callba/callab -> farcall/callfar; jpba/jpab -> farjp/jpfar

This commit is contained in:
Rangi 2020-07-06 21:18:22 -04:00
parent 77ed5f3820
commit 06db7ec55b
90 changed files with 251 additions and 253 deletions

View file

@ -1,5 +1,5 @@
HallOfFamePC:
callba AnimateHallOfFame
farcall AnimateHallOfFame
call ClearScreen
ld c, 100
call DelayFrames
@ -235,7 +235,7 @@ Credits:
jr .nextCreditsScreen
.showCopyrightText
push de
callba LoadCopyrightTiles
farcall LoadCopyrightTiles
pop de
pop de
jr .nextCreditsCommand

View file

@ -311,7 +311,7 @@ LoadIntroGraphics:
PlayShootingStar:
ld b, SET_PAL_GAME_FREAK_INTRO
call RunPaletteCommand
callba LoadCopyrightAndTextBoxTiles
farcall LoadCopyrightAndTextBoxTiles
ldPal a, BLACK, DARK_GRAY, LIGHT_GRAY, WHITE
ldh [rBGP], a
ld c, 180
@ -328,7 +328,7 @@ PlayShootingStar:
set 3, [hl]
ld c, 64
call DelayFrames
callba AnimateShootingStar
farcall AnimateShootingStar
push af
pop af
jr c, .next ; skip the delay if the user interrupted the animation

View file

@ -15,7 +15,7 @@ DoClearSaveDialogue:
ld a, [wCurrentMenuItem]
and a
jp z, Init
callba ClearSAV
farcall ClearSAV
jp Init
ClearSaveDataText:

View file

@ -226,7 +226,7 @@ ENDC
ld c, 1
call CheckForUserInterruption
jr c, .finishedWaiting
callba TitleScreenAnimateBallIfStarterOut
farcall TitleScreenAnimateBallIfStarterOut
call TitleScreenPickNewMon
jr .awaitUserInterruptionLoop
@ -255,7 +255,7 @@ ENDC
jp MainMenu
.doClearSaveDialogue
jpba DoClearSaveDialogue
farjp DoClearSaveDialogue
TitleScreenPickNewMon:
ld a, vBGMap0 / $100
@ -282,12 +282,12 @@ TitleScreenPickNewMon:
ld a, $90
ldh [hWY], a
ld d, 1 ; scroll out
callba TitleScroll
farcall TitleScroll
ret
TitleScreenScrollInMon:
ld d, 0 ; scroll in
callba TitleScroll
farcall TitleScroll
xor a
ldh [hWY], a
ret

View file

@ -199,7 +199,7 @@ LoadTradingGFXAndMonNames:
Trade_LoadMonPartySpriteGfx:
ld a, %11010000
ldh [rOBP1], a
jpba LoadMonPartySpriteGfx
farjp LoadMonPartySpriteGfx
Trade_SwapNames:
ld hl, wPlayerName
@ -615,7 +615,7 @@ Trade_AnimCircledMon:
ret
Trade_WriteCircledMonOAM:
callba WriteMonPartySpriteOAMBySpecies
farcall WriteMonPartySpriteOAMBySpecies
call Trade_WriteCircleOAM
Trade_AddOffsetsToOAMCoords: