diff options
| author | yenatch <yenatch@gmail.com> | 2018-01-22 01:06:48 -0500 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-01-22 01:06:48 -0500 |
| commit | c60f1331fef22b886adf3472d2b4f348832cfaf7 (patch) | |
| tree | 5a471fad61e406f5b3ca1aba67ced0186de01c52 /constants/music_constants.asm | |
| parent | f27f79488a460f0a89670f3611e1e9e175baf5d6 (diff) | |
| parent | 7fba864883732ccecb1221ae7ff97492d112362a (diff) | |
Merge pull request #456 from Rangi42/master
OAM data documentation; move more content into data/; move palettes into gfx/; more code+script constants; consistent map naming
Diffstat (limited to 'constants/music_constants.asm')
| -rw-r--r-- | constants/music_constants.asm | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/constants/music_constants.asm b/constants/music_constants.asm index 453bf9098..83085ef0c 100644 --- a/constants/music_constants.asm +++ b/constants/music_constants.asm @@ -108,9 +108,13 @@ const MUSIC_BATTLE_TOWER_LOBBY ; 65 const MUSIC_MOBILE_CENTER ; 66 -; GetMapHeaderMusic picks music for this value (see home/map.asm) +; GetMapMusic picks music for this value (see home/map.asm) MUSIC_MAHOGANY_MART EQU $64 -; GetMapHeaderMusic picks music for this bit flag +; ExitPokegearRadio_HandleMusic uses these values +RESTART_MAP_MUSIC EQU $fe +ENTER_MAP_MUSIC EQU $ff + +; GetMapMusic picks music for this bit flag RADIO_TOWER_MUSIC_F EQU 7 RADIO_TOWER_MUSIC EQU 1 << RADIO_TOWER_MUSIC_F |