aboutsummaryrefslogtreecommitdiffstats
path: root/home/pokemon.asm
diff options
context:
space:
mode:
authorRangi <remy.oukaour+rangi42@gmail.com>2020-07-06 21:18:22 -0400
committerRangi <remy.oukaour+rangi42@gmail.com>2020-07-06 21:18:22 -0400
commit06db7ec55bbc87ed18db72a53fb20fa7b4da9b29 (patch)
treed9631415d7640c39b8883766fa5209f92912c95c /home/pokemon.asm
parentUse ASCII quotes in comments (diff)
downloadpokeyellow-06db7ec55bbc87ed18db72a53fb20fa7b4da9b29.tar.gz
pokeyellow-06db7ec55bbc87ed18db72a53fb20fa7b4da9b29.tar.xz
pokeyellow-06db7ec55bbc87ed18db72a53fb20fa7b4da9b29.zip
callba/callab -> farcall/callfar; jpba/jpab -> farjp/jpfar
Diffstat (limited to 'home/pokemon.asm')
-rw-r--r--home/pokemon.asm6
1 files changed, 3 insertions, 3 deletions
diff --git a/home/pokemon.asm b/home/pokemon.asm
index 6c5442c4..d018843e 100644
--- a/home/pokemon.asm
+++ b/home/pokemon.asm
@@ -81,7 +81,7 @@ DrawHPBar::
; wLoadedMon = base address of pokemon data
; wMonHeader = base address of base stats
LoadMonData::
- jpab LoadMonData_
+ jpfar LoadMonData_
OverwritewMoves::
; Write c to [wMoves + b]. Unused.
@@ -277,7 +277,7 @@ HandlePartyMenuInput::
bit 1, b ; was the B button pressed?
jr z, .handleSwap ; if not, handle swapping the pokemon
.cancelSwap ; if the B button was pressed
- callba ErasePartyMenuCursors
+ farcall ErasePartyMenuCursors
xor a
ld [wMenuItemToSwap], a
ld [wPartyMenuTypeOrMessageID], a
@@ -286,7 +286,7 @@ HandlePartyMenuInput::
.handleSwap
ld a, [wCurrentMenuItem]
ld [wWhichPokemon], a
- callba SwitchPartyMon
+ farcall SwitchPartyMon
jr HandlePartyMenuInput
DrawPartyMenu::