Fix FFR location error at import

wildham0 · Apr 1, 2024 · 93defbb · 93defbb
1 parent f107929
commit 93defbb
Show file tree

Hide file tree

Showing 4 changed files with 38 additions and 37 deletions.
diff --git a/DataGroup.cs b/DataGroup.cs
@@ -15,33 +15,33 @@ public static class OwDataGroup
 	{
 		public static List<(OverworldTeleportIndex id, byte tile)> OwTeleportTiles = new()
 		{
-			(OverworldTeleportIndex.BahamutCave, 0x6C),
-			(OverworldTeleportIndex.CardiaNorth, 0x6A),
-			(OverworldTeleportIndex.CardiaGrass, 0x66),
-			(OverworldTeleportIndex.CardiaMarsh, 0x67),
-			(OverworldTeleportIndex.CardiaSmall, 0x68),
-			(OverworldTeleportIndex.CardiaForest, 0x69),
-			(OverworldTeleportIndex.CastleOrdeals, 0x38),
+			(OverworldTeleportIndex.BahamutCave1, 0x6C),
+			(OverworldTeleportIndex.Cardia1, 0x6A),
+			(OverworldTeleportIndex.Cardia2, 0x66),
+			(OverworldTeleportIndex.Cardia4, 0x67),
+			(OverworldTeleportIndex.Cardia5, 0x68),
+			(OverworldTeleportIndex.Cardia6, 0x69),
+			(OverworldTeleportIndex.CastleOrdeals1, 0x38),
 			(OverworldTeleportIndex.Coneria, 0x49),
-			(OverworldTeleportIndex.ConeriaCastle, 0x01),
+			(OverworldTeleportIndex.ConeriaCastle1, 0x01),
 			(OverworldTeleportIndex.CrescentLake, 0x4E),
 			(OverworldTeleportIndex.DwarfCave, 0x2F),
-			(OverworldTeleportIndex.EarthCave, 0x0E),
+			(OverworldTeleportIndex.EarthCave1, 0x0E),
 			(OverworldTeleportIndex.Elfland, 0x4C),
 			(OverworldTeleportIndex.ElflandCastle, 0x1B),
 			(OverworldTeleportIndex.Gaia, 0x5A),
-			(OverworldTeleportIndex.GurguVolcano, 0x74),
-			(OverworldTeleportIndex.IceCave, 0x2B),
+			(OverworldTeleportIndex.GurguVolcano1, 0x74),
+			(OverworldTeleportIndex.IceCave1, 0x2B),
 			(OverworldTeleportIndex.Lefein, 0x6D),
-			(OverworldTeleportIndex.MarshCave, 0x6E),
+			(OverworldTeleportIndex.MarshCave1, 0x6E),
 			(OverworldTeleportIndex.MatoyasCave, 0x32),
 			(OverworldTeleportIndex.Melmond, 0x4D),
-			(OverworldTeleportIndex.MirageTower, 0x1D),
+			(OverworldTeleportIndex.MirageTower1, 0x1D),
 			(OverworldTeleportIndex.NorthwestCastle, 0x29),
 			(OverworldTeleportIndex.Onrac, 0x5D),
 			(OverworldTeleportIndex.Pravoka, 0x4A),
 			(OverworldTeleportIndex.SardasCave, 0x3A),
-			(OverworldTeleportIndex.TempleOfFiends, 0x57),
+			(OverworldTeleportIndex.TempleOfFiends1, 0x57),
 			(OverworldTeleportIndex.TitansTunnelEast, 0x34),
 			(OverworldTeleportIndex.TitansTunnelWest, 0x35),
 			(OverworldTeleportIndex.Waterfall, 0x46),
@@ -62,12 +62,12 @@ public static class OwDataGroup
 
 		public static Dictionary<ExitTeleportIndex, OverworldTeleportIndex> ExitTeleportOwTeleporter = new()
 		{
-			{ ExitTeleportIndex.ExitCastleOrdeals, OverworldTeleportIndex.CastleOrdeals },
-			{ ExitTeleportIndex.ExitCastleConeria, OverworldTeleportIndex.ConeriaCastle },
-			{ ExitTeleportIndex.ExitEarthCave, OverworldTeleportIndex.EarthCave },
-			{ ExitTeleportIndex.ExitGurguVolcano, OverworldTeleportIndex.GurguVolcano },
-			{ ExitTeleportIndex.ExitIceCave, OverworldTeleportIndex.IceCave },
-			{ ExitTeleportIndex.ExitSkyPalace, OverworldTeleportIndex.MirageTower },
+			{ ExitTeleportIndex.ExitCastleOrdeals, OverworldTeleportIndex.CastleOrdeals1 },
+			{ ExitTeleportIndex.ExitCastleConeria, OverworldTeleportIndex.ConeriaCastle1 },
+			{ ExitTeleportIndex.ExitEarthCave, OverworldTeleportIndex.EarthCave1 },
+			{ ExitTeleportIndex.ExitGurguVolcano, OverworldTeleportIndex.GurguVolcano1 },
+			{ ExitTeleportIndex.ExitIceCave, OverworldTeleportIndex.IceCave1 },
+			{ ExitTeleportIndex.ExitSkyPalace, OverworldTeleportIndex.MirageTower1 },
 			{ ExitTeleportIndex.ExitSeaShrine, OverworldTeleportIndex.Onrac },
 			{ ExitTeleportIndex.ExitTitanE, OverworldTeleportIndex.TitansTunnelEast },
 			{ ExitTeleportIndex.ExitTitanW, OverworldTeleportIndex.TitansTunnelWest },

diff --git a/InfoWindow.cs b/InfoWindow.cs
@@ -32,7 +32,7 @@ public InfoWindow(Texture2D _window, SpriteFont _font, Texture2D _buttonTexture,
 			windowWidth = 28 * 8;
 			okButton = new(_font, "OK", _buttonTexture, new() { new EditorTask() { Type = EditorTasks.ToggleInfoWindow, Value = 10 } });
 
-			windowText = "FFR Map Editor v1.01\n\n" +
+			windowText = "FFR Map Editor v1.03\n\n" +
 				"Main Developer\n   wildham\n\n" +
 				"Icons Designer\n   DarkmoonEX\n\n" +
 				"Based on the work of\n" +

diff --git a/MapData.cs b/MapData.cs
@@ -13,7 +13,7 @@ namespace FFRMapEditorMono
 {
 	public enum OverworldTeleportIndex : byte
 	{
-		CardiaNorth = 0,
+		Cardia1 = 0, // CardiaNorth
 		Coneria = 1,
 		Pravoka = 2,
 		Elfland = 3,
@@ -22,28 +22,28 @@ public enum OverworldTeleportIndex : byte
 		Gaia = 6,
 		Onrac = 7,
 		Lefein = 8,
-		ConeriaCastle = 9,
+		ConeriaCastle1 = 9,
 		ElflandCastle = 10,
 		NorthwestCastle = 11,
-		CastleOrdeals = 12,
-		TempleOfFiends = 13,
-		EarthCave = 14,
-		GurguVolcano = 15,
-		IceCave = 16,
-		CardiaGrass = 17,
-		BahamutCave = 18,
+		CastleOrdeals1 = 12,
+		TempleOfFiends1 = 13,
+		EarthCave1 = 14,
+		GurguVolcano1 = 15,
+		IceCave1 = 16,
+		Cardia2 = 17, // CardiaGrass
+		BahamutCave1 = 18,
 		Waterfall = 19,
 		DwarfCave = 20,
 		MatoyasCave = 21,
 		SardasCave = 22,
-		MarshCave = 23,
-		MirageTower = 24,
+		MarshCave1 = 23,
+		MirageTower1 = 24,
 		TitansTunnelEast = 25,
 		TitansTunnelWest = 26,
-		CardiaMarsh = 27,
-		CardiaSmall = 28,
-		CardiaForest = 29,
-		DefaultLocation = 30,
+		Cardia4 = 27, // CardiaMarsh
+		Cardia5 = 28, // CardiaSmall
+		Cardia6 = 29, // CardiaForest
+		DefaultLocation = 30, // DefaultLocation
 		Unused = 31,
 		None = 0xff
 	}

diff --git a/readme.txt b/readme.txt
@@ -1,4 +1,4 @@
-FFR Map Editor v1.02
+FFR Map Editor v1.03
 
 Credits ........... [S01]
 Version Changes ... [S02]
@@ -20,6 +20,7 @@ Source code at
   https://github.com/wildham0/FFRMapEditorMono
 
 *** Version Change *** [S02]
+1.03: - Fixed FFR locations error at import
 1.02: - Added Undo/Redo options for paiting actions on the map.
       - Added automatic backup ("backupowmap.json" in root folder)
 1.01: - Added safeguards to New Map and Load Map functions.