Label some radio stuff.

This commit is contained in:
IIMarckus
2015-05-14 22:39:52 -06:00
parent d54725c28e
commit 21a7300f68

109
main.asm
View File

@@ -72032,7 +72032,7 @@ Function9164e: ; 9164e (24:564e)
UpdateRadioStation: ; 9166f (24:566f) UpdateRadioStation: ; 9166f (24:566f)
ld hl, wd958 ld hl, wd958
ld d, [hl] ld d, [hl]
ld hl, Unknown_916ad ld hl, RadioChannels
.asm_91676 .asm_91676
ld a, [hli] ld a, [hli]
cp $ff cp $ff
@@ -72076,79 +72076,82 @@ Function916a1: ; 916a1
ret ret
; 916ad ; 916ad
Unknown_916ad: ; 916ad
dbw 16, Function916c9
dbw 28, Function916d8
dbw 32, Function916e0
dbw 40, Function916e8
dbw 52, Function916f0
dbw 64, Function916fa
dbw 72, Function91709
dbw 78, Function91718
dbw 80, Function91727
db $ff
; 916c9
Function916c9: ; 916c9 RadioChannels:
call Function91744 ; frequencies and the shows that play on them.
jr nc, Function91740 ; frequency value given here = 4 × ingame_frequency 2
dbw 16, .PkmnTalkAndPokedexShow
dbw 28, .PokemonMusic
dbw 32, .LuckyChannel
dbw 40, .BuenasPassword
dbw 52, .RuinsOfAlphRadio
dbw 64, .PlacesAndPeople
dbw 72, .LetsAllSing
dbw 78, .PokeFluteRadio
dbw 80, .EvolutionRadio
db $ff
.PkmnTalkAndPokedexShow
; Pokédex Show in the morning
; Oak's Pokémon Talk in the afternoon and evening
call .InJohto
jr nc, .NoSignal
ld a, [TimeOfDay] ld a, [TimeOfDay]
and a and a
jp z, Function91766 jp z, Function91766
jp Function91753 jp Function91753
Function916d8: ; 916d8 .PokemonMusic
call Function91744 call .InJohto
jr nc, Function91740 jr nc, .NoSignal
jp Function9177b jp Function9177b
Function916e0: ; 916e0 .LuckyChannel
call Function91744 call .InJohto
jr nc, Function91740 jr nc, .NoSignal
jp Function91790 jp Function91790
Function916e8: ; 916e8 .BuenasPassword
call Function91744 call .InJohto
jr nc, Function91740 jr nc, .NoSignal
jp Function917a5 jp Function917a5
Function916f0: ; 916f0 .RuinsOfAlphRadio
ld a, [wc6d8] ld a, [wc6d8]
cp RUINS_OF_ALPH cp RUINS_OF_ALPH
jr nz, Function91740 jr nz, .NoSignal
jp Function917d5 jp Function917d5
Function916fa: ; 916fa .PlacesAndPeople
call Function91744 call .InJohto
jr c, Function91740 jr c, .NoSignal
ld a, [wd957] ld a, [wd957]
bit 3, a bit 3, a
jr z, Function91740 jr z, .NoSignal
jp Function917ea jp Function917ea
Function91709: ; 91709 .LetsAllSing
call Function91744 call .InJohto
jr c, Function91740 jr c, .NoSignal
ld a, [wd957] ld a, [wd957]
bit 3, a bit 3, a
jr z, Function91740 jr z, .NoSignal
jp Function917ff jp Function917ff
Function91718: ; 91718 .PokeFluteRadio
call Function91744 call .InJohto
jr c, Function91740 jr c, .NoSignal
ld a, [wd957] ld a, [wd957]
bit 3, a bit 3, a
jr z, Function91740 jr z, .NoSignal
jp Function91829 jp Function91829
Function91727: ; 91727 .EvolutionRadio
; This station airs in the Lake of Rage ; This station airs in the Lake of Rage area when Rocket are still in Mahogany.
; area when Rocket are still in Mahogany.
ld a, [StatusFlags] ld a, [StatusFlags]
bit 4, a bit 4, a
jr z, Function91740 jr z, .NoSignal
ld a, [wc6d8] ld a, [wc6d8]
cp MAHOGANY_TOWN cp MAHOGANY_TOWN
@@ -72156,15 +72159,17 @@ Function91727: ; 91727
cp ROUTE_43 cp ROUTE_43
jr z, .ok jr z, .ok
cp LAKE_OF_RAGE cp LAKE_OF_RAGE
jr nz, Function91740 jr nz, .NoSignal
.ok .ok
jp Function9183e jp Function9183e
Function91740: ; 91740 .NoSignal
call NoRadioStation call NoRadioStation
ret ret
Function91744: ; 91744 (24:5744) .InJohto
; if in Johto or on the S.S. Aqua, set carry
; otherwise clear carry
ld a, [wc6d8] ld a, [wc6d8]
cp FAST_SHIP cp FAST_SHIP
jr z, .johto jr z, .johto
@@ -77644,12 +77649,12 @@ Functionb8b8f: ; b8b8f (2e:4b8f)
Functionb8b90: ; b8b90 (2e:4b90) Functionb8b90: ; b8b90 (2e:4b90)
call Function1052 call Function1052
call PrintText call PrintText
ld de, $51 ld de, MUSIC_POKEMON_MARCH
call GetWeekday call GetWeekday
and 1 and 1
jr z, .asm_b8ba3 jr z, .done
ld de, $50 ld de, MUSIC_POKEMON_LULLABY
.asm_b8ba3 .done
callab Function91854 callab Function91854
ret ret
; b8baa (2e:4baa) ; b8baa (2e:4baa)
@@ -78751,7 +78756,7 @@ Functionb91eb: ; b91eb (2e:51eb)
ret nz ret nz
call Function1052 call Function1052
call PrintText call PrintText
ld hl, Unknown_b920b ld hl, RadioChannelSongs
ld a, [wd002] ld a, [wd002]
ld c, a ld c, a
ld b, 0 ld b, 0
@@ -78764,7 +78769,7 @@ Functionb91eb: ; b91eb (2e:51eb)
ret ret
; b920b (2e:520b) ; b920b (2e:520b)
Unknown_b920b: ; b920b RadioChannelSongs: ; b920b
dw MUSIC_POKEMON_TALK dw MUSIC_POKEMON_TALK
dw MUSIC_POKEMON_CENTER dw MUSIC_POKEMON_CENTER
dw MUSIC_TITLE dw MUSIC_TITLE