callba/callab → farcall/callfar

engine/intro_menu.asm

@@ -6,7 +6,7 @@ _MainMenu: ; 5ae8
 	ld a, e
 	ld [wMapMusic], a
 	call PlayMusic
-	callba MainMenu
+	farcall MainMenu
 	jp StartTitleScreen
 ; 5b04
 
@@ -56,13 +56,13 @@ NewGame_ClearTileMapEtc: ; 5b44
 
 MysteryGift: ; 5b54
 	call UpdateTime
-	callba DoMysteryGiftIfDayHasPassed
-	callba DoMysteryGift
+	farcall DoMysteryGiftIfDayHasPassed
+	farcall DoMysteryGift
 	ret
 ; 5b64
 
 OptionsMenu: ; 5b64
-	callba _OptionsMenu
+	farcall _OptionsMenu
 	ret
 ; 5b6b
 
@@ -86,14 +86,14 @@ NewGame: ; 5b6b
 ; 5b8f
 
 AreYouABoyOrAreYouAGirl: ; 5b8f
-	callba Mobile_AlwaysReturnNotCarry ; some mobile stuff
+	farcall Mobile_AlwaysReturnNotCarry ; some mobile stuff
 	jr c, .ok
-	callba InitGender
+	farcall InitGender
 	ret
 
 .ok
 	ld c, 0
-	callba InitMobileProfile ; mobile
+	farcall InitMobileProfile ; mobile
 	ret
 ; 5ba7
 
@@ -220,11 +220,11 @@ ENDC
 
 	call InitializeNPCNames
 
-	callba InitDecorations
+	farcall InitDecorations
 
-	callba DeletePartyMonMail
+	farcall DeletePartyMonMail
 
-	callba DeleteMobileEventIndex
+	farcall DeleteMobileEventIndex
 
 	call ResetGameTime
 	ret
@@ -316,8 +316,8 @@ InitializeNPCNames: ; 5ce9
 
 InitializeWorld: ; 5d23
 	call ShrinkPlayer
-	callba SpawnPlayer
-	callba _InitializeStartDay
+	farcall SpawnPlayer
+	farcall _InitializeStartDay
 	ret
 ; 5d33
 
@@ -349,9 +349,9 @@ LoadOrRegenerateLuckyIDNumber: ; 5d33
 ; 5d65
 
 Continue: ; 5d65
-	callba TryLoadSaveFile
+	farcall TryLoadSaveFile
 	jr c, .FailToLoad
-	callba _LoadData
+	farcall _LoadData
 	call LoadStandardMenuDataHeader
 	call DisplaySaveInfoOnContinue
 	ld a, $1
@@ -382,9 +382,9 @@ Continue: ; 5d65
 	call ClearTileMap
 	ld c, 20
 	call DelayFrames
-	callba JumpRoamMons
-	callba MysteryGift_CopyReceivedDecosToPC ; Mystery Gift
-	callba Function140ae ; time-related
+	farcall JumpRoamMons
+	farcall MysteryGift_CopyReceivedDecosToPC ; Mystery Gift
+	farcall Function140ae ; time-related
 	ld a, [wSpawnAfterChampion]
 	cp SPAWN_LANCE
 	jr z, .SpawnAfterE4
@@ -416,7 +416,7 @@ PostCreditsSpawn: ; 5de7
 ; 5df0
 
 Continue_MobileAdapterMenu: ; 5df0
-	callba Mobile_AlwaysReturnNotCarry ; mobile check
+	farcall Mobile_AlwaysReturnNotCarry ; mobile check
 	ret nc
 
 ; the rest of this stuff is never reached because
@@ -433,8 +433,8 @@ Continue_MobileAdapterMenu: ; 5df0
 	ld c, 20
 	call DelayFrames
 	ld c, $1
-	callba InitMobileProfile ; mobile
-	callba _SaveData
+	farcall InitMobileProfile ; mobile
+	farcall _SaveData
 	ld a, 8
 	ld [MusicFade], a
 	ld a, MUSIC_NONE % $100
@@ -466,7 +466,7 @@ Continue_CheckRTC_RestartClock: ; 5e48
 	call CheckRTCStatus
 	and %10000000 ; Day count exceeded 16383
 	jr z, .pass
-	callba RestartClock
+	farcall RestartClock
 	ld a, c
 	and a
 	jr z, .pass
@@ -488,7 +488,7 @@ FinishContinueFunction: ; 5e5d
 	res 7, [hl]
 	ld hl, wEnteredMapFromContinue
 	set 1, [hl]
