falso
/
mm
mirror of https://github.com/zeldaret/mm.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Document object_dnj (Deku Butler) (#1100)

This commit is contained in:
Tom Overton 2022-09-30 13:17:34 -07:00 committed by GitHub
parent 42a8bf6876
commit 15b9f83bd8
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 246 additions and 177 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

174
assets/xml/objects/object_dnj.xml
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>

242
src/overlays/actors/ovl_En_Dno/z_en_dno.c
View File

@ -11,7 +11,6 @@
#include "z_en_dno.h"
#include "overlays/actors/ovl_Bg_Crace_Movebg/z_bg_crace_movebg.h"
#include "objects/gameplay_keep/gameplay_keep.h"
#include "objects/object_dnj/object_dnj.h"
#define FLAGS (ACTOR_FLAG_1 | ACTOR_FLAG_8 | ACTOR_FLAG_10 | ACTOR_FLAG_20)
@ -44,17 +43,50 @@ void func_80A732C8(EnDno* this, PlayState* play);
s32 EnDno_OverrideLimbDraw(PlayState* play, s32 limbIndex, Gfx** dList, Vec3f* pos, Vec3s* rot, Actor* thisx);
void EnDno_PostLimbDraw(PlayState* play, s32 limbIndex, Gfx** dList, Vec3s* rot, Actor* thisx);
typedef enum {
/* 0 */ EN_DNO_ANIM_START_RACE_START,
/* 1 */ EN_DNO_ANIM_START_RACE_END,
/* 2 */ EN_DNO_ANIM_FLY,
/* 3 */ EN_DNO_ANIM_FAREWELL,
/* 4 */ EN_DNO_ANIM_GREETING,
/* 5 */ EN_DNO_ANIM_GREETING_WITH_CANDLE,
/* 6 */ EN_DNO_ANIM_PRAYER_LOOP,
/* 7 */ EN_DNO_ANIM_CLOSE_PARASOL,
/* 8 */ EN_DNO_ANIM_OPEN_PARASOL,
/* 9 */ EN_DNO_ANIM_IMPLORE_LOOP,
/* 10 */ EN_DNO_ANIM_IMPLORE_END,
/* 11 */ EN_DNO_ANIM_TALK,
/* 12 */ EN_DNO_ANIM_TALK_WITH_PARSOL_AND_CANDLE,
/* 13 */ EN_DNO_ANIM_IDLE,
/* 14 */ EN_DNO_ANIM_IDLE_WITH_CANDLE,
/* 15 */ EN_DNO_ANIM_PRAYER_START,
/* 16 */ EN_DNO_ANIM_IMPLORE_START,
/* 17 */ EN_DNO_ANIM_SHOCK_START,
/* 18 */ EN_DNO_ANIM_SHOCK_LOOP,
/* 19 */ EN_DNO_ANIM_GRIEVE,
} EnDnoAnimation;
static AnimationSpeedInfo sAnimations[] = {
{ &object_dnj_Anim_000470, 1.0f, ANIMMODE_ONCE, 0.0f }, { &object_dnj_Anim_0008F0, 1.0f, ANIMMODE_ONCE, 0.0f },
{ &object_dnj_Anim_000F6C, 1.0f, ANIMMODE_LOOP, 0.0f }, { &object_dnj_Anim_001A50, 1.0f, ANIMMODE_ONCE, 0.0f },
{ &object_dnj_Anim_002530, 1.0f, ANIMMODE_ONCE, 0.0f }, { &object_dnj_Anim_003320, 1.0f, ANIMMODE_ONCE, 0.0f },
{ &object_dnj_Anim_0036D0, 1.0f, ANIMMODE_LOOP, 0.0f }, { &object_dnj_Anim_0041CC, 1.0f, ANIMMODE_ONCE, 0.0f },
{ &object_dnj_Anim_004DD8, 1.0f, ANIMMODE_ONCE, 0.0f }, { &object_dnj_Anim_005F98, 1.0f, ANIMMODE_LOOP, 0.0f },
{ &object_dnj_Anim_006488, 1.0f, ANIMMODE_ONCE, 0.0f }, { &object_dnj_Anim_0073E4, 1.0f, ANIMMODE_LOOP, 0.0f },
{ &object_dnj_Anim_0077A8, 1.0f, ANIMMODE_LOOP, 0.0f }, { &object_dnj_Anim_007CA4, 1.0f, ANIMMODE_LOOP, 0.0f },
{ &object_dnj_Anim_008324, 1.0f, ANIMMODE_LOOP, 0.0f }, { &object_dnj_Anim_008AE4, 1.0f, ANIMMODE_ONCE, 0.0f },
{ &object_dnj_Anim_009100, 1.0f, ANIMMODE_ONCE, 0.0f }, { &object_dnj_Anim_0051E4, 1.0f, ANIMMODE_ONCE, 0.0f },
{ &object_dnj_Anim_005E20, 1.0f, ANIMMODE_LOOP, 0.0f }, { &object_dnj_Anim_006F84, 1.0f, ANIMMODE_LOOP, 0.0f },
{ &gDekuButlerStartRaceStartAnim, 1.0f, ANIMMODE_ONCE, 0.0f },
{ &gDekuButlerStartRaceEndAnim, 1.0f, ANIMMODE_ONCE, 0.0f },
{ &gDekuButlerFlyAnim, 1.0f, ANIMMODE_LOOP, 0.0f },
{ &gDekuButlerFarewellAnim, 1.0f, ANIMMODE_ONCE, 0.0f },
{ &gDekuButlerGreetingAnim, 1.0f, ANIMMODE_ONCE, 0.0f },
{ &gDekuButlerGreetingWithCandleAnim, 1.0f, ANIMMODE_ONCE, 0.0f },
{ &gDekuButlerPrayerLoopAnim, 1.0f, ANIMMODE_LOOP, 0.0f },
{ &gDekuButlerCloseParasolAnim, 1.0f, ANIMMODE_ONCE, 0.0f },
{ &gDekuButlerOpenParasolAnim, 1.0f, ANIMMODE_ONCE, 0.0f },
{ &gDekuButlerImploreLoopAnim, 1.0f, ANIMMODE_LOOP, 0.0f },
{ &gDekuButlerImploreEndAnim, 1.0f, ANIMMODE_ONCE, 0.0f },
{ &gDekuButlerTalkAnim, 1.0f, ANIMMODE_LOOP, 0.0f },
{ &gDekuButlerTalkWithParasolAndCandleAnim, 1.0f, ANIMMODE_LOOP, 0.0f },
{ &gDekuButlerIdleAnim, 1.0f, ANIMMODE_LOOP, 0.0f },
{ &gDekuButlerIdleWithCandleAnim, 1.0f, ANIMMODE_LOOP, 0.0f },
{ &gDekuButlerPrayerStartAnim, 1.0f, ANIMMODE_ONCE, 0.0f },
{ &gDekuButlerImploreStartAnim, 1.0f, ANIMMODE_ONCE, 0.0f },
{ &gDekuButlerShockStartAnim, 1.0f, ANIMMODE_ONCE, 0.0f },
{ &gDekuButlerShockLoopAnim, 1.0f, ANIMMODE_LOOP, 0.0f },
{ &gDekuButlerGrieveAnim, 1.0f, ANIMMODE_LOOP, 0.0f },
};
const ActorInit En_Dno_InitVars = {
@ -199,14 +231,15 @@ void EnDno_Init(Actor* thisx, PlayState* play) {
if (actor == NULL) {
Actor_ProcessInitChain(thisx, sInitChain);
ActorShape_Init(&thisx->shape, 0.0f, ActorShadow_DrawCircle, 21.0f);
SkelAnime_InitFlex(play, &this->skelAnime, &object_dnj_Skel_00E1F8, &object_dnj_Anim_007CA4,
this->jointTable, this->morphTable, 28);
SkelAnime_InitFlex(play, &this->skelAnime, &gDekuButlerSkel, &gDekuButlerIdleAnim, this->jointTable,
this->morphTable, DEKU_BUTLER_LIMB_MAX);
Collider_InitCylinder(play, &this->collider);
Collider_SetCylinder(play, &this->collider, thisx, &sCylinderInit);
Actor_UpdateBgCheckInfo(play, thisx, 0.0f, 0.0f, 0.0f, 4);
Animation_Change(&this->skelAnime, sAnimations[14].animation, 1.0f, 0.0f,
Animation_GetLastFrame(sAnimations[14].animation), sAnimations[14].mode,
sAnimations[14].morphFrames);
Animation_Change(&this->skelAnime, sAnimations[EN_DNO_ANIM_IDLE_WITH_CANDLE].animation, 1.0f, 0.0f,
Animation_GetLastFrame(sAnimations[EN_DNO_ANIM_IDLE_WITH_CANDLE].animation),
sAnimations[EN_DNO_ANIM_IDLE_WITH_CANDLE].mode,
sAnimations[EN_DNO_ANIM_IDLE_WITH_CANDLE].morphFrames);
this->unk_3BE = 0x3E93;
this->unk_3C0 = 60.0f;
this->unk_3B0 = 0;
@ -219,7 +252,8 @@ void EnDno_Init(Actor* thisx, PlayState* play) {
if (!(gSaveContext.save.weekEventReg[23] & 0x20) || (gSaveContext.save.weekEventReg[93] & 2)) {
Actor_MarkForDeath(thisx);
} else {
SubS_ChangeAnimationBySpeedInfo(&this->skelAnime, sAnimations, 14, &this->unk_32C);
SubS_ChangeAnimationBySpeedInfo(&this->skelAnime, sAnimations, EN_DNO_ANIM_IDLE_WITH_CANDLE,
&this->animIndex);
thisx->room = -1;
gSaveContext.timerStates[TIMER_ID_MINIGAME_1] = TIMER_STATE_STOP;
this->lightNode = LightContext_InsertLight(play, &play->lightCtx, &this->lightInfo);
@ -233,7 +267,8 @@ void EnDno_Init(Actor* thisx, PlayState* play) {
if (gSaveContext.save.weekEventReg[23] & 0x20) {
Actor_MarkForDeath(thisx);
} else {
SubS_ChangeAnimationBySpeedInfo(&this->skelAnime, sAnimations, 13, &this->unk_32C);
SubS_ChangeAnimationBySpeedInfo(&this->skelAnime, sAnimations, EN_DNO_ANIM_IDLE,
&this->animIndex);
this->unk_460 = SubS_FindActor(play, NULL, ACTORCAT_NPC, ACTOR_EN_DNQ);
if (this->unk_460 == NULL) {
Actor_MarkForDeath(thisx);
@ -261,7 +296,7 @@ void EnDno_Destroy(Actor* thisx, PlayState* play) {
void func_80A71B04(EnDno* this, PlayState* play) {
this->unk_452 = 0;
SubS_ChangeAnimationBySpeedInfo(&this->skelAnime, sAnimations, 19, &this->unk_32C);
SubS_ChangeAnimationBySpeedInfo(&this->skelAnime, sAnimations, EN_DNO_ANIM_GRIEVE, &this->animIndex);
this->actionFunc = EnDno_DoNothing;
}
@ -274,54 +309,57 @@ void func_80A71B68(EnDno* this, PlayState* play) {
if (CHECK_QUEST_ITEM(QUEST_SONG_SONATA)) {
if (gSaveContext.save.weekEventReg[27] & 1) {
if (!(this->unk_3B0 & 0x20)) {
SubS_ChangeAnimationBySpeedInfo(&this->skelAnime, sAnimations, 6, &this->unk_32C);
SubS_ChangeAnimationBySpeedInfo(&this->skelAnime, sAnimations, EN_DNO_ANIM_PRAYER_LOOP,
&this->animIndex);
this->actor.shape.rot.y = Actor_YawBetweenActors(&this->actor, this->unk_460);
}
} else {
SubS_ChangeAnimationBySpeedInfo(&this->skelAnime, sAnimations, 13, &this->unk_32C);
SubS_ChangeAnimationBySpeedInfo(&this->skelAnime, sAnimations, EN_DNO_ANIM_IDLE, &this->animIndex);
}
} else {
SubS_ChangeAnimationBySpeedInfo(&this->skelAnime, sAnimations, 13, &this->unk_32C);
SubS_ChangeAnimationBySpeedInfo(&this->skelAnime, sAnimations, EN_DNO_ANIM_IDLE, &this->animIndex);
}
this->actionFunc = func_80A71C3C;
}
void func_80A71C3C(EnDno* this, PlayState* play) {
switch (this->unk_32C) {
case 9:
case 16:
SubS_ChangeAnimationBySpeedInfo(&this->skelAnime, sAnimations, 10, &this->unk_32C);
switch (this->animIndex) {
case EN_DNO_ANIM_IMPLORE_LOOP:
case EN_DNO_ANIM_IMPLORE_START:
SubS_ChangeAnimationBySpeedInfo(&this->skelAnime, sAnimations, EN_DNO_ANIM_IMPLORE_END, &this->animIndex);
break;
case 3:
case 10:
case EN_DNO_ANIM_FAREWELL:
case EN_DNO_ANIM_IMPLORE_END:
if (this->skelAnime.curFrame == this->skelAnime.endFrame) {
SubS_ChangeAnimationBySpeedInfo(&this->skelAnime, sAnimations, 13, &this->unk_32C);
SubS_ChangeAnimationBySpeedInfo(&this->skelAnime, sAnimations, EN_DNO_ANIM_IDLE, &this->animIndex);
}
break;
case 11:
SubS_ChangeAnimationBySpeedInfo(&this->skelAnime, sAnimations, 15, &this->unk_32C);
case EN_DNO_ANIM_TALK:
SubS_ChangeAnimationBySpeedInfo(&this->skelAnime, sAnimations, EN_DNO_ANIM_PRAYER_START, &this->animIndex);
break;
case 15:
case EN_DNO_ANIM_PRAYER_START:
if (this->skelAnime.curFrame == this->skelAnime.endFrame) {
SubS_ChangeAnimationBySpeedInfo(&this->skelAnime, sAnimations, 6, &this->unk_32C);
SubS_ChangeAnimationBySpeedInfo(&this->skelAnime, sAnimations, EN_DNO_ANIM_PRAYER_LOOP,
&this->animIndex);
}
case 6:
case EN_DNO_ANIM_PRAYER_LOOP:
Math_SmoothStepToS(&this->actor.shape.rot.y, Actor_YawBetweenActors(&this->actor, this->unk_460), 2, 0xE38,
0x222);
break;
}
if ((this->unk_32C == 13) && (this->actor.xzDistToPlayer <= 120.0f)) {
if ((this->animIndex == EN_DNO_ANIM_IDLE) && (this->actor.xzDistToPlayer <= 120.0f)) {
func_80A71424(&this->unk_466, 0, this->actor.yawTowardsPlayer, this->actor.shape.rot.y, 0x2000, 0x16C);
} else {
Math_ScaledStepToS(&this->unk_466, 0, 0x16C);
}
if ((this->unk_32C != 3) && (this->unk_32C != 15) && (this->unk_32C != 6)) {
if ((this->animIndex != EN_DNO_ANIM_FAREWELL) && (this->animIndex != EN_DNO_ANIM_PRAYER_START) &&
(this->animIndex != EN_DNO_ANIM_PRAYER_LOOP)) {
Math_ScaledStepToS(&this->actor.shape.rot.y, this->actor.home.rot.y, 0x222);
}
@ -366,7 +404,8 @@ void func_80A71F18(EnDno* this, PlayState* play) {
Math_ScaledStepToS(&this->actor.shape.rot.y, this->actor.yawTowardsPlayer, 0xE38)) {
switch (this->textId) {
case 0x80B:
SubS_ChangeAnimationBySpeedInfo(&this->skelAnime, sAnimations, 16, &this->unk_32C);
SubS_ChangeAnimationBySpeedInfo(&this->skelAnime, sAnimations, EN_DNO_ANIM_IMPLORE_START,
&this->animIndex);
case 0x811:
Message_StartTextbox(play, this->textId, &this->actor);
@ -374,10 +413,13 @@ void func_80A71F18(EnDno* this, PlayState* play) {
case 0x80C:
case 0x80F:
if (this->unk_32C == 13) {
SubS_ChangeAnimationBySpeedInfo(&this->skelAnime, sAnimations, 4, &this->unk_32C);
} else if ((this->unk_32C == 4) && (this->skelAnime.curFrame == this->skelAnime.endFrame)) {
SubS_ChangeAnimationBySpeedInfo(&this->skelAnime, sAnimations, 11, &this->unk_32C);
if (this->animIndex == EN_DNO_ANIM_IDLE) {
SubS_ChangeAnimationBySpeedInfo(&this->skelAnime, sAnimations, EN_DNO_ANIM_GREETING,
&this->animIndex);
} else if ((this->animIndex == EN_DNO_ANIM_GREETING) &&
(this->skelAnime.curFrame == this->skelAnime.endFrame)) {
SubS_ChangeAnimationBySpeedInfo(&this->skelAnime, sAnimations, EN_DNO_ANIM_TALK,
&this->animIndex);
Message_StartTextbox(play, this->textId, &this->actor);
}
break;
@ -387,19 +429,21 @@ void func_80A71F18(EnDno* this, PlayState* play) {
case TEXT_STATE_3:
if (play->msgCtx.currentTextId == 0x80B) {
switch (this->unk_32C) {
case 16:
switch (this->animIndex) {
case EN_DNO_ANIM_IMPLORE_START:
if (this->skelAnime.curFrame == this->skelAnime.endFrame) {
SubS_ChangeAnimationBySpeedInfo(&this->skelAnime, sAnimations, 9, &this->unk_32C);
SubS_ChangeAnimationBySpeedInfo(&this->skelAnime, sAnimations, EN_DNO_ANIM_IMPLORE_LOOP,
&this->animIndex);
}
Math_ScaledStepToS(&this->actor.shape.rot.y,
Actor_YawBetweenActors(&this->actor, this->unk_460), 0x71C);
break;
case 10:
case EN_DNO_ANIM_IMPLORE_END:
if (this->skelAnime.curFrame == this->skelAnime.endFrame) {
func_801477B4(play);
SubS_ChangeAnimationBySpeedInfo(&this->skelAnime, sAnimations, 13, &this->unk_32C);
SubS_ChangeAnimationBySpeedInfo(&this->skelAnime, sAnimations, EN_DNO_ANIM_IDLE,
&this->animIndex);
func_80A71B68(this, play);
}
break;
@ -412,24 +456,27 @@ void func_80A71F18(EnDno* this, PlayState* play) {
case TEXT_STATE_DONE:
switch (play->msgCtx.currentTextId) {
case 0x80B:
switch (this->unk_32C) {
case 16:
switch (this->animIndex) {
case EN_DNO_ANIM_IMPLORE_START:
if (this->skelAnime.curFrame == this->skelAnime.endFrame) {
SubS_ChangeAnimationBySpeedInfo(&this->skelAnime, sAnimations, 9, &this->unk_32C);
SubS_ChangeAnimationBySpeedInfo(&this->skelAnime, sAnimations, EN_DNO_ANIM_IMPLORE_LOOP,
&this->animIndex);
}
break;
case 9:
case EN_DNO_ANIM_IMPLORE_LOOP:
if (Message_ShouldAdvance(play)) {
SubS_ChangeAnimationBySpeedInfo(&this->skelAnime, sAnimations, 10, &this->unk_32C);
SubS_ChangeAnimationBySpeedInfo(&this->skelAnime, sAnimations, EN_DNO_ANIM_IMPLORE_END,
&this->animIndex);
play->msgCtx.msgMode = 0x44;
}
break;
case 10:
case EN_DNO_ANIM_IMPLORE_END:
if (this->skelAnime.curFrame == this->skelAnime.endFrame) {
func_801477B4(play);
SubS_ChangeAnimationBySpeedInfo(&this->skelAnime, sAnimations, 13, &this->unk_32C);
SubS_ChangeAnimationBySpeedInfo(&this->skelAnime, sAnimations, EN_DNO_ANIM_IDLE,
&this->animIndex);
func_80A71B68(this, play);
}
break;
@ -449,13 +496,15 @@ void func_80A71F18(EnDno* this, PlayState* play) {
break;
case 0x80E:
if (this->unk_32C == 11) {
SubS_ChangeAnimationBySpeedInfo(&this->skelAnime, sAnimations, 3, &this->unk_32C);
} else if (this->unk_32C == 3) {
if (this->animIndex == EN_DNO_ANIM_TALK) {
SubS_ChangeAnimationBySpeedInfo(&this->skelAnime, sAnimations, EN_DNO_ANIM_FAREWELL,
&this->animIndex);
} else if (this->animIndex == EN_DNO_ANIM_FAREWELL) {
if (this->skelAnime.curFrame == this->skelAnime.endFrame) {
SubS_ChangeAnimationBySpeedInfo(&this->skelAnime, sAnimations, 13, &this->unk_32C);
SubS_ChangeAnimationBySpeedInfo(&this->skelAnime, sAnimations, EN_DNO_ANIM_IDLE,
&this->animIndex);
}
} else if ((this->unk_32C == 13) && Message_ShouldAdvance(play)) {
} else if ((this->animIndex == EN_DNO_ANIM_IDLE) && Message_ShouldAdvance(play)) {
func_801477B4(play);
func_80A71B68(this, play);
}
@ -475,14 +524,16 @@ void func_80A71F18(EnDno* this, PlayState* play) {
break;
}
switch (this->unk_32C) {
case 11:
SubS_ChangeAnimationBySpeedInfo(&this->skelAnime, sAnimations, 15, &this->unk_32C);
switch (this->animIndex) {
case EN_DNO_ANIM_TALK:
SubS_ChangeAnimationBySpeedInfo(&this->skelAnime, sAnimations, EN_DNO_ANIM_PRAYER_START,
&this->animIndex);
break;
case 15:
case EN_DNO_ANIM_PRAYER_START:
if (this->skelAnime.curFrame == this->skelAnime.endFrame) {
SubS_ChangeAnimationBySpeedInfo(&this->skelAnime, sAnimations, 6, &this->unk_32C);
SubS_ChangeAnimationBySpeedInfo(&this->skelAnime, sAnimations, EN_DNO_ANIM_PRAYER_LOOP,
&this->animIndex);
}
break;
}
@ -501,7 +552,7 @@ void func_80A71F18(EnDno* this, PlayState* play) {
void func_80A72438(EnDno* this, PlayState* play) {
this->unk_452 = 1;
SubS_ChangeAnimationBySpeedInfo(&this->skelAnime, sAnimations, 14, &this->unk_32C);
SubS_ChangeAnimationBySpeedInfo(&this->skelAnime, sAnimations, EN_DNO_ANIM_IDLE_WITH_CANDLE, &this->animIndex);
this->actor.textId = 0;
if (Flags_GetSwitch(play, EN_DNO_GET_RACE_STARTED_SWITCH_FLAG(&this->actor))) {
this->unk_454 = 1.0f;
@ -545,11 +596,13 @@ void func_80A725F8(EnDno* this, PlayState* play) {
case TEXT_STATE_NONE:
switch (this->unk_328) {
case 0:
if (this->unk_32C == 14) {
if (this->animIndex == EN_DNO_ANIM_IDLE_WITH_CANDLE) {
if (Math_ScaledStepToS(&this->actor.shape.rot.y, this->actor.yawTowardsPlayer, 0x2D8)) {
SubS_ChangeAnimationBySpeedInfo(&this->skelAnime, sAnimations, 5, &this->unk_32C);
SubS_ChangeAnimationBySpeedInfo(&this->skelAnime, sAnimations,
EN_DNO_ANIM_GREETING_WITH_CANDLE, &this->animIndex);
}
} else if ((this->unk_32C == 5) && Animation_OnFrame(&this->skelAnime, this->skelAnime.endFrame)) {
} else if ((this->animIndex == EN_DNO_ANIM_GREETING_WITH_CANDLE) &&
Animation_OnFrame(&this->skelAnime, this->skelAnime.endFrame)) {
if (Flags_GetSwitch(play, EN_DNO_GET_RACE_STARTED_SWITCH_FLAG(&this->actor))) {
Message_StartTextbox(play, 0x801, &this->actor);
} else if (Player_GetMask(play) == PLAYER_MASK_SCENTS) {
@ -557,7 +610,8 @@ void func_80A725F8(EnDno* this, PlayState* play) {
} else {
Message_StartTextbox(play, 0x800, &this->actor);
}
SubS_ChangeAnimationBySpeedInfo(&this->skelAnime, sAnimations, 14, &this->unk_32C);
SubS_ChangeAnimationBySpeedInfo(&this->skelAnime, sAnimations, EN_DNO_ANIM_IDLE_WITH_CANDLE,
&this->animIndex);
}
break;
@ -578,7 +632,7 @@ void func_80A725F8(EnDno* this, PlayState* play) {
case TEXT_STATE_CLOSING:
case TEXT_STATE_3:
if (((play->msgCtx.currentTextId == 0x800) || (play->msgCtx.currentTextId == 0x801)) &&
(this->unk_32C == 8)) {
(this->animIndex == EN_DNO_ANIM_OPEN_PARASOL)) {
Math_SmoothStepToF(&this->unk_454, 1.0f, 1.0f, 0.1f, 0.01f);
if (this->skelAnime.curFrame <= 23.0f) {
this->unk_452 = 3;
@ -592,7 +646,8 @@ void func_80A725F8(EnDno* this, PlayState* play) {
}
if (Animation_OnFrame(&this->skelAnime, this->skelAnime.endFrame)) {
SubS_ChangeAnimationBySpeedInfo(&this->skelAnime, sAnimations, 12, &this->unk_32C);
SubS_ChangeAnimationBySpeedInfo(&this->skelAnime, sAnimations,
EN_DNO_ANIM_TALK_WITH_PARSOL_AND_CANDLE, &this->animIndex);
Message_StartTextbox(play, 0x803, &this->actor);
}
}
@ -608,7 +663,8 @@ void func_80A725F8(EnDno* this, PlayState* play) {
play->msgCtx.msgMode = 0x44;
this->unk_452 = 1;
this->unk_454 = 0.0f;
SubS_ChangeAnimationBySpeedInfo(&this->skelAnime, sAnimations, 8, &this->unk_32C);
SubS_ChangeAnimationBySpeedInfo(&this->skelAnime, sAnimations, EN_DNO_ANIM_OPEN_PARASOL,
&this->animIndex);
}
break;
@ -632,15 +688,17 @@ void func_80A725F8(EnDno* this, PlayState* play) {
break;
case 0x804:
if (this->unk_32C == 14) {
if (this->animIndex == EN_DNO_ANIM_IDLE_WITH_CANDLE) {
if (Message_ShouldAdvance(play)) {
SubS_ChangeAnimationBySpeedInfo(&this->skelAnime, sAnimations, 5, &this->unk_32C);
SubS_ChangeAnimationBySpeedInfo(&this->skelAnime, sAnimations,
EN_DNO_ANIM_GREETING_WITH_CANDLE, &this->animIndex);
if (!(this->unk_3B0 & 0x40)) {
func_80A72CF8(this, play);
this->unk_3B0 |= 0x40;
}
}
} else if ((this->unk_32C == 5) && (this->skelAnime.curFrame == this->skelAnime.endFrame)) {
} else if ((this->animIndex == EN_DNO_ANIM_GREETING_WITH_CANDLE) &&
(this->skelAnime.curFrame == this->skelAnime.endFrame)) {
func_801477B4(play);
func_80A72438(this, play);
}
@ -661,7 +719,7 @@ void func_80A725F8(EnDno* this, PlayState* play) {
}
void func_80A72AE4(EnDno* this, PlayState* play) {
SubS_ChangeAnimationBySpeedInfo(&this->skelAnime, sAnimations, 0, &this->unk_32C);
SubS_ChangeAnimationBySpeedInfo(&this->skelAnime, sAnimations, EN_DNO_ANIM_START_RACE_START, &this->animIndex);
func_80A714B4(this, play);
this->actionFunc = func_80A72B3C;
}
@ -688,7 +746,7 @@ void func_80A72BA4(EnDno* this, PlayState* play) {
}
void func_80A72C04(EnDno* this, PlayState* play) {
SubS_ChangeAnimationBySpeedInfo(&this->skelAnime, sAnimations, 0, &this->unk_32C);
SubS_ChangeAnimationBySpeedInfo(&this->skelAnime, sAnimations, EN_DNO_ANIM_START_RACE_START, &this->animIndex);
this->actor.flags |= ACTOR_FLAG_8000000;
this->actor.flags &= ~(ACTOR_FLAG_1 | ACTOR_FLAG_8);
Math_Vec3f_Copy(&this->unk_334, &this->actor.world.pos);
@ -767,27 +825,26 @@ s32 EnDno_ActorPathing_Move(PlayState* play, ActorPathing* actorPath) {
}
void func_80A730A0(EnDno* this, PlayState* play) {
f32 temp_f10;
s32 phi_a2;
if (Animation_OnFrame(&this->skelAnime, this->skelAnime.endFrame)) {
phi_a2 = -1;
switch (this->unk_32C) {
case 0:
switch (this->animIndex) {
case EN_DNO_ANIM_START_RACE_START:
if (this->unk_44E >= 20) {
phi_a2 = 1;
phi_a2 = EN_DNO_ANIM_START_RACE_END;
} else {
this->unk_44E = 20;
}
break;
case 1:
phi_a2 = 2;
case EN_DNO_ANIM_START_RACE_END:
phi_a2 = EN_DNO_ANIM_FLY;
break;
}
if (phi_a2 >= 0) {
SubS_ChangeAnimationBySpeedInfo(&this->skelAnime, sAnimations, phi_a2, &this->unk_32C);
SubS_ChangeAnimationBySpeedInfo(&this->skelAnime, sAnimations, phi_a2, &this->animIndex);
}
}
@ -799,8 +856,7 @@ void func_80A730A0(EnDno* this, PlayState* play) {
this->actorPath.pointOffset.y = 0.0f;
this->actorPath.pointOffset.z = 0.0f;
Math_Vec3f_Copy(&this->actor.world.pos, &this->unk_334);
temp_f10 = (4.0f + Math_SinS(this->unk_3AE)) * Math_SinS(this->unk_3AC);
this->actor.world.pos.y += temp_f10;
this->actor.world.pos.y += Math_SinS(this->unk_3AC) * (4.0f + Math_SinS(this->unk_3AE));
this->unk_3AC += 4500;
this->unk_3AE += 1000;
this->actor.shape.rot.y = this->actor.yawTowardsPlayer;
@ -834,11 +890,12 @@ void func_80A732C8(EnDno* this, PlayState* play) {
if (Math_ScaledStepToS(&this->actor.world.rot.y, this->actor.yawTowardsPlayer, 0x71C)) {
this->unk_3B0 |= 4;
this->unk_44E = 3;
SubS_ChangeAnimationBySpeedInfo(&this->skelAnime, sAnimations, 7, &this->unk_32C);
SubS_ChangeAnimationBySpeedInfo(&this->skelAnime, sAnimations, EN_DNO_ANIM_CLOSE_PARASOL, &this->animIndex);
}
} else if (this->unk_44E == 3) {
if (Animation_OnFrame(&this->skelAnime, this->skelAnime.endFrame)) {
SubS_ChangeAnimationBySpeedInfo(&this->skelAnime, sAnimations, 14, &this->unk_32C);
SubS_ChangeAnimationBySpeedInfo(&this->skelAnime, sAnimations, EN_DNO_ANIM_IDLE_WITH_CANDLE,
&this->animIndex);
func_80A72438(this, play);
} else {
if (this->skelAnime.curFrame >= 20.0f) {
@ -880,15 +937,16 @@ void func_80A73408(EnDno* this, PlayState* play) {
}
if (sp33) {
SubS_ChangeAnimationBySpeedInfo(&this->skelAnime, sAnimations, phi_a2, &this->unk_32C);
SubS_ChangeAnimationBySpeedInfo(&this->skelAnime, sAnimations, phi_a2, &this->animIndex);
}
}
Cutscene_ActorTranslateAndYaw(&this->actor, play, temp_v0);
}
if ((Animation_OnFrame(&this->skelAnime, this->skelAnime.endFrame)) && (this->unk_32C == 17)) {
if ((Animation_OnFrame(&this->skelAnime, this->skelAnime.endFrame)) &&
(this->animIndex == EN_DNO_ANIM_SHOCK_START)) {
if (0) {};
SubS_ChangeAnimationBySpeedInfo(&this->skelAnime, sAnimations, 18, &this->unk_32C);
SubS_ChangeAnimationBySpeedInfo(&this->skelAnime, sAnimations, EN_DNO_ANIM_SHOCK_LOOP, &this->animIndex);
}
}
@ -982,7 +1040,7 @@ void EnDno_PostLimbDraw(PlayState* play, s32 limbIndex, Gfx** dList, Vec3s* rot,
gSPMatrix(gfxOpa, Matrix_NewMtx(play->state.gfxCtx), G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW);
gSPDisplayList(&gfxOpa[1], *dList);
POLY_OPA_DISP = gfxOpa + 2;
POLY_OPA_DISP = &gfxOpa[2];
CLOSE_DISPS(play->state.gfxCtx);
}
@ -1007,7 +1065,7 @@ void EnDno_PostLimbDraw(PlayState* play, s32 limbIndex, Gfx** dList, Vec3s* rot,
gDPSetEnvColor(&gfxXlu[3], 255, 0, 0, 0);
gSPDisplayList(&gfxXlu[4], gEffFire1DL);
POLY_XLU_DISP = gfxXlu + 5;
POLY_XLU_DISP = &gfxXlu[5];
Matrix_Pop();

7
src/overlays/actors/ovl_En_Dno/z_en_dno.h
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;