diff --git a/graphics/interface/ball/beast.png b/graphics/interface/ball/beast.png new file mode 100644 index 0000000000..56a10224c6 Binary files /dev/null and b/graphics/interface/ball/beast.png differ diff --git a/graphics/interface/ball/cherish.png b/graphics/interface/ball/cherish.png new file mode 100644 index 0000000000..3016b65609 Binary files /dev/null and b/graphics/interface/ball/cherish.png differ diff --git a/graphics/interface/ball/dream.png b/graphics/interface/ball/dream.png new file mode 100644 index 0000000000..104ee282f5 Binary files /dev/null and b/graphics/interface/ball/dream.png differ diff --git a/graphics/interface/ball/dusk.png b/graphics/interface/ball/dusk.png new file mode 100644 index 0000000000..2bb4d3d539 Binary files /dev/null and b/graphics/interface/ball/dusk.png differ diff --git a/graphics/interface/ball/fast.png b/graphics/interface/ball/fast.png new file mode 100644 index 0000000000..d6b7e283da Binary files /dev/null and b/graphics/interface/ball/fast.png differ diff --git a/graphics/interface/ball/friend.png b/graphics/interface/ball/friend.png new file mode 100644 index 0000000000..b016c0c631 Binary files /dev/null and b/graphics/interface/ball/friend.png differ diff --git a/graphics/interface/ball/heal.png b/graphics/interface/ball/heal.png new file mode 100644 index 0000000000..5f1604d785 Binary files /dev/null and b/graphics/interface/ball/heal.png differ diff --git a/graphics/interface/ball/heavy.png b/graphics/interface/ball/heavy.png new file mode 100644 index 0000000000..d37db7238b Binary files /dev/null and b/graphics/interface/ball/heavy.png differ diff --git a/graphics/interface/ball/level.png b/graphics/interface/ball/level.png new file mode 100644 index 0000000000..588bad393f Binary files /dev/null and b/graphics/interface/ball/level.png differ diff --git a/graphics/interface/ball/love.png b/graphics/interface/ball/love.png new file mode 100644 index 0000000000..3bb20d2cc6 Binary files /dev/null and b/graphics/interface/ball/love.png differ diff --git a/graphics/interface/ball/lure.png b/graphics/interface/ball/lure.png new file mode 100644 index 0000000000..9d10c25715 Binary files /dev/null and b/graphics/interface/ball/lure.png differ diff --git a/graphics/interface/ball/moon.png b/graphics/interface/ball/moon.png new file mode 100644 index 0000000000..beb1016f4d Binary files /dev/null and b/graphics/interface/ball/moon.png differ diff --git a/graphics/interface/ball/park.png b/graphics/interface/ball/park.png new file mode 100644 index 0000000000..9b526f5245 Binary files /dev/null and b/graphics/interface/ball/park.png differ diff --git a/graphics/interface/ball/quick.png b/graphics/interface/ball/quick.png new file mode 100644 index 0000000000..6c5dfccb9c Binary files /dev/null and b/graphics/interface/ball/quick.png differ diff --git a/graphics/interface/ball/sport.png b/graphics/interface/ball/sport.png new file mode 100644 index 0000000000..93228579b5 Binary files /dev/null and b/graphics/interface/ball/sport.png differ diff --git a/include/graphics.h b/include/graphics.h index 678b380e2b..dc6110857b 100644 --- a/include/graphics.h +++ b/include/graphics.h @@ -30,6 +30,36 @@ extern const u32 gInterfaceGfx_LuxuryBall[]; extern const u32 gInterfacePal_LuxuryBall[]; extern const u32 gInterfaceGfx_PremierBall[]; extern const u32 gInterfacePal_PremierBall[]; +extern const u32 gInterfaceGfx_LevelBall[]; +extern const u32 gInterfacePal_LevelBall[]; +extern const u32 gInterfaceGfx_LureBall[]; +extern const u32 gInterfacePal_LureBall[]; +extern const u32 gInterfaceGfx_MoonBall[]; +extern const u32 gInterfacePal_MoonBall[]; +extern const u32 gInterfaceGfx_FriendBall[]; +extern const u32 gInterfacePal_FriendBall[]; +extern const u32 gInterfaceGfx_LoveBall[]; +extern const u32 gInterfacePal_LoveBall[]; +extern const u32 gInterfaceGfx_HeavyBall[]; +extern const u32 gInterfacePal_HeavyBall[]; +extern const u32 gInterfaceGfx_FastBall[]; +extern const u32 gInterfacePal_FastBall[]; +extern const u32 gInterfaceGfx_SportBall[]; +extern const u32 gInterfacePal_SportBall[]; +extern const u32 gInterfaceGfx_DuskBall[]; +extern const u32 gInterfacePal_DuskBall[]; +extern const u32 gInterfaceGfx_QuickBall[]; +extern const u32 gInterfacePal_QuickBall[]; +extern const u32 gInterfaceGfx_HealBall[]; +extern const u32 gInterfacePal_HealBall[]; +extern const u32 gInterfaceGfx_CherishBall[]; +extern const u32 gInterfacePal_CherishBall[]; +extern const u32 gInterfaceGfx_ParkBall[]; +extern const u32 gInterfacePal_ParkBall[]; +extern const u32 gInterfaceGfx_DreamBall[]; +extern const u32 gInterfacePal_DreamBall[]; +extern const u32 gInterfaceGfx_BeastBall[]; +extern const u32 gInterfacePal_BeastBall[]; extern const u32 gOpenPokeballGfx[]; // pokemon gfx diff --git a/include/pokeball.h b/include/pokeball.h index 8e1d8b8ecb..29e80c794f 100644 --- a/include/pokeball.h +++ b/include/pokeball.h @@ -15,6 +15,21 @@ enum BALL_TIMER, BALL_LUXURY, BALL_PREMIER, + BALL_LEVEL, + BALL_LURE, + BALL_MOON, + BALL_FRIEND, + BALL_LOVE, + BALL_HEAVY, + BALL_FAST, + BALL_SPORT, + BALL_DUSK, + BALL_QUICK, + BALL_HEAL, + BALL_CHERISH, + BALL_PARK, + BALL_DREAM, + BALL_BEAST, POKEBALL_COUNT }; diff --git a/src/data/graphics/interface_pokeballs.h b/src/data/graphics/interface_pokeballs.h index fe9a4e5be3..c3842571bc 100644 --- a/src/data/graphics/interface_pokeballs.h +++ b/src/data/graphics/interface_pokeballs.h @@ -34,4 +34,49 @@ const u32 gInterfacePal_LuxuryBall[] = INCBIN_U32("graphics/interface/ball/luxur const u32 gInterfaceGfx_PremierBall[] = INCBIN_U32("graphics/interface/ball/premier.4bpp.lz"); const u32 gInterfacePal_PremierBall[] = INCBIN_U32("graphics/interface/ball/premier.gbapal.lz"); +const u32 gInterfaceGfx_LevelBall[] = INCBIN_U32("graphics/interface/ball/level.4bpp.lz"); +const u32 gInterfacePal_LevelBall[] = INCBIN_U32("graphics/interface/ball/level.gbapal.lz"); + +const u32 gInterfaceGfx_LureBall[] = INCBIN_U32("graphics/interface/ball/lure.4bpp.lz"); +const u32 gInterfacePal_LureBall[] = INCBIN_U32("graphics/interface/ball/lure.gbapal.lz"); + +const u32 gInterfaceGfx_MoonBall[] = INCBIN_U32("graphics/interface/ball/moon.4bpp.lz"); +const u32 gInterfacePal_MoonBall[] = INCBIN_U32("graphics/interface/ball/moon.gbapal.lz"); + +const u32 gInterfaceGfx_FriendBall[] = INCBIN_U32("graphics/interface/ball/friend.4bpp.lz"); +const u32 gInterfacePal_FriendBall[] = INCBIN_U32("graphics/interface/ball/friend.gbapal.lz"); + +const u32 gInterfaceGfx_LoveBall[] = INCBIN_U32("graphics/interface/ball/love.4bpp.lz"); +const u32 gInterfacePal_LoveBall[] = INCBIN_U32("graphics/interface/ball/love.gbapal.lz"); + +const u32 gInterfaceGfx_HeavyBall[] = INCBIN_U32("graphics/interface/ball/heavy.4bpp.lz"); +const u32 gInterfacePal_HeavyBall[] = INCBIN_U32("graphics/interface/ball/heavy.gbapal.lz"); + +const u32 gInterfaceGfx_FastBall[] = INCBIN_U32("graphics/interface/ball/fast.4bpp.lz"); +const u32 gInterfacePal_FastBall[] = INCBIN_U32("graphics/interface/ball/fast.gbapal.lz"); + +const u32 gInterfaceGfx_SportBall[] = INCBIN_U32("graphics/interface/ball/sport.4bpp.lz"); +const u32 gInterfacePal_SportBall[] = INCBIN_U32("graphics/interface/ball/sport.gbapal.lz"); + +const u32 gInterfaceGfx_DuskBall[] = INCBIN_U32("graphics/interface/ball/dusk.4bpp.lz"); +const u32 gInterfacePal_DuskBall[] = INCBIN_U32("graphics/interface/ball/dusk.gbapal.lz"); + +const u32 gInterfaceGfx_QuickBall[] = INCBIN_U32("graphics/interface/ball/quick.4bpp.lz"); +const u32 gInterfacePal_QuickBall[] = INCBIN_U32("graphics/interface/ball/quick.gbapal.lz"); + +const u32 gInterfaceGfx_HealBall[] = INCBIN_U32("graphics/interface/ball/heal.4bpp.lz"); +const u32 gInterfacePal_HealBall[] = INCBIN_U32("graphics/interface/ball/heal.gbapal.lz"); + +const u32 gInterfaceGfx_CherishBall[] = INCBIN_U32("graphics/interface/ball/cherish.4bpp.lz"); +const u32 gInterfacePal_CherishBall[] = INCBIN_U32("graphics/interface/ball/cherish.gbapal.lz"); + +const u32 gInterfaceGfx_ParkBall[] = INCBIN_U32("graphics/interface/ball/park.4bpp.lz"); +const u32 gInterfacePal_ParkBall[] = INCBIN_U32("graphics/interface/ball/park.gbapal.lz"); + +const u32 gInterfaceGfx_DreamBall[] = INCBIN_U32("graphics/interface/ball/dream.4bpp.lz"); +const u32 gInterfacePal_DreamBall[] = INCBIN_U32("graphics/interface/ball/dream.gbapal.lz"); + +const u32 gInterfaceGfx_BeastBall[] = INCBIN_U32("graphics/interface/ball/beast.4bpp.lz"); +const u32 gInterfacePal_BeastBall[] = INCBIN_U32("graphics/interface/ball/beast.gbapal.lz"); + const u32 gOpenPokeballGfx[] = INCBIN_U32("graphics/interface/ball_open.4bpp.lz"); diff --git a/src/pokeball.c b/src/pokeball.c index ac13295ddf..033ae7b6af 100644 --- a/src/pokeball.c +++ b/src/pokeball.c @@ -1428,11 +1428,13 @@ void LoadBallGfx(u8 ballId) LoadCompressedSpriteSheetUsingHeap(&gBallSpriteSheets[ballId]); LoadCompressedSpritePaletteUsingHeap(&gBallSpritePalettes[ballId]); } + switch (ballId) { case BALL_DIVE: case BALL_LUXURY: case BALL_PREMIER: + case BALL_LEVEL ... POKEBALL_COUNT: break; default: var = GetSpriteTileStartByTag(gBallSpriteSheets[ballId].tag);