diff options
| author | Rangi <remy.oukaour+rangi42@gmail.com> | 2020-07-05 16:35:06 -0400 |
|---|---|---|
| committer | Rangi <remy.oukaour+rangi42@gmail.com> | 2020-07-05 16:35:06 -0400 |
| commit | b0aa4cb14a602bc2acf15bc0f2591a94a30487a2 (patch) | |
| tree | 03188fdf760c09cf85fdb65b957ed2d90ff550e6 /home | |
| parent | Logical spacing in data/sgb/sgb_palettes.asm (diff) | |
| download | pokeyellow-b0aa4cb14a602bc2acf15bc0f2591a94a30487a2.tar.gz pokeyellow-b0aa4cb14a602bc2acf15bc0f2591a94a30487a2.tar.xz pokeyellow-b0aa4cb14a602bc2acf15bc0f2591a94a30487a2.zip | |
Port two HRAM labels from pokeyellow
Diffstat (limited to '')
| -rw-r--r-- | home.asm | 4 | ||||
| -rw-r--r-- | home/overworld.asm | 2 |
2 files changed, 3 insertions, 3 deletions
@@ -1752,7 +1752,7 @@ CheckForHiddenObjectOrBookshelfOrCardKeyDoor:: ld [MBC1RomBank], a ld [hLoadedROMBank], a call CheckForHiddenObject - ld a, [hFoundHiddenObject] + ld a, [hDidntFindAnyHiddenObject] and a jr nz, .hiddenObjectNotFound ld a, [wHiddenObjectFunctionRomBank] @@ -1772,7 +1772,7 @@ CheckForHiddenObjectOrBookshelfOrCardKeyDoor:: .nothingFound ld a, $ff .done - ld [hFoundHiddenObjectOrBookshelf], a + ld [hItemAlreadyFound], a pop af ld [MBC1RomBank], a ld [hLoadedROMBank], a diff --git a/home/overworld.asm b/home/overworld.asm index c16c121c..b17208c7 100644 --- a/home/overworld.asm +++ b/home/overworld.asm @@ -88,7 +88,7 @@ OverworldLoopLessDelay:: call IsPlayerCharacterBeingControlledByGame jr nz, .checkForOpponent call CheckForHiddenObjectOrBookshelfOrCardKeyDoor - ld a, [hFoundHiddenObjectOrBookshelf] + ld a, [hItemAlreadyFound] and a jp z, OverworldLoop ; jump if a hidden object or bookshelf was found, but not if a card key door was found call IsSpriteOrSignInFrontOfPlayer |