Improve Collision changes

SameplayerDE · May 16, 2024 · 6dcbd18 · 6dcbd18
1 parent 4c8a7fb
commit 6dcbd18
Show file tree

Hide file tree

Showing 2 changed files with 13 additions and 13 deletions.
diff --git a/DS_Map/Main Window.cs b/DS_Map/Main Window.cs
@@ -4304,39 +4304,39 @@ private void RestorePainter() {
         }
         private void PrepareCollisionPainterGraphics(byte collisionValue) {
             switch (collisionValue) {
-                case 0x01:
-                    paintPen = new Pen(Color.FromArgb(128, Color.AliceBlue));
-                    paintBrush = new SolidBrush(Color.FromArgb(128, Color.AliceBlue));
+                case 0x01: // Snow
+                    paintPen = new Pen(Color.FromArgb(128, Color.Lavender));
+                    paintBrush = new SolidBrush(Color.FromArgb(128, Color.Lavender));
                     break;
-                case 0x02:
+                case 0x02: // Leaves
                     paintPen = new Pen(Color.FromArgb(128, Color.ForestGreen));
                     paintBrush = new SolidBrush(Color.FromArgb(128, Color.ForestGreen));
                     break;
-                case 0x04:
+                case 0x04: // Grass
                     paintPen = new Pen(Color.FromArgb(128, Color.LimeGreen));
                     paintBrush = new SolidBrush(Color.FromArgb(128, Color.LimeGreen));
                     break;
-                case 0x06:
+                case 0x06: // Stairs and ice
                     paintPen = new Pen(Color.FromArgb(128, Color.PowderBlue));
                     paintBrush = new SolidBrush(Color.FromArgb(128, Color.PowderBlue));
                     break;
-                case 0x07:
+                case 0x07: // Metal
                     paintPen = new Pen(Color.FromArgb(128, Color.Silver));
                     paintBrush = new SolidBrush(Color.FromArgb(128, Color.Silver));
                     break;
-                case 0x0A:
+                case 0x0A: // Stone
                     paintPen = new Pen(Color.FromArgb(128, Color.DimGray));
                     paintBrush = new SolidBrush(Color.FromArgb(128, Color.DimGray));
                     break;
-                case 0x0D:
+                case 0x0D: // Wood
                     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: // 0x00                    
+                default: // 0x00 - Walkeable               
                     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
@@ -655,10 +655,10 @@ public static class System {
                 [0x01] = "[01] Snow",
                 [0x02] = "[02] Leaves",
                 [0x04] = "[04] Grass",
-                [0x06] = "[06] Stairs, ice, but also some floor areas of S.S. Aqua",
+                [0x06] = "[06] Stairs & Ice",
                 [0x07] = "[07] Metal",
-                [0x0A] = "[0A] Stone ground (caves, etc.)",
-                [0x0D] = "[0D] Wood (Burned Tower, etc.)",
+                [0x0A] = "[0A] Cavern floor",
+                [0x0D] = "[0D] Wood",
                 [0x80] = "[80] Blocked"
             };
             public static Dictionary<byte, string> MapCollisionTypePainters = new Dictionary<byte, string>() {