From 6413e7806e6e9c717cb00ebf915ef9a1c6c42cc8 Mon Sep 17 00:00:00 2001
From: Llinos Evans <36418502+PlagueVonKarma@users.noreply.github.com>
Date: Mon, 1 May 2023 19:09:20 +0100
Subject: [PATCH] Minor fixes to the Vermilion warp thing

Makes minor progress on the warp issue. Still unsure why this isn't working properly...
---
 data/maps/objects/CitrineCity.asm          | 2 ++
 data/maps/objects/FarawayIslandOutside.asm | 4 ++--
 scripts/VermilionCity.asm                  | 8 +-------
 3 files changed, 5 insertions(+), 9 deletions(-)

diff --git a/data/maps/objects/CitrineCity.asm b/data/maps/objects/CitrineCity.asm
index dec97776..dad6c965 100644
--- a/data/maps/objects/CitrineCity.asm
+++ b/data/maps/objects/CitrineCity.asm
@@ -7,6 +7,8 @@ CitrineCity_Object:
 	warp_event 15, 17, CITRINE_POKECENTER, 1
 	warp_event 15, 27, CITRINE_MART, 1
 	warp_event 22,  5, GARNET_CAVERN_1F, 1
+	warp_event 39, 31, VERMILION_CITY, 6
+	warp_event 39, 30, VERMILION_CITY, 6
 
 	def_bg_events
 
diff --git a/data/maps/objects/FarawayIslandOutside.asm b/data/maps/objects/FarawayIslandOutside.asm
index 3acbdab4..dced9e04 100644
--- a/data/maps/objects/FarawayIslandOutside.asm
+++ b/data/maps/objects/FarawayIslandOutside.asm
@@ -2,8 +2,8 @@ FarawayIslandOutside_Object:
 	db $2d ; border block
 
 	def_warp_events
-	warp_event  2, 35, VERMILION_CITY, 10
-	warp_event  3, 35, VERMILION_CITY, 9
+	warp_event  2, 35, VERMILION_CITY, 6
+	warp_event  3, 35, VERMILION_CITY, 6
 	warp_event 14, 12, FARAWAY_ISLAND_INSIDE, 1
 	warp_event 15, 12, FARAWAY_ISLAND_INSIDE, 2
 
diff --git a/scripts/VermilionCity.asm b/scripts/VermilionCity.asm
index f10d2a70..1ef9cfb9 100644
--- a/scripts/VermilionCity.asm
+++ b/scripts/VermilionCity.asm
@@ -242,9 +242,6 @@ PassListings:
     ldh [hWarpDestinationMap], a
     ld a, $1
     ld [wDestinationWarpID], a
-	ld a, VERMILION_CITY
-	ld [wLastMap], a
-	call PlayMapChangeSound
 	call WarpFound2
     jr .done
 .choseCitrine
@@ -252,11 +249,8 @@ PassListings:
 	call PrintText
 	ld a, CITRINE_CITY
 	ldh [hWarpDestinationMap], a
-	ld a, $1
+	ld a, $6
 	ld [wDestinationWarpID], a
-	ld a, VERMILION_CITY
-	ld [wLastMap], a
-	call PlayMapChangeSound
 	call WarpFound2
 	jr .done
 .cancelledPass