mirror of
https://github.com/pret/pokered.git
synced 2026-09-30 13:08:16 -05:00
Port two HRAM labels from pokeyellow
This commit is contained in:
@@ -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
|
||||
|
||||
4
home.asm
4
home.asm
@@ -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
|
||||
|
||||
@@ -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
|
||||
|
||||
Reference in New Issue
Block a user