d_a_obj_crystal OK

1 files changed, 123 insertions, 283 deletions

diff --git a/rel/d/a/obj/d_a_obj_crystal/d_a_obj_crystal.cpp b/rel/d/a/obj/d_a_obj_crystal/d_a_obj_crystal.cpp
index b8354cabaa..dffc11f020 100644
--- a/rel/d/a/obj/d_a_obj_crystal/d_a_obj_crystal.cpp
+++ b/rel/d/a/obj/d_a_obj_crystal/d_a_obj_crystal.cpp
@@ -1,333 +1,173 @@
-//
-// Generated By: dol2asm
-// Translation Unit: d_a_obj_crystal
-//
+/**
+ * d_a_obj_crystal.cpp
+ *
+ */
 
 #include "rel/d/a/obj/d_a_obj_crystal/d_a_obj_crystal.h"
-#include "dol2asm.h"
-#include "dolphin/types.h"
-
-//
-// Types:
-//
-
-struct request_of_phase_process_class {};
-
-struct csXyz {};
-
-struct cXyz {};
-
-struct mDoMtx_stack_c {
-    /* 8000CD64 */ void transS(cXyz const&);
-    /* 8000CF44 */ void ZXYrotM(csXyz const&);
-
-    static u8 now[48];
-};
-
-struct fopAc_ac_c {
-    /* 80018B64 */ fopAc_ac_c();
-};
-
-struct daObjCrystal_c {
-    /* 80BD63B8 */ void initBaseMtx();
-    /* 80BD6410 */ void setBaseMtx();
-    /* 80BD6470 */ void Create();
-    /* 80BD65B0 */ void CreateHeap();
-    /* 80BD6664 */ void create();
-    /* 80BD6718 */ void execute();
-    /* 80BD673C */ void draw();
-    /* 80BD67C8 */ void _delete();
-};
-
-struct dKy_tevstr_c {};
-
-struct J3DModelData {};
-
-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 dPa_levelEcallBack {};
-
-struct _GXColor {};
-
-struct dPa_control_c {
-    /* 8004CA90 */ void set(u8, u16, cXyz const*, dKy_tevstr_c const*, csXyz const*, cXyz const*,
-                            u8, dPa_levelEcallBack*, s8, _GXColor const*, _GXColor const*,
-                            cXyz const*, f32);
-};
-
-struct JUTNameTab {
-    /* 802DEAF8 */ void getName(u16) const;
-};
-
-struct JGeometry {
-    template <typename A1>
-    struct TVec3 {};
-    /* TVec3<f32> */
-    struct TVec3__template0 {};
-};
-
-struct J3DModel {};
-
-//
-// Forward References:
-//
-
-extern "C" static void CheckCreateHeap__FP10fopAc_ac_c();
-extern "C" void initBaseMtx__14daObjCrystal_cFv();
-extern "C" void setBaseMtx__14daObjCrystal_cFv();
-extern "C" void Create__14daObjCrystal_cFv();
-extern "C" void CreateHeap__14daObjCrystal_cFv();
-extern "C" void create__14daObjCrystal_cFv();
-extern "C" void execute__14daObjCrystal_cFv();
-extern "C" void draw__14daObjCrystal_cFv();
-extern "C" void _delete__14daObjCrystal_cFv();
-extern "C" static void daObjCrystal_Draw__FP14daObjCrystal_c();
-extern "C" static void daObjCrystal_Execute__FP14daObjCrystal_c();
-extern "C" static void daObjCrystal_Delete__FP14daObjCrystal_c();
-extern "C" static void daObjCrystal_Create__FP14daObjCrystal_c();
-extern "C" extern char const* const d_a_obj_crystal__stringBase0;
-extern "C" extern void* g_profile_Obj_Crystal[12];
-
-//
-// External References:
-//
-
-extern "C" void transS__14mDoMtx_stack_cFRC4cXyz();
-extern "C" void ZXYrotM__14mDoMtx_stack_cFRC5csXyz();
-extern "C" void mDoExt_modelUpdateDL__FP8J3DModel();
-extern "C" void mDoExt_J3DModel__create__FP12J3DModelDataUlUl();
-extern "C" void __ct__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
-set__13dPa_control_cFUcUsPC4cXyzPC12dKy_tevstr_cPC5csXyzPC4cXyzUcP18dPa_levelEcallBackScPC8_GXColorPC8_GXColorPC4cXyzf();
-extern "C" void settingTevStruct__18dScnKy_env_light_cFiP4cXyzP12dKy_tevstr_c();
-extern "C" void setLightTevColorType_MAJI__18dScnKy_env_light_cFP12J3DModelDataP12dKy_tevstr_c();
-extern "C" void func_802807E0();
-extern "C" void getName__10JUTNameTabCFUs();
-extern "C" void PSMTXCopy();
-extern "C" void _savegpr_24();
-extern "C" void _savegpr_27();
-extern "C" void _savegpr_28();
-extern "C" void _restgpr_24();
-extern "C" void _restgpr_27();
-extern "C" void _restgpr_28();
-extern "C" void strcmp();
-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:
-//
+#include "JSystem/JKernel/JKRHeap.h"
+#include "d/com/d_com_inf_game.h"
+#include "d/d_procname.h"
 
 /* 80BD6398-80BD63B8 000078 0020+00 1/1 0/0 0/0 .text            CheckCreateHeap__FP10fopAc_ac_c */
