Merge branch 'mistress' into renewables

scripts/BattleTent.asm

@@ -820,13 +820,12 @@ BattleTentLetsGo:
 	done
 	
 BattleTentWon:
-	text "Wow! You finally"
-	line "did it!"
+	text "Congratulations!"
 	
 	para "You beat"
 	line "@"
 	text_decimal wBTStreakCnt, 1, 3
-	text " oppenont(s)!"
+	text " opponent(s)!"
 	prompt
 	
 BattleTentLost:

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

scripts/SilphCo7F.asm

@@ -309,8 +309,8 @@ SilphCo7TrainerHeader3:
 SilphCo7Text1:
 ; lapras guy
 	text_asm
-	ld a, [wd72e]
-	bit 0, a ; got lapras?
+	ld a, [wd72c]
+	bit 2, a
 	jr z, .givelapras
 	CheckEvent EVENT_BEAT_SILPH_CO_GIOVANNI
 	jr nz, .savedsilph
@@ -329,8 +329,8 @@ SilphCo7Text1:
 	call EnableAutoTextBoxDrawing
 	ld hl, .HeresYourLaprasText
 	call PrintText
-	ld hl, wd72e
-	set 0, [hl]
+	ld hl, wd72c
+	set 2, [hl]
 	jr .done
 .savedsilph
 	ld hl, .LaprasGuySavedText