mirror of https://github.com/zeldaret/mm.git
Document Deku Flower objects and other Obj_Etcetera-related cleanup (#544)
* Document Deku Flower objects * Fix warnings, whoops * Respond to Elliptic's review * Better formatting * Small typo fix
This commit is contained in:
Tom Overton
GitHub
parent
92302fa6d6
commit
9c682e5e52
|
|
@ -766,59 +766,62 @@
|
|||
<PlayerAnimation Name="gameplay_keep_Linkanim_00E4E8" Offset="0xE4E8" />
|
||||
<PlayerAnimation Name="gameplay_keep_Linkanim_00E4F0" Offset="0xE4F0" />
|
||||
<DList Name="gameplay_keep_DL_00E5C0" Offset="0xE5C0" />
|
||||
<Collision Name="gameplay_keep_Colheader_00E710" Offset="0xE710" />
|
||||
<Animation Name="gameplay_keep_Anim_00EB7C" Offset="0xEB7C" />
|
||||
<DList Name="gameplay_keep_DL_00ED80" Offset="0xED80" />
|
||||
<DList Name="gameplay_keep_DL_00F2B8" Offset="0xF2B8" />
|
||||
<DList Name="gameplay_keep_DL_00F350" Offset="0xF350" />
|
||||
<DList Name="gameplay_keep_DL_00F438" Offset="0xF438" />
|
||||
<DList Name="gameplay_keep_DL_00F4C0" Offset="0xF4C0" />
|
||||
<DList Name="gameplay_keep_DL_00F548" Offset="0xF548" />
|
||||
<DList Name="gameplay_keep_DL_00F5D0" Offset="0xF5D0" />
|
||||
<DList Name="gameplay_keep_DL_00F658" Offset="0xF658" />
|
||||
<DList Name="gameplay_keep_DL_00F6E0" Offset="0xF6E0" />
|
||||
<DList Name="gameplay_keep_DL_00F768" Offset="0xF768" />
|
||||
<DList Name="gameplay_keep_DL_00F7F0" Offset="0xF7F0" />
|
||||
<Texture Name="gameplay_keep_Tex_00F878" OutName="tex_00F878" Format="rgba16" Width="16" Height="32" Offset="0xF878" />
|
||||
<Texture Name="gameplay_keep_Tex_00FC78" OutName="tex_00FC78" Format="rgba16" Width="16" Height="32" Offset="0xFC78" />
|
||||
<Texture Name="gameplay_keep_Tex_010078" OutName="tex_010078" Format="rgba16" Width="32" Height="32" Offset="0x10078" />
|
||||
<Texture Name="gameplay_keep_Tex_010878" OutName="tex_010878" Format="rgba16" Width="16" Height="32" Offset="0x10878" />
|
||||
<Texture Name="gameplay_keep_Tex_010C78" OutName="tex_010C78" Format="rgba16" Width="32" Height="32" Offset="0x10C78" />
|
||||
<Limb Name="gameplay_keep_Standardlimb_011478" Type="Standard" Offset="0x11478" />
|
||||
<Limb Name="gameplay_keep_Standardlimb_011484" Type="Standard" Offset="0x11484" />
|
||||
<Limb Name="gameplay_keep_Standardlimb_011490" Type="Standard" Offset="0x11490" />
|
||||
<Limb Name="gameplay_keep_Standardlimb_01149C" Type="Standard" Offset="0x1149C" />
|
||||
<Limb Name="gameplay_keep_Standardlimb_0114A8" Type="Standard" Offset="0x114A8" />
|
||||
<Limb Name="gameplay_keep_Standardlimb_0114B4" Type="Standard" Offset="0x114B4" />
|
||||
<Limb Name="gameplay_keep_Standardlimb_0114C0" Type="Standard" Offset="0x114C0" />
|
||||
<Limb Name="gameplay_keep_Standardlimb_0114CC" Type="Standard" Offset="0x114CC" />
|
||||
<Limb Name="gameplay_keep_Standardlimb_0114D8" Type="Standard" Offset="0x114D8" />
|
||||
<Limb Name="gameplay_keep_Standardlimb_0114E4" Type="Standard" Offset="0x114E4" />
|
||||
<Skeleton Name="gameplay_keep_Skel_011518" Type="Normal" LimbType="Standard" Offset="0x11518" />
|
||||
<Animation Name="gameplay_keep_Anim_0117A8" Offset="0x117A8" />
|
||||
<Collision Name="gameplay_keep_Colheader_0118D8" Offset="0x118D8" />
|
||||
<DList Name="gameplay_keep_DL_011BD0" Offset="0x11BD0" />
|
||||
<DList Name="gameplay_keep_DL_0121B0" Offset="0x121B0" />
|
||||
<DList Name="gameplay_keep_DL_012260" Offset="0x12260" />
|
||||
<DList Name="gameplay_keep_DL_012308" Offset="0x12308" />
|
||||
<DList Name="gameplay_keep_DL_012390" Offset="0x12390" />
|
||||
<DList Name="gameplay_keep_DL_012418" Offset="0x12418" />
|
||||
<DList Name="gameplay_keep_DL_0124A0" Offset="0x124A0" />
|
||||
<DList Name="gameplay_keep_DL_012528" Offset="0x12528" />
|
||||
<DList Name="gameplay_keep_DL_0125B0" Offset="0x125B0" />
|
||||
<DList Name="gameplay_keep_DL_012638" Offset="0x12638" />
|
||||
<DList Name="gameplay_keep_DL_0126C0" Offset="0x126C0" />
|
||||
<Limb Name="gameplay_keep_Standardlimb_012748" Type="Standard" Offset="0x12748" />
|
||||
<Limb Name="gameplay_keep_Standardlimb_012754" Type="Standard" Offset="0x12754" />
|
||||
<Limb Name="gameplay_keep_Standardlimb_012760" Type="Standard" Offset="0x12760" />
|
||||
<Limb Name="gameplay_keep_Standardlimb_01276C" Type="Standard" Offset="0x1276C" />
|
||||
<Limb Name="gameplay_keep_Standardlimb_012778" Type="Standard" Offset="0x12778" />
|
||||
<Limb Name="gameplay_keep_Standardlimb_012784" Type="Standard" Offset="0x12784" />
|
||||
<Limb Name="gameplay_keep_Standardlimb_012790" Type="Standard" Offset="0x12790" />
|
||||
<Limb Name="gameplay_keep_Standardlimb_01279C" Type="Standard" Offset="0x1279C" />
|
||||
<Limb Name="gameplay_keep_Standardlimb_0127A8" Type="Standard" Offset="0x127A8" />
|
||||
<Limb Name="gameplay_keep_Standardlimb_0127B4" Type="Standard" Offset="0x127B4" />
|
||||
<Skeleton Name="gameplay_keep_Skel_0127E8" Type="Flex" LimbType="Standard" Offset="0x127E8" />
|
||||
|
||||
<!-- Deku Flower -->
|
||||
<Collision Name="gPinkDekuFlowerCol" Offset="0xE710" />
|
||||
<Animation Name="gDekuFlowerBounceAnim" Offset="0xEB7C" /> <!-- Original name is "dnp_boyoyon" ("bounce") -->
|
||||
<DList Name="gPinkDekuFlowerIdleDL" Offset="0xED80" />
|
||||
<DList Name="gPinkDekuFlowerBaseDL" Offset="0xF2B8" />
|
||||
<DList Name="gPinkDekuFlowerCenterDL" Offset="0xF350" />
|
||||
<DList Name="gPinkDekuFlowerBackLeftPetalDL" Offset="0xF438" />
|
||||
<DList Name="gPinkDekuFlowerLeftLeafDL" Offset="0xF4C0" />
|
||||
<DList Name="gPinkDekuFlowerFrontLeftPetalDL" Offset="0xF548" />
|
||||
<DList Name="gPinkDekuFlowerRightLeafDL" Offset="0xF5D0" />
|
||||
<DList Name="gPinkDekuFlowerBackRightPetalDL" Offset="0xF658" />
|
||||
<DList Name="gPinkDekuFlowerFrontRightPetalDL" Offset="0xF6E0" />
|
||||
<DList Name="gPinkDekuFlowerFrontLeafDL" Offset="0xF768" />
|
||||
<DList Name="gPinkDekuFlowerBackLeafDL" Offset="0xF7F0" />
|
||||
<Texture Name="gPinkDekuFlowerPetalAndCenterTex" OutName="pink_deku_flower_petal_and_center" Format="rgba16" Width="16" Height="32" Offset="0xF878" />
|
||||
<Texture Name="gPinkDekuFlowerLeafAndCenterTex" OutName="pink_deku_flower_leaf_and_center" Format="rgba16" Width="16" Height="32" Offset="0xFC78" />
|
||||
<Texture Name="gPinkDekuFlowerBaseLeafTex" OutName="pink_deku_flower_base_leaf" Format="rgba16" Width="32" Height="32" Offset="0x10078" />
|
||||
<Texture Name="gGoldDekuFlowerPetalAndCenterTex" OutName="gold_deku_flower_petal_and_center" Format="rgba16" Width="16" Height="32" Offset="0x10878" />
|
||||
<Texture Name="gGoldDekuFlowerBaseLeafTex" OutName="gold_deku_flower_base_leaf" Format="rgba16" Width="32" Height="32" Offset="0x10C78" />
|
||||
<Limb Name="gPinkDekuFlowerBaseLimb" Type="Standard" Offset="0x11478" />
|
||||
<Limb Name="gPinkDekuFlowerCenterLimb" Type="Standard" Offset="0x11484" />
|
||||
<Limb Name="gPinkDekuFlowerBackLeafLimb" Type="Standard" Offset="0x11490" />
|
||||
<Limb Name="gPinkDekuFlowerFrontLeafLimb" Type="Standard" Offset="0x1149C" />
|
||||
<Limb Name="gPinkDekuFlowerFrontRightPetalLimb" Type="Standard" Offset="0x114A8" />
|
||||
<Limb Name="gPinkDekuFlowerBackRightPetalLimb" Type="Standard" Offset="0x114B4" />
|
||||
<Limb Name="gPinkDekuFlowerRightLeafLimb" Type="Standard" Offset="0x114C0" />
|
||||
<Limb Name="gPinkDekuFlowerFrontLeftPetalLimb" Type="Standard" Offset="0x114CC" />
|
||||
<Limb Name="gPinkDekuFlowerLeftLeafLimb" Type="Standard" Offset="0x114D8" />
|
||||
<Limb Name="gPinkDekuFlowerBackLeftPetalLimb" Type="Standard" Offset="0x114E4" />
|
||||
<Skeleton Name="gPinkDekuFlowerSkel" Type="Normal" LimbType="Standard" Offset="0x11518" />
|
||||
<Animation Name="gDekuFlowerRustleAnim" Offset="0x117A8" /> <!-- Original name is "dnp_zawa" ("rustling") -->
|
||||
<Collision Name="gGoldDekuFlowerCol" Offset="0x118D8" />
|
||||
<DList Name="gGoldDekuFlowerIdleDL" Offset="0x11BD0" />
|
||||
<DList Name="gGoldDekuFlowerBaseDL" Offset="0x121B0" />
|
||||
<DList Name="gGoldDekuFlowerCenterDL" Offset="0x12260" />
|
||||
<DList Name="gGoldDekuFlowerBackLeftPetalDL" Offset="0x12308" />
|
||||
<DList Name="gGoldDekuFlowerLeftPetalDL" Offset="0x12390" />
|
||||
<DList Name="gGoldDekuFlowerFrontLeftPetalDL" Offset="0x12418" />
|
||||
<DList Name="gGoldDekuFlowerRightPetalDL" Offset="0x124A0" />
|
||||
<DList Name="gGoldDekuFlowerBackRightPetalDL" Offset="0x12528" />
|
||||
<DList Name="gGoldDekuFlowerFrontRightPetalDL" Offset="0x125B0" />
|
||||
<DList Name="gGoldDekuFlowerFrontPetalDL" Offset="0x12638" />
|
||||
<DList Name="gGoldDekuFlowerBackPetalDL" Offset="0x126C0" />
|
||||
<Limb Name="gGoldDekuFlowerBaseLimb" Type="Standard" Offset="0x12748" />
|
||||
<Limb Name="gGoldDekuFlowerCenterLimb" Type="Standard" Offset="0x12754" />
|
||||
<Limb Name="gGoldDekuFlowerBackPetalLimb" Type="Standard" Offset="0x12760" />
|
||||
<Limb Name="gGoldDekuFlowerFrontPetalLimb" Type="Standard" Offset="0x1276C" />
|
||||
<Limb Name="gGoldDekuFlowerFrontRightPetalLimb" Type="Standard" Offset="0x12778" />
|
||||
<Limb Name="gGoldDekuFlowerBackRightPetalLimb" Type="Standard" Offset="0x12784" />
|
||||
<Limb Name="gGoldDekuFlowerRightPetalLimb" Type="Standard" Offset="0x12790" />
|
||||
<Limb Name="gGoldDekuFlowerFrontLeftPetalLimb" Type="Standard" Offset="0x1279C" />
|
||||
<Limb Name="gGoldDekuFlowerLeftPetalLimb" Type="Standard" Offset="0x127A8" />
|
||||
<Limb Name="gGoldDekuFlowerBackLeftPetalLimb" Type="Standard" Offset="0x127B4" />
|
||||
<Skeleton Name="gGoldDekuFlowerSkel" Type="Flex" LimbType="Standard" Offset="0x127E8" />
|
||||
|
||||
<Animation Name="gameplay_keep_Anim_012860" Offset="0x12860" />
|
||||
<Animation Name="gameplay_keep_Anim_0128BC" Offset="0x128BC" />
|
||||
<Texture Name="gameplay_keep_Tex_0128D0" OutName="tex_0128D0" Format="rgba16" Width="16" Height="128" Offset="0x128D0" />
|
||||
|
|
|
|||
|
|
@ -3866,14 +3866,6 @@ extern UNK_TYPE D_0400E3D8;
|
|||
extern UNK_TYPE D_0400E408;
|
||||
extern UNK_TYPE D_0400E410;
|
||||
extern UNK_TYPE D_0400E418;
|
||||
extern CollisionHeader D_0400E710; // Pink Deku Flower collision
|
||||
extern AnimationHeader D_0400EB7C; // Deku Flower intense flutter animation
|
||||
extern Gfx D_0400ED80; // Pink Deku Flower display list
|
||||
extern SkeletonHeader D_04011518; // Pink Deku Flower skeleton
|
||||
extern AnimationHeader D_040117A8; // Deku Flower small flutter animation
|
||||
extern CollisionHeader D_040118D8; // Gold Deku Flower collision
|
||||
extern Gfx D_04011BD0; // Gold Deku Flower display list
|
||||
extern SkeletonHeader D_040127E8; // Gold Deku Flower skeleton
|
||||
extern UNK_TYPE D_04012860;
|
||||
extern UNK_TYPE D_040128BC;
|
||||
extern u64 D_04014570[];
|
||||
|
|
|
|||
|
|
@ -5,6 +5,7 @@
|
|||
*/
|
||||
|
||||
#include "z_obj_etcetera.h"
|
||||
#include "objects/gameplay_keep/gameplay_keep.h"
|
||||
|
||||
#define FLAGS 0x00000010
|
||||
|
||||
|
|
@ -14,8 +15,8 @@ void ObjEtcetera_Init(Actor* thisx, GlobalContext* globalCtx);
|
|||
void ObjEtcetera_Destroy(Actor* thisx, GlobalContext* globalCtx);
|
||||
void ObjEtcetera_Update(Actor* thisx, GlobalContext* globalCtx);
|
||||
|
||||
void ObjEtcetera_PlaySmallFlutterAnimation(ObjEtcetera* this, GlobalContext* globalCtx);
|
||||
void ObjEtcetera_DoIntenseOscillation(ObjEtcetera* this, GlobalContext* globalCtx);
|
||||
void ObjEtcetera_PlayRustleAnimation(ObjEtcetera* this, GlobalContext* globalCtx);
|
||||
void ObjEtcetera_DoBounceOscillation(ObjEtcetera* this, GlobalContext* globalCtx);
|
||||
void ObjEtcetera_Setup(ObjEtcetera* this, GlobalContext* globalCtx);
|
||||
void ObjEtcetera_DrawIdle(Actor* thisx, GlobalContext* globalCtx);
|
||||
void ObjEtcetera_DrawAnimated(Actor* thisx, GlobalContext* globalCtx);
|
||||
|
|
@ -105,6 +106,11 @@ void ObjEtcetera_Destroy(Actor* thisx, GlobalContext* globalCtx) {
|
|||
Collider_DestroyCylinder(globalCtx, &this->collider);
|
||||
}
|
||||
|
||||
/**
|
||||
* This function will make the flower oscillate on the X and Z axes in most situations
|
||||
* where something interacts with it. When the player launches out of the flower, the
|
||||
* oscillation is handled by ObjEtcetera_DoBounceOscillation instead.
|
||||
*/
|
||||
void ObjEtcetera_DoNormalOscillation(ObjEtcetera* this, GlobalContext* globalCtx) {
|
||||
if (this->oscillationTimer > 0) {
|
||||
s32 requiredScopeTemp;
|
||||
|
|
@ -119,10 +125,11 @@ void ObjEtcetera_DoNormalOscillation(ObjEtcetera* this, GlobalContext* globalCtx
|
|||
}
|
||||
}
|
||||
|
||||
void ObjEtcetera_StartSmallFlutterAnimation(ObjEtcetera* this) {
|
||||
Animation_Change(&this->skelAnime, &D_040117A8, 1.0f, 0.0f, Animation_GetLastFrame(&D_040117A8), 2, 0.0f);
|
||||
void ObjEtcetera_StartRustleAnimation(ObjEtcetera* this) {
|
||||
Animation_Change(&this->skelAnime, &gDekuFlowerRustleAnim, 1.0f, 0.0f,
|
||||
Animation_GetLastFrame(&gDekuFlowerRustleAnim), 2, 0.0f);
|
||||
this->dyna.actor.draw = ObjEtcetera_DrawAnimated;
|
||||
this->actionFunc = ObjEtcetera_PlaySmallFlutterAnimation;
|
||||
this->actionFunc = ObjEtcetera_PlayRustleAnimation;
|
||||
}
|
||||
|
||||
void ObjEtcetera_Idle(ObjEtcetera* this, GlobalContext* globalCtx) {
|
||||
|
|
@ -131,12 +138,13 @@ void ObjEtcetera_Idle(ObjEtcetera* this, GlobalContext* globalCtx) {
|
|||
|
||||
if ((player->stateFlags3 & 0x200) && (this->dyna.actor.xzDistToPlayer < 20.0f)) {
|
||||
// Player is launching out of the Deku Flower
|
||||
Animation_Change(&this->skelAnime, &D_0400EB7C, 1.0f, 0.0f, Animation_GetLastFrame(&D_0400EB7C), 2, 0.0f);
|
||||
Animation_Change(&this->skelAnime, &gDekuFlowerBounceAnim, 1.0f, 0.0f,
|
||||
Animation_GetLastFrame(&gDekuFlowerBounceAnim), 2, 0.0f);
|
||||
this->dyna.actor.draw = ObjEtcetera_DrawAnimated;
|
||||
this->actionFunc = ObjEtcetera_DoIntenseOscillation;
|
||||
this->actionFunc = ObjEtcetera_DoBounceOscillation;
|
||||
Actor_SetScale(&this->dyna.actor, 0.01f);
|
||||
this->dyna.actor.scale.y = 0.02f;
|
||||
this->intenseOscillationScale = 0.003f;
|
||||
this->bounceOscillationScale = 0.003f;
|
||||
this->oscillationTimer = 30;
|
||||
this->burrowFlag &= ~1;
|
||||
} else if ((player->stateFlags3 & 0x2000) && (this->dyna.actor.xzDistToPlayer < 30.0f) &&
|
||||
|
|
@ -151,7 +159,7 @@ void ObjEtcetera_Idle(ObjEtcetera* this, GlobalContext* globalCtx) {
|
|||
if (!(this->burrowFlag & 1)) {
|
||||
// Player is walking onto the Deku Flower, or falling on it from a height
|
||||
this->oscillationTimer = 10;
|
||||
ObjEtcetera_StartSmallFlutterAnimation(this);
|
||||
ObjEtcetera_StartRustleAnimation(this);
|
||||
} else if ((player->actor.speedXZ > 0.1f) || ((player->unk_ABC < 0.0f) && !(player->stateFlags3 & 0x100))) {
|
||||
// Player is walking on top of the Deku Flower, is at the very start of burrowing, or is at the very
|
||||
// start of launching
|
||||
|
|
@ -162,19 +170,19 @@ void ObjEtcetera_Idle(ObjEtcetera* this, GlobalContext* globalCtx) {
|
|||
if (this->burrowFlag & 1) {
|
||||
// Player is walking off the Deku Flower
|
||||
this->oscillationTimer = 10;
|
||||
ObjEtcetera_StartSmallFlutterAnimation(this);
|
||||
ObjEtcetera_StartRustleAnimation(this);
|
||||
}
|
||||
this->burrowFlag &= ~1;
|
||||
}
|
||||
}
|
||||
if ((this->collider.base.acFlags & AC_HIT)) {
|
||||
this->oscillationTimer = 10;
|
||||
ObjEtcetera_StartSmallFlutterAnimation(this);
|
||||
ObjEtcetera_StartRustleAnimation(this);
|
||||
}
|
||||
ObjEtcetera_DoNormalOscillation(this, globalCtx);
|
||||
}
|
||||
|
||||
void ObjEtcetera_PlaySmallFlutterAnimation(ObjEtcetera* this, GlobalContext* globalCtx) {
|
||||
void ObjEtcetera_PlayRustleAnimation(ObjEtcetera* this, GlobalContext* globalCtx) {
|
||||
if (DynaPolyActor_IsInRidingMovingState(&this->dyna)) {
|
||||
this->burrowFlag |= 1;
|
||||
} else {
|
||||
|
|
@ -187,7 +195,12 @@ void ObjEtcetera_PlaySmallFlutterAnimation(ObjEtcetera* this, GlobalContext* glo
|
|||
ObjEtcetera_DoNormalOscillation(this, globalCtx);
|
||||
}
|
||||
|
||||
void ObjEtcetera_DoIntenseOscillation(ObjEtcetera* this, GlobalContext* globalCtx) {
|
||||
/**
|
||||
* When the bounce animation plays (either because the player launched out of the flower,
|
||||
* or because the flower spawned after killing a Mad Scrub), this function makes the
|
||||
* flower oscillate stronger than it normally does, including an oscillation on the Y-axis.
|
||||
*/
|
||||
void ObjEtcetera_DoBounceOscillation(ObjEtcetera* this, GlobalContext* globalCtx) {
|
||||
// In order to match, we are seemingly required to access scale.x at one point
|
||||
// without using this. We can create a thisx or dyna pointer to achieve that, but
|
||||
// it's more likely they used dyna given that DynaPolyActor_IsInRidingMovingState takes a DynaPolyActor.
|
||||
|
|
@ -208,12 +221,12 @@ void ObjEtcetera_DoIntenseOscillation(ObjEtcetera* this, GlobalContext* globalCt
|
|||
Actor_SetScale(&this->dyna.actor, 0.01f);
|
||||
this->dyna.actor.scale.y = 0.02f;
|
||||
this->oscillationTimer = 0;
|
||||
this->intenseOscillationScale = 0.0f;
|
||||
this->bounceOscillationScale = 0.0f;
|
||||
return;
|
||||
}
|
||||
this->intenseOscillationScale *= 0.8f;
|
||||
this->intenseOscillationScale -= (this->dyna.actor.scale.x - 0.01f) * 0.4f;
|
||||
scaleTemp = dyna->actor.scale.x + this->intenseOscillationScale;
|
||||
this->bounceOscillationScale *= 0.8f;
|
||||
this->bounceOscillationScale -= (this->dyna.actor.scale.x - 0.01f) * 0.4f;
|
||||
scaleTemp = dyna->actor.scale.x + this->bounceOscillationScale;
|
||||
Actor_SetScale(&this->dyna.actor, scaleTemp);
|
||||
this->dyna.actor.scale.y = 2.0f * scaleTemp;
|
||||
}
|
||||
|
|
@ -221,7 +234,12 @@ void ObjEtcetera_DoIntenseOscillation(ObjEtcetera* this, GlobalContext* globalCt
|
|||
void ObjEtcetera_Setup(ObjEtcetera* this, GlobalContext* globalCtx) {
|
||||
CollisionHeader* colHeader = NULL;
|
||||
s32 type;
|
||||
CollisionHeader* collisionHeaders[] = { &D_0400E710, &D_0400E710, &D_040118D8, &D_040118D8 };
|
||||
CollisionHeader* collisionHeaders[] = {
|
||||
&gPinkDekuFlowerCol,
|
||||
&gPinkDekuFlowerCol,
|
||||
&gGoldDekuFlowerCol,
|
||||
&gGoldDekuFlowerCol,
|
||||
};
|
||||
s32 pad;
|
||||
CollisionHeader* thisCollisionHeader;
|
||||
|
||||
|
|
@ -244,15 +262,15 @@ void ObjEtcetera_Setup(ObjEtcetera* this, GlobalContext* globalCtx) {
|
|||
switch (type) {
|
||||
case DEKU_FLOWER_TYPE_PINK:
|
||||
case DEKU_FLOWER_TYPE_PINK_SPAWNED_FROM_MAD_SCRUB:
|
||||
SkelAnime_Init(globalCtx, &this->skelAnime, &D_04011518, &D_0400EB7C, this->jointTable,
|
||||
this->morphTable, 11);
|
||||
this->dList = &D_0400ED80;
|
||||
SkelAnime_Init(globalCtx, &this->skelAnime, &gPinkDekuFlowerSkel, &gDekuFlowerBounceAnim,
|
||||
this->jointTable, this->morphTable, DEKU_FLOWER_LIMB_MAX);
|
||||
this->dList = gPinkDekuFlowerIdleDL;
|
||||
break;
|
||||
case DEKU_FLOWER_TYPE_GOLD:
|
||||
case DEKU_FLOWER_TYPE_GOLD_SPAWNED_FROM_MAD_SCRUB:
|
||||
this->dList = &D_04011BD0;
|
||||
SkelAnime_Init(globalCtx, &this->skelAnime, &D_040127E8, &D_0400EB7C, this->jointTable,
|
||||
this->morphTable, 11);
|
||||
this->dList = gGoldDekuFlowerIdleDL;
|
||||
SkelAnime_Init(globalCtx, &this->skelAnime, &gGoldDekuFlowerSkel.sh, &gDekuFlowerBounceAnim,
|
||||
this->jointTable, this->morphTable, DEKU_FLOWER_LIMB_MAX);
|
||||
this->collider.dim.height = 20;
|
||||
break;
|
||||
}
|
||||
|
|
@ -270,13 +288,13 @@ void ObjEtcetera_Setup(ObjEtcetera* this, GlobalContext* globalCtx) {
|
|||
break;
|
||||
case DEKU_FLOWER_TYPE_PINK_SPAWNED_FROM_MAD_SCRUB:
|
||||
case DEKU_FLOWER_TYPE_GOLD_SPAWNED_FROM_MAD_SCRUB:
|
||||
Animation_Change(&this->skelAnime, &D_0400EB7C, 1.0f, 0.0f, Animation_GetLastFrame(&D_0400EB7C), 2,
|
||||
0.0f);
|
||||
Animation_Change(&this->skelAnime, &gDekuFlowerBounceAnim, 1.0f, 0.0f,
|
||||
Animation_GetLastFrame(&gDekuFlowerBounceAnim), 2, 0.0f);
|
||||
this->dyna.actor.draw = ObjEtcetera_DrawAnimated;
|
||||
this->actionFunc = ObjEtcetera_DoIntenseOscillation;
|
||||
this->actionFunc = ObjEtcetera_DoBounceOscillation;
|
||||
Actor_SetScale(&this->dyna.actor, 0.0f);
|
||||
this->oscillationTimer = 30;
|
||||
this->intenseOscillationScale = 0.0f;
|
||||
this->bounceOscillationScale = 0.0f;
|
||||
this->dyna.actor.focus.pos.y = this->dyna.actor.home.pos.y + 10.0f;
|
||||
this->dyna.actor.targetMode = 3;
|
||||
break;
|
||||
|
|
@ -299,6 +317,11 @@ void ObjEtcetera_Update(Actor* thisx, GlobalContext* globalCtx) {
|
|||
CollisionCheck_SetAC(globalCtx, &globalCtx->colChkCtx, &this->collider.base);
|
||||
}
|
||||
|
||||
/**
|
||||
* When the flower isn't animating, this function is used to draw it.
|
||||
* It draws the flower as a single, non-moving display list that encompasses the whole flower.
|
||||
* When an animation is finished, functions are expected to set the actor's draw function to this.
|
||||
*/
|
||||
void ObjEtcetera_DrawIdle(Actor* thisx, GlobalContext* globalCtx) {
|
||||
ObjEtcetera* this = THIS;
|
||||
|
||||
|
|
@ -311,6 +334,11 @@ void ObjEtcetera_DrawIdle(Actor* thisx, GlobalContext* globalCtx) {
|
|||
CLOSE_DISPS(globalCtx->state.gfxCtx);
|
||||
}
|
||||
|
||||
/**
|
||||
* When the flower is animating, this function is used to draw it.
|
||||
* It draws the flower as an animated bunch of limbs using the SkelAnime system.
|
||||
* When a function wants to play an animation, it is expected to set the actor's draw function to this.
|
||||
*/
|
||||
void ObjEtcetera_DrawAnimated(Actor* thisx, GlobalContext* globalCtx) {
|
||||
ObjEtcetera* this = THIS;
|
||||
|
||||
|
|
|
|||
|
|
@ -13,6 +13,26 @@ typedef enum {
|
|||
/* 4 */ DEKU_FLOWER_TYPE_MAX,
|
||||
} DekuFlowerType;
|
||||
|
||||
/**
|
||||
* For the petal/leaf directions, "back" is negative and "front" is positive
|
||||
* on the flower's local Z-axis. "Left" and "right" are relative to the front
|
||||
* and back.
|
||||
*/
|
||||
typedef enum {
|
||||
/* 0 */ DEKU_FLOWER_LIMB_NONE,
|
||||
/* 1 */ DEKU_FLOWER_LIMB_BASE,
|
||||
/* 2 */ DEKU_FLOWER_LIMB_CENTER,
|
||||
/* 3 */ DEKU_FLOWER_LIMB_BACK_PETAL_OR_LEAF,
|
||||
/* 4 */ DEKU_FLOWER_LIMB_FRONT_PETAL_OR_LEAF,
|
||||
/* 5 */ DEKU_FLOWER_LIMB_FRONT_RIGHT_PETAL,
|
||||
/* 6 */ DEKU_FLOWER_LIMB_BACK_RIGHT_PETAL,
|
||||
/* 7 */ DEKU_FLOWER_LIMB_RIGHT_PETAL_OR_LEAF,
|
||||
/* 8 */ DEKU_FLOWER_LIMB_FRONT_LEFT_PETAL,
|
||||
/* 9 */ DEKU_FLOWER_LIMB_LEFT_PETAL_OR_LEAF,
|
||||
/* 10 */ DEKU_FLOWER_LIMB_BACK_LEFT_PETAL,
|
||||
/* 11 */ DEKU_FLOWER_LIMB_MAX,
|
||||
} DekuFlowerLimbs;
|
||||
|
||||
struct ObjEtcetera;
|
||||
|
||||
typedef void (*ObjEtceteraActionFunc)(struct ObjEtcetera*, GlobalContext*);
|
||||
|
|
@ -21,9 +41,9 @@ typedef struct ObjEtcetera {
|
|||
/* 0x000 */ DynaPolyActor dyna;
|
||||
/* 0x15C */ SkelAnime skelAnime;
|
||||
/* 0x1A0 */ ColliderCylinder collider;
|
||||
/* 0x1EC */ Vec3s jointTable[11];
|
||||
/* 0x22E */ Vec3s morphTable[11];
|
||||
/* 0x270 */ f32 intenseOscillationScale;
|
||||
/* 0x1EC */ Vec3s jointTable[DEKU_FLOWER_LIMB_MAX];
|
||||
/* 0x22E */ Vec3s morphTable[DEKU_FLOWER_LIMB_MAX];
|
||||
/* 0x270 */ f32 bounceOscillationScale;
|
||||
/* 0x274 */ s16 oscillationTimer;
|
||||
/* 0x276 */ u16 burrowFlag;
|
||||
/* 0x278 */ s8 objIndex;
|
||||
|
|
|
|||
|
|
@ -11100,10 +11100,10 @@
|
|||
0x80A7BC70:("ObjEtcetera_Init",),
|
||||
0x80A7BD80:("ObjEtcetera_Destroy",),
|
||||
0x80A7BDC8:("ObjEtcetera_DoNormalOscillation",),
|
||||
0x80A7BE8C:("ObjEtcetera_StartSmallFlutterAnimation",),
|
||||
0x80A7BE8C:("ObjEtcetera_StartRustleAnimation",),
|
||||
0x80A7BF08:("ObjEtcetera_Idle",),
|
||||
0x80A7C168:("ObjEtcetera_PlaySmallFlutterAnimation",),
|
||||
0x80A7C1F0:("ObjEtcetera_DoIntenseOscillation",),
|
||||
0x80A7C168:("ObjEtcetera_PlayRustleAnimation",),
|
||||
0x80A7C1F0:("ObjEtcetera_DoBounceOscillation",),
|
||||
0x80A7C308:("ObjEtcetera_Setup",),
|
||||
0x80A7C5EC:("ObjEtcetera_Update",),
|
||||
0x80A7C690:("ObjEtcetera_DrawIdle",),
|
||||
|
|
|
|||
Loading…
Reference in New Issue