-#pragma push
-#pragma optimization_level 0
-#pragma optimizewithasm off
-static asm void CheckCreateHeap(fopAc_ac_c* param_0) {
-    nofralloc
-#include "asm/rel/d/a/obj/d_a_obj_crystal/d_a_obj_crystal/CheckCreateHeap__FP10fopAc_ac_c.s"
+static int CheckCreateHeap(fopAc_ac_c* i_this) {
+    return static_cast<daObjCrystal_c*>(i_this)->CreateHeap();
 }
-#pragma pop
 
 /* 80BD63B8-80BD6410 000098 0058+00 1/1 0/0 0/0 .text            initBaseMtx__14daObjCrystal_cFv */
-#pragma push
-#pragma optimization_level 0
-#pragma optimizewithasm off
-asm void daObjCrystal_c::initBaseMtx() {
-    nofralloc
-#include "asm/rel/d/a/obj/d_a_obj_crystal/d_a_obj_crystal/initBaseMtx__14daObjCrystal_cFv.s"
+void daObjCrystal_c::initBaseMtx() {
+    mpModel[0]->setBaseScale(mScale);
+    mpModel[1]->setBaseScale(mScale);
+    setBaseMtx();
 }
-#pragma pop
 
 /* 80BD6410-80BD6470 0000F0 0060+00 2/2 0/0 0/0 .text            setBaseMtx__14daObjCrystal_cFv */
-#pragma push
-#pragma optimization_level 0
-#pragma optimizewithasm off
-asm void daObjCrystal_c::setBaseMtx() {
-    nofralloc
-#include "asm/rel/d/a/obj/d_a_obj_crystal/d_a_obj_crystal/setBaseMtx__14daObjCrystal_cFv.s"
-}
-#pragma pop
+void daObjCrystal_c::setBaseMtx() {
+    mDoMtx_stack_c::transS(current.pos);
+    mDoMtx_stack_c::ZXYrotM(shape_angle);
 
-/* ############################################################################################## */
-/* 80BD68BC-80BD68C0 000000 0004+00 2/2 0/0 0/0 .rodata          @3693 */
-SECTION_RODATA static f32 const lit_3693 = 1.0f;
-COMPILER_STRIP_GATE(0x80BD68BC, &lit_3693);
+    mpModel[0]->i_setBaseTRMtx(mDoMtx_stack_c::get());
+    mpModel[1]->i_setBaseTRMtx(mDoMtx_stack_c::get());
+}
 
-/* 80BD68D8-80BD68D8 00001C 0000+00 0/0 0/0 0/0 .rodata          @stringBase0 */
-#pragma push
-#pragma force_active on
-SECTION_DEAD static char const* const stringBase_80BD68D8 = "H_Suisho";
-SECTION_DEAD static char const* const stringBase_80BD68E1 = "polySurface1";
-#pragma pop
+/* 80BD68F0-80BD68F4 -00001 0004+00 3/3 0/0 0/0 .data            l_arcName */
+static char* l_arcName = "H_Suisho";
 
 /* 80BD6470-80BD65B0 000150 0140+00 1/1 0/0 0/0 .text            Create__14daObjCrystal_cFv */
-#pragma push
-#pragma optimization_level 0
-#pragma optimizewithasm off
-asm void daObjCrystal_c::Create() {
-    nofralloc
-#include "asm/rel/d/a/obj/d_a_obj_crystal/d_a_obj_crystal/Create__14daObjCrystal_cFv.s"
-}
-#pragma pop
+int daObjCrystal_c::Create() {
+    initBaseMtx();
+    fopAcM_SetMtx(this, mpModel[0]->getBaseTRMtx());
 
-/* ############################################################################################## */
-/* 80BD68C0-80BD68C8 000004 0008+00 0/1 0/0 0/0 .rodata          l_bmd$3697 */
-#pragma push
-#pragma force_active on
-SECTION_RODATA static u8 const l_bmd[8] = {
-    0x00, 0x00, 0x00, 0x04, 0x00, 0x00, 0x00, 0x07,
-};
-COMPILER_STRIP_GATE(0x80BD68C0, &l_bmd);
-#pragma pop
-
-/* 80BD68C8-80BD68D0 00000C 0008+00 0/1 0/0 0/0 .rodata          l_diff_flag$3698 */
-#pragma push
-#pragma force_active on
-SECTION_RODATA static u8 const l_diff_flag[8] = {
-    0x00, 0x00, 0x00, 0x00, 0x00, 0x08, 0x00, 0x00,
-};
-COMPILER_STRIP_GATE(0x80BD68C8, &l_diff_flag);
-#pragma pop
-
-/* 80BD68D0-80BD68D8 000014 0008+00 0/1 0/0 0/0 .rodata          l_flag$3699 */
-#pragma push
-#pragma force_active on
-SECTION_RODATA static u8 const l_flag[8] = {
-    0x19, 0x00, 0x00, 0x84, 0x11, 0x00, 0x00, 0x84,
-};
-COMPILER_STRIP_GATE(0x80BD68D0, &l_flag);
-#pragma pop
+    mpEmitter = dComIfGp_particle_set(0x8BED, &current.pos, &orig.angle, &mScale, 255, NULL, -1,
+                                      NULL, NULL, NULL);
+    mJointID = 0xFFFF;
 
-/* 80BD68F0-80BD68F4 -00001 0004+00 3/3 0/0 0/0 .data            l_arcName */
-SECTION_DATA static void* l_arcName = (void*)&d_a_obj_crystal__stringBase0;
+    JUTNameTab* joint_name = mpModel[0]->getModelData()->getJointTree().getJointName();
+    for (u16 i = 0; i < mpModel[0]->getModelData()->getJointNum(); i++) {
+        if (strcmp(joint_name->getName(i), "polySurface1") == 0) {
+            mJointID = i;
+        }
+    }
+
+    mpModel[0]->calc();
+
+    if (mpEmitter != NULL) {
+        mpEmitter->setGlobalRTMatrix(mpModel[0]->i_getAnmMtx(mJointID));
+    }
+
+    return 1;
+}
 
 /* 80BD65B0-80BD6664 000290 00B4+00 1/1 0/0 0/0 .text            CreateHeap__14daObjCrystal_cFv */
-#pragma push
-#pragma optimization_level 0
-#pragma optimizewithasm off
-asm void daObjCrystal_c::CreateHeap() {
-    nofralloc
-#include "asm/rel/d/a/obj/d_a_obj_crystal/d_a_obj_crystal/CreateHeap__14daObjCrystal_cFv.s"
+int daObjCrystal_c::CreateHeap() {
+    static int const l_bmd[] = {4, 7};
+    static u32 const l_diff_flag[] = {0, 0x80000};
+    static u32 const l_flag[] = {0x19000084, 0x11000084};
+
+    for (int i = 0; i < 2; i++) {
+        J3DModelData* modelData = (J3DModelData*)dComIfG_getObjectRes(l_arcName, l_bmd[i]);
+
+        mpModel[i] = mDoExt_J3DModel__create(modelData, l_diff_flag[i], l_flag[i]);
+        if (mpModel[i] == NULL) {
+            return 0;
+        }
+    }
+
+    return 1;
 }
-#pragma pop
 
 /* 80BD6664-80BD6718 000344 00B4+00 1/1 0/0 0/0 .text            create__14daObjCrystal_cFv */
-#pragma push
-#pragma optimization_level 0
-#pragma optimizewithasm off
-asm void daObjCrystal_c::create() {
-    nofralloc
-#include "asm/rel/d/a/obj/d_a_obj_crystal/d_a_obj_crystal/func_80BD6664.s"
+int daObjCrystal_c::create() {
+    if (!fopAcM_CheckCondition(this, 8)) {
+        new (this) daObjCrystal_c();
+        fopAcM_OnCondition(this, 8);
+    }
+
+    int phase = dComIfG_resLoad(&mPhase, l_arcName);
+    if (phase == cPhs_COMPLEATE_e) {
+        if (!fopAcM_entrySolidHeap(this, CheckCreateHeap, 0x4000)) {
+            return cPhs_ERROR_e;
+        }
+
+        if (!Create()) {
+            return cPhs_ERROR_e;
+        }
+    }
+
+    return phase;
 }
-#pragma pop
 
 /* 80BD6718-80BD673C 0003F8 0024+00 1/1 0/0 0/0 .text            execute__14daObjCrystal_cFv */
-#pragma push
-#pragma optimization_level 0
-#pragma optimizewithasm off
-asm void daObjCrystal_c::execute() {
-    nofralloc
-#include "asm/rel/d/a/obj/d_a_obj_crystal/d_a_obj_crystal/execute__14daObjCrystal_cFv.s"
+int daObjCrystal_c::execute() {
+    setBaseMtx();
+    return 1;
 }
-#pragma pop
 
 /* 80BD673C-80BD67C8 00041C 008C+00 1/1 0/0 0/0 .text            draw__14daObjCrystal_cFv */
-#pragma push
-#pragma optimization_level 0
-#pragma optimizewithasm off
-asm void daObjCrystal_c::draw() {
-    nofralloc
-#include "asm/rel/d/a/obj/d_a_obj_crystal/d_a_obj_crystal/draw__14daObjCrystal_cFv.s"
+int daObjCrystal_c::draw() {
+    g_env_light.settingTevStruct(0x10, &current.pos, &mTevStr);
+
+    for (int i = 0; i < 2; i++) {
+        g_env_light.setLightTevColorType_MAJI(mpModel[i], &mTevStr);
+        mDoExt_modelUpdateDL(mpModel[i]);
+    }
+
+    return 1;
 }
-#pragma pop
 
 /* 80BD67C8-80BD6834 0004A8 006C+00 1/1 0/0 0/0 .text            _delete__14daObjCrystal_cFv */
-#pragma push
-#pragma optimization_level 0
-#pragma optimizewithasm off
-asm void daObjCrystal_c::_delete() {
-    nofralloc
-#include "asm/rel/d/a/obj/d_a_obj_crystal/d_a_obj_crystal/_delete__14daObjCrystal_cFv.s"
+int daObjCrystal_c::_delete() {
+    if (mpEmitter != NULL) {
+        mpEmitter->becomeInvalidEmitter();
+        mpEmitter->quitImmortalEmitter();
+        mpEmitter = NULL;
+    }
+
+    dComIfG_resDelete(&mPhase, l_arcName);
+    return 1;
 }
-#pragma pop
 
 /* 80BD6834-80BD6854 000514 0020+00 1/0 0/0 0/0 .text daObjCrystal_Draw__FP14daObjCrystal_c */
-#pragma push
-#pragma optimization_level 0
-#pragma optimizewithasm off
-static asm void daObjCrystal_Draw(daObjCrystal_c* param_0) {
-    nofralloc
-#include "asm/rel/d/a/obj/d_a_obj_crystal/d_a_obj_crystal/daObjCrystal_Draw__FP14daObjCrystal_c.s"
+static int daObjCrystal_Draw(daObjCrystal_c* i_this) {
+    return i_this->draw();
 }
-#pragma pop
 
 /* 80BD6854-80BD6874 000534 0020+00 1/0 0/0 0/0 .text daObjCrystal_Execute__FP14daObjCrystal_c */
-#pragma push
-#pragma optimization_level 0
-#pragma optimizewithasm off
-static asm void daObjCrystal_Execute(daObjCrystal_c* param_0) {
-    nofralloc
-#include "asm/rel/d/a/obj/d_a_obj_crystal/d_a_obj_crystal/daObjCrystal_Execute__FP14daObjCrystal_c.s"
+static int daObjCrystal_Execute(daObjCrystal_c* i_this) {
+    return i_this->execute();
 }
-#pragma pop
 
 /* 80BD6874-80BD6894 000554 0020+00 1/0 0/0 0/0 .text daObjCrystal_Delete__FP14daObjCrystal_c */
-#pragma push
-#pragma optimization_level 0
-#pragma optimizewithasm off
-static asm void daObjCrystal_Delete(daObjCrystal_c* param_0) {
-    nofralloc
-#include "asm/rel/d/a/obj/d_a_obj_crystal/d_a_obj_crystal/daObjCrystal_Delete__FP14daObjCrystal_c.s"
+static int daObjCrystal_Delete(daObjCrystal_c* i_this) {
+    return i_this->_delete();
 }
-#pragma pop
 
 /* 80BD6894-80BD68B4 000574 0020+00 1/0 0/0 0/0 .text daObjCrystal_Create__FP14daObjCrystal_c */
-#pragma push
-#pragma optimization_level 0
-#pragma optimizewithasm off
-static asm void daObjCrystal_Create(daObjCrystal_c* param_0) {
-    nofralloc
-#include "asm/rel/d/a/obj/d_a_obj_crystal/d_a_obj_crystal/daObjCrystal_Create__FP14daObjCrystal_c.s"
+static int daObjCrystal_Create(daObjCrystal_c* i_this) {
+    return i_this->create();
 }
-#pragma pop
 
 /* ############################################################################################## */
 /* 80BD68F4-80BD6914 -00001 0020+00 1/0 0/0 0/0 .data            l_daObjCrystal_Method */
-SECTION_DATA static void* l_daObjCrystal_Method[8] = {
-    (void*)daObjCrystal_Create__FP14daObjCrystal_c,
-    (void*)daObjCrystal_Delete__FP14daObjCrystal_c,
-    (void*)daObjCrystal_Execute__FP14daObjCrystal_c,
-    (void*)NULL,
-    (void*)daObjCrystal_Draw__FP14daObjCrystal_c,
-    (void*)NULL,
-    (void*)NULL,
-    (void*)NULL,
+static actor_method_class l_daObjCrystal_Method = {
+    (process_method_func)daObjCrystal_Create,  (process_method_func)daObjCrystal_Delete,
+    (process_method_func)daObjCrystal_Execute, (process_method_func)NULL,
+    (process_method_func)daObjCrystal_Draw,
 };
 
 /* 80BD6914-80BD6944 -00001 0030+00 0/0 0/0 1/0 .data            g_profile_Obj_Crystal */
-SECTION_DATA extern void* g_profile_Obj_Crystal[12] = {
-    (void*)0xFFFFFFFD, (void*)0x0007FFFD,
-    (void*)0x01A40000, (void*)&g_fpcLf_Method,
-    (void*)0x00000580, (void*)NULL,
-    (void*)NULL,       (void*)&g_fopAc_Method,
-    (void*)0x02430000, (void*)&l_daObjCrystal_Method,
-    (void*)0x00040000, (void*)0x000E0000,
+extern actor_process_profile_definition g_profile_Obj_Crystal = {
+    -3,
+    7,
+    -3,
+    PROC_Obj_Crystal,
+    &g_fpcLf_Method.mBase,
+    sizeof(daObjCrystal_c),
+    0,
+    0,
+    &g_fopAc_Method.base,
+    579,
+    &l_daObjCrystal_Method,
+    0x40000,
+    0,
+    14,
 };
-
-/* 80BD68D8-80BD68D8 00001C 0000+00 0/0 0/0 0/0 .rodata          @stringBase0 */