From ee001744dc0ad308197a586ff85fcb8c0dec9196 Mon Sep 17 00:00:00 2001
From: Llinos Evans <36418502+PlagueVonKarma@users.noreply.github.com>
Date: Mon, 3 Jul 2023 17:29:21 +0100
Subject: [PATCH] Fix Galarian Articuno

Very simple, very embarrassing glitch. One bird to go.
---
 data/maps/objects/RedsHouse2F.asm | 3 ++-
 scripts/GarnetCavernB1F.asm       | 2 +-
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/data/maps/objects/RedsHouse2F.asm b/data/maps/objects/RedsHouse2F.asm
index 685b481f..8ecb2e0d 100644
--- a/data/maps/objects/RedsHouse2F.asm
+++ b/data/maps/objects/RedsHouse2F.asm
@@ -7,8 +7,9 @@ RedsHouse2F_Object:
 	;warp_event  5,  1, SILPH_CO_11F, 1 ; - Test Omega & Giovanni
 	;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, 2 ; - Test Birds
+	;warp_event  5,  1, CELESTE_HILL, 2 ; - Test GMolt
 	;warp_event	 5,  1, INDIGO_PLATEAU_LOBBY, 1 ; easy league access
+	warp_event	 5,  1, GARNET_CAVERN_B1F, 1 ; Test GCuno
 
 	def_bg_events
 
diff --git a/scripts/GarnetCavernB1F.asm b/scripts/GarnetCavernB1F.asm
index 29518e51..5ca98403 100644
--- a/scripts/GarnetCavernB1F.asm
+++ b/scripts/GarnetCavernB1F.asm
@@ -26,13 +26,13 @@ ArticunoGTrainerHeader:
 	db -1 ; end
 
 ArticunoGText:
+	text_asm
 	ld a, HS_ARTICUNO_G_COPY_1
 	ld [wMissableObjectIndex], a
 	predef HideObject
 	ld a, HS_ARTICUNO_G_COPY_2
 	ld [wMissableObjectIndex], a
 	predef HideObject
-	text_asm
 	ld hl, ArticunoGTrainerHeader
 	call TalkToTrainer
 	jp TextScriptEnd