From 687108a705a7a34ea6f003644a0500e68e58b9b3 Mon Sep 17 00:00:00 2001
From: Colin Halseth <qkmaxware@gmail.com>
Date: Sat, 20 Jan 2024 13:05:14 -0800
Subject: [PATCH] Godot verison add colour palette switcher

---
 Gameboy.Player.Godot/.gitignore               |   1 +
 .../Debuggers/Map Debugger.tscn               |   6 +
 Gameboy.Player.Godot/Debuggers/MapDebugger.cs |   8 +-
 .../Debuggers/PaletteDebugger.cs              | 242 +++++++++++++++---
 .../Debuggers/PaletteDebugger.tscn            | 169 +++++++++---
 Gameboy.Player.Godot/export_presets.cfg       | 216 ++++++++++++++++
 Gameboy/hardware/gpu/BackgroundMapSpan.cs     |  28 +-
 Gameboy/hardware/gpu/IDebuggablePpu.cs        |   1 +
 Gameboy/hardware/gpu/Ppu.Debug.cs             |   1 +
 9 files changed, 607 insertions(+), 65 deletions(-)
 create mode 100644 Gameboy.Player.Godot/export_presets.cfg

diff --git a/Gameboy.Player.Godot/.gitignore b/Gameboy.Player.Godot/.gitignore
index 4709183..eeb503d 100644
--- a/Gameboy.Player.Godot/.gitignore
+++ b/Gameboy.Player.Godot/.gitignore
@@ -1,2 +1,3 @@
 # Godot 4+ specific ignores
 .godot/
+[bB]in/
\ No newline at end of file
diff --git a/Gameboy.Player.Godot/Debuggers/Map Debugger.tscn b/Gameboy.Player.Godot/Debuggers/Map Debugger.tscn
index 3440c53..caf907a 100644
--- a/Gameboy.Player.Godot/Debuggers/Map Debugger.tscn	
+++ b/Gameboy.Player.Godot/Debuggers/Map Debugger.tscn	
@@ -37,4 +37,10 @@ text = "Reload"
 icon = ExtResource("3_fd1ro")
 expand_icon = true
 
+[node name="Label" type="Label" parent="."]
+layout_mode = 0
+offset_right = 40.0
+offset_bottom = 23.0
+text = "Addressing Mode: Method8000"
+
 [connection signal="pressed" from="Reload" to="." method="Refresh"]
