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

@@ -20,7 +20,7 @@ PokeGear: ; 90b8d (24:4b8d)
bit 7, a
jr nz, .done
call PokegearJumptable
callba PlaySpriteAnimations
farcall PlaySpriteAnimations
call DelayFrame
jr .loop
@@ -55,7 +55,7 @@ PokeGear: ; 90b8d (24:4b8d)
ld a, $7
ld [hWX], a
call Pokegear_LoadGFX
callba ClearSpriteAnims
farcall ClearSpriteAnims
call InitPokegearModeIndicatorArrow
ld a, 8
call SkipMusic
@@ -106,7 +106,7 @@ Pokegear_LoadGFX: ; 90c4e
call GetWorldMapLocation
cp FAST_SHIP
jr z, .ssaqua
callba GetPlayerIcon
farcall GetPlayerIcon
push de
ld h, d
ld l, e
@@ -239,7 +239,7 @@ InitPokegearTilemap: ; 90da8 (24:4da8)
.return_from_jumptable
call Pokegear_FinishTilemap
callba TownMapPals
farcall TownMapPals
ld a, [wcf65]
and a
jr nz, .kanto_0
@@ -319,7 +319,7 @@ InitPokegearTilemap: ; 90da8 (24:4da8)
.kanto
ld e, 1
.ok
callba PokegearMap
farcall PokegearMap
ld a, $7
ld bc, $12
hlcoord 1, 2
@@ -513,7 +513,7 @@ Pokegear_UpdateClock: ; 90f86 (24:4f86)
ld a, [hMinutes]
ld c, a
decoord 6, 8
callba PrintHoursMins
farcall PrintHoursMins
ld hl, .DayText
bccoord 6, 6
call PlaceHLTextAtBC
@@ -670,7 +670,7 @@ PokegearMap_InitPlayerIcon: ; 9106a
pop af
ld e, a
push bc
callba GetLandmarkCoords
farcall GetLandmarkCoords
pop bc
ld hl, SPRITEANIMSTRUCT_XCOORD
add hl, bc
@@ -709,9 +709,9 @@ PokegearMap_UpdateLandmarkName: ; 910b4
pop af
ld e, a
push de
callba GetLandmarkName
farcall GetLandmarkName
pop de
callba TownMap_ConvertLineBreakCharacters
farcall TownMap_ConvertLineBreakCharacters
hlcoord 8, 0
ld [hl], $34
ret
@@ -721,7 +721,7 @@ PokegearMap_UpdateLandmarkName: ; 910b4
PokegearMap_UpdateCursorPosition: ; 910d4
push bc
ld e, a
callba GetLandmarkCoords
farcall GetLandmarkCoords
pop bc
ld hl, SPRITEANIMSTRUCT_XCOORD
add hl, bc
@@ -929,7 +929,7 @@ PokegearPhone_MakePhoneCall: ; 911eb (24:51eb)
ret
.no_service
callba Phone_NoSignal
farcall Phone_NoSignal
ld hl, .OutOfServiceArea
call PrintText
ld a, $8
@@ -958,7 +958,7 @@ PokegearPhone_FinishPhoneCall: ; 91256 (24:5256)
ld a, [hJoyPressed]
and A_BUTTON | B_BUTTON
ret z
callba HangUp
farcall HangUp
ld a, $8
ld [wJumptableIndex], a
ld hl, PokegearText_WhomToCall
@@ -1121,7 +1121,7 @@ PokegearPhoneContactSubmenu: ; 91342 (24:5342)
ld d, 0
add hl, de
ld c, [hl]
callba CheckCanDeletePhoneNumber
farcall CheckCanDeletePhoneNumber
ld a, c
and a
jr z, .cant_delete
@@ -1849,7 +1849,7 @@ _TownMap: ; 9191c
call ClearSprites
call DisableLCD
call Pokegear_LoadGFX
callba ClearSpriteAnims
farcall ClearSpriteAnims
ld a, 8
call SkipMusic
ld a, $e3
@@ -1919,7 +1919,7 @@ _TownMap: ; 9191c
jr nz, .pressed_down
.loop2
push de
callba PlaySpriteAnimations
farcall PlaySpriteAnimations
pop de
call DelayFrame
jr .loop
@@ -1973,7 +1973,7 @@ _TownMap: ; 9191c
.kanto2
ld e, $1
.okay_tilemap
callba PokegearMap
farcall PokegearMap
ld a, $7
ld bc, 6
hlcoord 1, 0
@@ -1994,7 +1994,7 @@ _TownMap: ; 9191c
ld [hl], $17
ld a, [wTownMapCursorLandmark]
call PokegearMap_UpdateLandmarkName
callba TownMapPals
farcall TownMapPals
ret
; 91a53
@@ -2116,7 +2116,7 @@ _FlyMap: ; 91af3
ld [hl], $1
xor a
ld [hBGMapMode], a
callba ClearSpriteAnims
farcall ClearSpriteAnims
call LoadTownMapGFX
ld de, FlyMapLabelBorderGFX
ld hl, VTiles2 tile $30
@@ -2138,7 +2138,7 @@ _FlyMap: ; 91af3
jr nz, .pressedA
call FlyMapScroll
call GetMapCursorCoordinates
callba PlaySpriteAnimations
farcall PlaySpriteAnimations
call DelayFrame
jr .loop
@@ -2276,7 +2276,7 @@ TownMapBubble: ; 91bb5
ld de, Flypoints
add hl, de
ld e, [hl]
callba GetLandmarkName
farcall GetLandmarkName
hlcoord 2, 1
ld de, StringBuffer1
call PlaceString
@@ -2292,7 +2292,7 @@ GetMapCursorCoordinates: ; 91c17
ld de, Flypoints
add hl, de
ld e, [hl]
callba GetLandmarkCoords
farcall GetLandmarkCoords
ld a, [wTownMapCursorCoordinates]
ld c, a
ld a, [wTownMapCursorCoordinates + 1]
@@ -2595,7 +2595,7 @@ _Area: ; 91d11
.GetAndPlaceNest: ; 91e1e
ld [wTownMapCursorLandmark], a
ld e, a
callba FindNest ; load nest landmarks into TileMap[0,0]
farcall FindNest ; load nest landmarks into TileMap[0,0]
decoord 0, 0
ld hl, Sprites
.nestloop
@@ -2605,7 +2605,7 @@ _Area: ; 91d11
push de
ld e, a
push hl
callba GetLandmarkCoords
farcall GetLandmarkCoords
pop hl
; load into OAM
ld a, d
@@ -2637,7 +2637,7 @@ _Area: ; 91d11
ret c
ld a, [wTownMapPlayerIconLandmark]
ld e, a
callba GetLandmarkCoords
farcall GetLandmarkCoords
ld c, e
ld b, d
ld de, .PlayerOAM
@@ -2723,7 +2723,7 @@ _Area: ; 91d11
ld a, [wTownMapPlayerIconLandmark]
cp FAST_SHIP
jr z, .FastShip
callba GetPlayerIcon
farcall GetPlayerIcon
ret
.FastShip:
@@ -2851,7 +2851,7 @@ TownMapMon: ; 91f7b
ld [wd265], a
; Get FlyMon icon
ld e, 8 ; starting tile in VRAM
callba GetSpeciesIcon
farcall GetSpeciesIcon
; Animation/palette
depixel 0, 0
ld a, SPRITE_ANIM_INDEX_PARTY_MON
@@ -2869,7 +2869,7 @@ TownMapMon: ; 91f7b
TownMapPlayerIcon: ; 91fa6
; Draw the player icon at town map location in a
push af
callba GetPlayerIcon
farcall GetPlayerIcon
; Standing icon
ld hl, VTiles0 tile $10
ld c, 4 ; # tiles
@@ -2899,7 +2899,7 @@ TownMapPlayerIcon: ; 91fa6
pop af
ld e, a
push bc
callba GetLandmarkCoords
farcall GetLandmarkCoords
pop bc
ld hl, SPRITEANIMSTRUCT_XCOORD
add hl, bc
@@ -2945,7 +2945,7 @@ INCBIN "gfx/pokegear/flymap_label_border.1bpp"
ld [hl], $1
xor a
ld [hBGMapMode], a
callba ClearSpriteAnims
farcall ClearSpriteAnims
call LoadTownMapGFX
ld de, FlyMapLabelBorderGFX
ld hl, VTiles2 tile $30
@@ -2980,7 +2980,7 @@ INCBIN "gfx/pokegear/flymap_label_border.1bpp"
jr nz, .pressedA
call .HandleDPad
call GetMapCursorCoordinates
callba PlaySpriteAnimations
farcall PlaySpriteAnimations
call DelayFrame
jr .loop