thorn/kep-hack
1
0
Fork 0
mirror of https://github.com/thornAvery/kep-hack.git synced 2025-11-12 16:24:52 +13:00
Code Issues Actions Packages Projects Releases Wiki Activity

this can be optimised too

Browse source
This commit is contained in:
Llinos Evans 2023-07-08 15:54:53 +01:00
parent 2ca3ea175f
commit 24a89f1fd7
1 changed files with 1 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
scripts/HallOfFame.asm
View file

@ -140,7 +140,6 @@ PostGameSetup:
; It's really suboptimal and I think there is a way to make it better. ; It's really suboptimal and I think there is a way to make it better.
ResetLegendaryPokemon: ResetLegendaryPokemon:
ld a, DEX_ARTICUNO ; Load dex number ld a, DEX_ARTICUNO ; Load dex number
ld [wd11e], a ; Store in wd11e (input for IsPokemonBitSet)
call HoFIsPokemonBitSet ; Is it owned? call HoFIsPokemonBitSet ; Is it owned?
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...
@ -148,7 +147,6 @@ ResetLegendaryPokemon:
call ShowThis ; And restore the hide/show. call ShowThis ; And restore the hide/show.
.skipArticuno ; Rinse and repeat. .skipArticuno ; Rinse and repeat.
ld a, DEX_ZAPDOS ld a, DEX_ZAPDOS
ld [wd11e], a
call HoFIsPokemonBitSet call HoFIsPokemonBitSet
jr z, .skipZapdos jr z, .skipZapdos
ResetEvent EVENT_BEAT_ZAPDOS ResetEvent EVENT_BEAT_ZAPDOS
@ -156,7 +154,6 @@ ResetLegendaryPokemon:
call ShowThis call ShowThis
.skipZapdos .skipZapdos
ld a, DEX_MOLTRES ld a, DEX_MOLTRES
ld [wd11e], a
call HoFIsPokemonBitSet call HoFIsPokemonBitSet
jr z, .skipMoltres jr z, .skipMoltres
ResetEvent EVENT_BEAT_MOLTRES ResetEvent EVENT_BEAT_MOLTRES
@ -177,7 +174,6 @@ ResetLegendaryPokemon:
; 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.
ld a, DEX_MEW ld a, DEX_MEW
ld [wd11e], a
call HoFIsPokemonBitSet call HoFIsPokemonBitSet
jr z, .skipMew jr z, .skipMew
ResetEvent EVENT_BEAT_MEW ResetEvent EVENT_BEAT_MEW
@ -189,7 +185,6 @@ ResetLegendaryPokemon:
CheckEvent EVENT_POST_GAME_ATTAINED CheckEvent EVENT_POST_GAME_ATTAINED
jp z, .skipGalarianBirdsAndMewtwo jp z, .skipGalarianBirdsAndMewtwo
ld a, DEX_ARTICUNO_G ld a, DEX_ARTICUNO_G
ld [wd11e], a
call HoFIsPokemonBitSet call HoFIsPokemonBitSet
jr z, .skipArticunoG jr z, .skipArticunoG
ResetEvent EVENT_BEAT_ARTICUNO_G ResetEvent EVENT_BEAT_ARTICUNO_G
@ -197,7 +192,6 @@ ResetLegendaryPokemon:
call ShowThis call ShowThis
.skipArticunoG .skipArticunoG
ld a, DEX_ZAPDOS_G ld a, DEX_ZAPDOS_G
ld [wd11e], a
call HoFIsPokemonBitSet call HoFIsPokemonBitSet
jr z, .skipZapdosG jr z, .skipZapdosG
ResetEvent EVENT_BEAT_ZAPDOSG ResetEvent EVENT_BEAT_ZAPDOSG
@ -205,7 +199,6 @@ ResetLegendaryPokemon:
call ShowThis call ShowThis
.skipZapdosG .skipZapdosG
ld a, DEX_MOLTRES_G ld a, DEX_MOLTRES_G
ld [wd11e], a
call HoFIsPokemonBitSet call HoFIsPokemonBitSet
jr z, .skipMoltresG jr z, .skipMoltresG
ResetEvent EVENT_BEAT_GALARIAN_MOLTRES ResetEvent EVENT_BEAT_GALARIAN_MOLTRES
@ -213,7 +206,6 @@ ResetLegendaryPokemon:
call ShowThis call ShowThis
.skipMoltresG .skipMoltresG
ld a, DEX_MEWTWO ld a, DEX_MEWTWO
ld [wd11e], a
call HoFIsPokemonBitSet call HoFIsPokemonBitSet
jr z, .skipGalarianBirdsAndMewtwo jr z, .skipGalarianBirdsAndMewtwo
ResetEvent EVENT_BEAT_MEWTWO ResetEvent EVENT_BEAT_MEWTWO
@ -252,6 +244,7 @@ ObjectsToHide:
; 0 = Not Owned ; 0 = Not Owned
; 1 = Owned ; 1 = Owned
HoFIsPokemonBitSet: HoFIsPokemonBitSet:
ld [wd11e], a
ld hl, wPokedexOwned ld hl, wPokedexOwned
ld a, [wd11e] ld a, [wd11e]
dec a dec a