-	callba OverworldLoop
+	farcall OverworldLoop
 	ld a, [wSpawnAfterChampion]
 	cp SPAWN_RED
 	jr z, .AfterRed
@@ -671,7 +671,7 @@ Continue_DisplayGameTime: ; 5f84
 
 
 OakSpeech: ; 0x5f99
-	callba InitClock
+	farcall InitClock
 	call RotateFourPalettesLeft
 	call ClearTileMap
 
@@ -735,7 +735,7 @@ OakSpeech: ; 0x5f99
 
 	xor a
 	ld [CurPartySpecies], a
-	callba DrawIntroPlayerPic
+	farcall DrawIntroPlayerPic
 
 	ld b, SCGB_TRAINER_OR_MON_FRONTPIC_PALS
 	call GetSGBLayout
@@ -782,20 +782,20 @@ OakText7: ; 0x606f
 	db "@"
 
 NamePlayer: ; 0x6074
-	callba MovePlayerPicRight
-	callba ShowPlayerNamingChoices
+	farcall MovePlayerPicRight
+	farcall ShowPlayerNamingChoices
 	ld a, [wMenuCursorY]
 	dec a
 	jr z, .NewName
 	call StorePlayerName
-	callba ApplyMonOrTrainerPals
-	callba MovePlayerPicLeft
+	farcall ApplyMonOrTrainerPals
+	farcall MovePlayerPicLeft
 	ret
 
 .NewName:
 	ld b, 1
 	ld de, PlayerName
-	callba NamingScreen
+	farcall NamingScreen
 
 	call RotateThreePalettesRight
 	call ClearTileMap
@@ -805,7 +805,7 @@ NamePlayer: ; 0x6074
 
 	xor a
 	ld [CurPartySpecies], a
-	callba DrawIntroPlayerPic
+	farcall DrawIntroPlayerPic
 
 	ld b, SCGB_TRAINER_OR_MON_FRONTPIC_PALS
 	call GetSGBLayout
@@ -943,7 +943,7 @@ Intro_WipeInFrontpic: ; 6182
 
 Intro_PrepTrainerPic: ; 619c
 	ld de, VTiles2
-	callba GetTrainerPic
+	farcall GetTrainerPic
 	xor a
 	ld [hGraphicStartTile], a
 	hlcoord 6, 4
@@ -966,7 +966,7 @@ ShrinkFrame: ; 61b4
 
 Intro_PlacePlayerSprite: ; 61cd
 
-	callba GetPlayerIcon
+	farcall GetPlayerIcon
 	ld c, $c
 	ld hl, VTiles0
 	call Request2bpp
@@ -1012,9 +1012,9 @@ Intro_PlacePlayerSprite: ; 61cd
 
 
 CrystalIntroSequence: ; 620b
-	callab Copyright_GFPresents
+	callfar Copyright_GFPresents
 	jr c, StartTitleScreen
-	callba CrystalIntro
+	farcall CrystalIntro
 
 StartTitleScreen: ; 6219
 	ld a, [rSVBK]
@@ -1075,7 +1075,7 @@ StartTitleScreen: ; 6219
 
 
 .TitleScreen: ; 6274
-	callba _TitleScreen
+	farcall _TitleScreen
 	ret
 ; 627b
 
@@ -1084,7 +1084,7 @@ RunTitleScreen: ; 627b
 	bit 7, a
 	jr nz, .done_title
 	call TitleScreenScene
-	callba SuicuneFrameIterator
+	farcall SuicuneFrameIterator
 	call DelayFrame
 	and a
 	ret
@@ -1162,7 +1162,7 @@ TitleScreenEntrance: ; 62bc
 	dec b
 	jr nz, .loop
 
-	callba AnimateTitleCrystal
+	farcall AnimateTitleCrystal
 	ret
 
 .done
@@ -1320,12 +1320,12 @@ TitleScreenEnd: ; 6375
 ; 6389
 
 DeleteSaveData: ; 6389
-	callba _DeleteSaveData
+	farcall _DeleteSaveData
 	jp Init
 ; 6392
 
 ResetClock: ; 6392
-	callba _ResetClock
+	farcall _ResetClock
 	jp Init
 ; 639b
 
@@ -1401,7 +1401,7 @@ CopyrightString: ; 63fd
 ; 642e
 
 GameInit:: ; 642e
-	callba TryLoadSaveData
+	farcall TryLoadSaveData
 	call ClearWindowData
 	call ClearBGPalettes
 	call ClearTileMap