mirror/oot
1
0
Fork 0
mirror of https://github.com/zeldaret/oot synced 2026-09-02 01:52:35 -04:00
Code Issues Packages Projects Releases Wiki Activity

[cc0 oot] Keese (#2798)

Browse Source 
* [cc0 oot] Keese

* bodyType -> bodyElementalType

* cleanup EnFirefly

* keese cleanup
This commit is contained in:
Dragorn421
2026-08-31 17:29:52 +02:00
committed by GitHub
parent e9b8786fcb
commit 761db13884
3 changed files with 423 additions and 442 deletions
Download Patch File Download Diff File Expand all files Collapse all files
assets/xml/objects/object_firefly.xml
+48 -48
View File
@@ -2,7 +2,7 @@
<File Name="object_firefly" Segment="6">
<Animation Name="gKeeseFlyAnim" Offset="0x17C"/>
<Skeleton Name="gKeeseSkeleton" Type="Normal" LimbType="Standard" Offset="0x18B8"/>
<Skeleton Name="gKeeseSkel" Type="Normal" LimbType="Standard" LimbNone="KEESE_LIMB_NONE" LimbMax="KEESE_LIMB_MAX" EnumName="KeeseLimb" Offset="0x18B8"/>
<DList Name="gKeeseEyesDL" Offset="0x1678"/>
@@ -18,75 +18,75 @@
<Texture Name="gFireKeeseTalonTex" Format="rgba16" Width="8" Height="16" Offset="0x410"/>
<Texture Name="gFireKeeseWingTex" Format="rgba16" Width="4" Height="16" Offset="0x510"/>
<Array Name="object_firefly_Vtx_000890" Count="26" Offset="0x890">
<Array Name="gKeeseHeadVtx" Count="26" Offset="0x890">
<Vtx/>
</Array>
<Array Name="object_firefly_Vtx_000A30" Count="17" Offset="0xA30">
<Array Name="gKeeseBodyVtx" Count="17" Offset="0xA30">
<Vtx/>
</Array>
<Array Name="object_firefly_Vtx_000B40" Count="3" Offset="0xB40">
<Array Name="gKeeseLeftTalonVtx" Count="3" Offset="0xB40">
<Vtx/>
</Array>
<Array Name="object_firefly_Vtx_000B70" Count="4" Offset="0xB70">
<Array Name="gKeeseRightTalonVtx" Count="4" Offset="0xB70">
<Vtx/>
</Array>
<Array Name="object_firefly_Vtx_000BB0" Count="3" Offset="0xBB0">
<Array Name="gKeeseRightWingStartVtx" Count="3" Offset="0xBB0">
<Vtx/>
</Array>
<Array Name="object_firefly_Vtx_000BE0" Count="3" Offset="0xBE0">
<Array Name="gKeeseRightWingMiddleVtx" Count="3" Offset="0xBE0">
<Vtx/>
</Array>
<Array Name="object_firefly_Vtx_000C10" Count="3" Offset="0xC10">
<Array Name="gKeeseRightWingEndVtx" Count="3" Offset="0xC10">
<Vtx/>
</Array>
<Array Name="object_firefly_Vtx_000C40" Count="3" Offset="0xC40">
<Array Name="gKeeseLeftWingEndVtx" Count="3" Offset="0xC40">
<Vtx/>
</Array>
<Array Name="object_firefly_Vtx_000C70" Count="3" Offset="0xC70">
<Array Name="gKeeseLeftWingMiddleVtx" Count="3" Offset="0xC70">
<Vtx/>
</Array>
<Array Name="object_firefly_Vtx_000CA0" Count="3" Offset="0xCA0">
<Array Name="gKeeseLeftWingStartVtx" Count="3" Offset="0xCA0">
<Vtx/>
</Array>
<Array Name="gKeeseEyesVtx" Count="6" Offset="0xCD0">
<Vtx/>
</Array>
<DList Name="object_firefly_000D30_DL" Offset="0xD30"/>
<DList Name="object_firefly_000F40_DL" Offset="0xF40"/>
<DList Name="object_firefly_001038_DL" Offset="0x1038"/>
<DList Name="object_firefly_001100_DL" Offset="0x1100"/>
<DList Name="object_firefly_0011C8_DL" Offset="0x11C8"/>
<DList Name="object_firefly_001290_DL" Offset="0x1290"/>
<DList Name="object_firefly_001358_DL" Offset="0x1358"/>
<DList Name="object_firefly_001420_DL" Offset="0x1420"/>
<DList Name="object_firefly_0014E8_DL" Offset="0x14E8"/>
<DList Name="object_firefly_0015B0_DL" Offset="0x15B0"/>
<Limb Name="object_firefly_001708_Limb" LimbType="Standard" EnumName="LIMB_OBJECT_FIREFLY_001708" Offset="0x1708"/>
<Limb Name="object_firefly_001714_Limb" LimbType="Standard" EnumName="LIMB_OBJECT_FIREFLY_001714" Offset="0x1714"/>
<Limb Name="object_firefly_001720_Limb" LimbType="Standard" EnumName="LIMB_OBJECT_FIREFLY_001720" Offset="0x1720"/>
<Limb Name="object_firefly_00172C_Limb" LimbType="Standard" EnumName="LIMB_OBJECT_FIREFLY_00172C" Offset="0x172C"/>
<Limb Name="object_firefly_001738_Limb" LimbType="Standard" EnumName="LIMB_OBJECT_FIREFLY_001738" Offset="0x1738"/>
<Limb Name="object_firefly_001744_Limb" LimbType="Standard" EnumName="LIMB_OBJECT_FIREFLY_001744" Offset="0x1744"/>
<Limb Name="object_firefly_001750_Limb" LimbType="Standard" EnumName="LIMB_OBJECT_FIREFLY_001750" Offset="0x1750"/>
<Limb Name="object_firefly_00175C_Limb" LimbType="Standard" EnumName="LIMB_OBJECT_FIREFLY_00175C" Offset="0x175C"/>
<Limb Name="object_firefly_001768_Limb" LimbType="Standard" EnumName="LIMB_OBJECT_FIREFLY_001768" Offset="0x1768"/>
<Limb Name="object_firefly_001774_Limb" LimbType="Standard" EnumName="LIMB_OBJECT_FIREFLY_001774" Offset="0x1774"/>
<Limb Name="object_firefly_001780_Limb" LimbType="Standard" EnumName="LIMB_OBJECT_FIREFLY_001780" Offset="0x1780"/>
<Limb Name="object_firefly_00178C_Limb" LimbType="Standard" EnumName="LIMB_OBJECT_FIREFLY_00178C" Offset="0x178C"/>
<Limb Name="object_firefly_001798_Limb" LimbType="Standard" EnumName="LIMB_OBJECT_FIREFLY_001798" Offset="0x1798"/>
<Limb Name="object_firefly_0017A4_Limb" LimbType="Standard" EnumName="LIMB_OBJECT_FIREFLY_0017A4" Offset="0x17A4"/>
<Limb Name="object_firefly_0017B0_Limb" LimbType="Standard" EnumName="LIMB_OBJECT_FIREFLY_0017B0" Offset="0x17B0"/>
<Limb Name="object_firefly_0017BC_Limb" LimbType="Standard" EnumName="LIMB_OBJECT_FIREFLY_0017BC" Offset="0x17BC"/>
<Limb Name="object_firefly_0017C8_Limb" LimbType="Standard" EnumName="LIMB_OBJECT_FIREFLY_0017C8" Offset="0x17C8"/>
<Limb Name="object_firefly_0017D4_Limb" LimbType="Standard" EnumName="LIMB_OBJECT_FIREFLY_0017D4" Offset="0x17D4"/>
<Limb Name="object_firefly_0017E0_Limb" LimbType="Standard" EnumName="LIMB_OBJECT_FIREFLY_0017E0" Offset="0x17E0"/>
<Limb Name="object_firefly_0017EC_Limb" LimbType="Standard" EnumName="LIMB_OBJECT_FIREFLY_0017EC" Offset="0x17EC"/>
<Limb Name="object_firefly_0017F8_Limb" LimbType="Standard" EnumName="LIMB_OBJECT_FIREFLY_0017F8" Offset="0x17F8"/>
<Limb Name="object_firefly_001804_Limb" LimbType="Standard" EnumName="LIMB_OBJECT_FIREFLY_001804" Offset="0x1804"/>
<Limb Name="object_firefly_001810_Limb" LimbType="Standard" EnumName="LIMB_OBJECT_FIREFLY_001810" Offset="0x1810"/>
<Limb Name="object_firefly_00181C_Limb" LimbType="Standard" EnumName="LIMB_OBJECT_FIREFLY_00181C" Offset="0x181C"/>
<Limb Name="object_firefly_001828_Limb" LimbType="Standard" EnumName="LIMB_OBJECT_FIREFLY_001828" Offset="0x1828"/>
<Limb Name="object_firefly_001834_Limb" LimbType="Standard" EnumName="LIMB_OBJECT_FIREFLY_001834" Offset="0x1834"/>
<Limb Name="object_firefly_001840_Limb" LimbType="Standard" EnumName="LIMB_OBJECT_FIREFLY_001840" Offset="0x1840"/>
<DList Name="gKeeseHeadDL" Offset="0xD30"/>
<DList Name="gKeeseBodyDL" Offset="0xF40"/>
<DList Name="gKeeseLeftTalonDL" Offset="0x1038"/>
<DList Name="gKeeseRightTalonDL" Offset="0x1100"/>
<DList Name="gKeeseRightWingStartDL" Offset="0x11C8"/>
<DList Name="gKeeseRightWingMiddleDL" Offset="0x1290"/>
<DList Name="gKeeseRightWingEndDL" Offset="0x1358"/>
<DList Name="gKeeseLeftWingEndDL" Offset="0x1420"/>
<DList Name="gKeeseLeftWingMiddleDL" Offset="0x14E8"/>
<DList Name="gKeeseLeftWingStartDL" Offset="0x15B0"/>
<Limb Name="gKeeseRootRootLimb" LimbType="Standard" EnumName="KEESE_LIMB_ROOT_ROOT" Offset="0x1708"/>
<Limb Name="gKeeseRootLimb" LimbType="Standard" EnumName="KEESE_LIMB_ROOT" Offset="0x1714"/>
<Limb Name="gKeeseTalonsRootLimb" LimbType="Standard" EnumName="KEESE_LIMB_TALONS_ROOT" Offset="0x1720"/>
<Limb Name="gKeeseRightTalonRootRootLimb" LimbType="Standard" EnumName="KEESE_LIMB_RIGHT_TALON_ROOT_ROOT" Offset="0x172C"/>
<Limb Name="gKeeseRightTalonRootLimb" LimbType="Standard" EnumName="KEESE_LIMB_RIGHT_TALON_ROOT" Offset="0x1738"/>
<Limb Name="gKeeseRightTalonLimb" LimbType="Standard" EnumName="KEESE_LIMB_RIGHT_TALON" Offset="0x1744"/>
<Limb Name="gKeeseLeftTalonRootRootLimb" LimbType="Standard" EnumName="KEESE_LIMB_LEFT_TALON_ROOT_ROOT" Offset="0x1750"/>
<Limb Name="gKeeseLeftTalonRootLimb" LimbType="Standard" EnumName="KEESE_LIMB_LEFT_TALON_ROOT" Offset="0x175C"/>
<Limb Name="gKeeseLeftTalonLimb" LimbType="Standard" EnumName="KEESE_LIMB_LEFT_TALON" Offset="0x1768"/>
<Limb Name="gKeeseBodyLimb" LimbType="Standard" EnumName="KEESE_LIMB_BODY" Offset="0x1774"/>
<Limb Name="gKeeseLeftWingRootLimb" LimbType="Standard" EnumName="KEESE_LIMB_LEFT_WING_ROOT" Offset="0x1780"/>
<Limb Name="gKeeseLeftWingStartRootLimb" LimbType="Standard" EnumName="KEESE_LIMB_LEFT_WING_START_ROOT" Offset="0x178C"/>
<Limb Name="gKeeseLeftWingMiddleRootLimb" LimbType="Standard" EnumName="KEESE_LIMB_LEFT_WING_MIDDLE_ROOT" Offset="0x1798"/>
<Limb Name="gKeeseLeftWingEndRootLimb" LimbType="Standard" EnumName="KEESE_LIMB_LEFT_WING_END_ROOT" Offset="0x17A4"/>
<Limb Name="gKeeseLeftWingEndLimb" LimbType="Standard" EnumName="KEESE_LIMB_LEFT_WING_END" Offset="0x17B0"/>
<Limb Name="gKeeseLeftWingMiddleLimb" LimbType="Standard" EnumName="KEESE_LIMB_LEFT_WING_MIDDLE" Offset="0x17BC"/>
<Limb Name="gKeeseLeftWingStartLimb" LimbType="Standard" EnumName="KEESE_LIMB_LEFT_WING_START" Offset="0x17C8"/>
<Limb Name="gKeeseRightWingRootLimb" LimbType="Standard" EnumName="KEESE_LIMB_RIGHT_WING_ROOT" Offset="0x17D4"/>
<Limb Name="gKeeseRightWingStartRootLimb" LimbType="Standard" EnumName="KEESE_LIMB_RIGHT_WING_START_ROOT" Offset="0x17E0"/>
<Limb Name="gKeeseRightWingMiddleRootLimb" LimbType="Standard" EnumName="KEESE_LIMB_RIGHT_WING_MIDDLE_ROOT" Offset="0x17EC"/>
<Limb Name="gKeeseRightWingEndRootLimb" LimbType="Standard" EnumName="KEESE_LIMB_RIGHT_WING_END_ROOT" Offset="0x17F8"/>
<Limb Name="gKeeseRightWingEndLimb" LimbType="Standard" EnumName="KEESE_LIMB_RIGHT_WING_END" Offset="0x1804"/>
<Limb Name="gKeeseRightWingMiddleLimb" LimbType="Standard" EnumName="KEESE_LIMB_RIGHT_WING_MIDDLE" Offset="0x1810"/>
<Limb Name="gKeeseRightWingStartLimb" LimbType="Standard" EnumName="KEESE_LIMB_RIGHT_WING_START" Offset="0x181C"/>
<Limb Name="gKeeseHeadRootRootLimb" LimbType="Standard" EnumName="KEESE_LIMB_HEAD_ROOT_ROOT" Offset="0x1828"/>
<Limb Name="gKeeseHeadRootLimb" LimbType="Standard" EnumName="KEESE_LIMB_HEAD_ROOT" Offset="0x1834"/>
<Limb Name="gKeeseHeadLimb" LimbType="Standard" EnumName="KEESE_LIMB_HEAD" Offset="0x1840"/>
</File>
</Root>
src/overlays/actors/ovl_En_Firefly/z_en_firefly.c
+345 -373
View File
File diff suppressed because it is too large Load Diff
src/overlays/actors/ovl_En_Firefly/z_en_firefly.h
+30 -21
View File
@@ -4,32 +4,41 @@
#include "ultra64.h"
#include "actor.h"
#include "assets/objects/object_firefly/object_firefly.h"
typedef enum EnFireflyType {
EN_FIREFLY_TYPE_FIRE,
EN_FIREFLY_TYPE_FIRE_CAN_PERCH, // Can perch when no longer on fire
EN_FIREFLY_TYPE_NORMAL,
EN_FIREFLY_TYPE_NORMAL_PERCHED,
EN_FIREFLY_TYPE_ICE
} EnFireflyType;
struct EnFirefly;
typedef enum EnFireflyBodyPart {
/* 0 */ EN_FIREFLY_BODY_PART_LEFT_WING,
/* 1 */ EN_FIREFLY_BODY_PART_RIGHT_WING,
/* 2 */ EN_FIREFLY_BODY_PART_BODY,
/* 3 */ EN_FIREFLY_BODY_PART_MAX
} EnFireflyBodyPart;
typedef void (*EnFireflyActionFunc)(struct EnFirefly*, struct PlayState*);
typedef struct EnFirefly {
/* 0x0000 */ Actor actor;
/* 0x014C */ Vec3f bodyPartsPos[3];
/* 0x0170 */ SkelAnime skelAnime;
/* 0x01B4 */ EnFireflyActionFunc actionFunc;
/* 0x01B8 */ u8 auraType;
/* 0x01B9 */ u8 onFire;
/* 0x01BA */ s16 timer;
/* 0x01BC */ s16 targetPitch;
/* 0x01BE */ Vec3s jointTable[28];
/* 0x0266 */ Vec3s morphTable[28];
/* 0x0310 */ f32 maxAltitude;
/* 0x0314 */ ColliderJntSph collider;
/* 0x0344 */ ColliderJntSphElement colliderElements[1];
/* 0x000 */ Actor actor;
/* 0x14C */ Vec3f bodyPartsPos[EN_FIREFLY_BODY_PART_MAX];
/* 0x170 */ SkelAnime skelAnime;
/* 0x1B4 */ EnFireflyActionFunc actionFunc;
/* 0x1B8 */ u8 effectsElementalType;
/* 0x1B9 */ u8 bodyElementalType;
/* 0x1BA */ s16 timer;
/* 0x1BC */ s16 targetPitch;
/* 0x1BE */ Vec3s jointTable[KEESE_LIMB_MAX];
/* 0x266 */ Vec3s morphTable[KEESE_LIMB_MAX];
/* 0x310 */ f32 homeY;
/* 0x314 */ ColliderJntSph collider;
/* 0x334 */ ColliderJntSphElement colliderElements[1];
} EnFirefly; // size = 0x0374
typedef enum KeeseType {
/* 0 */ KEESE_FIRE_FLY,
/* 1 */ KEESE_FIRE_PERCH,
/* 2 */ KEESE_NORMAL_FLY,
/* 3 */ KEESE_NORMAL_PERCH,
/* 4 */ KEESE_ICE_FLY
} KeeseType;
#endif