Future/pokecrystal
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Add constants for battle object colors

Browse Source
This commit is contained in:
Remy Oukaour
2017-12-09 22:07:52 -05:00
parent cd2a748128
commit 7ccb11c903
3 changed files with 226 additions and 203 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
battle/objects/functions.asm
View File

@@ -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