diff options
| author | dannye <33dannye@gmail.com> | 2023-11-20 00:33:27 -0600 |
|---|---|---|
| committer | dannye <33dannye@gmail.com> | 2023-11-20 20:23:27 -0600 |
| commit | 298e99d3776580585c3f434e5d93137ae431bdd3 (patch) | |
| tree | a808c4ffd0fd0f9bd28972bae5236e0d3345c8e5 /scripts/SilphCo11F_2.asm | |
| parent | Add sound bits documentation for wOptions (#110) (diff) | |
| parent | Name 2 unnamed labels I missed in SeafoamIslandsB4F and PokemonMansion3F (#437) (diff) | |
| download | pokeyellow-298e99d3776580585c3f434e5d93137ae431bdd3.tar.gz pokeyellow-298e99d3776580585c3f434e5d93137ae431bdd3.tar.xz pokeyellow-298e99d3776580585c3f434e5d93137ae431bdd3.zip | |
Merge branch 'master' of https://github.com/pret/pokered
Diffstat (limited to 'scripts/SilphCo11F_2.asm')
| -rw-r--r-- | scripts/SilphCo11F_2.asm | 33 |
1 files changed, 16 insertions, 17 deletions
diff --git a/scripts/SilphCo11F_2.asm b/scripts/SilphCo11F_2.asm index 658e79eb..fbc5bb1b 100644 --- a/scripts/SilphCo11F_2.asm +++ b/scripts/SilphCo11F_2.asm @@ -1,37 +1,36 @@ -SaffronCityHideRocketsShowCitizens:: - ld hl, SaffronCityRockets -.hideLoop +SilphCo11FTeamRocketLeavesScript:: + ld hl, .HideMissableObjectIDs +.hide_loop ld a, [hli] - cp $ff ; have we run out of rockets to hide? - jr z, .showCitizens ; if so, start showing the citizens + cp $ff + jr z, .done_hiding push hl ld [wMissableObjectIndex], a predef HideObject pop hl - jr .hideLoop - -.showCitizens - ld hl, SaffronCityCitizens -.showLoop + jr .hide_loop +.done_hiding + ld hl, .ShowMissableObjectIDs +.show_loop ld a, [hli] - cp $ff ; have we run out of citizens to show? - ret z ; if so, we're done here + cp -1 + ret z push hl ld [wMissableObjectIndex], a predef ShowObject pop hl - jr .showLoop + jr .show_loop -SaffronCityCitizens: +.ShowMissableObjectIDs: db HS_SAFFRON_CITY_8 db HS_SAFFRON_CITY_9 db HS_SAFFRON_CITY_A db HS_SAFFRON_CITY_B db HS_SAFFRON_CITY_C db HS_SAFFRON_CITY_D - db $FF + db -1 ; end -SaffronCityRockets: +.HideMissableObjectIDs: db HS_SAFFRON_CITY_1 db HS_SAFFRON_CITY_2 db HS_SAFFRON_CITY_3 @@ -73,4 +72,4 @@ SaffronCityRockets: db HS_SILPH_CO_11F_JAMES db HS_SILPH_CO_11F_2 db HS_SILPH_CO_11F_JESSIE - db $ff + db -1 ; end |