From b91fcfd11cea058a55ea588a7820469762efb35b Mon Sep 17 00:00:00 2001
From: WizzardMaker <wizzardmaker@gmail.com>
Date: Mon, 17 Aug 2020 23:16:55 +0200
Subject: [PATCH 1/4] Quick and dirty fix for adding files to a collection

---
 S4GFX/Program.cs                         | 16 +++++++-------
 S4GFXInterface/ImageGrid.cs              |  4 ++--
 S4GFXInterface/MainWindow.xaml           |  4 ++--
 S4GFXLibrary/FileReader/GfxFileReader.cs | 28 +++++++++++++++++++-----
 S4GFXLibrary/FileReader/GilFileReader.cs | 11 +++++++---
 S4GFXLibrary/GFX/ImageData.cs            |  6 ++++-
 S4GFXLibrary/GFX/Palette.cs              |  4 ++++
 7 files changed, 51 insertions(+), 22 deletions(-)

diff --git a/S4GFX/Program.cs b/S4GFX/Program.cs
index b07e323..e89e029 100644
--- a/S4GFX/Program.cs
+++ b/S4GFX/Program.cs
@@ -369,10 +369,10 @@ private static ImageData[] LoadFromBitmap(string path, int i, ICollectionFileRea
 
 				ImageData data = new ImageData(map.Height, map.Width);
 
-				image.Width = map.Width;
-				image.Height = map.Height;
+				//image.Width = map.Width;
+				//image.Height = map.Height;
 
-				BitmapData d = map.LockBits(new Rectangle(0, 0, map.Width, map.Height), System.Drawing.Imaging.ImageLockMode.ReadOnly, System.Drawing.Imaging.PixelFormat.Format32bppArgb);
+				BitmapData d = map.LockBits(new Rectangle(0, 0, map.Width, map.Height), System.Drawing.Imaging.ImageLockMode.ReadOnly, System.Drawing.Imaging.PixelFormat.Format32bppPArgb);
 
 				int size = map.Height * map.Width * 4;
 
@@ -386,11 +386,11 @@ private static ImageData[] LoadFromBitmap(string path, int i, ICollectionFileRea
 				int index = 0;
 				for (int y = 0; y < map.Height; y++) {
 					for (int x = 0; x < map.Width; x++) {
-
-						data.data[index + 0] = argb[index + 1];//r
-						data.data[index + 1] = argb[index + 2];//g
-						data.data[index + 2] = argb[index + 3];//b
-						data.data[index + 3] = argb[index + 0];//a
+						//so LockBits stores the data as bgra, because fuck you, thats why...
+						data.data[index + 0] = argb[index + 2];//g1
+						data.data[index + 1] = argb[index + 1];//r2
+						data.data[index + 2] = argb[index + 0];//a3
+						data.data[index + 3] = argb[index + 3];//b0
 
 						index += 4;
 					}
diff --git a/S4GFXInterface/ImageGrid.cs b/S4GFXInterface/ImageGrid.cs
index 5cd0957..ac313f5 100644
--- a/S4GFXInterface/ImageGrid.cs
+++ b/S4GFXInterface/ImageGrid.cs
@@ -30,9 +30,9 @@ public class ImageView : IDisposable {
 			DirectBitmap bitmap;
 			private ExportedBitmap gridElement;
 
-			private bool removeAlpha = true;
+			private bool removeAlpha;
 			private bool onlyShadows;
-			private bool removeShadows = true;
+			private bool removeShadows;
 
 			ImageData data;
 
diff --git a/S4GFXInterface/MainWindow.xaml b/S4GFXInterface/MainWindow.xaml
index a417357..a226f6e 100644
--- a/S4GFXInterface/MainWindow.xaml
+++ b/S4GFXInterface/MainWindow.xaml
@@ -16,7 +16,7 @@
 			</DockPanel.Background>
 			<uc:HeaderButton x:Name="ExportB" Heading="Export" ImageSource="/Resources/Icons/icons8-exportieren-100.png"/>
 
-			<uc:HeaderButton x:Name="ImportB" Heading="Import" ImageSource="/Resources/Icons/icons8-importieren-100.png" IsEnabled="False"/>
+			<uc:HeaderButton x:Name="ImportB" Heading="Import" ImageSource="/Resources/Icons/icons8-importieren-100.png"/>
 
 			<uc:HeaderButton x:Name="SettingsB" Heading="Settings" ImageSource="/Resources/Icons/icons8-einstellungen-100.png"/>
 
@@ -86,7 +86,7 @@
 								<Button x:Name="OpenPath1" Content="Open" HorizontalAlignment="Left" Margin="387,2,0,0" VerticalAlignment="Top" Width="75" Click="OpenPath_Click"/>
 							</Grid>
 						</Border>
-						<CheckBox Content="Include subfolders" HorizontalAlignment="Left" VerticalAlignment="Top" Margin="10,99,0,0"/>
+						<CheckBox x:Name="ImportSubfolders" Content="Include subfolders" HorizontalAlignment="Left" VerticalAlignment="Top" Margin="10,99,0,0"/>
 						<Button Content="Prepare" HorizontalAlignment="Left" VerticalAlignment="Top" Width="75" Margin="191,19,0,0"/>
 						<ComboBox x:Name="ExportGroupIDs_Copy" HorizontalAlignment="Left" VerticalAlignment="Top" Width="96" Margin="76,19,0,0" SelectionChanged="ExportGroupIDs_SelectionChanged" IsEnabled="{Binding IsNotLoading}"/>
 						<Label HorizontalAlignment="Left" Margin="10,15,0,0" VerticalAlignment="Top" Width="66">
diff --git a/S4GFXLibrary/FileReader/GfxFileReader.cs b/S4GFXLibrary/FileReader/GfxFileReader.cs
index 7b21c86..793dd6f 100644
--- a/S4GFXLibrary/FileReader/GfxFileReader.cs
+++ b/S4GFXLibrary/FileReader/GfxFileReader.cs
@@ -46,14 +46,27 @@ public void ChangeImageData(string groupID, int index, ImageData[] newDatas) {
 			Palette p = paletteCollection.GetPalette();
 
 			int palettePosition = 0;
-			int oldIndex = (GetImage(index) as GfxImage).jobIndex;
+			int addedLength = 0;
+			int oldIndex = (GetImage(index) as GfxImage)?.jobIndex ?? 0;
 			for (int j = 0; j < newDatas.Length; j++) {
-				if(index + j > images.Length) {
+				if(index + j >= images.Length) {
 					Array.Resize(ref images, index + j + 1);
+
+					paletteCollection.GetPilFile().Resize(images.Length);
+					p.AddEntry();
+
+					paletteCollection.GetPilFile().SetOffset(index+j, (paletteCollection.GetPilFile().GetOffset(index + j - 1)+256*2));
+
 					images[index + j] = new GfxImage(
 						null,
 						p,
-						paletteCollection.GetOffset((GetImage(index + j - 1) as GfxImage).jobIndex));
+						paletteCollection.GetOffset(index + j));
+
+					images[index + j].jobIndex = index + j;
+
+					offsetTable.AddOffset();
+
+					offsetTable.offsetTable[index+j] = (int)baseStream.Length + addedLength;
 				}
 
 				GfxImage i = images[index + j];
@@ -71,6 +84,7 @@ public void ChangeImageData(string groupID, int index, ImageData[] newDatas) {
 				palettePosition += RecreatePaletteAt(start, palettePosition, newDatas[j]);
 
 				i.buffer = i.CreateImageData(newDatas[j]);
+				addedLength += i.buffer.Length;
 
 				int nextImageStartOffset = offsetTable.GetImageOffset(index + j + 1); //Get the current offset of the next image
 				int offset = Math.Max(0, offsetTable.GetImageOffset(index + j) + i.HeaderSize + i.buffer.Length - nextImageStartOffset - 1); //Our data could be larger, calculate how much larger
@@ -98,8 +112,8 @@ public DataBufferCollection GetDataBufferCollection(string groupID) {
 
 			return new DataBufferCollection(fileId)
 				.AddBuffer(gfxDataBuffer, "gfx")
-				.AddBuffer(pilDataBuffer, "pi4", "pi2")
-				.AddBuffer(paletteDataBuffer, "p46", "p26")
+				.AddBuffer(pilDataBuffer, "pil")//"pi4", "pi2")
+				.AddBuffer(paletteDataBuffer, "pa5","pa6")//"p46", "p26")
 				.AddBuffer(offsetTable.GetData(), "gil");
 		}
 
@@ -232,8 +246,10 @@ public int RecreatePaletteAt(int paletteOffset, int additionOffset, ImageData or
 
 			if (additionOffset == 0) {
 				for (int i = 0; i < 256; i++) {
-					p.SetColor(paletteOffset + i, 9999);
+					p.SetColor(paletteOffset + i, Palette.RGBToPalette(0,255,255));
 				}
+				//p.SetColor(paletteOffset + 0, Palette.RGBToPalette(255, 0, 0));
+				//p.SetColor(paletteOffset + 1, Palette.RGBToPalette(0, 255, 0));
 				additionOffset = 1;
 			}
 
diff --git a/S4GFXLibrary/FileReader/GilFileReader.cs b/S4GFXLibrary/FileReader/GilFileReader.cs
index fff74a7..7ff6aaf 100644
--- a/S4GFXLibrary/FileReader/GilFileReader.cs
+++ b/S4GFXLibrary/FileReader/GilFileReader.cs
@@ -1,10 +1,11 @@
-using System.IO;
+using System;
+using System.IO;
 
 namespace S4GFXLibrary.FileReader
 {
     public class GilFileReader : FileReaderBase
     {
-        int[] offsetTable;
+        public int[] offsetTable;
 
 
         public int GetImageCount()
@@ -22,6 +23,10 @@ public int GetImageOffset(int index)
             return offsetTable[index];
         }
 
+		public void AddOffset() {
+			Array.Resize(ref offsetTable, offsetTable.Length+1);
+		}
+
         /// <summary>
         /// Moves all offsets by offsetToAdd, starting from index startIndex
         /// </summary>
@@ -51,7 +56,7 @@ public GilFileReader(BinaryReader resourceReader)
 
         override public byte[] GetData()
         {
-            byte[] data = new byte[(int)baseStream.Length];
+            byte[] data = new byte[HeaderSize+offsetTable.Length*4];
 
             using (BinaryWriter writer = new BinaryWriter(new MemoryStream(data)))
             {
diff --git a/S4GFXLibrary/GFX/ImageData.cs b/S4GFXLibrary/GFX/ImageData.cs
index 8492cc3..8fa3e05 100644
--- a/S4GFXLibrary/GFX/ImageData.cs
+++ b/S4GFXLibrary/GFX/ImageData.cs
@@ -28,7 +28,11 @@ public uint[] GetUsedColors(bool forceUpdate = false)
             {
                 uint color = Palette.RGBToPalette(data[c], data[c + 1], data[c + 2]);
 
-                if (!usedColors.Contains(color))
+				int r = (int)(color & 0b0000_0000_0000_0000_1111_1111);
+				int g = (int)(color >> 8 & 0b0000_0000_0000_0000_1111_1111);
+				int b = (int)(color >> 16 & 0b0000_0000_0000_0000_1111_1111);
+
+				if (!usedColors.Contains(color))
                 {
                     usedColors.Add(color);
                     usedColors.Sort();
diff --git a/S4GFXLibrary/GFX/Palette.cs b/S4GFXLibrary/GFX/Palette.cs
index bab9368..aa96932 100644
--- a/S4GFXLibrary/GFX/Palette.cs
+++ b/S4GFXLibrary/GFX/Palette.cs
@@ -17,6 +17,10 @@ public Palette(Palette copy)
             palette = (uint[])copy.palette.Clone();
         }
 
+		public void AddEntry() {
+			Array.Resize(ref palette, palette.Length + 256);
+		}
+
         public void SetRGB(int index, int r, int g, int b)
         {
             palette[index] = (uint)(r | g << 8 | b << 16 | 255 << 24);

From 291b7931b5917cf8523147b31dfb9927a811e9bc Mon Sep 17 00:00:00 2001
From: WizzardMaker <wizzardmaker@gmail.com>
Date: Thu, 27 Aug 2020 13:42:26 +0200
Subject: [PATCH 2/4] - No longer loads the first group on app start-up - Added
 GH (ground files) export support

---
 S4GFXInterface/MainWindow.xaml.cs | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/S4GFXInterface/MainWindow.xaml.cs b/S4GFXInterface/MainWindow.xaml.cs
index a8df922..a97021e 100644
--- a/S4GFXInterface/MainWindow.xaml.cs
+++ b/S4GFXInterface/MainWindow.xaml.cs
@@ -167,7 +167,11 @@ public MainWindow() {
 			exportImageGrid.ViewModeChanged += CacheExportScrollPosition;
 			exportImageGrid.SelectionChanged += ExportSelectionChanged;
 
-			ExportGroupIDs.SelectedIndex = 0;
+			CanExport = false;
+			IsNotLoading = true;
+			ReturnToGroupBut.Visibility = Visibility.Collapsed;
+
+			//ExportGroupIDs.SelectedIndex = 0;
 			//ExportGrid.Children.Add(new ExportedBitmap());
 		}
 
@@ -209,7 +213,7 @@ private void ExportAllView() {
 		void GetAllGroups() {
 			List<string> ids = new List<string>();
 
-			foreach (string f in Directory.GetFiles(App.GamePath + "/GFX/", "*.gfx")) {
+			foreach (string f in Directory.GetFiles(App.GamePath + "/GFX/").Where(f => f.EndsWith(".gfx") || f.EndsWith(".gh5"))) {
 				ids.Add(System.IO.Path.GetFileNameWithoutExtension(f));
 			}
 

From 96184f5a335d5aca96e55b7e7146dfe21d5d9a85 Mon Sep 17 00:00:00 2001
From: WizzardMaker <wizzardmaker@gmail.com>
Date: Thu, 27 Aug 2020 13:43:41 +0200
Subject: [PATCH 3/4] Fixed .gh 16 bit image export, by changing the returned
 data from RGB565 to RGB888

---
 S4GFXLibrary/GFX/GfxImage16Bit.cs | 27 +++++++++++++++++++++------
 1 file changed, 21 insertions(+), 6 deletions(-)

diff --git a/S4GFXLibrary/GFX/GfxImage16Bit.cs b/S4GFXLibrary/GFX/GfxImage16Bit.cs
index abc8fdd..33a6b73 100644
--- a/S4GFXLibrary/GFX/GfxImage16Bit.cs
+++ b/S4GFXLibrary/GFX/GfxImage16Bit.cs
@@ -38,25 +38,40 @@ public int GetDataSize() {
 		public void GetImageData16Bit(byte[] buffer, byte[] imgData, int pos, int length) {
 			int j = 0;
 
-			while(j < length) {
+			while (j < length) {
 				int value1 = buffer[pos];
 				pos++;
 
 				int value2 = buffer[pos];
 				pos++;
 
-				imgData[j++] =(byte)( value2 & 0xF8); // r
-				imgData[j++] = (byte)((value1 >> 3) | (value2 << 5) & 0xFC); // g
-				imgData[j++] = (byte)((value1 << 3) & 0xF8); // b
-				imgData[j++] = (byte)(255); // alpha
+				int RGB565 = value2 << 8 | value1;
 
+				int byte_r = (RGB565 & 0xF800) >> 11;
+				int byte_g = (RGB565 & 0x07E0) >> 5;
+				int byte_b = RGB565 & 0x1F;
+
+
+				byte_r = (byte_r * 527 + 23) >> 5;
+				byte_g = (byte_g * 259 + 33) >> 5;
+				byte_b = (byte_b * 527 + 23) >> 6;
+
+
+				int r = ((value2 & 0xF8)); // r
+				int g = (((value1 >> 3) | (value2 << 5) & 0xFC)); // g
+				int b = (((value1 << 3) & 0xF8)); // b
+
+				imgData[j++] = (byte)(byte_r); // r
+				imgData[j++] = (byte)(byte_g); // g
+				imgData[j++] = (byte)(byte_b); // b
+				imgData[j++] = (byte)((255)); // alpha
 			}
 		}
 
 		public ImageData GetImageData() {
 			ImageData img = new ImageData(Height, Width);
 
-			int length = Width * Height * 2;
+			int length = Width * Height * 4;
 			int pos = DataOffset;
 
 			byte[] imgData = new byte[length];

From 4c8f64fdfbe70c2898616ddd2884cf6924eee0b6 Mon Sep 17 00:00:00 2001
From: WizzardMaker <wizzardmaker@gmail.com>
Date: Wed, 16 Sep 2020 23:11:37 +0200
Subject: [PATCH 4/4] Support for unit export (with all 8 team colors)

QoL Features added to the interface
---
 S4GFXInterface/ImageGrid.cs             | 10 ++++-
 S4GFXInterface/MainWindow.xaml          | 42 +++++++++++++----
 S4GFXInterface/MainWindow.xaml.cs       | 47 +++++++++++++++++--
 S4GFXLibrary/FileReader/GhFileReader.cs |  8 ++--
 S4GFXLibrary/GFX/GfxImage.cs            |  9 +---
 S4GFXLibrary/GFX/GfxImage16Bit.cs       | 35 ++++++++++-----
 S4GFXLibrary/GFX/Palette.cs             | 60 ++++++++++++++++++++++---
 7 files changed, 169 insertions(+), 42 deletions(-)

diff --git a/S4GFXInterface/ImageGrid.cs b/S4GFXInterface/ImageGrid.cs
index ac313f5..4aeece3 100644
--- a/S4GFXInterface/ImageGrid.cs
+++ b/S4GFXInterface/ImageGrid.cs
@@ -30,9 +30,8 @@ public class ImageView : IDisposable {
 			DirectBitmap bitmap;
 			private ExportedBitmap gridElement;
 
-			private bool removeAlpha;
 			private bool onlyShadows;
-			private bool removeShadows;
+			public static bool removeAlpha, removeShadows, removeGarbage;
 
 			ImageData data;
 
@@ -74,6 +73,13 @@ private void CreateBitmap() {
 						byte green = data.data[index + 1];
 						byte blue = data.data[index + 2];
 
+
+						if (removeGarbage && y > height-2) {
+							red = 255;
+							green = 0;
+							blue = 0;
+						}
+
 						if (red == 255 && green + blue == 0) {
 							alpha = removeAlpha ? 0 : alpha;
 						}
diff --git a/S4GFXInterface/MainWindow.xaml b/S4GFXInterface/MainWindow.xaml
index a226f6e..f72372c 100644
--- a/S4GFXInterface/MainWindow.xaml
+++ b/S4GFXInterface/MainWindow.xaml
@@ -26,26 +26,52 @@
 			<TabItem x:Name="Export" Header="Export" Margin="-2,-2,-2,0">
 				<DockPanel Margin="0,0,10,0" LastChildFill="False" ScrollViewer.VerticalScrollBarVisibility="Disabled">
 					<Grid Width="328" Margin="0,0,0,23">
-						<Button x:Name="ReturnToGroupBut" HorizontalAlignment="Left" VerticalAlignment="Top" Width="117" Margin="201,10,0,0" Height="22" Click="ReturnToGroupBut_Click">
+						<Grid.RowDefinitions>
+							<RowDefinition Height="121*"/>
+							<RowDefinition Height="327*"/>
+						</Grid.RowDefinitions>
+						<Button x:Name="ReturnToGroupBut" HorizontalAlignment="Left" VerticalAlignment="Top" Width="113" Margin="205,10,0,0" Height="22" Click="ReturnToGroupBut_Click">
 							<StackPanel Height="18" Width="133" Orientation="Horizontal">
-								<Image Source="Resources/Icons/icons8-zurück-96.png" Width="23" Margin="0"/>
+								<Image Source="Resources/Icons/icons8-zurück-96.png" Width="18" Margin="0"/>
 								<TextBlock TextWrapping="Wrap" Text="Return to group" Margin="0" Width="101"/>
 							</StackPanel>
 						</Button>
-						<ComboBox x:Name="ExportGroupIDs" HorizontalAlignment="Left" VerticalAlignment="Top" Width="96" Margin="76,10,0,0" SelectionChanged="ExportGroupIDs_SelectionChanged" IsEnabled="{Binding IsNotLoading}"/>
+						<ComboBox x:Name="ExportGroupIDs" HorizontalAlignment="Left" VerticalAlignment="Top" Width="52" Margin="76,10,0,0" SelectionChanged="ExportGroupIDs_SelectionChanged" IsEnabled="{Binding IsNotLoading}"/>
 						<Label HorizontalAlignment="Left" Margin="10,6,0,0" VerticalAlignment="Top" Width="66">
 							<TextBlock HorizontalAlignment="Left" TextWrapping="Wrap" Text="Group ID:" VerticalAlignment="Top"/>
 						</Label>
-						<Button x:Name="ExportSaveToDiskSingle" Height="22" Content="Save selected to Disk" Margin="174,416,10,10" Click="ExportSaveToDiskSingle_Click" IsEnabled="{Binding CanExportSingle}"/>
-						<Button x:Name="ExportSaveToDiskGroup" Height="22" Content="Save group to Disk" Margin="10,416,174,10" Click="ExportSaveToDiskGroup_Click"  IsEnabled="{Binding CanExportGroup}"/>
-						<Button x:Name="ExportSaveToDiskAll" Height="22" Content="Save All to Disk" Margin="92,389,92,37" Click="ExportSaveToDiskAll_Click"  IsEnabled="{Binding CanExportAll}"/>
+						<Button x:Name="ExportSaveToDiskSingle" Height="22" Content="Save selected to Disk" Margin="174,294.667,10,10" Click="ExportSaveToDiskSingle_Click" IsEnabled="{Binding CanExportSingle}" Grid.Row="1"/>
+						<Button x:Name="ExportSaveToDiskGroup" Height="22" Content="Save group to Disk" Margin="10,294.667,174,10" Click="ExportSaveToDiskGroup_Click"  IsEnabled="{Binding CanExportGroup}" Grid.Row="1"/>
+						<Button x:Name="ExportSaveToDiskAll" Height="22" Content="Save All to Disk" Margin="92,267.667,92,37" Click="ExportSaveToDiskAll_Click"  IsEnabled="{Binding CanExportAll}" Grid.Row="1"/>
+						<Button x:Name="ReloadBut" Content="Reload" HorizontalAlignment="Left" VerticalAlignment="Top" Width="58" Margin="137,10,0,0" Height="22" Click="ReloadBut_Click" IsEnabled="{Binding IsNotLoading}"/>
+						<Label HorizontalAlignment="Left" Margin="5,61,0,0" VerticalAlignment="Top" Width="313">
+							<TextBlock HorizontalAlignment="Left" TextWrapping="Wrap" VerticalAlignment="Top" Width="303"><Run Text="GFX Settings:"/><Run Text="    "/><Run Text="            "/><Run Text="*changing these requires a reload"/></TextBlock>
+						</Label>
+						<ComboBox x:Name="TeamGFXSetting" HorizontalAlignment="Left" VerticalAlignment="Top" Width="84" Margin="78,26,0,0" IsEnabled="{Binding IsNotLoading}" SelectedIndex="0" Grid.Row="1">
+							<ComboBoxItem Content="Red (0)"/>
+							<ComboBoxItem Content="Blue (1)"/>
+							<ComboBoxItem Content="Green (2)"/>
+							<ComboBoxItem Content="Yellow (3)"/>
+							<ComboBoxItem Content="Purple (4)"/>
+							<ComboBoxItem Content="Orange (5)"/>
+							<ComboBoxItem Content="Cyan (6)"/>
+							<ComboBoxItem Content="White (7)"/>
+						</ComboBox>
+						<Label HorizontalAlignment="Left" Margin="7,22,0,0" VerticalAlignment="Top" Width="71" Grid.Row="1">
+							<TextBlock HorizontalAlignment="Left" TextWrapping="Wrap" Text="Team color:" VerticalAlignment="Top"/>
+						</Label>
+						<TextBlock HorizontalAlignment="Left" Height="23" TextWrapping="Wrap" VerticalAlignment="Top" Width="120" Margin="179,27,0,0" Grid.Row="1"><Run Text="*for 20,21,22,"/><Run Text="23"/><Run Text=".gfx"/></TextBlock>
+						<Label HorizontalAlignment="Left" Margin="5,180.667,0,0" VerticalAlignment="Top" Width="93" Grid.Row="1"/>
+						<CheckBox x:Name="TransparencyCheck" Content="Use red as transparency" HorizontalAlignment="Left" VerticalAlignment="Top" Margin="10,87,0,0" Unchecked="TransparencyCheck_Checked" Checked="TransparencyCheck_Checked"/>
+						<CheckBox x:Name="ShadowCheck" Content="Use green as shadow" HorizontalAlignment="Left" VerticalAlignment="Top" Margin="10,107,0,0" Grid.RowSpan="2" Unchecked="ShadowCheck_Checked" Checked="ShadowCheck_Checked"/>
+						<CheckBox x:Name="RemoveGarbageCheck" Content="Remove last line (garbage info)" HorizontalAlignment="Left" VerticalAlignment="Top" Margin="10,6,0,0" Unchecked="RemoveGarbageCheck_Checked" Checked="RemoveGarbageCheck_Checked" Grid.Row="1"/>
 					</Grid>
 					<StatusBar HorizontalContentAlignment="Center" VerticalContentAlignment="Center" DockPanel.Dock="Bottom" BorderThickness="0 1 0 0" BorderBrush="{DynamicResource {x:Static SystemColors.ControlDarkBrushKey}}" Margin="-328,0,0,0">
 						<StatusBarItem>
-							<TextBlock x:Name="ExportLoadCount" Text="Hello!"/>
+							<TextBlock x:Name="ExportLoadCount" Text="Hello!" Visibility="Hidden"/>
 						</StatusBarItem>
 						<StatusBarItem>
-							<Image x:Name="LoadingIcon" Source="Resources/Icons/icons8-ladeanimation-bild-1-50.png" Height="22" Width="22">
+							<Image x:Name="LoadingIcon" Source="Resources/Icons/icons8-ladeanimation-bild-1-50.png" Height="22" Width="22" Visibility="Hidden">
 								<Image.Triggers>
 									<EventTrigger RoutedEvent="Window.Loaded">
 										<BeginStoryboard>
diff --git a/S4GFXInterface/MainWindow.xaml.cs b/S4GFXInterface/MainWindow.xaml.cs
index a97021e..ad92f6c 100644
--- a/S4GFXInterface/MainWindow.xaml.cs
+++ b/S4GFXInterface/MainWindow.xaml.cs
@@ -171,6 +171,12 @@ public MainWindow() {
 			IsNotLoading = true;
 			ReturnToGroupBut.Visibility = Visibility.Collapsed;
 
+			LoadingIcon.Visibility = Visibility.Hidden;
+
+
+			ImageGrid.ImageView.removeAlpha = TransparencyCheck.IsChecked == false;
+			ImageGrid.ImageView.removeShadows = ShadowCheck.IsChecked == false;
+
 			//ExportGroupIDs.SelectedIndex = 0;
 			//ExportGrid.Children.Add(new ExportedBitmap());
 		}
@@ -282,7 +288,7 @@ public ICollectionFileReader DoLoadGH(string fileId) {
 			var gh = new BinaryReader(File.Open(fileId + ".gh5", FileMode.Open), Encoding.Default, true);
 			//var gl = new BinaryReader(File.Open(fileId + ".gl5", FileMode.Open), Encoding.Default, true);
 
-			gfxFile = new GhFileReader(gh);
+			gfxFile = new GhFileReader(gh, true);
 
 			gh.Close();
 			//gl.Close();
@@ -302,8 +308,8 @@ public ICollectionFileReader DoLoad(string fileId, bool usePli, bool useJil) {
 				paletteIndex = new BinaryReader(File.Open(fileId + ".pil", FileMode.Open), Encoding.Default, true);
 				palette = new BinaryReader(File.Open(fileId + ".pa6", FileMode.Open), Encoding.Default, true);
 			} else {
-				paletteIndex = new BinaryReader(File.Open(fileId + ".pi4", FileMode.Open), Encoding.Default, true);
-				palette = new BinaryReader(File.Open(fileId + ".p46", FileMode.Open), Encoding.Default, true);
+				paletteIndex = new BinaryReader(File.Open(fileId + ".pi2", FileMode.Open), Encoding.Default, true);
+				palette = new BinaryReader(File.Open(fileId + ".p26", FileMode.Open), Encoding.Default, true);
 			}
 
 			if (useJil) {
@@ -317,6 +323,16 @@ public ICollectionFileReader DoLoad(string fileId, bool usePli, bool useJil) {
 			var paletteIndexList = new PilFileReader(paletteIndex);
 			var paletteCollection = new PaletteCollection(palette, paletteIndexList);
 
+			switch (fileId.Substring(fileId.Length-2)) {
+				case ("20"):
+				case ("21"):
+				case ("22"):
+				case ("23"):
+					paletteCollection.GetPalette().replaceTeamColors = true;
+					paletteCollection.GetPalette().team = TeamGFXSetting.SelectedIndex;
+				break;
+			}
+
 			DilFileReader directionIndexList = null;
 			JilFileReader jobIndexList = null;
 
@@ -376,6 +392,7 @@ private void SaveAllBitmaps(string path, ICollectionFileReader file = null) {
 						Dispatcher.Invoke((Action)delegate {
 							try {
 								ExportLoadCount.Text = $"Loaded: {loaded++}/{count}";
+								ExportLoadCount.Visibility = Visibility.Visible;
 								LoadingIcon.Visibility = Visibility.Visible;
 							} catch (Exception e) {
 								Console.WriteLine(e.Message);
@@ -432,9 +449,15 @@ public void AddButton(HeaderButton b, object indexObject) {
 		}
 
 		private void ExportGroupIDs_SelectionChanged(object sender, SelectionChangedEventArgs e) {
+			LoadGroup();
+		}
+
+		private void LoadGroup() {
+			if (ExportScrollView == null)
+				return;
 			ExportScrollView.ScrollToTop();
 
-			exportImageGrid.Clear();
+			exportImageGrid?.Clear();
 			source.Cancel();
 
 			exportImageGrid.SetContainer(int.Parse((string)ExportGroupIDs.SelectedItem));
@@ -498,6 +521,22 @@ private void ExportSaveToDiskSingle_Click(object sender, RoutedEventArgs e) {
 			exportImageGrid.selectedItem.SaveBitmapToFile(GetFullPath(exportImageGrid.selectedItem.Group));
 		}
 
+		private void ReloadBut_Click(object sender, RoutedEventArgs e) {
+			LoadGroup();
+		}
+
+		private void TransparencyCheck_Checked(object sender, RoutedEventArgs e) {
+			ImageGrid.ImageView.removeAlpha = TransparencyCheck.IsChecked == false;
+		}
+
+		private void ShadowCheck_Checked(object sender, RoutedEventArgs e) {
+			ImageGrid.ImageView.removeShadows = ShadowCheck.IsChecked == false;
+		}
+
+		private void RemoveGarbageCheck_Checked(object sender, RoutedEventArgs e) {
+			ImageGrid.ImageView.removeGarbage = ShadowCheck.IsChecked == false;
+		}
+
 		private void ExportSaveToDiskGroup_Click(object sender, RoutedEventArgs e) {
 			foreach (var i in exportImageGrid.GetImagesInCurrentGroup()) {
 				i.SaveBitmapToFile(GetFullPath(i.Group));
diff --git a/S4GFXLibrary/FileReader/GhFileReader.cs b/S4GFXLibrary/FileReader/GhFileReader.cs
index 0dc0289..ba995e8 100644
--- a/S4GFXLibrary/FileReader/GhFileReader.cs
+++ b/S4GFXLibrary/FileReader/GhFileReader.cs
@@ -37,7 +37,7 @@ public DataBufferCollection GetDataBufferCollection(string groupID) {
 			throw new System.NotImplementedException();
 		}
 
-		public GhFileReader(BinaryReader reader) {
+		public GhFileReader(BinaryReader reader, bool isGh5 = true) {
 			ReadResource(reader);
 
 			reader.BaseStream.Seek(0, SeekOrigin.Begin);
@@ -62,10 +62,10 @@ public GhFileReader(BinaryReader reader) {
 
 				switch (imageType) {
 					case 0:
-					img = new GfxImage16Bit(buffer, 128, rowCount);
+					img = new GfxImage16Bit(buffer, 128, rowCount, isGh5);
 					break;
 					case 1:
-					img = new GfxImage16Bit(buffer, 256, rowCount);
+					img = new GfxImage16Bit(buffer, 256, rowCount, isGh5);
 					break;
 					case 2:
 					img = new GfxImageWithPalette(buffer, 128, rowCount);
@@ -76,7 +76,7 @@ public GhFileReader(BinaryReader reader) {
 				}
 
 				img.Flag1 = flag1;
-				img.Flag1 = flag2;
+				img.Flag2 = flag2;
 				img.DataOffset = filePos + 8;
 
 				img.Index = index;
diff --git a/S4GFXLibrary/GFX/GfxImage.cs b/S4GFXLibrary/GFX/GfxImage.cs
index 1e9b4a2..34aadb8 100644
--- a/S4GFXLibrary/GFX/GfxImage.cs
+++ b/S4GFXLibrary/GFX/GfxImage.cs
@@ -90,12 +90,7 @@ void GetImageDataWithRunLengthEncoding(byte[] buffer, uint[] imgData, int pos, i
                 }
                 else
                 {
-                    color = palette.GetColor(paletteOffset + value);
-					//if (value > 200) {
-					//	color = Palette.RGBToPalette(0, 0, value, value);
-					//} else {
-					//	color = Palette.RGBToPalette(255, 0, 0);
-					//}
+                    color = palette.GetColor(paletteOffset + value, value);
 				}
 
                 for (int i = 0; i < count && j < length; i++)
@@ -118,7 +113,7 @@ public void GetImageDataWithNoEncoding(byte[] buffer, uint[] imgData, int pos, i
                 int value = pos >= buffer.Length ? 1 : buffer[pos];
                 pos++;
 
-                imgData[j++] = palette.GetColor(paletteOffset + value);
+                imgData[j++] = palette.GetColor(paletteOffset + value, value);
                 if (!paletteEntries.Contains(paletteOffset + value))
                     paletteEntries.Add(paletteOffset + value);
             }
diff --git a/S4GFXLibrary/GFX/GfxImage16Bit.cs b/S4GFXLibrary/GFX/GfxImage16Bit.cs
index 33a6b73..3cf26c6 100644
--- a/S4GFXLibrary/GFX/GfxImage16Bit.cs
+++ b/S4GFXLibrary/GFX/GfxImage16Bit.cs
@@ -18,11 +18,15 @@ class GfxImage16Bit : IGfxImage {
 		public int GroupIndex { get; set; }
 
 		public int rowCount;
+
+		bool convertTo24Bit;
+
 		public byte[] buffer;
 
-		public GfxImage16Bit(byte[] buffer, int width, int rowCount) {
+		public GfxImage16Bit(byte[] buffer, int width, int rowCount, bool convertTo24Bit = true) {
 			this.buffer = buffer;
 			this.rowCount = rowCount;
+			this.convertTo24Bit = convertTo24Bit;
 			Width = width;
 			Height = rowCount * width;
 		}
@@ -51,15 +55,26 @@ public void GetImageData16Bit(byte[] buffer, byte[] imgData, int pos, int length
 				int byte_g = (RGB565 & 0x07E0) >> 5;
 				int byte_b = RGB565 & 0x1F;
 
-
-				byte_r = (byte_r * 527 + 23) >> 5;
-				byte_g = (byte_g * 259 + 33) >> 5;
-				byte_b = (byte_b * 527 + 23) >> 6;
-
-
-				int r = ((value2 & 0xF8)); // r
-				int g = (((value1 >> 3) | (value2 << 5) & 0xFC)); // g
-				int b = (((value1 << 3) & 0xF8)); // b
+				int ogR = byte_r;
+				int ogG = byte_g;
+				int ogB = byte_b;
+
+				if (convertTo24Bit) {
+					byte_r = (byte_r * 527 + 31) >> 5;
+					byte_g = (byte_g * 259 + 33) >> 5;
+					byte_b = (byte_b * 527 + 31) >> 6;
+				} else {
+					byte_r = (int)Math.Round(byte_r / 31f * 255f);
+					byte_g = (int)Math.Round(byte_g / 63f * 255f);
+					byte_b = (int)Math.Round(byte_b / 31f * 255f);
+				}
+
+				int r = (int)Math.Round((byte_r << 5) / 527d); // r
+				int g = (int)Math.Round((byte_g << 5) / 259d); // g
+				int b = (int)Math.Round((byte_b << 6) / 527d); // b
+
+				//if (r - ogR + g - ogG + b - ogB != 0)
+				//	Console.WriteLine("Difference!");
 
 				imgData[j++] = (byte)(byte_r); // r
 				imgData[j++] = (byte)(byte_g); // g
diff --git a/S4GFXLibrary/GFX/Palette.cs b/S4GFXLibrary/GFX/Palette.cs
index aa96932..f12faef 100644
--- a/S4GFXLibrary/GFX/Palette.cs
+++ b/S4GFXLibrary/GFX/Palette.cs
@@ -1,12 +1,30 @@
 using System;
+using System.Collections.Generic;
+using System.Drawing.Drawing2D;
 using System.IO;
 
 namespace S4GFXLibrary.GFX
 {
     public class Palette
     {
+        #region Team Colors
+        static ushort[] redTeam = { 0x0000, 0x0000, 0x0000, 0x0800, 0x1000, 0x1800, 0x2000, 0x2800, 0x3000, 0x3800, 0x4000, 0x4800, 0x5000, 0x5800, 0x6000, 0x6800, 0x7000, 0x7800, 0x8000, 0x8800, 0x9000, 0x9800, 0xA000, 0xA800, 0xB000, 0xB800, 0xC000, 0xC800, 0xD000, 0xD820, 0xE061, 0xE8A2, };
+        static ushort[] blueTeam = { 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0001, 0x0002, 0x0003, 0x0004, 0x0005, 0x0006, 0x0007, 0x0008, 0x0008, 0x0009, 0x000A, 0x000B, 0x000C, 0x000D, 0x000E, 0x000F, 0x0010, 0x0011, 0x0832, 0x1073, 0x18B4, 0x20F5, 0x2936, 0x3177, 0x39B8, 0x41F9, };
+        static ushort[] greenTeam = { 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0020, 0x0060, 0x00A0, 0x00E0, 0x0120, 0x0160, 0x01A0, 0x01E0, 0x0220, 0x0260, 0x02A0, 0x02E0, 0x0320, 0x0360, 0x03A0, 0x03E0, 0x0420, 0x0460, 0x04A0, 0x04E1, 0x0522, 0x0563, 0x05A4, 0x05E5, 0x0626, };
+        static ushort[] yellowTeam = { 0x0000, 0x0800, 0x1020, 0x1860, 0x20A0, 0x28E0, 0x3120, 0x3960, 0x41A0, 0x41E0, 0x4A20, 0x5260, 0x5AA0, 0x62E0, 0x6B20, 0x7360, 0x7BA0, 0x83E0, 0x8C20, 0x9460, 0x9CA0, 0xA4E0, 0xAD20, 0xB540, 0xBD80, 0xC5C0, 0xCE00, 0xD640, 0xDE80, 0xE6C0, 0xEF00, 0xF740, };
+        static ushort[] purpleTeam = { 0x0000, 0x0001, 0x0002, 0x0003, 0x0004, 0x0005, 0x0006, 0x0007, 0x0008, 0x0809, 0x100A, 0x180B, 0x200C, 0x280D, 0x300E, 0x380F, 0x4010, 0x4811, 0x5012, 0x5813, 0x6014, 0x6815, 0x7016, 0x7857, 0x8098, 0x88D9, 0x911A, 0x995B, 0xA19C, 0xA9DD, 0xB21E, 0xBA5F, };
+        static ushort[] orangeTeam = { 0x0000, 0x0800, 0x1000, 0x1800, 0x2000, 0x2800, 0x3000, 0x3800, 0x4000, 0x4800, 0x5000, 0x5800, 0x6020, 0x6860, 0x70A0, 0x78E0, 0x8120, 0x8960, 0x91A0, 0x99E0, 0xA220, 0xAA60, 0xB2A0, 0xB2E0, 0xBB20, 0xC360, 0xCBA0, 0xD3E0, 0xDC21, 0xE462, 0xECA3, 0xF4E4, };
+        static ushort[] cyanTeam = { 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0020, 0x0060, 0x00A0, 0x00E1, 0x0122, 0x0163, 0x01A4, 0x01E5, 0x0226, 0x0267, 0x02A8, 0x02C9, 0x030A, 0x034B, 0x038C, 0x03CD, 0x040E, 0x044F, 0x0490, 0x04D1, 0x0512, 0x0D53, 0x1594, 0x1DD5, 0x2616, };
+        static ushort[] whiteTeam = { 0x0020, 0x0061, 0x00A2, 0x00E3, 0x0924, 0x1165, 0x19A6, 0x21E7, 0x2A28, 0x3269, 0x3AAA, 0x42EB, 0x4B2C, 0x536D, 0x5BAE, 0x63EF, 0x6C30, 0x7471, 0x7CB2, 0x84F3, 0x8D34, 0x9575, 0x9DB6, 0xA5F7, 0xAE38, 0xB679, 0xBEBA, 0xC6FB, 0xCF3C, 0xD77D, 0xD7BE, 0xDFFF, };
+
+        static List<ushort[]> teams = new List<ushort[]> { redTeam, blueTeam, greenTeam, yellowTeam, purpleTeam, orangeTeam, cyanTeam, whiteTeam };
+        #endregion
+
         public uint[] palette;
 
+        public bool replaceTeamColors;
+        public int team;
+
         public Palette(int count = 256)
         {
             palette = new uint[count];
@@ -35,8 +53,42 @@ public static uint RGBToPalette(int r, int g, int b, int a = 255)
             return (uint)(r | g << 8 | b << 16 | a << 24);
         }
 
-        public uint GetColor(int index)
+        public static uint RGB565ToPalette(ushort r565) {
+            int value2 = (r565 >> 8) & 0x00FF;
+            int value1 = r565 & 0x00FF;
+
+            int r = value2 & 0b1111_1000;
+            int g = value1 >> 3 | value2 << 5 & 0b1111_1100;
+            int b = value1 << 3 & 0b1111_1000;
+
+            return RGBToPalette(r, g, b);
+        }
+
+        public uint GetColor(int index, int offset)
         {
+            //return RGBToPalette(offset, 0, 0);
+
+
+            if (replaceTeamColors && offset > (224-32) && offset <(224)) {
+				int i = 224 - offset;
+                /*  32 - i = 32
+                 *  32 - i = 0
+                 */
+				return RGB565ToPalette(teams[team][32-i]);
+			}
+
+            int offsetToFile = index - offset;
+
+            if (offset >= 224 && replaceTeamColors) {
+                offsetToFile += 256 + 32 * team;
+                index = offsetToFile + (offset - 224);
+            }
+
+            return GetColor(index);
+        }
+        public uint GetColor(int index) {
+            if (index < 0)
+                return 0;
             return palette[index];
         }
 
@@ -68,16 +120,10 @@ public int Read16BitPalette(BinaryReader buffer, int pos = 0)
                 int value1 = buffer.ReadByte();
                 int value2 = buffer.ReadByte();
 
-                int v = value1 << 8 | value2;
-
                 int r = value2 & 0b1111_1000;
                 int g = value1 >> 3 | value2 << 5 & 0b1111_1100;
                 int b = value1 << 3 & 0b1111_1000;
 
-                int valueG = ((r & 0b1111_1000) << 8) + ((g & 0b1111_1100) << 3) + (b >> 3);
-                int v1 = valueG & 0b0000_0000_1111_1111;
-                int v2 = valueG >> 8 & 0b0000_0000_1111_1111;
-
                 SetRGB(i, r, g, b);
             }