thorn/kep-hack
1
0
Fork 0
mirror of https://github.com/thornAvery/kep-hack.git synced 2025-11-11 15:54:49 +13:00
Code Issues Actions Packages Projects Releases Wiki Activity

Port two HRAM labels from pokeyellow

Browse source
This commit is contained in:
Rangi 2020-07-05 16:35:06 -04:00
parent a77999f7f1
commit b0aa4cb14a
4 changed files with 10 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
engine/overworld/hidden_objects.asm
View file

@ -14,14 +14,14 @@ IsPlayerOnDungeonWarp::
set 4, [hl] set 4, [hl]
ret ret
; if a hidden object was found, stores $00 in [hFoundHiddenObject], else stores $ff ; if a hidden object was found, stores $00 in [hDidntFindAnyHiddenObject], else stores $ff
CheckForHiddenObject:: CheckForHiddenObject::
ld hl, hFoundHiddenObjectOrBookshelf ld hl, hItemAlreadyFound
xor a xor a
ld [hli], a ; [hFoundHiddenObjectOrBookshelf] ld [hli], a ; [hItemAlreadyFound]
ld [hli], a ; [hSavedMapTextPtr] ld [hli], a ; [hSavedMapTextPtr]
ld [hli], a ; [hSavedMapTextPtr + 1] ld [hli], a ; [hSavedMapTextPtr + 1]
ld [hl], a ; [hFoundHiddenObject] ld [hl], a ; [hDidntFindAnyHiddenObject]
ld de, $0 ld de, $0
ld hl, HiddenObjectMaps ld hl, HiddenObjectMaps
.hiddenMapLoop .hiddenMapLoop
@ -81,7 +81,7 @@ CheckForHiddenObject::
ret ret
.noMatch .noMatch
ld a, $ff ld a, $ff
ld [hFoundHiddenObject], a ld [hDidntFindAnyHiddenObject], a
ret ret
; checks if the coordinates in front of the player's sprite match Y in b and X in c ; checks if the coordinates in front of the player's sprite match Y in b and X in c

4
home.asm
View file

@ -1752,7 +1752,7 @@ CheckForHiddenObjectOrBookshelfOrCardKeyDoor::
ld [MBC1RomBank], a ld [MBC1RomBank], a
ld [hLoadedROMBank], a ld [hLoadedROMBank], a
call CheckForHiddenObject call CheckForHiddenObject
ld a, [hFoundHiddenObject] ld a, [hDidntFindAnyHiddenObject]
and a and a
jr nz, .hiddenObjectNotFound jr nz, .hiddenObjectNotFound
ld a, [wHiddenObjectFunctionRomBank] ld a, [wHiddenObjectFunctionRomBank]
@ -1772,7 +1772,7 @@ CheckForHiddenObjectOrBookshelfOrCardKeyDoor::
.nothingFound .nothingFound
ld a, $ff ld a, $ff
.done .done
ld [hFoundHiddenObjectOrBookshelf], a ld [hItemAlreadyFound], a
pop af pop af
ld [MBC1RomBank], a ld [MBC1RomBank], a
ld [hLoadedROMBank], a ld [hLoadedROMBank], a

2
home/overworld.asm
View file

@ -88,7 +88,7 @@ OverworldLoopLessDelay::
call IsPlayerCharacterBeingControlledByGame call IsPlayerCharacterBeingControlledByGame
jr nz, .checkForOpponent jr nz, .checkForOpponent
call CheckForHiddenObjectOrBookshelfOrCardKeyDoor call CheckForHiddenObjectOrBookshelfOrCardKeyDoor
ld a, [hFoundHiddenObjectOrBookshelf] ld a, [hItemAlreadyFound]
and a and a
jp z, OverworldLoop ; jump if a hidden object or bookshelf was found, but not if a card key door was found jp z, OverworldLoop ; jump if a hidden object or bookshelf was found, but not if a card key door was found
call IsSpriteOrSignInFrontOfPlayer call IsSpriteOrSignInFrontOfPlayer

4
hram.asm
View file

@ -350,8 +350,8 @@ hSpriteScreenXCoord EQU $FFEC
hSpriteMapYCoord EQU $FFED hSpriteMapYCoord EQU $FFED
hSpriteMapXCoord EQU $FFEE hSpriteMapXCoord EQU $FFEE
hFoundHiddenObjectOrBookshelf EQU $FFEB hItemAlreadyFound EQU $FFEB
hFoundHiddenObject EQU $FFEE hDidntFindAnyHiddenObject EQU $FFEE
hSavedMapTextPtr EQU $FFEC hSavedMapTextPtr EQU $FFEC