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 | |
| parent | a77999f7f151567a47dd69affe9a29378f298ff4 (diff) | |
Port two HRAM labels from pokeyellow
| -rwxr-xr-x | engine/overworld/hidden_objects.asm | 10 | ||||
| -rw-r--r-- | home.asm | 4 | ||||
| -rw-r--r-- | home/overworld.asm | 2 | ||||
| -rw-r--r-- | hram.asm | 4 |
4 files changed, 10 insertions, 10 deletions
diff --git a/engine/overworld/hidden_objects.asm b/engine/overworld/hidden_objects.asm index a19694e0..d4a0a2bd 100755 --- a/engine/overworld/hidden_objects.asm +++ b/engine/overworld/hidden_objects.asm @@ -14,14 +14,14 @@ IsPlayerOnDungeonWarp:: set 4, [hl] 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:: - ld hl, hFoundHiddenObjectOrBookshelf + ld hl, hItemAlreadyFound xor a - ld [hli], a ; [hFoundHiddenObjectOrBookshelf] + ld [hli], a ; [hItemAlreadyFound] ld [hli], a ; [hSavedMapTextPtr] ld [hli], a ; [hSavedMapTextPtr + 1] - ld [hl], a ; [hFoundHiddenObject] + ld [hl], a ; [hDidntFindAnyHiddenObject] ld de, $0 ld hl, HiddenObjectMaps .hiddenMapLoop @@ -81,7 +81,7 @@ CheckForHiddenObject:: ret .noMatch ld a, $ff - ld [hFoundHiddenObject], a + ld [hDidntFindAnyHiddenObject], a ret ; checks if the coordinates in front of the player's sprite match Y in b and X in c @@ -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 @@ -350,8 +350,8 @@ hSpriteScreenXCoord EQU $FFEC hSpriteMapYCoord EQU $FFED hSpriteMapXCoord EQU $FFEE -hFoundHiddenObjectOrBookshelf EQU $FFEB -hFoundHiddenObject EQU $FFEE +hItemAlreadyFound EQU $FFEB +hDidntFindAnyHiddenObject EQU $FFEE hSavedMapTextPtr EQU $FFEC |