diff options
| author | Rangi <35663410+Rangi42@users.noreply.github.com> | 2026-01-07 22:05:37 -0500 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2026-01-07 22:05:37 -0500 |
| commit | 0e49aef88ef94b9d3e80d89e4eb718e9425045df (patch) | |
| tree | c63433287b9e2aceda14ff977cc06875cd0735d3 /home | |
| parent | Use macros to enforce "missable/hide/show object" constraints, and rename the... (diff) | |
| download | pokeyellow-0e49aef88ef94b9d3e80d89e4eb718e9425045df.tar.gz pokeyellow-0e49aef88ef94b9d3e80d89e4eb718e9425045df.tar.xz pokeyellow-0e49aef88ef94b9d3e80d89e4eb718e9425045df.zip | |
Use macros to enforce "hidden object" constraints, and rename them to "hidden events" (#559)
Diffstat (limited to 'home')
| -rw-r--r-- | home/hidden_events.asm (renamed from home/hidden_objects.asm) | 14 | ||||
| -rw-r--r-- | home/overworld.asm | 4 |
2 files changed, 9 insertions, 9 deletions
diff --git a/home/hidden_objects.asm b/home/hidden_events.asm index bb513b9d..5acc95d9 100644 --- a/home/hidden_objects.asm +++ b/home/hidden_events.asm @@ -1,21 +1,21 @@ UpdateCinnabarGymGateTileBlocks:: farjp UpdateCinnabarGymGateTileBlocks_ -CheckForHiddenObjectOrBookshelfOrCardKeyDoor:: +CheckForHiddenEventOrBookshelfOrCardKeyDoor:: ldh a, [hLoadedROMBank] push af ldh a, [hJoyHeld] bit B_PAD_A, a jr z, .nothingFound ; A button is pressed - ld a, BANK(CheckForHiddenObject) + ld a, BANK(CheckForHiddenEvent) ld [rROMB], a ldh [hLoadedROMBank], a - call CheckForHiddenObject - ldh a, [hDidntFindAnyHiddenObject] + call CheckForHiddenEvent + ldh a, [hDidntFindAnyHiddenEvent] and a - jr nz, .hiddenObjectNotFound - ld a, [wHiddenObjectFunctionRomBank] + jr nz, .hiddenEventNotFound + ld a, [wHiddenEventFunctionRomBank] ld [rROMB], a ldh [hLoadedROMBank], a ld de, .returnAddress @@ -24,7 +24,7 @@ CheckForHiddenObjectOrBookshelfOrCardKeyDoor:: .returnAddress xor a jr .done -.hiddenObjectNotFound +.hiddenEventNotFound farcall PrintBookshelfText ldh a, [hInteractedWithBookshelf] and a diff --git a/home/overworld.asm b/home/overworld.asm index 58550167..a06a32da 100644 --- a/home/overworld.asm +++ b/home/overworld.asm @@ -87,10 +87,10 @@ OverworldLoopLessDelay:: jp nz, .noDirectionButtonsPressed call IsPlayerCharacterBeingControlledByGame jr nz, .checkForOpponent - call CheckForHiddenObjectOrBookshelfOrCardKeyDoor + call CheckForHiddenEventOrBookshelfOrCardKeyDoor ldh 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 + jp z, OverworldLoop ; jump if a hidden event or bookshelf was found, but not if a card key door was found call IsSpriteOrSignInFrontOfPlayer ldh a, [hTextID] and a |