diff options
| author | Rangi <35663410+Rangi42@users.noreply.github.com> | 2026-01-07 22:05:20 -0500 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2026-01-07 22:05:20 -0500 |
| commit | fe1e76466b293c83e6cd3a7d4639fb3c49da26ad (patch) | |
| tree | aba22f9f595e09024b902c08ddfdac67ee0e85f3 /scripts/BillsHouse.asm | |
| parent | Update RGBDS to 1.0.1 (although 1.0.0 still works) (diff) | |
| download | pokeyellow-fe1e76466b293c83e6cd3a7d4639fb3c49da26ad.tar.gz pokeyellow-fe1e76466b293c83e6cd3a7d4639fb3c49da26ad.tar.xz pokeyellow-fe1e76466b293c83e6cd3a7d4639fb3c49da26ad.zip | |
Use macros to enforce "missable/hide/show object" constraints, and rename them to "toggleable objects" (#557)
Diffstat (limited to 'scripts/BillsHouse.asm')
| -rw-r--r-- | scripts/BillsHouse.asm | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/scripts/BillsHouse.asm b/scripts/BillsHouse.asm index d43ae546..8ecebd20 100644 --- a/scripts/BillsHouse.asm +++ b/scripts/BillsHouse.asm @@ -49,8 +49,8 @@ BillsHousePokemonEntersMachineScript: ld a, [wStatusFlags5] bit BIT_SCRIPTED_NPC_MOVEMENT, a ret nz - ld a, HS_BILL_POKEMON - ld [wMissableObjectIndex], a + ld a, TOGGLE_BILL_POKEMON + ld [wToggleableObjectIndex], a predef HideObject SetEvent EVENT_BILL_SAID_USE_CELL_SEPARATOR xor a @@ -75,8 +75,8 @@ BillsHouseBillExitsMachineScript: ld a, 5 ldh [hSpriteMapXCoord], a call SetSpritePosition1 - ld a, HS_BILL_1 - ld [wMissableObjectIndex], a + ld a, TOGGLE_BILL_1 + ld [wToggleableObjectIndex], a predef ShowObject ld c, 8 call DelayFrames @@ -171,11 +171,11 @@ BillsHouseBillSSTicketText: ld hl, .SSTicketReceivedText call PrintText SetEvent EVENT_GOT_SS_TICKET - ld a, HS_CERULEAN_GUARD_1 - ld [wMissableObjectIndex], a + ld a, TOGGLE_CERULEAN_GUARD_1 + ld [wToggleableObjectIndex], a predef ShowObject - ld a, HS_CERULEAN_GUARD_2 - ld [wMissableObjectIndex], a + ld a, TOGGLE_CERULEAN_GUARD_2 + ld [wToggleableObjectIndex], a predef HideObject .got_ss_ticket ld hl, .WhyDontYouGoInsteadOfMeText |