diff --git a/assets/xml/objects/object_tw.xml b/assets/xml/objects/object_tw.xml
index 922d28ac65..435a064824 100644
--- a/assets/xml/objects/object_tw.xml
+++ b/assets/xml/objects/object_tw.xml
@@ -192,11 +192,55 @@
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
@@ -218,11 +262,55 @@
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
@@ -430,9 +518,6 @@
-
-
-
@@ -566,6 +651,7 @@
+
@@ -648,71 +734,77 @@
-
+
+
+
+
+
+
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
+
+
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
-
+
-
-
+
+
diff --git a/assets/xml/objects/object_tw_pal.xml b/assets/xml/objects/object_tw_pal.xml
deleted file mode 100644
index 2b777f3d3a..0000000000
--- a/assets/xml/objects/object_tw_pal.xml
+++ /dev/null
@@ -1,807 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/baseroms/gc-eu-mq-dbg/config.yml b/baseroms/gc-eu-mq-dbg/config.yml
index 7fdd8dea7b..e8465c1bdc 100644
--- a/baseroms/gc-eu-mq-dbg/config.yml
+++ b/baseroms/gc-eu-mq-dbg/config.yml
@@ -796,7 +796,7 @@ assets:
- name: objects/object_tsubo
xml_path: assets/xml/objects/object_tsubo.xml
- name: objects/object_tw
- xml_path: assets/xml/objects/object_tw_pal.xml
+ xml_path: assets/xml/objects/object_tw.xml
- name: objects/object_umajump
xml_path: assets/xml/objects/object_umajump.xml
- name: objects/object_vali
diff --git a/baseroms/gc-eu-mq/config.yml b/baseroms/gc-eu-mq/config.yml
index 04e1a70ed9..ff709dc9b4 100644
--- a/baseroms/gc-eu-mq/config.yml
+++ b/baseroms/gc-eu-mq/config.yml
@@ -788,7 +788,7 @@ assets:
- name: objects/object_tsubo
xml_path: assets/xml/objects/object_tsubo.xml
- name: objects/object_tw
- xml_path: assets/xml/objects/object_tw_pal.xml
+ xml_path: assets/xml/objects/object_tw.xml
- name: objects/object_umajump
xml_path: assets/xml/objects/object_umajump.xml
- name: objects/object_vali
diff --git a/baseroms/gc-eu/config.yml b/baseroms/gc-eu/config.yml
index 1d241a946a..ad049d17ff 100644
--- a/baseroms/gc-eu/config.yml
+++ b/baseroms/gc-eu/config.yml
@@ -788,7 +788,7 @@ assets:
- name: objects/object_tsubo
xml_path: assets/xml/objects/object_tsubo.xml
- name: objects/object_tw
- xml_path: assets/xml/objects/object_tw_pal.xml
+ xml_path: assets/xml/objects/object_tw.xml
- name: objects/object_umajump
xml_path: assets/xml/objects/object_umajump.xml
- name: objects/object_vali
diff --git a/baseroms/pal-1.0/config.yml b/baseroms/pal-1.0/config.yml
index 3354af1989..176c3eaacf 100644
--- a/baseroms/pal-1.0/config.yml
+++ b/baseroms/pal-1.0/config.yml
@@ -800,7 +800,7 @@ assets:
- name: objects/object_tsubo
xml_path: assets/xml/objects/object_tsubo.xml
- name: objects/object_tw
- xml_path: assets/xml/objects/object_tw_pal.xml
+ xml_path: assets/xml/objects/object_tw.xml
- name: objects/object_umajump
xml_path: assets/xml/objects/object_umajump.xml
- name: objects/object_vali
diff --git a/baseroms/pal-1.1/config.yml b/baseroms/pal-1.1/config.yml
index 41932f79e2..79e02623e9 100644
--- a/baseroms/pal-1.1/config.yml
+++ b/baseroms/pal-1.1/config.yml
@@ -800,7 +800,7 @@ assets:
- name: objects/object_tsubo
xml_path: assets/xml/objects/object_tsubo.xml
- name: objects/object_tw
- xml_path: assets/xml/objects/object_tw_pal.xml
+ xml_path: assets/xml/objects/object_tw.xml
- name: objects/object_umajump
xml_path: assets/xml/objects/object_umajump.xml
- name: objects/object_vali
diff --git a/src/overlays/actors/ovl_Boss_Tw/z_boss_tw.c b/src/overlays/actors/ovl_Boss_Tw/z_boss_tw.c
index 79eb682a76..e57b353e21 100644
--- a/src/overlays/actors/ovl_Boss_Tw/z_boss_tw.c
+++ b/src/overlays/actors/ovl_Boss_Tw/z_boss_tw.c
@@ -26,8 +26,8 @@
#include "assets/objects/gameplay_keep/gameplay_keep.h"
#include "assets/objects/object_tw/object_tw.h"
-#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:128 ntsc-1.1:128 ntsc-1.2:128 pal-1.0:128 pal-1.1:128"
+#pragma increment_block_number "gc-eu:128 gc-eu-mq:128 gc-jp:0 gc-jp-ce:0 gc-jp-mq:0 gc-us:0 gc-us-mq:0 ique-cn:0" \
+ "ntsc-1.0:0 ntsc-1.1:0 ntsc-1.2:0 pal-1.0:128 pal-1.1:128"
#define FLAGS \
(ACTOR_FLAG_ATTENTION_ENABLED | ACTOR_FLAG_HOSTILE | ACTOR_FLAG_UPDATE_CULLING_DISABLED | \
diff --git a/tools/assets/descriptor/z64resources.py b/tools/assets/descriptor/z64resources.py
index f4383e62b1..9f241c3118 100644
--- a/tools/assets/descriptor/z64resources.py
+++ b/tools/assets/descriptor/z64resources.py
@@ -139,6 +139,7 @@ class SkeletonResourceDesc(ResourceDesc):
def get_size(self):
skel_size = {
SkeletonType.NORMAL: 0x8,
+ SkeletonType.FLEX: 0xC,
}.get(self.type)
if skel_size is None:
raise ResourceHasNoSizeError()