diff options
| author | dannye <33dannye@gmail.com> | 2026-01-17 22:38:33 -0600 |
|---|---|---|
| committer | dannye <33dannye@gmail.com> | 2026-01-17 22:38:33 -0600 |
| commit | bc2354dd6626ce28bb9561547ed2107cfa56c18e (patch) | |
| tree | 5902d4c3389253c76b7c3351e0d7dfecb551c28d /scripts/PokemonTower7F.asm | |
| parent | Identify characters in `_OakSpeechText2B` and `Printer_GetMonStats.IDNo` (#144) (diff) | |
| parent | Use macros for `WildMonEncounterSlotChances` (#562) (diff) | |
| download | pokeyellow-bc2354dd6626ce28bb9561547ed2107cfa56c18e.tar.gz pokeyellow-bc2354dd6626ce28bb9561547ed2107cfa56c18e.tar.xz pokeyellow-bc2354dd6626ce28bb9561547ed2107cfa56c18e.zip | |
Merge branch 'master' of https://github.com/pret/pokered
Diffstat (limited to 'scripts/PokemonTower7F.asm')
| -rw-r--r-- | scripts/PokemonTower7F.asm | 28 |
1 files changed, 14 insertions, 14 deletions
diff --git a/scripts/PokemonTower7F.asm b/scripts/PokemonTower7F.asm index 3e30db56..bf7ad30d 100644 --- a/scripts/PokemonTower7F.asm +++ b/scripts/PokemonTower7F.asm @@ -57,9 +57,9 @@ PokemonTower7FScript_60d2a: ldh [hJoyHeld], a ld a, PAD_SELECT | PAD_START | PAD_CTRL_PAD ld [wJoyIgnore], a - ld a, HS_POKEMON_TOWER_7F_JESSIE + ld a, TOGGLE_POKEMON_TOWER_7F_JESSIE call PokemonTower7FScript_ShowObject - ld a, HS_POKEMON_TOWER_7F_JAMES + ld a, TOGGLE_POKEMON_TOWER_7F_JAMES call PokemonTower7FScript_ShowObject ld a, $1 ld [wDoNotWaitForButtonPressAfterDisplayingText], a @@ -201,9 +201,9 @@ PokemonTower7FScript9: ld a, PAD_BUTTONS | PAD_CTRL_PAD ld [wJoyIgnore], a call GBFadeOutToBlack - ld a, HS_POKEMON_TOWER_7F_JESSIE + ld a, TOGGLE_POKEMON_TOWER_7F_JESSIE call PokemonTower7FScript_HideObject - ld a, HS_POKEMON_TOWER_7F_JAMES + ld a, TOGGLE_POKEMON_TOWER_7F_JAMES call PokemonTower7FScript_HideObject call UpdateSprites call Delay3 @@ -223,22 +223,22 @@ PokemonTower7FScript10: ret PokemonTower7FScript_ShowObject: - ld [wMissableObjectIndex], a + ld [wToggleableObjectIndex], a predef ShowObject call UpdateSprites call Delay3 ret PokemonTower7FScript_HideObject: - ld [wMissableObjectIndex], a + ld [wToggleableObjectIndex], a predef HideObject ret PokemonTower7FWarpToMrFujiHouseScript: ld a, PAD_BUTTONS | PAD_CTRL_PAD ld [wJoyIgnore], a - ld a, HS_POKEMON_TOWER_7F_MR_FUJI - ld [wMissableObjectIndex], a + ld a, TOGGLE_POKEMON_TOWER_7F_MR_FUJI + ld [wToggleableObjectIndex], a predef HideObject ld a, SPRITE_FACING_UP ld [wSpritePlayerStateData1FacingDirection], a @@ -303,14 +303,14 @@ PokemonTower7FMrFujiText: call PrintText SetEvent EVENT_RESCUED_MR_FUJI SetEvent EVENT_RESCUED_MR_FUJI_2 - ld a, HS_MR_FUJIS_HOUSE_MR_FUJI - ld [wMissableObjectIndex], a + ld a, TOGGLE_MR_FUJIS_HOUSE_MR_FUJI + ld [wToggleableObjectIndex], a predef ShowObject - ld a, HS_SAFFRON_CITY_E - ld [wMissableObjectIndex], a + ld a, TOGGLE_SAFFRON_CITY_E + ld [wToggleableObjectIndex], a predef HideObject - ld a, HS_SAFFRON_CITY_F - ld [wMissableObjectIndex], a + ld a, TOGGLE_SAFFRON_CITY_F + ld [wToggleableObjectIndex], a predef ShowObject ld a, SCRIPT_POKEMONTOWER7F_WARP_TO_MR_FUJI_HOUSE ld [wPokemonTower7FCurScript], a |