diff options
| author | yenatch <yenatch@gmail.com> | 2017-12-10 01:47:10 -0500 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-12-10 01:47:10 -0500 |
| commit | 94c7def4883fbdbcd3987a067443a2069b8bb610 (patch) | |
| tree | 171c67509afba62571266bd6bebbfdb829d2a876 /battle/objects/functions.asm | |
| parent | 89b9292db0898f8ad2b6ea8513a3190762eb58c8 (diff) | |
| parent | d554b997c590825f030bd1be71989653b16a2ae0 (diff) | |
Merge pull request #409 from roukaour/master
Document constants with comments, actual names, and more thorough usage
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 |