summaryrefslogtreecommitdiff
path: root/engine/pokemon
diff options
context:
space:
mode:
authorRangi <remy.oukaour+rangi42@gmail.com>2021-01-09 15:16:05 -0500
committerRangi <remy.oukaour+rangi42@gmail.com>2021-01-09 15:16:05 -0500
commit7d3ea88611efbc2f9b903063e2816b1cae1bad35 (patch)
tree7475d498e4a1695aefd4a7e3356e735a51245d35 /engine/pokemon
parentf773fd1dd89782eb1e92b850c7409a8d8be37651 (diff)
Rename GetFarHalfword to GetFarWord
Fixes #796
Diffstat (limited to 'engine/pokemon')
-rw-r--r--engine/pokemon/breeding.asm4
-rw-r--r--engine/pokemon/move_mon.asm4
2 files changed, 4 insertions, 4 deletions
diff --git a/engine/pokemon/breeding.asm b/engine/pokemon/breeding.asm
index d6ffde4fd..bcf5322e2 100644
--- a/engine/pokemon/breeding.asm
+++ b/engine/pokemon/breeding.asm
@@ -428,7 +428,7 @@ GetEggMove:
add hl, bc
add hl, bc
ld a, BANK(EggMovePointers)
- call GetFarHalfword
+ call GetFarWord
.loop
ld a, BANK("Egg Moves")
call GetFarByte
@@ -462,7 +462,7 @@ GetEggMove:
add hl, bc
add hl, bc
ld a, BANK(EvosAttacksPointers)
- call GetFarHalfword
+ call GetFarWord
.loop3
ld a, BANK("Evolutions and Attacks")
call GetFarByte
diff --git a/engine/pokemon/move_mon.asm b/engine/pokemon/move_mon.asm
index fd01ba375..e51bbfe0a 100644
--- a/engine/pokemon/move_mon.asm
+++ b/engine/pokemon/move_mon.asm
@@ -1687,7 +1687,7 @@ GivePoke::
push bc
push hl
ld a, [wScriptBank]
- call GetFarHalfword
+ call GetFarWord
ld bc, MON_NAME_LENGTH
ld a, [wScriptBank]
call FarCopyBytes
@@ -1695,7 +1695,7 @@ GivePoke::
inc hl
inc hl
ld a, [wScriptBank]
- call GetFarHalfword
+ call GetFarWord
pop bc
ld a, b
and a