izzy/2ship2harkinian-Android
0
0
Fork 0
mirror of https://github.com/izzy2lost/2ship2harkinian-Android.git synced 2026-06-19 01:20:08 -07:00
Code Issues Packages Projects Releases Wiki Activity

Document object_dnj (Deku Butler) (#1100)

Browse Source
This commit is contained in:
Tom Overton
2022-09-30 21:17:34 +01:00
committed by GitHub
parent 42a8bf6876
commit 15b9f83bd8
3 changed files with 246 additions and 177 deletions
Download Patch File Download Diff File Expand all files Collapse all files
assets/xml/objects/object_dnj.xml
+92 -82
View File
@@ -1,86 +1,96 @@
<Root>
<!-- Assets for the Deku Butler -->
<File Name="object_dnj" Segment="6">
<Animation Name="object_dnj_Anim_000470" Offset="0x470" />
<Animation Name="object_dnj_Anim_0008F0" Offset="0x8F0" />
<Animation Name="object_dnj_Anim_000F6C" Offset="0xF6C" />
<Animation Name="object_dnj_Anim_001A50" Offset="0x1A50" />
<Animation Name="object_dnj_Anim_002530" Offset="0x2530" />
<Animation Name="object_dnj_Anim_003320" Offset="0x3320" />
<Animation Name="object_dnj_Anim_0036D0" Offset="0x36D0" />
<Animation Name="object_dnj_Anim_0041CC" Offset="0x41CC" />
<Animation Name="object_dnj_Anim_004DD8" Offset="0x4DD8" />
<Animation Name="object_dnj_Anim_0051E4" Offset="0x51E4" />
<Animation Name="object_dnj_Anim_005E20" Offset="0x5E20" />
<Animation Name="object_dnj_Anim_005F98" Offset="0x5F98" />
<Animation Name="object_dnj_Anim_006488" Offset="0x6488" />
<Animation Name="object_dnj_Anim_006F84" Offset="0x6F84" />
<Animation Name="object_dnj_Anim_0073E4" Offset="0x73E4" />
<Animation Name="object_dnj_Anim_0077A8" Offset="0x77A8" />
<Animation Name="object_dnj_Anim_007CA4" Offset="0x7CA4" />
<Animation Name="object_dnj_Anim_008324" Offset="0x8324" />
<Animation Name="object_dnj_Anim_008AE4" Offset="0x8AE4" />
<Animation Name="object_dnj_Anim_009100" Offset="0x9100" />
<DList Name="object_dnj_DL_00B7C0" Offset="0xB7C0" />
<DList Name="object_dnj_DL_00B850" Offset="0xB850" />
<DList Name="object_dnj_DL_00BC68" Offset="0xBC68" />
<DList Name="object_dnj_DL_00BDD8" Offset="0xBDD8" />
<DList Name="object_dnj_DL_00BEF0" Offset="0xBEF0" />
<DList Name="object_dnj_DL_00C118" Offset="0xC118" />
<DList Name="object_dnj_DL_00C1A0" Offset="0xC1A0" />
<DList Name="object_dnj_DL_00C248" Offset="0xC248" />
<DList Name="object_dnj_DL_00C370" Offset="0xC370" />
<DList Name="object_dnj_DL_00C450" Offset="0xC450" />
<DList Name="object_dnj_DL_00C4E0" Offset="0xC4E0" />
<DList Name="object_dnj_DL_00C5C0" Offset="0xC5C0" />
<DList Name="object_dnj_DL_00C650" Offset="0xC650" />
<DList Name="object_dnj_DL_00C7C0" Offset="0xC7C0" />
<DList Name="object_dnj_DL_00C8D8" Offset="0xC8D8" />
<DList Name="object_dnj_DL_00C988" Offset="0xC988" />
<DList Name="object_dnj_DL_00CA38" Offset="0xCA38" />
<DList Name="object_dnj_DL_00CAE8" Offset="0xCAE8" />
<DList Name="object_dnj_DL_00CBE8" Offset="0xCBE8" />
<DList Name="object_dnj_DL_00CC90" Offset="0xCC90" />
<DList Name="object_dnj_DL_00CD48" Offset="0xCD48" />
<DList Name="object_dnj_DL_00CE00" Offset="0xCE00" />
<DList Name="object_dnj_DL_00CEC8" Offset="0xCEC8" />
<DList Name="object_dnj_DL_00CF88" Offset="0xCF88" />
<DList Name="object_dnj_DL_00D040" Offset="0xD040" />
<DList Name="object_dnj_DL_00D108" Offset="0xD108" />
<Texture Name="object_dnj_Tex_00D1C8" OutName="tex_00D1C8" Format="rgba16" Width="16" Height="16" Offset="0xD1C8" />
<Texture Name="object_dnj_Tex_00D3C8" OutName="tex_00D3C8" Format="rgba16" Width="16" Height="16" Offset="0xD3C8" />
<Texture Name="object_dnj_Tex_00D5C8" OutName="tex_00D5C8" Format="rgba16" Width="8" Height="8" Offset="0xD5C8" />
<Texture Name="object_dnj_Tex_00D648" OutName="tex_00D648" Format="rgba16" Width="16" Height="16" Offset="0xD648" />
<Texture Name="object_dnj_Tex_00D848" OutName="tex_00D848" Format="rgba16" Width="16" Height="32" Offset="0xD848" />
<Texture Name="object_dnj_Tex_00DC48" OutName="tex_00DC48" Format="rgba16" Width="16" Height="8" Offset="0xDC48" />
<Texture Name="object_dnj_Tex_00DD48" OutName="tex_00DD48" Format="rgba16" Width="16" Height="16" Offset="0xDD48" />
<Texture Name="object_dnj_Tex_00DF48" OutName="tex_00DF48" Format="rgba16" Width="8" Height="16" Offset="0xDF48" />
<Limb Name="object_dnj_Standardlimb_00E048" Type="Standard" EnumName="OBJECT_DNJ_LIMB_01" Offset="0xE048" />
<Limb Name="object_dnj_Standardlimb_00E054" Type="Standard" EnumName="OBJECT_DNJ_LIMB_02" Offset="0xE054" />
<Limb Name="object_dnj_Standardlimb_00E060" Type="Standard" EnumName="OBJECT_DNJ_LIMB_03" Offset="0xE060" />
<Limb Name="object_dnj_Standardlimb_00E06C" Type="Standard" EnumName="OBJECT_DNJ_LIMB_04" Offset="0xE06C" />
<Limb Name="object_dnj_Standardlimb_00E078" Type="Standard" EnumName="OBJECT_DNJ_LIMB_05" Offset="0xE078" />
<Limb Name="object_dnj_Standardlimb_00E084" Type="Standard" EnumName="OBJECT_DNJ_LIMB_06" Offset="0xE084" />
<Limb Name="object_dnj_Standardlimb_00E090" Type="Standard" EnumName="OBJECT_DNJ_LIMB_07" Offset="0xE090" />
<Limb Name="object_dnj_Standardlimb_00E09C" Type="Standard" EnumName="OBJECT_DNJ_LIMB_08" Offset="0xE09C" />
<Limb Name="object_dnj_Standardlimb_00E0A8" Type="Standard" EnumName="OBJECT_DNJ_LIMB_09" Offset="0xE0A8" />
<Limb Name="object_dnj_Standardlimb_00E0B4" Type="Standard" EnumName="OBJECT_DNJ_LIMB_0A" Offset="0xE0B4" />
<Limb Name="object_dnj_Standardlimb_00E0C0" Type="Standard" EnumName="OBJECT_DNJ_LIMB_0B" Offset="0xE0C0" />
<Limb Name="object_dnj_Standardlimb_00E0CC" Type="Standard" EnumName="OBJECT_DNJ_LIMB_0C" Offset="0xE0CC" />
<Limb Name="object_dnj_Standardlimb_00E0D8" Type="Standard" EnumName="OBJECT_DNJ_LIMB_0D" Offset="0xE0D8" />
<Limb Name="object_dnj_Standardlimb_00E0E4" Type="Standard" EnumName="OBJECT_DNJ_LIMB_0E" Offset="0xE0E4" />
<Limb Name="object_dnj_Standardlimb_00E0F0" Type="Standard" EnumName="OBJECT_DNJ_LIMB_0F" Offset="0xE0F0" />
<Limb Name="object_dnj_Standardlimb_00E0FC" Type="Standard" EnumName="OBJECT_DNJ_LIMB_10" Offset="0xE0FC" />
<Limb Name="object_dnj_Standardlimb_00E108" Type="Standard" EnumName="OBJECT_DNJ_LIMB_11" Offset="0xE108" />
<Limb Name="object_dnj_Standardlimb_00E114" Type="Standard" EnumName="OBJECT_DNJ_LIMB_12" Offset="0xE114" />
<Limb Name="object_dnj_Standardlimb_00E120" Type="Standard" EnumName="OBJECT_DNJ_LIMB_13" Offset="0xE120" />
<Limb Name="object_dnj_Standardlimb_00E12C" Type="Standard" EnumName="OBJECT_DNJ_LIMB_14" Offset="0xE12C" />
<Limb Name="object_dnj_Standardlimb_00E138" Type="Standard" EnumName="OBJECT_DNJ_LIMB_15" Offset="0xE138" />
<Limb Name="object_dnj_Standardlimb_00E144" Type="Standard" EnumName="OBJECT_DNJ_LIMB_16" Offset="0xE144" />
<Limb Name="object_dnj_Standardlimb_00E150" Type="Standard" EnumName="OBJECT_DNJ_LIMB_17" Offset="0xE150" />
<Limb Name="object_dnj_Standardlimb_00E15C" Type="Standard" EnumName="OBJECT_DNJ_LIMB_18" Offset="0xE15C" />
<Limb Name="object_dnj_Standardlimb_00E168" Type="Standard" EnumName="OBJECT_DNJ_LIMB_19" Offset="0xE168" />
<Limb Name="object_dnj_Standardlimb_00E174" Type="Standard" EnumName="OBJECT_DNJ_LIMB_1A" Offset="0xE174" />
<Limb Name="object_dnj_Standardlimb_00E180" Type="Standard" EnumName="OBJECT_DNJ_LIMB_1B" Offset="0xE180" />
<Skeleton Name="object_dnj_Skel_00E1F8" Type="Flex" LimbType="Standard" LimbNone="OBJECT_DNJ_LIMB_NONE" LimbMax="OBJECT_DNJ_LIMB_MAX" EnumName="ObjectDnoLimb" Offset="0xE1F8" />
<!-- Deku Butler Animations -->
<Animation Name="gDekuButlerStartRaceStartAnim" Offset="0x470" /> <!-- Original name is "dnj_douzoR" (named after the line he says when the race starts in the Japanese text)-->
<Animation Name="gDekuButlerStartRaceEndAnim" Offset="0x8F0" /> <!-- Original name is "dnj_douzoTOwaitR" -->
<Animation Name="gDekuButlerFlyAnim" Offset="0xF6C" /> <!-- Original name is "dnj_flyR" -->
<Animation Name="gDekuButlerFarewellAnim" Offset="0x1A50" /> <!-- Original name is "dnj_goodbye" -->
<Animation Name="gDekuButlerGreetingAnim" Offset="0x2530" /> <!-- Original name is "dnj_hello" -->
<Animation Name="gDekuButlerGreetingWithCandleAnim" Offset="0x3320" /> <!-- Original name is "dnj_helloR" -->
<Animation Name="gDekuButlerPrayerLoopAnim" Offset="0x36D0" /> <!-- Original name is "dnj_inori" ("prayer; supplication") -->
<Animation Name="gDekuButlerCloseParasolAnim" Offset="0x41CC" /> <!-- Original name is "dnj_kasacloseR" ("kasa" = "umbrella; parasol") -->
<Animation Name="gDekuButlerOpenParasolAnim" Offset="0x4DD8" /> <!-- Original name is "dnj_kasaopenR" -->
<Animation Name="gDekuButlerShockStartAnim" Offset="0x51E4" /> <!-- Original name is "dnj_kosinukasu" ("to be unable to stand due to fear/surprise") -->
<Animation Name="gDekuButlerShockLoopAnim" Offset="0x5E20" /> <!-- Original name is "dnj_kosinukasu_loop" -->
<Animation Name="gDekuButlerImploreLoopAnim" Offset="0x5F98" /> <!-- Original name is "dnj_oisame" ("o" = "king", "isame" = "to admonish; to advise") -->
<Animation Name="gDekuButlerImploreEndAnim" Offset="0x6488" /> <!-- Original name is "dnj_oisameTOwait" -->
<Animation Name="gDekuButlerGrieveAnim" Offset="0x6F84" /> <!-- Original name is "dnj_rakutan_loop" ("despondency; disappointment​")-->
<Animation Name="gDekuButlerTalkAnim" Offset="0x73E4" /> <!-- Original name is "dnj_talk" -->
<Animation Name="gDekuButlerTalkWithParasolAndCandleAnim" Offset="0x77A8" /> <!-- Original name is "dnj_talkR" -->
<Animation Name="gDekuButlerIdleAnim" Offset="0x7CA4" /> <!-- Original name is "dnj_wait" -->
<Animation Name="gDekuButlerIdleWithCandleAnim" Offset="0x8324" /> <!-- Original name is "dnj_waitR" -->
<Animation Name="gDekuButlerPrayerStartAnim" Offset="0x8AE4" /> <!-- Original name is "dnj_waitTOinori" -->
<Animation Name="gDekuButlerImploreStartAnim" Offset="0x9100" /> <!-- Original name is "dnj_waitTOoisame" -->
<!-- Deku Butler Limb DisplayLists -->
<DList Name="gDekuButlerEyesDL" Offset="0xB7C0" />
<DList Name="gDekuButlerUpperBodyDL" Offset="0xB850" />
<DList Name="gDekuButlerLeftForearmDL" Offset="0xBC68" />
<DList Name="gDekuButlerLeftHandDL" Offset="0xBDD8" />
<DList Name="gDekuButlerCandleDL" Offset="0xBEF0" />
<DList Name="gDekuButlerCandleWickDL" Offset="0xC118" />
<DList Name="gDekuButlerLeftUpperArmDL" Offset="0xC1A0" />
<DList Name="gDekuButlerSnoutDL" Offset="0xC248" />
<DList Name="gDekuButlerRightMustacheCurlDL" Offset="0xC370" />
<DList Name="gDekuButlerRightMustacheBaseDL" Offset="0xC450" />
<DList Name="gDekuButlerLeftMustacheCurlDL" Offset="0xC4E0" />
<DList Name="gDekuButlerLeftMustacheBaseDL" Offset="0xC5C0" />
<DList Name="gDekuButlerRightForearmDL" Offset="0xC650" />
<DList Name="gDekuButlerRightHandDL" Offset="0xC7C0" />
<DList Name="gDekuButlerParasolUpperPetalsDL" Offset="0xC8D8" />
<DList Name="gDekuButlerParasolMiddlePetalsDL" Offset="0xC988" />
<DList Name="gDekuButlerParasolLowerPetalsDL" Offset="0xCA38" />
<DList Name="gDekuButlerParasolHandleDL" Offset="0xCAE8" />
<DList Name="gDekuButlerRightUpperArmDL" Offset="0xCBE8" />
<DList Name="gDekuButlerPelvisDL" Offset="0xCC90" />
<DList Name="gDekuButlerLeftShinDL" Offset="0xCD48" />
<DList Name="gDekuButlerLeftFootDL" Offset="0xCE00" />
<DList Name="gDekuButlerLeftThighDL" Offset="0xCEC8" />
<DList Name="gDekuButlerRightShinDL" Offset="0xCF88" />
<DList Name="gDekuButlerRightFootDL" Offset="0xD040" />
<DList Name="gDekuButlerRightThighDL" Offset="0xD108" />
<!-- Deku Butler Textures -->
<Texture Name="gDekuButlerEyeTex" OutName="deku_butler_eye" Format="rgba16" Width="16" Height="16" Offset="0xD1C8" />
<Texture Name="gDekuButlerBodyAndCandleHolderTex" OutName="deku_butler_body_and_candle_holder" Format="rgba16" Width="16" Height="16" Offset="0xD3C8" />
<Texture Name="gDekuButlerMouthTex" OutName="deku_butler_mouth" Format="rgba16" Width="8" Height="8" Offset="0xD5C8" />
<Texture Name="gDekuButlerLeafTex" OutName="deku_butler_leaf" Format="rgba16" Width="16" Height="16" Offset="0xD648" />
<Texture Name="gDekuButlerParasolPetalTex" OutName="deku_butler_parasol_petal" Format="rgba16" Width="16" Height="32" Offset="0xD848" />
<Texture Name="gDekuButlerCandleTex" OutName="deku_butler_candle" Format="rgba16" Width="16" Height="8" Offset="0xDC48" />
<Texture Name="gDekuButlerHairTex" OutName="deku_butler_hair" Format="rgba16" Width="16" Height="16" Offset="0xDD48" />
<Texture Name="gDekuButlerBowtieCenter" OutName="deku_butler_bowtie_center" Format="rgba16" Width="8" Height="16" Offset="0xDF48" />
<!-- Deku Butler Limbs -->
<Limb Name="gDekuButlerRootLimb" Type="Standard" EnumName="DEKU_BUTLER_LIMB_ROOT" Offset="0xE048" />
<Limb Name="gDekuButlerPelvisLimb" Type="Standard" EnumName="DEKU_BUTLER_LIMB_PELVIS" Offset="0xE054" />
<Limb Name="gDekuButlerRightThighLimb" Type="Standard" EnumName="DEKU_BUTLER_LIMB_RIGHT_THIGH" Offset="0xE060" />
<Limb Name="gDekuButlerRightShinLimb" Type="Standard" EnumName="DEKU_BUTLER_LIMB_RIGHT_SHIN" Offset="0xE06C" />
<Limb Name="gDekuButlerRightFootLimb" Type="Standard" EnumName="DEKU_BUTLER_LIMB_RIGHT_FOOT" Offset="0xE078" />
<Limb Name="gDekuButlerLeftThighLimb" Type="Standard" EnumName="DEKU_BUTLER_LIMB_LEFT_THIGH" Offset="0xE084" />
<Limb Name="gDekuButlerLeftShinLimb" Type="Standard" EnumName="DEKU_BUTLER_LIMB_LEFT_SHIN" Offset="0xE090" />
<Limb Name="gDekuButlerLeftFootLimb" Type="Standard" EnumName="DEKU_BUTLER_LIMB_LEFT_FOOT" Offset="0xE09C" />
<Limb Name="gDekuButlerEyesLimb" Type="Standard" EnumName="DEKU_BUTLER_LIMB_EYES" Offset="0xE0A8" />
<Limb Name="gDekuButlerRightUpperArmLimb" Type="Standard" EnumName="DEKU_BUTLER_LIMB_RIGHT_UPPER_ARM" Offset="0xE0B4" />
<Limb Name="gDekuButlerRightForearmLimb" Type="Standard" EnumName="DEKU_BUTLER_LIMB_RIGHT_FOREARM" Offset="0xE0C0" />
<Limb Name="gDekuButlerRightHandLimb" Type="Standard" EnumName="DEKU_BUTLER_LIMB_RIGHT_HAND" Offset="0xE0CC" />
<Limb Name="gDekuButlerParasolHandleLimb" Type="Standard" EnumName="DEKU_BUTLER_LIMB_PARASOL_HANDLE" Offset="0xE0D8" />
<Limb Name="gDekuButlerParasolUpperPetalsLimb" Type="Standard" EnumName="DEKU_BUTLER_LIMB_PARASOL_UPPER_PETALS" Offset="0xE0E4" />
<Limb Name="gDekuButlerParasolLowerPetalsLimb" Type="Standard" EnumName="DEKU_BUTLER_LIMB_PARASOL_LOWER_PETALS" Offset="0xE0F0" />
<Limb Name="gDekuButlerParasolMiddlePetalsLimb" Type="Standard" EnumName="DEKU_BUTLER_LIMB_PARASOL_MIDDLE_PETALS" Offset="0xE0FC" />
<Limb Name="gDekuButlerSnoutLimb" Type="Standard" EnumName="DEKU_BUTLER_LIMB_SNOUT" Offset="0xE108" />
<Limb Name="gDekuButlerLeftMustacheBaseLimb" Type="Standard" EnumName="DEKU_BUTLER_LIMB_LEFT_MUSTACHE_BASE" Offset="0xE114" />
<Limb Name="gDekuButlerLeftMustacheCurlLimb" Type="Standard" EnumName="DEKU_BUTLER_LIMB_LEFT_MUSTACHE_CURL" Offset="0xE120" />
<Limb Name="gDekuButlerRightMustacheBaseLimb" Type="Standard" EnumName="DEKU_BUTLER_LIMB_RIGHT_MUSTACHE_BASE" Offset="0xE12C" />
<Limb Name="gDekuButlerRightMustacheCurlLimb" Type="Standard" EnumName="DEKU_BUTLER_LIMB_RIGHT_MUSTACHE_CURL" Offset="0xE138" />
<Limb Name="gDekuButlerLeftUpperArmLimb" Type="Standard" EnumName="DEKU_BUTLER_LIMB_LEFT_UPPER_ARM" Offset="0xE144" />
<Limb Name="gDekuButlerLeftForearmLimb" Type="Standard" EnumName="DEKU_BUTLER_LIMB_LEFT_FOREARM" Offset="0xE150" />
<Limb Name="gDekuButlerLeftHandLimb" Type="Standard" EnumName="DEKU_BUTLER_LIMB_LEFT_HAND" Offset="0xE15C" />
<Limb Name="gDekuButlerCandleLimb" Type="Standard" EnumName="DEKU_BUTLER_LIMB_CANDLE" Offset="0xE168" />
<Limb Name="gDekuButlerCandleWickLimb" Type="Standard" EnumName="DEKU_BUTLER_LIMB_CANDLE_WICK" Offset="0xE174" />
<Limb Name="gDekuButlerUpperBodyLimb" Type="Standard" EnumName="DEKU_BUTLER_LIMB_UPPER_BODY" Offset="0xE180" />
<!-- Deku Butler Skeleton -->
<Skeleton Name="gDekuButlerSkel" Type="Flex" LimbType="Standard" LimbNone="DEKU_BUTLER_LIMB_NONE" LimbMax="DEKU_BUTLER_LIMB_MAX" EnumName="DekuButlerLimb" Offset="0xE1F8" />
</File>
</Root>
src/overlays/actors/ovl_En_Dno/z_en_dno.c
+150 -92
View File
File diff suppressed because it is too large Load Diff
src/overlays/actors/ovl_En_Dno/z_en_dno.h
+4 -3
View File
@@ -2,6 +2,7 @@
#define Z_EN_DNO_H
#include "global.h"
#include "objects/object_dnj/object_dnj.h"
struct EnDno;
@@ -21,10 +22,10 @@ typedef struct EnDno {
/* 0x144 */ EnDnoActionFunc actionFunc;
/* 0x148 */ SkelAnime skelAnime;
/* 0x18C */ ColliderCylinder collider;
/* 0x1D8 */ Vec3s jointTable[28];
/* 0x280 */ Vec3s morphTable[28];
/* 0x1D8 */ Vec3s jointTable[DEKU_BUTLER_LIMB_MAX];
/* 0x280 */ Vec3s morphTable[DEKU_BUTLER_LIMB_MAX];
/* 0x328 */ s32 unk_328;
/* 0x32C */ s32 unk_32C;
/* 0x32C */ s32 animIndex;
/* 0x330 */ UNK_TYPE1 unk_330[0x4];
/* 0x334 */ Vec3f unk_334;
/* 0x340 */ ActorPathing actorPath;