mirror of
https://github.com/zeldaret/oot
synced 2026-09-02 01:52:35 -04:00
[cc0 oot] Bari (#2795)
* [cc0 oot] Bari * revert using biri params * EnVali cleanup * bari cleanup * bari cleanup
This commit is contained in:
Dragorn421
@@ -1,104 +1,95 @@
|
||||
<Root>
|
||||
<File Name="object_vali" Segment="6">
|
||||
<!-- Bari animations -->
|
||||
<Animation Name="gBariWaitingAnim" Offset="0x710"/><!-- Flap arms wide -->
|
||||
<Animation Name="gBariRetaliatingAnim" Offset="0x854"/><!-- Swing arms up quickly -->
|
||||
<Animation Name="gBariMovingArmsDownAnim" Offset="0xB34"/><!-- Fold arms down -->
|
||||
<Animation Name="gBariUnusedAnim_000D9C" Offset="0xD9C"/><!-- Arms down, moving back and forth a little -->
|
||||
<Animation Name="gBariLurkingAnim" Offset="0x14AC"/><!-- Flap arms medium and slow -->
|
||||
|
||||
<!-- Bari Vertices -->
|
||||
<Array Name="gBariInnerHoodVtx" Count="53" Offset="0x14C0">
|
||||
<Animation Name="gBariAttackAnim" Offset="0x710"/>
|
||||
<Animation Name="gBariDamagedAnim" Offset="0x854"/>
|
||||
<Animation Name="gBariRecoverAnim" Offset="0xB34"/>
|
||||
<Animation Name="gBariAgitatedAnim" Offset="0xD9C"/> <!-- unused -->
|
||||
<Animation Name="gBariIdleAnim" Offset="0x14AC"/>
|
||||
<Array Name="gBariCoreVtx" Count="53" Offset="0x14C0">
|
||||
<Vtx/>
|
||||
</Array>
|
||||
<Array Name="gBariNucleusVtx" Count="4" Offset="0x1810">
|
||||
<Vtx/>
|
||||
</Array>
|
||||
<Array Name="gBariOuterHoodVtx" Count="46" Offset="0x1850">
|
||||
<Array Name="gBariHoodVtx" Count="46" Offset="0x1850">
|
||||
<Vtx/>
|
||||
</Array>
|
||||
<Array Name="gBariRightMandibleVtx" Count="18" Offset="0x1B30">
|
||||
<Array Name="gBariRightFangVtx" Count="18" Offset="0x1B30">
|
||||
<Vtx/>
|
||||
</Array>
|
||||
<Array Name="gBariLeftMandibleVtx" Count="18" Offset="0x1C50">
|
||||
<Array Name="gBariLeftFangVtx" Count="18" Offset="0x1C50">
|
||||
<Vtx/>
|
||||
</Array>
|
||||
<Array Name="gBariRightClawTipVtx" Count="12" Offset="0x1D70">
|
||||
<Array Name="gBariRightTentacleSpikeVtx" Count="12" Offset="0x1D70">
|
||||
<Vtx/>
|
||||
</Array>
|
||||
<Array Name="gBariRightClawBodyVtx" Count="18" Offset="0x1E30">
|
||||
<Array Name="gBariRightTentacleSpikeJointVtx" Count="18" Offset="0x1E30">
|
||||
<Vtx/>
|
||||
</Array>
|
||||
<Array Name="gBariRightForearmVtx" Count="19" Offset="0x1F50">
|
||||
<Array Name="gBariRightTentacleBodyVtx" Count="19" Offset="0x1F50">
|
||||
<Vtx/>
|
||||
</Array>
|
||||
<Array Name="gBariRightUpperArmVtx" Count="20" Offset="0x2080">
|
||||
<Array Name="gBariRightTentacleJointVtx" Count="20" Offset="0x2080">
|
||||
<Vtx/>
|
||||
</Array>
|
||||
<Array Name="gBariLeftClawTipVtx" Count="12" Offset="0x21C0">
|
||||
<Array Name="gBariLeftTentacleSpikeVtx" Count="12" Offset="0x21C0">
|
||||
<Vtx/>
|
||||
</Array>
|
||||
<Array Name="gBariLeftClawBodyVtx" Count="18" Offset="0x2280">
|
||||
<Array Name="gBariLeftTentacleSpikeJointVtx" Count="18" Offset="0x2280">
|
||||
<Vtx/>
|
||||
</Array>
|
||||
<Array Name="gBariLeftForearmVtx" Count="19" Offset="0x23A0">
|
||||
<Array Name="gBariLeftTentacleBodyVtx" Count="19" Offset="0x23A0">
|
||||
<Vtx/>
|
||||
</Array>
|
||||
<Array Name="gBariLeftUpperArmVtx" Count="20" Offset="0x24D0">
|
||||
<Array Name="gBariLeftTentacleJointVtx" Count="20" Offset="0x24D0">
|
||||
<Vtx/>
|
||||
</Array>
|
||||
|
||||
<!-- Bari DLists -->
|
||||
<DList Name="gBariInnerHoodDL" Offset="0x2610"/>
|
||||
<DList Name="gBariCoreDL" Offset="0x2610"/>
|
||||
<DList Name="gBariNucleusDL" Offset="0x2740"/>
|
||||
<DList Name="gBariOuterHoodDL" Offset="0x27D8"/>
|
||||
<DList Name="gBariRightMandibleDL" Offset="0x2968"/>
|
||||
<DList Name="gBariLeftMandibleDL" Offset="0x2A28"/>
|
||||
<DList Name="gBariRightClawTipDL" Offset="0x2AE8"/>
|
||||
<DList Name="gBariRightClawBodyDL" Offset="0x2B80"/>
|
||||
<DList Name="gBariRightForearmDL" Offset="0x2C20"/>
|
||||
<DList Name="gBariRightUpperArmDL" Offset="0x2D50"/>
|
||||
<DList Name="gBariLeftClawTipDL" Offset="0x2DF8"/>
|
||||
<DList Name="gBariLeftClawBodyDL" Offset="0x2E90"/>
|
||||
<DList Name="gBariLeftForearmDL" Offset="0x2F30"/>
|
||||
<DList Name="gBariLeftUpperArmDL" Offset="0x3060"/>
|
||||
|
||||
<!-- Bari DList textures -->
|
||||
<DList Name="gBariHoodDL" Offset="0x27D8"/>
|
||||
<DList Name="gBariRightFangDL" Offset="0x2968"/>
|
||||
<DList Name="gBariLeftFangDL" Offset="0x2A28"/>
|
||||
<DList Name="gBariRightTentacleSpikeDL" Offset="0x2AE8"/>
|
||||
<DList Name="gBariRightTentacleSpikeJointDL" Offset="0x2B80"/>
|
||||
<DList Name="gBariRightTentacleBodyDL" Offset="0x2C20"/>
|
||||
<DList Name="gBariRightTentacleJointDL" Offset="0x2D50"/>
|
||||
<DList Name="gBariLeftTentacleSpikeDL" Offset="0x2DF8"/>
|
||||
<DList Name="gBariLeftTentacleSpikeJointDL" Offset="0x2E90"/>
|
||||
<DList Name="gBariLeftTentacleBodyDL" Offset="0x2F30"/>
|
||||
<DList Name="gBariLeftTentacleJointDL" Offset="0x3060"/>
|
||||
<Texture Name="gBariNucleusTex" Format="ia16" Width="32" Height="32" Offset="0x3108"/>
|
||||
<Texture Name="gBariMandibleClawTex" Format="ia16" Width="8" Height="8" Offset="0x3908"/>
|
||||
<Texture Name="gBariOuterHoodForearmTex" Format="ia16" Width="16" Height="32" Offset="0x3988"/>
|
||||
<Texture Name="gBariOuterHoodBottomTex" Format="ia16" Width="8" Height="16" Offset="0x3D88"/>
|
||||
<Texture Name="gBariInnerHoodTex" Format="ia16" Width="32" Height="32" Offset="0x3E88"/>
|
||||
|
||||
<!-- Bari Limbs and Skeleton -->
|
||||
<Limb Name="gBariNucleusBaseLimb" LimbType="Standard" EnumName="VALI_LIMB_NUCLEUS_BASE" Offset="0x4688"/>
|
||||
<Limb Name="gBariNucleusLimb" LimbType="Standard" EnumName="VALI_LIMB_NUCLEUS" Offset="0x4694"/>
|
||||
<Limb Name="gBariRightMandibleBaseBaseLimb" LimbType="Standard" EnumName="VALI_LIMB_RIGHT_MANDIBLE_BASE_BASE" Offset="0x46A0"/>
|
||||
<Limb Name="gBariRightMandibleBaseLimb" LimbType="Standard" EnumName="VALI_LIMB_RIGHT_MANDIBLE_BASE" Offset="0x46AC"/>
|
||||
<Limb Name="gBariRightMandibleLimb" LimbType="Standard" EnumName="VALI_LIMB_RIGHT_MANDIBLE" Offset="0x46B8"/>
|
||||
<Limb Name="gBariLeftMandibleBaseBaseLimb" LimbType="Standard" EnumName="VALI_LIMB_LEFT_MANDIBLE_BASE_BASE" Offset="0x46C4"/>
|
||||
<Limb Name="gBariLeftMandibleBaseLimb" LimbType="Standard" EnumName="VALI_LIMB_LEFT_MANDIBLE_BASE" Offset="0x46D0"/>
|
||||
<Limb Name="gBariLeftMandibleLimb" LimbType="Standard" EnumName="VALI_LIMB_LEFT_MANDIBLE" Offset="0x46DC"/>
|
||||
<Limb Name="gBariLeftArmBaseLimb" LimbType="Standard" EnumName="VALI_LIMB_LEFT_ARM_BASE" Offset="0x46E8"/>
|
||||
<Limb Name="gBariLeftUpperArmBaseLimb" LimbType="Standard" EnumName="VALI_LIMB_LEFT_UPPER_ARM_BASE" Offset="0x46F4"/>
|
||||
<Limb Name="gBariLeftForearmBaseLimb" LimbType="Standard" EnumName="VALI_LIMB_LEFT_FOREARM_BASE" Offset="0x4700"/>
|
||||
<Limb Name="gBariLeftClawBodyBaseLimb" LimbType="Standard" EnumName="VALI_LIMB_LEFT_CLAW_BODY_BASE" Offset="0x470C"/>
|
||||
<Limb Name="gBariLeftClawTipBaseLimb" LimbType="Standard" EnumName="VALI_LIMB_LEFT_CLAW_TIP_BASE" Offset="0x4718"/>
|
||||
<Limb Name="gBariLeftClawTipLimb" LimbType="Standard" EnumName="VALI_LIMB_LEFT_CLAW_TIP" Offset="0x4724"/>
|
||||
<Limb Name="gBariLeftClawBodyLimb" LimbType="Standard" EnumName="VALI_LIMB_LEFT_CLAW_BODY" Offset="0x4730"/>
|
||||
<Limb Name="gBariLeftForearmLimb" LimbType="Standard" EnumName="VALI_LIMB_LEFT_FOREARM" Offset="0x473C"/>
|
||||
<Limb Name="gBariLeftUpperArmLimb" LimbType="Standard" EnumName="VALI_LIMB_LEFT_UPPER_ARM" Offset="0x4748"/>
|
||||
<Limb Name="gBariRightArmBaseLimb" LimbType="Standard" EnumName="VALI_LIMB_RIGHT_ARM_BASE" Offset="0x4754"/>
|
||||
<Limb Name="gBariRightUpperArmBaseLimb" LimbType="Standard" EnumName="VALI_LIMB_RIGHT_UPPER_ARM_BASE" Offset="0x4760"/>
|
||||
<Limb Name="gBariRightForearmBaseLimb" LimbType="Standard" EnumName="VALI_LIMB_RIGHT_FOREARM_BASE" Offset="0x476C"/>
|
||||
<Limb Name="gBariRightClawBodyBaseLimb" LimbType="Standard" EnumName="VALI_LIMB_RIGHT_CLAW_BODY_BASE" Offset="0x4778"/>
|
||||
<Limb Name="gBariRightClawTipBaseLimb" LimbType="Standard" EnumName="VALI_LIMB_RIGHT_CLAW_TIP_BASE" Offset="0x4784"/>
|
||||
<Limb Name="gBariRightClawTipLimb" LimbType="Standard" EnumName="VALI_LIMB_RIGHT_CLAW_TIP" Offset="0x4790"/>
|
||||
<Limb Name="gBariRightClawBodyLimb" LimbType="Standard" EnumName="VALI_LIMB_RIGHT_CLAW_BODY" Offset="0x479C"/>
|
||||
<Limb Name="gBariRightForearmLimb" LimbType="Standard" EnumName="VALI_LIMB_RIGHT_FOREARM" Offset="0x47A8"/>
|
||||
<Limb Name="gBariRightUpperArmLimb" LimbType="Standard" EnumName="VALI_LIMB_RIGHT_UPPER_ARM" Offset="0x47B4"/>
|
||||
<Limb Name="gBariInnerHoodLimb" LimbType="Standard" EnumName="VALI_LIMB_INNER_HOOD" Offset="0x47C0"/>
|
||||
<Limb Name="gBariOuterHoodLimb" LimbType="Standard" EnumName="VALI_LIMB_OUTER_HOOD" Offset="0x47CC"/>
|
||||
<Skeleton Name="gBariSkel" Type="Normal" LimbType="Standard" LimbNone="VALI_LIMB_NONE" LimbMax="VALI_LIMB_MAX" EnumName="ValiLimb" Offset="0x4848"/>
|
||||
<Texture Name="gBariPartsTex" Format="ia16" Width="8" Height="8" Offset="0x3908"/> <!-- fangs and tentacles parts -->
|
||||
<Texture Name="gBariBodyTex" Format="ia16" Width="16" Height="32" Offset="0x3988"/> <!-- hood top and tentacles body -->
|
||||
<Texture Name="gBariHoodBottomTex" Format="ia16" Width="8" Height="16" Offset="0x3D88"/>
|
||||
<Texture Name="gBariCoreTex" Format="ia16" Width="32" Height="32" Offset="0x3E88"/>
|
||||
<Limb Name="gBariRootLimb" LimbType="Standard" EnumName="BARI_LIMB_ROOT" Offset="0x4688"/>
|
||||
<Limb Name="gBariNucleusLimb" LimbType="Standard" EnumName="BARI_LIMB_NUCLEUS" Offset="0x4694"/>
|
||||
<Limb Name="gBariRightFangRootRootLimb" LimbType="Standard" EnumName="BARI_LIMB_RIGHT_FANG_ROOT_ROOT" Offset="0x46A0"/>
|
||||
<Limb Name="gBariRightFangRootLimb" LimbType="Standard" EnumName="BARI_LIMB_RIGHT_FANG_ROOT" Offset="0x46AC"/>
|
||||
<Limb Name="gBariRightFangLimb" LimbType="Standard" EnumName="BARI_LIMB_RIGHT_FANG" Offset="0x46B8"/>
|
||||
<Limb Name="gBariLeftFangRootRootLimb" LimbType="Standard" EnumName="BARI_LIMB_LEFT_FANG_ROOT_ROOT" Offset="0x46C4"/>
|
||||
<Limb Name="gBariLeftFangRootLimb" LimbType="Standard" EnumName="BARI_LIMB_LEFT_FANG_ROOT" Offset="0x46D0"/>
|
||||
<Limb Name="gBariLeftFangLimb" LimbType="Standard" EnumName="BARI_LIMB_LEFT_FANG" Offset="0x46DC"/>
|
||||
<Limb Name="gBariLeftTentacleRootLimb" LimbType="Standard" EnumName="BARI_LIMB_LEFT_TENTACLE_ROOT" Offset="0x46E8"/>
|
||||
<Limb Name="gBariLeftTentacleJointRootLimb" LimbType="Standard" EnumName="BARI_LIMB_LEFT_TENTACLE_JOINT_ROOT" Offset="0x46F4"/>
|
||||
<Limb Name="gBariLeftTentacleBodyRootLimb" LimbType="Standard" EnumName="BARI_LIMB_LEFT_TENTACLE_BODY_ROOT" Offset="0x4700"/>
|
||||
<Limb Name="gBariLeftTentacleSpikeJointRootLimb" LimbType="Standard" EnumName="BARI_LIMB_LEFT_TENTACLE_SPIKE_JOINT_ROOT" Offset="0x470C"/>
|
||||
<Limb Name="gBariLeftTentacleSpikeRootLimb" LimbType="Standard" EnumName="BARI_LIMB_LEFT_TENTACLE_SPIKE_ROOT" Offset="0x4718"/>
|
||||
<Limb Name="gBariLeftTentacleSpikeLimb" LimbType="Standard" EnumName="BARI_LIMB_LEFT_TENTACLE_SPIKE" Offset="0x4724"/>
|
||||
<Limb Name="gBariLeftTentacleSpikeJointLimb" LimbType="Standard" EnumName="BARI_LIMB_LEFT_TENTACLE_SPIKE_JOINT" Offset="0x4730"/>
|
||||
<Limb Name="gBariLeftTentacleBodyLimb" LimbType="Standard" EnumName="BARI_LIMB_LEFT_TENTACLE_BODY" Offset="0x473C"/>
|
||||
<Limb Name="gBariLeftTentacleJointLimb" LimbType="Standard" EnumName="BARI_LIMB_LEFT_TENTACLE_JOINT" Offset="0x4748"/>
|
||||
<Limb Name="gBariRightTentacleRootLimb" LimbType="Standard" EnumName="BARI_LIMB_RIGHT_TENTACLE_ROOT" Offset="0x4754"/>
|
||||
<Limb Name="gBariRightTentacleJointRootLimb" LimbType="Standard" EnumName="BARI_LIMB_RIGHT_TENTACLE_JOINT_ROOT" Offset="0x4760"/>
|
||||
<Limb Name="gBariRightTentacleBodyRootLimb" LimbType="Standard" EnumName="BARI_LIMB_RIGHT_TENTACLE_BODY_ROOT" Offset="0x476C"/>
|
||||
<Limb Name="gBariRightTentacleSpikeJointRootLimb" LimbType="Standard" EnumName="BARI_LIMB_RIGHT_TENTACLE_SPIKE_JOINT_ROOT" Offset="0x4778"/>
|
||||
<Limb Name="gBariRightTentacleSpikeRootLimb" LimbType="Standard" EnumName="BARI_LIMB_RIGHT_TENTACLE_SPIKE_ROOT" Offset="0x4784"/>
|
||||
<Limb Name="gBariRightTentacleSpikeLimb" LimbType="Standard" EnumName="BARI_LIMB_RIGHT_TENTACLE_SPIKE" Offset="0x4790"/>
|
||||
<Limb Name="gBariRightTentacleSpikeJointLimb" LimbType="Standard" EnumName="BARI_LIMB_RIGHT_TENTACLE_SPIKE_JOINT" Offset="0x479C"/>
|
||||
<Limb Name="gBariRightTentacleBodyLimb" LimbType="Standard" EnumName="BARI_LIMB_RIGHT_TENTACLE_BODY" Offset="0x47A8"/>
|
||||
<Limb Name="gBariRightTentacleJointLimb" LimbType="Standard" EnumName="BARI_LIMB_RIGHT_TENTACLE_JOINT" Offset="0x47B4"/>
|
||||
<Limb Name="gBariCoreLimb" LimbType="Standard" EnumName="BARI_LIMB_CORE" Offset="0x47C0"/>
|
||||
<Limb Name="gBariHoodLimb" LimbType="Standard" EnumName="BARI_LIMB_HOOD" Offset="0x47CC"/>
|
||||
<Skeleton Name="gBariSkel" Type="Normal" LimbType="Standard" LimbNone="BARI_LIMB_NONE" LimbMax="BARI_LIMB_MAX" EnumName="BariLimb" Offset="0x4848"/>
|
||||
</File>
|
||||
</Root>
|
||||
|
||||
File diff suppressed because it is too large
Load Diff
@@ -3,6 +3,7 @@
|
||||
|
||||
#include "ultra64.h"
|
||||
#include "actor.h"
|
||||
|
||||
#include "assets/objects/object_vali/object_vali.h"
|
||||
|
||||
struct EnVali;
|
||||
@@ -10,24 +11,19 @@ struct EnVali;
|
||||
typedef void (*EnValiActionFunc)(struct EnVali*, struct PlayState*);
|
||||
|
||||
typedef struct EnVali {
|
||||
/* 0x0000 */ Actor actor;
|
||||
/* 0x014C */ SkelAnime skelAnime;
|
||||
/* 0x0190 */ EnValiActionFunc actionFunc;
|
||||
/* 0x0194 */ u8 lightningTimer;
|
||||
/* 0x0195 */ u8 slingshotReactionTimer;
|
||||
/* 0x0196 */ s16 timer;
|
||||
/* 0x0198 */ Vec3s jointTable[VALI_LIMB_MAX];
|
||||
/* 0x0246 */ Vec3s morphTable[VALI_LIMB_MAX];
|
||||
/* 0x02F4 */ f32 armScale;
|
||||
/* 0x02F8 */ f32 floatHomeHeight; // Used as a centre for floating when visible (home is used for the lurk height)
|
||||
/* 0x02FC */ ColliderQuad leftArmCollider;
|
||||
/* 0x037C */ ColliderQuad rightArmCollider;
|
||||
/* 0x03FC */ ColliderCylinder bodyCollider;
|
||||
} EnVali; // size = 0x0448
|
||||
|
||||
typedef enum EnValiType {
|
||||
/* 0 */ BARI_TYPE_NORMAL,
|
||||
/* 1 */ BARI_TYPE_SWORD_DAMAGE
|
||||
} EnValiType;
|
||||
/* 0x000 */ Actor actor;
|
||||
/* 0x14C */ SkelAnime skelAnime;
|
||||
/* 0x190 */ EnValiActionFunc actionFunc;
|
||||
/* 0x194 */ u8 electrifyTimer;
|
||||
/* 0x195 */ u8 spinTimer;
|
||||
/* 0x196 */ s16 timer;
|
||||
/* 0x198 */ Vec3s jointTable[BARI_LIMB_MAX];
|
||||
/* 0x246 */ Vec3s morphTable[BARI_LIMB_MAX];
|
||||
/* 0x2F4 */ f32 tentaclesLengthFactor;
|
||||
/* 0x2F8 */ f32 spinHeight;
|
||||
/* 0x2FC */ ColliderQuad leftTentacleCollider;
|
||||
/* 0x37C */ ColliderQuad rightTentacleCollider;
|
||||
/* 0x3FC */ ColliderCylinder collider;
|
||||
} EnVali; // size = 0x448
|
||||
|
||||
#endif
|
||||
|
||||
Reference in New Issue
Block a user