diff options
| author | yenatch <yenatch@gmail.com> | 2017-12-12 00:08:54 -0500 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-12-12 00:08:54 -0500 |
| commit | f6942b9a136b2ee3b25159ebc4d54509a42c5266 (patch) | |
| tree | 0c0bedcd311ab83262e31cf6d9d4c37257143acc /constants/animation_constants.asm | |
| parent | 94c7def4883fbdbcd3987a067443a2069b8bb610 (diff) | |
| parent | 79873a1bfc0e40067c45dc74fbbebf547d177978 (diff) | |
Merge pull request #411 from roukaour/master
Clean up more labels, constants, and file names
Diffstat (limited to 'constants/animation_constants.asm')
| -rw-r--r-- | constants/animation_constants.asm | 27 |
1 files changed, 19 insertions, 8 deletions
diff --git a/constants/animation_constants.asm b/constants/animation_constants.asm index 8802cd579..e7c844c12 100644 --- a/constants/animation_constants.asm +++ b/constants/animation_constants.asm @@ -824,13 +824,24 @@ const_value SET 1 const BG_EFFECT_STRUCT_BATTLE_TURN 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_ENEMY_HP ; 2 + const PAL_BATTLE_BG_PLAYER_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 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 + const PAL_BATTLE_OB_ENEMY ; 0 + const PAL_BATTLE_OB_PLAYER ; 1 + const PAL_BATTLE_OB_GRAY ; 2 + const PAL_BATTLE_OB_YELLOW ; 3 + const PAL_BATTLE_OB_RED ; 4 + const PAL_BATTLE_OB_GREEN ; 5 + const PAL_BATTLE_OB_BLUE ; 6 + const PAL_BATTLE_OB_BROWN ; 7 |