From ef21943a942ffc0245eb960a8004dfd2b5ad416b Mon Sep 17 00:00:00 2001
From: isghj <isghj5@gmail.com>
Date: Sat, 6 Dec 2025 18:49:35 -0800
Subject: [PATCH] Pr2: more skelton limb enum changes

---
 assets/xml/objects/object_pr.xml          | 2 +-
 src/overlays/actors/ovl_En_Pr2/z_en_pr2.c | 2 +-
 src/overlays/actors/ovl_En_Pr2/z_en_pr2.h | 4 ++--
 src/overlays/actors/ovl_En_Prz/z_en_prz.c | 2 +-
 src/overlays/actors/ovl_En_Prz/z_en_prz.h | 4 ++--
 5 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/assets/xml/objects/object_pr.xml b/assets/xml/objects/object_pr.xml
index 03dfc14ab4..ed5d289c8f 100644
--- a/assets/xml/objects/object_pr.xml
+++ b/assets/xml/objects/object_pr.xml
@@ -59,7 +59,7 @@
         <Limb Name="gSkullFishSkullLimb" Type="Standard" EnumName="PR_2_LIMB_SKULL" Offset="0x4154" />
         <Limb Name="gSkullFishJawLimb" Type="Standard" EnumName="PR_2_LIMB_JAW" Offset="0x4160" />
         <Limb Name="gSkullFishTailLimb" Type="Standard" EnumName="PR_2_LIMB_TAIL" Offset="0x416C" />
-        <Skeleton Name="gSkullFishSkel" Type="Flex" LimbType="Standard" LimbNone="OBJECT_PR_2_LIMB_NONE" LimbMax="OBJECT_PR_2_LIMB_MAX" EnumName="ObjectPr2Limb" Offset="0x4188" />
+        <Skeleton Name="gSkullFishSkel" Type="Flex" LimbType="Standard" LimbNone="PR_2_LIMB_NONE" LimbMax="PR_2_LIMB_MAX" EnumName="Pr2Limb" Offset="0x4188" />
 
         <Animation Name="gSkullFishAttackAnim" Offset="0x4274" /> <!-- Original name is "prz_gattuku" -->
         <Animation Name="gSkullFishSwimAnim" Offset="0x4340" /> <!-- Original name is "prz_swim" -->
diff --git a/src/overlays/actors/ovl_En_Pr2/z_en_pr2.c b/src/overlays/actors/ovl_En_Pr2/z_en_pr2.c
index 83aca50edb..57bb0a65b7 100644
--- a/src/overlays/actors/ovl_En_Pr2/z_en_pr2.c
+++ b/src/overlays/actors/ovl_En_Pr2/z_en_pr2.c
@@ -129,7 +129,7 @@ void EnPr2_Init(Actor* thisx, PlayState* play) {
     this->actor.colChkInfo.damageTable = &sDamageTable;
 
     SkelAnime_InitFlex(play, &this->skelAnime, &gSkullFishSkel, &gSkullFishSwimAnim, this->jointTable, this->morphTable,
-                       OBJECT_PR_2_LIMB_MAX);
+                       PR_2_LIMB_MAX);
     this->type = ENPR2_GET_TYPE(&this->actor);
     this->actor.colChkInfo.mass = 10;
     Math_Vec3f_Copy(&this->newHome, &this->actor.home.pos);
diff --git a/src/overlays/actors/ovl_En_Pr2/z_en_pr2.h b/src/overlays/actors/ovl_En_Pr2/z_en_pr2.h
index bc4882cc83..a05386e9fc 100644
--- a/src/overlays/actors/ovl_En_Pr2/z_en_pr2.h
+++ b/src/overlays/actors/ovl_En_Pr2/z_en_pr2.h
@@ -46,8 +46,8 @@ typedef enum EnPr2State {
 typedef struct EnPr2 {
     /* 0x000 */ Actor actor;
     /* 0x144 */ SkelAnime skelAnime;
-    /* 0x188 */ Vec3s jointTable[OBJECT_PR_2_LIMB_MAX];
-    /* 0x1A6 */ Vec3s morphTable[OBJECT_PR_2_LIMB_MAX];
+    /* 0x188 */ Vec3s jointTable[PR_2_LIMB_MAX];
+    /* 0x1A6 */ Vec3s morphTable[PR_2_LIMB_MAX];
     /* 0x1C4 */ EnPr2ActionFunc actionFunc;
     /* 0x1C8 */ s16 pathIndex;
     /* 0x1CC */ Path* path;
diff --git a/src/overlays/actors/ovl_En_Prz/z_en_prz.c b/src/overlays/actors/ovl_En_Prz/z_en_prz.c
index 3c02a1acc1..83d882dd44 100644
--- a/src/overlays/actors/ovl_En_Prz/z_en_prz.c
+++ b/src/overlays/actors/ovl_En_Prz/z_en_prz.c
@@ -112,7 +112,7 @@ void EnPrz_Init(Actor* thisx, PlayState* play) {
     this->actor.colChkInfo.health = 1;
 
     SkelAnime_InitFlex(play, &this->skelAnime, &gSkullFishSkel, &gSkullFishSwimAnim, this->jointTable, this->morphTable,
-                       OBJECT_PR_2_LIMB_MAX);
+                       PR_2_LIMB_MAX);
 
     this->unk_1E6 = ENPRZ_GET(&this->actor);
     this->actor.shape.yOffset = 500.0f;
diff --git a/src/overlays/actors/ovl_En_Prz/z_en_prz.h b/src/overlays/actors/ovl_En_Prz/z_en_prz.h
index ec8df1eb50..9f47458e14 100644
--- a/src/overlays/actors/ovl_En_Prz/z_en_prz.h
+++ b/src/overlays/actors/ovl_En_Prz/z_en_prz.h
@@ -13,8 +13,8 @@ typedef void (*EnPrzActionFunc)(struct EnPrz*, PlayState*);
 typedef struct EnPrz {
     /* 0x000 */ Actor actor;
     /* 0x144 */ SkelAnime skelAnime;
-    /* 0x188 */ Vec3s jointTable[OBJECT_PR_2_LIMB_MAX];
-    /* 0x1A6 */ Vec3s morphTable[OBJECT_PR_2_LIMB_MAX];
+    /* 0x188 */ Vec3s jointTable[PR_2_LIMB_MAX];
+    /* 0x1A6 */ Vec3s morphTable[PR_2_LIMB_MAX];
     /* 0x1C4 */ EnPrzActionFunc actionFunc;
     /* 0x1C8 */ u8 unk_1C8;
     /* 0x1CC */ Vec3f unk_1CC;