save underworld/moon data

Author: Entroper

FF4/FF4Rom.cs

@@ -141,25 +141,53 @@ public Tileset LoadWorldMapTileset(MapType mapType)
 		public void SaveWorldMap(Map map)
 		{
 			var length = map.CompressedSize;
-			if (length > OverworldRowDataMaxLength)
+			int maxLength =
+				map.MapType == MapType.Overworld ? OverworldRowDataMaxLength :
+				map.MapType == MapType.Underworld ? UnderworldRowDataMaxLength :
+				map.MapType == MapType.Moon ? MoonRowDataMaxLength : 0;
+			if (length > maxLength)
 			{
-				throw new IndexOutOfRangeException($"Overworld map data is too big: {length} bytes used, {OverworldRowDataMaxLength} bytes allowed");
+				throw new IndexOutOfRangeException($"World map data is too big: {length} bytes used, {maxLength} bytes allowed");
 			}
 
-			byte[] pointerBytes = new byte[OverworldRowCount * 2];
+			byte[] pointerBytes = new byte[2*map.Height];
 			map.GetCompressedData(out byte[] data, out ushort[] pointers);
 			Buffer.BlockCopy(pointers, 0, pointerBytes, 0, pointerBytes.Length);
 
-			Put(OverworldRowDataOffset, data);
-			Put(OverworldRowPointersOffset, pointerBytes);
+			if (map.MapType == MapType.Overworld)
+			{
+				Put(OverworldRowDataOffset, data);
+				Put(OverworldRowPointersOffset, pointerBytes);
+			}
+			else if (map.MapType == MapType.Underworld)
+			{
+				Put(UnderworldRowDataOffset, data);
+				Put(UnderworldRowPointersOffset, pointerBytes);
+			}
+			else if (map.MapType == MapType.Moon)
+			{
+				Put(MoonRowDataOffset, data);
+				Put(MoonRowPointersOffset, pointerBytes);
+			}
 		}
 
-		public void SaveWorldMapTileset(Tileset tileset)
+		public void SaveWorldMapTileset(MapType mapType, Tileset tileset)
 		{
 			byte[] propertyBytes = new byte[MapTileCount*2];
 			Buffer.BlockCopy(tileset.TileProperties, 0, propertyBytes, 0, propertyBytes.Length);
 
-			Put(OverworldTilePropertiesOffset, propertyBytes);
+			if (mapType == MapType.Overworld)
+			{
+				Put(OverworldTilePropertiesOffset, propertyBytes);
+			}
+			else if (mapType == MapType.Underworld)
+			{
+				Put(UnderworldTilePropertiesOffset, propertyBytes);
+			}
+			else if (mapType == MapType.Moon)
+			{
+				Put(MoonTilePropertiesOffset, propertyBytes);
+			}
 		}
 	}
 }

FF4/Map.cs

@@ -112,27 +112,36 @@ public Map(MapType mapType, byte[] data, ushort[] pointers)
 
 		public void GetCompressedData(out byte[] data, out ushort[] pointers)
 		{
-			// Just for now until we cover all execution paths.
-			data = null;
-			pointers = null;
-
 			if (MapType == MapType.Overworld)
 			{
 				data = new byte[FF4Rom.OverworldRowDataMaxLength];
-				pointers = new ushort[Height];
-				int dataOffset = 0;
-				for (int y = 0; y < Height; y++)
-				{
-					Buffer.BlockCopy(_compressedRows[y], 0, data, dataOffset, _compressedRowLengths[y]);
-					pointers[y] = (ushort)dataOffset;
+			}
+			else if (MapType == MapType.Underworld)
+			{
+				data = new byte[FF4Rom.UnderworldRowDataMaxLength];
+			}
+			else if (MapType == MapType.Moon)
+			{
+				data = new byte[FF4Rom.MoonRowDataMaxLength];
+			}
+			else
+			{
+				throw new Exception("Invalid world map type");
+			}
 
-					dataOffset += _compressedRowLengths[y];
-				}
+			pointers = new ushort[Height];
+			int dataOffset = 0;
+			for (int y = 0; y < Height; y++)
+			{
+				Buffer.BlockCopy(_compressedRows[y], 0, data, dataOffset, _compressedRowLengths[y]);
+				pointers[y] = (ushort)dataOffset;
 
-				while (dataOffset < data.Length)
-				{
-					data[dataOffset++] = 0xFF;
-				}
+				dataOffset += _compressedRowLengths[y];
+			}
+
+			while (dataOffset < data.Length)
+			{
+				data[dataOffset++] = 0xFF;
 			}
 		}
 

FF4MapEdit/MainWindow.xaml.cs

@@ -119,20 +119,24 @@ private void SaveButton_Click(object sender, RoutedEventArgs e)
 		{
 			if (_map != null)
 			{
-				try
-				{
-					_rom.SaveWorldMap(_map);
-					_rom.SaveWorldMapTileset(_tileset);
-				}
-				catch (IndexOutOfRangeException ex) when (ex.Message.StartsWith("Overworld map data is too big"))
-				{
-					MessageBox.Show(ex.Message, "Error while saving");
-				}
-
+				SaveWorldMap();
 				_rom.Save(_filename);
 			}
 		}
 
+		private void SaveWorldMap()
+		{
+			try
+			{
+				_rom.SaveWorldMap(_map);
+				_rom.SaveWorldMapTileset(_map.MapType, _tileset);
+			}
+			catch (IndexOutOfRangeException ex) when (ex.Message.StartsWith("World map data is too big"))
+			{
+				MessageBox.Show(ex.Message, "Error while saving");
+			}
+		}
+
 		private void Tileset_MouseLeftButtonUp(object sender, MouseButtonEventArgs e)
 		{
 			GetClickedTile(sender, e, out int x, out int y);
@@ -153,7 +157,10 @@ private void MapComboBox_SelectionChanged(object sender, SelectionChangedEventAr
 		{
 			var mapType = (MapType)Enum.Parse(typeof(MapType), ((ComboBoxItem)MapComboBox.SelectedItem).Content.ToString());
 			if (mapType != _map.MapType)
+			{
+				SaveWorldMap();
 				LoadWorldMap(mapType);
+			}
 		}
 
 		private void HighlightSelectedTile(int x, int y)