More pokeballs expansion
BIN
graphics/interface/ball/beast.png
Normal file
After Width: | Height: | Size: 329 B |
BIN
graphics/interface/ball/cherish.png
Normal file
After Width: | Height: | Size: 329 B |
BIN
graphics/interface/ball/dream.png
Normal file
After Width: | Height: | Size: 316 B |
BIN
graphics/interface/ball/dusk.png
Normal file
After Width: | Height: | Size: 318 B |
BIN
graphics/interface/ball/fast.png
Normal file
After Width: | Height: | Size: 310 B |
BIN
graphics/interface/ball/friend.png
Normal file
After Width: | Height: | Size: 312 B |
BIN
graphics/interface/ball/heal.png
Normal file
After Width: | Height: | Size: 309 B |
BIN
graphics/interface/ball/heavy.png
Normal file
After Width: | Height: | Size: 316 B |
BIN
graphics/interface/ball/level.png
Normal file
After Width: | Height: | Size: 307 B |
BIN
graphics/interface/ball/love.png
Normal file
After Width: | Height: | Size: 305 B |
BIN
graphics/interface/ball/lure.png
Normal file
After Width: | Height: | Size: 302 B |
BIN
graphics/interface/ball/moon.png
Normal file
After Width: | Height: | Size: 317 B |
BIN
graphics/interface/ball/park.png
Normal file
After Width: | Height: | Size: 307 B |
BIN
graphics/interface/ball/quick.png
Normal file
After Width: | Height: | Size: 313 B |
BIN
graphics/interface/ball/sport.png
Normal file
After Width: | Height: | Size: 299 B |
@ -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
|
||||
|
@ -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
|
||||
};
|
||||
|
||||
|
@ -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");
|
||||
|
@ -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);
|
||||
|