pokehacks/pokecrystal-board
0
0
Fork 0
mirror of https://gitlab.com/xCrystal/pokecrystal-board.git synced 2025-04-09 05:44:44 -07:00
Code Issues 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

394
battle/objects/data.asm
View File

File diff suppressed because it is too large Load Diff

24
battle/objects/functions.asm
View File

@@ -451,18 +451,18 @@ GetBallAnimPal: ; cd249 (33:5249)
; cd26c (33:526c) ; cd26c (33:526c)
.balls .balls
db MASTER_BALL, 5 db MASTER_BALL, PAL_BATTLE_GREEN
db ULTRA_BALL, 3 db ULTRA_BALL, PAL_BATTLE_YELLOW
db GREAT_BALL, 6 db GREAT_BALL, PAL_BATTLE_BLUE
db POKE_BALL, 4 db POKE_BALL, PAL_BATTLE_RED
db HEAVY_BALL, 2 db HEAVY_BALL, PAL_BATTLE_GRAY
db LEVEL_BALL, 7 db LEVEL_BALL, PAL_BATTLE_BROWN
db LURE_BALL, 6 db LURE_BALL, PAL_BATTLE_BLUE
db FAST_BALL, 6 db FAST_BALL, PAL_BATTLE_BLUE
db FRIEND_BALL, 3 db FRIEND_BALL, PAL_BATTLE_YELLOW
db MOON_BALL, 2 db MOON_BALL, PAL_BATTLE_GRAY
db LOVE_BALL, 4 db LOVE_BALL, PAL_BATTLE_RED
db -1, 2 db -1, PAL_BATTLE_GRAY
; cd284 ; cd284
BattleAnimFunction_10: ; cd284 (33:5284) BattleAnimFunction_10: ; cd284 (33:5284)
call BattleAnim_AnonJumptable call BattleAnim_AnonJumptable

11
constants/animation_constants.asm
View File

@@ -823,3 +823,14 @@ const_value SET 1
const BG_EFFECT_STRUCT_JT_INDEX const BG_EFFECT_STRUCT_JT_INDEX
const BG_EFFECT_STRUCT_BATTLE_TURN const BG_EFFECT_STRUCT_BATTLE_TURN
const BG_EFFECT_STRUCT_03 const BG_EFFECT_STRUCT_03
; animation object palettes
const_def
const PAL_BATTLE_ENEMY ; 0
const PAL_BATTLE_PLAYER ; 1
const PAL_BATTLE_GRAY ; 2
const PAL_BATTLE_YELLOW ; 3
const PAL_BATTLE_RED ; 4
const PAL_BATTLE_GREEN ; 5
const PAL_BATTLE_BLUE ; 6
const PAL_BATTLE_BROWN ; 7