diff options
Diffstat (limited to 'battle/objects/functions.asm')
| -rwxr-xr-x | battle/objects/functions.asm | 20 |
1 files changed, 4 insertions, 16 deletions
diff --git a/battle/objects/functions.asm b/battle/objects/functions.asm index 3f988a2cc..6a0c2ecf8 100755 --- a/battle/objects/functions.asm +++ b/battle/objects/functions.asm @@ -424,7 +424,7 @@ BattleAnimFunction_PokeBallBlocked: ; cd212 (33:5212) ret GetBallAnimPal: ; cd249 (33:5249) - ld hl, .balls + ld hl, BallColors ld a, [rSVBK] push af ld a, $1 @@ -448,22 +448,10 @@ GetBallAnimPal: ; cd249 (33:5249) add hl, bc ld [hl], a ret - ; cd26c (33:526c) -.balls - db MASTER_BALL, PAL_BATTLE_GREEN - db ULTRA_BALL, PAL_BATTLE_YELLOW - db GREAT_BALL, PAL_BATTLE_BLUE - db POKE_BALL, PAL_BATTLE_RED - db HEAVY_BALL, PAL_BATTLE_GRAY - db LEVEL_BALL, PAL_BATTLE_BROWN - db LURE_BALL, PAL_BATTLE_BLUE - db FAST_BALL, PAL_BATTLE_BLUE - db FRIEND_BALL, PAL_BATTLE_YELLOW - db MOON_BALL, PAL_BATTLE_GRAY - db LOVE_BALL, PAL_BATTLE_RED - db -1, PAL_BATTLE_GRAY -; cd284 + +INCLUDE "data/ball_colors.asm" + BattleAnimFunction_10: ; cd284 (33:5284) call BattleAnim_AnonJumptable .anon_dw |