Replace hidden object file include in bank 3c

This commit is contained in:
pikalaxalt
2016-05-24 20:29:57 -04:00
parent 1e0e17ec52
commit 39b2a1685c
3 changed files with 6 additions and 6 deletions

View File

@@ -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

View File

@@ -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

View File

@@ -311,6 +311,8 @@ hSpriteAnimFrameCounter EQU $FFEA
hItemAlreadyFound EQU $FFEB
hDidntFindAnyHiddenObject EQU $FFEE
H_WHOSETURN EQU $FFF3 ; 0 on player’s turn, 1 on enemy’s turn
hLCDCPointer EQU $FFF4