From bbfbc7ada10211c043e5d45bc90222f06c3a7765 Mon Sep 17 00:00:00 2001
From: Topaz Whitelock <95656963+TopazTK@users.noreply.github.com>
Date: Tue, 15 Aug 2023 12:41:33 +0300
Subject: [PATCH] World Map to GOA Improvement

---
 F266B00B GoA ROM.lua | 49 ++++++++++++--------------------------------
 1 file changed, 13 insertions(+), 36 deletions(-)

diff --git a/F266B00B GoA ROM.lua b/F266B00B GoA ROM.lua
index 10d357b..b1405ad 100644
--- a/F266B00B GoA ROM.lua	
+++ b/F266B00B GoA ROM.lua	
@@ -85,6 +85,19 @@ elseif GAME_ID == 0x431219CC and ENGINE_TYPE == 'BACKEND' then --PC
 	NxtGauge = 0x48
 	Menu1    = 0x2A0E7D0 - 0x56450E
 	NextMenu = 0x8
+
+	-- Reroute the World Map Button to GOA
+	WriteArray(EXE_ADDRESS + 0x152A20, 
+		{ 0x48, 0x89, 0x5C, 0x24, 0x08, 0x57, 0x48, 0x83, 0xEC, 0x40, 0x8B, 0xFA, 0x8B, 0xD9, 0x33, 0xD2, 0x8D, 0x4A, 0x21, 0xE8, 0xE8, 0x5A, 0x25, 0x00, 0xC6, 0x44, 0x24, 0x32, 0xFF, 0xB8, 0xFF, 0xFF,
+		  0x00, 0x00, 0x66, 0x89, 0x44, 0x24, 0x38, 0xC7, 0x44, 0x24, 0x34, 0xFF, 0xFF, 0xFF, 0xFF, 0x85, 0xDB, 0x79, 0x09, 0xE8, 0x28, 0xD5, 0xFF, 0xFF, 0x0F, 0xB6, 0x58, 0x0C, 0xE8, 0x1F, 0xD5, 0xFF, 
+		  0xFF, 0x44, 0x8A, 0x78, 0x0C, 0xC6, 0x40, 0x0C, 0x04, 0xC6, 0x44, 0x24, 0x30, 0x04, 0xE8, 0x0D, 0xD5, 0xFF, 0xFF, 0x33, 0xC9, 0x48, 0x8D, 0x15, 0xD0, 0xCE, 0x45, 0x00, 0xC6, 0x40, 0x0D, 0x1A, 
+		  0x48, 0x8D, 0x05, 0x4D, 0xCE, 0x45, 0x00, 0xC6, 0x44, 0x24, 0x31, 0x1A, 0x3B, 0x18, 0x74, 0x0D, 0xFF, 0xC1, 0x48, 0x83, 0xC0, 0x08, 0x48, 0x3B, 0xC2, 0x7C, 0xF1, 0x33, 0xDB, 0x48, 0x00, 0xC1, 
+		  0x4C, 0x8D, 0x35, 0x29, 0xCE, 0x45, 0x00, 0xE8, 0xD4, 0xD4, 0xFF, 0xFF, 0x83, 0xCF, 0x01, 0xC7, 0x44, 0x24, 0x20, 0x00, 0x00, 0x00, 0x00, 0x45, 0x31, 0xC9, 0x48, 0x8D, 0x4C, 0x24, 0x30, 0x45, 
+		  0x31, 0xC0, 0x8B, 0xD7, 0x43, 0x8B, 0x1C, 0x3E, 0x88, 0x58, 0x0E, 0x88, 0x5C, 0x24, 0x32, 0xE8, 0xBC, 0xDA, 0xFF, 0xFF, 0x48, 0x8B, 0x5C, 0x24, 0x50, 0x48, 0x83, 0xC4, 0x40, 0x5F, 0xC3, 0xCC }
+	,true)
+ 
+	-- Write entrypoints for door to world accuracy.
+	WriteArray(0x4B382, {0x00, 0x00, 0x1C, 0x00, 0x1D, 0x17, 0x1A, 0x19, 0x16, 0x00, 0x1B, 0x01, 0x1F, 0x1F, 0x18, 0x1E, 0x20, 0x15, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00})
 end
 --[[Slot2  = Slot1 - NextSlot
 Slot3  = Slot2 - NextSlot
@@ -261,42 +274,6 @@ if Place == 0x1A04 then
 		WriteShort(BAR(ARD,0x05,0x25C),0x779,OnPC) --Radiant Garden
 	end
 end
---World Map -> Garden of Assemblage
-if Place == 0x000F then
-	local WarpDoor = false
-	if Door == 0x0C then --The World that Never Was
-		WarpDoor = 0x15
-	elseif Door == 0x03 then --Land of Dragons
-		WarpDoor = 0x16
-	elseif Door == 0x04 then --Beast's Castle
-		WarpDoor = 0x17
-	elseif Door == 0x09 then --Halloween Town	
-		WarpDoor = 0x18
-	elseif Door == 0x0A then --Agrabah
-		WarpDoor = 0x19
-	elseif Door == 0x05 then --Olympus Coliseum
-		WarpDoor = 0x1A
-	elseif Door == 0x0B then --Pride Lands
-		WarpDoor = 0x1B
-	elseif Door == 0x01 then --Twilight Town
-		if ReadByte(Save+0x1CFF) == 8 then --Twilight Town
-			WarpDoor = 0x1C
-		elseif ReadByte(Save+0x1CFF) == 13 then --Simulated Twilight Town
-			WarpDoor = 0x21
-		end
-	elseif Door == 0x02 then --Hollow Bastion
-		WarpDoor = 0x1D
-	elseif Door == 0x08 then --Port Royal
-		WarpDoor = 0x1E
-	elseif Door == 0x06 then --Disney Castle
-		WarpDoor = 0x1F
-	elseif Door == 0x07 then --Atlantica
-		WarpDoor = 0x01
-	end
-	if WarpDoor then
-		Warp(0x04,0x1A,WarpDoor)
-	end
-end
 --Visits Unlock
 if true then
 	if ReadByte(Save+0x364A) > 0 then --Picture