diff --git a/constants/event_constants.asm b/constants/event_constants.asm
index a64a17b2..7232ace7 100644
--- a/constants/event_constants.asm
+++ b/constants/event_constants.asm
@@ -817,6 +817,7 @@ DEF INDIGO_PLATEAU_EVENTS_END EQU const_value - 1
 	const EVENT_BEAT_VICTORY_ROAD_1_TRAINER_1
 	const_skip 4
 	const EVENT_VICTORY_ROAD_1_BOULDER_ON_SWITCH
+	const EVENT_BEAT_CHIEF ; moved out of the below union to prevent bugs
 
 ; Silph Gauntlet events
 	const_next $930
@@ -872,7 +873,7 @@ DEF SILPH_GAUNTLET_EVENTS_START EQU const_value
 	const EVENT_BEAT_GAUNTLET_SABRINA
 	const EVENT_BEAT_GAUNTLET_BLAINE
 	const_skip
-	const EVENT_BEAT_CHIEF
+	const_skip
 	const_skip 5
 	const_skip
 DEF SILPH_GAUNTLET_EVENTS_END EQU const_value - 1
diff --git a/data/maps/objects/RedsHouse2F.asm b/data/maps/objects/RedsHouse2F.asm
index de0c4f76..2bc15fdb 100644
--- a/data/maps/objects/RedsHouse2F.asm
+++ b/data/maps/objects/RedsHouse2F.asm
@@ -4,11 +4,12 @@ RedsHouse2F_Object:
 	def_warp_events
 	warp_event  7,  1, REDS_HOUSE_1F, 3
 	;warp_event  5,  1, SILPH_GAUNTLET_7F, 1 ; - Test Chief 
+	warp_event  5,  1, SILPH_CO_1F, 1 ; - Go through Gauntlet
 	;warp_event  5,  1, SILPH_CO_11F, 2 ; - Test J&J, Omega, & Giovanni. To test the Omega refight, change to SHOW in hide/show data, and set warp ID to 1.
 	;warp_event  5,  1, ROCKET_HIDEOUT_B4F, 2 ; - Test Giovanni 1
 	;warp_event  5,  1, MT_MOON_SQUARE, 1 ; - Test Shop, NPCs, and Crater
 	;warp_event  5,  1, CELESTE_HILL, 1 ; - Test GMolt
-	warp_event	 5,  1, HALL_OF_FAME, 1 ; Test post-game setup
+	;warp_event	 5,  1, HALL_OF_FAME, 1 ; Test post-game setup
 	;warp_event	 5,  1, GARNET_CAVERN_B1F, 1 ; Test GCuno
 	;warp_event	 5,  1, FARAWAY_ISLAND_INSIDE, 1 ; Test Mew
 	;warp_event	 5,  1, GIOVANNIS_ROOM, 1 ; Test spinner tiles
diff --git a/engine/debug/debug_party.asm b/engine/debug/debug_party.asm
index 014491fe..a9a78e64 100644
--- a/engine/debug/debug_party.asm
+++ b/engine/debug/debug_party.asm
@@ -206,6 +206,7 @@ DebugItemsList:
 	db BICYCLE, 1
 	db EXP_ALL, 1
 	db FULL_RESTORE, 99
+	db MAX_ELIXER, 99
 	db MAX_REPEL, 99
 	db RARE_CANDY, 99
 	db ESCAPE_ROPE, 99
diff --git a/scripts/SilphCo1F.asm b/scripts/SilphCo1F.asm
index 601607b0..f7debde5 100644
--- a/scripts/SilphCo1F.asm
+++ b/scripts/SilphCo1F.asm
@@ -9,6 +9,7 @@ SilphCo1F_ScriptPointers:
 	dw SilphCo1FScript1
 	
 SilphCo1FScript0:
+	ResetEvent EVENT_BEAT_CHIEF ; Used so you can rematch Chief and later the gauntlet, without him being reset alongside everything else. An absolutely tragic way to fix a bug, but it works. If you enter his room, you have to fight him, so this all works under the hood without infringing on design.
 	ld b, SILPHLETTER
 	call IsItemInBag
 	ret nz
diff --git a/scripts/SilphGauntlet7F.asm b/scripts/SilphGauntlet7F.asm
index e6e86aba..e3e6f860 100644
--- a/scripts/SilphGauntlet7F.asm
+++ b/scripts/SilphGauntlet7F.asm
@@ -71,7 +71,7 @@ ChiefScript3:
 	xor a
 	ld [wIsTrainerBattle], a
 	call UpdateSprites
-	SetEvent EVENT_BEAT_CHIEF
+	SetEvent EVENT_BEAT_CHIEF ; Ensures Chief cannot be rematched in the room.
 	ld a, $f0
 	ld [wJoyIgnore], a
 	ld a, $1
@@ -95,7 +95,7 @@ ChiefScript4:
 	ld a, HS_CERULEAN_CAVE_GUY
 	ld [wMissableObjectIndex], a
 	predef HideObject
-	; ResetEventRange SILPH_GAUNTLET_EVENTS_START, SILPH_GAUNTLET_EVENTS_END, 1 ; I want this to reset the trainers so you can refight them, but I'm very unsure how this works...
+	ResetEventRange SILPH_GAUNTLET_EVENTS_START, SILPH_GAUNTLET_EVENTS_END, 1 
 	
 	ld a, $0
 	ld [wSilphGauntlet7FCurScript], a
diff --git a/text/SilphGauntlet2F.asm b/text/SilphGauntlet2F.asm
index e5c67396..5b04bf25 100644
--- a/text/SilphGauntlet2F.asm
+++ b/text/SilphGauntlet2F.asm
@@ -58,8 +58,9 @@ _SilphGauntlet2FAfterBattleText3::
 _SilphGauntlet2FBattleText4::
 	text "Hahaha! This is"
 	line "great! So many"
-	cont "rare #MON! Show"
-	cont "me yours, now!"
+	cont "rare #MON!"
+	para "Show me yours,"
+	line "now!"
 	done
 
 _SilphGauntlet2FEndBattleText4::
diff --git a/text/SilphGauntlet3F.asm b/text/SilphGauntlet3F.asm
index 9087b199..1eaad982 100644
--- a/text/SilphGauntlet3F.asm
+++ b/text/SilphGauntlet3F.asm
@@ -22,7 +22,7 @@ _SilphGauntlet3FBattleText2::
 	done
 
 _SilphGauntlet3FEndBattleText2::
-	text "Sploosh!"
+	text "Agh!"
 	prompt
 
 _SilphGauntlet3FAfterBattleText2::