thorn/kep-hack
1
0
Fork 0
mirror of https://github.com/thornAvery/kep-hack.git synced 2025-09-17 02:40:50 +12:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge pull request #37 from jojo-kep/master

Browse source 
added backup script to make sure brunswick trail cactus gets hidden
This commit is contained in:
Martha Schilling 2024-01-10 11:02:13 +00:00 committed by GitHub
parent c7ca75185c 4581a9487f
commit b0d6f06e2b
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 22 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

22
scripts/BrunswickTrail.asm
View file

@ -11,6 +11,7 @@ BrunswickTrail_ScriptPointers:
dw CheckFightingMapTrainers dw CheckFightingMapTrainers
dw DisplayEnemyTrainerTextAndStartBattle dw DisplayEnemyTrainerTextAndStartBattle
dw EndTrainerBattle dw EndTrainerBattle
dw HideCactus
BrunswickTrail_TextPointers: BrunswickTrail_TextPointers:
dw FakeTreeEvent dw FakeTreeEvent
@ -139,7 +140,13 @@ FakeTreeEvent:
ld hl, CactusTrainerHeader ld hl, CactusTrainerHeader
call TalkToTrainer call TalkToTrainer
jp TextScriptEnd ; I have tried a lot of things and it's not disappearing AAA
;let's try a separate map script as a backup in case cactormous does not disappear like other static wild pokemon.
ld a, 3
ld [wBrunswickTrailCurScript], a
ld [wCurMapScript], a
; jp TextScriptEnd ; I have tried a lot of things and it's not disappearing AAA
;.NoCut ;.NoCut
; ld hl, FakeTreeNoCut ; Why do you have to be this way? I scream, for I do not know. ; ld hl, FakeTreeNoCut ; Why do you have to be this way? I scream, for I do not know.
; call PrintText ; call PrintText
@ -155,6 +162,19 @@ CactusBattleText:
call WaitForSoundToFinish call WaitForSoundToFinish
jp TextScriptEnd jp TextScriptEnd
HideCactus:
;this runs after the cactormous battle to make sure it gets hidden
ld a, HS_CACTUS
ld [wMissableObjectIndex], a
predef HideObject
call UpdateSprites
call Delay3
xor a
ld [wBrunswickTrailCurScript], a
ld [wCurMapScript], a
ret
GZapFound: GZapFound:
text_asm text_asm
ld hl, BirdTextCall ld hl, BirdTextCall