dionmoustos/PokemonEmeraldSafariFrontier
1
0
Fork 0
Code Issues 21 Pull Requests Actions Packages Projects Releases Wiki Activity

Move balls, shop, link, map popups, and bag out of interface

Browse Source
This commit is contained in:
GriffinR
2022-01-11 11:59:24 -05:00
parent d782d3544d
commit 694aa3c65d
80 changed files with 168 additions and 171 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/pokeball.c
+24 -24
View File
@@ -59,34 +59,34 @@ static u16 GetBattlerPokeballItemId(u8 battlerId);
const struct CompressedSpriteSheet gBallSpriteSheets[POKEBALL_COUNT] =
{
[BALL_POKE] = {gInterfaceGfx_PokeBall, 384, GFX_TAG_POKEBALL},
[BALL_GREAT] = {gInterfaceGfx_GreatBall, 384, GFX_TAG_GREATBALL},
[BALL_SAFARI] = {gInterfaceGfx_SafariBall, 384, GFX_TAG_SAFARIBALL},
[BALL_ULTRA] = {gInterfaceGfx_UltraBall, 384, GFX_TAG_ULTRABALL},
[BALL_MASTER] = {gInterfaceGfx_MasterBall, 384, GFX_TAG_MASTERBALL},
[BALL_NET] = {gInterfaceGfx_NetBall, 384, GFX_TAG_NETBALL},
[BALL_DIVE] = {gInterfaceGfx_DiveBall, 384, GFX_TAG_DIVEBALL},
[BALL_NEST] = {gInterfaceGfx_NestBall, 384, GFX_TAG_NESTBALL},
[BALL_REPEAT] = {gInterfaceGfx_RepeatBall, 384, GFX_TAG_REPEATBALL},
[BALL_TIMER] = {gInterfaceGfx_TimerBall, 384, GFX_TAG_TIMERBALL},
[BALL_LUXURY] = {gInterfaceGfx_LuxuryBall, 384, GFX_TAG_LUXURYBALL},
[BALL_PREMIER] = {gInterfaceGfx_PremierBall, 384, GFX_TAG_PREMIERBALL},
[BALL_POKE] = {gBallGfx_Poke, 384, GFX_TAG_POKEBALL},
[BALL_GREAT] = {gBallGfx_Great, 384, GFX_TAG_GREATBALL},
[BALL_SAFARI] = {gBallGfx_Safari, 384, GFX_TAG_SAFARIBALL},
[BALL_ULTRA] = {gBallGfx_Ultra, 384, GFX_TAG_ULTRABALL},
[BALL_MASTER] = {gBallGfx_Master, 384, GFX_TAG_MASTERBALL},
[BALL_NET] = {gBallGfx_Net, 384, GFX_TAG_NETBALL},
[BALL_DIVE] = {gBallGfx_Dive, 384, GFX_TAG_DIVEBALL},
[BALL_NEST] = {gBallGfx_Nest, 384, GFX_TAG_NESTBALL},
[BALL_REPEAT] = {gBallGfx_Repeat, 384, GFX_TAG_REPEATBALL},
[BALL_TIMER] = {gBallGfx_Timer, 384, GFX_TAG_TIMERBALL},
[BALL_LUXURY] = {gBallGfx_Luxury, 384, GFX_TAG_LUXURYBALL},
[BALL_PREMIER] = {gBallGfx_Premier, 384, GFX_TAG_PREMIERBALL},
};
const struct CompressedSpritePalette gBallSpritePalettes[POKEBALL_COUNT] =
{
[BALL_POKE] = {gInterfacePal_PokeBall, GFX_TAG_POKEBALL},
[BALL_GREAT] = {gInterfacePal_GreatBall, GFX_TAG_GREATBALL},
[BALL_SAFARI] = {gInterfacePal_SafariBall, GFX_TAG_SAFARIBALL},
[BALL_ULTRA] = {gInterfacePal_UltraBall, GFX_TAG_ULTRABALL},
[BALL_MASTER] = {gInterfacePal_MasterBall, GFX_TAG_MASTERBALL},
[BALL_NET] = {gInterfacePal_NetBall, GFX_TAG_NETBALL},
[BALL_DIVE] = {gInterfacePal_DiveBall, GFX_TAG_DIVEBALL},
[BALL_NEST] = {gInterfacePal_NestBall, GFX_TAG_NESTBALL},
[BALL_REPEAT] = {gInterfacePal_RepeatBall, GFX_TAG_REPEATBALL},
[BALL_TIMER] = {gInterfacePal_TimerBall, GFX_TAG_TIMERBALL},
[BALL_LUXURY] = {gInterfacePal_LuxuryBall, GFX_TAG_LUXURYBALL},
[BALL_PREMIER] = {gInterfacePal_PremierBall, GFX_TAG_PREMIERBALL},
[BALL_POKE] = {gBallPal_Poke, GFX_TAG_POKEBALL},
[BALL_GREAT] = {gBallPal_Great, GFX_TAG_GREATBALL},
[BALL_SAFARI] = {gBallPal_Safari, GFX_TAG_SAFARIBALL},
[BALL_ULTRA] = {gBallPal_Ultra, GFX_TAG_ULTRABALL},
[BALL_MASTER] = {gBallPal_Master, GFX_TAG_MASTERBALL},
[BALL_NET] = {gBallPal_Net, GFX_TAG_NETBALL},
[BALL_DIVE] = {gBallPal_Dive, GFX_TAG_DIVEBALL},
[BALL_NEST] = {gBallPal_Nest, GFX_TAG_NESTBALL},
[BALL_REPEAT] = {gBallPal_Repeat, GFX_TAG_REPEATBALL},
[BALL_TIMER] = {gBallPal_Timer, GFX_TAG_TIMERBALL},
[BALL_LUXURY] = {gBallPal_Luxury, GFX_TAG_LUXURYBALL},
[BALL_PREMIER] = {gBallPal_Premier, GFX_TAG_PREMIERBALL},
};
static const struct OamData sBallOamData =