diff --git a/Gameboy.Player.Godot/Debuggers/MapDebugger.cs b/Gameboy.Player.Godot/Debuggers/MapDebugger.cs
index 41323d6..b6ba913 100644
--- a/Gameboy.Player.Godot/Debuggers/MapDebugger.cs
+++ b/Gameboy.Player.Godot/Debuggers/MapDebugger.cs
@@ -14,21 +14,25 @@ public partial class MapDebugger : Control {
 	[Export] public MapType Map; 
 
 	private BitmapTextureRect rect;
+	private Label label;
 
 	// Called when the node enters the scene tree for the first time.
 	public override void _Ready() {
 		this.rect = GetNode<BitmapTextureRect>("Rect");
+		this.label = GetNode<Label>("Label");
 	}
 
 	public void Refresh() {
 		var ppu = Player?.Console?.GPU;
 		if (ppu is IDebuggablePpu debug) {
+			var mode = debug.TileSelectionMode;
+			label.Text = "Addressing Mode: " + mode;
 			switch (Map) {
 				case MapType.Background:
-					rect?.Redraw(debug.BackgroundMap.ToBitmap());
+					rect?.Redraw(debug.BackgroundMap.ToBitmap(mode));
 					break;
 				case MapType.Window:
-					rect?.Redraw(debug.WindowMap.ToBitmap());
+					rect?.Redraw(debug.WindowMap.ToBitmap(mode));
 					break;
 			}
 		}
diff --git a/Gameboy.Player.Godot/Debuggers/PaletteDebugger.cs b/Gameboy.Player.Godot/Debuggers/PaletteDebugger.cs
index b347190..6aa48ec 100644
--- a/Gameboy.Player.Godot/Debuggers/PaletteDebugger.cs
+++ b/Gameboy.Player.Godot/Debuggers/PaletteDebugger.cs
@@ -6,20 +6,141 @@
 
 namespace Qkmaxware.Emulators.Gameboy.Player;
 
+public class Theme {
+	public string Name;
+	public Color BgWhite = new Color(1, 1, 1);	
+	public Color BgLightGrey = new Color(0.6f, 0.6f, 0.6f);
+	public Color BgDarkGrey = new Color(0.3f, 0.3f, 0.3f);
+	public Color BgBlack = new Color(0, 0, 0);
+
+	public Color Obj0White = new Color(1, 1, 1);
+	public Color Obj0LightGrey = new Color(0.6f, 0.6f, 0.6f);
+	public Color Obj0DarkGrey = new Color(0.3f, 0.3f, 0.3f);
+	public Color Obj0Black = new Color(0, 0, 0);
+
+	public Color Obj1White = new Color(1, 1, 1);
+	public Color Obj1LightGrey = new Color(0.6f, 0.6f, 0.6f);
+	public Color Obj1DarkGrey = new Color(0.3f, 0.3f, 0.3f);
+	public Color Obj1Black = new Color(0, 0, 0);
+}
+
 public partial class PaletteDebugger : Control {
 
 	[Export] public TextureRenderer Player;
 
+	private ColorPickerButton bg0Black;
+	private ColorPickerButton bg0DarkGrey;
+	private ColorPickerButton bg0LightGrey;
+	private ColorPickerButton bg0White;
+	private ColorPickerButton obj0Black;
+	private ColorPickerButton obj0DarkGrey;
+	private ColorPickerButton obj0LightGrey;
+	private ColorPickerButton obj0White;
+	private ColorPickerButton obj1Black;
+	private ColorPickerButton obj1DarkGrey;
+	private ColorPickerButton obj1LightGrey;
+	private ColorPickerButton obj1White;
+
 	private ColorRect[][] bg;
 	private ColorRect[][] obj;
 
+	private static List<Theme> themes = new List<Theme> {
+		// Good theme list https://tcrf.net/Notes:Game_Boy_Color_Bootstrap_ROM
+		new Theme { Name = "Greyscale" },
+		new Theme { 
+			Name = "Classic Green",
+			BgWhite = new Color("e0f8cf"),	
+			BgLightGrey = new Color("86c06c"),
+			BgDarkGrey = new Color("306850"),
+			BgBlack = new Color("071821"),
+			Obj0White = new Color("e0f8cf"),
+			Obj0LightGrey = new Color("86c06c"),
+			Obj0DarkGrey = new Color("306850"),
+			Obj0Black = new Color("071821"),
+			Obj1White = new Color("e0f8cf"),
+			Obj1LightGrey = new Color("86c06c"),
+			Obj1DarkGrey = new Color("306850"),
+			Obj1Black = new Color("071821"),
+		},
+		new Theme { 
+			Name = "PkMn Blue",
+			BgWhite = new Color("FFFFFF"),	
+			Obj0White = new Color("FFFFFF"),
+			Obj1White = new Color("FFFFFF"),
+
+			BgLightGrey = new Color("63A5FF"),
+			Obj0LightGrey = new Color("FF8484"),
+			Obj1LightGrey = new Color("63A5FF"),
+
+			BgDarkGrey = new Color("0000FF"),
+			Obj0DarkGrey = new Color("943A3A"),
+			Obj1DarkGrey = new Color("0000FF"),
+
+			BgBlack = new Color("000000"),
+			Obj0Black = new Color("000000"),
+			Obj1Black = new Color("000000"),
+		},
+		new Theme { 
+			Name = "PkMn Red",
+			BgWhite = new Color("FFFFFF"),	
+			Obj0White = new Color("FFFFFF"),
+			Obj1White = new Color("FFFFFF"),
+
+			BgLightGrey = new Color("FF8484"),
+			Obj0LightGrey = new Color("7BFF31"),
+			Obj1LightGrey = new Color("FF8484"),
+
+			BgDarkGrey = new Color("943A3A"),
+			Obj0DarkGrey = new Color("008400"),
+			Obj1DarkGrey = new Color("943A3A"),
+
+			BgBlack = new Color("000000"),
+			Obj0Black = new Color("000000"),
+			Obj1Black = new Color("000000"),
+		},
+	};
+
 	// Called when the node enters the scene tree for the first time.
 	public override void _Ready() {
+		// Colours
+		bg0Black = GetNode<ColorPickerButton>("ScrollContainer/VSplitContainer/Colours/VBoxContainer/HBoxContainer/Bg/HBoxContainer/BgBlack");
+		bg0Black.Color = Player?.BgBlack ?? new Color(0,0,0,1);
+		bg0DarkGrey = GetNode<ColorPickerButton>("ScrollContainer/VSplitContainer/Colours/VBoxContainer/HBoxContainer/Bg/HBoxContainer/BgDarkGrey");
+		bg0DarkGrey.Color = Player?.BgDarkGrey ?? new Color(0.3f,0.3f,0.3f,1);
+		bg0LightGrey = GetNode<ColorPickerButton>("ScrollContainer/VSplitContainer/Colours/VBoxContainer/HBoxContainer/Bg/HBoxContainer/BgLightGrey");
+		bg0LightGrey.Color = Player?.BgLightGrey ?? new Color(0.6f,0.6f,0.6f,1);
+		bg0White = GetNode<ColorPickerButton>("ScrollContainer/VSplitContainer/Colours/VBoxContainer/HBoxContainer/Bg/HBoxContainer/BgWhite");
+		bg0White.Color = Player?.BgWhite ?? new Color(1,1,1,1);
+
+		obj0Black = GetNode<ColorPickerButton>("ScrollContainer/VSplitContainer/Colours/VBoxContainer/HBoxContainer/Objects/HBoxContainer/Obj0Black");
+		obj0Black.Color = Player?.Obj0Black ?? new Color(0,0,0,1);
+		obj0DarkGrey = GetNode<ColorPickerButton>("ScrollContainer/VSplitContainer/Colours/VBoxContainer/HBoxContainer/Objects/HBoxContainer/Obj0DarkGrey");
+		obj0DarkGrey.Color = Player?.Obj0DarkGrey ?? new Color(0.3f,0.3f,0.3f,1);
+		obj0LightGrey = GetNode<ColorPickerButton>("ScrollContainer/VSplitContainer/Colours/VBoxContainer/HBoxContainer/Objects/HBoxContainer/Obj0LightGrey");
+		obj0LightGrey.Color = Player?.Obj0LightGrey ?? new Color(0.6f,0.6f,0.6f,1);
+		obj0White = GetNode<ColorPickerButton>("ScrollContainer/VSplitContainer/Colours/VBoxContainer/HBoxContainer/Objects/HBoxContainer/Obj0White");
+		obj0White.Color = Player?.Obj0White ?? new Color(1,1,1,1);
+
+		obj1Black = GetNode<ColorPickerButton>("ScrollContainer/VSplitContainer/Colours/VBoxContainer/HBoxContainer/Objects/HBoxContainer2/Obj1Black");
+		obj1Black.Color = Player?.Obj1Black ?? new Color(0,0,0,1);
+		obj1DarkGrey = GetNode<ColorPickerButton>("ScrollContainer/VSplitContainer/Colours/VBoxContainer/HBoxContainer/Objects/HBoxContainer2/Obj1DarkGrey");
+		obj1DarkGrey.Color = Player?.Obj1DarkGrey ?? new Color(0.3f,0.3f,0.3f,1);
+		obj1LightGrey = GetNode<ColorPickerButton>("ScrollContainer/VSplitContainer/Colours/VBoxContainer/HBoxContainer/Objects/HBoxContainer2/Obj1LightGrey");
+		obj1LightGrey.Color = Player?.Obj1LightGrey ?? new Color(0.6f,0.6f,0.6f,1);
+		obj1White = GetNode<ColorPickerButton>("ScrollContainer/VSplitContainer/Colours/VBoxContainer/HBoxContainer/Objects/HBoxContainer2/Obj1White");
+		obj1White.Color = Player?.Obj1White ?? new Color(1,1,1,1);
+
+		var themePicker = GetNode<OptionButton>("ScrollContainer/VSplitContainer/Colours/VBoxContainer/HBoxContainer/Themes/OptionButton");
+		foreach (var theme in themes) {
+			themePicker.AddItem(theme.Name);
+		}
+
+		// Palettes
 		bg = new ColorRect[1][];
 		bg[0] = new ColorRect[4];
 		for (var i = 0; i < 4; i++) {
 			var b00 = Convert.ToString(i, 2).PadLeft(2, '0');
-			bg[0][i] = this.GetNode<ColorRect>("ScrollContainer/HSplitContainer/Background/VBoxContainer/HBoxContainer/"+b00);
+			bg[0][i] = this.GetNode<ColorRect>("ScrollContainer/VSplitContainer/Palettes/VBoxContainer/HBoxContainer/Background/HBoxContainer/"+b00);
 		}
 
 		obj = new ColorRect[2][];
@@ -27,12 +148,27 @@ public override void _Ready() {
 		obj[1] = new ColorRect[4];
 		for (var i = 0; i < 4; i++) {
 			var b00 = Convert.ToString(i, 2).PadLeft(2, '0');
-			obj[0][i] = this.GetNode<ColorRect>("ScrollContainer/HSplitContainer/Objects/VBoxContainer/HBoxContainer1/"+b00);
-			obj[1][i] = this.GetNode<ColorRect>("ScrollContainer/HSplitContainer/Objects/VBoxContainer/HBoxContainer2/"+b00);
+			obj[0][i] = this.GetNode<ColorRect>("ScrollContainer/VSplitContainer/Palettes/VBoxContainer/HBoxContainer/Objects/HBoxContainer1/"+b00);
+			obj[1][i] = this.GetNode<ColorRect>("ScrollContainer/VSplitContainer/Palettes/VBoxContainer/HBoxContainer/Objects/HBoxContainer2/"+b00);
 		}
 	}
 
 	public void Refresh() {
+		bg0Black.Color = Player?.BgBlack ?? new Color(0,0,0,1);
+		bg0DarkGrey.Color = Player?.BgDarkGrey ?? new Color(0.3f,0.3f,0.3f,1);
+		bg0LightGrey.Color = Player?.BgLightGrey ?? new Color(0.6f,0.6f,0.6f,1);
+		bg0White.Color = Player?.BgWhite ?? new Color(1,1,1,1);
+
+		obj0Black.Color = Player?.Obj0Black ?? new Color(0,0,0,1);
+		obj0DarkGrey.Color = Player?.Obj0DarkGrey ?? new Color(0.3f,0.3f,0.3f,1);
+		obj0LightGrey.Color = Player?.Obj0LightGrey ?? new Color(0.6f,0.6f,0.6f,1);
+		obj0White.Color = Player?.Obj0White ?? new Color(1,1,1,1);
+
+		obj1Black.Color = Player?.Obj1Black ?? new Color(0,0,0,1);
+		obj1DarkGrey.Color = Player?.Obj1DarkGrey ?? new Color(0.3f,0.3f,0.3f,1);
+		obj1LightGrey.Color = Player?.Obj1LightGrey ?? new Color(0.6f,0.6f,0.6f,1);
+		obj1White.Color = Player?.Obj1White ?? new Color(1,1,1,1);
+
 		var ppu = Player?.Console?.GPU;
 		if (ppu is IDebuggablePpu debug) {
 			HashSet<ColourPallet> bgcolours = new HashSet<ColourPallet>();
@@ -40,23 +176,23 @@ public void Refresh() {
 				foreach (var pair in palette.First.Zip(palette.Second)) {
 					var palettedColour = pair.First;
 					var rgb = palettedColour switch {
-						ColourPallet.BackgroundDark => new Color(0,0,0,1),
-						ColourPallet.Object0Dark => new Color(0,0,0,1),
-						ColourPallet.Object1Dark => new Color(0,0,0,1),
+						ColourPallet.BackgroundDark => Player.BgBlack,
+						ColourPallet.Object0Dark => Player.BgBlack,
+						ColourPallet.Object1Dark => Player.BgBlack,
 
-						ColourPallet.BackgroundMedium => new Color(0.3f,0.3f,0.3f,1),
-						ColourPallet.Object0Medium => new Color(0.3f,0.3f,0.3f,1),
-						ColourPallet.Object1Medium => new Color(0.3f,0.3f,0.3f,1),
+						ColourPallet.BackgroundMedium => Player.BgDarkGrey,
+						ColourPallet.Object0Medium => Player.BgDarkGrey,
+						ColourPallet.Object1Medium => Player.BgDarkGrey,
 
-						ColourPallet.BackgroundLight => new Color(0.6f,0.6f,0.6f,1),
-						ColourPallet.Object0Light => new Color(0.6f,0.6f,0.6f,1),
-						ColourPallet.Object1Light => new Color(0.6f,0.6f,0.6f,1),
+						ColourPallet.BackgroundLight => Player.BgLightGrey,
+						ColourPallet.Object0Light => Player.BgLightGrey,
+						ColourPallet.Object1Light => Player.BgLightGrey,
 
-						ColourPallet.BackgroundWhite => new Color(1f,1f,1f,1),
-						ColourPallet.Object0White => new Color(1f,1f,1f,1),
-						ColourPallet.Object1White => new Color(1f,1f,1f,1),
+						ColourPallet.BackgroundWhite => Player.BgWhite,
+						ColourPallet.Object0White => Player.BgWhite,
+						ColourPallet.Object1White => Player.BgWhite,
 
-						_ => new Color(0,0,0,1),
+						_ => Player.BgBlack,
 					};
 					bgcolours.Add(palettedColour);
 					pair.Second.Color = rgb;
@@ -67,35 +203,83 @@ public void Refresh() {
 			}
 
 			HashSet<ColourPallet> objcolours = new HashSet<ColourPallet>();
+			var colourSetIndex = 0;
 			foreach (var palette in debug.ObjectPalettes.Zip(obj)) {
+				var black = colourSetIndex == 0 ? Player.Obj0Black : Player.Obj1Black;
+				var dg = colourSetIndex == 0 ? Player.Obj0DarkGrey : Player.Obj1DarkGrey;
+				var lg = colourSetIndex == 0 ? Player.Obj0LightGrey : Player.Obj1LightGrey;
+				var white = colourSetIndex == 0 ? Player.Obj0White : Player.Obj1White;
+
 				foreach (var pair in palette.First.Zip(palette.Second)) {
 					var palettedColour = pair.First;
 					var rgb = palettedColour switch {
-						ColourPallet.BackgroundDark => new Color(0,0,0,1),
-						ColourPallet.Object0Dark => new Color(0,0,0,1),
-						ColourPallet.Object1Dark => new Color(0,0,0,1),
+						ColourPallet.BackgroundDark => black,
+						ColourPallet.Object0Dark => black,
+						ColourPallet.Object1Dark => black,
 
-						ColourPallet.BackgroundMedium => new Color(0.3f,0.3f,0.3f,1),
-						ColourPallet.Object0Medium => new Color(0.3f,0.3f,0.3f,1),
-						ColourPallet.Object1Medium => new Color(0.3f,0.3f,0.3f,1),
+						ColourPallet.BackgroundMedium => dg,
+						ColourPallet.Object0Medium => dg,
+						ColourPallet.Object1Medium => dg,
 
-						ColourPallet.BackgroundLight => new Color(0.6f,0.6f,0.6f,1),
-						ColourPallet.Object0Light => new Color(0.6f,0.6f,0.6f,1),
-						ColourPallet.Object1Light => new Color(0.6f,0.6f,0.6f,1),
+						ColourPallet.BackgroundLight => lg,
+						ColourPallet.Object0Light => lg,
+						ColourPallet.Object1Light => lg,
 
-						ColourPallet.BackgroundWhite => new Color(1f,1f,1f,1),
-						ColourPallet.Object0White => new Color(1f,1f,1f,1),
-						ColourPallet.Object1White => new Color(1f,1f,1f,1),
+						ColourPallet.BackgroundWhite => white,
+						ColourPallet.Object0White => white,
+						ColourPallet.Object1White => white,
 
-						_ => new Color(0,0,0,1),
+						_ => black,
 					};
 					objcolours.Add(palettedColour);
 					pair.Second.Color = rgb;
 				}
+
+				colourSetIndex = (colourSetIndex + 1) % 2;
 			}
 			if (objcolours.Count < 1) {
 				GD.PushError("Object palette is mono-colour.");
 			}
 		}
 	}
+
+
+	public void SelectTheme(int index) {
+		if (index >= 0 && index < themes.Count) {
+			var theme = themes[index];
+			bg0Black.Color = theme.BgBlack;
+			bg0DarkGrey.Color = theme.BgDarkGrey;
+			bg0LightGrey.Color = theme.BgLightGrey;
+			bg0White.Color = theme.BgWhite;
+
+			obj0Black.Color 	= theme.Obj0Black;
+			obj0DarkGrey.Color 	= theme.Obj0DarkGrey;
+			obj0LightGrey.Color = theme.Obj0LightGrey;
+			obj0White.Color 	= theme.Obj0White;
+
+			obj1Black.Color 	= theme.Obj1Black;
+			obj1DarkGrey.Color 	= theme.Obj1DarkGrey;
+			obj1LightGrey.Color = theme.Obj1LightGrey;
+			obj1White.Color 	= theme.Obj1White;
+		}
+	}
+
+	public void UpdatePlayerColours() {
+		if (Player is not null) {
+			Player.BgBlack = bg0Black.Color;
+			Player.BgDarkGrey = bg0DarkGrey.Color;
+			Player.BgLightGrey = bg0LightGrey.Color;
+			Player.BgWhite = bg0White.Color;
+			
+			Player.Obj0Black = obj0Black.Color;
+			Player.Obj0DarkGrey = obj0DarkGrey.Color;
+			Player.Obj0LightGrey = obj0LightGrey.Color;
+			Player.Obj0White = obj0White.Color;
+			
+			Player.Obj1Black = obj1Black.Color;
+			Player.Obj1DarkGrey = obj1DarkGrey.Color;
+			Player.Obj1LightGrey = obj1LightGrey.Color;
+			Player.Obj1White = obj1White.Color;
+		}
+	}
 }
diff --git a/Gameboy.Player.Godot/Debuggers/PaletteDebugger.tscn b/Gameboy.Player.Godot/Debuggers/PaletteDebugger.tscn
index c80f7e1..01a4501 100644
--- a/Gameboy.Player.Godot/Debuggers/PaletteDebugger.tscn
+++ b/Gameboy.Player.Godot/Debuggers/PaletteDebugger.tscn
@@ -22,94 +22,203 @@ grow_horizontal = 2
 grow_vertical = 2
 horizontal_scroll_mode = 0
 
-[node name="HSplitContainer" type="HSplitContainer" parent="ScrollContainer"]
+[node name="VSplitContainer" type="VBoxContainer" parent="ScrollContainer"]
 layout_mode = 2
 size_flags_horizontal = 3
-size_flags_vertical = 3
-split_offset = 512
 
-[node name="Background" type="MarginContainer" parent="ScrollContainer/HSplitContainer"]
+[node name="Colours" type="MarginContainer" parent="ScrollContainer/VSplitContainer"]
 layout_mode = 2
 theme_override_constants/margin_left = 10
 theme_override_constants/margin_top = 10
-theme_override_constants/margin_right = -10
-theme_override_constants/margin_bottom = -10
+theme_override_constants/margin_right = 10
+theme_override_constants/margin_bottom = 10
 
-[node name="VBoxContainer" type="VBoxContainer" parent="ScrollContainer/HSplitContainer/Background"]
+[node name="VBoxContainer" type="VBoxContainer" parent="ScrollContainer/VSplitContainer/Colours"]
 layout_mode = 2
 
-[node name="Label" type="Label" parent="ScrollContainer/HSplitContainer/Background/VBoxContainer"]
+[node name="Label" type="Label" parent="ScrollContainer/VSplitContainer/Colours/VBoxContainer"]
+layout_mode = 2
+text = "Colours"
+
+[node name="HBoxContainer" type="HBoxContainer" parent="ScrollContainer/VSplitContainer/Colours/VBoxContainer"]
+layout_mode = 2
+theme_override_constants/separation = 64
+
+[node name="Bg" type="VBoxContainer" parent="ScrollContainer/VSplitContainer/Colours/VBoxContainer/HBoxContainer"]
+layout_mode = 2
+
+[node name="Background" type="Label" parent="ScrollContainer/VSplitContainer/Colours/VBoxContainer/HBoxContainer/Bg"]
+layout_mode = 2
+text = "Background
+"
+
+[node name="HBoxContainer" type="HBoxContainer" parent="ScrollContainer/VSplitContainer/Colours/VBoxContainer/HBoxContainer/Bg"]
+layout_mode = 2
+
+[node name="BgBlack" type="ColorPickerButton" parent="ScrollContainer/VSplitContainer/Colours/VBoxContainer/HBoxContainer/Bg/HBoxContainer"]
+custom_minimum_size = Vector2(64, 64)
+layout_mode = 2
+
+[node name="BgDarkGrey" type="ColorPickerButton" parent="ScrollContainer/VSplitContainer/Colours/VBoxContainer/HBoxContainer/Bg/HBoxContainer"]
+custom_minimum_size = Vector2(64, 64)
+layout_mode = 2
+
+[node name="BgLightGrey" type="ColorPickerButton" parent="ScrollContainer/VSplitContainer/Colours/VBoxContainer/HBoxContainer/Bg/HBoxContainer"]
+custom_minimum_size = Vector2(64, 64)
+layout_mode = 2
+
+[node name="BgWhite" type="ColorPickerButton" parent="ScrollContainer/VSplitContainer/Colours/VBoxContainer/HBoxContainer/Bg/HBoxContainer"]
+custom_minimum_size = Vector2(64, 64)
+layout_mode = 2
+
+[node name="Objects" type="VBoxContainer" parent="ScrollContainer/VSplitContainer/Colours/VBoxContainer/HBoxContainer"]
+layout_mode = 2
+
+[node name="Background" type="Label" parent="ScrollContainer/VSplitContainer/Colours/VBoxContainer/HBoxContainer/Objects"]
+layout_mode = 2
+text = "Background
+"
+
+[node name="HBoxContainer" type="HBoxContainer" parent="ScrollContainer/VSplitContainer/Colours/VBoxContainer/HBoxContainer/Objects"]
+layout_mode = 2
+
+[node name="Obj0Black" type="ColorPickerButton" parent="ScrollContainer/VSplitContainer/Colours/VBoxContainer/HBoxContainer/Objects/HBoxContainer"]
+custom_minimum_size = Vector2(64, 64)
+layout_mode = 2
+
+[node name="Obj0DarkGrey" type="ColorPickerButton" parent="ScrollContainer/VSplitContainer/Colours/VBoxContainer/HBoxContainer/Objects/HBoxContainer"]
+custom_minimum_size = Vector2(64, 64)
+layout_mode = 2
+
+[node name="Obj0LightGrey" type="ColorPickerButton" parent="ScrollContainer/VSplitContainer/Colours/VBoxContainer/HBoxContainer/Objects/HBoxContainer"]
+custom_minimum_size = Vector2(64, 64)
 layout_mode = 2
-text = "Backgrounds"
 
-[node name="HBoxContainer" type="HBoxContainer" parent="ScrollContainer/HSplitContainer/Background/VBoxContainer"]
+[node name="Obj0White" type="ColorPickerButton" parent="ScrollContainer/VSplitContainer/Colours/VBoxContainer/HBoxContainer/Objects/HBoxContainer"]
+custom_minimum_size = Vector2(64, 64)
+layout_mode = 2
+
+[node name="HBoxContainer2" type="HBoxContainer" parent="ScrollContainer/VSplitContainer/Colours/VBoxContainer/HBoxContainer/Objects"]
 layout_mode = 2
 
-[node name="00" type="ColorRect" parent="ScrollContainer/HSplitContainer/Background/VBoxContainer/HBoxContainer"]
+[node name="Obj1Black" type="ColorPickerButton" parent="ScrollContainer/VSplitContainer/Colours/VBoxContainer/HBoxContainer/Objects/HBoxContainer2"]
 custom_minimum_size = Vector2(64, 64)
 layout_mode = 2
 
-[node name="01" type="ColorRect" parent="ScrollContainer/HSplitContainer/Background/VBoxContainer/HBoxContainer"]
+[node name="Obj1DarkGrey" type="ColorPickerButton" parent="ScrollContainer/VSplitContainer/Colours/VBoxContainer/HBoxContainer/Objects/HBoxContainer2"]
 custom_minimum_size = Vector2(64, 64)
 layout_mode = 2
 
-[node name="10" type="ColorRect" parent="ScrollContainer/HSplitContainer/Background/VBoxContainer/HBoxContainer"]
+[node name="Obj1LightGrey" type="ColorPickerButton" parent="ScrollContainer/VSplitContainer/Colours/VBoxContainer/HBoxContainer/Objects/HBoxContainer2"]
 custom_minimum_size = Vector2(64, 64)
 layout_mode = 2
 
-[node name="11" type="ColorRect" parent="ScrollContainer/HSplitContainer/Background/VBoxContainer/HBoxContainer"]
+[node name="Obj1White" type="ColorPickerButton" parent="ScrollContainer/VSplitContainer/Colours/VBoxContainer/HBoxContainer/Objects/HBoxContainer2"]
 custom_minimum_size = Vector2(64, 64)
 layout_mode = 2
 
-[node name="Objects" type="MarginContainer" parent="ScrollContainer/HSplitContainer"]
+[node name="Themes" type="VBoxContainer" parent="ScrollContainer/VSplitContainer/Colours/VBoxContainer/HBoxContainer"]
+layout_mode = 2
+
+[node name="Label" type="Label" parent="ScrollContainer/VSplitContainer/Colours/VBoxContainer/HBoxContainer/Themes"]
+layout_mode = 2
+text = "Themes"
+
+[node name="OptionButton" type="OptionButton" parent="ScrollContainer/VSplitContainer/Colours/VBoxContainer/HBoxContainer/Themes"]
+layout_mode = 2
+selected = 0
+allow_reselect = true
+
+[node name="Change" type="Button" parent="ScrollContainer/VSplitContainer/Colours/VBoxContainer/HBoxContainer/Themes"]
+layout_mode = 2
+text = "Change LCD Colours"
+
+[node name="Palettes" type="MarginContainer" parent="ScrollContainer/VSplitContainer"]
 layout_mode = 2
 theme_override_constants/margin_left = 10
 theme_override_constants/margin_top = 10
-theme_override_constants/margin_right = -10
-theme_override_constants/margin_bottom = -10
+theme_override_constants/margin_right = 10
+theme_override_constants/margin_bottom = 10
+
+[node name="VBoxContainer" type="VBoxContainer" parent="ScrollContainer/VSplitContainer/Palettes"]
+layout_mode = 2
+
+[node name="Label" type="Label" parent="ScrollContainer/VSplitContainer/Palettes/VBoxContainer"]
+layout_mode = 2
+text = "Palettes"
+
+[node name="HBoxContainer" type="HBoxContainer" parent="ScrollContainer/VSplitContainer/Palettes/VBoxContainer"]
+layout_mode = 2
+theme_override_constants/separation = 64
+
+[node name="Background" type="VBoxContainer" parent="ScrollContainer/VSplitContainer/Palettes/VBoxContainer/HBoxContainer"]
+layout_mode = 2
+
+[node name="Label" type="Label" parent="ScrollContainer/VSplitContainer/Palettes/VBoxContainer/HBoxContainer/Background"]
+layout_mode = 2
+text = "Backgrounds"
+
+[node name="HBoxContainer" type="HBoxContainer" parent="ScrollContainer/VSplitContainer/Palettes/VBoxContainer/HBoxContainer/Background"]
+layout_mode = 2
+
+[node name="00" type="ColorRect" parent="ScrollContainer/VSplitContainer/Palettes/VBoxContainer/HBoxContainer/Background/HBoxContainer"]
+custom_minimum_size = Vector2(64, 64)
+layout_mode = 2
+
+[node name="01" type="ColorRect" parent="ScrollContainer/VSplitContainer/Palettes/VBoxContainer/HBoxContainer/Background/HBoxContainer"]
+custom_minimum_size = Vector2(64, 64)
+layout_mode = 2
+
+[node name="10" type="ColorRect" parent="ScrollContainer/VSplitContainer/Palettes/VBoxContainer/HBoxContainer/Background/HBoxContainer"]
+custom_minimum_size = Vector2(64, 64)
+layout_mode = 2
+
+[node name="11" type="ColorRect" parent="ScrollContainer/VSplitContainer/Palettes/VBoxContainer/HBoxContainer/Background/HBoxContainer"]
+custom_minimum_size = Vector2(64, 64)
+layout_mode = 2
 
-[node name="VBoxContainer" type="VBoxContainer" parent="ScrollContainer/HSplitContainer/Objects"]
+[node name="Objects" type="VBoxContainer" parent="ScrollContainer/VSplitContainer/Palettes/VBoxContainer/HBoxContainer"]
 layout_mode = 2
 
-[node name="Label" type="Label" parent="ScrollContainer/HSplitContainer/Objects/VBoxContainer"]
+[node name="Label" type="Label" parent="ScrollContainer/VSplitContainer/Palettes/VBoxContainer/HBoxContainer/Objects"]
 layout_mode = 2
 text = "Objects"
 
-[node name="HBoxContainer1" type="HBoxContainer" parent="ScrollContainer/HSplitContainer/Objects/VBoxContainer"]
+[node name="HBoxContainer1" type="HBoxContainer" parent="ScrollContainer/VSplitContainer/Palettes/VBoxContainer/HBoxContainer/Objects"]
 layout_mode = 2
 
-[node name="00" type="ColorRect" parent="ScrollContainer/HSplitContainer/Objects/VBoxContainer/HBoxContainer1"]
+[node name="00" type="ColorRect" parent="ScrollContainer/VSplitContainer/Palettes/VBoxContainer/HBoxContainer/Objects/HBoxContainer1"]
 custom_minimum_size = Vector2(64, 64)
 layout_mode = 2
 
-[node name="01" type="ColorRect" parent="ScrollContainer/HSplitContainer/Objects/VBoxContainer/HBoxContainer1"]
+[node name="01" type="ColorRect" parent="ScrollContainer/VSplitContainer/Palettes/VBoxContainer/HBoxContainer/Objects/HBoxContainer1"]
 custom_minimum_size = Vector2(64, 64)
 layout_mode = 2
 
-[node name="10" type="ColorRect" parent="ScrollContainer/HSplitContainer/Objects/VBoxContainer/HBoxContainer1"]
+[node name="10" type="ColorRect" parent="ScrollContainer/VSplitContainer/Palettes/VBoxContainer/HBoxContainer/Objects/HBoxContainer1"]
 custom_minimum_size = Vector2(64, 64)
 layout_mode = 2
 
-[node name="11" type="ColorRect" parent="ScrollContainer/HSplitContainer/Objects/VBoxContainer/HBoxContainer1"]
+[node name="11" type="ColorRect" parent="ScrollContainer/VSplitContainer/Palettes/VBoxContainer/HBoxContainer/Objects/HBoxContainer1"]
 custom_minimum_size = Vector2(64, 64)
 layout_mode = 2
 
-[node name="HBoxContainer2" type="HBoxContainer" parent="ScrollContainer/HSplitContainer/Objects/VBoxContainer"]
+[node name="HBoxContainer2" type="HBoxContainer" parent="ScrollContainer/VSplitContainer/Palettes/VBoxContainer/HBoxContainer/Objects"]
 layout_mode = 2
 
-[node name="00" type="ColorRect" parent="ScrollContainer/HSplitContainer/Objects/VBoxContainer/HBoxContainer2"]
+[node name="00" type="ColorRect" parent="ScrollContainer/VSplitContainer/Palettes/VBoxContainer/HBoxContainer/Objects/HBoxContainer2"]
 custom_minimum_size = Vector2(64, 64)
 layout_mode = 2
 
-[node name="01" type="ColorRect" parent="ScrollContainer/HSplitContainer/Objects/VBoxContainer/HBoxContainer2"]
+[node name="01" type="ColorRect" parent="ScrollContainer/VSplitContainer/Palettes/VBoxContainer/HBoxContainer/Objects/HBoxContainer2"]
 custom_minimum_size = Vector2(64, 64)
 layout_mode = 2
 
-[node name="10" type="ColorRect" parent="ScrollContainer/HSplitContainer/Objects/VBoxContainer/HBoxContainer2"]
+[node name="10" type="ColorRect" parent="ScrollContainer/VSplitContainer/Palettes/VBoxContainer/HBoxContainer/Objects/HBoxContainer2"]
 custom_minimum_size = Vector2(64, 64)
 layout_mode = 2
 
-[node name="11" type="ColorRect" parent="ScrollContainer/HSplitContainer/Objects/VBoxContainer/HBoxContainer2"]
+[node name="11" type="ColorRect" parent="ScrollContainer/VSplitContainer/Palettes/VBoxContainer/HBoxContainer/Objects/HBoxContainer2"]
 custom_minimum_size = Vector2(64, 64)
 layout_mode = 2
 
@@ -125,4 +234,6 @@ text = "Reload"
 icon = ExtResource("2_wsgsr")
 expand_icon = true
 
+[connection signal="item_selected" from="ScrollContainer/VSplitContainer/Colours/VBoxContainer/HBoxContainer/Themes/OptionButton" to="." method="SelectTheme"]
+[connection signal="pressed" from="ScrollContainer/VSplitContainer/Colours/VBoxContainer/HBoxContainer/Themes/Change" to="." method="UpdatePlayerColours"]
 [connection signal="pressed" from="Reload" to="." method="Refresh"]
diff --git a/Gameboy.Player.Godot/export_presets.cfg b/Gameboy.Player.Godot/export_presets.cfg
new file mode 100644
index 0000000..18dffa3
--- /dev/null
+++ b/Gameboy.Player.Godot/export_presets.cfg
@@ -0,0 +1,216 @@
+[preset.0]
+
+name="Windows x64"
+platform="Windows Desktop"
+runnable=true
+dedicated_server=false
+custom_features=""
+export_filter="all_resources"
+include_filter=""
+exclude_filter=""
+export_path="Bin/Gameboy.Player.Godot.exe"
+encryption_include_filters=""
+encryption_exclude_filters=""
+encrypt_pck=false
+encrypt_directory=false
+
+[preset.0.options]
+
+custom_template/debug=""
+custom_template/release=""
+debug/export_console_wrapper=0
+binary_format/embed_pck=false
+texture_format/bptc=true
+texture_format/s3tc=true
+texture_format/etc=false
+texture_format/etc2=false
+binary_format/architecture="x86_64"
+codesign/enable=false
+codesign/timestamp=true
+codesign/timestamp_server_url=""
+codesign/digest_algorithm=1
+codesign/description=""
+codesign/custom_options=PackedStringArray()
+application/modify_resources=false
+application/icon=""
+application/console_wrapper_icon=""
+application/icon_interpolation=4
+application/file_version=""
+application/product_version=""
+application/company_name="Qkmaxware"
+application/product_name="Blazorboy.Godot"
+application/file_description=""
+application/copyright=""
+application/trademarks=""
+application/export_angle=0
+ssh_remote_deploy/enabled=false
+ssh_remote_deploy/host="user@host_ip"
+ssh_remote_deploy/port="22"
+ssh_remote_deploy/extra_args_ssh=""
+ssh_remote_deploy/extra_args_scp=""
+ssh_remote_deploy/run_script="Expand-Archive -LiteralPath '{temp_dir}\\{archive_name}' -DestinationPath '{temp_dir}'
+$action = New-ScheduledTaskAction -Execute '{temp_dir}\\{exe_name}' -Argument '{cmd_args}'
+$trigger = New-ScheduledTaskTrigger -Once -At 00:00
+$settings = New-ScheduledTaskSettingsSet
+$task = New-ScheduledTask -Action $action -Trigger $trigger -Settings $settings
+Register-ScheduledTask godot_remote_debug -InputObject $task -Force:$true
+Start-ScheduledTask -TaskName godot_remote_debug
+while (Get-ScheduledTask -TaskName godot_remote_debug | ? State -eq running) { Start-Sleep -Milliseconds 100 }
+Unregister-ScheduledTask -TaskName godot_remote_debug -Confirm:$false -ErrorAction:SilentlyContinue"
+ssh_remote_deploy/cleanup_script="Stop-ScheduledTask -TaskName godot_remote_debug -ErrorAction:SilentlyContinue
+Unregister-ScheduledTask -TaskName godot_remote_debug -Confirm:$false -ErrorAction:SilentlyContinue
+Remove-Item -Recurse -Force '{temp_dir}'"
+dotnet/include_scripts_content=false
+dotnet/include_debug_symbols=false
+dotnet/embed_build_outputs=false
+
+[preset.1]
+
+name="Linux/X11 x64"
+platform="Linux/X11"
+runnable=true
+dedicated_server=false
+custom_features=""
+export_filter="all_resources"
+include_filter=""
+exclude_filter=""
+export_path=""
+encryption_include_filters=""
+encryption_exclude_filters=""
+encrypt_pck=false
+encrypt_directory=false
+
+[preset.1.options]
+
+custom_template/debug=""
+custom_template/release=""
+debug/export_console_wrapper=0
+binary_format/embed_pck=false
+texture_format/bptc=true
+texture_format/s3tc=true
+texture_format/etc=false
+texture_format/etc2=false
+binary_format/architecture="x86_64"
+ssh_remote_deploy/enabled=false
+ssh_remote_deploy/host="user@host_ip"
+ssh_remote_deploy/port="22"
+ssh_remote_deploy/extra_args_ssh=""
+ssh_remote_deploy/extra_args_scp=""
+ssh_remote_deploy/run_script="#!/usr/bin/env bash
+export DISPLAY=:0
+unzip -o -q \"{temp_dir}/{archive_name}\" -d \"{temp_dir}\"
+\"{temp_dir}/{exe_name}\" {cmd_args}"
+ssh_remote_deploy/cleanup_script="#!/usr/bin/env bash
+kill $(pgrep -x -f \"{temp_dir}/{exe_name} {cmd_args}\")
+rm -rf \"{temp_dir}\""
+dotnet/include_scripts_content=false
+dotnet/include_debug_symbols=false
+dotnet/embed_build_outputs=false
+
+[preset.2]
+
+name="MacOS x64"
+platform="macOS"
+runnable=true
+dedicated_server=false
+custom_features=""
+export_filter="all_resources"
+include_filter=""
+exclude_filter=""
+export_path=""
+encryption_include_filters=""
+encryption_exclude_filters=""
+encrypt_pck=false
+encrypt_directory=false
+
+[preset.2.options]
+
+export/distribution_type=1
+binary_format/architecture="universal"
+custom_template/debug=""
+custom_template/release=""
+debug/export_console_wrapper=1
+application/icon=""
+application/icon_interpolation=4
+application/bundle_identifier="qkmaxware.blazorboy.godot"
+application/signature=""
+application/app_category="Games"
+application/short_version=""
+application/version=""
+application/copyright="qkmaxware"
+application/copyright_localized={}
+application/min_macos_version="10.12"
+application/export_angle=0
+display/high_res=true
+xcode/platform_build="14C18"
+xcode/sdk_version="13.1"
+xcode/sdk_build="22C55"
+xcode/sdk_name="macosx13.1"
+xcode/xcode_version="1420"
+xcode/xcode_build="14C18"
+codesign/codesign=1
+codesign/installer_identity=""
+codesign/apple_team_id=""
+codesign/identity=""
+codesign/entitlements/custom_file=""
+codesign/entitlements/allow_jit_code_execution=false
+codesign/entitlements/allow_unsigned_executable_memory=false
+codesign/entitlements/allow_dyld_environment_variables=false
+codesign/entitlements/disable_library_validation=false
+codesign/entitlements/audio_input=false
+codesign/entitlements/camera=false
+codesign/entitlements/location=false
+codesign/entitlements/address_book=false
+codesign/entitlements/calendars=false
+codesign/entitlements/photos_library=false
+codesign/entitlements/apple_events=false
+codesign/entitlements/debugging=false
+codesign/entitlements/app_sandbox/enabled=false
+codesign/entitlements/app_sandbox/network_server=false
+codesign/entitlements/app_sandbox/network_client=false
+codesign/entitlements/app_sandbox/device_usb=false
+codesign/entitlements/app_sandbox/device_bluetooth=false
+codesign/entitlements/app_sandbox/files_downloads=0
+codesign/entitlements/app_sandbox/files_pictures=0
+codesign/entitlements/app_sandbox/files_music=0
+codesign/entitlements/app_sandbox/files_movies=0
+codesign/entitlements/app_sandbox/files_user_selected=0
+codesign/entitlements/app_sandbox/helper_executables=[]
+codesign/custom_options=PackedStringArray()
+notarization/notarization=0
+privacy/microphone_usage_description=""
+privacy/microphone_usage_description_localized={}
+privacy/camera_usage_description=""
+privacy/camera_usage_description_localized={}
+privacy/location_usage_description=""
+privacy/location_usage_description_localized={}
+privacy/address_book_usage_description=""
+privacy/address_book_usage_description_localized={}
+privacy/calendar_usage_description=""
+privacy/calendar_usage_description_localized={}
+privacy/photos_library_usage_description=""
+privacy/photos_library_usage_description_localized={}
+privacy/desktop_folder_usage_description=""
+privacy/desktop_folder_usage_description_localized={}
+privacy/documents_folder_usage_description=""
+privacy/documents_folder_usage_description_localized={}
+privacy/downloads_folder_usage_description=""
+privacy/downloads_folder_usage_description_localized={}
+privacy/network_volumes_usage_description=""
+privacy/network_volumes_usage_description_localized={}
+privacy/removable_volumes_usage_description=""
+privacy/removable_volumes_usage_description_localized={}
+ssh_remote_deploy/enabled=false
+ssh_remote_deploy/host="user@host_ip"
+ssh_remote_deploy/port="22"
+ssh_remote_deploy/extra_args_ssh=""
+ssh_remote_deploy/extra_args_scp=""
+ssh_remote_deploy/run_script="#!/usr/bin/env bash
+unzip -o -q \"{temp_dir}/{archive_name}\" -d \"{temp_dir}\"
+open \"{temp_dir}/{exe_name}.app\" --args {cmd_args}"
+ssh_remote_deploy/cleanup_script="#!/usr/bin/env bash
+kill $(pgrep -x -f \"{temp_dir}/{exe_name}.app/Contents/MacOS/{exe_name} {cmd_args}\")
+rm -rf \"{temp_dir}\""
+dotnet/include_scripts_content=false
+dotnet/include_debug_symbols=false
+dotnet/embed_build_outputs=false
diff --git a/Gameboy/hardware/gpu/BackgroundMapSpan.cs b/Gameboy/hardware/gpu/BackgroundMapSpan.cs
index 6080b92..7ebd663 100644
--- a/Gameboy/hardware/gpu/BackgroundMapSpan.cs
+++ b/Gameboy/hardware/gpu/BackgroundMapSpan.cs
@@ -32,19 +32,37 @@ public BackgroundMapSpan(int addressBase, int startIndex, byte[] vram) {
         this.VramReference = vram;
     }
 
-    public byte TileIndexAt(int x, int y) {
+    protected int unsignedByteToSigned(int u8){
+        if(u8 > 127)
+            u8 = -((~u8+1)&255);
+        return u8;
+    }
+    public int TileIndexAt(int x, int y, TileDataSelect mode = TileDataSelect.Method8000) {
         // Row by row
-        return VramReference[StartIndex + (x + Width * y)];
+        var raw_index = VramReference[StartIndex + (x + Width * y)];
+        if (mode == TileDataSelect.Method8000) {
+            return raw_index;
+        } else {
+            return unsignedByteToSigned(raw_index);
+        }
+    }
+
+    public TileSpan TileAt(int x, int y, TileDataSelect mode = TileDataSelect.Method8000) {
+        var index = TileIndexAt(x, y, mode);
+        if (mode == TileDataSelect.Method8000) {
+            return new TileSpan(0x8000, index, this.VramReference);
+        } else {
+            return new TileSpan(0x8000, 256 + index, this.VramReference);
+        }
     }
 
-    public Bitmap ToBitmap() {
+    public Bitmap ToBitmap(TileDataSelect mode = TileDataSelect.Method8000) {
         var bitmap = new Bitmap(256, 256);
         var index = 0;
         for (var row = 0; row < 32; row++) {
             for (var col = 0; col < 32; col++) {
                 // Only works for method 1 0x8000 method (TODO method 2)
-                var tileIndex = this.TileIndexAt(col, row);
-                TileSpan tile = new TileSpan(0x8000, tileIndex, this.VramReference);
+                TileSpan tile = TileAt(col, row, mode);
                 var stamp = tile.ToBitmap();
                 bitmap.Stamp(col * 8, row * 8, stamp);
                 index++;
diff --git a/Gameboy/hardware/gpu/IDebuggablePpu.cs b/Gameboy/hardware/gpu/IDebuggablePpu.cs
index 952a0e4..721f827 100644
--- a/Gameboy/hardware/gpu/IDebuggablePpu.cs
+++ b/Gameboy/hardware/gpu/IDebuggablePpu.cs
@@ -8,6 +8,7 @@ public interface IDebuggablePpu : IPpu {
     public IEnumerable<ColourPallet[]> ObjectPalettes {get;} 
     public IEnumerable<SpriteSpan> Sprites {get;}
     public IEnumerable<TileSpan> Tiles {get;}
+    public TileDataSelect TileSelectionMode {get;}
     public BackgroundMapSpan BackgroundMap {get;}
     public BackgroundMapSpan WindowMap {get;}
 }
\ No newline at end of file
diff --git a/Gameboy/hardware/gpu/Ppu.Debug.cs b/Gameboy/hardware/gpu/Ppu.Debug.cs
index 4d6322c..d08bbc3 100644
--- a/Gameboy/hardware/gpu/Ppu.Debug.cs
+++ b/Gameboy/hardware/gpu/Ppu.Debug.cs
@@ -26,6 +26,7 @@ public IEnumerable<ColourPallet[]> ObjectPalettes {
     }
     public IEnumerable<SpriteSpan> Sprites => Array.AsReadOnly(sprites);
     public IEnumerable<TileSpan> Tiles => Array.AsReadOnly(tiles);
+    public TileDataSelect TileSelectionMode => LCDC.TileDataSelect;
     public BackgroundMapSpan BackgroundMap => LCDC.BackgroundTileMapIndex == TileMapIndex.Map9800 ? Map9800 : Map9C00;
     public BackgroundMapSpan WindowMap => LCDC.WindowTileMapIndex == TileMapIndex.Map9800 ? Map9800 : Map9C00;
 }
\ No newline at end of file