From 858e7bc92a5b78343c3f8ace16393fd758bfc045 Mon Sep 17 00:00:00 2001
From: MementoMartha <harleyrayquaza@gmail.com>
Date: Thu, 27 Apr 2023 10:34:23 +0100
Subject: [PATCH] Cactus and Gapdos now disappear after the battle

---
 constants/event_constants.asm     |  7 +++----
 data/maps/objects/CelesteHill.asm |  1 +
 data/wild/maps/MtMoonCrater.asm   |  4 ++--
 scripts/BrunswickTrail.asm        | 11 +++++++----
 text/BrunswickTrail.asm           |  2 +-
 5 files changed, 14 insertions(+), 11 deletions(-)

diff --git a/constants/event_constants.asm b/constants/event_constants.asm
index 81ef39f6..e405fb9d 100644
--- a/constants/event_constants.asm
+++ b/constants/event_constants.asm
@@ -640,9 +640,10 @@
 	const EVENT_BEAT_MEW
 	const_skip 7
 	const EVENT_BEAT_MOLTRES
-	;const_skip 7
-	;const EVENT_BEAT_OMEGA
 	const_skip 7
+	const EVENT_BEAT_CACTUS
+	const EVENT_BEAT_ZAPDOSG
+	const_skip 6
 	const EVENT_BEAT_DRAGONITE 
 
 ; Celadon University, Salesman
@@ -785,8 +786,6 @@
 
 ; Safari Zone events
 	const_next $880
-	const EVENT_BEAT_CACTUS
-	const EVENT_BEAT_ZAPDOSG
 	const EVENT_GOT_HM03
 	const EVENT_GOT_MELTAN
 
diff --git a/data/maps/objects/CelesteHill.asm b/data/maps/objects/CelesteHill.asm
index ad71f839..ecb78c79 100644
--- a/data/maps/objects/CelesteHill.asm
+++ b/data/maps/objects/CelesteHill.asm
@@ -2,6 +2,7 @@ CelesteHill_Object:
 	db $0 ; border block
 
 	def_warp_events
+	warp_event 12, 23, BRUNSWICK_TRAIL, 1
 	warp_event 13, 23, BRUNSWICK_TRAIL, 1
 
 	def_bg_events
diff --git a/data/wild/maps/MtMoonCrater.asm b/data/wild/maps/MtMoonCrater.asm
index fa804787..008c7ca7 100644
--- a/data/wild/maps/MtMoonCrater.asm
+++ b/data/wild/maps/MtMoonCrater.asm
@@ -7,9 +7,9 @@ MtMoonCraterMons:
 	db 52, DUGTRIO
 	db 55, ESPEON
 	db 55, UMBREON
-	db 56, SANDY_SHOCKS
+	db 50, SANDY_SHOCKS
 	db 50, SCREAM_TAIL
-	db 50, CHANSEY ; I don't like this but I also don't like the Paradox Pokemon not both being 4%. Sue me.
+	db 56, CHANSEY ; I don't like this but I also don't like the Paradox Pokemon not both being 4%. Sue me.
 	end_grass_wildmons
 	
 	def_water_wildmons 10 ; encounter rate
diff --git a/scripts/BrunswickTrail.asm b/scripts/BrunswickTrail.asm
index 5eea36d8..e81d81e5 100644
--- a/scripts/BrunswickTrail.asm
+++ b/scripts/BrunswickTrail.asm
@@ -1,8 +1,11 @@
 BrunswickTrail_Script:
-	jp EnableAutoTextBoxDrawing
-	ld hl, BrunswickTrail_ScriptPointers
+	call EnableAutoTextBoxDrawing
+	ld hl, BrunswickTrailTrainerHeaders
+	ld de, BrunswickTrail_ScriptPointers
 	ld a, [wBrunswickTrailCurScript]
-	jp CallFunctionInTable
+	call ExecuteCurMapScriptInTable
+	ld [wBrunswickTrailCurScript], a
+	ret
 
 BrunswickTrail_ScriptPointers:
 	dw CheckFightingMapTrainers
@@ -15,7 +18,7 @@ BrunswickTrail_TextPointers:
 	dw GalarianZapdosText
 
 BrunswickTrailTrainerHeaders:
-	def_trainers 0
+	def_trainers
 CactusTrainerHeader:
 	trainer EVENT_BEAT_CACTUS, 0, CactusBattleText, CactusBattleText, CactusBattleText
 GalarianZapdosTrainerHeader:
diff --git a/text/BrunswickTrail.asm b/text/BrunswickTrail.asm
index 5ae3fd60..7deac90b 100644
--- a/text/BrunswickTrail.asm
+++ b/text/BrunswickTrail.asm
@@ -34,7 +34,7 @@ _FakeTreeAttack::
 	prompt
 
 _GalarianZapdosBattleText::
-	text "Kyooo!"
+	text "Gyaoo!"	; making the cries consistent with the other legendary birds
 	prompt
 
 ; Martha can do the text for her things...