thorn/kep-hack
1
0
Fork 0
mirror of https://github.com/thornAvery/kep-hack.git synced 2025-11-10 23:40:59 +13:00
Code Issues Actions Packages Projects Releases Wiki Activity

Optimise hide/show

Browse source
This commit is contained in:
Llinos Evans 2023-07-08 15:52:31 +01:00
parent f9f5a7f1b0
commit 0c4d3c8731
1 changed files with 16 additions and 21 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

37
scripts/HallOfFame.asm
View file

@ -131,8 +131,7 @@ PostGameSetup:
cp -1 cp -1
ret z ret z
push hl push hl
ld [wMissableObjectIndex], a call ShowThis
predef ShowObject
pop hl pop hl
jr .loop2 jr .loop2
@ -147,8 +146,7 @@ ResetLegendaryPokemon:
jr nz, .skipArticuno ; If owned, skip jr nz, .skipArticuno ; If owned, skip
ResetEvent EVENT_BEAT_ARTICUNO ; If not, reset the event... ResetEvent EVENT_BEAT_ARTICUNO ; If not, reset the event...
ld a, HS_ARTICUNO ld a, HS_ARTICUNO
ld [wMissableObjectIndex], a call ShowThis ; And restore the hide/show.
predef ShowObject ; And restore the hide/show.
.skipArticuno ; Rinse and repeat. .skipArticuno ; Rinse and repeat.
ld a, DEX_ZAPDOS ld a, DEX_ZAPDOS
ld [wd11e], a ld [wd11e], a
@ -156,8 +154,7 @@ ResetLegendaryPokemon:
jr z, .skipZapdos jr z, .skipZapdos
ResetEvent EVENT_BEAT_ZAPDOS ResetEvent EVENT_BEAT_ZAPDOS
ld a, HS_ZAPDOS ld a, HS_ZAPDOS
ld [wMissableObjectIndex], a call ShowThis
predef ShowObject
.skipZapdos .skipZapdos
ld a, DEX_MOLTRES ld a, DEX_MOLTRES
ld [wd11e], a ld [wd11e], a
@ -165,8 +162,7 @@ ResetLegendaryPokemon:
jr z, .skipMoltres jr z, .skipMoltres
ResetEvent EVENT_BEAT_MOLTRES ResetEvent EVENT_BEAT_MOLTRES
ld a, HS_MOLTRES ld a, HS_MOLTRES
ld [wMissableObjectIndex], a call ShowThis
predef ShowObject
.skipMoltres .skipMoltres
; Omega is special. ; Omega is special.
; If Omega wasn't obtained, it'll be available somewhere else on Silph Co. 11F. ; If Omega wasn't obtained, it'll be available somewhere else on Silph Co. 11F.
@ -177,8 +173,7 @@ ResetLegendaryPokemon:
; jr nz, .skipOmega ; jr nz, .skipOmega
; ResetEvent EVENT_BEAT_OMEGA_2 ; ResetEvent EVENT_BEAT_OMEGA_2
; ld a, HS_OMEGA_2 ; ld a, HS_OMEGA_2
; ld [wMissableObjectIndex], a ; call ShowThis
; predef ShowObject
;.skipOmega ;.skipOmega
; Mew's hints aren't until the post-game, but is available regardless. ; Mew's hints aren't until the post-game, but is available regardless.
; So, we put this here. ; So, we put this here.
@ -188,8 +183,7 @@ ResetLegendaryPokemon:
jr z, .skipMew jr z, .skipMew
ResetEvent EVENT_BEAT_MEW ResetEvent EVENT_BEAT_MEW
ld a, HS_MEW ld a, HS_MEW
ld [wMissableObjectIndex], a call ShowThis
predef ShowObject
.skipMew .skipMew
; If you haven't cleared the game yet, you've not met the Galarian Birds. ; If you haven't cleared the game yet, you've not met the Galarian Birds.
; So we may as well skip processing all this. ; So we may as well skip processing all this.
@ -201,8 +195,7 @@ ResetLegendaryPokemon:
jr z, .skipArticunoG jr z, .skipArticunoG
ResetEvent EVENT_BEAT_ARTICUNO_G ResetEvent EVENT_BEAT_ARTICUNO_G
ld a, HS_GARNET_ARTICUNO_G ld a, HS_GARNET_ARTICUNO_G
ld [wMissableObjectIndex], a call ShowThis
predef ShowObject
.skipArticunoG .skipArticunoG
ld a, DEX_ZAPDOS_G ld a, DEX_ZAPDOS_G
ld [wd11e], a ld [wd11e], a
@ -210,8 +203,7 @@ ResetLegendaryPokemon:
jr z, .skipZapdosG jr z, .skipZapdosG
ResetEvent EVENT_BEAT_ZAPDOSG ResetEvent EVENT_BEAT_ZAPDOSG
ld a, HS_BRUNSWICK_ZAPDOS_G_2 ld a, HS_BRUNSWICK_ZAPDOS_G_2
ld [wMissableObjectIndex], a call ShowThis
predef ShowObject
.skipZapdosG .skipZapdosG
ld a, DEX_MOLTRES_G ld a, DEX_MOLTRES_G
ld [wd11e], a ld [wd11e], a
@ -219,8 +211,7 @@ ResetLegendaryPokemon:
jr z, .skipMoltresG jr z, .skipMoltresG
ResetEvent EVENT_BEAT_GALARIAN_MOLTRES ResetEvent EVENT_BEAT_GALARIAN_MOLTRES
ld a, HS_MOLTRES_G ld a, HS_MOLTRES_G
ld [wMissableObjectIndex], a call ShowThis
predef ShowObject
.skipMoltresG .skipMoltresG
ld a, DEX_MEWTWO ld a, DEX_MEWTWO
ld [wd11e], a ld [wd11e], a
@ -228,13 +219,17 @@ ResetLegendaryPokemon:
jr z, .skipGalarianBirdsAndMewtwo jr z, .skipGalarianBirdsAndMewtwo
ResetEvent EVENT_BEAT_MEWTWO ResetEvent EVENT_BEAT_MEWTWO
ld a, HS_MEWTWO ld a, HS_MEWTWO
ld [wMissableObjectIndex], a call ShowThis
predef ShowObject
.skipGalarianBirdsAndMewtwo .skipGalarianBirdsAndMewtwo
; We set this last to save on processing earlier in the script. ; We set this last to save on processing earlier in the script.
SetEvent EVENT_POST_GAME_ATTAINED SetEvent EVENT_POST_GAME_ATTAINED
ret ret
ShowThis:
ld [wMissableObjectIndex], a
predef ShowObject
ret
ObjectsToShow: ObjectsToShow:
db HS_ROUTE_1_OAK ; Oak post-game fight db HS_ROUTE_1_OAK ; Oak post-game fight
db -1 ; end db -1 ; end