From 7ddd468ed6cea45bfb3a6cc94498503525ab85f2 Mon Sep 17 00:00:00 2001
From: Dragorn421 <Dragorn421@users.noreply.github.com>
Date: Wed, 11 Jun 2025 01:36:16 +0200
Subject: [PATCH] `object_zo`: finalize, split and commit (#2624)

---
 assets/objects/object_zo/effect_bubbles.c     |  20 ++
 assets/objects/object_zo/effect_ripples.c     |  10 +
 assets/objects/object_zo/effect_splashes.c    |  20 ++
 .../gZoraHandsOnHipsTappingFootAnim.c         |  14 +
 assets/objects/object_zo/gZoraIdleAnim.c      |  14 +
 assets/objects/object_zo/gZoraOpenArmsAnim.c  |  14 +
 assets/objects/object_zo/gZoraSkel.c          | 291 ++++++++++++++++++
 assets/objects/object_zo/gZoraSurfaceAnim.c   |  14 +
 .../objects/object_zo/gZoraThrowRupeesAnim.c  |  14 +
 assets/objects/object_zo/object_zo.h          |  55 ++++
 assets/xml/objects/object_zo.xml              |  40 +--
 spec/spec                                     |  10 +-
 tools/assets/extract/write_source.txt         |   1 -
 13 files changed, 495 insertions(+), 22 deletions(-)
 create mode 100644 assets/objects/object_zo/effect_bubbles.c
 create mode 100644 assets/objects/object_zo/effect_ripples.c
 create mode 100644 assets/objects/object_zo/effect_splashes.c
 create mode 100644 assets/objects/object_zo/gZoraHandsOnHipsTappingFootAnim.c
 create mode 100644 assets/objects/object_zo/gZoraIdleAnim.c
 create mode 100644 assets/objects/object_zo/gZoraOpenArmsAnim.c
 create mode 100644 assets/objects/object_zo/gZoraSkel.c
 create mode 100644 assets/objects/object_zo/gZoraSurfaceAnim.c
 create mode 100644 assets/objects/object_zo/gZoraThrowRupeesAnim.c
 create mode 100644 assets/objects/object_zo/object_zo.h

diff --git a/assets/objects/object_zo/effect_bubbles.c b/assets/objects/object_zo/effect_bubbles.c
new file mode 100644
index 0000000000..9f88bfce82
--- /dev/null
+++ b/assets/objects/object_zo/effect_bubbles.c
@@ -0,0 +1,20 @@
+#include "object_zo.h"
+#include "gfx.h"
+
+#define gZoraBubblesTex_WIDTH 16
+#define gZoraBubblesTex_HEIGHT 16
+u64 gZoraBubblesTex[TEX_LEN(u64, gZoraBubblesTex_WIDTH, gZoraBubblesTex_HEIGHT, 8)] = {
+#include "assets/objects/object_zo/gZoraBubblesTex.ia8.inc.c"
+};
+
+Vtx gZoraBubblesModelVtx[] = {
+#include "assets/objects/object_zo/gZoraBubblesModelVtx.inc.c"
+};
+
+Gfx gZoraBubblesMaterialDL[12] = {
+#include "assets/objects/object_zo/gZoraBubblesMaterialDL.inc.c"
+};
+
+Gfx gZoraBubblesModelDL[3] = {
+#include "assets/objects/object_zo/gZoraBubblesModelDL.inc.c"
+};
diff --git a/assets/objects/object_zo/effect_ripples.c b/assets/objects/object_zo/effect_ripples.c
new file mode 100644
index 0000000000..7fb878f2b0
--- /dev/null
+++ b/assets/objects/object_zo/effect_ripples.c
@@ -0,0 +1,10 @@
+#include "object_zo.h"
+#include "assets/objects/gameplay_keep/gameplay_keep.h"
+
+Gfx gZoraRipplesMaterialDL[13] = {
+#include "assets/objects/object_zo/gZoraRipplesMaterialDL.inc.c"
+};
+
+Gfx gZoraRipplesModelDL[3] = {
+#include "assets/objects/object_zo/gZoraRipplesModelDL.inc.c"
+};
diff --git a/assets/objects/object_zo/effect_splashes.c b/assets/objects/object_zo/effect_splashes.c
new file mode 100644
index 0000000000..557830eba1
--- /dev/null
+++ b/assets/objects/object_zo/effect_splashes.c
@@ -0,0 +1,20 @@
+#include "object_zo.h"
+#include "gfx.h"
+
+#define gZoraSplashesTex_WIDTH 16
+#define gZoraSplashesTex_HEIGHT 16
+u64 gZoraSplashesTex[TEX_LEN(u64, gZoraSplashesTex_WIDTH, gZoraSplashesTex_HEIGHT, 8)] = {
+#include "assets/objects/object_zo/gZoraSplashesTex.i8.inc.c"
+};
+
+Vtx gZoraSplashesModelVtx[] = {
+#include "assets/objects/object_zo/gZoraSplashesModelVtx.inc.c"
+};
+
+Gfx gZoraSplashesMaterialDL[14] = {
+#include "assets/objects/object_zo/gZoraSplashesMaterialDL.inc.c"
+};
+
+Gfx gZoraSplashesModelDL[3] = {
+#include "assets/objects/object_zo/gZoraSplashesModelDL.inc.c"
+};
diff --git a/assets/objects/object_zo/gZoraHandsOnHipsTappingFootAnim.c b/assets/objects/object_zo/gZoraHandsOnHipsTappingFootAnim.c
new file mode 100644
index 0000000000..de19ceac14
--- /dev/null
+++ b/assets/objects/object_zo/gZoraHandsOnHipsTappingFootAnim.c
@@ -0,0 +1,14 @@
+#include "object_zo.h"
+#include "array_count.h"
+
+s16 gZoraHandsOnHipsTappingFootFrameData[] = {
+#include "assets/objects/object_zo/gZoraHandsOnHipsTappingFootFrameData.inc.c"
+};
+
+JointIndex gZoraHandsOnHipsTappingFootJointIndices[] = {
+#include "assets/objects/object_zo/gZoraHandsOnHipsTappingFootJointIndices.inc.c"
+};
+
+AnimationHeader gZoraHandsOnHipsTappingFootAnim = {
+#include "assets/objects/object_zo/gZoraHandsOnHipsTappingFootAnim.inc.c"
+};
diff --git a/assets/objects/object_zo/gZoraIdleAnim.c b/assets/objects/object_zo/gZoraIdleAnim.c
new file mode 100644
index 0000000000..0be4d26b2c
--- /dev/null
+++ b/assets/objects/object_zo/gZoraIdleAnim.c
@@ -0,0 +1,14 @@
+#include "object_zo.h"
+#include "array_count.h"
+
+s16 gZoraIdleFrameData[] = {
+#include "assets/objects/object_zo/gZoraIdleFrameData.inc.c"
+};
+
+JointIndex gZoraIdleJointIndices[] = {
+#include "assets/objects/object_zo/gZoraIdleJointIndices.inc.c"
+};
+
+AnimationHeader gZoraIdleAnim = {
+#include "assets/objects/object_zo/gZoraIdleAnim.inc.c"
+};
diff --git a/assets/objects/object_zo/gZoraOpenArmsAnim.c b/assets/objects/object_zo/gZoraOpenArmsAnim.c
new file mode 100644
index 0000000000..5be007b12b
--- /dev/null
+++ b/assets/objects/object_zo/gZoraOpenArmsAnim.c
@@ -0,0 +1,14 @@
+#include "object_zo.h"
+#include "array_count.h"
+
+s16 gZoraOpenArmsFrameData[] = {
+#include "assets/objects/object_zo/gZoraOpenArmsFrameData.inc.c"
+};
+
+JointIndex gZoraOpenArmsJointIndices[] = {
+#include "assets/objects/object_zo/gZoraOpenArmsJointIndices.inc.c"
+};
+
+AnimationHeader gZoraOpenArmsAnim = {
+#include "assets/objects/object_zo/gZoraOpenArmsAnim.inc.c"
+};
diff --git a/assets/objects/object_zo/gZoraSkel.c b/assets/objects/object_zo/gZoraSkel.c
new file mode 100644
index 0000000000..8ea991044a
--- /dev/null
+++ b/assets/objects/object_zo/gZoraSkel.c
@@ -0,0 +1,291 @@
+#include "object_zo.h"
+#include "array_count.h"
+#include "gfx.h"
+
+u64 gZoraTLUT[] = {
+#include "assets/objects/object_zo/gZoraTLUT.tlut.rgba16.inc.c"
+};
+
+#define gZoraFinTex_WIDTH 32
+#define gZoraFinTex_HEIGHT 32
+u64 gZoraFinTex[TEX_LEN(u64, gZoraFinTex_WIDTH, gZoraFinTex_HEIGHT, 8)] = {
+#include "assets/objects/object_zo/gZoraFinTex.ci8.tlut_gZoraTLUT.inc.c"
+};
+
+#define gZoraHeadTailTex_WIDTH 32
+#define gZoraHeadTailTex_HEIGHT 64
+u64 gZoraHeadTailTex[TEX_LEN(u64, gZoraHeadTailTex_WIDTH, gZoraHeadTailTex_HEIGHT, 8)] = {
+#include "assets/objects/object_zo/gZoraHeadTailTex.ci8.tlut_gZoraTLUT.inc.c"
+};
+
+#define gZoraHeadTex_WIDTH 8
+#define gZoraHeadTex_HEIGHT 8
+u64 gZoraHeadTex[TEX_LEN(u64, gZoraHeadTex_WIDTH, gZoraHeadTex_HEIGHT, 8)] = {
+#include "assets/objects/object_zo/gZoraHeadTex.ci8.tlut_gZoraTLUT.inc.c"
+};
+
+u64 gZoraEyeOpenTex[TEX_LEN(u64, ZORA_EYE_TEX_WIDTH, ZORA_EYE_TEX_HEIGHT, 16)] = {
+#include "assets/objects/object_zo/gZoraEyeOpenTex.rgba16.inc.c"
+};
+
+u64 gZoraEyeHalfTex[TEX_LEN(u64, ZORA_EYE_TEX_WIDTH, ZORA_EYE_TEX_HEIGHT, 16)] = {
+#include "assets/objects/object_zo/gZoraEyeHalfTex.rgba16.inc.c"
+};
+
+u64 gZoraEyeClosedTex[TEX_LEN(u64, ZORA_EYE_TEX_WIDTH, ZORA_EYE_TEX_HEIGHT, 16)] = {
+#include "assets/objects/object_zo/gZoraEyeClosedTex.rgba16.inc.c"
+};
+
+#define gZoraMouthTex_WIDTH 32
+#define gZoraMouthTex_HEIGHT 32
+u64 gZoraMouthTex[TEX_LEN(u64, gZoraMouthTex_WIDTH, gZoraMouthTex_HEIGHT, 16)] = {
+#include "assets/objects/object_zo/gZoraMouthTex.rgba16.inc.c"
+};
+
+#define gZoraHandTex_WIDTH 16
+#define gZoraHandTex_HEIGHT 16
+u64 gZoraHandTex[TEX_LEN(u64, gZoraHandTex_WIDTH, gZoraHandTex_HEIGHT, 8)] = {
+#include "assets/objects/object_zo/gZoraHandTex.ci8.tlut_gZoraTLUT.inc.c"
+};
+
+#define gZoraKneeTex_WIDTH 8
+#define gZoraKneeTex_HEIGHT 8
+u64 gZoraKneeTex[TEX_LEN(u64, gZoraKneeTex_WIDTH, gZoraKneeTex_HEIGHT, 8)] = {
+#include "assets/objects/object_zo/gZoraKneeTex.ci8.tlut_gZoraTLUT.inc.c"
+};
+
+Vtx gZoraHeadTailFinVtx[] = {
+#include "assets/objects/object_zo/gZoraHeadTailFinVtx.inc.c"
+};
+
+Vtx gZoraHeadTail3Vtx[] = {
+#include "assets/objects/object_zo/gZoraHeadTail3Vtx.inc.c"
+};
+
+Vtx gZoraHeadTail2Vtx[] = {
+#include "assets/objects/object_zo/gZoraHeadTail2Vtx.inc.c"
+};
+
+Vtx gZoraHeadTail1Vtx[] = {
+#include "assets/objects/object_zo/gZoraHeadTail1Vtx.inc.c"
+};
+
+Vtx gZoraHeadVtx[] = {
+#include "assets/objects/object_zo/gZoraHeadVtx.inc.c"
+};
+
+Vtx gZoraLeftHandVtx[] = {
+#include "assets/objects/object_zo/gZoraLeftHandVtx.inc.c"
+};
+
+Vtx gZoraLeftForearmVtx[] = {
+#include "assets/objects/object_zo/gZoraLeftForearmVtx.inc.c"
+};
+
+Vtx gZoraLeftArmVtx[] = {
+#include "assets/objects/object_zo/gZoraLeftArmVtx.inc.c"
+};
+
+Vtx gZoraRightHandVtx[] = {
+#include "assets/objects/object_zo/gZoraRightHandVtx.inc.c"
+};
+
+Vtx gZoraRightForearmVtx[] = {
+#include "assets/objects/object_zo/gZoraRightForearmVtx.inc.c"
+};
+
+Vtx gZoraRightArmVtx[] = {
+#include "assets/objects/object_zo/gZoraRightArmVtx.inc.c"
+};
+
+Vtx gZoraTorsoVtx[] = {
+#include "assets/objects/object_zo/gZoraTorsoVtx.inc.c"
+};
+
+Vtx gZoraLeftFootVtx[] = {
+#include "assets/objects/object_zo/gZoraLeftFootVtx.inc.c"
+};
+
+Vtx gZoraLeftShinVtx[] = {
+#include "assets/objects/object_zo/gZoraLeftShinVtx.inc.c"
+};
+
+Vtx gZoraLeftThighsVtx[] = {
+#include "assets/objects/object_zo/gZoraLeftThighsVtx.inc.c"
+};
+
+Vtx gZoraRightFootVtx[] = {
+#include "assets/objects/object_zo/gZoraRightFootVtx.inc.c"
+};
+
+Vtx gZoraRightShinVtx[] = {
+#include "assets/objects/object_zo/gZoraRightShinVtx.inc.c"
+};
+
+Vtx gZoraRightThighsVtx[] = {
+#include "assets/objects/object_zo/gZoraRightThighsVtx.inc.c"
+};
+
+Vtx gZoraPelvisVtx[] = {
+#include "assets/objects/object_zo/gZoraPelvisVtx.inc.c"
+};
+
+Gfx gZoraPelvisDL[53] = {
+#include "assets/objects/object_zo/gZoraPelvisDL.inc.c"
+};
+
+Gfx gZoraTorsoDL[111] = {
+#include "assets/objects/object_zo/gZoraTorsoDL.inc.c"
+};
+
+Gfx gZoraHeadDL[79] = {
+#include "assets/objects/object_zo/gZoraHeadDL.inc.c"
+};
+
+Gfx gZoraHeadTail1DL[52] = {
+#include "assets/objects/object_zo/gZoraHeadTail1DL.inc.c"
+};
+
+Gfx gZoraHeadTail2DL[51] = {
+#include "assets/objects/object_zo/gZoraHeadTail2DL.inc.c"
+};
+
+Gfx gZoraHeadTail3DL[51] = {
+#include "assets/objects/object_zo/gZoraHeadTail3DL.inc.c"
+};
+
+Gfx gZoraHeadTailFinDL[72] = {
+#include "assets/objects/object_zo/gZoraHeadTailFinDL.inc.c"
+};
+
+Gfx gZoraRightArmDL[76] = {
+#include "assets/objects/object_zo/gZoraRightArmDL.inc.c"
+};
+
+Gfx gZoraRightForearmDL[92] = {
+#include "assets/objects/object_zo/gZoraRightForearmDL.inc.c"
+};
+
+Gfx gZoraRightHandDL[65] = {
+#include "assets/objects/object_zo/gZoraRightHandDL.inc.c"
+};
+
+Gfx gZoraLeftArmDL[76] = {
+#include "assets/objects/object_zo/gZoraLeftArmDL.inc.c"
+};
+
+Gfx gZoraLeftForearmDL[92] = {
+#include "assets/objects/object_zo/gZoraLeftForearmDL.inc.c"
+};
+
+Gfx gZoraLeftHandDL[65] = {
+#include "assets/objects/object_zo/gZoraLeftHandDL.inc.c"
+};
+
+Gfx gZoraRightThighsDL[92] = {
+#include "assets/objects/object_zo/gZoraRightThighsDL.inc.c"
+};
+
+Gfx gZoraRightShinDL[91] = {
+#include "assets/objects/object_zo/gZoraRightShinDL.inc.c"
+};
+
+Gfx gZoraRightFootDL[89] = {
+#include "assets/objects/object_zo/gZoraRightFootDL.inc.c"
+};
+
+Gfx gZoraLeftThighsDL[92] = {
+#include "assets/objects/object_zo/gZoraLeftThighsDL.inc.c"
+};
+
+Gfx gZoraLeftShinDL[91] = {
+#include "assets/objects/object_zo/gZoraLeftShinDL.inc.c"
+};
+
+Gfx gZoraLeftFootDL[89] = {
+#include "assets/objects/object_zo/gZoraLeftFootDL.inc.c"
+};
+
+StandardLimb gZoraPelvisLimb = {
+#include "assets/objects/object_zo/gZoraPelvisLimb.inc.c"
+};
+
+StandardLimb gZoraLeftThighsLimb = {
+#include "assets/objects/object_zo/gZoraLeftThighsLimb.inc.c"
+};
+
+StandardLimb gZoraLeftShinLimb = {
+#include "assets/objects/object_zo/gZoraLeftShinLimb.inc.c"
+};
+
+StandardLimb gZoraLeftFootLimb = {
+#include "assets/objects/object_zo/gZoraLeftFootLimb.inc.c"
+};
+
+StandardLimb gZoraRightThighsLimb = {
+#include "assets/objects/object_zo/gZoraRightThighsLimb.inc.c"
+};
+
+StandardLimb gZoraRightShinLimb = {
+#include "assets/objects/object_zo/gZoraRightShinLimb.inc.c"
+};
+
+StandardLimb gZoraRightFootLimb = {
+#include "assets/objects/object_zo/gZoraRightFootLimb.inc.c"
+};
+
+StandardLimb gZoraTorsoLimb = {
+#include "assets/objects/object_zo/gZoraTorsoLimb.inc.c"
+};
+
+StandardLimb gZoraLeftArmLimb = {
+#include "assets/objects/object_zo/gZoraLeftArmLimb.inc.c"
+};
+
+StandardLimb gZoraLeftForearmLimb = {
+#include "assets/objects/object_zo/gZoraLeftForearmLimb.inc.c"
+};
+
+StandardLimb gZoraLeftHandLimb = {
+#include "assets/objects/object_zo/gZoraLeftHandLimb.inc.c"
+};
+
+StandardLimb gZoraRightArmLimb = {
+#include "assets/objects/object_zo/gZoraRightArmLimb.inc.c"
+};
+
+StandardLimb gZoraRightForearmLimb = {
+#include "assets/objects/object_zo/gZoraRightForearmLimb.inc.c"
+};
+
+StandardLimb gZoraRightHandLimb = {
+#include "assets/objects/object_zo/gZoraRightHandLimb.inc.c"
+};
+
+StandardLimb gZoraHeadLimb = {
+#include "assets/objects/object_zo/gZoraHeadLimb.inc.c"
+};
+
+StandardLimb gZoraHeadTail1Limb = {
+#include "assets/objects/object_zo/gZoraHeadTail1Limb.inc.c"
+};
+
+StandardLimb gZoraHeadTail2Limb = {
+#include "assets/objects/object_zo/gZoraHeadTail2Limb.inc.c"
+};
+
+StandardLimb gZoraHeadTail3Limb = {
+#include "assets/objects/object_zo/gZoraHeadTail3Limb.inc.c"
+};
+
+StandardLimb gZoraHeadTailFinLimb = {
+#include "assets/objects/object_zo/gZoraHeadTailFinLimb.inc.c"
+};
+
+void* gZoraLimbs[] = {
+#include "assets/objects/object_zo/gZoraLimbs.inc.c"
+};
+
+FlexSkeletonHeader gZoraSkel = {
+#include "assets/objects/object_zo/gZoraSkel.inc.c"
+};
diff --git a/assets/objects/object_zo/gZoraSurfaceAnim.c b/assets/objects/object_zo/gZoraSurfaceAnim.c
new file mode 100644
index 0000000000..f0fd1eefdb
--- /dev/null
+++ b/assets/objects/object_zo/gZoraSurfaceAnim.c
@@ -0,0 +1,14 @@
+#include "object_zo.h"
+#include "array_count.h"
+
+s16 gZoraSurfaceFrameData[] = {
+#include "assets/objects/object_zo/gZoraSurfaceFrameData.inc.c"
+};
+
+JointIndex gZoraSurfaceJointIndices[] = {
+#include "assets/objects/object_zo/gZoraSurfaceJointIndices.inc.c"
+};
+
+AnimationHeader gZoraSurfaceAnim = {
+#include "assets/objects/object_zo/gZoraSurfaceAnim.inc.c"
+};
diff --git a/assets/objects/object_zo/gZoraThrowRupeesAnim.c b/assets/objects/object_zo/gZoraThrowRupeesAnim.c
new file mode 100644
index 0000000000..8c1ac64a86
--- /dev/null
+++ b/assets/objects/object_zo/gZoraThrowRupeesAnim.c
@@ -0,0 +1,14 @@
+#include "object_zo.h"
+#include "array_count.h"
+
+s16 gZoraThrowRupeesFrameData[] = {
+#include "assets/objects/object_zo/gZoraThrowRupeesFrameData.inc.c"
+};
+
+JointIndex gZoraThrowRupeesJointIndices[] = {
+#include "assets/objects/object_zo/gZoraThrowRupeesJointIndices.inc.c"
+};
+
+AnimationHeader gZoraThrowRupeesAnim = {
+#include "assets/objects/object_zo/gZoraThrowRupeesAnim.inc.c"
+};
diff --git a/assets/objects/object_zo/object_zo.h b/assets/objects/object_zo/object_zo.h
new file mode 100644
index 0000000000..b68a1223d0
--- /dev/null
+++ b/assets/objects/object_zo/object_zo.h
@@ -0,0 +1,55 @@
+#ifndef OBJECT_ZO_H
+#define OBJECT_ZO_H
+
+#include "ultra64.h"
+#include "animation.h"
+#include "tex_len.h"
+
+extern Gfx gZoraBubblesMaterialDL[12];
+extern Gfx gZoraBubblesModelDL[3];
+
+extern Gfx gZoraSplashesMaterialDL[14];
+extern Gfx gZoraSplashesModelDL[3];
+
+extern Gfx gZoraRipplesMaterialDL[13];
+extern Gfx gZoraRipplesModelDL[3];
+
+extern AnimationHeader gZoraHandsOnHipsTappingFootAnim;
+extern AnimationHeader gZoraOpenArmsAnim;
+extern AnimationHeader gZoraThrowRupeesAnim;
+extern AnimationHeader gZoraSurfaceAnim;
+extern AnimationHeader gZoraIdleAnim;
+
+#define ZORA_EYE_TEX_WIDTH 32
+#define ZORA_EYE_TEX_HEIGHT 32
+extern u64 gZoraEyeOpenTex[TEX_LEN(u64, ZORA_EYE_TEX_WIDTH, ZORA_EYE_TEX_HEIGHT, 16)];
+extern u64 gZoraEyeHalfTex[TEX_LEN(u64, ZORA_EYE_TEX_WIDTH, ZORA_EYE_TEX_HEIGHT, 16)];
+extern u64 gZoraEyeClosedTex[TEX_LEN(u64, ZORA_EYE_TEX_WIDTH, ZORA_EYE_TEX_HEIGHT, 16)];
+
+typedef enum ZoraLimb {
+    /*  0 */ ZORA_LIMB_NONE,
+    /*  1 */ ZORA_LIMB_PELVIS,
+    /*  2 */ ZORA_LIMB_LEFT_THIGHS,
+    /*  3 */ ZORA_LIMB_LEFT_SHIN,
+    /*  4 */ ZORA_LIMB_LEFT_FOOT,
+    /*  5 */ ZORA_LIMB_RIGHT_THIGHS,
+    /*  6 */ ZORA_LIMB_RIGHT_SHIN,
+    /*  7 */ ZORA_LIMB_RIGHT_FOOT,
+    /*  8 */ ZORA_LIMB_TORSO,
+    /*  9 */ ZORA_LIMB_LEFT_ARM,
+    /* 10 */ ZORA_LIMB_LEFT_FOREARM,
+    /* 11 */ ZORA_LIMB_LEFT_HAND,
+    /* 12 */ ZORA_LIMB_RIGHT_ARM,
+    /* 13 */ ZORA_LIMB_RIGHT_FOREARM,
+    /* 14 */ ZORA_LIMB_RIGHT_HAND,
+    /* 15 */ ZORA_LIMB_HEAD,
+    /* 16 */ ZORA_LIMB_HEAD_TAIL_1,
+    /* 17 */ ZORA_LIMB_HEAD_TAIL_2,
+    /* 18 */ ZORA_LIMB_HEAD_TAIL_3,
+    /* 19 */ ZORA_LIMB_HEAD_TAIL_FIN,
+    /* 20 */ ZORA_LIMB_MAX
+} ZoraLimb;
+
+extern FlexSkeletonHeader gZoraSkel;
+
+#endif
diff --git a/assets/xml/objects/object_zo.xml b/assets/xml/objects/object_zo.xml
index 45c9601284..92aefa8949 100644
--- a/assets/xml/objects/object_zo.xml
+++ b/assets/xml/objects/object_zo.xml
@@ -1,110 +1,110 @@
 <Root>
     <ExternalFile OutPath="assets/objects/gameplay_keep"/>
     <File Name="object_zo" Segment="6">
-        <Skeleton Name="gZoraSkel" Type="Flex" LimbType="Standard" Offset="0xBFA8"/>
+        <Skeleton Name="gZoraSkel" Type="Flex" LimbType="Standard" LimbNone="ZORA_LIMB_NONE" LimbMax="ZORA_LIMB_MAX" EnumName="ZoraLimb" Offset="0xBFA8"/>
 
-        <Limb Name="gZoraPelvisLimb" LimbType="Standard" Offset="0xBE78"/>
+        <Limb Name="gZoraPelvisLimb" LimbType="Standard" EnumName="ZORA_LIMB_PELVIS" Offset="0xBE78"/>
         <Array Name="gZoraPelvisVtx" Count="31" Offset="0x8E50">
             <Vtx/>
         </Array>
         <DList Name="gZoraPelvisDL" Offset="0x9040"/>
 
         <!-- Left leg -->
-        <Limb Name="gZoraLeftThighsLimb" LimbType="Standard" Offset="0xBE84"/>
+        <Limb Name="gZoraLeftThighsLimb" LimbType="Standard" EnumName="ZORA_LIMB_LEFT_THIGHS" Offset="0xBE84"/>
         <Array Name="gZoraLeftThighsVtx" Count="44" Offset="0x83D0">
             <Vtx/>
         </Array>
         <DList Name="gZoraLeftThighsDL" Offset="0xB5F8"/>
-        <Limb Name="gZoraLeftShinLimb" LimbType="Standard" Offset="0xBE90"/>
+        <Limb Name="gZoraLeftShinLimb" LimbType="Standard" EnumName="ZORA_LIMB_LEFT_SHIN" Offset="0xBE90"/>
         <Array Name="gZoraLeftShinVtx" Count="41" Offset="0x8140">
             <Vtx/>
         </Array>
         <DList Name="gZoraLeftShinDL" Offset="0xB8D8"/>
-        <Limb Name="gZoraLeftFootLimb" LimbType="Standard" Offset="0xBE9C"/>
+        <Limb Name="gZoraLeftFootLimb" LimbType="Standard" EnumName="ZORA_LIMB_LEFT_FOOT" Offset="0xBE9C"/>
         <Array Name="gZoraLeftFootVtx" Count="39" Offset="0x7ED0">
             <Vtx/>
         </Array>
         <DList Name="gZoraLeftFootDL" Offset="0xBBB0"/>
 
         <!-- Right leg -->
-        <Limb Name="gZoraRightThighsLimb" LimbType="Standard" Offset="0xBEA8"/>
+        <Limb Name="gZoraRightThighsLimb" LimbType="Standard" EnumName="ZORA_LIMB_RIGHT_THIGHS" Offset="0xBEA8"/>
         <Array Name="gZoraRightThighsVtx" Count="44" Offset="0x8B90">
             <Vtx/>
         </Array>
         <DList Name="gZoraRightThighsDL" Offset="0xAD78"/>
-        <Limb Name="gZoraRightShinLimb" LimbType="Standard" Offset="0xBEB4"/>
+        <Limb Name="gZoraRightShinLimb" LimbType="Standard" EnumName="ZORA_LIMB_RIGHT_SHIN" Offset="0xBEB4"/>
         <Array Name="gZoraRightShinVtx" Count="41" Offset="0x8900">
             <Vtx/>
         </Array>
         <DList Name="gZoraRightShinDL" Offset="0xB058"/>
-        <Limb Name="gZoraRightFootLimb" LimbType="Standard" Offset="0xBEC0"/>
+        <Limb Name="gZoraRightFootLimb" LimbType="Standard" EnumName="ZORA_LIMB_RIGHT_FOOT" Offset="0xBEC0"/>
         <Array Name="gZoraRightFootVtx" Count="39" Offset="0x8690">
             <Vtx/>
         </Array>
         <DList Name="gZoraRightFootDL" Offset="0xB330"/>
 
-        <Limb Name="gZoraTorsoLimb" LimbType="Standard" Offset="0xBECC"/>
+        <Limb Name="gZoraTorsoLimb" LimbType="Standard" EnumName="ZORA_LIMB_TORSO" Offset="0xBECC"/>
         <Array Name="gZoraTorsoVtx" Count="106" Offset="0x7830">
             <Vtx/>
         </Array>
         <DList Name="gZoraTorsoDL" Offset="0x91E8"/>
 
         <!-- Left arm -->
-        <Limb Name="gZoraLeftArmLimb" LimbType="Standard" Offset="0xBED8"/>
+        <Limb Name="gZoraLeftArmLimb" LimbType="Standard" EnumName="ZORA_LIMB_LEFT_ARM" Offset="0xBED8"/>
         <Array Name="gZoraLeftArmVtx" Count="38" Offset="0x6ED0">
             <Vtx/>
         </Array>
         <DList Name="gZoraLeftArmDL" Offset="0xA630"/>
-        <Limb Name="gZoraLeftForearmLimb" LimbType="Standard" Offset="0xBEE4"/>
+        <Limb Name="gZoraLeftForearmLimb" LimbType="Standard" EnumName="ZORA_LIMB_LEFT_FOREARM" Offset="0xBEE4"/>
         <Array Name="gZoraLeftForearmVtx" Count="33" Offset="0x6CC0">
             <Vtx/>
         </Array>
         <DList Name="gZoraLeftForearmDL" Offset="0xA890"/>
-        <Limb Name="gZoraLeftHandLimb" LimbType="Standard" Offset="0xBEF0"/>
+        <Limb Name="gZoraLeftHandLimb" LimbType="Standard" EnumName="ZORA_LIMB_LEFT_HAND" Offset="0xBEF0"/>
         <Array Name="gZoraLeftHandVtx" Count="41" Offset="0x6A30">
             <Vtx/>
         </Array>
         <DList Name="gZoraLeftHandDL" Offset="0xAB70"/>
 
         <!-- Right arm -->
-        <Limb Name="gZoraRightArmLimb" LimbType="Standard" Offset="0xBEFC"/>
+        <Limb Name="gZoraRightArmLimb" LimbType="Standard" EnumName="ZORA_LIMB_RIGHT_ARM" Offset="0xBEFC"/>
         <Array Name="gZoraRightArmVtx" Count="38" Offset="0x75D0">
             <Vtx/>
         </Array>
         <DList Name="gZoraRightArmDL" Offset="0x9EE8"/>
-        <Limb Name="gZoraRightForearmLimb" LimbType="Standard" Offset="0xBF08"/>
+        <Limb Name="gZoraRightForearmLimb" LimbType="Standard" EnumName="ZORA_LIMB_RIGHT_FOREARM" Offset="0xBF08"/>
         <Array Name="gZoraRightForearmVtx" Count="33" Offset="0x73C0">
             <Vtx/>
         </Array>
         <DList Name="gZoraRightForearmDL" Offset="0xA148"/>
-        <Limb Name="gZoraRightHandLimb" LimbType="Standard" Offset="0xBF14"/>
+        <Limb Name="gZoraRightHandLimb" LimbType="Standard" EnumName="ZORA_LIMB_RIGHT_HAND" Offset="0xBF14"/>
         <Array Name="gZoraRightHandVtx" Count="41" Offset="0x7130">
             <Vtx/>
         </Array>
         <DList Name="gZoraRightHandDL" Offset="0xA428"/>
 
         <!-- Head and head tail -->
-        <Limb Name="gZoraHeadLimb" LimbType="Standard" Offset="0xBF20"/>
+        <Limb Name="gZoraHeadLimb" LimbType="Standard" EnumName="ZORA_LIMB_HEAD" Offset="0xBF20"/>
         <Array Name="gZoraHeadVtx" Count="75" Offset="0x6580">
             <Vtx/>
         </Array>
         <DList Name="gZoraHeadDL" Offset="0x9560"/>
-        <Limb Name="gZoraHeadTail1Limb" LimbType="Standard" Offset="0xBF2C"/>
+        <Limb Name="gZoraHeadTail1Limb" LimbType="Standard" EnumName="ZORA_LIMB_HEAD_TAIL_1" Offset="0xBF2C"/>
         <Array Name="gZoraHeadTail1Vtx" Count="24" Offset="0x6400">
             <Vtx/>
         </Array>
         <DList Name="gZoraHeadTail1DL" Offset="0x97D8"/>
-        <Limb Name="gZoraHeadTail2Limb" LimbType="Standard" Offset="0xBF38"/>
+        <Limb Name="gZoraHeadTail2Limb" LimbType="Standard" EnumName="ZORA_LIMB_HEAD_TAIL_2" Offset="0xBF38"/>
         <Array Name="gZoraHeadTail2Vtx" Count="22" Offset="0x62A0">
             <Vtx/>
         </Array>
         <DList Name="gZoraHeadTail2DL" Offset="0x9978"/>
-        <Limb Name="gZoraHeadTail3Limb" LimbType="Standard" Offset="0xBF44"/>
+        <Limb Name="gZoraHeadTail3Limb" LimbType="Standard" EnumName="ZORA_LIMB_HEAD_TAIL_3" Offset="0xBF44"/>
         <Array Name="gZoraHeadTail3Vtx" Count="22" Offset="0x6140">
             <Vtx/>
         </Array>
         <DList Name="gZoraHeadTail3DL" Offset="0x9B10"/>
-        <Limb Name="gZoraHeadTailFinLimb" LimbType="Standard" Offset="0xBF50"/>
+        <Limb Name="gZoraHeadTailFinLimb" LimbType="Standard" EnumName="ZORA_LIMB_HEAD_TAIL_FIN" Offset="0xBF50"/>
         <Array Name="gZoraHeadTailFinVtx" Count="28" Offset="0x5F80">
             <Vtx/>
         </Array>
diff --git a/spec/spec b/spec/spec
index 1a3fe91cea..ea8bd6058b 100644
--- a/spec/spec
+++ b/spec/spec
@@ -2859,7 +2859,15 @@ beginseg
     name "object_zo"
     compress
     romalign 0x1000
-    include "$(BUILD_DIR)/assets/objects/object_zo/object_zo.o"
+    include "$(BUILD_DIR)/assets/objects/object_zo/gZoraHandsOnHipsTappingFootAnim.o"
+    include "$(BUILD_DIR)/assets/objects/object_zo/gZoraOpenArmsAnim.o"
+    include "$(BUILD_DIR)/assets/objects/object_zo/gZoraThrowRupeesAnim.o"
+    include "$(BUILD_DIR)/assets/objects/object_zo/effect_bubbles.o"
+    include "$(BUILD_DIR)/assets/objects/object_zo/effect_splashes.o"
+    include "$(BUILD_DIR)/assets/objects/object_zo/gZoraSurfaceAnim.o"
+    include "$(BUILD_DIR)/assets/objects/object_zo/gZoraIdleAnim.o"
+    include "$(BUILD_DIR)/assets/objects/object_zo/gZoraSkel.o"
+    include "$(BUILD_DIR)/assets/objects/object_zo/effect_ripples.o"
     number 6
 endseg
 
diff --git a/tools/assets/extract/write_source.txt b/tools/assets/extract/write_source.txt
index 161826ca2b..35b876ee4b 100644
--- a/tools/assets/extract/write_source.txt
+++ b/tools/assets/extract/write_source.txt
@@ -380,7 +380,6 @@ assets/objects/object_zl2_anime1/object_zl2_anime1.c
 assets/objects/object_zl2_anime2/object_zl2_anime2.c
 assets/objects/object_zl2/object_zl2.c
 assets/objects/object_zl4/object_zl4.c
-assets/objects/object_zo/object_zo.c
 assets/overlays/ovl_Boss_Ganon/ovl_Boss_Ganon.c
 assets/overlays/ovl_Boss_Sst/ovl_Boss_Sst.c
 assets/overlays/ovl_Demo_Shd/ovl_Demo_Shd.c