From ff15905491faf884b6466c135f329f0fef447459 Mon Sep 17 00:00:00 2001
From: HailSanta <Hail2Santa@gmail.com>
Date: Thu, 25 Apr 2024 15:40:27 -0400
Subject: [PATCH 1/2] do not modify texture names

---
 tools/build/mapfs/tex.py        |  5 -----
 tools/splat_ext/tex_archives.py | 15 ++++-----------
 2 files changed, 4 insertions(+), 16 deletions(-)

diff --git a/tools/build/mapfs/tex.py b/tools/build/mapfs/tex.py
index f560a907a3..de7b961f67 100644
--- a/tools/build/mapfs/tex.py
+++ b/tools/build/mapfs/tex.py
@@ -30,11 +30,6 @@ def img_from_json(json_data, tex_name: str, asset_stack: Tuple[Path, ...]) -> Te
 
     ret.img_name = json_data["name"]
 
-    if "ext" in json_data:
-        ret.raw_ext = json_data["ext"]
-    else:
-        ret.raw_ext = "tif"
-
     # read data for main tile
     main_data = json_data.get("main")
     if main_data == None:
diff --git a/tools/splat_ext/tex_archives.py b/tools/splat_ext/tex_archives.py
index 682efea105..295253f64a 100644
--- a/tools/splat_ext/tex_archives.py
+++ b/tools/splat_ext/tex_archives.py
@@ -222,9 +222,7 @@ def get_n64_pal(self, texbuf, fmt, depth):
     # extract texture properties and rasters from buffer
     def from_bytes(self, texbuf: TexBuffer):
         # strip area prefix and original extension suffix
-        raw_name = decode_null_terminated_ascii(texbuf.get(32))
-        self.img_name = raw_name[4:-3]
-        self.raw_ext = raw_name[-3:]
+        self.img_name = decode_null_terminated_ascii(texbuf.get(32))
 
         (
             self.aux_width,
@@ -339,10 +337,6 @@ def get_json_entry(self):
         out = {}
         out["name"] = self.img_name
 
-        # only a single texture in 'tst_tex' has 'rgb', otherwise this is always 'tif'
-        if self.raw_ext != "tif":
-            out["ext"] = self.raw_ext
-
         out["main"] = {
             "format": get_format_name(self.main_fmt, self.main_depth),
             "hwrap": wrap_modes.get(self.main_hwrap),
@@ -439,9 +433,8 @@ def pack_color(r, g, b, a):
     def add_bytes(self, tex_name: str, bytes: bytearray):
         pos = len(bytes)
 
-        # form raw name and write to header
-        raw_name = tex_name[:4] + self.img_name + self.raw_ext
-        name_bytes = raw_name.encode("ascii")
+        # write name to header
+        name_bytes = self.img_name.encode("ascii")
         bytes += name_bytes
 
         # pad name out to 32 bytes
@@ -491,7 +484,7 @@ def add_bytes(self, tex_name: str, bytes: bytearray):
                 bytes += self.aux_pal
 
         size = len(bytes) - pos
-        assert size == self.expected_size(), f"{raw_name}: size mismatch: {size} != {self.expected_size()}"
+        assert size == self.expected_size(), f"{self.img_name}: size mismatch: {size} != {self.expected_size()}"
 
     def expected_size(self) -> int:
         """

From f4edcfe49d6be5298b3edab1ff4b55b01bfce7a8 Mon Sep 17 00:00:00 2001
From: HailSanta <Hail2Santa@gmail.com>
Date: Thu, 25 Apr 2024 19:44:37 -0400
Subject: [PATCH 2/2] remove tif extension hack

---
 src/model.c | 8 --------
 1 file changed, 8 deletions(-)

diff --git a/src/model.c b/src/model.c
index 058084a688..2ef5617295 100644
--- a/src/model.c
+++ b/src/model.c
@@ -2149,14 +2149,6 @@ void load_texture_by_name(ModelNodeProperty* propertyName, s32 romOffset, s32 si
             break;
         }
 
-        // try appending "tif" - this is a common issue with textures ported from Star Rod mods
-        char tifName[32];
-        strcpy(tifName, textureName);
-        strcat(tifName, "tif");
-        if (strcmp(tifName, header->name) == 0) {
-            break;
-        }
-
         textureIdx++;
         mainSize = rasterSize + paletteSize + sizeof(*header);
         romOffset += mainSize;