summaryrefslogtreecommitdiff
path: root/engine/overworld
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/overworld
parentf773fd1dd89782eb1e92b850c7409a8d8be37651 (diff)
Rename GetFarHalfword to GetFarWord
Fixes #796
Diffstat (limited to 'engine/overworld')
-rw-r--r--engine/overworld/events.asm6
-rw-r--r--engine/overworld/scripting.asm2
-rw-r--r--engine/overworld/wildmons.asm2
3 files changed, 5 insertions, 5 deletions
diff --git a/engine/overworld/events.asm b/engine/overworld/events.asm
index c0a77ed20..257e75a15 100644
--- a/engine/overworld/events.asm
+++ b/engine/overworld/events.asm
@@ -422,7 +422,7 @@ rept SCENE_SCRIPT_SIZE
endr
call GetMapScriptsBank
- call GetFarHalfword
+ call GetFarWord
call GetMapScriptsBank
call CallScript
@@ -722,7 +722,7 @@ TryBGEvent:
inc hl
inc hl
call GetMapScriptsBank
- call GetFarHalfword
+ call GetFarWord
call GetMapScriptsBank
call CallScript
scf
@@ -739,7 +739,7 @@ CheckBGEventFlag:
ld l, a
push hl
call GetMapScriptsBank
- call GetFarHalfword
+ call GetFarWord
ld e, l
ld d, h
ld b, CHECK_FLAG
diff --git a/engine/overworld/scripting.asm b/engine/overworld/scripting.asm
index ca2306aee..0470247d4 100644
--- a/engine/overworld/scripting.asm
+++ b/engine/overworld/scripting.asm
@@ -1369,7 +1369,7 @@ StdScript:
ld b, a
inc hl
ld a, BANK(StdScripts)
- call GetFarHalfword
+ call GetFarWord
ret
SkipTwoScriptBytes:
diff --git a/engine/overworld/wildmons.asm b/engine/overworld/wildmons.asm
index ed103bfc3..33146fbaa 100644
--- a/engine/overworld/wildmons.asm
+++ b/engine/overworld/wildmons.asm
@@ -889,7 +889,7 @@ RandomPhoneMon:
add hl, bc
add hl, bc
ld a, BANK(TrainerGroups)
- call GetFarHalfword
+ call GetFarWord
.skip_trainer
dec e