diff options
| author | Rangi <remy.oukaour+rangi42@gmail.com> | 2021-03-16 18:08:25 -0400 |
|---|---|---|
| committer | Rangi <remy.oukaour+rangi42@gmail.com> | 2021-03-16 18:08:25 -0400 |
| commit | 2bc8cf5fc11d4ef84022840ad10cd05eaab12ae9 (patch) | |
| tree | a51a504112ef948c1ddcb0b7e31c2f285f3b84a9 /engine/pokegear | |
| parent | 8b5dde16c3e7f7ad87a095f71cc6b61cf00b2bb8 (diff) | |
Revise some constant definitions
Diffstat (limited to 'engine/pokegear')
| -rw-r--r-- | engine/pokegear/pokegear.asm | 12 |
1 files changed, 7 insertions, 5 deletions
diff --git a/engine/pokegear/pokegear.asm b/engine/pokegear/pokegear.asm index acef7b42..ee040de3 100644 --- a/engine/pokegear/pokegear.asm +++ b/engine/pokegear/pokegear.asm @@ -1907,7 +1907,7 @@ PlayRadio: .PlayStation: ld a, ENTER_MAP_MUSIC ld [wPokegearRadioMusicPlaying], a - ld hl, .StationPointers + ld hl, PlayRadioStationPointers ld d, 0 add hl, de add hl, de @@ -1934,9 +1934,10 @@ PlayRadio: call WaitBGMap ret -.StationPointers: +PlayRadioStationPointers: ; entries correspond to MAPRADIO_* constants - dw .OakOrPnP + table_width 2, PlayRadioStationPointers + dw LoadStation_PokemonChannel dw LoadStation_OaksPokemonTalk dw LoadStation_PokedexShow dw LoadStation_PokemonMusic @@ -1945,8 +1946,9 @@ PlayRadio: dw LoadStation_PlacesAndPeople dw LoadStation_LetsAllSing dw LoadStation_RocketRadio + assert_table_length NUM_MAP_RADIO_STATIONS -.OakOrPnP: +LoadStation_PokemonChannel: call IsInJohto and a jr nz, .kanto @@ -1956,7 +1958,7 @@ PlayRadio: jp z, LoadStation_PokedexShow jp LoadStation_OaksPokemonTalk -.kanto +.kanto: jp LoadStation_PlacesAndPeople PokegearMap: |