callba/callab → farcall/callfar

This commit is contained in:
Remy Oukaour
2017-12-24 12:47:30 -05:00
parent d787c66374
commit c66d195089
170 changed files with 1751 additions and 1751 deletions

View File

@@ -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
@@ -1808,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
@@ -1955,7 +1955,7 @@ StartRadioStation:
ld e, [hl]
inc hl
ld d, [hl]
callab RadioMusicRestartDE
callfar RadioMusicRestartDE
ret
RadioChannelSongs: