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

Document Object Tokei Step (#523) 

* Cleanup and doc object

* Rename actor stack variable

* Revert actor change and fix ARRY_COUNT typo

* More actor cleanup from review

* Format

* didPrevBounce to hasPrevBounced
This commit is contained in:
Derek Hensley 2021-12-26 19:15:12 -08:00 committed by GitHub
parent af7525e2d3
commit d2c411e132
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 40 additions and 48 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
assets/xml/objects/object_tokei_step.xml
View File

@ -1,8 +1,8 @@
<Root> <Root>
<File Name="object_tokei_step" Segment="6"> <File Name="object_tokei_step" Segment="6">
<DList Name="object_tokei_step_DL_000080" Offset="0x80" /> <DList Name="gClocktowerPanelEmptyDL" Offset="0x80" />
<DList Name="object_tokei_step_DL_000088" Offset="0x88" /> <DList Name="gClocktowerPanelDL" Offset="0x88" />
<Texture Name="object_tokei_step_Tex_000120" OutName="tex_000120" Format="rgba16" Width="32" Height="32" Offset="0x120" /> <Texture Name="gClocktowerPanelTex" OutName="clocktower_panel" Format="rgba16" Width="32" Height="32" Offset="0x120" />
<Collision Name="object_tokei_step_Colheader_000968" Offset="0x968" /> <Collision Name="gClocktowerPanelCol" Offset="0x968" />
</File> </File>
</Root> </Root>

75
src/overlays/actors/ovl_Obj_Tokei_Step/z_obj_tokei_step.c
View File

@ -5,6 +5,7 @@
*/ */
#include "z_obj_tokei_step.h" #include "z_obj_tokei_step.h"
#include "objects/object_tokei_step/object_tokei_step.h"
#define FLAGS 0x00400010 #define FLAGS 0x00400010
@ -37,11 +38,11 @@ const ActorInit Obj_Tokei_Step_InitVars = {
(ActorFunc)ObjTokeiStep_Draw, (ActorFunc)ObjTokeiStep_Draw,
}; };
static f32 panelXOffsets[] = { -105.0f, -90.0f, -75.0f, -60.0f, -45.0f, -30.0f, -15.0f }; static f32 sPanelXOffsets[] = { -105.0f, -90.0f, -75.0f, -60.0f, -45.0f, -30.0f, -15.0f };
static f32 dustSpawnXOffsets[] = { -60.0f, -40.0f, -20.0f, 0.0f, 20.0f, 40.0f, 60.0f }; static f32 sDustSpawnXOffsets[] = { -60.0f, -40.0f, -20.0f, 0.0f, 20.0f, 40.0f, 60.0f };
static Vec3f dustEffectAccel = { 0.0f, 0.3f, 0.0f }; static Vec3f sDustEffectAccel = { 0.0f, 0.3f, 0.0f };
static InitChainEntry sInitChain[] = { static InitChainEntry sInitChain[] = {
ICHAIN_F32(uncullZoneForward, 4000, ICHAIN_CONTINUE), ICHAIN_F32(uncullZoneForward, 4000, ICHAIN_CONTINUE),
@ -50,27 +51,22 @@ static InitChainEntry sInitChain[] = {
ICHAIN_VEC3F_DIV1000(scale, 100, ICHAIN_STOP), ICHAIN_VEC3F_DIV1000(scale, 100, ICHAIN_STOP),
}; };
extern Gfx D_06000088[];
extern CollisionHeader D_06000968;
void ObjTokeiStep_SetSysMatrix(ObjTokeiStepPanel* panel) { void ObjTokeiStep_SetSysMatrix(ObjTokeiStepPanel* panel) {
MtxF* sysMatrix; MtxF* mtx = Matrix_GetCurrentState();
sysMatrix = Matrix_GetCurrentState(); mtx->wx = panel->pos.x;
sysMatrix->wx = panel->pos.x; mtx->wy = panel->pos.y;
sysMatrix->wy = panel->pos.y; mtx->wz = panel->pos.z;
sysMatrix->wz = panel->pos.z;
} }
void ObjTokeiStep_AddQuake(ObjTokeiStep* this, GlobalContext* globalCtx) { void ObjTokeiStep_AddQuake(ObjTokeiStep* this, GlobalContext* globalCtx) {
s32 pad[2]; s32 pad[2];
s16 quake; s16 quake = Quake_Add(GET_ACTIVE_CAM(globalCtx), 3);
quake = Quake_Add(GET_ACTIVE_CAM(globalCtx), 3); Quake_SetSpeed(quake, 20000);
Quake_SetSpeed(quake, 0x4E20);
Quake_SetQuakeValues(quake, 1, 0, 0, 0); Quake_SetQuakeValues(quake, 1, 0, 0, 0);
Quake_SetCountdown(quake, 7); Quake_SetCountdown(quake, 7);
func_8013ECE0(this->dyna.actor.xyzDistToPlayerSq, 0x78, 0x14, 0xA); func_8013ECE0(this->dyna.actor.xyzDistToPlayerSq, 120, 20, 10);
} }
void ObjTokeiStep_SpawnDust(ObjTokeiStep* this, ObjTokeiStepPanel* panel, GlobalContext* globalCtx) { void ObjTokeiStep_SpawnDust(ObjTokeiStep* this, ObjTokeiStepPanel* panel, GlobalContext* globalCtx) {
@ -84,12 +80,12 @@ void ObjTokeiStep_SpawnDust(ObjTokeiStep* this, ObjTokeiStepPanel* panel, Global
dustSpawnOffset.y = 115.0f; dustSpawnOffset.y = 115.0f;
dustSpawnOffset.z = -10.0f; dustSpawnOffset.z = -10.0f;
for (i = 0; i < 7; i++) { for (i = 0; i < 7; i++) {
dustSpawnOffset.x = dustSpawnXOffsets[i]; dustSpawnOffset.x = sDustSpawnXOffsets[i];
Matrix_MultiplyVector3fByState(&dustSpawnOffset, &dustSpawnPos); Matrix_MultiplyVector3fByState(&dustSpawnOffset, &dustSpawnPos);
dustSpawnPos.x += panel->pos.x; dustSpawnPos.x += panel->pos.x;
dustSpawnPos.y += panel->pos.y; dustSpawnPos.y += panel->pos.y;
dustSpawnPos.z += panel->pos.z; dustSpawnPos.z += panel->pos.z;
func_800B1210(globalCtx, &dustSpawnPos, &D_801D15B0, &dustEffectAccel, (s32)((Rand_ZeroOne() * 40.0f) + 80.0f), func_800B1210(globalCtx, &dustSpawnPos, &D_801D15B0, &sDustEffectAccel, (s32)((Rand_ZeroOne() * 40.0f) + 80.0f),
(s32)((Rand_ZeroOne() * 20.0f) + 50.0f)); (s32)((Rand_ZeroOne() * 20.0f) + 50.0f));
} }
} }
@ -105,7 +101,7 @@ void ObjTokeiStep_InitSteps(ObjTokeiStep* this) {
panelOffset.x = 0.0f; panelOffset.x = 0.0f;
panelOffset.y = 0.0f; panelOffset.y = 0.0f;
for (i = 0; i < 7; i++) { for (i = 0; i < ARRAY_COUNT(this->panels); i++) {
panel = &this->panels[i]; panel = &this->panels[i];
panelOffset.z = i * -20.0f; panelOffset.z = i * -20.0f;
Matrix_MultiplyVector3fByState(&panelOffset, &panel->pos); Matrix_MultiplyVector3fByState(&panelOffset, &panel->pos);
@ -123,9 +119,9 @@ void ObjTokeiStep_InitStepsOpen(ObjTokeiStep* this) {
this->dyna.actor.world.pos.z, &this->dyna.actor.shape.rot); this->dyna.actor.world.pos.z, &this->dyna.actor.shape.rot);
panelOffset.x = 0.0f; panelOffset.x = 0.0f;
for (i = 0; i < 7; i++) { for (i = 0; i < ARRAY_COUNT(this->panels); i++) {
panel = &this->panels[i]; panel = &this->panels[i];
panelOffset.y = panelXOffsets[i]; panelOffset.y = sPanelXOffsets[i];
panelOffset.z = i * -20.0f; panelOffset.z = i * -20.0f;
Matrix_MultiplyVector3fByState(&panelOffset, &panel->pos); Matrix_MultiplyVector3fByState(&panelOffset, &panel->pos);
} }
@ -135,7 +131,7 @@ void ObjTokeiStep_InitTimers(ObjTokeiStep* this) {
s32 i; s32 i;
this->panels[0].startFallingTimer = 0; this->panels[0].startFallingTimer = 0;
for (i = 1; i < 7; i++) { for (i = 1; i < ARRAY_COUNT(this->panels); i++) {
this->panels[i].startFallingTimer = 10; this->panels[i].startFallingTimer = 10;
} }
} }
@ -145,17 +141,17 @@ s32 ObjTokeiStep_OpenProcess(ObjTokeiStep* this, GlobalContext* globalCtx) {
s32 i; s32 i;
ObjTokeiStepPanel* panel; ObjTokeiStepPanel* panel;
f32 finalPosY; f32 finalPosY;
s32 isOpen = 1; s32 isOpen = true;
s32 prevBounced = 1; s32 hasPrevBounced = true;
for (i = 0; i < 7; i++) { for (i = 0; i < ARRAY_COUNT(this->panels); i++) {
panel = &this->panels[i]; panel = &this->panels[i];
if (prevBounced && panel->startFallingTimer > 0) { if (hasPrevBounced && (panel->startFallingTimer > 0)) {
panel->startFallingTimer--; panel->startFallingTimer--;
isOpen = 0; isOpen = false;
} }
if (prevBounced && panel->numBounces < 3 && panel->startFallingTimer <= 0) { if (hasPrevBounced && (panel->numBounces < 3) && (panel->startFallingTimer <= 0)) {
finalPosY = panelXOffsets[i] + this->dyna.actor.world.pos.y; finalPosY = sPanelXOffsets[i] + this->dyna.actor.world.pos.y;
if (!panel->hasSoundPlayed) { if (!panel->hasSoundPlayed) {
Audio_PlayActorSound2(&this->dyna.actor, NA_SE_EV_CLOCK_TOWER_STAIR_MOVE); Audio_PlayActorSound2(&this->dyna.actor, NA_SE_EV_CLOCK_TOWER_STAIR_MOVE);
panel->hasSoundPlayed = true; panel->hasSoundPlayed = true;
@ -163,7 +159,7 @@ s32 ObjTokeiStep_OpenProcess(ObjTokeiStep* this, GlobalContext* globalCtx) {
panel->posChangeY += -2.5f; panel->posChangeY += -2.5f;
panel->posChangeY *= 0.83f; panel->posChangeY *= 0.83f;
panel->pos.y += panel->posChangeY; panel->pos.y += panel->posChangeY;
isOpen = 0; isOpen = false;
if (panel->pos.y < finalPosY) { if (panel->pos.y < finalPosY) {
panel->numBounces++; panel->numBounces++;
if (panel->numBounces >= 3) { if (panel->numBounces >= 3) {
@ -186,7 +182,7 @@ s32 ObjTokeiStep_OpenProcess(ObjTokeiStep* this, GlobalContext* globalCtx) {
} }
} }
} }
prevBounced = panel->numBounces > 0; hasPrevBounced = panel->numBounces > 0;
} }
return isOpen; return isOpen;
} }
@ -196,16 +192,17 @@ void ObjTokeiStep_Init(Actor* thisx, GlobalContext* globalCtx) {
Actor_ProcessInitChain(&this->dyna.actor, sInitChain); Actor_ProcessInitChain(&this->dyna.actor, sInitChain);
DynaPolyActor_Init(&this->dyna, 0); DynaPolyActor_Init(&this->dyna, 0);
if ((globalCtx->sceneNum == 0x6F) && (gSaveContext.sceneSetupIndex == 2) && (globalCtx->csCtx.unk_12 == 0)) { if ((globalCtx->sceneNum == SCENE_CLOCKTOWER) && (gSaveContext.sceneSetupIndex == 2) &&
DynaPolyActor_LoadMesh(globalCtx, &this->dyna, &D_06000968); (globalCtx->csCtx.unk_12 == 0)) {
DynaPolyActor_LoadMesh(globalCtx, &this->dyna, &gClocktowerPanelCol);
ObjTokeiStep_InitSteps(this); ObjTokeiStep_InitSteps(this);
ObjTokeiStep_SetupBeginOpen(this); ObjTokeiStep_SetupBeginOpen(this);
} else if (!((CURRENT_DAY != 3) || (gSaveContext.time >= 0x4000)) || gSaveContext.day >= 4) { } else if (((CURRENT_DAY == 3) && (gSaveContext.time < CLOCK_TIME(6, 0))) || (gSaveContext.day >= 4)) {
this->dyna.actor.draw = ObjTokeiStep_DrawOpen; this->dyna.actor.draw = ObjTokeiStep_DrawOpen;
ObjTokeiStep_InitStepsOpen(this); ObjTokeiStep_InitStepsOpen(this);
ObjTokeiStep_SetupDoNothingOpen(this); ObjTokeiStep_SetupDoNothingOpen(this);
} else { } else {
DynaPolyActor_LoadMesh(globalCtx, &this->dyna, &D_06000968); DynaPolyActor_LoadMesh(globalCtx, &this->dyna, &gClocktowerPanelCol);
ObjTokeiStep_InitSteps(this); ObjTokeiStep_InitSteps(this);
ObjTokeiStep_SetupDoNothing(this); ObjTokeiStep_SetupDoNothing(this);
} }
@ -226,7 +223,7 @@ void ObjTokeiStep_BeginOpen(ObjTokeiStep* this, GlobalContext* globalCtx) {
if (func_800EE29C(globalCtx, 0x86)) { if (func_800EE29C(globalCtx, 0x86)) {
action = globalCtx->csCtx.npcActions[func_800EE200(globalCtx, 0x86)]; action = globalCtx->csCtx.npcActions[func_800EE200(globalCtx, 0x86)];
if ((globalCtx->csCtx.frames == (*action).startFrame) && action->unk0) { if ((action->startFrame == globalCtx->csCtx.frames) && (action->unk0 != 0)) {
this->dyna.actor.draw = ObjTokeiStep_DrawOpen; this->dyna.actor.draw = ObjTokeiStep_DrawOpen;
ObjTokeiStep_SetupOpen(this); ObjTokeiStep_SetupOpen(this);
} }
@ -269,12 +266,12 @@ void ObjTokeiStep_Update(Actor* thisx, GlobalContext* globalCtx) {
void ObjTokeiStep_Draw(Actor* thisx, GlobalContext* globalCtx) { void ObjTokeiStep_Draw(Actor* thisx, GlobalContext* globalCtx) {
ObjTokeiStep* this = THIS; ObjTokeiStep* this = THIS;
func_800BDFC0(globalCtx, D_06000088); func_800BDFC0(globalCtx, gClocktowerPanelDL);
} }
void ObjTokeiStep_DrawOpen(Actor* thisx, GlobalContext* globalCtx) { void ObjTokeiStep_DrawOpen(Actor* thisx, GlobalContext* globalCtx) {
ObjTokeiStep* this = THIS; ObjTokeiStep* this = THIS;
int i; s32 i;
ObjTokeiStepPanel* panel; ObjTokeiStepPanel* panel;
Gfx* gfx; Gfx* gfx;
@ -282,11 +279,11 @@ void ObjTokeiStep_DrawOpen(Actor* thisx, GlobalContext* globalCtx) {
gfx = POLY_OPA_DISP; gfx = POLY_OPA_DISP;
gSPDisplayList(gfx++, &sSetupDL[6 * 0x19]); gSPDisplayList(gfx++, &sSetupDL[6 * 0x19]);
for (i = 0; i < 7; i++) { for (i = 0; i < ARRAY_COUNT(this->panels); i++) {
panel = &this->panels[i]; panel = &this->panels[i];
ObjTokeiStep_SetSysMatrix(panel); ObjTokeiStep_SetSysMatrix(panel);
gSPMatrix(gfx++, Matrix_NewMtx(globalCtx->state.gfxCtx), G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW); gSPMatrix(gfx++, Matrix_NewMtx(globalCtx->state.gfxCtx), G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW);
gSPDisplayList(gfx++, D_06000088); gSPDisplayList(gfx++, gClocktowerPanelDL);
} }
POLY_OPA_DISP = gfx; POLY_OPA_DISP = gfx;
CLOSE_DISPS(globalCtx->state.gfxCtx); CLOSE_DISPS(globalCtx->state.gfxCtx);

5
undefined_syms.txt
View File

@ -4391,11 +4391,6 @@ D_0600D8E8 = 0x0600D8E8;
D_0600E818 = 0x0600E818; D_0600E818 = 0x0600E818;
D_0600F518 = 0x0600F518; D_0600F518 = 0x0600F518;
// ovl_Obj_Tokei_Step
D_06000088 = 0x06000088;
D_06000968 = 0x06000968;
// ovl_Obj_Tokei_Turret // ovl_Obj_Tokei_Turret
D_06002508 = 0x06002508; D_06002508 = 0x06002508;