summaryrefslogtreecommitdiff
path: root/engine
diff options
context:
space:
mode:
Diffstat (limited to 'engine')
-rw-r--r--engine/bank3c.asm4
-rwxr-xr-xengine/overworld/hidden_objects.asm6
2 files changed, 4 insertions, 6 deletions
diff --git a/engine/bank3c.asm b/engine/bank3c.asm
index 4e5fca0a..e98153bc 100644
--- a/engine/bank3c.asm
+++ b/engine/bank3c.asm
@@ -277,10 +277,8 @@ BeachHouse_h: ; f220e (3c:620e)
dr $f220e, $f24ae
Func_f24ae: ; f24ae (3c:64ae)
dr $f24ae, $f25f8
-CheckForHiddenObject:: ; f25f8 (3c:65f8)
- dr $f25f8, $f268d
-INCLUDE "data/hidden_objects.asm"
+INCLUDE "engine/overworld/hidden_objects.asm"
Func_f2cd0:
ld d, 0
diff --git a/engine/overworld/hidden_objects.asm b/engine/overworld/hidden_objects.asm
index 15496b81..cba2a221 100755
--- a/engine/overworld/hidden_objects.asm
+++ b/engine/overworld/hidden_objects.asm
@@ -1,6 +1,6 @@
-; if a hidden object was found, stores $00 in [$ffee], else stores $ff
+; if a hidden object was found, stores $00 in [hDidntFindAnyHiddenObject], else stores $ff
CheckForHiddenObject: ; f25f8 (3c:65f8)
- ld hl, $ffeb
+ ld hl, hItemAlreadyFound
xor a
ld [hli], a
ld [hli], a
@@ -55,7 +55,7 @@ CheckForHiddenObject: ; f25f8 (3c:65f8)
ret
.noMatch
ld a, $ff
- ld [$ffee], a
+ ld [hDidntFindAnyHiddenObject], a
ret
; checks if the coordinates in front of the player's sprite match Y in b and X in c