Merge pull request #1748 from BenjaminUrquhart/master

Fix 2024.2 detection (makes Undertale Yellow load again)
UnderminersTeam · May 2, 2024 · 1fef615 · 1fef615
2 parents 3ccc168 + 921e0c8
commit 1fef615
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 5 deletions.
diff --git a/UndertaleModLib/Models/UndertaleRoom.cs b/UndertaleModLib/Models/UndertaleRoom.cs
@@ -1799,7 +1799,7 @@ public void ReadCompressedTileData(UndertaleReader reader)
 
                     // sanity check: run of 2 empty tiles
                     if (length != 0x81) 
-                        throw new IOException("Expected 0x81, got " + length.ToString("X2"));
+                        throw new IOException("Expected 0x81, got 0x" + length.ToString("X2"));
                     if (tile != unchecked((uint)-1))
                         throw new IOException("Expected -1, got " + tile + " (0x" + tile.ToString("X8") + ")");
                 }

diff --git a/UndertaleModLib/UndertaleChunks.cs b/UndertaleModLib/UndertaleChunks.cs
@@ -916,17 +916,20 @@ private void CheckForTileCompression(UndertaleReader reader)
                     if (layerType != LayerType.Tiles)
                         continue;
 
-                    reader.Position += 10 * 4;
+                    reader.Position += 32;
+                    int effectCount = reader.ReadInt32();
+                    reader.Position += effectCount * 12 + 4;
+
                     int tileMapWidth = reader.ReadInt32();
                     int tileMapHeight = reader.ReadInt32();
                     if (nextOffset - reader.AbsPosition != (tileMapWidth * tileMapHeight * 4))
                     {
                         // Check complete, found and tested a layer.
                         reader.undertaleData.SetGMS2Version(2024, 2);
-                        reader.Position = returnTo;
-                        checkedFor2024_2 = true;
-                        return;
                     }
+                    reader.Position = returnTo;
+                    checkedFor2024_2 = true;
+                    return;
                 }
             }