mirror of
https://github.com/zeldaret/oot.git
synced 2025-08-06 06:10:21 +00:00
EnMThunder, 1 nonmatching (#604)
* Data migrated, all but Draw matched * Draw likely equivalent but serious regalloc issues, and that last Gfx_TwoTexScroll is being very stubborn * Merge remote-tracking branch 'upstream/master' into Thunder * some improvements, set up to PR as nonmatching * spec * corrected header * added function to functions.h * delete asm * Added new collider init Co-authored-by: fig02 <fig02srl@gmail.com>
This commit is contained in:
EllipticEllipsis
GitHub
parent
be84e1f0f8
commit
0e76c84c45
14 changed files with 387 additions and 1014 deletions
|
|
@ -9,13 +9,10 @@ void EnMThunder_Destroy(Actor* thisx, GlobalContext* globalCtx);
|
|||
void EnMThunder_Update(Actor* thisx, GlobalContext* globalCtx);
|
||||
void EnMThunder_Draw(Actor* thisx, GlobalContext* globalCtx);
|
||||
|
||||
extern UNK_TYPE D_04012570;
|
||||
extern UNK_TYPE D_04012690;
|
||||
extern UNK_TYPE D_04012AF0;
|
||||
extern UNK_TYPE D_04012C10;
|
||||
extern UNK_TYPE D_04013610;
|
||||
void func_80A9F314(GlobalContext* globalCtx, f32 arg1);
|
||||
void func_80A9F408(EnMThunder* this, GlobalContext* globalCtx);
|
||||
void func_80A9F9B4(EnMThunder* this, GlobalContext* globalCtx);
|
||||
|
||||
/*
|
||||
const ActorInit En_M_Thunder_InitVars = {
|
||||
ACTOR_EN_M_THUNDER,
|
||||
ACTORCAT_ITEMACTION,
|
||||
|
|
@ -47,23 +44,375 @@ static ColliderCylinderInit D_80AA0420 = {
|
|||
},
|
||||
{ 200, 200, 0, { 0, 0, 0 } },
|
||||
};
|
||||
*/
|
||||
#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_M_Thunder/func_80A9EFE0.s")
|
||||
|
||||
#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_M_Thunder/EnMThunder_Init.s")
|
||||
static u32 D_80AA044C[] = { 0x01000000, 0x00400000, 0x00800000 };
|
||||
static u32 D_80AA0458[] = { 0x08000000, 0x02000000, 0x04000000 };
|
||||
|
||||
#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_M_Thunder/EnMThunder_Destroy.s")
|
||||
static u16 sSfxIds[] = {
|
||||
NA_SE_IT_ROLLING_CUT_LV2,
|
||||
NA_SE_IT_ROLLING_CUT_LV1,
|
||||
NA_SE_IT_ROLLING_CUT_LV2,
|
||||
NA_SE_IT_ROLLING_CUT_LV1
|
||||
};
|
||||
|
||||
#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_M_Thunder/func_80A9F314.s")
|
||||
extern Gfx D_04012570[];
|
||||
extern Gfx D_04012690[];
|
||||
extern Gfx D_04012AF0[];
|
||||
extern Gfx D_04012C10[];
|
||||
extern Gfx D_04013610[];
|
||||
|
||||
#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_M_Thunder/func_80A9F350.s")
|
||||
// Setup action
|
||||
void func_80A9EFE0(EnMThunder* this, EnMThunderActionFunc actionFunc) {
|
||||
this->actionFunc = actionFunc;
|
||||
}
|
||||
|
||||
#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_M_Thunder/func_80A9F408.s")
|
||||
void EnMThunder_Init(Actor* thisx, GlobalContext* globalCtx2) {
|
||||
GlobalContext* globalCtx = globalCtx2;
|
||||
EnMThunder* this = THIS;
|
||||
Player* player = PLAYER;
|
||||
|
||||
#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_M_Thunder/func_80A9F938.s")
|
||||
Collider_InitCylinder(globalCtx, &this->collider);
|
||||
Collider_SetCylinder(globalCtx, &this->collider, &this->actor, &D_80AA0420);
|
||||
this->unk_1C7 = (this->actor.params & 0xFF) - 1;
|
||||
Lights_PointNoGlowSetInfo(&this->lightInfo, this->actor.world.pos.x, this->actor.world.pos.y,
|
||||
this->actor.world.pos.z, 255, 255, 255, 0);
|
||||
this->lightNode = LightContext_InsertLight(globalCtx, &globalCtx->lightCtx, &this->lightInfo);
|
||||
this->collider.dim.radius = 0;
|
||||
this->collider.dim.height = 40;
|
||||
this->collider.dim.yShift = -20;
|
||||
this->unk_1C4 = 8;
|
||||
this->unk_1B4 = 0.0f;
|
||||
this->actor.world.pos = player->bodyPartsPos[0];
|
||||
this->unk_1AC = 0.0f;
|
||||
this->unk_1BC = 0.0f;
|
||||
this->actor.shape.rot.y = player->actor.shape.rot.y + 0x8000;
|
||||
this->actor.room = -1;
|
||||
Actor_SetScale(&this->actor, 0.1f);
|
||||
this->unk_1CA = 0;
|
||||
|
||||
#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_M_Thunder/func_80A9F9B4.s")
|
||||
if (player->stateFlags2 & 0x20000) {
|
||||
if (!gSaveContext.magicAcquired || gSaveContext.unk_13F0 ||
|
||||
(((this->actor.params & 0xFF00) >> 8) &&
|
||||
!(func_80087708(globalCtx, (this->actor.params & 0xFF00) >> 8, 0)))) {
|
||||
Audio_PlaySoundGeneral(NA_SE_IT_ROLLING_CUT, &player->actor.projectedPos, 4, &D_801333E0, &D_801333E0,
|
||||
&D_801333E8);
|
||||
Audio_PlaySoundGeneral(NA_SE_IT_SWORD_SWING_HARD, &player->actor.projectedPos, 4, &D_801333E0, &D_801333E0,
|
||||
&D_801333E8);
|
||||
Actor_Kill(&this->actor);
|
||||
return;
|
||||
}
|
||||
|
||||
#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_M_Thunder/EnMThunder_Update.s")
|
||||
player->stateFlags2 &= ~0x20000;
|
||||
this->unk_1CA = 1;
|
||||
this->collider.info.toucher.dmgFlags = D_80AA044C[this->unk_1C7];
|
||||
this->unk_1C6 = 1;
|
||||
this->unk_1C9 = ((this->unk_1C7 == 1) ? 2 : 4);
|
||||
func_80A9EFE0(this, func_80A9F9B4);
|
||||
this->unk_1C4 = 8;
|
||||
Audio_PlaySoundGeneral(NA_SE_IT_ROLLING_CUT_LV1, &player->actor.projectedPos, 4, &D_801333E0, &D_801333E0,
|
||||
&D_801333E8);
|
||||
this->unk_1AC = 1.0f;
|
||||
} else {
|
||||
func_80A9EFE0(this, func_80A9F408);
|
||||
}
|
||||
this->actor.child = NULL;
|
||||
}
|
||||
|
||||
void EnMThunder_Destroy(Actor* thisx, GlobalContext* globalCtx) {
|
||||
EnMThunder* this = THIS;
|
||||
|
||||
if (this->unk_1CA != 0) {
|
||||
func_800876C8(globalCtx);
|
||||
}
|
||||
|
||||
Collider_DestroyCylinder(globalCtx, &this->collider);
|
||||
func_80A9F314(globalCtx, 0.0f);
|
||||
LightContext_RemoveLight(globalCtx, &globalCtx->lightCtx, this->lightNode);
|
||||
}
|
||||
|
||||
void func_80A9F314(GlobalContext* globalCtx, f32 arg1) {
|
||||
func_800773A8(globalCtx, arg1, 850.0f, 0.2f, 0.0f);
|
||||
}
|
||||
|
||||
void func_80A9F350(EnMThunder* this, GlobalContext* globalCtx) {
|
||||
Player* player = PLAYER;
|
||||
|
||||
if (player->stateFlags2 & 0x20000) {
|
||||
if (player->swordAnimation >= 0x18) {
|
||||
Audio_PlaySoundGeneral(NA_SE_IT_ROLLING_CUT, &player->actor.projectedPos, 4, &D_801333E0, &D_801333E0,
|
||||
&D_801333E8);
|
||||
Audio_PlaySoundGeneral(NA_SE_IT_SWORD_SWING_HARD, &player->actor.projectedPos, 4, &D_801333E0, &D_801333E0,
|
||||
&D_801333E8);
|
||||
}
|
||||
|
||||
Actor_Kill(&this->actor);
|
||||
return;
|
||||
}
|
||||
|
||||
if (!(player->stateFlags1 & 0x1000)) {
|
||||
Actor_Kill(&this->actor);
|
||||
}
|
||||
}
|
||||
|
||||
void func_80A9F408(EnMThunder* this, GlobalContext* globalCtx) {
|
||||
Player* player = PLAYER;
|
||||
Actor* child = this->actor.child;
|
||||
|
||||
this->unk_1B8 = player->unk_858;
|
||||
this->actor.world.pos = player->bodyPartsPos[0];
|
||||
this->actor.shape.rot.y = player->actor.shape.rot.y + 0x8000;
|
||||
|
||||
if (this->unk_1CA == 0) {
|
||||
if (player->unk_858 >= 0.1f) {
|
||||
if ((gSaveContext.unk_13F0) || (((this->actor.params & 0xFF00) >> 8) &&
|
||||
!(func_80087708(globalCtx, (this->actor.params & 0xFF00) >> 8, 4)))) {
|
||||
func_80A9F350(this, globalCtx);
|
||||
func_80A9EFE0(this, func_80A9F350);
|
||||
this->unk_1C8 = 0;
|
||||
this->unk_1BC = 0.0;
|
||||
this->unk_1AC = 0.0f;
|
||||
return;
|
||||
}
|
||||
|
||||
this->unk_1CA = 1;
|
||||
}
|
||||
}
|
||||
|
||||
if (player->unk_858 >= 0.1f) {
|
||||
func_800AA000(0.0f, (s32)(player->unk_858 * 150.0f) & 0xFF, 2, (s32)(player->unk_858 * 150.0f) & 0xFF);
|
||||
}
|
||||
|
||||
if (player->stateFlags2 & 0x20000) {
|
||||
if ((child != NULL) && (child->update != NULL)) {
|
||||
child->parent = NULL;
|
||||
}
|
||||
|
||||
if (player->unk_858 <= 0.15f) {
|
||||
if ((player->unk_858 >= 0.1f) && (player->swordAnimation >= 0x18)) {
|
||||
Audio_PlaySoundGeneral(NA_SE_IT_ROLLING_CUT, &player->actor.projectedPos, 4, &D_801333E0, &D_801333E0,
|
||||
&D_801333E8);
|
||||
Audio_PlaySoundGeneral(NA_SE_IT_SWORD_SWING_HARD, &player->actor.projectedPos, 4, &D_801333E0,
|
||||
&D_801333E0, &D_801333E8);
|
||||
}
|
||||
Actor_Kill(&this->actor);
|
||||
return;
|
||||
} else {
|
||||
player->stateFlags2 &= ~0x20000;
|
||||
if ((this->actor.params & 0xFF00) >> 8) {
|
||||
gSaveContext.unk_13F0 = 1;
|
||||
}
|
||||
if (player->unk_858 < 0.85f) {
|
||||
this->collider.info.toucher.dmgFlags = D_80AA044C[this->unk_1C7];
|
||||
this->unk_1C6 = 1;
|
||||
this->unk_1C9 = ((this->unk_1C7 == 1) ? 2 : 4);
|
||||
} else {
|
||||
this->collider.info.toucher.dmgFlags = D_80AA0458[this->unk_1C7];
|
||||
this->unk_1C6 = 0;
|
||||
this->unk_1C9 = ((this->unk_1C7 == 1) ? 4 : 8);
|
||||
}
|
||||
|
||||
func_80A9EFE0(this, func_80A9F9B4);
|
||||
this->unk_1C4 = 8;
|
||||
Audio_PlaySoundGeneral(sSfxIds[this->unk_1C6], &player->actor.projectedPos, 4, &D_801333E0, &D_801333E0,
|
||||
&D_801333E8);
|
||||
this->unk_1AC = 1.0f;
|
||||
return;
|
||||
}
|
||||
}
|
||||
|
||||
if (!(player->stateFlags1 & 0x1000)) {
|
||||
if (this->actor.child != NULL) {
|
||||
this->actor.child->parent = NULL;
|
||||
}
|
||||
Actor_Kill(&this->actor);
|
||||
return;
|
||||
}
|
||||
|
||||
if (player->unk_858 > 0.15f) {
|
||||
this->unk_1C8 = 255;
|
||||
if (this->actor.child == NULL) {
|
||||
Actor_SpawnAsChild(&globalCtx->actorCtx, &this->actor, globalCtx, ACTOR_EFF_DUST, this->actor.world.pos.x,
|
||||
this->actor.world.pos.y, this->actor.world.pos.z, 0, this->actor.shape.rot.y, 0,
|
||||
this->unk_1C7 + 2);
|
||||
}
|
||||
this->unk_1BC += ((((player->unk_858 - 0.15f) * 1.5f) - this->unk_1BC) * 0.5f);
|
||||
|
||||
} else if (player->unk_858 > .1f) {
|
||||
this->unk_1C8 = (s32)((player->unk_858 - .1f) * 255.0f * 20.0f);
|
||||
this->unk_1AC = (player->unk_858 - .1f) * 10.0f;
|
||||
} else {
|
||||
this->unk_1C8 = 0;
|
||||
}
|
||||
|
||||
if (player->unk_858 > 0.85f) {
|
||||
func_800F4254(&player->actor.projectedPos, 2);
|
||||
} else if (player->unk_858 > 0.15f) {
|
||||
func_800F4254(&player->actor.projectedPos, 1);
|
||||
} else if (player->unk_858 > 0.1f) {
|
||||
func_800F4254(&player->actor.projectedPos, 0);
|
||||
}
|
||||
|
||||
if (Gameplay_InCsMode(globalCtx)) {
|
||||
Actor_Kill(&this->actor);
|
||||
}
|
||||
}
|
||||
|
||||
void func_80A9F938(EnMThunder* this, GlobalContext* globalCtx) {
|
||||
if (this->unk_1C4 < 2) {
|
||||
if (this->unk_1C8 < 40) {
|
||||
this->unk_1C8 = 0;
|
||||
} else {
|
||||
this->unk_1C8 -= 40;
|
||||
}
|
||||
}
|
||||
|
||||
this->unk_1B4 += 2.0f * this->unk_1B0;
|
||||
|
||||
if (this->unk_1BC < this->unk_1AC) {
|
||||
this->unk_1BC += ((this->unk_1AC - this->unk_1BC) * 0.1f);
|
||||
} else {
|
||||
this->unk_1BC = this->unk_1AC;
|
||||
}
|
||||
}
|
||||
|
||||
void func_80A9F9B4(EnMThunder* this, GlobalContext* globalCtx) {
|
||||
Player* player = PLAYER;
|
||||
|
||||
if (Math_StepToF(&this->unk_1AC, 0.0f, 0.0625f)) {
|
||||
Actor_Kill(&this->actor);
|
||||
} else {
|
||||
Math_SmoothStepToF(&this->actor.scale.x, (s32)this->unk_1C9, 0.6f, 0.8f, 0.0f);
|
||||
Actor_SetScale(&this->actor, this->actor.scale.x);
|
||||
this->collider.dim.radius = (this->actor.scale.x * 25.0f);
|
||||
Collider_UpdateCylinder(&this->actor, &this->collider);
|
||||
CollisionCheck_SetAT(globalCtx, &globalCtx->colChkCtx, &this->collider.base);
|
||||
}
|
||||
|
||||
if (this->unk_1C4 > 0) {
|
||||
this->actor.world.pos.x = player->bodyPartsPos[0].x;
|
||||
this->actor.world.pos.z = player->bodyPartsPos[0].z;
|
||||
this->unk_1C4--;
|
||||
}
|
||||
|
||||
if (this->unk_1AC > 0.6f) {
|
||||
this->unk_1B0 = 1.0f;
|
||||
} else {
|
||||
this->unk_1B0 = this->unk_1AC * 1.6666666f;
|
||||
}
|
||||
|
||||
func_80A9F938(this, globalCtx);
|
||||
|
||||
if (Gameplay_InCsMode(globalCtx)) {
|
||||
Actor_Kill(&this->actor);
|
||||
}
|
||||
}
|
||||
|
||||
void EnMThunder_Update(Actor* thisx, GlobalContext* globalCtx) {
|
||||
EnMThunder* this = THIS;
|
||||
f32 blueRadius;
|
||||
s32 redGreen;
|
||||
|
||||
this->actionFunc(this, globalCtx);
|
||||
func_80A9F314(globalCtx, this->unk_1BC);
|
||||
blueRadius = this->unk_1AC;
|
||||
redGreen = (u32)(blueRadius * 255.0f) & 0xFF;
|
||||
Lights_PointNoGlowSetInfo(&this->lightInfo, this->actor.world.pos.x, this->actor.world.pos.y,
|
||||
this->actor.world.pos.z, redGreen, redGreen, (u32)(blueRadius * 100.0f),
|
||||
(s32)(blueRadius * 800.0f));
|
||||
}
|
||||
|
||||
#ifdef NON_MATCHING
|
||||
void EnMThunder_Draw(Actor* thisx, GlobalContext* globalCtx2) {
|
||||
static f32 D_80AA046C[] = { 0.1f, 0.15f, 0.2f, 0.25f, 0.3f, 0.25f, 0.2f, 0.15f };
|
||||
GlobalContext* globalCtx = globalCtx2;
|
||||
EnMThunder* this = THIS;
|
||||
Player* player = PLAYER;
|
||||
f32 phi_f14;
|
||||
s32 phi_t1;
|
||||
// u8 frames;
|
||||
|
||||
if (1) {}
|
||||
|
||||
OPEN_DISPS(globalCtx->state.gfxCtx, "../z_en_m_thunder.c", 844);
|
||||
func_80093D84(globalCtx->state.gfxCtx);
|
||||
Matrix_Scale(0.02f, 0.02f, 0.02f, MTXMODE_APPLY);
|
||||
gSPMatrix(POLY_XLU_DISP++, Matrix_NewMtx(globalCtx->state.gfxCtx, "../z_en_m_thunder.c", 853),
|
||||
G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW);
|
||||
|
||||
if (((this->unk_1C6 & 0xFF) == 0) || ((this->unk_1C6) == 1)) {
|
||||
gSPSegment(POLY_XLU_DISP++, 0x08,
|
||||
Gfx_TwoTexScroll(globalCtx->state.gfxCtx, 0, 0xFF - ((s8)(this->unk_1B4 * 30) & 0xFF), 0, 0x40, 0x20,
|
||||
1, 0xFF - ((s8)(this->unk_1B4 * 20) & 0xFF), 0, 8, 8));
|
||||
if (1) {}
|
||||
}
|
||||
|
||||
switch (this->unk_1C6) {
|
||||
case 0:
|
||||
gDPSetPrimColor(POLY_XLU_DISP++, 0, 0x80, 255, 255, 170, (u8)((u32)(this->unk_1B0 * 255) & 0xFF));
|
||||
gSPDisplayList(POLY_XLU_DISP++, D_04012AF0);
|
||||
gSPDisplayList(POLY_XLU_DISP++, D_04012C10);
|
||||
break;
|
||||
case 1:
|
||||
gDPSetPrimColor(POLY_XLU_DISP++, 0, 0x80, 170, 255, 255, (u8)((u32)(this->unk_1B0 * 255) & 0xFF));
|
||||
gSPDisplayList(POLY_XLU_DISP++, D_04012570);
|
||||
gSPDisplayList(POLY_XLU_DISP++, D_04012690);
|
||||
break;
|
||||
}
|
||||
|
||||
Matrix_Mult(&player->mf_9E0, MTXMODE_NEW);
|
||||
|
||||
switch (this->unk_1C7) {
|
||||
case 1:
|
||||
Matrix_Translate(0.0f, 220.0f, 0.0f, MTXMODE_APPLY);
|
||||
Matrix_Scale(-0.7f, -0.6f, -0.4f, MTXMODE_APPLY);
|
||||
Matrix_RotateX(16384.0f, MTXMODE_APPLY);
|
||||
break;
|
||||
case 0:
|
||||
Matrix_Translate(0.0f, 300.0f, -100.0f, MTXMODE_APPLY);
|
||||
Matrix_Scale(-1.2f, -1.0f, -0.7f, MTXMODE_APPLY);
|
||||
Matrix_RotateX(16384.0f, MTXMODE_APPLY);
|
||||
break;
|
||||
case 2:
|
||||
Matrix_Translate(200.0f, 350.0f, 0.0f, MTXMODE_APPLY);
|
||||
Matrix_Scale(-1.8f, -1.4f, -0.7f, MTXMODE_APPLY);
|
||||
Matrix_RotateX(16384.0f, MTXMODE_APPLY);
|
||||
break;
|
||||
}
|
||||
|
||||
if (this->unk_1B8 >= 0.85f) {
|
||||
phi_f14 = (D_80AA046C[(globalCtx->gameplayFrames & 7)] * 6.0f) + 1.0f;
|
||||
gDPSetPrimColor(POLY_XLU_DISP++, 0, 0x80, 255, 255, 170, this->unk_1C8);
|
||||
gDPSetEnvColor(POLY_XLU_DISP++, 255, 100, 0, 128);
|
||||
phi_t1 = 0x28;
|
||||
} else {
|
||||
phi_f14 = (D_80AA046C[globalCtx->gameplayFrames & 7] * 2.0f) + 1.0f;
|
||||
gDPSetPrimColor(POLY_XLU_DISP++, 0, 0x80, 170, 255, 255, this->unk_1C8);
|
||||
gDPSetEnvColor(POLY_XLU_DISP++, 0, 100, 255, 128);
|
||||
phi_t1 = 0x14;
|
||||
}
|
||||
Matrix_Scale(1.0f, phi_f14, phi_f14, MTXMODE_APPLY);
|
||||
gSPMatrix(POLY_XLU_DISP++, Matrix_NewMtx(globalCtx->state.gfxCtx, "../z_en_m_thunder.c", 960),
|
||||
G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW);
|
||||
|
||||
// redGreen_14 = temp_s0->polyXlu.p;
|
||||
// temp_s0->polyXlu.p = redGreen_14 + 8;
|
||||
// redGreen_14->words.w0 = 0xDB060024;
|
||||
// temp_v1_3 = temp_t2->unk1DE4;
|
||||
// temp_v1_3 = globalCtx->gameplayFrames;
|
||||
// sp50 = redGreen_14;
|
||||
// sp50->words.w1 = Gfx_TwoTexScroll(globalCtx->state.gfxCtx, 0, (temp_v1_3 * 5) & 0xFF, 0U, 0x20, 0x20, 1,
|
||||
// (temp_v1_3 * 0x14) & 0xFF, (temp_v1_3 * temp_t1) & 0xFF, 8, 8);
|
||||
// frames = globalCtx->gameplayFrames;
|
||||
gSPSegment(POLY_XLU_DISP++, 0x09,
|
||||
Gfx_TwoTexScroll(globalCtx->state.gfxCtx, 0, (globalCtx->gameplayFrames * 5) & 0xFF, 0, 0x20, 0x20, 1,
|
||||
(globalCtx->gameplayFrames * 0x14) & 0xFF,
|
||||
(u8)(globalCtx->gameplayFrames * phi_t1) & 0xFF, 8, 8));
|
||||
|
||||
gSPDisplayList(POLY_XLU_DISP++, D_04013610);
|
||||
|
||||
CLOSE_DISPS(globalCtx->state.gfxCtx, "../z_en_m_thunder.c", 1031);
|
||||
}
|
||||
#else
|
||||
f32 D_80AA046C[] = { 0.1f, 0.15f, 0.2f, 0.25f, 0.3f, 0.25f, 0.2f, 0.15f };
|
||||
#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_M_Thunder/EnMThunder_Draw.s")
|
||||
#endif
|
||||
|
|
|
|||
|
|
@ -6,9 +6,25 @@
|
|||
|
||||
struct EnMThunder;
|
||||
|
||||
typedef void (*EnMThunderActionFunc)(struct EnMThunder*, GlobalContext*);
|
||||
|
||||
typedef struct EnMThunder {
|
||||
/* 0x0000 */ Actor actor;
|
||||
/* 0x014C */ char unk_14C[0x80];
|
||||
/* 0x014C */ ColliderCylinder collider;
|
||||
/* 0x0198 */ LightNode* lightNode;
|
||||
/* 0x019C */ LightInfo lightInfo;
|
||||
/* 0x01AC */ f32 unk_1AC;
|
||||
/* 0x01B0 */ f32 unk_1B0;
|
||||
/* 0x01B0 */ f32 unk_1B4;
|
||||
/* 0x01B0 */ f32 unk_1B8;
|
||||
/* 0x01BC */ f32 unk_1BC;
|
||||
/* 0x01C0 */ EnMThunderActionFunc actionFunc;
|
||||
/* 0x01C4 */ u16 unk_1C4;
|
||||
/* 0x01C6 */ u8 unk_1C6;
|
||||
/* 0x01C7 */ u8 unk_1C7;
|
||||
/* 0x01C8 */ u8 unk_1C8;
|
||||
/* 0x01C9 */ u8 unk_1C9;
|
||||
/* 0x01CA */ u8 unk_1CA;
|
||||
} EnMThunder; // size = 0x01CC
|
||||
|
||||
extern const ActorInit En_M_Thunder_InitVars;
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue