summaryrefslogtreecommitdiff
path: root/engine/namingscreen.asm
diff options
context:
space:
mode:
authorRemy Oukaour <remy.oukaour@gmail.com>2017-12-24 12:47:30 -0500
committerRemy Oukaour <remy.oukaour@gmail.com>2017-12-24 12:47:30 -0500
commitc66d195089b1e1b823be4f0a0fc9b8f41f5f790d (patch)
tree47869a9d9ed7f5c2c8a8974b5a46a35e65ffef6a /engine/namingscreen.asm
parentd787c66374df60fceb34fa5860c34bf56e476cbe (diff)
callba/callab → farcall/callfar
Diffstat (limited to 'engine/namingscreen.asm')
-rwxr-xr-xengine/namingscreen.asm14
1 files changed, 7 insertions, 7 deletions
diff --git a/engine/namingscreen.asm b/engine/namingscreen.asm
index 0bc613709..484bbe753 100755
--- a/engine/namingscreen.asm
+++ b/engine/namingscreen.asm
@@ -103,7 +103,7 @@ NamingScreen: ; 116c1
inc de
hlcoord 5, 4
call PlaceString
- callba GetGender
+ farcall GetGender
jr c, .genderless
ld a, "♂"
jr nz, .place_gender
@@ -124,7 +124,7 @@ NamingScreen: ; 116c1
; 1178d
.Player: ; 1178d (4:578d)
- callba GetPlayerIcon
+ farcall GetPlayerIcon
call .LoadSprite
hlcoord 5, 2
ld de, .PlayerNameString
@@ -352,14 +352,14 @@ NamingScreenJoypadLoop: ; 11915
bit 7, a
jr nz, .quit
call .RunJumptable
- callba PlaySpriteAnimationsAndDelayFrame
+ farcall PlaySpriteAnimationsAndDelayFrame
call .UpdateStringEntry
call DelayFrame
and a
ret
.quit
- callab ClearSpriteAnims
+ callfar ClearSpriteAnims
call ClearSprites
xor a
ld [hSCX], a
@@ -900,7 +900,7 @@ NamingScreen_GetLastCharacter: ; 11c11 (4:5c11)
LoadNamingScreenGFX: ; 11c51
call ClearSprites
- callab ClearSpriteAnims
+ callfar ClearSpriteAnims
call LoadStandardFont
call LoadFontsExtra
@@ -1096,14 +1096,14 @@ INCBIN "gfx/icon/mail2.2bpp"
bit 7, a
jr nz, .exit_mail
call .DoJumptable
- callba PlaySpriteAnimationsAndDelayFrame
+ farcall PlaySpriteAnimationsAndDelayFrame
call .Update
call DelayFrame
and a
ret
.exit_mail
- callab ClearSpriteAnims
+ callfar ClearSpriteAnims
call ClearSprites
xor a
ld [hSCX], a