From 4c8a7fb89073b45b0a931bf5be7aa925435efdfe Mon Sep 17 00:00:00 2001
From: Miguel Terol Espino <miguel.terol.93@gmail.com>
Date: Thu, 16 May 2024 15:52:54 +0200
Subject: [PATCH] Added new tile collisions

---
 DS_Map/Main Window.cs            | 36 ++++++++++++++++++++++++++------
 DS_Map/Resources/PokeDatabase.cs |  8 ++++++-
 2 files changed, 37 insertions(+), 7 deletions(-)

diff --git a/DS_Map/Main Window.cs b/DS_Map/Main Window.cs
index 3a170ac..0f37ee8 100644
--- a/DS_Map/Main Window.cs	
+++ b/DS_Map/Main Window.cs	
@@ -4304,17 +4304,41 @@ namespace DSPRE {
         }
         private void PrepareCollisionPainterGraphics(byte collisionValue) {
             switch (collisionValue) {
-                case 0x0:
-                    paintPen = new Pen(Color.FromArgb(128, Color.White));
-                    paintBrush = new SolidBrush(Color.FromArgb(128, Color.White));
+                case 0x01:
+                    paintPen = new Pen(Color.FromArgb(128, Color.AliceBlue));
+                    paintBrush = new SolidBrush(Color.FromArgb(128, Color.AliceBlue));
+                    break;
+                case 0x02:
+                    paintPen = new Pen(Color.FromArgb(128, Color.ForestGreen));
+                    paintBrush = new SolidBrush(Color.FromArgb(128, Color.ForestGreen));
+                    break;
+                case 0x04:
+                    paintPen = new Pen(Color.FromArgb(128, Color.LimeGreen));
+                    paintBrush = new SolidBrush(Color.FromArgb(128, Color.LimeGreen));
+                    break;
+                case 0x06:
+                    paintPen = new Pen(Color.FromArgb(128, Color.PowderBlue));
+                    paintBrush = new SolidBrush(Color.FromArgb(128, Color.PowderBlue));
+                    break;
+                case 0x07:
+                    paintPen = new Pen(Color.FromArgb(128, Color.Silver));
+                    paintBrush = new SolidBrush(Color.FromArgb(128, Color.Silver));
+                    break;
+                case 0x0A:
+                    paintPen = new Pen(Color.FromArgb(128, Color.DimGray));
+                    paintBrush = new SolidBrush(Color.FromArgb(128, Color.DimGray));
+                    break;
+                case 0x0D:
+                    paintPen = new Pen(Color.FromArgb(128, Color.SaddleBrown));
+                    paintBrush = new SolidBrush(Color.FromArgb(128, Color.SaddleBrown));
                     break;
                 case 0x80:
                     paintPen = new Pen(Color.FromArgb(128, Color.Red));
                     paintBrush = new SolidBrush(Color.FromArgb(128, Color.Red));
                     break;
-                default:
-                    paintPen = new Pen(Color.FromArgb(128, Color.LimeGreen));
-                    paintBrush = new SolidBrush(Color.FromArgb(128, Color.LimeGreen));
+                default: // 0x00                    
+                    paintPen = new Pen(Color.FromArgb(128, Color.White));
+                    paintBrush = new SolidBrush(Color.FromArgb(128, Color.White));
                     break;
             }
         }
diff --git a/DS_Map/Resources/PokeDatabase.cs b/DS_Map/Resources/PokeDatabase.cs
index 2deb915..01fca02 100644
--- a/DS_Map/Resources/PokeDatabase.cs
+++ b/DS_Map/Resources/PokeDatabase.cs
@@ -652,7 +652,13 @@ namespace DSPRE.Resources {
 
             public static Dictionary<byte, string> MapCollisionPainters = new Dictionary<byte, string>() {
                 [0x00] = "[00] Walkable",
-                [0x04] = "[04] Grass Sound",
+                [0x01] = "[01] Snow",
+                [0x02] = "[02] Leaves",
+                [0x04] = "[04] Grass",
+                [0x06] = "[06] Stairs, ice, but also some floor areas of S.S. Aqua",
+                [0x07] = "[07] Metal",
+                [0x0A] = "[0A] Stone ground (caves, etc.)",
+                [0x0D] = "[0D] Wood (Burned Tower, etc.)",
                 [0x80] = "[80] Blocked"
             };
             public static Dictionary<byte, string> MapCollisionTypePainters = new Dictionary<byte, string>() {