diff options
| author | Remy Oukaour <remy.oukaour@gmail.com> | 2017-12-09 22:07:52 -0500 |
|---|---|---|
| committer | Remy Oukaour <remy.oukaour@gmail.com> | 2017-12-09 22:07:52 -0500 |
| commit | 7ccb11c903bb46796301f85b7b21c37369773517 (patch) | |
| tree | 8f2e8d28931a50b645c7918c2e6a5c936bf4beae /battle/objects/functions.asm | |
| parent | cd2a7481283beec7ba37451deeb841ebc37073ba (diff) | |
Add constants for battle object colors
Diffstat (limited to 'battle/objects/functions.asm')
| -rwxr-xr-x | battle/objects/functions.asm | 24 |
1 files changed, 12 insertions, 12 deletions
diff --git a/battle/objects/functions.asm b/battle/objects/functions.asm index debfcf04d..3f988a2cc 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, 5 - db ULTRA_BALL, 3 - db GREAT_BALL, 6 - db POKE_BALL, 4 - db HEAVY_BALL, 2 - db LEVEL_BALL, 7 - db LURE_BALL, 6 - db FAST_BALL, 6 - db FRIEND_BALL, 3 - db MOON_BALL, 2 - db LOVE_BALL, 4 - db -1, 2 + 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 BattleAnimFunction_10: ; cd284 (33:5284) call BattleAnim_AnonJumptable |