pokehacks/pokecrystal-board
0
0
Fork 0
mirror of https://gitlab.com/xCrystal/pokecrystal-board.git synced 2025-04-09 05:44:44 -07:00
Code Issues Packages Projects Releases Wiki Activity

Revise some constant definitions

Browse Source
This commit is contained in:
Rangi
2021-03-16 17:53:42 -04:00
parent 52bcd78290
commit 3684296583
27 changed files with 91 additions and 80 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
engine/pokegear/pokegear.asm
View File

@@ -1956,7 +1956,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
@@ -1983,9 +1983,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
@@ -1994,8 +1995,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
@@ -2005,7 +2007,7 @@ PlayRadio:
jp z, LoadStation_PokedexShow
jp LoadStation_OaksPokemonTalk
.kanto
.kanto:
jp LoadStation_PlacesAndPeople
PokegearMap: