From a0bef01a1ddcd80eb098e88dc0514d07a4f1bc50 Mon Sep 17 00:00:00 2001 From: Remy Oukaour Date: Sun, 10 Dec 2017 20:10:39 -0500 Subject: Define more palette constants --- battle/objects/functions.asm | 24 ++++++++++++------------ 1 file changed, 12 insertions(+), 12 deletions(-) (limited to 'battle/objects/functions.asm') diff --git a/battle/objects/functions.asm b/battle/objects/functions.asm index 3f988a2cc..3af7b6dad 100755 --- a/battle/objects/functions.asm +++ b/battle/objects/functions.asm @@ -451,18 +451,18 @@ GetBallAnimPal: ; cd249 (33:5249) ; 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 + db MASTER_BALL, PAL_BATTLE_OB_GREEN + db ULTRA_BALL, PAL_BATTLE_OB_YELLOW + db GREAT_BALL, PAL_BATTLE_OB_BLUE + db POKE_BALL, PAL_BATTLE_OB_RED + db HEAVY_BALL, PAL_BATTLE_OB_GRAY + db LEVEL_BALL, PAL_BATTLE_OB_BROWN + db LURE_BALL, PAL_BATTLE_OB_BLUE + db FAST_BALL, PAL_BATTLE_OB_BLUE + db FRIEND_BALL, PAL_BATTLE_OB_YELLOW + db MOON_BALL, PAL_BATTLE_OB_GRAY + db LOVE_BALL, PAL_BATTLE_OB_RED + db -1, PAL_BATTLE_OB_GRAY ; cd284 BattleAnimFunction_10: ; cd284 (33:5284) call BattleAnim_AnonJumptable -- cgit v1.2.3 From 2e41368ac4a4c409cd97a1afe166a7f9a363eb1e Mon Sep 17 00:00:00 2001 From: Remy Oukaour Date: Mon, 11 Dec 2017 17:11:30 -0500 Subject: Factor out one more data table --- battle/objects/functions.asm | 20 +++++--------------- 1 file changed, 5 insertions(+), 15 deletions(-) (limited to 'battle/objects/functions.asm') diff --git a/battle/objects/functions.asm b/battle/objects/functions.asm index 3af7b6dad..77c56c7b2 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,12 @@ GetBallAnimPal: ; cd249 (33:5249) add hl, bc ld [hl], a ret - ; cd26c (33:526c) -.balls - db MASTER_BALL, PAL_BATTLE_OB_GREEN - db ULTRA_BALL, PAL_BATTLE_OB_YELLOW - db GREAT_BALL, PAL_BATTLE_OB_BLUE - db POKE_BALL, PAL_BATTLE_OB_RED - db HEAVY_BALL, PAL_BATTLE_OB_GRAY - db LEVEL_BALL, PAL_BATTLE_OB_BROWN - db LURE_BALL, PAL_BATTLE_OB_BLUE - db FAST_BALL, PAL_BATTLE_OB_BLUE - db FRIEND_BALL, PAL_BATTLE_OB_YELLOW - db MOON_BALL, PAL_BATTLE_OB_GRAY - db LOVE_BALL, PAL_BATTLE_OB_RED - db -1, PAL_BATTLE_OB_GRAY + +BallColors: +INCLUDE "data/ball_colors.asm" ; cd284 + BattleAnimFunction_10: ; cd284 (33:5284) call BattleAnim_AnonJumptable .anon_dw -- cgit v1.2.3 From f1f84743f7759a0f808f935add82439ba6637d2b Mon Sep 17 00:00:00 2001 From: Remy Oukaour Date: Mon, 11 Dec 2017 22:44:25 -0500 Subject: Keep table labels in the same files as their contents. --- battle/objects/functions.asm | 2 -- 1 file changed, 2 deletions(-) (limited to 'battle/objects/functions.asm') diff --git a/battle/objects/functions.asm b/battle/objects/functions.asm index 77c56c7b2..6a0c2ecf8 100755 --- a/battle/objects/functions.asm +++ b/battle/objects/functions.asm @@ -450,9 +450,7 @@ GetBallAnimPal: ; cd249 (33:5249) ret ; cd26c (33:526c) -BallColors: INCLUDE "data/ball_colors.asm" -; cd284 BattleAnimFunction_10: ; cd284 (33:5284) call BattleAnim_AnonJumptable -- cgit v1.2.3