diff options
| author | UserWest <WestofMystic@gmail.com> | 2021-11-05 20:38:01 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-11-05 20:38:01 -0400 |
| commit | 40b07c571e9a19edbc7201fc6b4ad466827ef071 (patch) | |
| tree | e336d9fb6b3da002e755fe058f82563aef171444 | |
| parent | 70baa4f3e80bceedd00cafbbab219665eb189225 (diff) | |
Label Saffron City hide/show function (#73)
Co-authored-by: Rangi <35663410+Rangi42@users.noreply.github.com>
| -rw-r--r-- | scripts/SilphCo11F.asm | 2 | ||||
| -rw-r--r-- | scripts/SilphCo11F_2.asm | 28 |
2 files changed, 15 insertions, 15 deletions
diff --git a/scripts/SilphCo11F.asm b/scripts/SilphCo11F.asm index 63c236ee..dfbf5951 100644 --- a/scripts/SilphCo11F.asm +++ b/scripts/SilphCo11F.asm @@ -171,7 +171,7 @@ SilphCo11Script3: ldh [hSpriteIndexOrTextID], a call DisplayTextID call GBFadeOutToBlack - farcall Func_f25a0 + farcall SaffronCityHideRocketsShowCitizens call UpdateSprites call Delay3 call GBFadeInFromBlack diff --git a/scripts/SilphCo11F_2.asm b/scripts/SilphCo11F_2.asm index c8fd9c3e..658e79eb 100644 --- a/scripts/SilphCo11F_2.asm +++ b/scripts/SilphCo11F_2.asm @@ -1,28 +1,28 @@ -Func_f25a0:: - ld hl, MissableObjects_f25ce -.asm_f25a3 +SaffronCityHideRocketsShowCitizens:: + ld hl, SaffronCityRockets +.hideLoop ld a, [hli] - cp $ff - jr z, .asm_f25b4 + cp $ff ; have we run out of rockets to hide? + jr z, .showCitizens ; if so, start showing the citizens push hl ld [wMissableObjectIndex], a predef HideObject pop hl - jr .asm_f25a3 + jr .hideLoop -.asm_f25b4 - ld hl, MissableObjects_f25c7 -.asm_f25b7 +.showCitizens + ld hl, SaffronCityCitizens +.showLoop ld a, [hli] - cp $ff - ret z + cp $ff ; have we run out of citizens to show? + ret z ; if so, we're done here push hl ld [wMissableObjectIndex], a predef ShowObject pop hl - jr .asm_f25b7 + jr .showLoop -MissableObjects_f25c7: +SaffronCityCitizens: db HS_SAFFRON_CITY_8 db HS_SAFFRON_CITY_9 db HS_SAFFRON_CITY_A @@ -31,7 +31,7 @@ MissableObjects_f25c7: db HS_SAFFRON_CITY_D db $FF -MissableObjects_f25ce: +SaffronCityRockets: db HS_SAFFRON_CITY_1 db HS_SAFFRON_CITY_2 db HS_SAFFRON_CITY_3 |