diff options
Diffstat (limited to 'engine/radio.asm')
| -rw-r--r-- | engine/radio.asm | 33 |
1 files changed, 16 insertions, 17 deletions
diff --git a/engine/radio.asm b/engine/radio.asm index 99408af48..b5c1e075f 100644 --- a/engine/radio.asm +++ b/engine/radio.asm @@ -234,7 +234,7 @@ OaksPkmnTalk4: jr z, .done .next dec hl - ld de, WILDMON_GRASS_STRUCTURE_LENGTH + ld de, GRASS_WILDDATA_LENGTH add hl, de jr .loop @@ -249,12 +249,12 @@ endr cp 3 jr z, .loop2 - ld bc, 2 * NUM_WILDMONS_PER_AREA_TIME_OF_DAY + ld bc, 2 * NUM_GRASSMON call AddNTimes .loop3 ; Choose one of the middle three Pokemon. call Random - and NUM_WILDMONS_PER_AREA_TIME_OF_DAY + and NUM_GRASSMON cp 2 jr c, .loop3 cp 5 @@ -278,7 +278,7 @@ endr pop bc call GetWorldMapLocation ld e, a - callba GetLandmarkName + farcall GetLandmarkName ld hl, OPT_OakText1 call CopyRadioTextToRAM ld a, OAKS_POKEMON_TALK_5 @@ -592,7 +592,7 @@ OaksPkmnTalk9: db "@" OaksPkmnTalk10: - callba RadioMusicRestartPokemonChannel + farcall RadioMusicRestartPokemonChannel ld hl, OPT_RestartText call PrintText call WaitBGMap @@ -653,7 +653,7 @@ OaksPkmnTalk14: dec [hl] ret nz ld de, $1d - callab RadioMusicRestartDE + callfar RadioMusicRestartDE ld hl, .terminator call PrintText ld a, OAKS_POKEMON_TALK_4 @@ -923,7 +923,7 @@ StartPokemonMusicChannel: jr z, .SunTueThurSun ld de, MUSIC_POKEMON_LULLABY .SunTueThurSun: - callab RadioMusicRestartDE + callfar RadioMusicRestartDE ret BenIntroText1: @@ -978,9 +978,9 @@ BenFernText3B: LuckyNumberShow1: call StartRadioStation - callab Special_CheckLuckyNumberShowFlag + callfar Special_CheckLuckyNumberShowFlag jr nc, .dontreset - callab Special_ResetLuckyNumberShowFlag + callfar Special_ResetLuckyNumberShowFlag .dontreset ld hl, LC_Text1 ld a, LUCKY_NUMBER_SHOW_2 @@ -1193,12 +1193,12 @@ PeoplePlaces4: ; People pop bc jr c, PeoplePlaces4 push bc - callab GetTrainerClassName + callfar GetTrainerClassName ld de, StringBuffer1 call CopyName1 pop bc ld b, 1 - callab GetTrainerName + callfar GetTrainerName ld hl, PnP_Text4 ld a, PLACES_AND_PEOPLE_5 jp NextRadioLine @@ -1348,7 +1348,7 @@ PeoplePlaces6: ; Places ld c, [hl] call GetWorldMapLocation ld e, a - callba GetLandmarkName + farcall GetLandmarkName ld hl, PnP_Text5 ld a, PLACES_AND_PEOPLE_7 jp NextRadioLine @@ -1578,7 +1578,6 @@ BuenasPassword4: .greater_than_11 call Random maskbits NUM_PASSWORD_CATEGORIES - and x cp NUM_PASSWORD_CATEGORIES jr nc, .greater_than_11 ; Store it in the high nybble of e. @@ -1809,8 +1808,8 @@ BuenasPassword19: BuenasPassword20: ld a, [hBGMapMode] push af - callba NoRadioMusic - callba NoRadioName + farcall NoRadioMusic + farcall NoRadioName pop af ld [hBGMapMode], a ld hl, WeeklyFlags @@ -1837,7 +1836,7 @@ BuenasPassword21: BuenasPasswordCheckTime: call UpdateTime ld a, [hHours] - cp 18 ; 6 PM + cp NITE_HOUR ret BuenasPasswordChannelName: @@ -1956,7 +1955,7 @@ StartRadioStation: ld e, [hl] inc hl ld d, [hl] - callab RadioMusicRestartDE + callfar RadioMusicRestartDE ret RadioChannelSongs: |