mirror of
https://github.com/zeldaret/oot.git
synced 2025-08-06 06:10:21 +00:00
z_en_kakasi2.c (#427)
* Decompiles z_en_kakasi2 - EnKakasi2_Init * Destroy * func_80A90264 * Finishes z_en_kakasi2 * Remove unused data/reloc * Some hex fixes * Some fixes * Addresses PR comments * Rename temp to be more generic * More var renaming, timer modulo * Change low rotation values to decimal Co-authored-by: i82orbom <i82orbom i82orbom@github>
This commit is contained in:
i82orbom
GitHub
parent
ca2c493374
commit
353d4d134f
15 changed files with 217 additions and 790 deletions
|
|
@ -1,14 +1,36 @@
|
|||
/*
|
||||
* File: z_en_kakasi2.c
|
||||
* Overlay: ovl_En_Kakasi2
|
||||
* Description: Pierre the Scarecrow Spawn
|
||||
*/
|
||||
|
||||
#include "z_en_kakasi2.h"
|
||||
#include "vt.h"
|
||||
|
||||
#define FLAGS 0x0A000031
|
||||
|
||||
#define THIS ((EnKakasi2*)thisx)
|
||||
|
||||
static ColliderCylinderInit sCylinderInit = {
|
||||
{ COLTYPE_UNK10, 0x00, 0x09, 0x39, 0x20, COLSHAPE_CYLINDER },
|
||||
{ 0x00, { 0xFFCFFFFF, 0x00, 0x00 }, { 0xFFCFFFFF, 0x00, 0x00 }, 0x00, 0x05, 0x01 },
|
||||
{ 20, 70, 0, { 0, 0, 0 } },
|
||||
};
|
||||
|
||||
void EnKakasi2_Init(Actor* thisx, GlobalContext* globalCtx);
|
||||
void EnKakasi2_Destroy(Actor* thisx, GlobalContext* globalCtx);
|
||||
void EnKakasi2_Update(Actor* thisx, GlobalContext* globalCtx);
|
||||
void func_80A90948(Actor* thisx, GlobalContext* globalCtx);
|
||||
|
||||
void func_80A9062C(EnKakasi2* this, GlobalContext* globalCtx);
|
||||
void func_80A90264(EnKakasi2* this, GlobalContext* globalCtx);
|
||||
void func_80A904D8(EnKakasi2* this, GlobalContext* globalCtx);
|
||||
void func_80A90578(EnKakasi2* this, GlobalContext* globalCtx);
|
||||
void func_80A906C4(EnKakasi2* this, GlobalContext* globalCtx);
|
||||
|
||||
extern SkeletonHeader D_060065B0;
|
||||
extern AnimationHeader D_06000214;
|
||||
|
||||
/*
|
||||
const ActorInit En_Kakasi2_InitVars = {
|
||||
ACTOR_EN_KAKASI2,
|
||||
ACTORTYPE_PROP,
|
||||
|
|
@ -20,21 +42,193 @@ const ActorInit En_Kakasi2_InitVars = {
|
|||
(ActorFunc)EnKakasi2_Update,
|
||||
NULL,
|
||||
};
|
||||
*/
|
||||
#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Kakasi2/EnKakasi2_Init.s")
|
||||
|
||||
#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Kakasi2/EnKakasi2_Destroy.s")
|
||||
void EnKakasi2_Init(Actor* thisx, GlobalContext* globalCtx) {
|
||||
EnKakasi2* this = THIS;
|
||||
s32 pad;
|
||||
f32 spawnRangeY;
|
||||
f32 spawnRangeXZ;
|
||||
|
||||
#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Kakasi2/func_80A90264.s")
|
||||
osSyncPrintf("\n\n");
|
||||
// Visit Umeda
|
||||
osSyncPrintf(VT_FGCOL(GREEN) "☆☆☆☆☆ 梅田参号見参！ ☆☆☆☆☆ \n" VT_RST);
|
||||
|
||||
#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Kakasi2/func_80A904D8.s")
|
||||
this->switchFlag = this->actor.params & 0x3F;
|
||||
spawnRangeY = (this->actor.params >> 6) & 0xFF;
|
||||
spawnRangeXZ = this->actor.posRot.rot.z;
|
||||
if (this->switchFlag == 0x3F) {
|
||||
this->switchFlag = -1;
|
||||
}
|
||||
this->actor.unk_1F = 4;
|
||||
this->maxSpawnDistance.x = (spawnRangeY * 40.0f) + 40.0f;
|
||||
this->maxSpawnDistance.y = (spawnRangeXZ * 40.0f) + 40.0f;
|
||||
|
||||
#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Kakasi2/func_80A90578.s")
|
||||
// Former? (Argument 0)
|
||||
osSyncPrintf(VT_FGCOL(YELLOW) "☆☆☆☆☆ 元？(引数０) ☆☆☆☆ %f\n" VT_RST, spawnRangeY);
|
||||
// Former? (Z angle)
|
||||
osSyncPrintf(VT_FGCOL(YELLOW) "☆☆☆☆☆ 元？(Ｚアングル) ☆☆ %f\n" VT_RST, spawnRangeXZ);
|
||||
// Correction coordinates X
|
||||
osSyncPrintf(VT_FGCOL(YELLOW) "☆☆☆☆☆ 補正座標Ｘ ☆☆☆☆☆ %f\n" VT_RST, this->maxSpawnDistance.x);
|
||||
// Correction coordinates Y
|
||||
osSyncPrintf(VT_FGCOL(YELLOW) "☆☆☆☆☆ 補正座標Ｙ ☆☆☆☆☆ %f\n" VT_RST, this->maxSpawnDistance.y);
|
||||
// Correction coordinates Z
|
||||
osSyncPrintf(VT_FGCOL(YELLOW) "☆☆☆☆☆ 補正座標Ｚ ☆☆☆☆☆ %f\n" VT_RST, this->maxSpawnDistance.z);
|
||||
osSyncPrintf(VT_FGCOL(YELLOW) "☆☆☆☆☆ SAVE ☆☆☆☆☆ %d\n" VT_RST, this->switchFlag);
|
||||
osSyncPrintf("\n\n");
|
||||
|
||||
#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Kakasi2/func_80A9062C.s")
|
||||
this->actor.colChkInfo.mass = 0xFF;
|
||||
this->height = 60.0f;
|
||||
Actor_SetScale(&this->actor, 0.01f);
|
||||
this->actor.flags |= 0x400;
|
||||
this->unk_198 = this->actor.shape.rot.y;
|
||||
|
||||
#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Kakasi2/func_80A906C4.s")
|
||||
if (this->switchFlag >= 0 && Flags_GetSwitch(globalCtx, this->switchFlag)) {
|
||||
this->actor.draw = func_80A90948;
|
||||
Collider_InitCylinder(globalCtx, &this->collider);
|
||||
Collider_SetCylinder(globalCtx, &this->collider, &this->actor, &sCylinderInit);
|
||||
SkelAnime_InitSV(globalCtx, &this->skelAnime, &D_060065B0, &D_06000214, NULL, NULL, 0);
|
||||
this->actionFunc = func_80A9062C;
|
||||
} else {
|
||||
this->actionFunc = func_80A90264;
|
||||
this->actor.shape.unk_08 = -8000.0f;
|
||||
}
|
||||
}
|
||||
|
||||
#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Kakasi2/EnKakasi2_Update.s")
|
||||
void EnKakasi2_Destroy(Actor* thisx, GlobalContext* globalCtx) {
|
||||
EnKakasi2* this = THIS;
|
||||
|
||||
#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Kakasi2/func_80A90948.s")
|
||||
Collider_DestroyCylinder(globalCtx, &this->collider);
|
||||
//! @bug Skelanime_Free is not called
|
||||
}
|
||||
|
||||
void func_80A90264(EnKakasi2* this, GlobalContext* globalCtx) {
|
||||
Player* player = PLAYER;
|
||||
|
||||
this->unk_194++;
|
||||
|
||||
if ((BREG(1) != 0) && (this->actor.xzDistFromLink < this->maxSpawnDistance.x) &&
|
||||
(fabsf(player->actor.posRot.pos.y - this->actor.posRot.pos.y) < this->maxSpawnDistance.y)) {
|
||||
|
||||
this->actor.draw = func_80A90948;
|
||||
Collider_InitCylinder(globalCtx, &this->collider);
|
||||
Collider_SetCylinder(globalCtx, &this->collider, &this->actor, &sCylinderInit);
|
||||
SkelAnime_InitSV(globalCtx, &this->skelAnime, &D_060065B0, &D_06000214, NULL, NULL, 0);
|
||||
func_80080480(globalCtx, this);
|
||||
this->actor.flags |= 0x8000001;
|
||||
|
||||
func_80078884(NA_SE_SY_CORRECT_CHIME);
|
||||
if (this->switchFlag >= 0) {
|
||||
Flags_SetSwitch(globalCtx, this->switchFlag);
|
||||
}
|
||||
|
||||
osSyncPrintf(VT_FGCOL(GREEN) "☆☆☆☆☆ SAVE 終了 ☆☆☆☆☆ %d\n" VT_RST, this->switchFlag);
|
||||
this->actionFunc = func_80A904D8;
|
||||
} else if ((this->actor.xzDistFromLink < this->maxSpawnDistance.x) &&
|
||||
(fabsf(player->actor.posRot.pos.y - this->actor.posRot.pos.y) < this->maxSpawnDistance.y) &&
|
||||
(gSaveContext.eventChkInf[9] & 0x1000)) {
|
||||
|
||||
this->unk_194 = 0;
|
||||
if (globalCtx->msgCtx.unk_E3EE == 11) {
|
||||
if (this->switchFlag >= 0) {
|
||||
Flags_SetSwitch(globalCtx, this->switchFlag);
|
||||
}
|
||||
osSyncPrintf(VT_FGCOL(GREEN) "☆☆☆☆☆ SAVE 終了 ☆☆☆☆☆ %d\n" VT_RST, this->switchFlag);
|
||||
globalCtx->msgCtx.unk_E3EE = 4;
|
||||
this->actor.draw = func_80A90948;
|
||||
Collider_InitCylinder(globalCtx, &this->collider);
|
||||
Collider_SetCylinder(globalCtx, &this->collider, &this->actor, &sCylinderInit);
|
||||
SkelAnime_InitSV(globalCtx, &this->skelAnime, &D_060065B0, &D_06000214, NULL, NULL, 0);
|
||||
func_80080480(globalCtx, this);
|
||||
func_80078884(NA_SE_SY_CORRECT_CHIME);
|
||||
|
||||
this->actor.flags |= 0x8000001;
|
||||
this->actionFunc = func_80A904D8;
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
void func_80A904D8(EnKakasi2* this, GlobalContext* globalCtx) {
|
||||
f32 frameCount = SkelAnime_GetFrameCount(&D_06000214.genericHeader);
|
||||
|
||||
SkelAnime_ChangeAnim(&this->skelAnime, &D_06000214, 1.0f, 0.0f, (s16)frameCount, 0, -10.0f);
|
||||
Audio_PlayActorSound2(&this->actor, NA_SE_EV_COME_UP_DEKU_JR);
|
||||
this->actionFunc = func_80A90578;
|
||||
}
|
||||
|
||||
void func_80A90578(EnKakasi2* this, GlobalContext* globalCtx) {
|
||||
s16 currentFrame;
|
||||
|
||||
SkelAnime_FrameUpdateMatrix(&this->skelAnime);
|
||||
|
||||
currentFrame = this->skelAnime.animCurrentFrame;
|
||||
if (currentFrame == 11 || currentFrame == 17) {
|
||||
Audio_PlayActorSound2(&this->actor, NA_SE_EV_KAKASHI_SWING);
|
||||
}
|
||||
|
||||
this->actor.shape.rot.y += 0x800;
|
||||
Math_SmoothDownscaleMaxF(&this->actor.shape.unk_08, 0.5f, 500.0f);
|
||||
|
||||
if (this->actor.shape.unk_08 > -100.0f) {
|
||||
this->actionFunc = func_80A9062C;
|
||||
this->actor.shape.unk_08 = 0.0f;
|
||||
}
|
||||
}
|
||||
|
||||
void func_80A9062C(EnKakasi2* this, GlobalContext* globalCtx) {
|
||||
f32 frameCount = SkelAnime_GetFrameCount(&D_06000214.genericHeader);
|
||||
|
||||
SkelAnime_ChangeAnim(&this->skelAnime, &D_06000214, 0.0f, 0.0f, (s16)frameCount, 2, -10.0f);
|
||||
this->actionFunc = func_80A906C4;
|
||||
}
|
||||
|
||||
void func_80A906C4(EnKakasi2* this, GlobalContext* globalCtx) {
|
||||
if (this->skelAnime.animCurrentFrame != 0) {
|
||||
Math_SmoothDownscaleMaxF(&this->skelAnime.animCurrentFrame, 0.5f, 1.0f);
|
||||
}
|
||||
Math_SmoothScaleMaxMinS(&this->actor.shape.rot.y, this->unk_198, 5, 0xBB8, 0);
|
||||
SkelAnime_FrameUpdateMatrix(&this->skelAnime);
|
||||
}
|
||||
|
||||
void EnKakasi2_Update(Actor* thisx, GlobalContext* globalCtx) {
|
||||
EnKakasi2* this = THIS;
|
||||
GlobalContext* globalCtx2 = globalCtx;
|
||||
|
||||
this->actor.posRot.rot = this->actor.shape.rot;
|
||||
Actor_SetHeight(&this->actor, this->height);
|
||||
this->actionFunc(this, globalCtx2);
|
||||
Actor_MoveForward(&this->actor);
|
||||
|
||||
if (this->actor.shape.unk_08 == 0.0f) {
|
||||
Collider_CylinderUpdate(&this->actor, &this->collider);
|
||||
CollisionCheck_SetAC(globalCtx2, &globalCtx2->colChkCtx, &this->collider.base);
|
||||
CollisionCheck_SetOC(globalCtx2, &globalCtx2->colChkCtx, &this->collider.base);
|
||||
}
|
||||
if (BREG(0) != 0) {
|
||||
if (BREG(5) != 0) {
|
||||
osSyncPrintf(VT_FGCOL(YELLOW) "☆☆☆☆☆ this->actor.player_distance ☆☆☆☆☆ %f\n" VT_RST, this->actor.xzDistFromLink);
|
||||
osSyncPrintf(VT_FGCOL(YELLOW) "☆☆☆☆☆ this->hosei.x ☆☆☆☆☆ %f\n" VT_RST, this->maxSpawnDistance.x);
|
||||
osSyncPrintf("\n\n");
|
||||
}
|
||||
if (this->actor.draw == NULL) {
|
||||
if (this->unk_194 != 0) {
|
||||
if ((this->unk_194 % 2) == 0) {
|
||||
DebugDisplay_AddObject(this->actor.posRot.pos.x, this->actor.posRot.pos.y, this->actor.posRot.pos.z,
|
||||
this->actor.posRot.rot.x, this->actor.posRot.rot.y, this->actor.posRot.rot.z,
|
||||
1.0f, 1.0f, 1.0f, 70, 70, 70, 255, 4, globalCtx2->state.gfxCtx);
|
||||
}
|
||||
} else {
|
||||
DebugDisplay_AddObject(this->actor.posRot.pos.x, this->actor.posRot.pos.y, this->actor.posRot.pos.z,
|
||||
this->actor.posRot.rot.x, this->actor.posRot.rot.y, this->actor.posRot.rot.z,
|
||||
1.0f, 1.0f, 1.0f, 0, 255, 255, 255, 4, globalCtx2->state.gfxCtx);
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
void func_80A90948(Actor* thisx, GlobalContext* globalCtx) {
|
||||
EnKakasi2* this = THIS;
|
||||
|
||||
func_80093D18(globalCtx->state.gfxCtx);
|
||||
SkelAnime_DrawSV(globalCtx, this->skelAnime.skeleton, this->skelAnime.limbDrawTbl, this->skelAnime.dListCount, NULL,
|
||||
NULL, &this->actor);
|
||||
}
|
||||
|
|
|
|||
|
|
@ -6,9 +6,18 @@
|
|||
|
||||
struct EnKakasi2;
|
||||
|
||||
typedef void (*EnKakasi2ActionFunc)(struct EnKakasi2*, GlobalContext*);
|
||||
|
||||
typedef struct EnKakasi2 {
|
||||
/* 0x0000 */ Actor actor;
|
||||
/* 0x014C */ char unk_14C[0xAC];
|
||||
/* 0x014C */ EnKakasi2ActionFunc actionFunc;
|
||||
/* 0x0150 */ SkelAnime skelAnime;
|
||||
/* 0x0194 */ s16 unk_194;
|
||||
/* 0x0196 */ s16 switchFlag;
|
||||
/* 0x0198 */ s16 unk_198;
|
||||
/* 0x019C */ Vec3f maxSpawnDistance;
|
||||
/* 0x01A8 */ f32 height;
|
||||
/* 0x01AC */ ColliderCylinder collider;
|
||||
} EnKakasi2; // size = 0x01F8
|
||||
|
||||
extern const ActorInit En_Kakasi2_InitVars;
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue