Merge pull request ShiraTheMogul#37 from jojo-kep/master

added backup script to make sure brunswick trail cactus gets hidden

Author: MementoMartha

scripts/BrunswickTrail.asm

@@ -11,7 +11,8 @@ BrunswickTrail_ScriptPointers:
 	dw CheckFightingMapTrainers
 	dw DisplayEnemyTrainerTextAndStartBattle
 	dw EndTrainerBattle
-
+	dw HideCactus
+	
 BrunswickTrail_TextPointers:
 	dw FakeTreeEvent
 	dw BrunswickTrainer1
@@ -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
@@ -154,6 +161,19 @@ CactusBattleText:
 	call PlayCry
 	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