Merge branch 'main' into shape-c

pmret · Jan 21, 2024 · 21a9108 · 21a9108
2 parents 482b26e + f1edb83
commit 21a9108
Show file tree

Hide file tree

Showing 10 changed files with 95 additions and 712 deletions.
diff --git a/requirements.txt b/requirements.txt
@@ -13,4 +13,5 @@ rabbitizer
 n64img
 python-githooks
 crunch64>=0.2.0
-splat64>=0.21.0
+splat64>=0.21.5
+requests
diff --git a/src/os/nusys/nugfxfuncset.c b/src/os/nusys/nugfxfuncset.c
@@ -1,9 +1,6 @@
 #include "common.h"
 #include "nu/nusys.h"
 
-NUGfxFunc nuGfxFunc = NULL;
-NUGfxPreNMIFunc nuGfxPreNMIFunc = NULL;
-
 void nuGfxFuncSet(NUGfxFunc func) {
     OSIntMask intMask;
 

diff --git a/src/os/nusys/nugfxthread.c b/src/os/nusys/nugfxthread.c
@@ -3,6 +3,9 @@
 
 void gfxThread(void*);
 
+NUGfxFunc nuGfxFunc = NULL;
+NUGfxPreNMIFunc nuGfxPreNMIFunc = NULL;
+
 extern char GfxStack[NU_GFX_STACK_SIZE];
 extern OSThread D_800B1B90;
 extern OSMesg nuGfxMesgBuf[NU_GFX_MESGS];

diff --git a/tools/build/configure.py b/tools/build/configure.py
@@ -624,7 +624,9 @@ def build(
             if isinstance(seg, splat.segtypes.n64.header.N64SegHeader):
                 build(entry.object_path, entry.src_paths, "as")
             elif isinstance(seg, splat.segtypes.common.asm.CommonSegAsm) or (
-                isinstance(seg, splat.segtypes.common.data.CommonSegData) and not seg.type[0] == "."
+                isinstance(seg, splat.segtypes.common.data.CommonSegData)
+                and not seg.type[0] == "."
+                or isinstance(seg, splat.segtypes.common.textbin.CommonSegTextbin)
             ):
                 build(entry.object_path, entry.src_paths, "as")
             elif seg.type in ["pm_effect_loads", "pm_effect_shims"]:
@@ -782,11 +784,7 @@ def build(
                                 type="data",
                                 define=True,
                             )
-            elif (
-                isinstance(seg, splat.segtypes.common.bin.CommonSegBin)
-                or isinstance(seg, splat.segtypes.common.textbin.CommonSegTextbin)
-                or isinstance(seg, splat.segtypes.common.rodatabin.CommonSegRodatabin)
-            ):
+            elif isinstance(seg, splat.segtypes.common.bin.CommonSegBin):
                 build(entry.object_path, entry.src_paths, "bin")
             elif isinstance(seg, splat.segtypes.n64.yay0.N64SegYay0):
                 compressed_path = entry.object_path.with_suffix("")  # remove .o

diff --git a/tools/build/sprite/sprites.py b/tools/build/sprite/sprites.py
@@ -17,6 +17,7 @@
     MAX_COMPONENTS_XML,
     NPC_SPRITE_MEDADATA_XML_FILENAME,
     PALETTE_GROUPS_XML,
+    HAS_BACK_XML,
     PALETTE_XML,
     PLAYER_SPRITE_MEDADATA_XML_FILENAME,
     SPECIAL_RASTER,
@@ -141,13 +142,12 @@ def player_raster_from_xml(xml: ET.Element, back: bool = False) -> PlayerRaster:
 
 
 def player_xml_to_bytes(xml: ET.Element, asset_stack: Tuple[Path, ...]) -> List[bytes]:
-    has_back = False
-
     out_bytes = b""
     back_out_bytes = b""
 
     max_components = int(xml.attrib[MAX_COMPONENTS_XML])
     num_variations = int(xml.attrib[PALETTE_GROUPS_XML])
+    has_back = xml.attrib[HAS_BACK_XML] == "true"
 
     # Animations
     animations: List[List[AnimComponent]] = []
@@ -253,8 +253,6 @@ def player_xml_to_bytes(xml: ET.Element, asset_stack: Tuple[Path, ...]) -> List[
     raster_bytes_back: bytes = b""
     raster_offset = 0
     for raster_xml in xml[1]:
-        if "back" in raster_xml.attrib:
-            has_back = True
         r = player_raster_from_xml(raster_xml, back=False)
         raster_bytes += struct.pack(">IBBBB", raster_offset, r.width, r.height, r.palette_idx, 0xFF)
 
@@ -343,13 +341,6 @@ def player_xml_to_bytes(xml: ET.Element, asset_stack: Tuple[Path, ...]) -> List[
     return ret
 
 
-def xml_has_back(xml: ET.Element) -> bool:
-    for raster_xml in xml[1]:
-        if "back" in raster_xml.attrib:
-            return True
-    return False
-
-
 def write_player_sprite_header(
     sprite_order: List[str],
     out_file: Path,
@@ -365,7 +356,7 @@ def write_player_sprite_header(
 
     for sprite_name in sprite_order:
         sprite_xml = PLAYER_XML_CACHE[sprite_name]
-        has_back = xml_has_back(sprite_xml)
+        has_back = sprite_xml.attrib[HAS_BACK_XML] == "true"
 
         player_sprites[f"SPR_{sprite_name}"] = sprite_id
         player_rasters[sprite_name] = {}

diff --git a/tools/splat_ext/pm_sprites.py b/tools/splat_ext/pm_sprites.py
@@ -95,6 +95,7 @@
 
 MAX_COMPONENTS_XML = "maxComponents"
 PALETTE_GROUPS_XML = "paletteGroups"
+HAS_BACK_XML = "hasBack"
 PALETTE_XML = "palette"
 BACK_PALETTE_XML = "backPalette"
 
@@ -397,6 +398,7 @@ def get_sprite_name_from_offset(offset: int, offsets: List[int], names: List[str
             {
                 MAX_COMPONENTS_XML: str(cur_sprite.max_components),
                 PALETTE_GROUPS_XML: str(cur_sprite.num_variations),
+                HAS_BACK_XML: str(has_back).lower(),
             },
         )