diff options
| author | pikalaxalt <PikalaxALT@gmail.com> | 2016-05-24 20:29:57 -0400 |
|---|---|---|
| committer | pikalaxalt <PikalaxALT@gmail.com> | 2016-05-24 20:29:57 -0400 |
| commit | 39b2a1685c2d365bb8fdb976a91a43804b5f3e40 (patch) | |
| tree | 636f506a5946643c601212a49dd1bb5b7d8da5b9 | |
| parent | 1e0e17ec528f81ed698df39c9aaeddb58405ede7 (diff) | |
Replace hidden object file include in bank 3c
| -rw-r--r-- | engine/bank3c.asm | 4 | ||||
| -rwxr-xr-x | engine/overworld/hidden_objects.asm | 6 | ||||
| -rw-r--r-- | hram.asm | 2 |
3 files changed, 6 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 @@ -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 |