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

Define more palette constants

Browse Source
This commit is contained in:
Remy Oukaour
2017-12-10 20:10:39 -05:00
parent 0f16ba854a
commit a0bef01a1d
4 changed files with 230 additions and 208 deletions
Download Patch File Download Diff File Expand all files Collapse all files

376
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, PAL_BATTLE_GREEN db MASTER_BALL, PAL_BATTLE_OB_GREEN
db ULTRA_BALL, PAL_BATTLE_YELLOW db ULTRA_BALL, PAL_BATTLE_OB_YELLOW
db GREAT_BALL, PAL_BATTLE_BLUE db GREAT_BALL, PAL_BATTLE_OB_BLUE
db POKE_BALL, PAL_BATTLE_RED db POKE_BALL, PAL_BATTLE_OB_RED
db HEAVY_BALL, PAL_BATTLE_GRAY db HEAVY_BALL, PAL_BATTLE_OB_GRAY
db LEVEL_BALL, PAL_BATTLE_BROWN db LEVEL_BALL, PAL_BATTLE_OB_BROWN
db LURE_BALL, PAL_BATTLE_BLUE db LURE_BALL, PAL_BATTLE_OB_BLUE
db FAST_BALL, PAL_BATTLE_BLUE db FAST_BALL, PAL_BATTLE_OB_BLUE
db FRIEND_BALL, PAL_BATTLE_YELLOW db FRIEND_BALL, PAL_BATTLE_OB_YELLOW
db MOON_BALL, PAL_BATTLE_GRAY db MOON_BALL, PAL_BATTLE_OB_GRAY
db LOVE_BALL, PAL_BATTLE_RED db LOVE_BALL, PAL_BATTLE_OB_RED
db -1, PAL_BATTLE_GRAY db -1, PAL_BATTLE_OB_GRAY
; cd284 ; cd284
BattleAnimFunction_10: ; cd284 (33:5284) BattleAnimFunction_10: ; cd284 (33:5284)
call BattleAnim_AnonJumptable call BattleAnim_AnonJumptable

27
constants/animation_constants.asm
View File

@@ -824,13 +824,24 @@ const_value SET 1
const BG_EFFECT_STRUCT_BATTLE_TURN const BG_EFFECT_STRUCT_BATTLE_TURN
const BG_EFFECT_STRUCT_03 const BG_EFFECT_STRUCT_03
; battle palettes
const_def
const PAL_BATTLE_BG_PLAYER ; 0
const PAL_BATTLE_BG_ENEMY ; 1
const PAL_BATTLE_BG_PLAYER_HP ; 2
const PAL_BATTLE_BG_ENEMY_HP ; 3
const PAL_BATTLE_BG_EXP ; 4
const PAL_BATTLE_BG_5 ; 5
const PAL_BATTLE_BG_6 ; 6
const PAL_BATTLE_BG_TEXT ; 7
; animation object palettes ; animation object palettes
const_def const_def
const PAL_BATTLE_ENEMY ; 0 const PAL_BATTLE_OB_ENEMY ; 0
const PAL_BATTLE_PLAYER ; 1 const PAL_BATTLE_OB_PLAYER ; 1
const PAL_BATTLE_GRAY ; 2 const PAL_BATTLE_OB_GRAY ; 2
const PAL_BATTLE_YELLOW ; 3 const PAL_BATTLE_OB_YELLOW ; 3
const PAL_BATTLE_RED ; 4 const PAL_BATTLE_OB_RED ; 4
const PAL_BATTLE_GREEN ; 5 const PAL_BATTLE_OB_GREEN ; 5
const PAL_BATTLE_BLUE ; 6 const PAL_BATTLE_OB_BLUE ; 6
const PAL_BATTLE_BROWN ; 7 const PAL_BATTLE_OB_BROWN ; 7

11
constants/sprite_constants.asm
View File

@@ -193,6 +193,17 @@ const_value SET 1
const PAL_OW_TREE ; 6 const PAL_OW_TREE ; 6
const PAL_OW_ROCK ; 7 const PAL_OW_ROCK ; 7
; person_events set bit 3 so as not to use the sprite's default palette
const_value set (1 << 3)
const PAL_NPC_RED ; 8
const PAL_NPC_BLUE ; 9
const PAL_NPC_GREEN ; a
const PAL_NPC_BROWN ; b
const PAL_NPC_PINK ; c
const PAL_NPC_SILVER ; d
const PAL_NPC_TREE ; e
const PAL_NPC_ROCK ; f
; SpriteMovementData indexes (see data/map_objects.asm) ; SpriteMovementData indexes (see data/map_objects.asm)
const_def const_def
const SPRITEMOVEDATA_00 ; 00 const SPRITEMOVEDATA_00 ; 00