all versions OK

src/code/z_kankyo.c

@@ -1,5 +1,5 @@
-#pragma increment_block_number "gc-eu:208 gc-eu-mq:224 gc-jp:208 gc-jp-ce:208 gc-jp-mq:208 gc-us:208 gc-us-mq:208" \
+#pragma increment_block_number "gc-eu:208 gc-eu-mq:208 gc-jp:192 gc-jp-ce:192 gc-jp-mq:192 gc-us:192 gc-us-mq:192" \
-                               "ique-cn:208 ntsc-1.0:208 ntsc-1.1:208 ntsc-1.2:208 pal-1.0:232 pal-1.1:232"
+                               "ique-cn:192 ntsc-1.0:208 ntsc-1.1:208 ntsc-1.2:208 pal-1.0:224 pal-1.1:224"
 
 #include "global.h"
 #include "ultra64.h"
@@ -214,8 +214,8 @@ s16 sLightningFlashAlpha;
 s16 sSunDepthTestX;
 s16 sSunDepthTestY;
 
-#pragma increment_block_number "gc-eu:224 gc-eu-mq:240 gc-jp:224 gc-jp-ce:224 gc-jp-mq:224 gc-us:224 gc-us-mq:224" \
+#pragma increment_block_number "gc-eu:224 gc-eu-mq:224 gc-jp:224 gc-jp-ce:224 gc-jp-mq:224 gc-us:224 gc-us-mq:224" \
-                               "ique-cn:224 ntsc-1.0:224 ntsc-1.1:224 ntsc-1.2:224 pal-1.0:240 pal-1.1:240"
+                               "ique-cn:224 ntsc-1.0:224 ntsc-1.1:224 ntsc-1.2:224 pal-1.0:224 pal-1.1:224"
 
 LightNode* sNGameOverLightNode;
 LightInfo sNGameOverLightInfo;

src/overlays/actors/ovl_Boss_Tw/z_boss_tw.c

@@ -3,6 +3,8 @@
 #include "assets/objects/object_tw/object_tw.h"
 #include "overlays/actors/ovl_Door_Warp1/z_door_warp1.h"
 
+#pragma increment_block_number "gc-jp:128 gc-jp-ce:128 gc-jp-mq:128 gc-us:128 gc-us-mq:128 ique-cn:128"
+
 #define FLAGS                                                                                 \
     (ACTOR_FLAG_ATTENTION_ENABLED | ACTOR_FLAG_HOSTILE | ACTOR_FLAG_UPDATE_CULLING_DISABLED | \
      ACTOR_FLAG_DRAW_CULLING_DISABLED)

src/overlays/actors/ovl_Fishing/z_fishing.c

@@ -35,8 +35,8 @@
 #include "cic6105.h"
 #endif
 
-#pragma increment_block_number "gc-eu:64 gc-eu-mq:170 gc-jp:170 gc-jp-ce:170 gc-jp-mq:170 gc-us:170 gc-us-mq:170" \
+#pragma increment_block_number "gc-eu:64 gc-eu-mq:64 gc-jp:64 gc-jp-ce:64 gc-jp-mq:64 gc-us:64 gc-us-mq:64 ntsc-1.0:0" \
-                               "ntsc-1.0:0 ntsc-1.1:121 ntsc-1.2:121 pal-1.0:121 pal-1.1:121"
+                               "ntsc-1.1:0 ntsc-1.2:0 pal-1.0:0 pal-1.1:0"
 
 #define FLAGS ACTOR_FLAG_UPDATE_CULLING_DISABLED
 

src/overlays/actors/ovl_player_actor/z_player.c

@@ -365,14 +365,14 @@ static s32 D_80858AA0;
 
 // TODO: There's probably a way to match BSS ordering with less padding by spreading the variables out and moving
 // data around. It would be easier if we had more options for controlling BSS ordering in debug.
-#pragma increment_block_number "gc-eu:128 gc-eu-mq:192 gc-jp:128 gc-jp-ce:128 gc-jp-mq:128 gc-us:128 gc-us-mq:128" \
+#pragma increment_block_number "gc-eu:128 gc-eu-mq:128 gc-jp:128 gc-jp-ce:128 gc-jp-mq:128 gc-us:128 gc-us-mq:128" \
                                "ique-cn:128 ntsc-1.0:192 ntsc-1.1:192 ntsc-1.2:192 pal-1.0:192 pal-1.1:192"
 
 static s32 sSavedCurrentMask;
 static Vec3f sInteractWallCheckResult;
 static Input* sControlInput;
 
-#pragma increment_block_number "gc-eu:192 gc-eu-mq:160 gc-jp:192 gc-jp-ce:192 gc-jp-mq:192 gc-us:192 gc-us-mq:192" \
+#pragma increment_block_number "gc-eu:192 gc-eu-mq:192 gc-jp:192 gc-jp-ce:192 gc-jp-mq:192 gc-us:192 gc-us-mq:192" \
                                "ique-cn:192 ntsc-1.0:128 ntsc-1.1:128 ntsc-1.2:128 pal-1.0:128 pal-1.1:128"
 
 // .data

tools/assets/extract/extase/__init__.py

@@ -116,6 +116,7 @@ class File:
         *,
         data: Optional[memoryview] = None,
         size: Optional[int] = None,
+        alignment: int = 8,
     ):
         self.name = name
         if data is None != size is None:
@@ -129,6 +130,7 @@ class File:
             assert size is not None
             self.data = None
             self.size = size
+        self.alignment = alignment
         self._resources: list[Resource] = []
         self._is_resources_sorted = True
         self.referenced_files: set[File] = set()

tools/assets/extract/extase_oot64/dlist_resources.py

@@ -220,9 +220,9 @@ class TextureResource(Resource):
         self.resources_ci_list: list[TextureResource] = []
         """For TLUT "textures", the CI textures using it"""
 
-        if size_bytes % 8 == 0 and range_start % 8 == 0:
+        if size_bytes % 8 == 0 and (file.alignment + range_start) % 8 == 0:
             self.alignment = 8
-        elif size_bytes % 4 == 0 and range_start % 4 == 0:
+        elif size_bytes % 4 == 0 and (file.alignment + range_start) % 4 == 0:
             self.alignment = 4
         else:
             raise NotImplementedError(

tools/assets/extract/extract_xml_z64.py

@@ -120,8 +120,21 @@ def process_pool(
             range_start, range_end = rescoll.backing_memory.range
             data = data[range_start:range_end]
 
+        if isinstance(rescoll.start_address, VRAMStartAddress):
+            if rescoll.start_address.vram % 8 == 0:
+                alignment = 8
+            elif rescoll.start_address.vram % 4 == 0:
+                alignment = 4
+            else:
+                raise NotImplementedError(
+                    f"alignment for {rescoll.start_address.vram=:#08X}"
+                )
+        elif isinstance(rescoll.start_address, SegmentStartAddress):
+            alignment = 8
+        else:
+            raise NotImplementedError(rescoll.start_address)
         # TODO File.name
-        file = File(rescoll.backing_memory.name, data=data)
+        file = File(rescoll.backing_memory.name, data=data, alignment=alignment)
         file_by_rescoll[rescoll] = file
 
         (