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

Document the boulder fragments in gameplay_keep and clean up En_Baguo (#574) 

* Document the boulder fragments in gameplay_keep and clean up En_Baguo

* Remove the boulder fragment from variables.h

* Run ./format.sh

* Move limb enum to object
This commit is contained in:
Tom Overton 2022-01-30 12:47:00 -08:00 committed by GitHub
parent 4543b5ade6
commit 50a9df7804
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
4 changed files with 82 additions and 66 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
assets/xml/objects/gameplay_keep.xml
View File

@ -873,8 +873,11 @@
<Texture Name="gameplay_keep_Tex_01F740" OutName="tex_01F740" Format="ia4" Width="16" Height="16" Offset="0x1F740" />
<Texture Name="gameplay_keep_Tex_01F7C0" OutName="tex_01F7C0" Format="ia8" Width="16" Height="16" Offset="0x1F7C0" />
<Texture Name="gameplay_keep_Tex_01F8C0" OutName="tex_01F8C0" Format="ia8" Width="16" Height="24" Offset="0x1F8C0" />
<DList Name="gameplay_keep_DL_01FA40" Offset="0x1FA40" />
<Texture Name="gameplay_keep_Tex_01FBE0" OutName="tex_01FBE0" Format="rgba16" Width="32" Height="32" Offset="0x1FBE0" />
<!-- Boulder Fragments -->
<DList Name="gBoulderFragmentsDL" Offset="0x1FA40" />
<Texture Name="gBoulderFragmentsTex" OutName="boulder_fragments" Format="rgba16" Width="32" Height="32" Offset="0x1FBE0" />
<Animation Name="gameplay_keep_Anim_0204B4" Offset="0x204B4" />
<Animation Name="gameplay_keep_Anim_0205A0" Offset="0x205A0" />
<Animation Name="gameplay_keep_Anim_020658" Offset="0x20658" />

6
assets/xml/objects/object_gmo.xml
View File

@ -9,8 +9,8 @@
<Texture Name="gNejironEyeOpenTex" OutName="nejiron_eye_open" Format="rgba16" Width="16" Height="32" Offset="0x14C8" />
<Texture Name="gNejironEyeHalfTex" OutName="nejiron_eye_half" Format="rgba16" Width="16" Height="32" Offset="0x18C8" />
<Texture Name="gNejironEyeClosedTex" OutName="nejiron_eye_closed" Format="rgba16" Width="16" Height="32" Offset="0x1CC8" />
<Limb Name="gNejironBodyLimb" Type="Standard" Offset="0x20C8" />
<Limb Name="gNejironEyeLimb" Type="Standard" Offset="0x20D4" />
<Skeleton Name="gNejironSkel" Type="Normal" LimbType="Standard" Offset="0x20E8" />
<Limb Name="gNejironBodyLimb" Type="Standard" EnumName="NEJIRON_LIMB_BODY" Offset="0x20C8" />
<Limb Name="gNejironEyeLimb" Type="Standard" EnumName="NEJIRON_LIMB_EYES" Offset="0x20D4" />
<Skeleton Name="gNejironSkel" Type="Normal" LimbType="Standard" LimbNone="NEJIRON_LIMB_NONE" LimbMax="NEJIRON_LIMB_MAX" EnumName="NejironLimbs" Offset="0x20E8" />
</File>
</Root>

113
src/overlays/actors/ovl_En_Baguo/z_en_baguo.c
View File

@ -5,7 +5,6 @@
*/
#include "z_en_baguo.h"
#include "objects/object_gmo/object_gmo.h"
#include "objects/gameplay_keep/gameplay_keep.h"
#define FLAGS 0x00000005
@ -28,6 +27,21 @@ void EnBaguo_InitializeParticle(EnBaguo* this, Vec3f* position, Vec3f* velocity,
void EnBaguo_UpdateParticles(EnBaguo* this, GlobalContext* globalCtx);
void EnBaguo_DrawRockParticles(EnBaguo* this, GlobalContext* globalCtx);
typedef enum {
/* 0x0 */ NEJIRON_ACTION_INACTIVE, // The Nejiron is either underground or emerging from underground
/* 0x1 */ NEJIRON_ACTION_ACTIVE, // The Nejiron is above ground and actively chasing the player
/* 0x2 */ NEJIRON_ACTION_RETREATING, // The Nejiron is burrowing back underground
/* 0x3 */ NEJIRON_ACTION_EXPLODING // The Nejiron has detonated
} NejironAction;
/**
* These directions are relative to the Nejiron.
*/
typedef enum {
/* 0x0 */ NEJIRON_DIRECTION_RIGHT,
/* 0x1 */ NEJIRON_DIRECTION_LEFT
} NejironRollDirection;
const ActorInit En_Baguo_InitVars = {
ACTOR_EN_BAGUO,
ACTORCAT_ENEMY,
@ -112,7 +126,8 @@ void EnBaguo_Init(Actor* thisx, GlobalContext* globalCtx) {
EnBaguo* this = THIS;
ActorShape_Init(&this->actor.shape, 0.0f, ActorShadow_DrawCircle, 0.0f);
SkelAnime_Init(globalCtx, &this->skelAnime, &gNejironSkel, NULL, this->jointTable, this->morphTable, 3);
SkelAnime_Init(globalCtx, &this->skelAnime, &gNejironSkel, NULL, this->jointTable, this->morphTable,
NEJIRON_LIMB_MAX);
this->actor.hintId = 0xB;
this->maxDistanceFromHome = 240.0f;
this->maxDistanceFromHome += this->actor.world.rot.z * 40.0f;
@ -120,12 +135,14 @@ void EnBaguo_Init(Actor* thisx, GlobalContext* globalCtx) {
Actor_SetScale(&this->actor, 0.01f);
this->actor.colChkInfo.mass = MASS_IMMOVABLE;
this->actor.targetMode = 2;
Collider_InitAndSetJntSph(globalCtx, &this->collider, &this->actor, &sJntSphInit, this->colliderElements);
this->collider.elements[0].dim.modelSphere.radius = 30;
this->collider.elements[0].dim.scale = 1.0f;
this->collider.elements[0].dim.modelSphere.center.x = 80;
this->collider.elements[0].dim.modelSphere.center.y = 80;
this->collider.elements[0].dim.modelSphere.center.z = 0;
this->actor.shape.yOffset = -3000.0f;
this->actor.gravity = -3.0f;
this->actor.colChkInfo.damageTable = &sDamageTable;
@ -195,26 +212,27 @@ void EnBaguo_Idle(EnBaguo* this, GlobalContext* globalCtx) {
}
}
this->actor.shape.rot.y = this->actor.world.rot.y;
return;
}
yaw = this->actor.yawTowardsPlayer - this->actor.world.rot.y;
absoluteYaw = ABS_ALT(yaw);
Math_Vec3f_Copy(&this->targetRotation, &gZeroVec3f);
Math_Vec3f_Copy(&this->currentRotation, &gZeroVec3f);
if (absoluteYaw < 0x2000) {
this->targetRotation.x = 2000.0f;
} else {
this->zRollDirection = NEJIRON_DIRECTION_RIGHT;
this->targetRotation.z = 2000.0f;
if ((s16)(this->actor.yawTowardsPlayer - this->actor.world.rot.y) > 0) {
this->zRollDirection = NEJIRON_DIRECTION_LEFT;
yaw = this->actor.yawTowardsPlayer - this->actor.world.rot.y;
absoluteYaw = ABS_ALT(yaw);
Math_Vec3f_Copy(&this->targetRotation, &gZeroVec3f);
Math_Vec3f_Copy(&this->currentRotation, &gZeroVec3f);
if (absoluteYaw < 0x2000) {
this->targetRotation.x = 2000.0f;
} else {
this->zRollDirection = NEJIRON_DIRECTION_RIGHT;
this->targetRotation.z = 2000.0f;
if ((s16)(this->actor.yawTowardsPlayer - this->actor.world.rot.y) > 0) {
this->zRollDirection = NEJIRON_DIRECTION_LEFT;
}
}
this->timer = 38;
this->actor.world.rot.y = this->actor.yawTowardsPlayer;
this->bouncedFlag = 0;
this->actionFunc = EnBaguo_Roll;
}
this->timer = 38;
this->actor.world.rot.y = this->actor.yawTowardsPlayer;
this->hardHitFlag = 0;
this->actionFunc = EnBaguo_Roll;
}
void EnBaguo_Roll(EnBaguo* this, GlobalContext* globalCtx) {
@ -224,35 +242,33 @@ void EnBaguo_Roll(EnBaguo* this, GlobalContext* globalCtx) {
if ((sqrtf(SQ(xDistanceFromHome) + SQ(zDistanceFromHome)) > this->maxDistanceFromHome) ||
(Player_GetMask(globalCtx) == PLAYER_MASK_STONE)) {
EnBaguo_SetupRetreatUnderground(this);
return;
}
if (this->timer == 0) {
} else if (this->timer == 0) {
this->timer = 100;
this->actor.world.rot.y = this->actor.shape.rot.y;
this->actionFunc = EnBaguo_Idle;
this->actor.speedXZ = 0.0f;
return;
}
if (!this->hardHitFlag && this->collider.base.atFlags & AC_HARD) {
this->zRollDirection ^= 1;
this->hardHitFlag = 1;
this->actor.speedXZ = -7.0f;
}
Math_ApproachF(&this->currentRotation.x, this->targetRotation.x, 0.2f, 1000.0f);
Math_ApproachF(&this->currentRotation.z, this->targetRotation.z, 0.2f, 1000.0f);
Math_ApproachF(&this->actor.speedXZ, 5.0f, 0.3f, 0.5f);
this->actor.world.rot.x += (s16)this->currentRotation.x;
if (this->currentRotation.z != 0.0f) {
if (this->zRollDirection == NEJIRON_DIRECTION_RIGHT) {
this->actor.world.rot.z += (s16)this->currentRotation.z;
} else {
this->actor.world.rot.z -= (s16)this->currentRotation.z;
} else {
if (!this->bouncedFlag && this->collider.base.atFlags & AT_BOUNCED) {
this->zRollDirection ^= 1;
this->bouncedFlag = 1;
this->actor.speedXZ = -7.0f;
}
Math_ApproachF(&this->currentRotation.x, this->targetRotation.x, 0.2f, 1000.0f);
Math_ApproachF(&this->currentRotation.z, this->targetRotation.z, 0.2f, 1000.0f);
Math_ApproachF(&this->actor.speedXZ, 5.0f, 0.3f, 0.5f);
this->actor.world.rot.x += (s16)this->currentRotation.x;
if (this->currentRotation.z != 0.0f) {
if (this->zRollDirection == NEJIRON_DIRECTION_RIGHT) {
this->actor.world.rot.z += (s16)this->currentRotation.z;
} else {
this->actor.world.rot.z -= (s16)this->currentRotation.z;
}
}
Actor_PlaySfxAtPos(&this->actor, NA_SE_EN_BAKUO_ROLL - SFX_FLAG);
}
Actor_PlaySfxAtPos(&this->actor, NA_SE_EN_BAKUO_ROLL - SFX_FLAG);
}
void EnBaguo_SetupRetreatUnderground(EnBaguo* this) {
@ -268,8 +284,10 @@ void EnBaguo_RetreatUnderground(EnBaguo* this, GlobalContext* globalCtx) {
Actor_SpawnFloorDustRing(globalCtx, &this->actor, &this->actor.world.pos, this->actor.shape.shadowScale - 20.0f,
10, 8.0f, 500, 10, 1);
}
Math_ApproachF(&this->actor.shape.yOffset, -3000.0f, 100.0f, 500.0f);
Math_ApproachZeroF(&this->actor.shape.shadowScale, 0.3f, 5.0f);
if (this->actor.shape.yOffset < -2970.0f) {
this->actor.shape.yOffset = -3000.0f;
this->actor.draw = EnBaguo_DrawBody;
@ -285,6 +303,7 @@ void EnBaguo_PostDetonation(EnBaguo* this, GlobalContext* globalCtx) {
if (this->timer == 0) {
Actor_MarkForDeath(&this->actor);
}
if (this->timer >= 26) {
CollisionCheck_SetAT(globalCtx, &globalCtx->colChkCtx, &this->collider.base);
}
@ -331,6 +350,7 @@ void EnBaguo_CheckForDetonation(EnBaguo* this, GlobalContext* globalCtx) {
this->actor.world.pos.y, this->actor.world.pos.z, 0, 0, 0, CLEAR_TAG_POP);
Actor_PlaySfxAtPos(&this->actor, NA_SE_IT_BOMB_EXPLOSION);
Actor_PlaySfxAtPos(&this->actor, NA_SE_EN_BAKUO_DEAD);
this->timer = 30;
this->actor.flags |= 0x8000000;
this->actor.flags &= ~1;
@ -362,6 +382,7 @@ void EnBaguo_Update(Actor* thisx, GlobalContext* globalCtx) {
if (this->action != NEJIRON_ACTION_EXPLODING) {
this->actor.shape.rot.x = this->actor.world.rot.x;
this->actor.shape.rot.z = this->actor.world.rot.z;
if (this->blinkTimer == 0) {
this->eyeIndex++;
if (this->eyeIndex >= 3) {
@ -369,6 +390,7 @@ void EnBaguo_Update(Actor* thisx, GlobalContext* globalCtx) {
this->blinkTimer = Rand_ZeroFloat(60.0f) + 20.0f;
}
}
Actor_MoveWithGravity(&this->actor);
Actor_UpdateBgCheckInfo(globalCtx, &this->actor, 20.0f, 20.0f, 60.0f, 0x1D);
if (this->action != NEJIRON_ACTION_INACTIVE) {
@ -449,12 +471,14 @@ void EnBaguo_UpdateParticles(EnBaguo* this, GlobalContext* globalCtx) {
particle->velocity.x += particle->acceleration.x;
particle->velocity.y += particle->acceleration.y;
particle->velocity.z += particle->acceleration.z;
if (particle->position.y < (this->actor.world.pos.y - 10.0f)) {
Math_ApproachZeroF(&particle->scale, 0.2f, 0.001f);
if (particle->scale <= 0.0001f) {
particle->timer = 0;
}
}
if (particle->timer != 0) {
particle->timer--;
} else {
@ -470,6 +494,7 @@ void EnBaguo_DrawRockParticles(EnBaguo* this, GlobalContext* globalCtx) {
GraphicsContext* gfxCtx = globalCtx->state.gfxCtx;
OPEN_DISPS(gfxCtx);
func_8012C28C(globalCtx->state.gfxCtx);
for (i = 0; i < ARRAY_COUNT(this->particles); i++, particle++) {
if (particle->isVisible) {
@ -478,10 +503,12 @@ void EnBaguo_DrawRockParticles(EnBaguo* this, GlobalContext* globalCtx) {
Matrix_RotateY(particle->rotation.y, MTXMODE_APPLY);
Matrix_InsertZRotation_s(particle->rotation.z, MTXMODE_APPLY);
Matrix_Scale(particle->scale, particle->scale, particle->scale, MTXMODE_APPLY);
gSPMatrix(POLY_OPA_DISP++, Matrix_NewMtx(gfxCtx), G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW);
gDPSetPrimColor(POLY_OPA_DISP++, 0, 1, 255, 255, 255, 255);
gSPDisplayList(POLY_OPA_DISP++, &gameplay_keep_DL_01FA40);
gSPDisplayList(POLY_OPA_DISP++, gBoulderFragmentsDL);
}
}
CLOSE_DISPS(gfxCtx);
}

22
src/overlays/actors/ovl_En_Baguo/z_en_baguo.h
View File

@ -2,26 +2,12 @@
#define Z_EN_BAGUO_H
#include "global.h"
#include "objects/object_gmo/object_gmo.h"
struct EnBaguo;
typedef void (*EnBaguoActionFunc)(struct EnBaguo*, GlobalContext*);
typedef enum {
/* 0x0 */ NEJIRON_ACTION_INACTIVE, // The Nejiron is either underground or emerging from underground
/* 0x1 */ NEJIRON_ACTION_ACTIVE, // The Nejiron is above ground and actively chasing the player
/* 0x2 */ NEJIRON_ACTION_RETREATING, // The Nejiron is burrowing back underground
/* 0x3 */ NEJIRON_ACTION_EXPLODING // The Nejiron has detonated
} NejironAction;
/**
* These directions are relative to the Nejiron.
*/
typedef enum {
/* 0x0 */ NEJIRON_DIRECTION_RIGHT,
/* 0x1 */ NEJIRON_DIRECTION_LEFT
} NejironRollDirection;
/**
* When a Nejiron explodes, rock particles fly out from where it exploded.
* This struct governs how these rock particles behave.
@ -39,8 +25,8 @@ typedef struct NejironParticle {
typedef struct EnBaguo {
/* 0x000 */ Actor actor;
/* 0x144 */ SkelAnime skelAnime;
/* 0x188 */ Vec3s jointTable[3];
/* 0x19A */ Vec3s morphTable[3];
/* 0x188 */ Vec3s jointTable[NEJIRON_LIMB_MAX];
/* 0x19A */ Vec3s morphTable[NEJIRON_LIMB_MAX];
/* 0x1AC */ EnBaguoActionFunc actionFunc;
/* 0x1B0 */ s16 eyeIndex;
/* 0x1B2 */ s16 blinkTimer;
@ -48,7 +34,7 @@ typedef struct EnBaguo {
/* 0x1B6 */ s16 action;
/* 0x1B8 */ s16 zRollDirection;
/* 0x1BC */ f32 maxDistanceFromHome;
/* 0x1C0 */ u8 hardHitFlag;
/* 0x1C0 */ u8 bouncedFlag;
/* 0x1C4 */ Vec3f currentRotation;
/* 0x1D0 */ Vec3f targetRotation;
/* 0x1DC */ ColliderJntSph collider;