d_a_dmidna OK / f_op + misc cleanup (#276)

* some f_op / d_insect cleanup

* rename some vars according to tww

* d_a_dmidna OK

* remove asm
This commit is contained in:
TakaRikka
2023-02-10 09:07:47 -08:00
committed by GitHub
parent 68f5b6d05a
commit 67a2c83b9b
73 changed files with 5635 additions and 20433 deletions
+82 -228
View File
@@ -1,273 +1,127 @@
//
// Generated By: dol2asm
// Translation Unit: d_a_dmidna
//
/**
* d_a_dmidna.cpp
* Dying Midna Actor
*/
#include "rel/d/a/d_a_dmidna/d_a_dmidna.h"
#include "dol2asm.h"
#include "dolphin/types.h"
//
// Types:
//
struct request_of_phase_process_class {};
struct cXyz {};
struct mDoMtx_stack_c {
/* 8000CD64 */ void transS(cXyz const&);
static u8 now[48];
};
struct mDoExt_McaMorfCallBack2_c {};
struct mDoExt_McaMorfCallBack1_c {};
struct J3DAnmTransform {};
struct J3DModelData {};
struct Z2Creature {};
struct mDoExt_McaMorfSO {
/* 800107D0 */ mDoExt_McaMorfSO(J3DModelData*, mDoExt_McaMorfCallBack1_c*,
mDoExt_McaMorfCallBack2_c*, J3DAnmTransform*, int, f32, int,
int, Z2Creature*, u32, u32);
/* 800110B0 */ void play(u32, s8);
/* 800111EC */ void modelCalc();
};
struct fopAc_ac_c {
/* 80018B64 */ fopAc_ac_c();
/* 80018C8C */ ~fopAc_ac_c();
};
struct daDmidna_c {
/* 8045CED8 */ void createHeap();
/* 8045CFE4 */ void create();
/* 8045D0B4 */ ~daDmidna_c();
/* 8045D144 */ void setMatrix();
/* 8045D1A0 */ void execute();
/* 8045D204 */ void draw();
};
struct dKy_tevstr_c {};
struct dScnKy_env_light_c {
/* 801A37C4 */ void settingTevStruct(int, cXyz*, dKy_tevstr_c*);
/* 801A4DA0 */ void setLightTevColorType_MAJI(J3DModelData*, dKy_tevstr_c*);
};
struct dRes_info_c {};
struct dRes_control_c {
/* 8003C2EC */ void getRes(char const*, s32, dRes_info_c*, int);
};
struct J3DModel {};
//
// Forward References:
//
extern "C" void createHeap__10daDmidna_cFv();
extern "C" static void daDmidna_createHeap__FP10fopAc_ac_c();
extern "C" void create__10daDmidna_cFv();
extern "C" static void daDmidna_Create__FP10fopAc_ac_c();
extern "C" void __dt__10daDmidna_cFv();
extern "C" static void daDmidna_Delete__FP10daDmidna_c();
extern "C" void setMatrix__10daDmidna_cFv();
extern "C" void execute__10daDmidna_cFv();
extern "C" static void daDmidna_Execute__FP10daDmidna_c();
extern "C" void draw__10daDmidna_cFv();
extern "C" static void daDmidna_Draw__FP10daDmidna_c();
extern "C" extern void* g_profile_DMIDNA[12];
//
// External References:
//
extern "C" void mDoMtx_YrotM__FPA4_fs();
extern "C" void transS__14mDoMtx_stack_cFRC4cXyz();
extern "C" void mDoExt_modelEntryDL__FP8J3DModel();
extern "C" void
__ct__16mDoExt_McaMorfSOFP12J3DModelDataP25mDoExt_McaMorfCallBack1_cP25mDoExt_McaMorfCallBack2_cP15J3DAnmTransformifiiP10Z2CreatureUlUl();
extern "C" void play__16mDoExt_McaMorfSOFUlSc();
extern "C" void modelCalc__16mDoExt_McaMorfSOFv();
extern "C" void __ct__10fopAc_ac_cFv();
extern "C" void __dt__10fopAc_ac_cFv();
extern "C" void fopAcM_entrySolidHeap__FP10fopAc_ac_cPFP10fopAc_ac_c_iUl();
extern "C" void dComIfG_resLoad__FP30request_of_phase_process_classPCc();
extern "C" void dComIfG_resDelete__FP30request_of_phase_process_classPCc();
extern "C" void getRes__14dRes_control_cFPCclP11dRes_info_ci();
extern "C" void settingTevStruct__18dScnKy_env_light_cFiP4cXyzP12dKy_tevstr_c();
extern "C" void setLightTevColorType_MAJI__18dScnKy_env_light_cFP12J3DModelDataP12dKy_tevstr_c();
extern "C" void* __nw__FUl();
extern "C" void __dl__FPv();
extern "C" void PSMTXCopy();
extern "C" void _savegpr_28();
extern "C" void _restgpr_28();
extern "C" extern void* g_fopAc_Method[8];
extern "C" extern void* g_fpcLf_Method[5 + 1 /* padding */];
extern "C" u8 now__14mDoMtx_stack_c[48];
extern "C" extern u8 g_dComIfG_gameInfo[122384];
extern "C" extern u8 g_env_light[4880];
//
// Declarations:
//
/* ############################################################################################## */
/* 8045D290-8045D298 000000 0007+01 3/3 0/0 0/0 .rodata l_arcName */
SECTION_RODATA static u8 const l_arcName[7 + 1 /* padding */] = {
0x44,
0x6D,
0x69,
0x64,
0x6E,
0x61,
0x00,
/* padding */
0x00,
};
COMPILER_STRIP_GATE(0x8045D290, &l_arcName);
/* 8045D298-8045D29C 000008 0004+00 1/1 0/0 0/0 .rodata @3769 */
SECTION_RODATA static f32 const lit_3769 = 1.0f;
COMPILER_STRIP_GATE(0x8045D298, &lit_3769);
static const char l_arcName[] = "Dmidna";
/* 8045CED8-8045CFC4 000078 00EC+00 1/1 0/0 0/0 .text createHeap__10daDmidna_cFv */
#pragma push
#pragma optimization_level 0
#pragma optimizewithasm off
asm void daDmidna_c::createHeap() {
nofralloc
#include "asm/rel/d/a/d_a_dmidna/d_a_dmidna/createHeap__10daDmidna_cFv.s"
int daDmidna_c::createHeap() {
mpModelMorf = new mDoExt_McaMorfSO((J3DModelData*)dComIfG_getObjectRes(l_arcName, 8), NULL,
NULL, (J3DAnmTransform*)dComIfG_getObjectRes(l_arcName, 4),
2, 1.0f, 0, -1, NULL, 0, 0);
if (mpModelMorf == NULL || mpModelMorf->getModel() == NULL) {
return 0;
}
return 1;
}
#pragma pop
/* 8045CFC4-8045CFE4 000164 0020+00 1/1 0/0 0/0 .text daDmidna_createHeap__FP10fopAc_ac_c
*/
#pragma push
#pragma optimization_level 0
#pragma optimizewithasm off
static asm void daDmidna_createHeap(fopAc_ac_c* param_0) {
nofralloc
#include "asm/rel/d/a/d_a_dmidna/d_a_dmidna/daDmidna_createHeap__FP10fopAc_ac_c.s"
static int daDmidna_createHeap(fopAc_ac_c* i_this) {
return static_cast<daDmidna_c*>(i_this)->createHeap();
}
#pragma pop
/* 8045CFE4-8045D094 000184 00B0+00 1/1 0/0 0/0 .text create__10daDmidna_cFv */
#pragma push
#pragma optimization_level 0
#pragma optimizewithasm off
asm void daDmidna_c::create() {
nofralloc
#include "asm/rel/d/a/d_a_dmidna/d_a_dmidna/create__10daDmidna_cFv.s"
int daDmidna_c::create() {
if (!fopAcM_CheckCondition(this, 8)) {
new (this) daDmidna_c();
fopAcM_OnCondition(this, 8);
}
int phase = dComIfG_resLoad(&mPhase, l_arcName);
if (phase == cPhs_COMPLEATE_e) {
if (!fopAcM_entrySolidHeap(this, daDmidna_createHeap, 0xAEE0)) {
return cPhs_ERROR_e;
}
model = mpModelMorf->getModel();
setMatrix();
}
return phase;
}
#pragma pop
/* 8045D094-8045D0B4 000234 0020+00 1/0 0/0 0/0 .text daDmidna_Create__FP10fopAc_ac_c */
#pragma push
#pragma optimization_level 0
#pragma optimizewithasm off
static asm void daDmidna_Create(fopAc_ac_c* param_0) {
nofralloc
#include "asm/rel/d/a/d_a_dmidna/d_a_dmidna/daDmidna_Create__FP10fopAc_ac_c.s"
static int daDmidna_Create(fopAc_ac_c* i_this) {
return static_cast<daDmidna_c*>(i_this)->create();
}
#pragma pop
/* 8045D0B4-8045D11C 000254 0068+00 1/1 0/0 0/0 .text __dt__10daDmidna_cFv */
#pragma push
#pragma optimization_level 0
#pragma optimizewithasm off
asm daDmidna_c::~daDmidna_c() {
nofralloc
#include "asm/rel/d/a/d_a_dmidna/d_a_dmidna/__dt__10daDmidna_cFv.s"
daDmidna_c::~daDmidna_c() {
dComIfG_resDelete(&mPhase, l_arcName);
}
#pragma pop
/* 8045D11C-8045D144 0002BC 0028+00 1/0 0/0 0/0 .text daDmidna_Delete__FP10daDmidna_c */
#pragma push
#pragma optimization_level 0
#pragma optimizewithasm off
static asm void daDmidna_Delete(daDmidna_c* param_0) {
nofralloc
#include "asm/rel/d/a/d_a_dmidna/d_a_dmidna/daDmidna_Delete__FP10daDmidna_c.s"
static int daDmidna_Delete(daDmidna_c* i_this) {
i_this->~daDmidna_c();
return 1;
}
#pragma pop
/* 8045D144-8045D1A0 0002E4 005C+00 2/2 0/0 0/0 .text setMatrix__10daDmidna_cFv */
#pragma push
#pragma optimization_level 0
#pragma optimizewithasm off
asm void daDmidna_c::setMatrix() {
nofralloc
#include "asm/rel/d/a/d_a_dmidna/d_a_dmidna/setMatrix__10daDmidna_cFv.s"
void daDmidna_c::setMatrix() {
mDoMtx_stack_c::transS(current.pos);
mDoMtx_stack_c::YrotM(shape_angle.y);
model->i_setBaseTRMtx(mDoMtx_stack_c::get());
mpModelMorf->modelCalc();
}
#pragma pop
/* 8045D1A0-8045D1E4 000340 0044+00 1/1 0/0 0/0 .text execute__10daDmidna_cFv */
#pragma push
#pragma optimization_level 0
#pragma optimizewithasm off
asm void daDmidna_c::execute() {
nofralloc
#include "asm/rel/d/a/d_a_dmidna/d_a_dmidna/execute__10daDmidna_cFv.s"
int daDmidna_c::execute() {
mpModelMorf->play(0, 0);
setMatrix();
return 1;
}
#pragma pop
/* 8045D1E4-8045D204 000384 0020+00 1/0 0/0 0/0 .text daDmidna_Execute__FP10daDmidna_c */
#pragma push
#pragma optimization_level 0
#pragma optimizewithasm off
static asm void daDmidna_Execute(daDmidna_c* param_0) {
nofralloc
#include "asm/rel/d/a/d_a_dmidna/d_a_dmidna/daDmidna_Execute__FP10daDmidna_c.s"
static int daDmidna_Execute(daDmidna_c* i_this) {
return i_this->execute();
}
#pragma pop
/* 8045D204-8045D268 0003A4 0064+00 1/1 0/0 0/0 .text draw__10daDmidna_cFv */
#pragma push
#pragma optimization_level 0
#pragma optimizewithasm off
asm void daDmidna_c::draw() {
nofralloc
#include "asm/rel/d/a/d_a_dmidna/d_a_dmidna/draw__10daDmidna_cFv.s"
int daDmidna_c::draw() {
g_env_light.settingTevStruct(0, &current.pos, &mTevStr);
g_env_light.setLightTevColorType_MAJI(model, &mTevStr);
mDoExt_modelEntryDL(model);
return 1;
}
#pragma pop
/* 8045D268-8045D288 000408 0020+00 1/0 0/0 0/0 .text daDmidna_Draw__FP10daDmidna_c */
#pragma push
#pragma optimization_level 0
#pragma optimizewithasm off
static asm void daDmidna_Draw(daDmidna_c* param_0) {
nofralloc
#include "asm/rel/d/a/d_a_dmidna/d_a_dmidna/daDmidna_Draw__FP10daDmidna_c.s"
static int daDmidna_Draw(daDmidna_c* i_this) {
return i_this->draw();
}
#pragma pop
/* ############################################################################################## */
/* 8045D29C-8045D2BC -00001 0020+00 1/0 0/0 0/0 .data l_daDmidna_Method */
SECTION_DATA static void* l_daDmidna_Method[8] = {
(void*)daDmidna_Create__FP10fopAc_ac_c,
(void*)daDmidna_Delete__FP10daDmidna_c,
(void*)daDmidna_Execute__FP10daDmidna_c,
(void*)NULL,
(void*)daDmidna_Draw__FP10daDmidna_c,
(void*)NULL,
(void*)NULL,
(void*)NULL,
static actor_method_class l_daDmidna_Method = {
(process_method_func)daDmidna_Create, (process_method_func)daDmidna_Delete,
(process_method_func)daDmidna_Execute, (process_method_func)NULL,
(process_method_func)daDmidna_Draw,
};
/* 8045D2BC-8045D2EC -00001 0030+00 0/0 0/0 1/0 .data g_profile_DMIDNA */
SECTION_DATA extern void* g_profile_DMIDNA[12] = {
(void*)0xFFFFFFFD, (void*)0x0007FFFD,
(void*)0x02D80000, (void*)&g_fpcLf_Method,
(void*)0x00000578, (void*)NULL,
(void*)NULL, (void*)&g_fopAc_Method,
(void*)0x005D0000, (void*)&l_daDmidna_Method,
(void*)0x00060000, (void*)0x03000000,
extern actor_process_profile_definition g_profile_DMIDNA = {
-3,
7,
0xFFFD,
PROC_DMIDNA,
0,
&g_fpcLf_Method.mBase,
sizeof(daDmidna_c),
0,
0,
&g_fopAc_Method.base,
0x005D,
0,
0,
&l_daDmidna_Method,
0x00060000,
3,
0,
0,
0,
};