aboutsummaryrefslogtreecommitdiffstats
path: root/home/hidden_objects.asm
diff options
context:
space:
mode:
authorRangi <35663410+Rangi42@users.noreply.github.com>2026-01-07 22:05:37 -0500
committerGitHub <noreply@github.com>2026-01-07 22:05:37 -0500
commit0e49aef88ef94b9d3e80d89e4eb718e9425045df (patch)
treec63433287b9e2aceda14ff977cc06875cd0735d3 /home/hidden_objects.asm
parentUse macros to enforce "missable/hide/show object" constraints, and rename the... (diff)
downloadpokeyellow-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/hidden_objects.asm')
-rw-r--r--home/hidden_objects.asm39
1 files changed, 0 insertions, 39 deletions
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