pokehacks/pokecrystal-board
0
0
Fork 0
mirror of https://gitlab.com/xCrystal/pokecrystal-board.git synced 2025-09-08 08:13:02 -07:00
Code Issues Packages Projects Releases Wiki Activity

Factor out one more data table

Browse Source
This commit is contained in:
Remy Oukaour
2017-12-11 17:11:30 -05:00
parent 690442e31d
commit 2e41368ac4
2 changed files with 18 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
battle/objects/functions.asm
View File

@@ -424,7 +424,7 @@ BattleAnimFunction_PokeBallBlocked: ; cd212 (33:5212)
ret ret
GetBallAnimPal: ; cd249 (33:5249) GetBallAnimPal: ; cd249 (33:5249)
ld hl, .balls ld hl, BallColors
ld a, [rSVBK] ld a, [rSVBK]
push af push af
ld a, $1 ld a, $1
@@ -448,22 +448,12 @@ GetBallAnimPal: ; cd249 (33:5249)
add hl, bc add hl, bc
ld [hl], a ld [hl], a
ret ret
; cd26c (33:526c) ; cd26c (33:526c)
.balls
db MASTER_BALL, PAL_BATTLE_OB_GREEN BallColors:
db ULTRA_BALL, PAL_BATTLE_OB_YELLOW INCLUDE "data/ball_colors.asm"
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 ; cd284
BattleAnimFunction_10: ; cd284 (33:5284) BattleAnimFunction_10: ; cd284 (33:5284)
call BattleAnim_AnonJumptable call BattleAnim_AnonJumptable
.anon_dw .anon_dw

13
data/ball_colors.asm Normal file
View File

@@ -0,0 +1,13 @@
; colors of balls thrown in battle
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