From 0e49aef88ef94b9d3e80d89e4eb718e9425045df Mon Sep 17 00:00:00 2001 From: Rangi <35663410+Rangi42@users.noreply.github.com> Date: Wed, 7 Jan 2026 22:05:37 -0500 Subject: Use macros to enforce "hidden object" constraints, and rename them to "hidden events" (#559) --- home/hidden_objects.asm | 39 --------------------------------------- 1 file changed, 39 deletions(-) delete mode 100644 home/hidden_objects.asm (limited to 'home/hidden_objects.asm') diff --git a/home/hidden_objects.asm b/home/hidden_objects.asm deleted file mode 100644 index bb513b9d..00000000 --- a/home/hidden_objects.asm +++ /dev/null @@ -1,39 +0,0 @@ -UpdateCinnabarGymGateTileBlocks:: - farjp UpdateCinnabarGymGateTileBlocks_ - -CheckForHiddenObjectOrBookshelfOrCardKeyDoor:: - 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 [rROMB], a - ldh [hLoadedROMBank], a - call CheckForHiddenObject - ldh a, [hDidntFindAnyHiddenObject] - and a - jr nz, .hiddenObjectNotFound - ld a, [wHiddenObjectFunctionRomBank] - ld [rROMB], a - ldh [hLoadedROMBank], a - ld de, .returnAddress - push de - jp hl -.returnAddress - xor a - jr .done -.hiddenObjectNotFound - farcall PrintBookshelfText - ldh a, [hInteractedWithBookshelf] - and a - jr z, .done -.nothingFound - ld a, $ff -.done - ldh [hItemAlreadyFound], a - pop af - ld [rROMB], a - ldh [hLoadedROMBank], a - ret -- cgit v1.3.1-sl0p