Decompile Bg_Fu_Kaiten. Add some method to generate overlays, refinement needed

This commit is contained in:
rozlette
2019-12-27 20:55:17 -06:00
parent 664bb49a5d
commit 37969fbe50
13 changed files with 238 additions and 203 deletions
+68
View File
@@ -0,0 +1,68 @@
#include <ultra64.h>
#include <global.h>
ActorInitData bgFuKaitenInitData = {
0x01AE,
1,
0,
0x30,
0x01A0,
0, 0,
sizeof(ActorBgFuKaiten),
(actor_func)&BgFuKaiten_Init,
(actor_func)&BgFuKaiten_Fini,
(actor_func)&BgFuKaiten_Main,
(actor_func)&BgFuKaiten_Draw
};
void BgFuKaiten_Init(ActorBgFuKaiten* this, GlobalContext* ctxt) {
UNK_TYPE pad0;
UNK_TYPE pad1;
BgMeshHeader* header = 0;
Actor_SetScale(&this->bg.base, 1.0);
BcCheck3_BgActorInit(&this->bg, 3);
BgCheck_RelocateMeshHeader(&object_fu_kaiten_002D30, &header);
this->bg.bgActorId = BgCheck_AddActorMesh(ctxt, &ctxt->bgCheckContext.dyna, &this->bg, header);
this->bouceHeight = 0.0;
this->rotationSpeed = 0;
this->bounceSpeed = 0;
this->bounce = 0;
}
void BgFuKaiten_Fini(ActorBgFuKaiten* this, GlobalContext* ctxt) {
BgCheck_RemoveActorMesh(ctxt, &ctxt->bgCheckContext.dyna, this->bg.bgActorId);
}
void BgFuKaiten_UpdateRotation(ActorBgFuKaiten* this) {
f32 f0;
this->bg.base.postDrawParams.rotation.y += this->rotationSpeed;
if (this->rotationSpeed > 0)
{
f0 = this->rotationSpeed * .002f;
func_8019FAD8(&this->bg.base.unkEC, 8310, f0);
}
}
void BgFuKaiten_UpdateHeight(ActorBgFuKaiten* this) {
this->bounce += this->bounceSpeed;
this->bg.base.unk24.pos.y = this->bg.base.initPosRot.pos.y + this->elevation + this->bouceHeight;
this->bg.base.unk24.pos.y -= this->bouceHeight * Lib_cos(this->bounce);
}
void BgFuKaiten_Main(ActorBgFuKaiten* this, GlobalContext* ctxt) {
BgFuKaiten_UpdateRotation(this);
BgFuKaiten_UpdateHeight(this);
}
void BgFuKaiten_Draw(ActorBgFuKaiten* this, GlobalContext* ctxt) {
GraphicsContext* gCtxt = ctxt->common.gCtxt;
UNK_TYPE pad;
func_8012C28C(gCtxt);
gSPMatrix(gCtxt->polyOpa.append++, SysMatrix_AppendStateToPolyOpaDisp(ctxt->common.gCtxt), G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW);
gSPDisplayList(gCtxt->polyOpa.append++, object_fu_kaiten_0005D0);
}
@@ -1,133 +0,0 @@
#include <ultra64.h>
#include <global.h>
typedef struct z_ActorBgFuKaiten_s {
/* 0x000 */ Actor baseActor;
/* 0x144 */ UNK_TYPE unk144;
/* 0x148 */ u8 pad0[0x18];
/* 0x160 */ f32 unk160;
/* 0x164 */ f32 unk164;
/* 0x168 */ s16 unk168;
/* 0x16A */ s16 unk16A;
/* 0x16C */ s16 unk16C;
/* 0x16E */ u8 pad1[0x2];
} z_ActorBgFuKaiten;
void z_bg_fu_kaiten_init(z_ActorBgFuKaiten* this, GlobalContext* ctxt);
void z_bg_fu_kaiten_fini(z_ActorBgFuKaiten* this, GlobalContext* ctxt);
UNK_RET func_80ACB4B4(z_ActorBgFuKaiten* this);
UNK_RET func_80ACB50C(z_ActorBgFuKaiten* this);
void z_bg_fu_kaiten_main(z_ActorBgFuKaiten* this, GlobalContext* ctxt);
void func_80ACB5A0(z_ActorBgFuKaiten* this, GlobalContext* ctxt);
ActorInitData bgBgFuKaitenInitVar = {
0x01AE,
1,
0,
0x30,
0x01A0,
sizeof(z_ActorBgFuKaiten),
(actor_func)z_bg_fu_kaiten_init,
(actor_func)z_bg_fu_kaiten_fini,
(actor_func)z_bg_fu_kaiten_main,
(actor_func)func_80ACB5A0
};
f32 D_80ACB650 = 0.002;
// Overlay info
GLOBAL_ASM(
.data
glabel D_80ACB654
/* 000149 0x80ACB654 */ .word 0x00000000
/* 000150 0x80ACB658 */ .word 0x00000000
/* 000151 0x80ACB65C */ .word 0x00000000
/* 000152 0x80ACB660 */ .word 0x00000230
/* 000153 0x80ACB664 */ .word 0x00000020
/* 000154 0x80ACB668 */ .word 0x00000010
/* 000155 0x80ACB66C */ .word 0x00000000
/* 000156 0x80ACB670 */ .word 0x00000008
/* 000157 0x80ACB674 */ .word 0x450000D8
/* 000158 0x80ACB678 */ .word 0x460000DC
/* 000159 0x80ACB67C */ .word 0x44000180
/* 000160 0x80ACB680 */ .word 0x44000188
/* 000161 0x80ACB684 */ .word 0x82000010
/* 000162 0x80ACB688 */ .word 0x82000014
/* 000163 0x80ACB68C */ .word 0x82000018
/* 000164 0x80ACB690 */ .word 0x8200001C
/* 000165 0x80ACB694 */ .word 0x00000000
/* 000166 0x80ACB698 */ .word 0x00000000
/* 000167 0x80ACB69C */ .word 0x00000040
)
void z_bg_fu_kaiten_init(z_ActorBgFuKaiten* this, GlobalContext* ctxt) {
UNK_TYPE pad0;
UNK_TYPE pad1;
UNK_TYPE sp24 = 0;
func_800B67E0((Actor*)this, 1.0);
func_800CAE10((Actor*)this, 3);
func_800C9564((UNK_TYPE)&D_06002D30, &sp24); // XXX: D_06002D30 is probably a constant
this->unk144 = func_800C6188(ctxt, &ctxt->unk880, (Actor*)this, sp24);
this->unk164 = 0.0;
this->unk168 = 0;
this->unk16A = 0;
this->unk16C = 0;
}
void z_bg_fu_kaiten_fini(z_ActorBgFuKaiten* this, GlobalContext* ctxt) {
func_800C64CC(ctxt, &ctxt->unk880, this->unk144);
}
UNK_RET func_80ACB4B4(z_ActorBgFuKaiten* this) {
s16 v0 = this->unk168;
f32 f0;
this->baseActor.unkBE += v0;
if (v0 > 0)
{
f0 = (f32)v0 * D_80ACB650;
func_8019FAD8(&this->baseActor.unkEC, 8310, f0);
}
}
UNK_RET func_80ACB50C(z_ActorBgFuKaiten* this) {
this->unk16C += this->unk16A;
this->baseActor.unk24.y = this->baseActor.unk8.y + this->unk160 + this->unk164;
this->baseActor.unk24.y -= this->unk164 * func_800FED44(this->unk16C);
}
void z_bg_fu_kaiten_main(z_ActorBgFuKaiten* this, GlobalContext* ctxt) {
func_80ACB4B4(this);
func_80ACB50C(this);
}
#ifdef NON_MATCHING
void func_80ACB5A0(z_ActorBgFuKaiten* this, GlobalContext* ctxt) {
GraphicsContext* sp24 = ctxt->unk0;
UNK_TYPE pad;
// XXX: register allocation is wrong here
func_8012C28C(sp24);
{
Gfx* v0 = sp24->unk2B0++;
v0->words.w0 = 0xDA380003;
v0->words.w1 = func_80181A40(ctxt->unk0);
}
{
Gfx* v0 = sp24->unk2B0++;
v0->words.w0 = 0xDE000000; v0->words.w1 = (u32)&D_060005D0; // XXX: D_060005D0 is probably a constant
}
}
#else
GLOBAL_ASM("./asm/nonmatching/ovl_Bg_Fu_Kaiten_0x80ACB400/func_80ACB5A0.asm")
#endif