diff options
Diffstat (limited to 'constants')
| -rw-r--r-- | constants/animation_constants.asm | 4 | ||||
| -rw-r--r-- | constants/music_constants.asm | 4 |
2 files changed, 5 insertions, 3 deletions
diff --git a/constants/animation_constants.asm b/constants/animation_constants.asm index 21247a87f..e7c844c12 100644 --- a/constants/animation_constants.asm +++ b/constants/animation_constants.asm @@ -828,8 +828,8 @@ const_value SET 1 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_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 diff --git a/constants/music_constants.asm b/constants/music_constants.asm index 9536ae837..453bf9098 100644 --- a/constants/music_constants.asm +++ b/constants/music_constants.asm @@ -110,5 +110,7 @@ ; GetMapHeaderMusic picks music for this value (see home/map.asm) MUSIC_MAHOGANY_MART EQU $64 + ; GetMapHeaderMusic picks music for this bit flag -RADIO_TOWER_MUSIC EQU 7 +RADIO_TOWER_MUSIC_F EQU 7 +RADIO_TOWER_MUSIC EQU 1 << RADIO_TOWER_MUSIC_F |