added backup script to make sure brunswick trail cactus gets hidden

This commit is contained in:
jojobear13 2024-01-10 04:15:47 -06:00
parent c7ca75185c
commit 4581a9487f

View file

@ -11,6 +11,7 @@ BrunswickTrail_ScriptPointers:
dw CheckFightingMapTrainers
dw DisplayEnemyTrainerTextAndStartBattle
dw EndTrainerBattle
dw HideCactus
BrunswickTrail_TextPointers:
dw FakeTreeEvent
@ -139,7 +140,13 @@ FakeTreeEvent:
ld hl, CactusTrainerHeader
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
; ld hl, FakeTreeNoCut ; Why do you have to be this way? I scream, for I do not know.
; call PrintText
@ -155,6 +162,19 @@ CactusBattleText:
call WaitForSoundToFinish
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:
text_asm
ld hl, BirdTextCall