From 617c84f4cf085f0cf7b6f1ec7200504c062b705a Mon Sep 17 00:00:00 2001 From: Trueffeloot Date: Tue, 23 May 2023 21:59:44 +0200 Subject: [PATCH 1/5] d_a_obj_prop OK --- include/m_Do/m_Do_ext.h | 1 + .../rel/d/a/obj/d_a_obj_prop/d_a_obj_prop.h | 26 +- rel/d/a/obj/d_a_obj_prop/d_a_obj_prop.cpp | 431 ++++++------------ .../d_a_tag_attention/d_a_tag_attention.cpp | 11 +- 4 files changed, 166 insertions(+), 303 deletions(-) diff --git a/include/m_Do/m_Do_ext.h b/include/m_Do/m_Do_ext.h index ab3d266745..fa80315ac8 100644 --- a/include/m_Do/m_Do_ext.h +++ b/include/m_Do/m_Do_ext.h @@ -568,6 +568,7 @@ JKRSolidHeap* mDoExt_createSolidHeapFromGameToCurrent(JKRHeap** o_heap, u32 i_si u32 mDoExt_adjustSolidHeapToSystem(JKRSolidHeap* i_heap); JKRHeap* mDoExt_getCurrentHeap(); void mDoExt_removeMesgFont(); +void mDoExt_modelUpdate(J3DModel* i_model); void mDoExt_modelUpdateDL(J3DModel* i_model); J3DModel* mDoExt_J3DModel__create(J3DModelData* i_modelData, u32 param_1, u32 param_2); void mDoExt_setAraCacheSize(u32 size); diff --git a/include/rel/d/a/obj/d_a_obj_prop/d_a_obj_prop.h b/include/rel/d/a/obj/d_a_obj_prop/d_a_obj_prop.h index 3197119a88..0ef32c455c 100644 --- a/include/rel/d/a/obj/d_a_obj_prop/d_a_obj_prop.h +++ b/include/rel/d/a/obj/d_a_obj_prop/d_a_obj_prop.h @@ -1,6 +1,30 @@ #ifndef D_A_OBJ_PROP_H #define D_A_OBJ_PROP_H -#include "dolphin/types.h" +#include "d/com/d_com_inf_game.h" +#include "f_op/f_op_actor_mng.h" + +class daObjProp_c : public fopAc_ac_c { +public: + /* 80CB51F8 */ daObjProp_c(); + + /* 80CB52B4 */ bool createHeap(); + /* 80CB5334 */ int create(); + /* 80CB5408 */ int Delete(); + /* 80CB543C */ int draw(); + /* 80CB54A0 */ int execute(); + /* 80CB54E4 */ void init(); + /* 80CB54F4 */ void setModelMtx(); + + u32 getNameArg_0() { return fopAcM_GetParamBit(this, 0, 4); } + u32 getArg_0() { return fopAcM_GetParamBit(this, 4, 4); } + + /* 0x568 */ request_of_phase_process_class mPhaseReq; + + /* 0x570 */ /* 80CB5234 */ virtual ~daObjProp_c(); + + /* 0x574 */ J3DModel* mpModel; + /* 0x578 */ u8 mArg; +}; // Size: 0x57C #endif /* D_A_OBJ_PROP_H */ diff --git a/rel/d/a/obj/d_a_obj_prop/d_a_obj_prop.cpp b/rel/d/a/obj/d_a_obj_prop/d_a_obj_prop.cpp index 85e72a6555..8a3999e5a2 100644 --- a/rel/d/a/obj/d_a_obj_prop/d_a_obj_prop.cpp +++ b/rel/d/a/obj/d_a_obj_prop/d_a_obj_prop.cpp @@ -1,304 +1,151 @@ -// -// Generated By: dol2asm -// Translation Unit: d_a_obj_prop -// +/** + * d_a_obj_prop.cpp + * Object - Propeller +*/ #include "rel/d/a/obj/d_a_obj_prop/d_a_obj_prop.h" -#include "dol2asm.h" -#include "dolphin/types.h" - -// -// Types: -// - -struct request_of_phase_process_class {}; - -struct mDoMtx_stack_c { - static u8 now[48]; -}; - -struct fopAc_ac_c { - /* 80018B64 */ fopAc_ac_c(); - /* 80018C8C */ ~fopAc_ac_c(); -}; - -struct daObjProp_c { - /* 80CB51F8 */ daObjProp_c(); - /* 80CB5234 */ ~daObjProp_c(); - /* 80CB52B4 */ void createHeap(); - /* 80CB5334 */ void create(); - /* 80CB5408 */ void Delete(); - /* 80CB543C */ void draw(); - /* 80CB54A0 */ void execute(); - /* 80CB54E4 */ void init(); - /* 80CB54F4 */ void setModelMtx(); -}; - -struct dKy_tevstr_c {}; - -struct J3DModelData {}; - -struct cXyz {}; - -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" static void daObjProp_c_createHeap__FP10fopAc_ac_c(); -extern "C" void __ct__11daObjProp_cFv(); -extern "C" void __dt__11daObjProp_cFv(); -extern "C" void createHeap__11daObjProp_cFv(); -extern "C" void create__11daObjProp_cFv(); -extern "C" void Delete__11daObjProp_cFv(); -extern "C" void draw__11daObjProp_cFv(); -extern "C" void execute__11daObjProp_cFv(); -extern "C" void init__11daObjProp_cFv(); -extern "C" void setModelMtx__11daObjProp_cFv(); -extern "C" static void daObjProp_create__FP11daObjProp_c(); -extern "C" static void daObjProp_Delete__FP11daObjProp_c(); -extern "C" static void daObjProp_execute__FP11daObjProp_c(); -extern "C" static void daObjProp_draw__FP11daObjProp_c(); -extern "C" extern char const* const d_a_obj_prop__stringBase0; - -// -// External References: -// - -extern "C" void mDoMtx_YrotM__FPA4_fs(); -extern "C" void mDoExt_modelUpdate__FP8J3DModel(); -extern "C" void mDoExt_J3DModel__create__FP12J3DModelDataUlUl(); -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 fopAcM_setCullSizeBox2__FP10fopAc_ac_cP12J3DModelData(); -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 __dl__FPv(); -extern "C" void PSMTXCopy(); -extern "C" void PSMTXTrans(); -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/d_procname.h" /* 80CB51D8-80CB51F8 000078 0020+00 1/1 0/0 0/0 .text daObjProp_c_createHeap__FP10fopAc_ac_c */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -static asm void daObjProp_c_createHeap(fopAc_ac_c* param_0) { - nofralloc -#include "asm/rel/d/a/obj/d_a_obj_prop/d_a_obj_prop/daObjProp_c_createHeap__FP10fopAc_ac_c.s" +static bool daObjProp_c_createHeap(fopAc_ac_c* i_this) { + return static_cast(i_this)->createHeap(); } -#pragma pop - -/* ############################################################################################## */ -/* 80CB5620-80CB5620 00000C 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ -#pragma push -#pragma force_active on -SECTION_DEAD static char const* const stringBase_80CB5620 = "L7Prop"; -#pragma pop /* 80CB5628-80CB562C -00001 0004+00 3/3 0/0 0/0 .data l_arcName */ -SECTION_DATA static void* l_arcName = (void*)&d_a_obj_prop__stringBase0; +static const char* l_arcName = "L7Prop"; + +/* 80CB51F8-80CB5234 000098 003C+00 2/2 0/0 0/0 .text __ct__11daObjProp_cFv */ +daObjProp_c::daObjProp_c() {} + +inline request_of_phase_process_class* daObjProp_getRes(daObjProp_c* i_prop) { + daObjProp_c* mProp2 = (daObjProp_c*)i_prop; + return mProp2 != NULL ? &mProp2->mPhaseReq : (request_of_phase_process_class*)mProp2; +} + +/* 80CB5234-80CB52B4 0000D4 0080+00 1/0 0/0 0/0 .text __dt__11daObjProp_cFv */ +daObjProp_c::~daObjProp_c() { + dComIfG_resDelete(daObjProp_getRes(this), l_arcName); +} + +static const u32 BMD_IDX[] = {3, 4}; + +/* 80CB52B4-80CB5334 000154 0080+00 1/1 0/0 0/0 .text createHeap__11daObjProp_cFv */ +bool daObjProp_c::createHeap() { + u32 nameArg = getNameArg_0(); + u32 bmd = BMD_IDX[nameArg]; + mpModel = mDoExt_J3DModel__create((J3DModelData*)dComIfG_getObjectRes(l_arcName, bmd), 0x80000, + 0x11000084); + return mpModel != NULL; +} + +/* 80CB5334-80CB5408 0001D4 00D4+00 1/1 0/0 0/0 .text create__11daObjProp_cFv */ +int daObjProp_c::create() { + if (!fopAcM_CheckCondition(this, 8)) { + new (this) daObjProp_c(); + fopAcM_OnCondition(this, 8); + } + + daObjProp_c* tmp = this; + if (this) { + tmp = (daObjProp_c*)&mPhaseReq; + } + + int phase = dComIfG_resLoad((request_of_phase_process_class*)tmp, l_arcName); + if (phase == cPhs_COMPLEATE_e) { + if (!fopAcM_entrySolidHeap(this, (heapCallbackFunc)daObjProp_c_createHeap, 0x1000)) { + return cPhs_ERROR_e; + + } else { + init(); + setModelMtx(); + mCullMtx = mpModel->getBaseTRMtx(); + fopAcM_setCullSizeBox2(this, mpModel->getModelData()); + } + } + return phase; +} + +/* 80CB5408-80CB543C 0002A8 0034+00 1/1 0/0 0/0 .text Delete__11daObjProp_cFv */ +int daObjProp_c::Delete() { + this->~daObjProp_c(); + return 1; +} + +/* 80CB543C-80CB54A0 0002DC 0064+00 1/1 0/0 0/0 .text draw__11daObjProp_cFv */ +int daObjProp_c::draw() { + g_env_light.settingTevStruct(NULL, ¤t.pos, &mTevStr); + g_env_light.setLightTevColorType_MAJI(mpModel->mModelData, &mTevStr); + mDoExt_modelUpdate(mpModel); + return 1; +} + +static const s16 ADD_ANGLE[] = {0x1800, 0xE800}; + +/* 80CB54A0-80CB54E4 000340 0044+00 1/1 0/0 0/0 .text execute__11daObjProp_cFv */ +int daObjProp_c::execute() { + shape_angle.y += ADD_ANGLE[mArg]; + setModelMtx(); + return 1; +} + +/* 80CB54E4-80CB54F4 000384 0010+00 1/1 0/0 0/0 .text init__11daObjProp_cFv */ +void daObjProp_c::init() { + mArg = getArg_0() & 1; +} + +/* 80CB54F4-80CB5558 000394 0064+00 2/2 0/0 0/0 .text setModelMtx__11daObjProp_cFv */ +void daObjProp_c::setModelMtx() { + mDoMtx_stack_c::transS(current.pos.x, current.pos.y, current.pos.z); + mDoMtx_stack_c::YrotM(shape_angle.y); + PSMTXCopy(mDoMtx_stack_c::now, mpModel->mBaseTransformMtx); +} + +/* 80CB5558-80CB55AC 0003F8 0054+00 1/0 0/0 0/0 .text daObjProp_create__FP11daObjProp_c */ +static int daObjProp_create(daObjProp_c* i_this) { + if (!fopAcM_CheckCondition(i_this, 8)) { + new (i_this) daObjProp_c(); + fopAcM_OnCondition(i_this, 8); + } + return i_this->create(); +} + +/* 80CB55AC-80CB55CC 00044C 0020+00 1/0 0/0 0/0 .text daObjProp_Delete__FP11daObjProp_c */ +static int daObjProp_Delete(daObjProp_c* i_this) { + return i_this->Delete(); +} + +/* 80CB55CC-80CB55EC 00046C 0020+00 1/0 0/0 0/0 .text daObjProp_execute__FP11daObjProp_c */ +static int daObjProp_execute(daObjProp_c* i_this) { + return i_this->execute(); +} + +/* 80CB55EC-80CB560C 00048C 0020+00 1/0 0/0 0/0 .text daObjProp_draw__FP11daObjProp_c */ +static int daObjProp_draw(daObjProp_c* i_this) { + return i_this->draw(); +} /* 80CB562C-80CB564C -00001 0020+00 1/0 0/0 0/0 .data daObjProp_METHODS */ -SECTION_DATA static void* daObjProp_METHODS[8] = { - (void*)daObjProp_create__FP11daObjProp_c, - (void*)daObjProp_Delete__FP11daObjProp_c, - (void*)daObjProp_execute__FP11daObjProp_c, - (void*)NULL, - (void*)daObjProp_draw__FP11daObjProp_c, - (void*)NULL, - (void*)NULL, - (void*)NULL, +static actor_method_class daObjProp_METHODS = { + (process_method_func)daObjProp_create, (process_method_func)daObjProp_Delete, + (process_method_func)daObjProp_execute, (process_method_func)NULL, + (process_method_func)daObjProp_draw, }; /* 80CB564C-80CB567C -00001 0030+00 0/0 0/0 1/0 .data g_profile_Obj_Prop */ -SECTION_DATA extern void* g_profile_Obj_Prop[12] = { - (void*)0xFFFFFFFD, (void*)0x0007FFFD, - (void*)0x01970000, (void*)&g_fpcLf_Method, - (void*)0x0000057C, (void*)NULL, - (void*)NULL, (void*)&g_fopAc_Method, - (void*)0x02E10000, (void*)&daObjProp_METHODS, - (void*)0x00040000, (void*)0x030E0000, -}; - -/* 80CB567C-80CB5688 000054 000C+00 2/2 0/0 0/0 .data __vt__11daObjProp_c */ -SECTION_DATA extern void* __vt__11daObjProp_c[3] = { - (void*)NULL /* RTTI */, - (void*)NULL, - (void*)__dt__11daObjProp_cFv, -}; - -/* 80CB51F8-80CB5234 000098 003C+00 2/2 0/0 0/0 .text __ct__11daObjProp_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm daObjProp_c::daObjProp_c() { - nofralloc -#include "asm/rel/d/a/obj/d_a_obj_prop/d_a_obj_prop/__ct__11daObjProp_cFv.s" -} -#pragma pop - -/* 80CB5234-80CB52B4 0000D4 0080+00 1/0 0/0 0/0 .text __dt__11daObjProp_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm daObjProp_c::~daObjProp_c() { - nofralloc -#include "asm/rel/d/a/obj/d_a_obj_prop/d_a_obj_prop/__dt__11daObjProp_cFv.s" -} -#pragma pop - -/* ############################################################################################## */ -/* 80CB5614-80CB561C 000000 0008+00 1/1 0/0 0/0 .rodata BMD_IDX$3638 */ -SECTION_RODATA static u8 const BMD_IDX[8] = { - 0x00, 0x00, 0x00, 0x03, 0x00, 0x00, 0x00, 0x04, -}; -COMPILER_STRIP_GATE(0x80CB5614, &BMD_IDX); - -/* 80CB52B4-80CB5334 000154 0080+00 1/1 0/0 0/0 .text createHeap__11daObjProp_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void daObjProp_c::createHeap() { - nofralloc -#include "asm/rel/d/a/obj/d_a_obj_prop/d_a_obj_prop/createHeap__11daObjProp_cFv.s" -} -#pragma pop - -/* 80CB5334-80CB5408 0001D4 00D4+00 1/1 0/0 0/0 .text create__11daObjProp_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void daObjProp_c::create() { - nofralloc -#include "asm/rel/d/a/obj/d_a_obj_prop/d_a_obj_prop/create__11daObjProp_cFv.s" -} -#pragma pop - -/* 80CB5408-80CB543C 0002A8 0034+00 1/1 0/0 0/0 .text Delete__11daObjProp_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void daObjProp_c::Delete() { - nofralloc -#include "asm/rel/d/a/obj/d_a_obj_prop/d_a_obj_prop/Delete__11daObjProp_cFv.s" -} -#pragma pop - -/* 80CB543C-80CB54A0 0002DC 0064+00 1/1 0/0 0/0 .text draw__11daObjProp_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void daObjProp_c::draw() { - nofralloc -#include "asm/rel/d/a/obj/d_a_obj_prop/d_a_obj_prop/draw__11daObjProp_cFv.s" -} -#pragma pop - -/* ############################################################################################## */ -/* 80CB561C-80CB5620 000008 0004+00 1/1 0/0 0/0 .rodata ADD_ANGLE$3689 */ -SECTION_RODATA static u8 const ADD_ANGLE[4] = { - 0x18, - 0x00, - 0xE8, - 0x00, -}; -COMPILER_STRIP_GATE(0x80CB561C, &ADD_ANGLE); - -/* 80CB54A0-80CB54E4 000340 0044+00 1/1 0/0 0/0 .text execute__11daObjProp_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void daObjProp_c::execute() { - nofralloc -#include "asm/rel/d/a/obj/d_a_obj_prop/d_a_obj_prop/execute__11daObjProp_cFv.s" -} -#pragma pop - -/* 80CB54E4-80CB54F4 000384 0010+00 1/1 0/0 0/0 .text init__11daObjProp_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void daObjProp_c::init() { - nofralloc -#include "asm/rel/d/a/obj/d_a_obj_prop/d_a_obj_prop/init__11daObjProp_cFv.s" -} -#pragma pop - -/* 80CB54F4-80CB5558 000394 0064+00 2/2 0/0 0/0 .text setModelMtx__11daObjProp_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void daObjProp_c::setModelMtx() { - nofralloc -#include "asm/rel/d/a/obj/d_a_obj_prop/d_a_obj_prop/setModelMtx__11daObjProp_cFv.s" -} -#pragma pop - -/* 80CB5558-80CB55AC 0003F8 0054+00 1/0 0/0 0/0 .text daObjProp_create__FP11daObjProp_c - */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -static asm void daObjProp_create(daObjProp_c* param_0) { - nofralloc -#include "asm/rel/d/a/obj/d_a_obj_prop/d_a_obj_prop/daObjProp_create__FP11daObjProp_c.s" -} -#pragma pop - -/* 80CB55AC-80CB55CC 00044C 0020+00 1/0 0/0 0/0 .text daObjProp_Delete__FP11daObjProp_c - */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -static asm void daObjProp_Delete(daObjProp_c* param_0) { - nofralloc -#include "asm/rel/d/a/obj/d_a_obj_prop/d_a_obj_prop/daObjProp_Delete__FP11daObjProp_c.s" -} -#pragma pop - -/* 80CB55CC-80CB55EC 00046C 0020+00 1/0 0/0 0/0 .text daObjProp_execute__FP11daObjProp_c - */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -static asm void daObjProp_execute(daObjProp_c* param_0) { - nofralloc -#include "asm/rel/d/a/obj/d_a_obj_prop/d_a_obj_prop/daObjProp_execute__FP11daObjProp_c.s" -} -#pragma pop - -/* 80CB55EC-80CB560C 00048C 0020+00 1/0 0/0 0/0 .text daObjProp_draw__FP11daObjProp_c */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -static asm void daObjProp_draw(daObjProp_c* param_0) { - nofralloc -#include "asm/rel/d/a/obj/d_a_obj_prop/d_a_obj_prop/daObjProp_draw__FP11daObjProp_c.s" -} -#pragma pop - -/* 80CB5620-80CB5620 00000C 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ +extern actor_process_profile_definition g_profile_Obj_Prop = { + -3, + 7, + -3, + PROC_Obj_Prop, + &g_fpcLf_Method.mBase, + sizeof(daObjProp_c), + 0, + 0, + &g_fopAc_Method.base, + 0x02E1, + &daObjProp_METHODS, + 0x00040000, + 3, + 14, +}; \ No newline at end of file diff --git a/rel/d/a/tag/d_a_tag_attention/d_a_tag_attention.cpp b/rel/d/a/tag/d_a_tag_attention/d_a_tag_attention.cpp index 7af41f941c..025b95c885 100644 --- a/rel/d/a/tag/d_a_tag_attention/d_a_tag_attention.cpp +++ b/rel/d/a/tag/d_a_tag_attention/d_a_tag_attention.cpp @@ -8,16 +8,7 @@ #include "d/a/d_a_player.h" #include "d/d_procname.h" -/* ############################################################################################## */ -/* 804D5724-804D5728 000000 0002+02 1/1 0/0 0/0 .rodata l_dist_tbl$3641 */ -SECTION_RODATA static u8 const l_dist_tbl[2 + 2 /* padding */] = { - 0x23, - 0x24, - /* padding */ - 0x00, - 0x00, -}; -COMPILER_STRIP_GATE(0x804D5724, &l_dist_tbl); +static const u8 l_dist_tbl[] = { 0x23, 0x24 }; /* 804D5318-804D5354 000078 003C+00 1/1 0/0 0/0 .text Create__8daAttp_cFv */ int daAttp_c::Create() { From 38290003b08c146353b037a7b015d904de5767a8 Mon Sep 17 00:00:00 2001 From: Trueffel <106771418+Trueffeloot@users.noreply.github.com> Date: Sun, 18 Jun 2023 20:26:12 +0200 Subject: [PATCH 2/5] tp-progress (#1) --- .github/workflows/ci-cd.yml | 46 +++++++++++++++++++++++++ .github/workflows/ok-check.yml | 20 ----------- tools/tp.py | 46 +++++-------------------- tools/upload-progress.py | 62 ++++++++++++++++++++++++++++++++++ 4 files changed, 117 insertions(+), 57 deletions(-) create mode 100644 .github/workflows/ci-cd.yml delete mode 100644 .github/workflows/ok-check.yml create mode 100755 tools/upload-progress.py diff --git a/.github/workflows/ci-cd.yml b/.github/workflows/ci-cd.yml new file mode 100644 index 0000000000..e9cfd8ac21 --- /dev/null +++ b/.github/workflows/ci-cd.yml @@ -0,0 +1,46 @@ +name: CI/CD + +on: + push: + branches: + - master + pull_request: + branches: + - master + types: [synchronize] + +jobs: + build: + if: ${{ github.event_name == 'pull_request' }} + runs-on: ubuntu-latest + container: + image: ghcr.io/pheenoh/zeldaret-tp:latest + steps: + - name: Checkout + uses: actions/checkout@v3 + - name: Copy in dol and compilers + run: cp /tmp/baserom.dol ./baserom.dol && cp -r /tmp/mwcc_compiler/ tools/mwcc_compiler && cp tools/mwcc_compiler/2.7/mwcceppc.exe tools/mwcc_compiler/2.7/mwcceppc_modded.exe && chown root /github/home/ + - name: Run Make (OK) + run: make all rels && ./tp check --rels + - name: Upload artifact + uses: actions/upload-artifact@v3 + with: + name: artifact-${{ github.event.pull_request.number }} + path: ./progress-${{ github.event.pull_request.number }}.json + release: + if: ${{ github.event_name == 'push' }} + needs: build + runs-on: ubuntu-latest + steps: + - name: Checkout + uses: actions/checkout@v3 + - name: Download artifact + uses: actions/download-artifact@v3 + with: + name: artifact-${{ github.event.pull_request.number }} + - name: Upload Progress to Frogress + env: + PROGRESS_API_KEY: ${{ secrets.FROGRESS_API_KEY }} + run: ./tools/upload-progress.py -b https://progress.deco.mp/ -p twilightprincess -v gcn_usa \ + progress-${{ github.event.pull_request.number }}.json + \ No newline at end of file diff --git a/.github/workflows/ok-check.yml b/.github/workflows/ok-check.yml deleted file mode 100644 index f2c3446476..0000000000 --- a/.github/workflows/ok-check.yml +++ /dev/null @@ -1,20 +0,0 @@ -name: OK Check - -on: pull_request - -jobs: - build: - - runs-on: ubuntu-latest - container: - image: ghcr.io/pheenoh/zeldaret-tp:latest - - steps: - - name: Checkout - uses: actions/checkout@v1 - with: - token: ${{secrets.MY_REPO_PAT}} - - name: Copy in dol and compilers - run: cp /tmp/baserom.dol ./baserom.dol && cp -r /tmp/mwcc_compiler/ tools/mwcc_compiler && cp tools/mwcc_compiler/2.7/mwcceppc.exe tools/mwcc_compiler/2.7/mwcceppc_modded.exe && chown root /github/home/ - - name: Run Make (OK) - run: make all rels && ./tp check --rels diff --git a/tools/tp.py b/tools/tp.py index 9f8c7dd7ba..4773454153 100644 --- a/tools/tp.py +++ b/tools/tp.py @@ -717,43 +717,15 @@ def calculate_progress(build_path: Path, matching: bool, format: str, print_rels ) ) elif format == "JSON": - matching = {} - non_matching = {} - - matching["main.dol"] = { - "decompiled": dol_progress.decompiled, - "total": dol_progress.size, - "sections": [ - { - name: { - "decompiled": sec.decompiled, - "total": sec.size, - } - } - for name, sec in dol_progress.sections.items() - ], - } - - if rels_progress: - matching["rels"] = { - "decompiled": rel_decompiled, - "total": rel_size, - } - - for rel in rels_progress: - matching[rel.name] = { - "decompiled": rel.decompiled, - "total": rel.size, - } - - print( - json.dumps( - { - "matching": matching, - "non-matchgin": non_matching, - } - ) - ) + data = { + "code": decompiled_size, + "code/total": total_size, + "dol": dol_progress.decompiled, + "dol/total": dol_progress.size, + "rels": rel_decompiled, + "rels/total": rel_size, + } + print(json.dumps(data)) else: print(dol_progress.percentage) print(100 * (rel_decompiled / rel_size)) diff --git a/tools/upload-progress.py b/tools/upload-progress.py new file mode 100755 index 0000000000..d12e7caf1d --- /dev/null +++ b/tools/upload-progress.py @@ -0,0 +1,62 @@ +#!/usr/bin/env python3 +import argparse +import json +import os +import subprocess +from pprint import pprint + +import requests + + +def get_git_commit_timestamp() -> int: + return int(subprocess.check_output(['git', 'show', '-s', '--format=%ct']).decode('ascii').rstrip()) + + +def get_git_commit_sha() -> str: + return subprocess.check_output(['git', 'rev-parse', 'HEAD']).decode('ascii').strip() + + +def generate_url(args: argparse.Namespace) -> str: + url_components = [args.base_url.rstrip('/'), 'data'] + + for arg in [args.project, args.version.replace('.', '-')]: + if arg != "": + url_components.append(arg) + + return str.join('/', url_components) + '/' + + +if __name__ == '__main__': + parser = argparse.ArgumentParser(description="Upload progress information.") + parser.add_argument("-b", "--base_url", help="API base URL", required=True) + parser.add_argument("-a", "--api_key", help="API key (env var PROGRESS_API_KEY)") + parser.add_argument("-p", "--project", help="Project slug", required=True) + parser.add_argument("-v", "--version", help="Version slug", required=True) + parser.add_argument("input", help="Progress JSON input") + + args = parser.parse_args() + api_key = args.api_key or os.environ.get("PROGRESS_API_KEY") + if not api_key: + raise "API key required" + url = generate_url(args) + + entries = [] + with open(args.input, "r") as f: + data = json.load(f) + entries.append({ + "timestamp": get_git_commit_timestamp(), + "git_hash": get_git_commit_sha(), + "categories": { + "default": data, + }, + }) + + print("Publishing entries to", url) + pprint(entries) + data = { + "api_key": api_key, + "entries": entries, + } + r = requests.post(url, json=data) + r.raise_for_status() + print("Done!") \ No newline at end of file From 42cd2b01e653816d19030f0fb19eb1ebd2f4a1d7 Mon Sep 17 00:00:00 2001 From: Trueffel <106771418+Trueffeloot@users.noreply.github.com> Date: Mon, 19 Jun 2023 21:22:34 +0200 Subject: [PATCH 3/5] Tp-progress-work-2 (#2) --- tools/tp.py | 1 + 1 file changed, 1 insertion(+) diff --git a/tools/tp.py b/tools/tp.py index 4773454153..edb5b908be 100644 --- a/tools/tp.py +++ b/tools/tp.py @@ -717,6 +717,7 @@ def calculate_progress(build_path: Path, matching: bool, format: str, print_rels ) ) elif format == "JSON": + # TODO: add dol sections instead of total dol. data = { "code": decompiled_size, "code/total": total_size, From 67783acac051eef335ed59757e6c3c1dcd1dbde2 Mon Sep 17 00:00:00 2001 From: Trueffel <106771418+Trueffeloot@users.noreply.github.com> Date: Mon, 19 Jun 2023 21:41:00 +0200 Subject: [PATCH 4/5] seperate (#3) --- .github/workflows/cd.yml | 36 ++++++++++++++++++++++++++++++++++++ .github/workflows/ci.yml | 27 +++++++++++++++++++++++++++ 2 files changed, 63 insertions(+) create mode 100644 .github/workflows/cd.yml create mode 100644 .github/workflows/ci.yml diff --git a/.github/workflows/cd.yml b/.github/workflows/cd.yml new file mode 100644 index 0000000000..73e1532666 --- /dev/null +++ b/.github/workflows/cd.yml @@ -0,0 +1,36 @@ +name: CD + +on: + push: + branches: + - master + +env: + WORKFLOW: "ci.yml" + +jobs: + download: + runs-on: ubuntu-latest + steps: + - name: Checkout + uses: actions/checkout@v3 + - name: Get latest workflow run ID + id: get_run_id + run: | + RUN_ID=$(curl --request GET \ + --url https://api.github.com/repos/${{ github.repository }}/actions/workflows/${{ env.WORKFLOW }}/runs \ + --header 'authorization: Bearer ${{ secrets.GITHUB_TOKEN }}' \ + --header 'content-type: application/json' | jq '.workflow_runs[0].id') + echo "run_id=$RUN_ID" >> $GITHUB_OUTPUT + - name: Download artifact + uses: dawidd6/action-download-artifact@v2.27.0 + with: + github_token: ${{ secrets.GITHUB_TOKEN }} + run_id: ${{ steps.get_run_id.outputs.run_id }} + name: artifact-${{ steps.get_run_id.outputs.run_id }} + workflow: ${{ env.WORKFLOW }} + - name: Upload Progress to Frogress + env: + PROGRESS_API_KEY: ${{ secrets.FROGRESS_API_KEY }} + run: ./tools/upload-progress.py -b https://progress.deco.mp/ -p twilightprincess -v gcn_usa \ + progress-${{ steps.get_run_id.outputs.run_id }}.json \ No newline at end of file diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml new file mode 100644 index 0000000000..09ae82e493 --- /dev/null +++ b/.github/workflows/ci.yml @@ -0,0 +1,27 @@ +name: CI + +on: + pull_request: + branches: + - master + +jobs: + build: + runs-on: ubuntu-latest + container: + image: ghcr.io/pheenoh/zeldaret-tp:latest + steps: + - name: Checkout + uses: actions/checkout@v3 + - name: Copy in dol and compilers + run: cp /tmp/baserom.dol ./baserom.dol && cp -r /tmp/mwcc_compiler/ tools/mwcc_compiler && cp tools/mwcc_compiler/2.7/mwcceppc.exe tools/mwcc_compiler/2.7/mwcceppc_modded.exe && chown root /github/home/ + - name: Run Make (OK) + run: make all rels && ./tp check --rels + - name: Create JSON for Progress + run: ./tp progress -f JSON > progress-${{ github.run_id }}.json + - name: Upload artifact + uses: actions/upload-artifact@v3 + with: + name: artifact-${{ github.run_id }} + path: ./progress-${{ github.run_id }}.json + \ No newline at end of file From 65ef839bb558a8f6044423ce7e6303313dce3bd5 Mon Sep 17 00:00:00 2001 From: Trueffeloot Date: Mon, 10 Jul 2023 02:34:35 +0200 Subject: [PATCH 5/5] several files OK --- Progress.md | 18 +- .../isArrival__22dMenu_Fmap_room_data_cFv.s | 21 - .../__ct__15dMsgScrnPlace_cFv.s | 264 --------- .../__dt__15dMsgScrnPlace_cFv.s | 96 ---- .../drawSelf__15dMsgScrnPlace_cFv.s | 23 - .../exec__15dMsgScrnPlace_cFv.s | 74 --- .../fukiAlpha__15dMsgScrnPlace_cFf.s | 37 -- .../__ct__15dMsgScrnStaff_cFUc.s | 175 ------ .../__dt__15dMsgScrnStaff_cFv.s | 74 --- .../drawSelf__15dMsgScrnStaff_cFv.s | 23 - .../exec__15dMsgScrnStaff_cFv.s | 34 -- .../fukiAlpha__15dMsgScrnStaff_cFf.s | 10 - .../CreateHeap__12daHsTarget_cFv.s | 33 -- .../Delete__12daHsTarget_cFv.s | 17 - .../d_a_obj_hsTarget/Draw__12daHsTarget_cFv.s | 26 - .../Execute__12daHsTarget_cFPPA3_A4_f.s | 6 - .../__ct__16daHsTarget_HIO_cFv.s | 8 - .../__dt__14mDoHIO_entry_cFv.s | 20 - .../__dt__16daHsTarget_HIO_cFv.s | 26 - .../__sinit_d_a_obj_hsTarget_cpp.s | 16 - .../create__12daHsTarget_cFv.s | 77 --- .../daHsTarget_Create__FP10fopAc_ac_c.s | 9 - .../daHsTarget_Delete__FP12daHsTarget_c.s | 9 - .../daHsTarget_Draw__FP12daHsTarget_c.s | 12 - .../daHsTarget_Execute__FP12daHsTarget_c.s | 9 - .../setBaseMtx__12daHsTarget_cFv.s | 35 -- .../CreateHeap__12daObjOnsen_cFv.s | 105 ---- .../d_a_obj_onsen/Create__12daObjOnsen_cFv.s | 20 - .../d_a_obj_onsen/Delete__12daObjOnsen_cFv.s | 17 - .../d_a_obj_onsen/Draw__12daObjOnsen_cFv.s | 60 --- .../Execute__12daObjOnsen_cFPPA3_A4_f.s | 13 - .../d_a_obj_onsen/__dt__12J3DFrameCtrlFv.s | 20 - .../create1st__12daObjOnsen_cFv.s | 45 -- ...aObjOnsen_MoveBGDelete__FP12daObjOnsen_c.s | 9 - .../daObjOnsen_MoveBGDraw__FP12daObjOnsen_c.s | 12 - ...ObjOnsen_MoveBGExecute__FP12daObjOnsen_c.s | 9 - .../daObjOnsen_create1st__FP12daObjOnsen_c.s | 27 - .../initBaseMtx__12daObjOnsen_cFv.s | 23 - .../setBaseMtx__12daObjOnsen_cFv.s | 31 -- .../Delete__14daObjRCircle_cFv.s | 14 - .../__ct__14daObjRCircle_cFv.s | 36 -- .../d_a_obj_rcircle/__dt__12J3DFrameCtrlFv.s | 20 - .../__dt__14daObjRCircle_cFv.s | 55 -- .../createHeap__14daObjRCircle_cFv.s | 72 --- .../create__14daObjRCircle_cFv.s | 72 --- .../daObjRCircle_Delete__FP14daObjRCircle_c.s | 9 - ...aObjRCircle_c_createHeap__FP10fopAc_ac_c.s | 9 - .../daObjRCircle_create__FP14daObjRCircle_c.s | 24 - .../daObjRCircle_draw__FP14daObjRCircle_c.s | 9 - ...daObjRCircle_execute__FP14daObjRCircle_c.s | 9 - .../draw__14daObjRCircle_cFv.s | 52 -- .../execute__14daObjRCircle_cFv.s | 51 -- .../init__14daObjRCircle_cFv.s | 4 - .../setModelMtx__14daObjRCircle_cFv.s | 22 - include/d/com/d_com_inf_game.h | 5 + include/d/d_drawlist.h | 2 + include/d/pane/d_pane_class.h | 3 + include/msg/scrn/d_msg_scrn_place.h | 20 +- include/msg/scrn/d_msg_scrn_staff.h | 19 +- .../a/obj/d_a_obj_hsTarget/d_a_obj_hsTarget.h | 25 +- .../rel/d/a/obj/d_a_obj_onsen/d_a_obj_onsen.h | 23 +- .../d/a/obj/d_a_obj_rcircle/d_a_obj_rcircle.h | 27 +- .../obj/d_a_obj_hsTarget/d_a_obj_hsTarget.cpp | 409 +++----------- rel/d/a/obj/d_a_obj_onsen/d_a_obj_onsen.cpp | 445 ++++------------ .../a/obj/d_a_obj_rcircle/d_a_obj_rcircle.cpp | 501 ++++++------------ src/d/map/d_map_path_fmap.cpp | 13 +- src/msg/scrn/d_msg_scrn_place.cpp | 340 ++++-------- src/msg/scrn/d_msg_scrn_staff.cpp | 280 +++------- 68 files changed, 671 insertions(+), 3442 deletions(-) delete mode 100644 asm/d/map/d_map_path_fmap/isArrival__22dMenu_Fmap_room_data_cFv.s delete mode 100644 asm/msg/scrn/d_msg_scrn_place/__ct__15dMsgScrnPlace_cFv.s delete mode 100644 asm/msg/scrn/d_msg_scrn_place/__dt__15dMsgScrnPlace_cFv.s delete mode 100644 asm/msg/scrn/d_msg_scrn_place/drawSelf__15dMsgScrnPlace_cFv.s delete mode 100644 asm/msg/scrn/d_msg_scrn_place/exec__15dMsgScrnPlace_cFv.s delete mode 100644 asm/msg/scrn/d_msg_scrn_place/fukiAlpha__15dMsgScrnPlace_cFf.s delete mode 100644 asm/msg/scrn/d_msg_scrn_staff/__ct__15dMsgScrnStaff_cFUc.s delete mode 100644 asm/msg/scrn/d_msg_scrn_staff/__dt__15dMsgScrnStaff_cFv.s delete mode 100644 asm/msg/scrn/d_msg_scrn_staff/drawSelf__15dMsgScrnStaff_cFv.s delete mode 100644 asm/msg/scrn/d_msg_scrn_staff/exec__15dMsgScrnStaff_cFv.s delete mode 100644 asm/msg/scrn/d_msg_scrn_staff/fukiAlpha__15dMsgScrnStaff_cFf.s delete mode 100644 asm/rel/d/a/obj/d_a_obj_hsTarget/d_a_obj_hsTarget/CreateHeap__12daHsTarget_cFv.s delete mode 100644 asm/rel/d/a/obj/d_a_obj_hsTarget/d_a_obj_hsTarget/Delete__12daHsTarget_cFv.s delete mode 100644 asm/rel/d/a/obj/d_a_obj_hsTarget/d_a_obj_hsTarget/Draw__12daHsTarget_cFv.s delete mode 100644 asm/rel/d/a/obj/d_a_obj_hsTarget/d_a_obj_hsTarget/Execute__12daHsTarget_cFPPA3_A4_f.s delete mode 100644 asm/rel/d/a/obj/d_a_obj_hsTarget/d_a_obj_hsTarget/__ct__16daHsTarget_HIO_cFv.s delete mode 100644 asm/rel/d/a/obj/d_a_obj_hsTarget/d_a_obj_hsTarget/__dt__14mDoHIO_entry_cFv.s delete mode 100644 asm/rel/d/a/obj/d_a_obj_hsTarget/d_a_obj_hsTarget/__dt__16daHsTarget_HIO_cFv.s delete mode 100644 asm/rel/d/a/obj/d_a_obj_hsTarget/d_a_obj_hsTarget/__sinit_d_a_obj_hsTarget_cpp.s delete mode 100644 asm/rel/d/a/obj/d_a_obj_hsTarget/d_a_obj_hsTarget/create__12daHsTarget_cFv.s delete mode 100644 asm/rel/d/a/obj/d_a_obj_hsTarget/d_a_obj_hsTarget/daHsTarget_Create__FP10fopAc_ac_c.s delete mode 100644 asm/rel/d/a/obj/d_a_obj_hsTarget/d_a_obj_hsTarget/daHsTarget_Delete__FP12daHsTarget_c.s delete mode 100644 asm/rel/d/a/obj/d_a_obj_hsTarget/d_a_obj_hsTarget/daHsTarget_Draw__FP12daHsTarget_c.s delete mode 100644 asm/rel/d/a/obj/d_a_obj_hsTarget/d_a_obj_hsTarget/daHsTarget_Execute__FP12daHsTarget_c.s delete mode 100644 asm/rel/d/a/obj/d_a_obj_hsTarget/d_a_obj_hsTarget/setBaseMtx__12daHsTarget_cFv.s delete mode 100644 asm/rel/d/a/obj/d_a_obj_onsen/d_a_obj_onsen/CreateHeap__12daObjOnsen_cFv.s delete mode 100644 asm/rel/d/a/obj/d_a_obj_onsen/d_a_obj_onsen/Create__12daObjOnsen_cFv.s delete mode 100644 asm/rel/d/a/obj/d_a_obj_onsen/d_a_obj_onsen/Delete__12daObjOnsen_cFv.s delete mode 100644 asm/rel/d/a/obj/d_a_obj_onsen/d_a_obj_onsen/Draw__12daObjOnsen_cFv.s delete mode 100644 asm/rel/d/a/obj/d_a_obj_onsen/d_a_obj_onsen/Execute__12daObjOnsen_cFPPA3_A4_f.s delete mode 100644 asm/rel/d/a/obj/d_a_obj_onsen/d_a_obj_onsen/__dt__12J3DFrameCtrlFv.s delete mode 100644 asm/rel/d/a/obj/d_a_obj_onsen/d_a_obj_onsen/create1st__12daObjOnsen_cFv.s delete mode 100644 asm/rel/d/a/obj/d_a_obj_onsen/d_a_obj_onsen/daObjOnsen_MoveBGDelete__FP12daObjOnsen_c.s delete mode 100644 asm/rel/d/a/obj/d_a_obj_onsen/d_a_obj_onsen/daObjOnsen_MoveBGDraw__FP12daObjOnsen_c.s delete mode 100644 asm/rel/d/a/obj/d_a_obj_onsen/d_a_obj_onsen/daObjOnsen_MoveBGExecute__FP12daObjOnsen_c.s delete mode 100644 asm/rel/d/a/obj/d_a_obj_onsen/d_a_obj_onsen/daObjOnsen_create1st__FP12daObjOnsen_c.s delete mode 100644 asm/rel/d/a/obj/d_a_obj_onsen/d_a_obj_onsen/initBaseMtx__12daObjOnsen_cFv.s delete mode 100644 asm/rel/d/a/obj/d_a_obj_onsen/d_a_obj_onsen/setBaseMtx__12daObjOnsen_cFv.s delete mode 100644 asm/rel/d/a/obj/d_a_obj_rcircle/d_a_obj_rcircle/Delete__14daObjRCircle_cFv.s delete mode 100644 asm/rel/d/a/obj/d_a_obj_rcircle/d_a_obj_rcircle/__ct__14daObjRCircle_cFv.s delete mode 100644 asm/rel/d/a/obj/d_a_obj_rcircle/d_a_obj_rcircle/__dt__12J3DFrameCtrlFv.s delete mode 100644 asm/rel/d/a/obj/d_a_obj_rcircle/d_a_obj_rcircle/__dt__14daObjRCircle_cFv.s delete mode 100644 asm/rel/d/a/obj/d_a_obj_rcircle/d_a_obj_rcircle/createHeap__14daObjRCircle_cFv.s delete mode 100644 asm/rel/d/a/obj/d_a_obj_rcircle/d_a_obj_rcircle/create__14daObjRCircle_cFv.s delete mode 100644 asm/rel/d/a/obj/d_a_obj_rcircle/d_a_obj_rcircle/daObjRCircle_Delete__FP14daObjRCircle_c.s delete mode 100644 asm/rel/d/a/obj/d_a_obj_rcircle/d_a_obj_rcircle/daObjRCircle_c_createHeap__FP10fopAc_ac_c.s delete mode 100644 asm/rel/d/a/obj/d_a_obj_rcircle/d_a_obj_rcircle/daObjRCircle_create__FP14daObjRCircle_c.s delete mode 100644 asm/rel/d/a/obj/d_a_obj_rcircle/d_a_obj_rcircle/daObjRCircle_draw__FP14daObjRCircle_c.s delete mode 100644 asm/rel/d/a/obj/d_a_obj_rcircle/d_a_obj_rcircle/daObjRCircle_execute__FP14daObjRCircle_c.s delete mode 100644 asm/rel/d/a/obj/d_a_obj_rcircle/d_a_obj_rcircle/draw__14daObjRCircle_cFv.s delete mode 100644 asm/rel/d/a/obj/d_a_obj_rcircle/d_a_obj_rcircle/execute__14daObjRCircle_cFv.s delete mode 100644 asm/rel/d/a/obj/d_a_obj_rcircle/d_a_obj_rcircle/init__14daObjRCircle_cFv.s delete mode 100644 asm/rel/d/a/obj/d_a_obj_rcircle/d_a_obj_rcircle/setModelMtx__14daObjRCircle_cFv.s diff --git a/Progress.md b/Progress.md index 9695e3bd75..ed334e0c89 100644 --- a/Progress.md +++ b/Progress.md @@ -7,22 +7,22 @@ Section | Percentage | Decompiled (bytes) | Total (bytes) .init | 97.972973% | 9280 | 9472 .extab | 100.000000% | 96 | 96 .extabindex | 100.000000% | 96 | 96 -.text | 28.037360% | 1008376 | 3596544 +.text | 28.125334% | 1011540 | 3596544 .ctors | 100.000000% | 448 | 448 .dtors | 100.000000% | 32 | 32 .rodata | 100.000000% | 193856 | 193856 .data | 100.000000% | 197632 | 197632 .sdata | 100.000000% | 1408 | 1408 .sdata2 | 100.000000% | 20832 | 20832 -Total | 35.623697% | 1432312 | 4020672 +Total | 35.702390% | 1435476 | 4020672 ## Total Section | Percentage | Decompiled (bytes) | Total (bytes) ---|---|---|--- -main.dol | 35.623697% | 1432312 | 4020672 -RELs | 33.810282% | 3888292 | 11500324 -Total | 34.280042% | 5320604 | 15520996 +main.dol | 35.702390% | 1435476 | 4020672 +RELs | 33.847533% | 3892576 | 11500324 +Total | 34.328029% | 5328052 | 15520996 ## RELs @@ -436,7 +436,7 @@ d_a_obj_hbombkoya | 47.549020% | 3104 | 6528 d_a_obj_heavySw | 41.214623% | 2796 | 6784 d_a_obj_hfuta | 39.073970% | 2768 | 7084 d_a_obj_hhashi | 33.138856% | 3408 | 10284 -d_a_obj_hsTarget | 57.317073% | 1504 | 2624 +d_a_obj_hsTarget | 100.000000% | 2624 | 2624 d_a_obj_ice_l | 34.815373% | 1848 | 5308 d_a_obj_ice_s | 35.446009% | 2416 | 6816 d_a_obj_iceblock | 32.744340% | 4744 | 14488 @@ -558,7 +558,7 @@ d_a_obj_ndoor | 51.957831% | 1380 | 2656 d_a_obj_nougu | 42.325581% | 2548 | 6020 d_a_obj_octhashi | 35.325420% | 3452 | 9772 d_a_obj_oiltubo | 40.168244% | 3056 | 7608 -d_a_obj_onsen | 49.239281% | 1424 | 2892 +d_a_obj_onsen | 100.000000% | 2892 | 2892 d_a_obj_onsenFire | 100.000000% | 1296 | 1296 d_a_obj_onsenTaru | 38.567616% | 3468 | 8992 d_a_obj_ornament_cloth | 38.734568% | 2008 | 5184 @@ -573,7 +573,7 @@ d_a_obj_poFire | 36.999540% | 3216 | 8692 d_a_obj_poTbox | 44.731739% | 2768 | 6188 d_a_obj_prop | 100.000000% | 2064 | 2064 d_a_obj_pumpkin | 29.152971% | 4612 | 15820 -d_a_obj_rcircle | 43.989432% | 1332 | 3028 +d_a_obj_rcircle | 100.000000% | 3028 | 3028 d_a_obj_rfHole | 43.621701% | 2380 | 5456 d_a_obj_rgate | 36.466069% | 5696 | 15620 d_a_obj_riverrock | 37.311178% | 2964 | 7944 @@ -785,4 +785,4 @@ d_a_vrbox2 | 34.977578% | 2184 | 6244 d_a_warp_bug | 100.000000% | 2024 | 2024 d_a_ykgr | 44.400631% | 2252 | 5072 f_pc_profile_lst | 100.000000% | 28156 | 28156 -Total | 33.810282% | 3888292 | 11500324 +Total | 33.847533% | 3892576 | 11500324 diff --git a/asm/d/map/d_map_path_fmap/isArrival__22dMenu_Fmap_room_data_cFv.s b/asm/d/map/d_map_path_fmap/isArrival__22dMenu_Fmap_room_data_cFv.s deleted file mode 100644 index 2e62376b81..0000000000 --- a/asm/d/map/d_map_path_fmap/isArrival__22dMenu_Fmap_room_data_cFv.s +++ /dev/null @@ -1,21 +0,0 @@ -lbl_8003D818: -/* 8003D818 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 8003D81C 7C 08 02 A6 */ mflr r0 -/* 8003D820 90 01 00 14 */ stw r0, 0x14(r1) -/* 8003D824 93 E1 00 0C */ stw r31, 0xc(r1) -/* 8003D828 7C 7F 1B 78 */ mr r31, r3 -/* 8003D82C 80 63 00 0C */ lwz r3, 0xc(r3) -/* 8003D830 80 83 00 08 */ lwz r4, 8(r3) -/* 8003D834 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */ -/* 8003D838 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 0x804061C0@l */ -/* 8003D83C 88 84 00 02 */ lbz r4, 2(r4) -/* 8003D840 4B FF 78 69 */ bl getSave2__10dSv_save_cFi -/* 8003D844 88 9F 00 10 */ lbz r4, 0x10(r31) -/* 8003D848 4B FF 72 A5 */ bl isVisitedRoom__13dSv_memory2_cFi -/* 8003D84C 30 03 FF FF */ addic r0, r3, -1 -/* 8003D850 7C 60 19 10 */ subfe r3, r0, r3 -/* 8003D854 83 E1 00 0C */ lwz r31, 0xc(r1) -/* 8003D858 80 01 00 14 */ lwz r0, 0x14(r1) -/* 8003D85C 7C 08 03 A6 */ mtlr r0 -/* 8003D860 38 21 00 10 */ addi r1, r1, 0x10 -/* 8003D864 4E 80 00 20 */ blr diff --git a/asm/msg/scrn/d_msg_scrn_place/__ct__15dMsgScrnPlace_cFv.s b/asm/msg/scrn/d_msg_scrn_place/__ct__15dMsgScrnPlace_cFv.s deleted file mode 100644 index 6bf2da703c..0000000000 --- a/asm/msg/scrn/d_msg_scrn_place/__ct__15dMsgScrnPlace_cFv.s +++ /dev/null @@ -1,264 +0,0 @@ -lbl_802463CC: -/* 802463CC 94 21 FF D0 */ stwu r1, -0x30(r1) -/* 802463D0 7C 08 02 A6 */ mflr r0 -/* 802463D4 90 01 00 34 */ stw r0, 0x34(r1) -/* 802463D8 DB E1 00 20 */ stfd f31, 0x20(r1) -/* 802463DC F3 E1 00 28 */ psq_st f31, 40(r1), 0, 0 /* qr0 */ -/* 802463E0 39 61 00 20 */ addi r11, r1, 0x20 -/* 802463E4 48 11 BD ED */ bl _savegpr_26 -/* 802463E8 7C 7F 1B 78 */ mr r31, r3 -/* 802463EC 4B FF 5C F1 */ bl __ct__14dMsgScrnBase_cFv -/* 802463F0 3C 60 80 3C */ lis r3, __vt__15dMsgScrnPlace_c@ha /* 0x803C12E8@ha */ -/* 802463F4 38 03 12 E8 */ addi r0, r3, __vt__15dMsgScrnPlace_c@l /* 0x803C12E8@l */ -/* 802463F8 90 1F 00 00 */ stw r0, 0(r31) -/* 802463FC 7F E3 FB 78 */ mr r3, r31 -/* 80246400 4B FF 5D 6D */ bl init__14dMsgScrnBase_cFv -/* 80246404 4B F3 B2 3D */ bl dCam_getBody__Fv -/* 80246408 80 03 09 24 */ lwz r0, 0x924(r3) -/* 8024640C 2C 00 00 00 */ cmpwi r0, 0 -/* 80246410 41 82 00 30 */ beq lbl_80246440 -/* 80246414 4B F3 B2 2D */ bl dCam_getBody__Fv -/* 80246418 80 03 09 24 */ lwz r0, 0x924(r3) -/* 8024641C 2C 00 00 04 */ cmpwi r0, 4 -/* 80246420 41 82 00 20 */ beq lbl_80246440 -/* 80246424 3C 60 80 43 */ lis r3, g_MsgObject_HIO_c@ha /* 0x8043028C@ha */ -/* 80246428 38 63 02 8C */ addi r3, r3, g_MsgObject_HIO_c@l /* 0x8043028C@l */ -/* 8024642C C0 03 01 94 */ lfs f0, 0x194(r3) -/* 80246430 D0 1F 00 CC */ stfs f0, 0xcc(r31) -/* 80246434 C0 03 01 B4 */ lfs f0, 0x1b4(r3) -/* 80246438 D0 1F 00 D0 */ stfs f0, 0xd0(r31) -/* 8024643C 48 00 00 10 */ b lbl_8024644C -lbl_80246440: -/* 80246440 C0 02 B2 E8 */ lfs f0, lit_3998(r2) -/* 80246444 D0 1F 00 D0 */ stfs f0, 0xd0(r31) -/* 80246448 D0 1F 00 CC */ stfs f0, 0xcc(r31) -lbl_8024644C: -/* 8024644C 38 60 01 18 */ li r3, 0x118 -/* 80246450 48 08 87 FD */ bl __nw__FUl -/* 80246454 7C 60 1B 79 */ or. r0, r3, r3 -/* 80246458 41 82 00 0C */ beq lbl_80246464 -/* 8024645C 48 0B 20 3D */ bl __ct__9J2DScreenFv -/* 80246460 7C 60 1B 78 */ mr r0, r3 -lbl_80246464: -/* 80246464 90 1F 00 04 */ stw r0, 4(r31) -/* 80246468 80 7F 00 04 */ lwz r3, 4(r31) -/* 8024646C 3C 80 80 3A */ lis r4, msg_scrn_d_msg_scrn_place__stringBase0@ha /* 0x80399B78@ha */ -/* 80246470 38 84 9B 78 */ addi r4, r4, msg_scrn_d_msg_scrn_place__stringBase0@l /* 0x80399B78@l */ -/* 80246474 3C A0 00 02 */ lis r5, 2 -/* 80246478 3C C0 80 40 */ lis r6, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */ -/* 8024647C 38 C6 61 C0 */ addi r6, r6, g_dComIfG_gameInfo@l /* 0x804061C0@l */ -/* 80246480 80 C6 5C 7C */ lwz r6, 0x5c7c(r6) -/* 80246484 48 0B 21 C5 */ bl setPriority__9J2DScreenFPCcUlP10JKRArchive -/* 80246488 80 7F 00 04 */ lwz r3, 4(r31) -/* 8024648C 48 00 EC 5D */ bl dPaneClass_showNullPane__FP9J2DScreen -/* 80246490 38 60 00 6C */ li r3, 0x6c -/* 80246494 48 08 87 B9 */ bl __nw__FUl -/* 80246498 7C 60 1B 79 */ or. r0, r3, r3 -/* 8024649C 41 82 00 24 */ beq lbl_802464C0 -/* 802464A0 80 9F 00 04 */ lwz r4, 4(r31) -/* 802464A4 3C A0 5F 61 */ lis r5, 0x5F61 /* 0x5F616C6C@ha */ -/* 802464A8 38 C5 6C 6C */ addi r6, r5, 0x6C6C /* 0x5F616C6C@l */ -/* 802464AC 38 A0 00 6E */ li r5, 0x6e -/* 802464B0 38 E0 00 02 */ li r7, 2 -/* 802464B4 39 00 00 00 */ li r8, 0 -/* 802464B8 48 00 D4 CD */ bl __ct__8CPaneMgrFP9J2DScreenUxUcP10JKRExpHeap -/* 802464BC 7C 60 1B 78 */ mr r0, r3 -lbl_802464C0: -/* 802464C0 90 1F 00 08 */ stw r0, 8(r31) -/* 802464C4 3C 60 80 43 */ lis r3, g_MsgObject_HIO_c@ha /* 0x8043028C@ha */ -/* 802464C8 38 83 02 8C */ addi r4, r3, g_MsgObject_HIO_c@l /* 0x8043028C@l */ -/* 802464CC C0 24 00 BC */ lfs f1, 0xbc(r4) -/* 802464D0 80 7F 00 08 */ lwz r3, 8(r31) -/* 802464D4 80 63 00 04 */ lwz r3, 4(r3) -/* 802464D8 C0 04 00 90 */ lfs f0, 0x90(r4) -/* 802464DC D0 03 00 CC */ stfs f0, 0xcc(r3) -/* 802464E0 D0 23 00 D0 */ stfs f1, 0xd0(r3) -/* 802464E4 81 83 00 00 */ lwz r12, 0(r3) -/* 802464E8 81 8C 00 2C */ lwz r12, 0x2c(r12) -/* 802464EC 7D 89 03 A6 */ mtctr r12 -/* 802464F0 4E 80 04 21 */ bctrl -/* 802464F4 38 60 00 6C */ li r3, 0x6c -/* 802464F8 48 08 87 55 */ bl __nw__FUl -/* 802464FC 7C 60 1B 79 */ or. r0, r3, r3 -/* 80246500 41 82 00 28 */ beq lbl_80246528 -/* 80246504 80 9F 00 04 */ lwz r4, 4(r31) -/* 80246508 3C A0 6E 74 */ lis r5, 0x6E74 /* 0x6E745F6E@ha */ -/* 8024650C 38 C5 5F 6E */ addi r6, r5, 0x5F6E /* 0x6E745F6E@l */ -/* 80246510 3C A0 73 5F */ lis r5, 0x735F /* 0x735F666F@ha */ -/* 80246514 38 A5 66 6F */ addi r5, r5, 0x666F /* 0x735F666F@l */ -/* 80246518 38 E0 00 00 */ li r7, 0 -/* 8024651C 39 00 00 00 */ li r8, 0 -/* 80246520 48 00 D4 65 */ bl __ct__8CPaneMgrFP9J2DScreenUxUcP10JKRExpHeap -/* 80246524 7C 60 1B 78 */ mr r0, r3 -lbl_80246528: -/* 80246528 90 1F 00 C8 */ stw r0, 0xc8(r31) -/* 8024652C 3C 60 80 43 */ lis r3, g_MsgObject_HIO_c@ha /* 0x8043028C@ha */ -/* 80246530 38 83 02 8C */ addi r4, r3, g_MsgObject_HIO_c@l /* 0x8043028C@l */ -/* 80246534 C0 24 01 A4 */ lfs f1, 0x1a4(r4) -/* 80246538 80 7F 00 C8 */ lwz r3, 0xc8(r31) -/* 8024653C 80 63 00 04 */ lwz r3, 4(r3) -/* 80246540 C0 04 01 9C */ lfs f0, 0x19c(r4) -/* 80246544 D0 03 00 CC */ stfs f0, 0xcc(r3) -/* 80246548 D0 23 00 D0 */ stfs f1, 0xd0(r3) -/* 8024654C 81 83 00 00 */ lwz r12, 0(r3) -/* 80246550 81 8C 00 2C */ lwz r12, 0x2c(r12) -/* 80246554 7D 89 03 A6 */ mtctr r12 -/* 80246558 4E 80 04 21 */ bctrl -/* 8024655C 80 7F 00 C8 */ lwz r3, 0xc8(r31) -/* 80246560 3C 80 80 43 */ lis r4, g_MsgObject_HIO_c@ha /* 0x8043028C@ha */ -/* 80246564 38 84 02 8C */ addi r4, r4, g_MsgObject_HIO_c@l /* 0x8043028C@l */ -/* 80246568 C0 24 01 8C */ lfs f1, 0x18c(r4) -/* 8024656C C0 44 01 94 */ lfs f2, 0x194(r4) -/* 80246570 C0 1F 00 CC */ lfs f0, 0xcc(r31) -/* 80246574 EC 42 00 28 */ fsubs f2, f2, f0 -/* 80246578 48 00 E0 39 */ bl paneTrans__8CPaneMgrFff -/* 8024657C 38 60 00 6C */ li r3, 0x6c -/* 80246580 48 08 86 CD */ bl __nw__FUl -/* 80246584 7C 60 1B 79 */ or. r0, r3, r3 -/* 80246588 41 82 00 24 */ beq lbl_802465AC -/* 8024658C 80 9F 00 04 */ lwz r4, 4(r31) -/* 80246590 3C A0 73 65 */ lis r5, 0x7365 /* 0x73655F6E@ha */ -/* 80246594 38 C5 5F 6E */ addi r6, r5, 0x5F6E /* 0x73655F6E@l */ -/* 80246598 38 A0 62 61 */ li r5, 0x6261 -/* 8024659C 38 E0 00 02 */ li r7, 2 -/* 802465A0 39 00 00 00 */ li r8, 0 -/* 802465A4 48 00 D3 E1 */ bl __ct__8CPaneMgrFP9J2DScreenUxUcP10JKRExpHeap -/* 802465A8 7C 60 1B 78 */ mr r0, r3 -lbl_802465AC: -/* 802465AC 90 1F 00 C4 */ stw r0, 0xc4(r31) -/* 802465B0 3C 60 80 43 */ lis r3, g_MsgObject_HIO_c@ha /* 0x8043028C@ha */ -/* 802465B4 38 83 02 8C */ addi r4, r3, g_MsgObject_HIO_c@l /* 0x8043028C@l */ -/* 802465B8 C0 24 01 C4 */ lfs f1, 0x1c4(r4) -/* 802465BC 80 7F 00 C4 */ lwz r3, 0xc4(r31) -/* 802465C0 80 63 00 04 */ lwz r3, 4(r3) -/* 802465C4 C0 04 01 BC */ lfs f0, 0x1bc(r4) -/* 802465C8 D0 03 00 CC */ stfs f0, 0xcc(r3) -/* 802465CC D0 23 00 D0 */ stfs f1, 0xd0(r3) -/* 802465D0 81 83 00 00 */ lwz r12, 0(r3) -/* 802465D4 81 8C 00 2C */ lwz r12, 0x2c(r12) -/* 802465D8 7D 89 03 A6 */ mtctr r12 -/* 802465DC 4E 80 04 21 */ bctrl -/* 802465E0 80 7F 00 C4 */ lwz r3, 0xc4(r31) -/* 802465E4 3C 80 80 43 */ lis r4, g_MsgObject_HIO_c@ha /* 0x8043028C@ha */ -/* 802465E8 38 84 02 8C */ addi r4, r4, g_MsgObject_HIO_c@l /* 0x8043028C@l */ -/* 802465EC C0 24 01 AC */ lfs f1, 0x1ac(r4) -/* 802465F0 C0 44 01 B4 */ lfs f2, 0x1b4(r4) -/* 802465F4 C0 1F 00 D0 */ lfs f0, 0xd0(r31) -/* 802465F8 EC 42 00 28 */ fsubs f2, f2, f0 -/* 802465FC 48 00 DF B5 */ bl paneTrans__8CPaneMgrFff -/* 80246600 3B C0 00 00 */ li r30, 0 -/* 80246604 3B A0 00 00 */ li r29, 0 -/* 80246608 3B 80 00 00 */ li r28, 0 -/* 8024660C 3C 60 80 3A */ lis r3, msg_scrn_d_msg_scrn_place__stringBase0@ha /* 0x80399B78@ha */ -/* 80246610 3B 63 9B 78 */ addi r27, r3, msg_scrn_d_msg_scrn_place__stringBase0@l /* 0x80399B78@l */ -/* 80246614 C3 E2 B2 EC */ lfs f31, lit_3999(r2) -lbl_80246618: -/* 80246618 38 60 00 6C */ li r3, 0x6c -/* 8024661C 48 08 86 31 */ bl __nw__FUl -/* 80246620 7C 64 1B 79 */ or. r4, r3, r3 -/* 80246624 41 82 00 2C */ beq lbl_80246650 -/* 80246628 80 9F 00 04 */ lwz r4, 4(r31) -/* 8024662C 3C A0 80 3C */ lis r5, t_tag@ha /* 0x803C12B0@ha */ -/* 80246630 38 05 12 B0 */ addi r0, r5, t_tag@l /* 0x803C12B0@l */ -/* 80246634 7C C0 E2 14 */ add r6, r0, r28 -/* 80246638 80 A6 00 00 */ lwz r5, 0(r6) -/* 8024663C 80 C6 00 04 */ lwz r6, 4(r6) -/* 80246640 38 E0 00 00 */ li r7, 0 -/* 80246644 39 00 00 00 */ li r8, 0 -/* 80246648 48 00 D3 3D */ bl __ct__8CPaneMgrFP9J2DScreenUxUcP10JKRExpHeap -/* 8024664C 7C 64 1B 78 */ mr r4, r3 -lbl_80246650: -/* 80246650 38 1D 00 0C */ addi r0, r29, 0xc -/* 80246654 7C 9F 01 2E */ stwx r4, r31, r0 -/* 80246658 7C 7F 00 2E */ lwzx r3, r31, r0 -/* 8024665C 83 43 00 04 */ lwz r26, 4(r3) -/* 80246660 4B DC E4 A5 */ bl mDoExt_getRubyFont__Fv -/* 80246664 7C 64 1B 78 */ mr r4, r3 -/* 80246668 7F 43 D3 78 */ mr r3, r26 -/* 8024666C 81 9A 00 00 */ lwz r12, 0(r26) -/* 80246670 81 8C 00 9C */ lwz r12, 0x9c(r12) -/* 80246674 7D 89 03 A6 */ mtctr r12 -/* 80246678 4E 80 04 21 */ bctrl -/* 8024667C 38 1D 00 0C */ addi r0, r29, 0xc -/* 80246680 7C 7F 00 2E */ lwzx r3, r31, r0 -/* 80246684 80 63 00 04 */ lwz r3, 4(r3) -/* 80246688 38 80 00 80 */ li r4, 0x80 -/* 8024668C 38 BB 00 1E */ addi r5, r27, 0x1e -/* 80246690 4C C6 31 82 */ crclr 6 -/* 80246694 48 0B A0 B9 */ bl setString__10J2DTextBoxFsPCce -/* 80246698 38 1D 00 0C */ addi r0, r29, 0xc -/* 8024669C 7C 7F 00 2E */ lwzx r3, r31, r0 -/* 802466A0 80 63 00 04 */ lwz r3, 4(r3) -/* 802466A4 D3 E3 01 14 */ stfs f31, 0x114(r3) -/* 802466A8 3B DE 00 01 */ addi r30, r30, 1 -/* 802466AC 2C 1E 00 07 */ cmpwi r30, 7 -/* 802466B0 3B BD 00 04 */ addi r29, r29, 4 -/* 802466B4 3B 9C 00 08 */ addi r28, r28, 8 -/* 802466B8 41 80 FF 60 */ blt lbl_80246618 -/* 802466BC 80 7F 00 0C */ lwz r3, 0xc(r31) -/* 802466C0 80 63 00 04 */ lwz r3, 4(r3) -/* 802466C4 C0 03 01 1C */ lfs f0, 0x11c(r3) -/* 802466C8 D0 1F 00 58 */ stfs f0, 0x58(r31) -/* 802466CC C0 03 01 20 */ lfs f0, 0x120(r3) -/* 802466D0 D0 1F 00 5C */ stfs f0, 0x5c(r31) -/* 802466D4 80 7F 00 0C */ lwz r3, 0xc(r31) -/* 802466D8 80 63 00 04 */ lwz r3, 4(r3) -/* 802466DC C0 23 00 28 */ lfs f1, 0x28(r3) -/* 802466E0 C0 03 00 20 */ lfs f0, 0x20(r3) -/* 802466E4 EC 01 00 28 */ fsubs f0, f1, f0 -/* 802466E8 D0 1F 00 74 */ stfs f0, 0x74(r31) -/* 802466EC 80 7F 00 0C */ lwz r3, 0xc(r31) -/* 802466F0 80 63 00 04 */ lwz r3, 4(r3) -/* 802466F4 C0 23 00 2C */ lfs f1, 0x2c(r3) -/* 802466F8 C0 03 00 24 */ lfs f0, 0x24(r3) -/* 802466FC EC 01 00 28 */ fsubs f0, f1, f0 -/* 80246700 D0 1F 00 78 */ stfs f0, 0x78(r31) -/* 80246704 80 7F 00 0C */ lwz r3, 0xc(r31) -/* 80246708 80 63 00 04 */ lwz r3, 4(r3) -/* 8024670C C0 03 01 18 */ lfs f0, 0x118(r3) -/* 80246710 D0 1F 00 7C */ stfs f0, 0x7c(r31) -/* 80246714 80 7F 00 0C */ lwz r3, 0xc(r31) -/* 80246718 80 63 00 04 */ lwz r3, 4(r3) -/* 8024671C C0 03 01 14 */ lfs f0, 0x114(r3) -/* 80246720 D0 1F 00 80 */ stfs f0, 0x80(r31) -/* 80246724 3B 40 00 00 */ li r26, 0 -/* 80246728 3B C0 00 00 */ li r30, 0 -/* 8024672C C3 E2 B2 F0 */ lfs f31, lit_4000(r2) -lbl_80246730: -/* 80246730 38 1E 00 0C */ addi r0, r30, 0xc -/* 80246734 7C 7F 00 2E */ lwzx r3, r31, r0 -/* 80246738 80 63 00 04 */ lwz r3, 4(r3) -/* 8024673C C0 1F 00 7C */ lfs f0, 0x7c(r31) -/* 80246740 D0 03 01 18 */ stfs f0, 0x118(r3) -/* 80246744 7C 7F 00 2E */ lwzx r3, r31, r0 -/* 80246748 80 63 00 04 */ lwz r3, 4(r3) -/* 8024674C C0 23 00 2C */ lfs f1, 0x2c(r3) -/* 80246750 C0 03 00 24 */ lfs f0, 0x24(r3) -/* 80246754 EC 41 00 28 */ fsubs f2, f1, f0 -/* 80246758 C0 23 00 28 */ lfs f1, 0x28(r3) -/* 8024675C C0 03 00 20 */ lfs f0, 0x20(r3) -/* 80246760 EC 01 00 28 */ fsubs f0, f1, f0 -/* 80246764 EC 3F 00 32 */ fmuls f1, f31, f0 -/* 80246768 81 83 00 00 */ lwz r12, 0(r3) -/* 8024676C 81 8C 00 18 */ lwz r12, 0x18(r12) -/* 80246770 7D 89 03 A6 */ mtctr r12 -/* 80246774 4E 80 04 21 */ bctrl -/* 80246778 3B 5A 00 01 */ addi r26, r26, 1 -/* 8024677C 2C 1A 00 07 */ cmpwi r26, 7 -/* 80246780 3B DE 00 04 */ addi r30, r30, 4 -/* 80246784 41 80 FF AC */ blt lbl_80246730 -/* 80246788 80 7F 00 0C */ lwz r3, 0xc(r31) -/* 8024678C 48 00 DB 5D */ bl getGlobalPosX__8CPaneMgrFv -/* 80246790 D0 3F 00 64 */ stfs f1, 0x64(r31) -/* 80246794 80 7F 00 0C */ lwz r3, 0xc(r31) -/* 80246798 48 00 DB CD */ bl getGlobalPosY__8CPaneMgrFv -/* 8024679C D0 3F 00 68 */ stfs f1, 0x68(r31) -/* 802467A0 7F E3 FB 78 */ mr r3, r31 -/* 802467A4 E3 E1 00 28 */ psq_l f31, 40(r1), 0, 0 /* qr0 */ -/* 802467A8 CB E1 00 20 */ lfd f31, 0x20(r1) -/* 802467AC 39 61 00 20 */ addi r11, r1, 0x20 -/* 802467B0 48 11 BA 6D */ bl _restgpr_26 -/* 802467B4 80 01 00 34 */ lwz r0, 0x34(r1) -/* 802467B8 7C 08 03 A6 */ mtlr r0 -/* 802467BC 38 21 00 30 */ addi r1, r1, 0x30 -/* 802467C0 4E 80 00 20 */ blr diff --git a/asm/msg/scrn/d_msg_scrn_place/__dt__15dMsgScrnPlace_cFv.s b/asm/msg/scrn/d_msg_scrn_place/__dt__15dMsgScrnPlace_cFv.s deleted file mode 100644 index 8b461f4b24..0000000000 --- a/asm/msg/scrn/d_msg_scrn_place/__dt__15dMsgScrnPlace_cFv.s +++ /dev/null @@ -1,96 +0,0 @@ -lbl_802467C4: -/* 802467C4 94 21 FF E0 */ stwu r1, -0x20(r1) -/* 802467C8 7C 08 02 A6 */ mflr r0 -/* 802467CC 90 01 00 24 */ stw r0, 0x24(r1) -/* 802467D0 39 61 00 20 */ addi r11, r1, 0x20 -/* 802467D4 48 11 B9 FD */ bl _savegpr_26 -/* 802467D8 7C 7F 1B 79 */ or. r31, r3, r3 -/* 802467DC 7C 9A 23 78 */ mr r26, r4 -/* 802467E0 41 82 01 28 */ beq lbl_80246908 -/* 802467E4 3C 60 80 3C */ lis r3, __vt__15dMsgScrnPlace_c@ha /* 0x803C12E8@ha */ -/* 802467E8 38 03 12 E8 */ addi r0, r3, __vt__15dMsgScrnPlace_c@l /* 0x803C12E8@l */ -/* 802467EC 90 1F 00 00 */ stw r0, 0(r31) -/* 802467F0 80 7F 00 04 */ lwz r3, 4(r31) -/* 802467F4 28 03 00 00 */ cmplwi r3, 0 -/* 802467F8 41 82 00 18 */ beq lbl_80246810 -/* 802467FC 38 80 00 01 */ li r4, 1 -/* 80246800 81 83 00 00 */ lwz r12, 0(r3) -/* 80246804 81 8C 00 08 */ lwz r12, 8(r12) -/* 80246808 7D 89 03 A6 */ mtctr r12 -/* 8024680C 4E 80 04 21 */ bctrl -lbl_80246810: -/* 80246810 38 00 00 00 */ li r0, 0 -/* 80246814 90 1F 00 04 */ stw r0, 4(r31) -/* 80246818 80 7F 00 08 */ lwz r3, 8(r31) -/* 8024681C 28 03 00 00 */ cmplwi r3, 0 -/* 80246820 41 82 00 18 */ beq lbl_80246838 -/* 80246824 38 80 00 01 */ li r4, 1 -/* 80246828 81 83 00 00 */ lwz r12, 0(r3) -/* 8024682C 81 8C 00 08 */ lwz r12, 8(r12) -/* 80246830 7D 89 03 A6 */ mtctr r12 -/* 80246834 4E 80 04 21 */ bctrl -lbl_80246838: -/* 80246838 38 00 00 00 */ li r0, 0 -/* 8024683C 90 1F 00 08 */ stw r0, 8(r31) -/* 80246840 80 7F 00 C8 */ lwz r3, 0xc8(r31) -/* 80246844 28 03 00 00 */ cmplwi r3, 0 -/* 80246848 41 82 00 18 */ beq lbl_80246860 -/* 8024684C 38 80 00 01 */ li r4, 1 -/* 80246850 81 83 00 00 */ lwz r12, 0(r3) -/* 80246854 81 8C 00 08 */ lwz r12, 8(r12) -/* 80246858 7D 89 03 A6 */ mtctr r12 -/* 8024685C 4E 80 04 21 */ bctrl -lbl_80246860: -/* 80246860 38 00 00 00 */ li r0, 0 -/* 80246864 90 1F 00 C8 */ stw r0, 0xc8(r31) -/* 80246868 80 7F 00 C4 */ lwz r3, 0xc4(r31) -/* 8024686C 28 03 00 00 */ cmplwi r3, 0 -/* 80246870 41 82 00 18 */ beq lbl_80246888 -/* 80246874 38 80 00 01 */ li r4, 1 -/* 80246878 81 83 00 00 */ lwz r12, 0(r3) -/* 8024687C 81 8C 00 08 */ lwz r12, 8(r12) -/* 80246880 7D 89 03 A6 */ mtctr r12 -/* 80246884 4E 80 04 21 */ bctrl -lbl_80246888: -/* 80246888 3B A0 00 00 */ li r29, 0 -/* 8024688C 93 BF 00 C4 */ stw r29, 0xc4(r31) -/* 80246890 3B 60 00 00 */ li r27, 0 -/* 80246894 7F BE EB 78 */ mr r30, r29 -lbl_80246898: -/* 80246898 3B 9E 00 0C */ addi r28, r30, 0xc -/* 8024689C 7C 7F E0 2E */ lwzx r3, r31, r28 -/* 802468A0 28 03 00 00 */ cmplwi r3, 0 -/* 802468A4 41 82 00 18 */ beq lbl_802468BC -/* 802468A8 38 80 00 01 */ li r4, 1 -/* 802468AC 81 83 00 00 */ lwz r12, 0(r3) -/* 802468B0 81 8C 00 08 */ lwz r12, 8(r12) -/* 802468B4 7D 89 03 A6 */ mtctr r12 -/* 802468B8 4E 80 04 21 */ bctrl -lbl_802468BC: -/* 802468BC 7F BF E1 2E */ stwx r29, r31, r28 -/* 802468C0 3B 7B 00 01 */ addi r27, r27, 1 -/* 802468C4 2C 1B 00 07 */ cmpwi r27, 7 -/* 802468C8 3B DE 00 04 */ addi r30, r30, 4 -/* 802468CC 41 80 FF CC */ blt lbl_80246898 -/* 802468D0 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */ -/* 802468D4 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 0x804061C0@l */ -/* 802468D8 80 63 5C 7C */ lwz r3, 0x5c7c(r3) -/* 802468DC 81 83 00 00 */ lwz r12, 0(r3) -/* 802468E0 81 8C 00 24 */ lwz r12, 0x24(r12) -/* 802468E4 7D 89 03 A6 */ mtctr r12 -/* 802468E8 4E 80 04 21 */ bctrl -/* 802468EC 7F E3 FB 78 */ mr r3, r31 -/* 802468F0 38 80 00 00 */ li r4, 0 -/* 802468F4 4B FF 58 31 */ bl __dt__14dMsgScrnBase_cFv -/* 802468F8 7F 40 07 35 */ extsh. r0, r26 -/* 802468FC 40 81 00 0C */ ble lbl_80246908 -/* 80246900 7F E3 FB 78 */ mr r3, r31 -/* 80246904 48 08 84 39 */ bl __dl__FPv -lbl_80246908: -/* 80246908 7F E3 FB 78 */ mr r3, r31 -/* 8024690C 39 61 00 20 */ addi r11, r1, 0x20 -/* 80246910 48 11 B9 0D */ bl _restgpr_26 -/* 80246914 80 01 00 24 */ lwz r0, 0x24(r1) -/* 80246918 7C 08 03 A6 */ mtlr r0 -/* 8024691C 38 21 00 20 */ addi r1, r1, 0x20 -/* 80246920 4E 80 00 20 */ blr diff --git a/asm/msg/scrn/d_msg_scrn_place/drawSelf__15dMsgScrnPlace_cFv.s b/asm/msg/scrn/d_msg_scrn_place/drawSelf__15dMsgScrnPlace_cFv.s deleted file mode 100644 index c5b5267150..0000000000 --- a/asm/msg/scrn/d_msg_scrn_place/drawSelf__15dMsgScrnPlace_cFv.s +++ /dev/null @@ -1,23 +0,0 @@ -lbl_80246A44: -/* 80246A44 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 80246A48 7C 08 02 A6 */ mflr r0 -/* 80246A4C 90 01 00 14 */ stw r0, 0x14(r1) -/* 80246A50 93 E1 00 0C */ stw r31, 0xc(r1) -/* 80246A54 7C 7F 1B 78 */ mr r31, r3 -/* 80246A58 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */ -/* 80246A5C 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 0x804061C0@l */ -/* 80246A60 80 63 5F 50 */ lwz r3, 0x5f50(r3) -/* 80246A64 81 83 00 00 */ lwz r12, 0(r3) -/* 80246A68 81 8C 00 18 */ lwz r12, 0x18(r12) -/* 80246A6C 7D 89 03 A6 */ mtctr r12 -/* 80246A70 4E 80 04 21 */ bctrl -/* 80246A74 7F E3 FB 78 */ mr r3, r31 -/* 80246A78 C0 22 B2 E8 */ lfs f1, lit_3998(r2) -/* 80246A7C FC 40 08 90 */ fmr f2, f1 -/* 80246A80 C0 62 B2 EC */ lfs f3, lit_3999(r2) -/* 80246A84 4B FF 58 A9 */ bl drawOutFont__14dMsgScrnBase_cFfff -/* 80246A88 83 E1 00 0C */ lwz r31, 0xc(r1) -/* 80246A8C 80 01 00 14 */ lwz r0, 0x14(r1) -/* 80246A90 7C 08 03 A6 */ mtlr r0 -/* 80246A94 38 21 00 10 */ addi r1, r1, 0x10 -/* 80246A98 4E 80 00 20 */ blr diff --git a/asm/msg/scrn/d_msg_scrn_place/exec__15dMsgScrnPlace_cFv.s b/asm/msg/scrn/d_msg_scrn_place/exec__15dMsgScrnPlace_cFv.s deleted file mode 100644 index 7048853b9f..0000000000 --- a/asm/msg/scrn/d_msg_scrn_place/exec__15dMsgScrnPlace_cFv.s +++ /dev/null @@ -1,74 +0,0 @@ -lbl_80246924: -/* 80246924 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 80246928 7C 08 02 A6 */ mflr r0 -/* 8024692C 90 01 00 14 */ stw r0, 0x14(r1) -/* 80246930 93 E1 00 0C */ stw r31, 0xc(r1) -/* 80246934 7C 7F 1B 78 */ mr r31, r3 -/* 80246938 3C 60 80 43 */ lis r3, g_MsgObject_HIO_c@ha /* 0x8043028C@ha */ -/* 8024693C 38 83 02 8C */ addi r4, r3, g_MsgObject_HIO_c@l /* 0x8043028C@l */ -/* 80246940 C0 24 00 BC */ lfs f1, 0xbc(r4) -/* 80246944 80 7F 00 08 */ lwz r3, 8(r31) -/* 80246948 80 63 00 04 */ lwz r3, 4(r3) -/* 8024694C C0 04 00 90 */ lfs f0, 0x90(r4) -/* 80246950 D0 03 00 CC */ stfs f0, 0xcc(r3) -/* 80246954 D0 23 00 D0 */ stfs f1, 0xd0(r3) -/* 80246958 81 83 00 00 */ lwz r12, 0(r3) -/* 8024695C 81 8C 00 2C */ lwz r12, 0x2c(r12) -/* 80246960 7D 89 03 A6 */ mtctr r12 -/* 80246964 4E 80 04 21 */ bctrl -/* 80246968 3C 60 80 43 */ lis r3, g_MsgObject_HIO_c@ha /* 0x8043028C@ha */ -/* 8024696C 38 83 02 8C */ addi r4, r3, g_MsgObject_HIO_c@l /* 0x8043028C@l */ -/* 80246970 C0 24 01 A4 */ lfs f1, 0x1a4(r4) -/* 80246974 80 7F 00 C8 */ lwz r3, 0xc8(r31) -/* 80246978 80 63 00 04 */ lwz r3, 4(r3) -/* 8024697C C0 04 01 9C */ lfs f0, 0x19c(r4) -/* 80246980 D0 03 00 CC */ stfs f0, 0xcc(r3) -/* 80246984 D0 23 00 D0 */ stfs f1, 0xd0(r3) -/* 80246988 81 83 00 00 */ lwz r12, 0(r3) -/* 8024698C 81 8C 00 2C */ lwz r12, 0x2c(r12) -/* 80246990 7D 89 03 A6 */ mtctr r12 -/* 80246994 4E 80 04 21 */ bctrl -/* 80246998 80 7F 00 C8 */ lwz r3, 0xc8(r31) -/* 8024699C 3C 80 80 43 */ lis r4, g_MsgObject_HIO_c@ha /* 0x8043028C@ha */ -/* 802469A0 38 84 02 8C */ addi r4, r4, g_MsgObject_HIO_c@l /* 0x8043028C@l */ -/* 802469A4 C0 24 01 8C */ lfs f1, 0x18c(r4) -/* 802469A8 C0 44 01 94 */ lfs f2, 0x194(r4) -/* 802469AC C0 1F 00 CC */ lfs f0, 0xcc(r31) -/* 802469B0 EC 42 00 28 */ fsubs f2, f2, f0 -/* 802469B4 48 00 DB FD */ bl paneTrans__8CPaneMgrFff -/* 802469B8 3C 60 80 43 */ lis r3, g_MsgObject_HIO_c@ha /* 0x8043028C@ha */ -/* 802469BC 38 83 02 8C */ addi r4, r3, g_MsgObject_HIO_c@l /* 0x8043028C@l */ -/* 802469C0 C0 24 01 C4 */ lfs f1, 0x1c4(r4) -/* 802469C4 80 7F 00 C4 */ lwz r3, 0xc4(r31) -/* 802469C8 80 63 00 04 */ lwz r3, 4(r3) -/* 802469CC C0 04 01 BC */ lfs f0, 0x1bc(r4) -/* 802469D0 D0 03 00 CC */ stfs f0, 0xcc(r3) -/* 802469D4 D0 23 00 D0 */ stfs f1, 0xd0(r3) -/* 802469D8 81 83 00 00 */ lwz r12, 0(r3) -/* 802469DC 81 8C 00 2C */ lwz r12, 0x2c(r12) -/* 802469E0 7D 89 03 A6 */ mtctr r12 -/* 802469E4 4E 80 04 21 */ bctrl -/* 802469E8 80 7F 00 C4 */ lwz r3, 0xc4(r31) -/* 802469EC 3C 80 80 43 */ lis r4, g_MsgObject_HIO_c@ha /* 0x8043028C@ha */ -/* 802469F0 38 84 02 8C */ addi r4, r4, g_MsgObject_HIO_c@l /* 0x8043028C@l */ -/* 802469F4 C0 24 01 AC */ lfs f1, 0x1ac(r4) -/* 802469F8 C0 44 01 B4 */ lfs f2, 0x1b4(r4) -/* 802469FC C0 1F 00 D0 */ lfs f0, 0xd0(r31) -/* 80246A00 EC 42 00 28 */ fsubs f2, f2, f0 -/* 80246A04 48 00 DB AD */ bl paneTrans__8CPaneMgrFff -/* 80246A08 7F E3 FB 78 */ mr r3, r31 -/* 80246A0C 4B FF 5B 69 */ bl isTalkNow__14dMsgScrnBase_cFv -/* 80246A10 54 60 06 3F */ clrlwi. r0, r3, 0x18 -/* 80246A14 41 82 00 1C */ beq lbl_80246A30 -/* 80246A18 7F E3 FB 78 */ mr r3, r31 -/* 80246A1C C0 22 B2 EC */ lfs f1, lit_3999(r2) -/* 80246A20 81 9F 00 00 */ lwz r12, 0(r31) -/* 80246A24 81 8C 00 4C */ lwz r12, 0x4c(r12) -/* 80246A28 7D 89 03 A6 */ mtctr r12 -/* 80246A2C 4E 80 04 21 */ bctrl -lbl_80246A30: -/* 80246A30 83 E1 00 0C */ lwz r31, 0xc(r1) -/* 80246A34 80 01 00 14 */ lwz r0, 0x14(r1) -/* 80246A38 7C 08 03 A6 */ mtlr r0 -/* 80246A3C 38 21 00 10 */ addi r1, r1, 0x10 -/* 80246A40 4E 80 00 20 */ blr diff --git a/asm/msg/scrn/d_msg_scrn_place/fukiAlpha__15dMsgScrnPlace_cFf.s b/asm/msg/scrn/d_msg_scrn_place/fukiAlpha__15dMsgScrnPlace_cFf.s deleted file mode 100644 index 2c7f742713..0000000000 --- a/asm/msg/scrn/d_msg_scrn_place/fukiAlpha__15dMsgScrnPlace_cFf.s +++ /dev/null @@ -1,37 +0,0 @@ -lbl_80246A9C: -/* 80246A9C 94 21 FF D0 */ stwu r1, -0x30(r1) -/* 80246AA0 7C 08 02 A6 */ mflr r0 -/* 80246AA4 90 01 00 34 */ stw r0, 0x34(r1) -/* 80246AA8 DB E1 00 20 */ stfd f31, 0x20(r1) -/* 80246AAC F3 E1 00 28 */ psq_st f31, 40(r1), 0, 0 /* qr0 */ -/* 80246AB0 39 61 00 20 */ addi r11, r1, 0x20 -/* 80246AB4 48 11 B7 29 */ bl _savegpr_29 -/* 80246AB8 7C 7D 1B 78 */ mr r29, r3 -/* 80246ABC FF E0 08 90 */ fmr f31, f1 -/* 80246AC0 80 63 00 08 */ lwz r3, 8(r3) -/* 80246AC4 48 00 ED 0D */ bl setAlphaRate__13CPaneMgrAlphaFf -/* 80246AC8 80 7D 00 C4 */ lwz r3, 0xc4(r29) -/* 80246ACC 3C 80 80 43 */ lis r4, g_MsgObject_HIO_c@ha /* 0x8043028C@ha */ -/* 80246AD0 38 84 02 8C */ addi r4, r4, g_MsgObject_HIO_c@l /* 0x8043028C@l */ -/* 80246AD4 C0 04 01 CC */ lfs f0, 0x1cc(r4) -/* 80246AD8 EC 3F 00 32 */ fmuls f1, f31, f0 -/* 80246ADC 48 00 EC F5 */ bl setAlphaRate__13CPaneMgrAlphaFf -/* 80246AE0 3B C0 00 00 */ li r30, 0 -/* 80246AE4 3B E0 00 00 */ li r31, 0 -lbl_80246AE8: -/* 80246AE8 38 1F 00 0C */ addi r0, r31, 0xc -/* 80246AEC 7C 7D 00 2E */ lwzx r3, r29, r0 -/* 80246AF0 FC 20 F8 90 */ fmr f1, f31 -/* 80246AF4 48 00 EC DD */ bl setAlphaRate__13CPaneMgrAlphaFf -/* 80246AF8 3B DE 00 01 */ addi r30, r30, 1 -/* 80246AFC 2C 1E 00 07 */ cmpwi r30, 7 -/* 80246B00 3B FF 00 04 */ addi r31, r31, 4 -/* 80246B04 41 80 FF E4 */ blt lbl_80246AE8 -/* 80246B08 E3 E1 00 28 */ psq_l f31, 40(r1), 0, 0 /* qr0 */ -/* 80246B0C CB E1 00 20 */ lfd f31, 0x20(r1) -/* 80246B10 39 61 00 20 */ addi r11, r1, 0x20 -/* 80246B14 48 11 B7 15 */ bl _restgpr_29 -/* 80246B18 80 01 00 34 */ lwz r0, 0x34(r1) -/* 80246B1C 7C 08 03 A6 */ mtlr r0 -/* 80246B20 38 21 00 30 */ addi r1, r1, 0x30 -/* 80246B24 4E 80 00 20 */ blr diff --git a/asm/msg/scrn/d_msg_scrn_staff/__ct__15dMsgScrnStaff_cFUc.s b/asm/msg/scrn/d_msg_scrn_staff/__ct__15dMsgScrnStaff_cFUc.s deleted file mode 100644 index cf9f1a9029..0000000000 --- a/asm/msg/scrn/d_msg_scrn_staff/__ct__15dMsgScrnStaff_cFUc.s +++ /dev/null @@ -1,175 +0,0 @@ -lbl_80246B34: -/* 80246B34 94 21 FF E0 */ stwu r1, -0x20(r1) -/* 80246B38 7C 08 02 A6 */ mflr r0 -/* 80246B3C 90 01 00 24 */ stw r0, 0x24(r1) -/* 80246B40 39 61 00 20 */ addi r11, r1, 0x20 -/* 80246B44 48 11 B6 8D */ bl _savegpr_26 -/* 80246B48 7C 7E 1B 78 */ mr r30, r3 -/* 80246B4C 4B FF 55 91 */ bl __ct__14dMsgScrnBase_cFv -/* 80246B50 3C 60 80 3C */ lis r3, __vt__15dMsgScrnStaff_c@ha /* 0x803C1370@ha */ -/* 80246B54 38 03 13 70 */ addi r0, r3, __vt__15dMsgScrnStaff_c@l /* 0x803C1370@l */ -/* 80246B58 90 1E 00 00 */ stw r0, 0(r30) -/* 80246B5C 7F C3 F3 78 */ mr r3, r30 -/* 80246B60 4B FF 56 0D */ bl init__14dMsgScrnBase_cFv -/* 80246B64 C0 02 B2 F8 */ lfs f0, lit_3842(r2) -/* 80246B68 D0 1E 00 D0 */ stfs f0, 0xd0(r30) -/* 80246B6C D0 1E 00 CC */ stfs f0, 0xcc(r30) -/* 80246B70 38 60 01 18 */ li r3, 0x118 -/* 80246B74 48 08 80 D9 */ bl __nw__FUl -/* 80246B78 7C 60 1B 79 */ or. r0, r3, r3 -/* 80246B7C 41 82 00 0C */ beq lbl_80246B88 -/* 80246B80 48 0B 19 19 */ bl __ct__9J2DScreenFv -/* 80246B84 7C 60 1B 78 */ mr r0, r3 -lbl_80246B88: -/* 80246B88 90 1E 00 04 */ stw r0, 4(r30) -/* 80246B8C 80 7E 00 04 */ lwz r3, 4(r30) -/* 80246B90 3C 80 80 3A */ lis r4, msg_scrn_d_msg_scrn_staff__stringBase0@ha /* 0x80399B98@ha */ -/* 80246B94 38 84 9B 98 */ addi r4, r4, msg_scrn_d_msg_scrn_staff__stringBase0@l /* 0x80399B98@l */ -/* 80246B98 3C A0 00 02 */ lis r5, 2 -/* 80246B9C 3C C0 80 40 */ lis r6, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */ -/* 80246BA0 38 C6 61 C0 */ addi r6, r6, g_dComIfG_gameInfo@l /* 0x804061C0@l */ -/* 80246BA4 80 C6 5C 84 */ lwz r6, 0x5c84(r6) -/* 80246BA8 48 0B 1A A1 */ bl setPriority__9J2DScreenFPCcUlP10JKRArchive -/* 80246BAC 80 7E 00 04 */ lwz r3, 4(r30) -/* 80246BB0 48 00 E5 39 */ bl dPaneClass_showNullPane__FP9J2DScreen -/* 80246BB4 38 60 00 6C */ li r3, 0x6c -/* 80246BB8 48 08 80 95 */ bl __nw__FUl -/* 80246BBC 7C 60 1B 79 */ or. r0, r3, r3 -/* 80246BC0 41 82 00 24 */ beq lbl_80246BE4 -/* 80246BC4 80 9E 00 04 */ lwz r4, 4(r30) -/* 80246BC8 3C A0 52 4F */ lis r5, 0x524F /* 0x524F4F54@ha */ -/* 80246BCC 38 C5 4F 54 */ addi r6, r5, 0x4F54 /* 0x524F4F54@l */ -/* 80246BD0 38 A0 00 00 */ li r5, 0 -/* 80246BD4 38 E0 00 02 */ li r7, 2 -/* 80246BD8 39 00 00 00 */ li r8, 0 -/* 80246BDC 48 00 CD A9 */ bl __ct__8CPaneMgrFP9J2DScreenUxUcP10JKRExpHeap -/* 80246BE0 7C 60 1B 78 */ mr r0, r3 -lbl_80246BE4: -/* 80246BE4 90 1E 00 08 */ stw r0, 8(r30) -/* 80246BE8 80 7E 00 04 */ lwz r3, 4(r30) -/* 80246BEC 3C 80 66 74 */ lis r4, 0x6674 /* 0x66745F6E@ha */ -/* 80246BF0 38 C4 5F 6E */ addi r6, r4, 0x5F6E /* 0x66745F6E@l */ -/* 80246BF4 38 A0 6C 65 */ li r5, 0x6c65 -/* 80246BF8 81 83 00 00 */ lwz r12, 0(r3) -/* 80246BFC 81 8C 00 3C */ lwz r12, 0x3c(r12) -/* 80246C00 7D 89 03 A6 */ mtctr r12 -/* 80246C04 4E 80 04 21 */ bctrl -/* 80246C08 38 00 00 00 */ li r0, 0 -/* 80246C0C 98 03 00 B0 */ stb r0, 0xb0(r3) -/* 80246C10 80 7E 00 04 */ lwz r3, 4(r30) -/* 80246C14 3C 80 68 74 */ lis r4, 0x6874 /* 0x68745F6E@ha */ -/* 80246C18 38 C4 5F 6E */ addi r6, r4, 0x5F6E /* 0x68745F6E@l */ -/* 80246C1C 3C 80 00 72 */ lis r4, 0x0072 /* 0x00726967@ha */ -/* 80246C20 38 A4 69 67 */ addi r5, r4, 0x6967 /* 0x00726967@l */ -/* 80246C24 81 83 00 00 */ lwz r12, 0(r3) -/* 80246C28 81 8C 00 3C */ lwz r12, 0x3c(r12) -/* 80246C2C 7D 89 03 A6 */ mtctr r12 -/* 80246C30 4E 80 04 21 */ bctrl -/* 80246C34 3B 60 00 00 */ li r27, 0 -/* 80246C38 9B 63 00 B0 */ stb r27, 0xb0(r3) -/* 80246C3C 3B E0 00 00 */ li r31, 0 -/* 80246C40 3B A0 00 00 */ li r29, 0 -/* 80246C44 3C 60 80 3A */ lis r3, msg_scrn_d_msg_scrn_staff__stringBase0@ha /* 0x80399B98@ha */ -/* 80246C48 3B 83 9B 98 */ addi r28, r3, msg_scrn_d_msg_scrn_staff__stringBase0@l /* 0x80399B98@l */ -lbl_80246C4C: -/* 80246C4C 38 60 00 6C */ li r3, 0x6c -/* 80246C50 48 08 7F FD */ bl __nw__FUl -/* 80246C54 7C 64 1B 79 */ or. r4, r3, r3 -/* 80246C58 41 82 00 2C */ beq lbl_80246C84 -/* 80246C5C 80 9E 00 04 */ lwz r4, 4(r30) -/* 80246C60 3C A0 80 3C */ lis r5, t_tag@ha /* 0x803C1340@ha */ -/* 80246C64 38 05 13 40 */ addi r0, r5, t_tag@l /* 0x803C1340@l */ -/* 80246C68 7C C0 DA 14 */ add r6, r0, r27 -/* 80246C6C 80 A6 00 00 */ lwz r5, 0(r6) -/* 80246C70 80 C6 00 04 */ lwz r6, 4(r6) -/* 80246C74 38 E0 00 00 */ li r7, 0 -/* 80246C78 39 00 00 00 */ li r8, 0 -/* 80246C7C 48 00 CD 09 */ bl __ct__8CPaneMgrFP9J2DScreenUxUcP10JKRExpHeap -/* 80246C80 7C 64 1B 78 */ mr r4, r3 -lbl_80246C84: -/* 80246C84 38 1D 00 0C */ addi r0, r29, 0xc -/* 80246C88 7C 9E 01 2E */ stwx r4, r30, r0 -/* 80246C8C 7C 7E 00 2E */ lwzx r3, r30, r0 -/* 80246C90 83 43 00 04 */ lwz r26, 4(r3) -/* 80246C94 4B DC DD 5D */ bl mDoExt_getMesgFont__Fv -/* 80246C98 7C 64 1B 78 */ mr r4, r3 -/* 80246C9C 7F 43 D3 78 */ mr r3, r26 -/* 80246CA0 81 9A 00 00 */ lwz r12, 0(r26) -/* 80246CA4 81 8C 00 9C */ lwz r12, 0x9c(r12) -/* 80246CA8 7D 89 03 A6 */ mtctr r12 -/* 80246CAC 4E 80 04 21 */ bctrl -/* 80246CB0 38 1D 00 0C */ addi r0, r29, 0xc -/* 80246CB4 7C 7E 00 2E */ lwzx r3, r30, r0 -/* 80246CB8 80 63 00 04 */ lwz r3, 4(r3) -/* 80246CBC 38 80 02 00 */ li r4, 0x200 -/* 80246CC0 38 BC 00 15 */ addi r5, r28, 0x15 -/* 80246CC4 4C C6 31 82 */ crclr 6 -/* 80246CC8 48 0B 9A 85 */ bl setString__10J2DTextBoxFsPCce -/* 80246CCC 3B FF 00 01 */ addi r31, r31, 1 -/* 80246CD0 2C 1F 00 06 */ cmpwi r31, 6 -/* 80246CD4 3B BD 00 04 */ addi r29, r29, 4 -/* 80246CD8 3B 7B 00 08 */ addi r27, r27, 8 -/* 80246CDC 41 80 FF 70 */ blt lbl_80246C4C -/* 80246CE0 80 7E 00 0C */ lwz r3, 0xc(r30) -/* 80246CE4 80 63 00 04 */ lwz r3, 4(r3) -/* 80246CE8 C0 03 01 1C */ lfs f0, 0x11c(r3) -/* 80246CEC D0 1E 00 58 */ stfs f0, 0x58(r30) -/* 80246CF0 C0 03 01 20 */ lfs f0, 0x120(r3) -/* 80246CF4 D0 1E 00 5C */ stfs f0, 0x5c(r30) -/* 80246CF8 80 7E 00 0C */ lwz r3, 0xc(r30) -/* 80246CFC 80 63 00 04 */ lwz r3, 4(r3) -/* 80246D00 C0 23 00 28 */ lfs f1, 0x28(r3) -/* 80246D04 C0 03 00 20 */ lfs f0, 0x20(r3) -/* 80246D08 EC 01 00 28 */ fsubs f0, f1, f0 -/* 80246D0C D0 1E 00 74 */ stfs f0, 0x74(r30) -/* 80246D10 80 7E 00 0C */ lwz r3, 0xc(r30) -/* 80246D14 80 63 00 04 */ lwz r3, 4(r3) -/* 80246D18 C0 23 00 2C */ lfs f1, 0x2c(r3) -/* 80246D1C C0 03 00 24 */ lfs f0, 0x24(r3) -/* 80246D20 EC 01 00 28 */ fsubs f0, f1, f0 -/* 80246D24 D0 1E 00 78 */ stfs f0, 0x78(r30) -/* 80246D28 80 7E 00 0C */ lwz r3, 0xc(r30) -/* 80246D2C 80 63 00 04 */ lwz r3, 4(r3) -/* 80246D30 C0 03 01 18 */ lfs f0, 0x118(r3) -/* 80246D34 D0 1E 00 7C */ stfs f0, 0x7c(r30) -/* 80246D38 80 7E 00 0C */ lwz r3, 0xc(r30) -/* 80246D3C 80 63 00 04 */ lwz r3, 4(r3) -/* 80246D40 C0 03 01 14 */ lfs f0, 0x114(r3) -/* 80246D44 D0 1E 00 80 */ stfs f0, 0x80(r30) -/* 80246D48 3B 40 00 00 */ li r26, 0 -/* 80246D4C 3B E0 00 00 */ li r31, 0 -lbl_80246D50: -/* 80246D50 38 1F 00 0C */ addi r0, r31, 0xc -/* 80246D54 7C 7E 00 2E */ lwzx r3, r30, r0 -/* 80246D58 80 63 00 04 */ lwz r3, 4(r3) -/* 80246D5C C0 1E 00 7C */ lfs f0, 0x7c(r30) -/* 80246D60 D0 03 01 18 */ stfs f0, 0x118(r3) -/* 80246D64 7C 7E 00 2E */ lwzx r3, r30, r0 -/* 80246D68 80 63 00 04 */ lwz r3, 4(r3) -/* 80246D6C C0 23 00 2C */ lfs f1, 0x2c(r3) -/* 80246D70 C0 03 00 24 */ lfs f0, 0x24(r3) -/* 80246D74 EC 41 00 28 */ fsubs f2, f1, f0 -/* 80246D78 C0 23 00 28 */ lfs f1, 0x28(r3) -/* 80246D7C C0 03 00 20 */ lfs f0, 0x20(r3) -/* 80246D80 EC 21 00 28 */ fsubs f1, f1, f0 -/* 80246D84 81 83 00 00 */ lwz r12, 0(r3) -/* 80246D88 81 8C 00 18 */ lwz r12, 0x18(r12) -/* 80246D8C 7D 89 03 A6 */ mtctr r12 -/* 80246D90 4E 80 04 21 */ bctrl -/* 80246D94 3B 5A 00 01 */ addi r26, r26, 1 -/* 80246D98 2C 1A 00 06 */ cmpwi r26, 6 -/* 80246D9C 3B FF 00 04 */ addi r31, r31, 4 -/* 80246DA0 41 80 FF B0 */ blt lbl_80246D50 -/* 80246DA4 80 7E 00 0C */ lwz r3, 0xc(r30) -/* 80246DA8 48 00 D5 41 */ bl getGlobalPosX__8CPaneMgrFv -/* 80246DAC D0 3E 00 64 */ stfs f1, 0x64(r30) -/* 80246DB0 80 7E 00 0C */ lwz r3, 0xc(r30) -/* 80246DB4 48 00 D5 B1 */ bl getGlobalPosY__8CPaneMgrFv -/* 80246DB8 D0 3E 00 68 */ stfs f1, 0x68(r30) -/* 80246DBC 7F C3 F3 78 */ mr r3, r30 -/* 80246DC0 39 61 00 20 */ addi r11, r1, 0x20 -/* 80246DC4 48 11 B4 59 */ bl _restgpr_26 -/* 80246DC8 80 01 00 24 */ lwz r0, 0x24(r1) -/* 80246DCC 7C 08 03 A6 */ mtlr r0 -/* 80246DD0 38 21 00 20 */ addi r1, r1, 0x20 -/* 80246DD4 4E 80 00 20 */ blr diff --git a/asm/msg/scrn/d_msg_scrn_staff/__dt__15dMsgScrnStaff_cFv.s b/asm/msg/scrn/d_msg_scrn_staff/__dt__15dMsgScrnStaff_cFv.s deleted file mode 100644 index 445f29f753..0000000000 --- a/asm/msg/scrn/d_msg_scrn_staff/__dt__15dMsgScrnStaff_cFv.s +++ /dev/null @@ -1,74 +0,0 @@ -lbl_80246DD8: -/* 80246DD8 94 21 FF E0 */ stwu r1, -0x20(r1) -/* 80246DDC 7C 08 02 A6 */ mflr r0 -/* 80246DE0 90 01 00 24 */ stw r0, 0x24(r1) -/* 80246DE4 39 61 00 20 */ addi r11, r1, 0x20 -/* 80246DE8 48 11 B3 E9 */ bl _savegpr_26 -/* 80246DEC 7C 7A 1B 79 */ or. r26, r3, r3 -/* 80246DF0 7C 9B 23 78 */ mr r27, r4 -/* 80246DF4 41 82 00 D8 */ beq lbl_80246ECC -/* 80246DF8 3C 60 80 3C */ lis r3, __vt__15dMsgScrnStaff_c@ha /* 0x803C1370@ha */ -/* 80246DFC 38 03 13 70 */ addi r0, r3, __vt__15dMsgScrnStaff_c@l /* 0x803C1370@l */ -/* 80246E00 90 1A 00 00 */ stw r0, 0(r26) -/* 80246E04 80 7A 00 04 */ lwz r3, 4(r26) -/* 80246E08 28 03 00 00 */ cmplwi r3, 0 -/* 80246E0C 41 82 00 18 */ beq lbl_80246E24 -/* 80246E10 38 80 00 01 */ li r4, 1 -/* 80246E14 81 83 00 00 */ lwz r12, 0(r3) -/* 80246E18 81 8C 00 08 */ lwz r12, 8(r12) -/* 80246E1C 7D 89 03 A6 */ mtctr r12 -/* 80246E20 4E 80 04 21 */ bctrl -lbl_80246E24: -/* 80246E24 38 00 00 00 */ li r0, 0 -/* 80246E28 90 1A 00 04 */ stw r0, 4(r26) -/* 80246E2C 80 7A 00 08 */ lwz r3, 8(r26) -/* 80246E30 28 03 00 00 */ cmplwi r3, 0 -/* 80246E34 41 82 00 18 */ beq lbl_80246E4C -/* 80246E38 38 80 00 01 */ li r4, 1 -/* 80246E3C 81 83 00 00 */ lwz r12, 0(r3) -/* 80246E40 81 8C 00 08 */ lwz r12, 8(r12) -/* 80246E44 7D 89 03 A6 */ mtctr r12 -/* 80246E48 4E 80 04 21 */ bctrl -lbl_80246E4C: -/* 80246E4C 3B C0 00 00 */ li r30, 0 -/* 80246E50 93 DA 00 08 */ stw r30, 8(r26) -/* 80246E54 3B 80 00 00 */ li r28, 0 -/* 80246E58 7F DF F3 78 */ mr r31, r30 -lbl_80246E5C: -/* 80246E5C 3B BF 00 0C */ addi r29, r31, 0xc -/* 80246E60 7C 7A E8 2E */ lwzx r3, r26, r29 -/* 80246E64 28 03 00 00 */ cmplwi r3, 0 -/* 80246E68 41 82 00 18 */ beq lbl_80246E80 -/* 80246E6C 38 80 00 01 */ li r4, 1 -/* 80246E70 81 83 00 00 */ lwz r12, 0(r3) -/* 80246E74 81 8C 00 08 */ lwz r12, 8(r12) -/* 80246E78 7D 89 03 A6 */ mtctr r12 -/* 80246E7C 4E 80 04 21 */ bctrl -lbl_80246E80: -/* 80246E80 7F DA E9 2E */ stwx r30, r26, r29 -/* 80246E84 3B 9C 00 01 */ addi r28, r28, 1 -/* 80246E88 2C 1C 00 06 */ cmpwi r28, 6 -/* 80246E8C 3B FF 00 04 */ addi r31, r31, 4 -/* 80246E90 41 80 FF CC */ blt lbl_80246E5C -/* 80246E94 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */ -/* 80246E98 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 0x804061C0@l */ -/* 80246E9C 80 63 5C 84 */ lwz r3, 0x5c84(r3) -/* 80246EA0 81 83 00 00 */ lwz r12, 0(r3) -/* 80246EA4 81 8C 00 24 */ lwz r12, 0x24(r12) -/* 80246EA8 7D 89 03 A6 */ mtctr r12 -/* 80246EAC 4E 80 04 21 */ bctrl -/* 80246EB0 7F 43 D3 78 */ mr r3, r26 -/* 80246EB4 38 80 00 00 */ li r4, 0 -/* 80246EB8 4B FF 52 6D */ bl __dt__14dMsgScrnBase_cFv -/* 80246EBC 7F 60 07 35 */ extsh. r0, r27 -/* 80246EC0 40 81 00 0C */ ble lbl_80246ECC -/* 80246EC4 7F 43 D3 78 */ mr r3, r26 -/* 80246EC8 48 08 7E 75 */ bl __dl__FPv -lbl_80246ECC: -/* 80246ECC 7F 43 D3 78 */ mr r3, r26 -/* 80246ED0 39 61 00 20 */ addi r11, r1, 0x20 -/* 80246ED4 48 11 B3 49 */ bl _restgpr_26 -/* 80246ED8 80 01 00 24 */ lwz r0, 0x24(r1) -/* 80246EDC 7C 08 03 A6 */ mtlr r0 -/* 80246EE0 38 21 00 20 */ addi r1, r1, 0x20 -/* 80246EE4 4E 80 00 20 */ blr diff --git a/asm/msg/scrn/d_msg_scrn_staff/drawSelf__15dMsgScrnStaff_cFv.s b/asm/msg/scrn/d_msg_scrn_staff/drawSelf__15dMsgScrnStaff_cFv.s deleted file mode 100644 index 07eee38c33..0000000000 --- a/asm/msg/scrn/d_msg_scrn_staff/drawSelf__15dMsgScrnStaff_cFv.s +++ /dev/null @@ -1,23 +0,0 @@ -lbl_80246F68: -/* 80246F68 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 80246F6C 7C 08 02 A6 */ mflr r0 -/* 80246F70 90 01 00 14 */ stw r0, 0x14(r1) -/* 80246F74 93 E1 00 0C */ stw r31, 0xc(r1) -/* 80246F78 7C 7F 1B 78 */ mr r31, r3 -/* 80246F7C 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */ -/* 80246F80 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 0x804061C0@l */ -/* 80246F84 80 63 5F 50 */ lwz r3, 0x5f50(r3) -/* 80246F88 81 83 00 00 */ lwz r12, 0(r3) -/* 80246F8C 81 8C 00 18 */ lwz r12, 0x18(r12) -/* 80246F90 7D 89 03 A6 */ mtctr r12 -/* 80246F94 4E 80 04 21 */ bctrl -/* 80246F98 7F E3 FB 78 */ mr r3, r31 -/* 80246F9C C0 22 B2 F8 */ lfs f1, lit_3842(r2) -/* 80246FA0 FC 40 08 90 */ fmr f2, f1 -/* 80246FA4 C0 62 B2 FC */ lfs f3, lit_3877(r2) -/* 80246FA8 4B FF 53 85 */ bl drawOutFont__14dMsgScrnBase_cFfff -/* 80246FAC 83 E1 00 0C */ lwz r31, 0xc(r1) -/* 80246FB0 80 01 00 14 */ lwz r0, 0x14(r1) -/* 80246FB4 7C 08 03 A6 */ mtlr r0 -/* 80246FB8 38 21 00 10 */ addi r1, r1, 0x10 -/* 80246FBC 4E 80 00 20 */ blr diff --git a/asm/msg/scrn/d_msg_scrn_staff/exec__15dMsgScrnStaff_cFv.s b/asm/msg/scrn/d_msg_scrn_staff/exec__15dMsgScrnStaff_cFv.s deleted file mode 100644 index 7aaaa0b15f..0000000000 --- a/asm/msg/scrn/d_msg_scrn_staff/exec__15dMsgScrnStaff_cFv.s +++ /dev/null @@ -1,34 +0,0 @@ -lbl_80246EE8: -/* 80246EE8 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 80246EEC 7C 08 02 A6 */ mflr r0 -/* 80246EF0 90 01 00 14 */ stw r0, 0x14(r1) -/* 80246EF4 93 E1 00 0C */ stw r31, 0xc(r1) -/* 80246EF8 7C 7F 1B 78 */ mr r31, r3 -/* 80246EFC 3C 60 80 43 */ lis r3, g_MsgObject_HIO_c@ha /* 0x8043028C@ha */ -/* 80246F00 38 83 02 8C */ addi r4, r3, g_MsgObject_HIO_c@l /* 0x8043028C@l */ -/* 80246F04 C0 24 00 BC */ lfs f1, 0xbc(r4) -/* 80246F08 80 7F 00 08 */ lwz r3, 8(r31) -/* 80246F0C 80 63 00 04 */ lwz r3, 4(r3) -/* 80246F10 C0 04 00 90 */ lfs f0, 0x90(r4) -/* 80246F14 D0 03 00 CC */ stfs f0, 0xcc(r3) -/* 80246F18 D0 23 00 D0 */ stfs f1, 0xd0(r3) -/* 80246F1C 81 83 00 00 */ lwz r12, 0(r3) -/* 80246F20 81 8C 00 2C */ lwz r12, 0x2c(r12) -/* 80246F24 7D 89 03 A6 */ mtctr r12 -/* 80246F28 4E 80 04 21 */ bctrl -/* 80246F2C 7F E3 FB 78 */ mr r3, r31 -/* 80246F30 4B FF 56 45 */ bl isTalkNow__14dMsgScrnBase_cFv -/* 80246F34 54 60 06 3F */ clrlwi. r0, r3, 0x18 -/* 80246F38 41 82 00 1C */ beq lbl_80246F54 -/* 80246F3C 7F E3 FB 78 */ mr r3, r31 -/* 80246F40 C0 22 B2 FC */ lfs f1, lit_3877(r2) -/* 80246F44 81 9F 00 00 */ lwz r12, 0(r31) -/* 80246F48 81 8C 00 4C */ lwz r12, 0x4c(r12) -/* 80246F4C 7D 89 03 A6 */ mtctr r12 -/* 80246F50 4E 80 04 21 */ bctrl -lbl_80246F54: -/* 80246F54 83 E1 00 0C */ lwz r31, 0xc(r1) -/* 80246F58 80 01 00 14 */ lwz r0, 0x14(r1) -/* 80246F5C 7C 08 03 A6 */ mtlr r0 -/* 80246F60 38 21 00 10 */ addi r1, r1, 0x10 -/* 80246F64 4E 80 00 20 */ blr diff --git a/asm/msg/scrn/d_msg_scrn_staff/fukiAlpha__15dMsgScrnStaff_cFf.s b/asm/msg/scrn/d_msg_scrn_staff/fukiAlpha__15dMsgScrnStaff_cFf.s deleted file mode 100644 index b57e08275d..0000000000 --- a/asm/msg/scrn/d_msg_scrn_staff/fukiAlpha__15dMsgScrnStaff_cFf.s +++ /dev/null @@ -1,10 +0,0 @@ -lbl_80246FC0: -/* 80246FC0 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 80246FC4 7C 08 02 A6 */ mflr r0 -/* 80246FC8 90 01 00 14 */ stw r0, 0x14(r1) -/* 80246FCC 80 63 00 08 */ lwz r3, 8(r3) -/* 80246FD0 48 00 E8 01 */ bl setAlphaRate__13CPaneMgrAlphaFf -/* 80246FD4 80 01 00 14 */ lwz r0, 0x14(r1) -/* 80246FD8 7C 08 03 A6 */ mtlr r0 -/* 80246FDC 38 21 00 10 */ addi r1, r1, 0x10 -/* 80246FE0 4E 80 00 20 */ blr diff --git a/asm/rel/d/a/obj/d_a_obj_hsTarget/d_a_obj_hsTarget/CreateHeap__12daHsTarget_cFv.s b/asm/rel/d/a/obj/d_a_obj_hsTarget/d_a_obj_hsTarget/CreateHeap__12daHsTarget_cFv.s deleted file mode 100644 index b79f6a7555..0000000000 --- a/asm/rel/d/a/obj/d_a_obj_hsTarget/d_a_obj_hsTarget/CreateHeap__12daHsTarget_cFv.s +++ /dev/null @@ -1,33 +0,0 @@ -lbl_80C1F518: -/* 80C1F518 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 80C1F51C 7C 08 02 A6 */ mflr r0 -/* 80C1F520 90 01 00 14 */ stw r0, 0x14(r1) -/* 80C1F524 93 E1 00 0C */ stw r31, 0xc(r1) -/* 80C1F528 7C 7F 1B 78 */ mr r31, r3 -/* 80C1F52C 88 03 05 AC */ lbz r0, 0x5ac(r3) -/* 80C1F530 54 00 10 3A */ slwi r0, r0, 2 -/* 80C1F534 3C 60 80 C2 */ lis r3, l_resNameIdx@ha /* 0x80C1F8C0@ha */ -/* 80C1F538 38 63 F8 C0 */ addi r3, r3, l_resNameIdx@l /* 0x80C1F8C0@l */ -/* 80C1F53C 7C 63 00 2E */ lwzx r3, r3, r0 -/* 80C1F540 3C 80 80 C2 */ lis r4, l_bmdIdx@ha /* 0x80C1F8A0@ha */ -/* 80C1F544 38 84 F8 A0 */ addi r4, r4, l_bmdIdx@l /* 0x80C1F8A0@l */ -/* 80C1F548 7C 84 00 2E */ lwzx r4, r4, r0 -/* 80C1F54C 3C A0 80 40 */ lis r5, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */ -/* 80C1F550 38 A5 61 C0 */ addi r5, r5, g_dComIfG_gameInfo@l /* 0x804061C0@l */ -/* 80C1F554 3C A5 00 02 */ addis r5, r5, 2 -/* 80C1F558 38 C0 00 80 */ li r6, 0x80 -/* 80C1F55C 38 A5 C2 F8 */ addi r5, r5, -15624 -/* 80C1F560 4B 41 CD 8D */ bl getRes__14dRes_control_cFPCclP11dRes_info_ci -/* 80C1F564 3C 80 00 08 */ lis r4, 8 -/* 80C1F568 3C A0 11 00 */ lis r5, 0x1100 /* 0x11000084@ha */ -/* 80C1F56C 38 A5 00 84 */ addi r5, r5, 0x0084 /* 0x11000084@l */ -/* 80C1F570 4B 3F 56 E5 */ bl mDoExt_J3DModel__create__FP12J3DModelDataUlUl -/* 80C1F574 90 7F 05 A8 */ stw r3, 0x5a8(r31) -/* 80C1F578 80 7F 05 A8 */ lwz r3, 0x5a8(r31) -/* 80C1F57C 30 03 FF FF */ addic r0, r3, -1 -/* 80C1F580 7C 60 19 10 */ subfe r3, r0, r3 -/* 80C1F584 83 E1 00 0C */ lwz r31, 0xc(r1) -/* 80C1F588 80 01 00 14 */ lwz r0, 0x14(r1) -/* 80C1F58C 7C 08 03 A6 */ mtlr r0 -/* 80C1F590 38 21 00 10 */ addi r1, r1, 0x10 -/* 80C1F594 4E 80 00 20 */ blr diff --git a/asm/rel/d/a/obj/d_a_obj_hsTarget/d_a_obj_hsTarget/Delete__12daHsTarget_cFv.s b/asm/rel/d/a/obj/d_a_obj_hsTarget/d_a_obj_hsTarget/Delete__12daHsTarget_cFv.s deleted file mode 100644 index 93edfea422..0000000000 --- a/asm/rel/d/a/obj/d_a_obj_hsTarget/d_a_obj_hsTarget/Delete__12daHsTarget_cFv.s +++ /dev/null @@ -1,17 +0,0 @@ -lbl_80C1F728: -/* 80C1F728 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 80C1F72C 7C 08 02 A6 */ mflr r0 -/* 80C1F730 90 01 00 14 */ stw r0, 0x14(r1) -/* 80C1F734 7C 64 1B 78 */ mr r4, r3 -/* 80C1F738 38 64 05 A0 */ addi r3, r4, 0x5a0 -/* 80C1F73C 88 04 05 AC */ lbz r0, 0x5ac(r4) -/* 80C1F740 54 00 10 3A */ slwi r0, r0, 2 -/* 80C1F744 3C 80 80 C2 */ lis r4, l_resNameIdx@ha /* 0x80C1F8C0@ha */ -/* 80C1F748 38 84 F8 C0 */ addi r4, r4, l_resNameIdx@l /* 0x80C1F8C0@l */ -/* 80C1F74C 7C 84 00 2E */ lwzx r4, r4, r0 -/* 80C1F750 4B 40 D8 B9 */ bl dComIfG_resDelete__FP30request_of_phase_process_classPCc -/* 80C1F754 38 60 00 01 */ li r3, 1 -/* 80C1F758 80 01 00 14 */ lwz r0, 0x14(r1) -/* 80C1F75C 7C 08 03 A6 */ mtlr r0 -/* 80C1F760 38 21 00 10 */ addi r1, r1, 0x10 -/* 80C1F764 4E 80 00 20 */ blr diff --git a/asm/rel/d/a/obj/d_a_obj_hsTarget/d_a_obj_hsTarget/Draw__12daHsTarget_cFv.s b/asm/rel/d/a/obj/d_a_obj_hsTarget/d_a_obj_hsTarget/Draw__12daHsTarget_cFv.s deleted file mode 100644 index b8d246c6e4..0000000000 --- a/asm/rel/d/a/obj/d_a_obj_hsTarget/d_a_obj_hsTarget/Draw__12daHsTarget_cFv.s +++ /dev/null @@ -1,26 +0,0 @@ -lbl_80C1F6C4: -/* 80C1F6C4 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 80C1F6C8 7C 08 02 A6 */ mflr r0 -/* 80C1F6CC 90 01 00 14 */ stw r0, 0x14(r1) -/* 80C1F6D0 93 E1 00 0C */ stw r31, 0xc(r1) -/* 80C1F6D4 7C 7F 1B 78 */ mr r31, r3 -/* 80C1F6D8 3C 60 80 43 */ lis r3, g_env_light@ha /* 0x8042CA54@ha */ -/* 80C1F6DC 38 63 CA 54 */ addi r3, r3, g_env_light@l /* 0x8042CA54@l */ -/* 80C1F6E0 38 80 00 40 */ li r4, 0x40 -/* 80C1F6E4 38 BF 04 D0 */ addi r5, r31, 0x4d0 -/* 80C1F6E8 38 DF 01 0C */ addi r6, r31, 0x10c -/* 80C1F6EC 4B 58 40 D9 */ bl settingTevStruct__18dScnKy_env_light_cFiP4cXyzP12dKy_tevstr_c -/* 80C1F6F0 3C 60 80 43 */ lis r3, g_env_light@ha /* 0x8042CA54@ha */ -/* 80C1F6F4 38 63 CA 54 */ addi r3, r3, g_env_light@l /* 0x8042CA54@l */ -/* 80C1F6F8 80 9F 05 A8 */ lwz r4, 0x5a8(r31) -/* 80C1F6FC 80 84 00 04 */ lwz r4, 4(r4) -/* 80C1F700 38 BF 01 0C */ addi r5, r31, 0x10c -/* 80C1F704 4B 58 56 9D */ bl setLightTevColorType_MAJI__18dScnKy_env_light_cFP12J3DModelDataP12dKy_tevstr_c -/* 80C1F708 80 7F 05 A8 */ lwz r3, 0x5a8(r31) -/* 80C1F70C 4B 3E E5 B9 */ bl mDoExt_modelUpdateDL__FP8J3DModel -/* 80C1F710 38 60 00 01 */ li r3, 1 -/* 80C1F714 83 E1 00 0C */ lwz r31, 0xc(r1) -/* 80C1F718 80 01 00 14 */ lwz r0, 0x14(r1) -/* 80C1F71C 7C 08 03 A6 */ mtlr r0 -/* 80C1F720 38 21 00 10 */ addi r1, r1, 0x10 -/* 80C1F724 4E 80 00 20 */ blr diff --git a/asm/rel/d/a/obj/d_a_obj_hsTarget/d_a_obj_hsTarget/Execute__12daHsTarget_cFPPA3_A4_f.s b/asm/rel/d/a/obj/d_a_obj_hsTarget/d_a_obj_hsTarget/Execute__12daHsTarget_cFPPA3_A4_f.s deleted file mode 100644 index d2858195ae..0000000000 --- a/asm/rel/d/a/obj/d_a_obj_hsTarget/d_a_obj_hsTarget/Execute__12daHsTarget_cFPPA3_A4_f.s +++ /dev/null @@ -1,6 +0,0 @@ -lbl_80C1F6B0: -/* 80C1F6B0 80 63 05 A8 */ lwz r3, 0x5a8(r3) -/* 80C1F6B4 38 03 00 24 */ addi r0, r3, 0x24 -/* 80C1F6B8 90 04 00 00 */ stw r0, 0(r4) -/* 80C1F6BC 38 60 00 01 */ li r3, 1 -/* 80C1F6C0 4E 80 00 20 */ blr diff --git a/asm/rel/d/a/obj/d_a_obj_hsTarget/d_a_obj_hsTarget/__ct__16daHsTarget_HIO_cFv.s b/asm/rel/d/a/obj/d_a_obj_hsTarget/d_a_obj_hsTarget/__ct__16daHsTarget_HIO_cFv.s deleted file mode 100644 index d53fb64129..0000000000 --- a/asm/rel/d/a/obj/d_a_obj_hsTarget/d_a_obj_hsTarget/__ct__16daHsTarget_HIO_cFv.s +++ /dev/null @@ -1,8 +0,0 @@ -lbl_80C1F42C: -/* 80C1F42C 3C 80 80 C2 */ lis r4, __vt__14mDoHIO_entry_c@ha /* 0x80C1F94C@ha */ -/* 80C1F430 38 04 F9 4C */ addi r0, r4, __vt__14mDoHIO_entry_c@l /* 0x80C1F94C@l */ -/* 80C1F434 90 03 00 00 */ stw r0, 0(r3) -/* 80C1F438 3C 80 80 C2 */ lis r4, __vt__16daHsTarget_HIO_c@ha /* 0x80C1F940@ha */ -/* 80C1F43C 38 04 F9 40 */ addi r0, r4, __vt__16daHsTarget_HIO_c@l /* 0x80C1F940@l */ -/* 80C1F440 90 03 00 00 */ stw r0, 0(r3) -/* 80C1F444 4E 80 00 20 */ blr diff --git a/asm/rel/d/a/obj/d_a_obj_hsTarget/d_a_obj_hsTarget/__dt__14mDoHIO_entry_cFv.s b/asm/rel/d/a/obj/d_a_obj_hsTarget/d_a_obj_hsTarget/__dt__14mDoHIO_entry_cFv.s deleted file mode 100644 index 5bba2d6e63..0000000000 --- a/asm/rel/d/a/obj/d_a_obj_hsTarget/d_a_obj_hsTarget/__dt__14mDoHIO_entry_cFv.s +++ /dev/null @@ -1,20 +0,0 @@ -lbl_80C1F448: -/* 80C1F448 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 80C1F44C 7C 08 02 A6 */ mflr r0 -/* 80C1F450 90 01 00 14 */ stw r0, 0x14(r1) -/* 80C1F454 93 E1 00 0C */ stw r31, 0xc(r1) -/* 80C1F458 7C 7F 1B 79 */ or. r31, r3, r3 -/* 80C1F45C 41 82 00 1C */ beq lbl_80C1F478 -/* 80C1F460 3C A0 80 C2 */ lis r5, __vt__14mDoHIO_entry_c@ha /* 0x80C1F94C@ha */ -/* 80C1F464 38 05 F9 4C */ addi r0, r5, __vt__14mDoHIO_entry_c@l /* 0x80C1F94C@l */ -/* 80C1F468 90 1F 00 00 */ stw r0, 0(r31) -/* 80C1F46C 7C 80 07 35 */ extsh. r0, r4 -/* 80C1F470 40 81 00 08 */ ble lbl_80C1F478 -/* 80C1F474 4B 6A F8 C9 */ bl __dl__FPv -lbl_80C1F478: -/* 80C1F478 7F E3 FB 78 */ mr r3, r31 -/* 80C1F47C 83 E1 00 0C */ lwz r31, 0xc(r1) -/* 80C1F480 80 01 00 14 */ lwz r0, 0x14(r1) -/* 80C1F484 7C 08 03 A6 */ mtlr r0 -/* 80C1F488 38 21 00 10 */ addi r1, r1, 0x10 -/* 80C1F48C 4E 80 00 20 */ blr diff --git a/asm/rel/d/a/obj/d_a_obj_hsTarget/d_a_obj_hsTarget/__dt__16daHsTarget_HIO_cFv.s b/asm/rel/d/a/obj/d_a_obj_hsTarget/d_a_obj_hsTarget/__dt__16daHsTarget_HIO_cFv.s deleted file mode 100644 index 32c548bf79..0000000000 --- a/asm/rel/d/a/obj/d_a_obj_hsTarget/d_a_obj_hsTarget/__dt__16daHsTarget_HIO_cFv.s +++ /dev/null @@ -1,26 +0,0 @@ -lbl_80C1F7F4: -/* 80C1F7F4 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 80C1F7F8 7C 08 02 A6 */ mflr r0 -/* 80C1F7FC 90 01 00 14 */ stw r0, 0x14(r1) -/* 80C1F800 93 E1 00 0C */ stw r31, 0xc(r1) -/* 80C1F804 7C 7F 1B 79 */ or. r31, r3, r3 -/* 80C1F808 41 82 00 30 */ beq lbl_80C1F838 -/* 80C1F80C 3C 60 80 C2 */ lis r3, __vt__16daHsTarget_HIO_c@ha /* 0x80C1F940@ha */ -/* 80C1F810 38 03 F9 40 */ addi r0, r3, __vt__16daHsTarget_HIO_c@l /* 0x80C1F940@l */ -/* 80C1F814 90 1F 00 00 */ stw r0, 0(r31) -/* 80C1F818 41 82 00 10 */ beq lbl_80C1F828 -/* 80C1F81C 3C 60 80 C2 */ lis r3, __vt__14mDoHIO_entry_c@ha /* 0x80C1F94C@ha */ -/* 80C1F820 38 03 F9 4C */ addi r0, r3, __vt__14mDoHIO_entry_c@l /* 0x80C1F94C@l */ -/* 80C1F824 90 1F 00 00 */ stw r0, 0(r31) -lbl_80C1F828: -/* 80C1F828 7C 80 07 35 */ extsh. r0, r4 -/* 80C1F82C 40 81 00 0C */ ble lbl_80C1F838 -/* 80C1F830 7F E3 FB 78 */ mr r3, r31 -/* 80C1F834 4B 6A F5 09 */ bl __dl__FPv -lbl_80C1F838: -/* 80C1F838 7F E3 FB 78 */ mr r3, r31 -/* 80C1F83C 83 E1 00 0C */ lwz r31, 0xc(r1) -/* 80C1F840 80 01 00 14 */ lwz r0, 0x14(r1) -/* 80C1F844 7C 08 03 A6 */ mtlr r0 -/* 80C1F848 38 21 00 10 */ addi r1, r1, 0x10 -/* 80C1F84C 4E 80 00 20 */ blr diff --git a/asm/rel/d/a/obj/d_a_obj_hsTarget/d_a_obj_hsTarget/__sinit_d_a_obj_hsTarget_cpp.s b/asm/rel/d/a/obj/d_a_obj_hsTarget/d_a_obj_hsTarget/__sinit_d_a_obj_hsTarget_cpp.s deleted file mode 100644 index ce33547e02..0000000000 --- a/asm/rel/d/a/obj/d_a_obj_hsTarget/d_a_obj_hsTarget/__sinit_d_a_obj_hsTarget_cpp.s +++ /dev/null @@ -1,16 +0,0 @@ -lbl_80C1F850: -/* 80C1F850 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 80C1F854 7C 08 02 A6 */ mflr r0 -/* 80C1F858 90 01 00 14 */ stw r0, 0x14(r1) -/* 80C1F85C 3C 60 80 C2 */ lis r3, l_HIO@ha /* 0x80C1F96C@ha */ -/* 80C1F860 38 63 F9 6C */ addi r3, r3, l_HIO@l /* 0x80C1F96C@l */ -/* 80C1F864 4B FF FB C9 */ bl __ct__16daHsTarget_HIO_cFv -/* 80C1F868 3C 80 80 C2 */ lis r4, __dt__16daHsTarget_HIO_cFv@ha /* 0x80C1F7F4@ha */ -/* 80C1F86C 38 84 F7 F4 */ addi r4, r4, __dt__16daHsTarget_HIO_cFv@l /* 0x80C1F7F4@l */ -/* 80C1F870 3C A0 80 C2 */ lis r5, lit_3621@ha /* 0x80C1F960@ha */ -/* 80C1F874 38 A5 F9 60 */ addi r5, r5, lit_3621@l /* 0x80C1F960@l */ -/* 80C1F878 4B FF FB 41 */ bl __register_global_object -/* 80C1F87C 80 01 00 14 */ lwz r0, 0x14(r1) -/* 80C1F880 7C 08 03 A6 */ mtlr r0 -/* 80C1F884 38 21 00 10 */ addi r1, r1, 0x10 -/* 80C1F888 4E 80 00 20 */ blr diff --git a/asm/rel/d/a/obj/d_a_obj_hsTarget/d_a_obj_hsTarget/create__12daHsTarget_cFv.s b/asm/rel/d/a/obj/d_a_obj_hsTarget/d_a_obj_hsTarget/create__12daHsTarget_cFv.s deleted file mode 100644 index dedaeb22b1..0000000000 --- a/asm/rel/d/a/obj/d_a_obj_hsTarget/d_a_obj_hsTarget/create__12daHsTarget_cFv.s +++ /dev/null @@ -1,77 +0,0 @@ -lbl_80C1F598: -/* 80C1F598 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 80C1F59C 7C 08 02 A6 */ mflr r0 -/* 80C1F5A0 90 01 00 14 */ stw r0, 0x14(r1) -/* 80C1F5A4 93 E1 00 0C */ stw r31, 0xc(r1) -/* 80C1F5A8 93 C1 00 08 */ stw r30, 8(r1) -/* 80C1F5AC 7C 7F 1B 78 */ mr r31, r3 -/* 80C1F5B0 80 03 04 A0 */ lwz r0, 0x4a0(r3) -/* 80C1F5B4 54 00 07 39 */ rlwinm. r0, r0, 0, 0x1c, 0x1c -/* 80C1F5B8 40 82 00 28 */ bne lbl_80C1F5E0 -/* 80C1F5BC 28 1F 00 00 */ cmplwi r31, 0 -/* 80C1F5C0 41 82 00 14 */ beq lbl_80C1F5D4 -/* 80C1F5C4 4B 45 90 61 */ bl __ct__16dBgS_MoveBgActorFv -/* 80C1F5C8 3C 60 80 C2 */ lis r3, __vt__12daHsTarget_c@ha /* 0x80C1F918@ha */ -/* 80C1F5CC 38 03 F9 18 */ addi r0, r3, __vt__12daHsTarget_c@l /* 0x80C1F918@l */ -/* 80C1F5D0 90 1F 05 9C */ stw r0, 0x59c(r31) -lbl_80C1F5D4: -/* 80C1F5D4 80 1F 04 A0 */ lwz r0, 0x4a0(r31) -/* 80C1F5D8 60 00 00 08 */ ori r0, r0, 8 -/* 80C1F5DC 90 1F 04 A0 */ stw r0, 0x4a0(r31) -lbl_80C1F5E0: -/* 80C1F5E0 80 1F 00 B0 */ lwz r0, 0xb0(r31) -/* 80C1F5E4 54 00 07 3E */ clrlwi r0, r0, 0x1c -/* 80C1F5E8 98 1F 05 AC */ stb r0, 0x5ac(r31) -/* 80C1F5EC 88 1F 05 AC */ lbz r0, 0x5ac(r31) -/* 80C1F5F0 28 00 00 0F */ cmplwi r0, 0xf -/* 80C1F5F4 40 82 00 0C */ bne lbl_80C1F600 -/* 80C1F5F8 38 00 00 00 */ li r0, 0 -/* 80C1F5FC 98 1F 05 AC */ stb r0, 0x5ac(r31) -lbl_80C1F600: -/* 80C1F600 38 7F 05 A0 */ addi r3, r31, 0x5a0 -/* 80C1F604 88 1F 05 AC */ lbz r0, 0x5ac(r31) -/* 80C1F608 54 00 10 3A */ slwi r0, r0, 2 -/* 80C1F60C 3C 80 80 C2 */ lis r4, l_resNameIdx@ha /* 0x80C1F8C0@ha */ -/* 80C1F610 38 84 F8 C0 */ addi r4, r4, l_resNameIdx@l /* 0x80C1F8C0@l */ -/* 80C1F614 7C 84 00 2E */ lwzx r4, r4, r0 -/* 80C1F618 4B 40 D8 A5 */ bl dComIfG_resLoad__FP30request_of_phase_process_classPCc -/* 80C1F61C 7C 7E 1B 78 */ mr r30, r3 -/* 80C1F620 2C 1E 00 04 */ cmpwi r30, 4 -/* 80C1F624 40 82 00 70 */ bne lbl_80C1F694 -/* 80C1F628 88 1F 05 AC */ lbz r0, 0x5ac(r31) -/* 80C1F62C 54 00 10 3A */ slwi r0, r0, 2 -/* 80C1F630 7F E3 FB 78 */ mr r3, r31 -/* 80C1F634 3C 80 80 C2 */ lis r4, l_resNameIdx@ha /* 0x80C1F8C0@ha */ -/* 80C1F638 38 84 F8 C0 */ addi r4, r4, l_resNameIdx@l /* 0x80C1F8C0@l */ -/* 80C1F63C 7C 84 00 2E */ lwzx r4, r4, r0 -/* 80C1F640 3C A0 80 C2 */ lis r5, l_dzbIdx@ha /* 0x80C1F8A8@ha */ -/* 80C1F644 38 A5 F8 A8 */ addi r5, r5, l_dzbIdx@l /* 0x80C1F8A8@l */ -/* 80C1F648 7C A5 00 2E */ lwzx r5, r5, r0 -/* 80C1F64C 3C C0 80 07 */ lis r6, dBgS_MoveBGProc_TypicalRotY__FP4dBgWPvRC13cBgS_PolyInfobP4cXyzP5csXyzP5csXyz@ha /* 0x80075AD8@ha */ -/* 80C1F650 38 C6 5A D8 */ addi r6, r6, dBgS_MoveBGProc_TypicalRotY__FP4dBgWPvRC13cBgS_PolyInfobP4cXyzP5csXyzP5csXyz@l /* 0x80075AD8@l */ -/* 80C1F654 38 E0 0A C0 */ li r7, 0xac0 -/* 80C1F658 39 00 00 00 */ li r8, 0 -/* 80C1F65C 4B 45 91 61 */ bl MoveBGCreate__16dBgS_MoveBgActorFPCciPFP4dBgWPvRC13cBgS_PolyInfobP4cXyzP5csXyzP5csXyz_vUlPA3_A4_f -/* 80C1F660 2C 03 00 05 */ cmpwi r3, 5 -/* 80C1F664 40 82 00 0C */ bne lbl_80C1F670 -/* 80C1F668 38 60 00 05 */ li r3, 5 -/* 80C1F66C 48 00 00 2C */ b lbl_80C1F698 -lbl_80C1F670: -/* 80C1F670 80 7F 05 A8 */ lwz r3, 0x5a8(r31) -/* 80C1F674 38 03 00 24 */ addi r0, r3, 0x24 -/* 80C1F678 90 1F 05 04 */ stw r0, 0x504(r31) -/* 80C1F67C 80 7F 05 A8 */ lwz r3, 0x5a8(r31) -/* 80C1F680 80 83 00 04 */ lwz r4, 4(r3) -/* 80C1F684 7F E3 FB 78 */ mr r3, r31 -/* 80C1F688 4B 3F AE F1 */ bl fopAcM_setCullSizeBox2__FP10fopAc_ac_cP12J3DModelData -/* 80C1F68C 7F E3 FB 78 */ mr r3, r31 -/* 80C1F690 4B FF FE 01 */ bl setBaseMtx__12daHsTarget_cFv -lbl_80C1F694: -/* 80C1F694 7F C3 F3 78 */ mr r3, r30 -lbl_80C1F698: -/* 80C1F698 83 E1 00 0C */ lwz r31, 0xc(r1) -/* 80C1F69C 83 C1 00 08 */ lwz r30, 8(r1) -/* 80C1F6A0 80 01 00 14 */ lwz r0, 0x14(r1) -/* 80C1F6A4 7C 08 03 A6 */ mtlr r0 -/* 80C1F6A8 38 21 00 10 */ addi r1, r1, 0x10 -/* 80C1F6AC 4E 80 00 20 */ blr diff --git a/asm/rel/d/a/obj/d_a_obj_hsTarget/d_a_obj_hsTarget/daHsTarget_Create__FP10fopAc_ac_c.s b/asm/rel/d/a/obj/d_a_obj_hsTarget/d_a_obj_hsTarget/daHsTarget_Create__FP10fopAc_ac_c.s deleted file mode 100644 index d2fa0774fd..0000000000 --- a/asm/rel/d/a/obj/d_a_obj_hsTarget/d_a_obj_hsTarget/daHsTarget_Create__FP10fopAc_ac_c.s +++ /dev/null @@ -1,9 +0,0 @@ -lbl_80C1F7D4: -/* 80C1F7D4 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 80C1F7D8 7C 08 02 A6 */ mflr r0 -/* 80C1F7DC 90 01 00 14 */ stw r0, 0x14(r1) -/* 80C1F7E0 4B FF FD B9 */ bl create__12daHsTarget_cFv -/* 80C1F7E4 80 01 00 14 */ lwz r0, 0x14(r1) -/* 80C1F7E8 7C 08 03 A6 */ mtlr r0 -/* 80C1F7EC 38 21 00 10 */ addi r1, r1, 0x10 -/* 80C1F7F0 4E 80 00 20 */ blr diff --git a/asm/rel/d/a/obj/d_a_obj_hsTarget/d_a_obj_hsTarget/daHsTarget_Delete__FP12daHsTarget_c.s b/asm/rel/d/a/obj/d_a_obj_hsTarget/d_a_obj_hsTarget/daHsTarget_Delete__FP12daHsTarget_c.s deleted file mode 100644 index 9330d9cbea..0000000000 --- a/asm/rel/d/a/obj/d_a_obj_hsTarget/d_a_obj_hsTarget/daHsTarget_Delete__FP12daHsTarget_c.s +++ /dev/null @@ -1,9 +0,0 @@ -lbl_80C1F7B4: -/* 80C1F7B4 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 80C1F7B8 7C 08 02 A6 */ mflr r0 -/* 80C1F7BC 90 01 00 14 */ stw r0, 0x14(r1) -/* 80C1F7C0 4B 45 91 1D */ bl MoveBGDelete__16dBgS_MoveBgActorFv -/* 80C1F7C4 80 01 00 14 */ lwz r0, 0x14(r1) -/* 80C1F7C8 7C 08 03 A6 */ mtlr r0 -/* 80C1F7CC 38 21 00 10 */ addi r1, r1, 0x10 -/* 80C1F7D0 4E 80 00 20 */ blr diff --git a/asm/rel/d/a/obj/d_a_obj_hsTarget/d_a_obj_hsTarget/daHsTarget_Draw__FP12daHsTarget_c.s b/asm/rel/d/a/obj/d_a_obj_hsTarget/d_a_obj_hsTarget/daHsTarget_Draw__FP12daHsTarget_c.s deleted file mode 100644 index 1bb909672e..0000000000 --- a/asm/rel/d/a/obj/d_a_obj_hsTarget/d_a_obj_hsTarget/daHsTarget_Draw__FP12daHsTarget_c.s +++ /dev/null @@ -1,12 +0,0 @@ -lbl_80C1F768: -/* 80C1F768 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 80C1F76C 7C 08 02 A6 */ mflr r0 -/* 80C1F770 90 01 00 14 */ stw r0, 0x14(r1) -/* 80C1F774 81 83 05 9C */ lwz r12, 0x59c(r3) -/* 80C1F778 81 8C 00 14 */ lwz r12, 0x14(r12) -/* 80C1F77C 7D 89 03 A6 */ mtctr r12 -/* 80C1F780 4E 80 04 21 */ bctrl -/* 80C1F784 80 01 00 14 */ lwz r0, 0x14(r1) -/* 80C1F788 7C 08 03 A6 */ mtlr r0 -/* 80C1F78C 38 21 00 10 */ addi r1, r1, 0x10 -/* 80C1F790 4E 80 00 20 */ blr diff --git a/asm/rel/d/a/obj/d_a_obj_hsTarget/d_a_obj_hsTarget/daHsTarget_Execute__FP12daHsTarget_c.s b/asm/rel/d/a/obj/d_a_obj_hsTarget/d_a_obj_hsTarget/daHsTarget_Execute__FP12daHsTarget_c.s deleted file mode 100644 index 22a71d7d31..0000000000 --- a/asm/rel/d/a/obj/d_a_obj_hsTarget/d_a_obj_hsTarget/daHsTarget_Execute__FP12daHsTarget_c.s +++ /dev/null @@ -1,9 +0,0 @@ -lbl_80C1F794: -/* 80C1F794 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 80C1F798 7C 08 02 A6 */ mflr r0 -/* 80C1F79C 90 01 00 14 */ stw r0, 0x14(r1) -/* 80C1F7A0 4B 45 91 B1 */ bl MoveBGExecute__16dBgS_MoveBgActorFv -/* 80C1F7A4 80 01 00 14 */ lwz r0, 0x14(r1) -/* 80C1F7A8 7C 08 03 A6 */ mtlr r0 -/* 80C1F7AC 38 21 00 10 */ addi r1, r1, 0x10 -/* 80C1F7B0 4E 80 00 20 */ blr diff --git a/asm/rel/d/a/obj/d_a_obj_hsTarget/d_a_obj_hsTarget/setBaseMtx__12daHsTarget_cFv.s b/asm/rel/d/a/obj/d_a_obj_hsTarget/d_a_obj_hsTarget/setBaseMtx__12daHsTarget_cFv.s deleted file mode 100644 index cb013d1c9b..0000000000 --- a/asm/rel/d/a/obj/d_a_obj_hsTarget/d_a_obj_hsTarget/setBaseMtx__12daHsTarget_cFv.s +++ /dev/null @@ -1,35 +0,0 @@ -lbl_80C1F490: -/* 80C1F490 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 80C1F494 7C 08 02 A6 */ mflr r0 -/* 80C1F498 90 01 00 14 */ stw r0, 0x14(r1) -/* 80C1F49C 93 E1 00 0C */ stw r31, 0xc(r1) -/* 80C1F4A0 7C 7F 1B 78 */ mr r31, r3 -/* 80C1F4A4 3C 60 80 3E */ lis r3, now__14mDoMtx_stack_c@ha /* 0x803DD470@ha */ -/* 80C1F4A8 38 63 D4 70 */ addi r3, r3, now__14mDoMtx_stack_c@l /* 0x803DD470@l */ -/* 80C1F4AC C0 3F 04 D0 */ lfs f1, 0x4d0(r31) -/* 80C1F4B0 C0 5F 04 D4 */ lfs f2, 0x4d4(r31) -/* 80C1F4B4 C0 7F 04 D8 */ lfs f3, 0x4d8(r31) -/* 80C1F4B8 4B 72 74 31 */ bl PSMTXTrans -/* 80C1F4BC 3C 60 80 3E */ lis r3, now__14mDoMtx_stack_c@ha /* 0x803DD470@ha */ -/* 80C1F4C0 38 63 D4 70 */ addi r3, r3, now__14mDoMtx_stack_c@l /* 0x803DD470@l */ -/* 80C1F4C4 A8 9F 04 E4 */ lha r4, 0x4e4(r31) -/* 80C1F4C8 A8 BF 04 E6 */ lha r5, 0x4e6(r31) -/* 80C1F4CC A8 DF 04 E8 */ lha r6, 0x4e8(r31) -/* 80C1F4D0 4B 3E CD D1 */ bl mDoMtx_ZXYrotM__FPA4_fsss -/* 80C1F4D4 80 7F 05 A8 */ lwz r3, 0x5a8(r31) -/* 80C1F4D8 C0 1F 04 EC */ lfs f0, 0x4ec(r31) -/* 80C1F4DC D0 03 00 18 */ stfs f0, 0x18(r3) -/* 80C1F4E0 C0 1F 04 F0 */ lfs f0, 0x4f0(r31) -/* 80C1F4E4 D0 03 00 1C */ stfs f0, 0x1c(r3) -/* 80C1F4E8 C0 1F 04 F4 */ lfs f0, 0x4f4(r31) -/* 80C1F4EC D0 03 00 20 */ stfs f0, 0x20(r3) -/* 80C1F4F0 3C 60 80 3E */ lis r3, now__14mDoMtx_stack_c@ha /* 0x803DD470@ha */ -/* 80C1F4F4 38 63 D4 70 */ addi r3, r3, now__14mDoMtx_stack_c@l /* 0x803DD470@l */ -/* 80C1F4F8 80 9F 05 A8 */ lwz r4, 0x5a8(r31) -/* 80C1F4FC 38 84 00 24 */ addi r4, r4, 0x24 -/* 80C1F500 4B 72 6F B1 */ bl PSMTXCopy -/* 80C1F504 83 E1 00 0C */ lwz r31, 0xc(r1) -/* 80C1F508 80 01 00 14 */ lwz r0, 0x14(r1) -/* 80C1F50C 7C 08 03 A6 */ mtlr r0 -/* 80C1F510 38 21 00 10 */ addi r1, r1, 0x10 -/* 80C1F514 4E 80 00 20 */ blr diff --git a/asm/rel/d/a/obj/d_a_obj_onsen/d_a_obj_onsen/CreateHeap__12daObjOnsen_cFv.s b/asm/rel/d/a/obj/d_a_obj_onsen/d_a_obj_onsen/CreateHeap__12daObjOnsen_cFv.s deleted file mode 100644 index 900be86d98..0000000000 --- a/asm/rel/d/a/obj/d_a_obj_onsen/d_a_obj_onsen/CreateHeap__12daObjOnsen_cFv.s +++ /dev/null @@ -1,105 +0,0 @@ -lbl_80CA7C74: -/* 80CA7C74 94 21 FF E0 */ stwu r1, -0x20(r1) -/* 80CA7C78 7C 08 02 A6 */ mflr r0 -/* 80CA7C7C 90 01 00 24 */ stw r0, 0x24(r1) -/* 80CA7C80 39 61 00 20 */ addi r11, r1, 0x20 -/* 80CA7C84 4B 6B A5 51 */ bl _savegpr_27 -/* 80CA7C88 7C 7E 1B 78 */ mr r30, r3 -/* 80CA7C8C 3C 60 80 CB */ lis r3, l_bmd@ha /* 0x80CA811C@ha */ -/* 80CA7C90 3B E3 81 1C */ addi r31, r3, l_bmd@l /* 0x80CA811C@l */ -/* 80CA7C94 88 1E 05 B4 */ lbz r0, 0x5b4(r30) -/* 80CA7C98 54 00 10 3A */ slwi r0, r0, 2 -/* 80CA7C9C 3C 60 80 CB */ lis r3, l_arcName@ha /* 0x80CA815C@ha */ -/* 80CA7CA0 38 63 81 5C */ addi r3, r3, l_arcName@l /* 0x80CA815C@l */ -/* 80CA7CA4 7C 63 00 2E */ lwzx r3, r3, r0 -/* 80CA7CA8 38 9F 00 00 */ addi r4, r31, 0 -/* 80CA7CAC 7C 84 00 2E */ lwzx r4, r4, r0 -/* 80CA7CB0 3C A0 80 40 */ lis r5, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */ -/* 80CA7CB4 38 A5 61 C0 */ addi r5, r5, g_dComIfG_gameInfo@l /* 0x804061C0@l */ -/* 80CA7CB8 3F A5 00 02 */ addis r29, r5, 2 -/* 80CA7CBC 3B BD C2 F8 */ addi r29, r29, -15624 -/* 80CA7CC0 7F A5 EB 78 */ mr r5, r29 -/* 80CA7CC4 38 C0 00 80 */ li r6, 0x80 -/* 80CA7CC8 4B 39 46 25 */ bl getRes__14dRes_control_cFPCclP11dRes_info_ci -/* 80CA7CCC 3C 80 00 08 */ lis r4, 8 -/* 80CA7CD0 3C A0 11 00 */ lis r5, 0x1100 /* 0x11000084@ha */ -/* 80CA7CD4 38 A5 00 84 */ addi r5, r5, 0x0084 /* 0x11000084@l */ -/* 80CA7CD8 4B 36 CF 7D */ bl mDoExt_J3DModel__create__FP12J3DModelDataUlUl -/* 80CA7CDC 90 7E 05 A8 */ stw r3, 0x5a8(r30) -/* 80CA7CE0 80 1E 05 A8 */ lwz r0, 0x5a8(r30) -/* 80CA7CE4 28 00 00 00 */ cmplwi r0, 0 -/* 80CA7CE8 40 82 00 0C */ bne lbl_80CA7CF4 -/* 80CA7CEC 38 60 00 00 */ li r3, 0 -/* 80CA7CF0 48 00 00 F4 */ b lbl_80CA7DE4 -lbl_80CA7CF4: -/* 80CA7CF4 88 1E 05 B4 */ lbz r0, 0x5b4(r30) -/* 80CA7CF8 54 00 10 3A */ slwi r0, r0, 2 -/* 80CA7CFC 3C 60 80 CB */ lis r3, l_arcName@ha /* 0x80CA815C@ha */ -/* 80CA7D00 38 63 81 5C */ addi r3, r3, l_arcName@l /* 0x80CA815C@l */ -/* 80CA7D04 7C 63 00 2E */ lwzx r3, r3, r0 -/* 80CA7D08 38 9F 00 10 */ addi r4, r31, 0x10 -/* 80CA7D0C 7C 84 00 2E */ lwzx r4, r4, r0 -/* 80CA7D10 7F A5 EB 78 */ mr r5, r29 -/* 80CA7D14 38 C0 00 80 */ li r6, 0x80 -/* 80CA7D18 4B 39 45 D5 */ bl getRes__14dRes_control_cFPCclP11dRes_info_ci -/* 80CA7D1C 7C 7C 1B 78 */ mr r28, r3 -/* 80CA7D20 3C 80 00 08 */ lis r4, 8 -/* 80CA7D24 3C A0 19 00 */ lis r5, 0x1900 /* 0x19000284@ha */ -/* 80CA7D28 38 A5 02 84 */ addi r5, r5, 0x0284 /* 0x19000284@l */ -/* 80CA7D2C 4B 36 CF 29 */ bl mDoExt_J3DModel__create__FP12J3DModelDataUlUl -/* 80CA7D30 90 7E 05 AC */ stw r3, 0x5ac(r30) -/* 80CA7D34 80 1E 05 AC */ lwz r0, 0x5ac(r30) -/* 80CA7D38 28 00 00 00 */ cmplwi r0, 0 -/* 80CA7D3C 40 82 00 0C */ bne lbl_80CA7D48 -/* 80CA7D40 38 60 00 00 */ li r3, 0 -/* 80CA7D44 48 00 00 A0 */ b lbl_80CA7DE4 -lbl_80CA7D48: -/* 80CA7D48 88 1E 05 B4 */ lbz r0, 0x5b4(r30) -/* 80CA7D4C 54 00 10 3A */ slwi r0, r0, 2 -/* 80CA7D50 3C 60 80 CB */ lis r3, l_arcName@ha /* 0x80CA815C@ha */ -/* 80CA7D54 38 63 81 5C */ addi r3, r3, l_arcName@l /* 0x80CA815C@l */ -/* 80CA7D58 7C 63 00 2E */ lwzx r3, r3, r0 -/* 80CA7D5C 38 9F 00 08 */ addi r4, r31, 8 -/* 80CA7D60 7C 84 00 2E */ lwzx r4, r4, r0 -/* 80CA7D64 7F A5 EB 78 */ mr r5, r29 -/* 80CA7D68 38 C0 00 80 */ li r6, 0x80 -/* 80CA7D6C 4B 39 45 81 */ bl getRes__14dRes_control_cFPCclP11dRes_info_ci -/* 80CA7D70 7C 7B 1B 78 */ mr r27, r3 -/* 80CA7D74 38 60 00 18 */ li r3, 0x18 -/* 80CA7D78 4B 62 6E D5 */ bl __nw__FUl -/* 80CA7D7C 7C 7D 1B 79 */ or. r29, r3, r3 -/* 80CA7D80 41 82 00 20 */ beq lbl_80CA7DA0 -/* 80CA7D84 3C 80 80 CB */ lis r4, __vt__12J3DFrameCtrl@ha /* 0x80CA81B4@ha */ -/* 80CA7D88 38 04 81 B4 */ addi r0, r4, __vt__12J3DFrameCtrl@l /* 0x80CA81B4@l */ -/* 80CA7D8C 90 1D 00 00 */ stw r0, 0(r29) -/* 80CA7D90 38 80 00 00 */ li r4, 0 -/* 80CA7D94 4B 68 06 69 */ bl init__12J3DFrameCtrlFs -/* 80CA7D98 38 00 00 00 */ li r0, 0 -/* 80CA7D9C 90 1D 00 14 */ stw r0, 0x14(r29) -lbl_80CA7DA0: -/* 80CA7DA0 93 BE 05 B0 */ stw r29, 0x5b0(r30) -/* 80CA7DA4 80 7E 05 B0 */ lwz r3, 0x5b0(r30) -/* 80CA7DA8 28 03 00 00 */ cmplwi r3, 0 -/* 80CA7DAC 41 82 00 2C */ beq lbl_80CA7DD8 -/* 80CA7DB0 38 9C 00 58 */ addi r4, r28, 0x58 -/* 80CA7DB4 7F 65 DB 78 */ mr r5, r27 -/* 80CA7DB8 38 C0 00 01 */ li r6, 1 -/* 80CA7DBC 38 E0 00 02 */ li r7, 2 -/* 80CA7DC0 C0 3F 00 28 */ lfs f1, 0x28(r31) -/* 80CA7DC4 39 00 00 00 */ li r8, 0 -/* 80CA7DC8 39 20 FF FF */ li r9, -1 -/* 80CA7DCC 4B 36 58 71 */ bl init__13mDoExt_btkAnmFP16J3DMaterialTableP19J3DAnmTextureSRTKeyiifss -/* 80CA7DD0 2C 03 00 00 */ cmpwi r3, 0 -/* 80CA7DD4 40 82 00 0C */ bne lbl_80CA7DE0 -lbl_80CA7DD8: -/* 80CA7DD8 38 60 00 00 */ li r3, 0 -/* 80CA7DDC 48 00 00 08 */ b lbl_80CA7DE4 -lbl_80CA7DE0: -/* 80CA7DE0 38 60 00 01 */ li r3, 1 -lbl_80CA7DE4: -/* 80CA7DE4 39 61 00 20 */ addi r11, r1, 0x20 -/* 80CA7DE8 4B 6B A4 39 */ bl _restgpr_27 -/* 80CA7DEC 80 01 00 24 */ lwz r0, 0x24(r1) -/* 80CA7DF0 7C 08 03 A6 */ mtlr r0 -/* 80CA7DF4 38 21 00 20 */ addi r1, r1, 0x20 -/* 80CA7DF8 4E 80 00 20 */ blr diff --git a/asm/rel/d/a/obj/d_a_obj_onsen/d_a_obj_onsen/Create__12daObjOnsen_cFv.s b/asm/rel/d/a/obj/d_a_obj_onsen/d_a_obj_onsen/Create__12daObjOnsen_cFv.s deleted file mode 100644 index fe0dc7989f..0000000000 --- a/asm/rel/d/a/obj/d_a_obj_onsen/d_a_obj_onsen/Create__12daObjOnsen_cFv.s +++ /dev/null @@ -1,20 +0,0 @@ -lbl_80CA7C28: -/* 80CA7C28 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 80CA7C2C 7C 08 02 A6 */ mflr r0 -/* 80CA7C30 90 01 00 14 */ stw r0, 0x14(r1) -/* 80CA7C34 93 E1 00 0C */ stw r31, 0xc(r1) -/* 80CA7C38 7C 7F 1B 78 */ mr r31, r3 -/* 80CA7C3C 4B FF FF 1D */ bl initBaseMtx__12daObjOnsen_cFv -/* 80CA7C40 80 7F 05 A8 */ lwz r3, 0x5a8(r31) -/* 80CA7C44 38 03 00 24 */ addi r0, r3, 0x24 -/* 80CA7C48 90 1F 05 04 */ stw r0, 0x504(r31) -/* 80CA7C4C 80 7F 05 A8 */ lwz r3, 0x5a8(r31) -/* 80CA7C50 80 83 00 04 */ lwz r4, 4(r3) -/* 80CA7C54 7F E3 FB 78 */ mr r3, r31 -/* 80CA7C58 4B 37 29 21 */ bl fopAcM_setCullSizeBox2__FP10fopAc_ac_cP12J3DModelData -/* 80CA7C5C 38 60 00 01 */ li r3, 1 -/* 80CA7C60 83 E1 00 0C */ lwz r31, 0xc(r1) -/* 80CA7C64 80 01 00 14 */ lwz r0, 0x14(r1) -/* 80CA7C68 7C 08 03 A6 */ mtlr r0 -/* 80CA7C6C 38 21 00 10 */ addi r1, r1, 0x10 -/* 80CA7C70 4E 80 00 20 */ blr diff --git a/asm/rel/d/a/obj/d_a_obj_onsen/d_a_obj_onsen/Delete__12daObjOnsen_cFv.s b/asm/rel/d/a/obj/d_a_obj_onsen/d_a_obj_onsen/Delete__12daObjOnsen_cFv.s deleted file mode 100644 index 3b6bd8d65c..0000000000 --- a/asm/rel/d/a/obj/d_a_obj_onsen/d_a_obj_onsen/Delete__12daObjOnsen_cFv.s +++ /dev/null @@ -1,17 +0,0 @@ -lbl_80CA8008: -/* 80CA8008 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 80CA800C 7C 08 02 A6 */ mflr r0 -/* 80CA8010 90 01 00 14 */ stw r0, 0x14(r1) -/* 80CA8014 7C 64 1B 78 */ mr r4, r3 -/* 80CA8018 38 64 05 A0 */ addi r3, r4, 0x5a0 -/* 80CA801C 88 04 05 B4 */ lbz r0, 0x5b4(r4) -/* 80CA8020 54 00 10 3A */ slwi r0, r0, 2 -/* 80CA8024 3C 80 80 CB */ lis r4, l_arcName@ha /* 0x80CA815C@ha */ -/* 80CA8028 38 84 81 5C */ addi r4, r4, l_arcName@l /* 0x80CA815C@l */ -/* 80CA802C 7C 84 00 2E */ lwzx r4, r4, r0 -/* 80CA8030 4B 38 4F D9 */ bl dComIfG_resDelete__FP30request_of_phase_process_classPCc -/* 80CA8034 38 60 00 01 */ li r3, 1 -/* 80CA8038 80 01 00 14 */ lwz r0, 0x14(r1) -/* 80CA803C 7C 08 03 A6 */ mtlr r0 -/* 80CA8040 38 21 00 10 */ addi r1, r1, 0x10 -/* 80CA8044 4E 80 00 20 */ blr diff --git a/asm/rel/d/a/obj/d_a_obj_onsen/d_a_obj_onsen/Draw__12daObjOnsen_cFv.s b/asm/rel/d/a/obj/d_a_obj_onsen/d_a_obj_onsen/Draw__12daObjOnsen_cFv.s deleted file mode 100644 index 2ed85d94bd..0000000000 --- a/asm/rel/d/a/obj/d_a_obj_onsen/d_a_obj_onsen/Draw__12daObjOnsen_cFv.s +++ /dev/null @@ -1,60 +0,0 @@ -lbl_80CA7F1C: -/* 80CA7F1C 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 80CA7F20 7C 08 02 A6 */ mflr r0 -/* 80CA7F24 90 01 00 14 */ stw r0, 0x14(r1) -/* 80CA7F28 93 E1 00 0C */ stw r31, 0xc(r1) -/* 80CA7F2C 93 C1 00 08 */ stw r30, 8(r1) -/* 80CA7F30 7C 7E 1B 78 */ mr r30, r3 -/* 80CA7F34 3C 60 80 43 */ lis r3, g_env_light@ha /* 0x8042CA54@ha */ -/* 80CA7F38 38 63 CA 54 */ addi r3, r3, g_env_light@l /* 0x8042CA54@l */ -/* 80CA7F3C 38 80 00 10 */ li r4, 0x10 -/* 80CA7F40 38 BE 04 D0 */ addi r5, r30, 0x4d0 -/* 80CA7F44 38 DE 01 0C */ addi r6, r30, 0x10c -/* 80CA7F48 4B 4F B8 7D */ bl settingTevStruct__18dScnKy_env_light_cFiP4cXyzP12dKy_tevstr_c -/* 80CA7F4C 3C 60 80 43 */ lis r3, g_env_light@ha /* 0x8042CA54@ha */ -/* 80CA7F50 38 63 CA 54 */ addi r3, r3, g_env_light@l /* 0x8042CA54@l */ -/* 80CA7F54 80 9E 05 A8 */ lwz r4, 0x5a8(r30) -/* 80CA7F58 80 84 00 04 */ lwz r4, 4(r4) -/* 80CA7F5C 38 BE 01 0C */ addi r5, r30, 0x10c -/* 80CA7F60 4B 4F CE 41 */ bl setLightTevColorType_MAJI__18dScnKy_env_light_cFP12J3DModelDataP12dKy_tevstr_c -/* 80CA7F64 3C 60 80 43 */ lis r3, g_env_light@ha /* 0x8042CA54@ha */ -/* 80CA7F68 38 63 CA 54 */ addi r3, r3, g_env_light@l /* 0x8042CA54@l */ -/* 80CA7F6C 80 9E 05 AC */ lwz r4, 0x5ac(r30) -/* 80CA7F70 80 84 00 04 */ lwz r4, 4(r4) -/* 80CA7F74 38 BE 01 0C */ addi r5, r30, 0x10c -/* 80CA7F78 4B 4F CE 29 */ bl setLightTevColorType_MAJI__18dScnKy_env_light_cFP12J3DModelDataP12dKy_tevstr_c -/* 80CA7F7C 80 7E 05 A8 */ lwz r3, 0x5a8(r30) -/* 80CA7F80 4B 50 4D A5 */ bl dKy_bg_MAxx_proc__FPv -/* 80CA7F84 80 7E 05 A8 */ lwz r3, 0x5a8(r30) -/* 80CA7F88 4B 36 5D 3D */ bl mDoExt_modelUpdateDL__FP8J3DModel -/* 80CA7F8C 80 7E 05 AC */ lwz r3, 0x5ac(r30) -/* 80CA7F90 80 83 00 04 */ lwz r4, 4(r3) -/* 80CA7F94 80 7E 05 B0 */ lwz r3, 0x5b0(r30) -/* 80CA7F98 C0 23 00 10 */ lfs f1, 0x10(r3) -/* 80CA7F9C 38 84 00 58 */ addi r4, r4, 0x58 -/* 80CA7FA0 4B 36 57 39 */ bl entry__13mDoExt_btkAnmFP16J3DMaterialTablef -/* 80CA7FA4 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */ -/* 80CA7FA8 38 83 61 C0 */ addi r4, r3, g_dComIfG_gameInfo@l /* 0x804061C0@l */ -/* 80CA7FAC 80 04 5F A0 */ lwz r0, 0x5fa0(r4) -/* 80CA7FB0 3C 60 80 43 */ lis r3, j3dSys@ha /* 0x80434AC8@ha */ -/* 80CA7FB4 3B E3 4A C8 */ addi r31, r3, j3dSys@l /* 0x80434AC8@l */ -/* 80CA7FB8 90 1F 00 48 */ stw r0, 0x48(r31) -/* 80CA7FBC 80 04 5F A4 */ lwz r0, 0x5fa4(r4) -/* 80CA7FC0 90 1F 00 4C */ stw r0, 0x4c(r31) -/* 80CA7FC4 80 7E 05 AC */ lwz r3, 0x5ac(r30) -/* 80CA7FC8 4B 50 4D 5D */ bl dKy_bg_MAxx_proc__FPv -/* 80CA7FCC 80 7E 05 AC */ lwz r3, 0x5ac(r30) -/* 80CA7FD0 4B 36 5C F5 */ bl mDoExt_modelUpdateDL__FP8J3DModel -/* 80CA7FD4 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */ -/* 80CA7FD8 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 0x804061C0@l */ -/* 80CA7FDC 80 03 5F 80 */ lwz r0, 0x5f80(r3) -/* 80CA7FE0 90 1F 00 48 */ stw r0, 0x48(r31) -/* 80CA7FE4 80 03 5F 84 */ lwz r0, 0x5f84(r3) -/* 80CA7FE8 90 1F 00 4C */ stw r0, 0x4c(r31) -/* 80CA7FEC 38 60 00 01 */ li r3, 1 -/* 80CA7FF0 83 E1 00 0C */ lwz r31, 0xc(r1) -/* 80CA7FF4 83 C1 00 08 */ lwz r30, 8(r1) -/* 80CA7FF8 80 01 00 14 */ lwz r0, 0x14(r1) -/* 80CA7FFC 7C 08 03 A6 */ mtlr r0 -/* 80CA8000 38 21 00 10 */ addi r1, r1, 0x10 -/* 80CA8004 4E 80 00 20 */ blr diff --git a/asm/rel/d/a/obj/d_a_obj_onsen/d_a_obj_onsen/Execute__12daObjOnsen_cFPPA3_A4_f.s b/asm/rel/d/a/obj/d_a_obj_onsen/d_a_obj_onsen/Execute__12daObjOnsen_cFPPA3_A4_f.s deleted file mode 100644 index 81a9c1bb0f..0000000000 --- a/asm/rel/d/a/obj/d_a_obj_onsen/d_a_obj_onsen/Execute__12daObjOnsen_cFPPA3_A4_f.s +++ /dev/null @@ -1,13 +0,0 @@ -lbl_80CA7EEC: -/* 80CA7EEC 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 80CA7EF0 7C 08 02 A6 */ mflr r0 -/* 80CA7EF4 90 01 00 14 */ stw r0, 0x14(r1) -/* 80CA7EF8 38 03 05 6C */ addi r0, r3, 0x56c -/* 80CA7EFC 90 04 00 00 */ stw r0, 0(r4) -/* 80CA7F00 80 63 05 B0 */ lwz r3, 0x5b0(r3) -/* 80CA7F04 4B 36 55 25 */ bl play__14mDoExt_baseAnmFv -/* 80CA7F08 38 60 00 01 */ li r3, 1 -/* 80CA7F0C 80 01 00 14 */ lwz r0, 0x14(r1) -/* 80CA7F10 7C 08 03 A6 */ mtlr r0 -/* 80CA7F14 38 21 00 10 */ addi r1, r1, 0x10 -/* 80CA7F18 4E 80 00 20 */ blr diff --git a/asm/rel/d/a/obj/d_a_obj_onsen/d_a_obj_onsen/__dt__12J3DFrameCtrlFv.s b/asm/rel/d/a/obj/d_a_obj_onsen/d_a_obj_onsen/__dt__12J3DFrameCtrlFv.s deleted file mode 100644 index 69b3059626..0000000000 --- a/asm/rel/d/a/obj/d_a_obj_onsen/d_a_obj_onsen/__dt__12J3DFrameCtrlFv.s +++ /dev/null @@ -1,20 +0,0 @@ -lbl_80CA7DFC: -/* 80CA7DFC 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 80CA7E00 7C 08 02 A6 */ mflr r0 -/* 80CA7E04 90 01 00 14 */ stw r0, 0x14(r1) -/* 80CA7E08 93 E1 00 0C */ stw r31, 0xc(r1) -/* 80CA7E0C 7C 7F 1B 79 */ or. r31, r3, r3 -/* 80CA7E10 41 82 00 1C */ beq lbl_80CA7E2C -/* 80CA7E14 3C A0 80 CB */ lis r5, __vt__12J3DFrameCtrl@ha /* 0x80CA81B4@ha */ -/* 80CA7E18 38 05 81 B4 */ addi r0, r5, __vt__12J3DFrameCtrl@l /* 0x80CA81B4@l */ -/* 80CA7E1C 90 1F 00 00 */ stw r0, 0(r31) -/* 80CA7E20 7C 80 07 35 */ extsh. r0, r4 -/* 80CA7E24 40 81 00 08 */ ble lbl_80CA7E2C -/* 80CA7E28 4B 62 6F 15 */ bl __dl__FPv -lbl_80CA7E2C: -/* 80CA7E2C 7F E3 FB 78 */ mr r3, r31 -/* 80CA7E30 83 E1 00 0C */ lwz r31, 0xc(r1) -/* 80CA7E34 80 01 00 14 */ lwz r0, 0x14(r1) -/* 80CA7E38 7C 08 03 A6 */ mtlr r0 -/* 80CA7E3C 38 21 00 10 */ addi r1, r1, 0x10 -/* 80CA7E40 4E 80 00 20 */ blr diff --git a/asm/rel/d/a/obj/d_a_obj_onsen/d_a_obj_onsen/create1st__12daObjOnsen_cFv.s b/asm/rel/d/a/obj/d_a_obj_onsen/d_a_obj_onsen/create1st__12daObjOnsen_cFv.s deleted file mode 100644 index e7587183d0..0000000000 --- a/asm/rel/d/a/obj/d_a_obj_onsen/d_a_obj_onsen/create1st__12daObjOnsen_cFv.s +++ /dev/null @@ -1,45 +0,0 @@ -lbl_80CA7E44: -/* 80CA7E44 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 80CA7E48 7C 08 02 A6 */ mflr r0 -/* 80CA7E4C 90 01 00 14 */ stw r0, 0x14(r1) -/* 80CA7E50 93 E1 00 0C */ stw r31, 0xc(r1) -/* 80CA7E54 7C 7F 1B 78 */ mr r31, r3 -/* 80CA7E58 80 03 00 B0 */ lwz r0, 0xb0(r3) -/* 80CA7E5C 98 03 05 B4 */ stb r0, 0x5b4(r3) -/* 80CA7E60 38 7F 05 A0 */ addi r3, r31, 0x5a0 -/* 80CA7E64 88 1F 05 B4 */ lbz r0, 0x5b4(r31) -/* 80CA7E68 54 00 10 3A */ slwi r0, r0, 2 -/* 80CA7E6C 3C 80 80 CB */ lis r4, l_arcName@ha /* 0x80CA815C@ha */ -/* 80CA7E70 38 84 81 5C */ addi r4, r4, l_arcName@l /* 0x80CA815C@l */ -/* 80CA7E74 7C 84 00 2E */ lwzx r4, r4, r0 -/* 80CA7E78 4B 38 50 45 */ bl dComIfG_resLoad__FP30request_of_phase_process_classPCc -/* 80CA7E7C 7C 60 1B 78 */ mr r0, r3 -/* 80CA7E80 2C 00 00 04 */ cmpwi r0, 4 -/* 80CA7E84 40 82 00 50 */ bne lbl_80CA7ED4 -/* 80CA7E88 88 1F 05 B4 */ lbz r0, 0x5b4(r31) -/* 80CA7E8C 54 00 10 3A */ slwi r0, r0, 2 -/* 80CA7E90 7F E3 FB 78 */ mr r3, r31 -/* 80CA7E94 3C 80 80 CB */ lis r4, l_arcName@ha /* 0x80CA815C@ha */ -/* 80CA7E98 38 84 81 5C */ addi r4, r4, l_arcName@l /* 0x80CA815C@l */ -/* 80CA7E9C 7C 84 00 2E */ lwzx r4, r4, r0 -/* 80CA7EA0 3C A0 80 CB */ lis r5, l_dzb@ha /* 0x80CA8134@ha */ -/* 80CA7EA4 38 A5 81 34 */ addi r5, r5, l_dzb@l /* 0x80CA8134@l */ -/* 80CA7EA8 7C A5 00 2E */ lwzx r5, r5, r0 -/* 80CA7EAC 38 C0 00 00 */ li r6, 0 -/* 80CA7EB0 3C E0 80 CB */ lis r7, l_heap_size@ha /* 0x80CA813C@ha */ -/* 80CA7EB4 38 E7 81 3C */ addi r7, r7, l_heap_size@l /* 0x80CA813C@l */ -/* 80CA7EB8 7C E7 00 2E */ lwzx r7, r7, r0 -/* 80CA7EBC 39 00 00 00 */ li r8, 0 -/* 80CA7EC0 4B 3D 08 FD */ bl MoveBGCreate__16dBgS_MoveBgActorFPCciPFP4dBgWPvRC13cBgS_PolyInfobP4cXyzP5csXyzP5csXyz_vUlPA3_A4_f -/* 80CA7EC4 7C 60 1B 78 */ mr r0, r3 -/* 80CA7EC8 2C 00 00 05 */ cmpwi r0, 5 -/* 80CA7ECC 40 82 00 08 */ bne lbl_80CA7ED4 -/* 80CA7ED0 48 00 00 08 */ b lbl_80CA7ED8 -lbl_80CA7ED4: -/* 80CA7ED4 7C 03 03 78 */ mr r3, r0 -lbl_80CA7ED8: -/* 80CA7ED8 83 E1 00 0C */ lwz r31, 0xc(r1) -/* 80CA7EDC 80 01 00 14 */ lwz r0, 0x14(r1) -/* 80CA7EE0 7C 08 03 A6 */ mtlr r0 -/* 80CA7EE4 38 21 00 10 */ addi r1, r1, 0x10 -/* 80CA7EE8 4E 80 00 20 */ blr diff --git a/asm/rel/d/a/obj/d_a_obj_onsen/d_a_obj_onsen/daObjOnsen_MoveBGDelete__FP12daObjOnsen_c.s b/asm/rel/d/a/obj/d_a_obj_onsen/d_a_obj_onsen/daObjOnsen_MoveBGDelete__FP12daObjOnsen_c.s deleted file mode 100644 index 914e6c4041..0000000000 --- a/asm/rel/d/a/obj/d_a_obj_onsen/d_a_obj_onsen/daObjOnsen_MoveBGDelete__FP12daObjOnsen_c.s +++ /dev/null @@ -1,9 +0,0 @@ -lbl_80CA80A8: -/* 80CA80A8 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 80CA80AC 7C 08 02 A6 */ mflr r0 -/* 80CA80B0 90 01 00 14 */ stw r0, 0x14(r1) -/* 80CA80B4 4B 3D 08 29 */ bl MoveBGDelete__16dBgS_MoveBgActorFv -/* 80CA80B8 80 01 00 14 */ lwz r0, 0x14(r1) -/* 80CA80BC 7C 08 03 A6 */ mtlr r0 -/* 80CA80C0 38 21 00 10 */ addi r1, r1, 0x10 -/* 80CA80C4 4E 80 00 20 */ blr diff --git a/asm/rel/d/a/obj/d_a_obj_onsen/d_a_obj_onsen/daObjOnsen_MoveBGDraw__FP12daObjOnsen_c.s b/asm/rel/d/a/obj/d_a_obj_onsen/d_a_obj_onsen/daObjOnsen_MoveBGDraw__FP12daObjOnsen_c.s deleted file mode 100644 index 7b82c2a118..0000000000 --- a/asm/rel/d/a/obj/d_a_obj_onsen/d_a_obj_onsen/daObjOnsen_MoveBGDraw__FP12daObjOnsen_c.s +++ /dev/null @@ -1,12 +0,0 @@ -lbl_80CA80E8: -/* 80CA80E8 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 80CA80EC 7C 08 02 A6 */ mflr r0 -/* 80CA80F0 90 01 00 14 */ stw r0, 0x14(r1) -/* 80CA80F4 81 83 05 9C */ lwz r12, 0x59c(r3) -/* 80CA80F8 81 8C 00 14 */ lwz r12, 0x14(r12) -/* 80CA80FC 7D 89 03 A6 */ mtctr r12 -/* 80CA8100 4E 80 04 21 */ bctrl -/* 80CA8104 80 01 00 14 */ lwz r0, 0x14(r1) -/* 80CA8108 7C 08 03 A6 */ mtlr r0 -/* 80CA810C 38 21 00 10 */ addi r1, r1, 0x10 -/* 80CA8110 4E 80 00 20 */ blr diff --git a/asm/rel/d/a/obj/d_a_obj_onsen/d_a_obj_onsen/daObjOnsen_MoveBGExecute__FP12daObjOnsen_c.s b/asm/rel/d/a/obj/d_a_obj_onsen/d_a_obj_onsen/daObjOnsen_MoveBGExecute__FP12daObjOnsen_c.s deleted file mode 100644 index 54303b94cb..0000000000 --- a/asm/rel/d/a/obj/d_a_obj_onsen/d_a_obj_onsen/daObjOnsen_MoveBGExecute__FP12daObjOnsen_c.s +++ /dev/null @@ -1,9 +0,0 @@ -lbl_80CA80C8: -/* 80CA80C8 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 80CA80CC 7C 08 02 A6 */ mflr r0 -/* 80CA80D0 90 01 00 14 */ stw r0, 0x14(r1) -/* 80CA80D4 4B 3D 08 7D */ bl MoveBGExecute__16dBgS_MoveBgActorFv -/* 80CA80D8 80 01 00 14 */ lwz r0, 0x14(r1) -/* 80CA80DC 7C 08 03 A6 */ mtlr r0 -/* 80CA80E0 38 21 00 10 */ addi r1, r1, 0x10 -/* 80CA80E4 4E 80 00 20 */ blr diff --git a/asm/rel/d/a/obj/d_a_obj_onsen/d_a_obj_onsen/daObjOnsen_create1st__FP12daObjOnsen_c.s b/asm/rel/d/a/obj/d_a_obj_onsen/d_a_obj_onsen/daObjOnsen_create1st__FP12daObjOnsen_c.s deleted file mode 100644 index e77d5990af..0000000000 --- a/asm/rel/d/a/obj/d_a_obj_onsen/d_a_obj_onsen/daObjOnsen_create1st__FP12daObjOnsen_c.s +++ /dev/null @@ -1,27 +0,0 @@ -lbl_80CA8048: -/* 80CA8048 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 80CA804C 7C 08 02 A6 */ mflr r0 -/* 80CA8050 90 01 00 14 */ stw r0, 0x14(r1) -/* 80CA8054 93 E1 00 0C */ stw r31, 0xc(r1) -/* 80CA8058 7C 7F 1B 78 */ mr r31, r3 -/* 80CA805C 80 03 04 A0 */ lwz r0, 0x4a0(r3) -/* 80CA8060 54 00 07 39 */ rlwinm. r0, r0, 0, 0x1c, 0x1c -/* 80CA8064 40 82 00 28 */ bne lbl_80CA808C -/* 80CA8068 28 1F 00 00 */ cmplwi r31, 0 -/* 80CA806C 41 82 00 14 */ beq lbl_80CA8080 -/* 80CA8070 4B 3D 05 B5 */ bl __ct__16dBgS_MoveBgActorFv -/* 80CA8074 3C 60 80 CB */ lis r3, __vt__12daObjOnsen_c@ha /* 0x80CA81C0@ha */ -/* 80CA8078 38 03 81 C0 */ addi r0, r3, __vt__12daObjOnsen_c@l /* 0x80CA81C0@l */ -/* 80CA807C 90 1F 05 9C */ stw r0, 0x59c(r31) -lbl_80CA8080: -/* 80CA8080 80 1F 04 A0 */ lwz r0, 0x4a0(r31) -/* 80CA8084 60 00 00 08 */ ori r0, r0, 8 -/* 80CA8088 90 1F 04 A0 */ stw r0, 0x4a0(r31) -lbl_80CA808C: -/* 80CA808C 7F E3 FB 78 */ mr r3, r31 -/* 80CA8090 4B FF FD B5 */ bl create1st__12daObjOnsen_cFv -/* 80CA8094 83 E1 00 0C */ lwz r31, 0xc(r1) -/* 80CA8098 80 01 00 14 */ lwz r0, 0x14(r1) -/* 80CA809C 7C 08 03 A6 */ mtlr r0 -/* 80CA80A0 38 21 00 10 */ addi r1, r1, 0x10 -/* 80CA80A4 4E 80 00 20 */ blr diff --git a/asm/rel/d/a/obj/d_a_obj_onsen/d_a_obj_onsen/initBaseMtx__12daObjOnsen_cFv.s b/asm/rel/d/a/obj/d_a_obj_onsen/d_a_obj_onsen/initBaseMtx__12daObjOnsen_cFv.s deleted file mode 100644 index fe1cca0750..0000000000 --- a/asm/rel/d/a/obj/d_a_obj_onsen/d_a_obj_onsen/initBaseMtx__12daObjOnsen_cFv.s +++ /dev/null @@ -1,23 +0,0 @@ -lbl_80CA7B58: -/* 80CA7B58 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 80CA7B5C 7C 08 02 A6 */ mflr r0 -/* 80CA7B60 90 01 00 14 */ stw r0, 0x14(r1) -/* 80CA7B64 80 83 05 A8 */ lwz r4, 0x5a8(r3) -/* 80CA7B68 C0 03 04 EC */ lfs f0, 0x4ec(r3) -/* 80CA7B6C D0 04 00 18 */ stfs f0, 0x18(r4) -/* 80CA7B70 C0 03 04 F0 */ lfs f0, 0x4f0(r3) -/* 80CA7B74 D0 04 00 1C */ stfs f0, 0x1c(r4) -/* 80CA7B78 C0 03 04 F4 */ lfs f0, 0x4f4(r3) -/* 80CA7B7C D0 04 00 20 */ stfs f0, 0x20(r4) -/* 80CA7B80 80 83 05 AC */ lwz r4, 0x5ac(r3) -/* 80CA7B84 C0 03 04 EC */ lfs f0, 0x4ec(r3) -/* 80CA7B88 D0 04 00 18 */ stfs f0, 0x18(r4) -/* 80CA7B8C C0 03 04 F0 */ lfs f0, 0x4f0(r3) -/* 80CA7B90 D0 04 00 1C */ stfs f0, 0x1c(r4) -/* 80CA7B94 C0 03 04 F4 */ lfs f0, 0x4f4(r3) -/* 80CA7B98 D0 04 00 20 */ stfs f0, 0x20(r4) -/* 80CA7B9C 48 00 00 15 */ bl setBaseMtx__12daObjOnsen_cFv -/* 80CA7BA0 80 01 00 14 */ lwz r0, 0x14(r1) -/* 80CA7BA4 7C 08 03 A6 */ mtlr r0 -/* 80CA7BA8 38 21 00 10 */ addi r1, r1, 0x10 -/* 80CA7BAC 4E 80 00 20 */ blr diff --git a/asm/rel/d/a/obj/d_a_obj_onsen/d_a_obj_onsen/setBaseMtx__12daObjOnsen_cFv.s b/asm/rel/d/a/obj/d_a_obj_onsen/d_a_obj_onsen/setBaseMtx__12daObjOnsen_cFv.s deleted file mode 100644 index 3e0851d135..0000000000 --- a/asm/rel/d/a/obj/d_a_obj_onsen/d_a_obj_onsen/setBaseMtx__12daObjOnsen_cFv.s +++ /dev/null @@ -1,31 +0,0 @@ -lbl_80CA7BB0: -/* 80CA7BB0 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 80CA7BB4 7C 08 02 A6 */ mflr r0 -/* 80CA7BB8 90 01 00 14 */ stw r0, 0x14(r1) -/* 80CA7BBC 93 E1 00 0C */ stw r31, 0xc(r1) -/* 80CA7BC0 7C 7F 1B 78 */ mr r31, r3 -/* 80CA7BC4 38 7F 04 D0 */ addi r3, r31, 0x4d0 -/* 80CA7BC8 4B 36 51 9D */ bl transS__14mDoMtx_stack_cFRC4cXyz -/* 80CA7BCC 3C 60 80 3E */ lis r3, now__14mDoMtx_stack_c@ha /* 0x803DD470@ha */ -/* 80CA7BD0 38 63 D4 70 */ addi r3, r3, now__14mDoMtx_stack_c@l /* 0x803DD470@l */ -/* 80CA7BD4 A8 9F 04 E6 */ lha r4, 0x4e6(r31) -/* 80CA7BD8 4B 36 48 5D */ bl mDoMtx_YrotM__FPA4_fs -/* 80CA7BDC 3C 60 80 3E */ lis r3, now__14mDoMtx_stack_c@ha /* 0x803DD470@ha */ -/* 80CA7BE0 38 63 D4 70 */ addi r3, r3, now__14mDoMtx_stack_c@l /* 0x803DD470@l */ -/* 80CA7BE4 80 9F 05 A8 */ lwz r4, 0x5a8(r31) -/* 80CA7BE8 38 84 00 24 */ addi r4, r4, 0x24 -/* 80CA7BEC 4B 69 E8 C5 */ bl PSMTXCopy -/* 80CA7BF0 3C 60 80 3E */ lis r3, now__14mDoMtx_stack_c@ha /* 0x803DD470@ha */ -/* 80CA7BF4 38 63 D4 70 */ addi r3, r3, now__14mDoMtx_stack_c@l /* 0x803DD470@l */ -/* 80CA7BF8 80 9F 05 AC */ lwz r4, 0x5ac(r31) -/* 80CA7BFC 38 84 00 24 */ addi r4, r4, 0x24 -/* 80CA7C00 4B 69 E8 B1 */ bl PSMTXCopy -/* 80CA7C04 3C 60 80 3E */ lis r3, now__14mDoMtx_stack_c@ha /* 0x803DD470@ha */ -/* 80CA7C08 38 63 D4 70 */ addi r3, r3, now__14mDoMtx_stack_c@l /* 0x803DD470@l */ -/* 80CA7C0C 38 9F 05 6C */ addi r4, r31, 0x56c -/* 80CA7C10 4B 69 E8 A1 */ bl PSMTXCopy -/* 80CA7C14 83 E1 00 0C */ lwz r31, 0xc(r1) -/* 80CA7C18 80 01 00 14 */ lwz r0, 0x14(r1) -/* 80CA7C1C 7C 08 03 A6 */ mtlr r0 -/* 80CA7C20 38 21 00 10 */ addi r1, r1, 0x10 -/* 80CA7C24 4E 80 00 20 */ blr diff --git a/asm/rel/d/a/obj/d_a_obj_rcircle/d_a_obj_rcircle/Delete__14daObjRCircle_cFv.s b/asm/rel/d/a/obj/d_a_obj_rcircle/d_a_obj_rcircle/Delete__14daObjRCircle_cFv.s deleted file mode 100644 index 78e36c820b..0000000000 --- a/asm/rel/d/a/obj/d_a_obj_rcircle/d_a_obj_rcircle/Delete__14daObjRCircle_cFv.s +++ /dev/null @@ -1,14 +0,0 @@ -lbl_80CB8A28: -/* 80CB8A28 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 80CB8A2C 7C 08 02 A6 */ mflr r0 -/* 80CB8A30 90 01 00 14 */ stw r0, 0x14(r1) -/* 80CB8A34 38 80 FF FF */ li r4, -1 -/* 80CB8A38 81 83 05 70 */ lwz r12, 0x570(r3) -/* 80CB8A3C 81 8C 00 08 */ lwz r12, 8(r12) -/* 80CB8A40 7D 89 03 A6 */ mtctr r12 -/* 80CB8A44 4E 80 04 21 */ bctrl -/* 80CB8A48 38 60 00 01 */ li r3, 1 -/* 80CB8A4C 80 01 00 14 */ lwz r0, 0x14(r1) -/* 80CB8A50 7C 08 03 A6 */ mtlr r0 -/* 80CB8A54 38 21 00 10 */ addi r1, r1, 0x10 -/* 80CB8A58 4E 80 00 20 */ blr diff --git a/asm/rel/d/a/obj/d_a_obj_rcircle/d_a_obj_rcircle/__ct__14daObjRCircle_cFv.s b/asm/rel/d/a/obj/d_a_obj_rcircle/d_a_obj_rcircle/__ct__14daObjRCircle_cFv.s deleted file mode 100644 index e07d1d31d5..0000000000 --- a/asm/rel/d/a/obj/d_a_obj_rcircle/d_a_obj_rcircle/__ct__14daObjRCircle_cFv.s +++ /dev/null @@ -1,36 +0,0 @@ -lbl_80CB8678: -/* 80CB8678 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 80CB867C 7C 08 02 A6 */ mflr r0 -/* 80CB8680 90 01 00 14 */ stw r0, 0x14(r1) -/* 80CB8684 93 E1 00 0C */ stw r31, 0xc(r1) -/* 80CB8688 93 C1 00 08 */ stw r30, 8(r1) -/* 80CB868C 7C 7F 1B 78 */ mr r31, r3 -/* 80CB8690 4B 36 04 D5 */ bl __ct__10fopAc_ac_cFv -/* 80CB8694 3C 60 80 CC */ lis r3, __vt__14daObjRCircle_c@ha /* 0x80CB8D64@ha */ -/* 80CB8698 38 03 8D 64 */ addi r0, r3, __vt__14daObjRCircle_c@l /* 0x80CB8D64@l */ -/* 80CB869C 90 1F 05 70 */ stw r0, 0x570(r31) -/* 80CB86A0 3B DF 05 74 */ addi r30, r31, 0x574 -/* 80CB86A4 3C 60 80 CC */ lis r3, __vt__12J3DFrameCtrl@ha /* 0x80CB8D70@ha */ -/* 80CB86A8 38 03 8D 70 */ addi r0, r3, __vt__12J3DFrameCtrl@l /* 0x80CB8D70@l */ -/* 80CB86AC 90 1F 05 74 */ stw r0, 0x574(r31) -/* 80CB86B0 7F C3 F3 78 */ mr r3, r30 -/* 80CB86B4 38 80 00 00 */ li r4, 0 -/* 80CB86B8 4B 66 FD 45 */ bl init__12J3DFrameCtrlFs -/* 80CB86BC 38 00 00 00 */ li r0, 0 -/* 80CB86C0 90 1E 00 14 */ stw r0, 0x14(r30) -/* 80CB86C4 3B DF 05 8C */ addi r30, r31, 0x58c -/* 80CB86C8 3C 60 80 CC */ lis r3, __vt__12J3DFrameCtrl@ha /* 0x80CB8D70@ha */ -/* 80CB86CC 38 03 8D 70 */ addi r0, r3, __vt__12J3DFrameCtrl@l /* 0x80CB8D70@l */ -/* 80CB86D0 90 1F 05 8C */ stw r0, 0x58c(r31) -/* 80CB86D4 7F C3 F3 78 */ mr r3, r30 -/* 80CB86D8 38 80 00 00 */ li r4, 0 -/* 80CB86DC 4B 66 FD 21 */ bl init__12J3DFrameCtrlFs -/* 80CB86E0 38 00 00 00 */ li r0, 0 -/* 80CB86E4 90 1E 00 14 */ stw r0, 0x14(r30) -/* 80CB86E8 7F E3 FB 78 */ mr r3, r31 -/* 80CB86EC 83 E1 00 0C */ lwz r31, 0xc(r1) -/* 80CB86F0 83 C1 00 08 */ lwz r30, 8(r1) -/* 80CB86F4 80 01 00 14 */ lwz r0, 0x14(r1) -/* 80CB86F8 7C 08 03 A6 */ mtlr r0 -/* 80CB86FC 38 21 00 10 */ addi r1, r1, 0x10 -/* 80CB8700 4E 80 00 20 */ blr diff --git a/asm/rel/d/a/obj/d_a_obj_rcircle/d_a_obj_rcircle/__dt__12J3DFrameCtrlFv.s b/asm/rel/d/a/obj/d_a_obj_rcircle/d_a_obj_rcircle/__dt__12J3DFrameCtrlFv.s deleted file mode 100644 index eb54e85c0c..0000000000 --- a/asm/rel/d/a/obj/d_a_obj_rcircle/d_a_obj_rcircle/__dt__12J3DFrameCtrlFv.s +++ /dev/null @@ -1,20 +0,0 @@ -lbl_80CB8704: -/* 80CB8704 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 80CB8708 7C 08 02 A6 */ mflr r0 -/* 80CB870C 90 01 00 14 */ stw r0, 0x14(r1) -/* 80CB8710 93 E1 00 0C */ stw r31, 0xc(r1) -/* 80CB8714 7C 7F 1B 79 */ or. r31, r3, r3 -/* 80CB8718 41 82 00 1C */ beq lbl_80CB8734 -/* 80CB871C 3C A0 80 CC */ lis r5, __vt__12J3DFrameCtrl@ha /* 0x80CB8D70@ha */ -/* 80CB8720 38 05 8D 70 */ addi r0, r5, __vt__12J3DFrameCtrl@l /* 0x80CB8D70@l */ -/* 80CB8724 90 1F 00 00 */ stw r0, 0(r31) -/* 80CB8728 7C 80 07 35 */ extsh. r0, r4 -/* 80CB872C 40 81 00 08 */ ble lbl_80CB8734 -/* 80CB8730 4B 61 66 0D */ bl __dl__FPv -lbl_80CB8734: -/* 80CB8734 7F E3 FB 78 */ mr r3, r31 -/* 80CB8738 83 E1 00 0C */ lwz r31, 0xc(r1) -/* 80CB873C 80 01 00 14 */ lwz r0, 0x14(r1) -/* 80CB8740 7C 08 03 A6 */ mtlr r0 -/* 80CB8744 38 21 00 10 */ addi r1, r1, 0x10 -/* 80CB8748 4E 80 00 20 */ blr diff --git a/asm/rel/d/a/obj/d_a_obj_rcircle/d_a_obj_rcircle/__dt__14daObjRCircle_cFv.s b/asm/rel/d/a/obj/d_a_obj_rcircle/d_a_obj_rcircle/__dt__14daObjRCircle_cFv.s deleted file mode 100644 index 02ef7f247b..0000000000 --- a/asm/rel/d/a/obj/d_a_obj_rcircle/d_a_obj_rcircle/__dt__14daObjRCircle_cFv.s +++ /dev/null @@ -1,55 +0,0 @@ -lbl_80CB874C: -/* 80CB874C 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 80CB8750 7C 08 02 A6 */ mflr r0 -/* 80CB8754 90 01 00 14 */ stw r0, 0x14(r1) -/* 80CB8758 93 E1 00 0C */ stw r31, 0xc(r1) -/* 80CB875C 93 C1 00 08 */ stw r30, 8(r1) -/* 80CB8760 7C 7E 1B 79 */ or. r30, r3, r3 -/* 80CB8764 7C 9F 23 78 */ mr r31, r4 -/* 80CB8768 41 82 00 90 */ beq lbl_80CB87F8 -/* 80CB876C 3C 60 80 CC */ lis r3, __vt__14daObjRCircle_c@ha /* 0x80CB8D64@ha */ -/* 80CB8770 38 03 8D 64 */ addi r0, r3, __vt__14daObjRCircle_c@l /* 0x80CB8D64@l */ -/* 80CB8774 90 1E 05 70 */ stw r0, 0x570(r30) -/* 80CB8778 7F C3 F3 78 */ mr r3, r30 -/* 80CB877C 41 82 00 08 */ beq lbl_80CB8784 -/* 80CB8780 38 63 05 68 */ addi r3, r3, 0x568 -lbl_80CB8784: -/* 80CB8784 3C 80 80 CC */ lis r4, l_arcName@ha /* 0x80CB8D10@ha */ -/* 80CB8788 38 84 8D 10 */ addi r4, r4, l_arcName@l /* 0x80CB8D10@l */ -/* 80CB878C 80 84 00 00 */ lwz r4, 0(r4) -/* 80CB8790 4B 37 48 79 */ bl dComIfG_resDelete__FP30request_of_phase_process_classPCc -/* 80CB8794 34 1E 05 8C */ addic. r0, r30, 0x58c -/* 80CB8798 41 82 00 20 */ beq lbl_80CB87B8 -/* 80CB879C 34 1E 05 8C */ addic. r0, r30, 0x58c -/* 80CB87A0 41 82 00 18 */ beq lbl_80CB87B8 -/* 80CB87A4 34 1E 05 8C */ addic. r0, r30, 0x58c -/* 80CB87A8 41 82 00 10 */ beq lbl_80CB87B8 -/* 80CB87AC 3C 60 80 CC */ lis r3, __vt__12J3DFrameCtrl@ha /* 0x80CB8D70@ha */ -/* 80CB87B0 38 03 8D 70 */ addi r0, r3, __vt__12J3DFrameCtrl@l /* 0x80CB8D70@l */ -/* 80CB87B4 90 1E 05 8C */ stw r0, 0x58c(r30) -lbl_80CB87B8: -/* 80CB87B8 34 1E 05 74 */ addic. r0, r30, 0x574 -/* 80CB87BC 41 82 00 20 */ beq lbl_80CB87DC -/* 80CB87C0 34 1E 05 74 */ addic. r0, r30, 0x574 -/* 80CB87C4 41 82 00 18 */ beq lbl_80CB87DC -/* 80CB87C8 34 1E 05 74 */ addic. r0, r30, 0x574 -/* 80CB87CC 41 82 00 10 */ beq lbl_80CB87DC -/* 80CB87D0 3C 60 80 CC */ lis r3, __vt__12J3DFrameCtrl@ha /* 0x80CB8D70@ha */ -/* 80CB87D4 38 03 8D 70 */ addi r0, r3, __vt__12J3DFrameCtrl@l /* 0x80CB8D70@l */ -/* 80CB87D8 90 1E 05 74 */ stw r0, 0x574(r30) -lbl_80CB87DC: -/* 80CB87DC 7F C3 F3 78 */ mr r3, r30 -/* 80CB87E0 38 80 00 00 */ li r4, 0 -/* 80CB87E4 4B 36 04 A9 */ bl __dt__10fopAc_ac_cFv -/* 80CB87E8 7F E0 07 35 */ extsh. r0, r31 -/* 80CB87EC 40 81 00 0C */ ble lbl_80CB87F8 -/* 80CB87F0 7F C3 F3 78 */ mr r3, r30 -/* 80CB87F4 4B 61 65 49 */ bl __dl__FPv -lbl_80CB87F8: -/* 80CB87F8 7F C3 F3 78 */ mr r3, r30 -/* 80CB87FC 83 E1 00 0C */ lwz r31, 0xc(r1) -/* 80CB8800 83 C1 00 08 */ lwz r30, 8(r1) -/* 80CB8804 80 01 00 14 */ lwz r0, 0x14(r1) -/* 80CB8808 7C 08 03 A6 */ mtlr r0 -/* 80CB880C 38 21 00 10 */ addi r1, r1, 0x10 -/* 80CB8810 4E 80 00 20 */ blr diff --git a/asm/rel/d/a/obj/d_a_obj_rcircle/d_a_obj_rcircle/createHeap__14daObjRCircle_cFv.s b/asm/rel/d/a/obj/d_a_obj_rcircle/d_a_obj_rcircle/createHeap__14daObjRCircle_cFv.s deleted file mode 100644 index 3d44299c4b..0000000000 --- a/asm/rel/d/a/obj/d_a_obj_rcircle/d_a_obj_rcircle/createHeap__14daObjRCircle_cFv.s +++ /dev/null @@ -1,72 +0,0 @@ -lbl_80CB8814: -/* 80CB8814 94 21 FF E0 */ stwu r1, -0x20(r1) -/* 80CB8818 7C 08 02 A6 */ mflr r0 -/* 80CB881C 90 01 00 24 */ stw r0, 0x24(r1) -/* 80CB8820 39 61 00 20 */ addi r11, r1, 0x20 -/* 80CB8824 4B 6A 99 B9 */ bl _savegpr_29 -/* 80CB8828 7C 7F 1B 78 */ mr r31, r3 -/* 80CB882C 3C 60 80 CC */ lis r3, l_arcName@ha /* 0x80CB8D10@ha */ -/* 80CB8830 38 63 8D 10 */ addi r3, r3, l_arcName@l /* 0x80CB8D10@l */ -/* 80CB8834 80 63 00 00 */ lwz r3, 0(r3) -/* 80CB8838 38 80 00 05 */ li r4, 5 -/* 80CB883C 3C A0 80 40 */ lis r5, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */ -/* 80CB8840 38 A5 61 C0 */ addi r5, r5, g_dComIfG_gameInfo@l /* 0x804061C0@l */ -/* 80CB8844 3F A5 00 02 */ addis r29, r5, 2 -/* 80CB8848 3B BD C2 F8 */ addi r29, r29, -15624 -/* 80CB884C 7F A5 EB 78 */ mr r5, r29 -/* 80CB8850 38 C0 00 80 */ li r6, 0x80 -/* 80CB8854 4B 38 3A 99 */ bl getRes__14dRes_control_cFPCclP11dRes_info_ci -/* 80CB8858 7C 7E 1B 78 */ mr r30, r3 -/* 80CB885C 3C 80 00 08 */ lis r4, 8 -/* 80CB8860 3C A0 11 00 */ lis r5, 0x1100 /* 0x11000284@ha */ -/* 80CB8864 38 A5 02 84 */ addi r5, r5, 0x0284 /* 0x11000284@l */ -/* 80CB8868 4B 35 C3 ED */ bl mDoExt_J3DModel__create__FP12J3DModelDataUlUl -/* 80CB886C 90 7F 05 A4 */ stw r3, 0x5a4(r31) -/* 80CB8870 80 1F 05 A4 */ lwz r0, 0x5a4(r31) -/* 80CB8874 28 00 00 00 */ cmplwi r0, 0 -/* 80CB8878 40 82 00 0C */ bne lbl_80CB8884 -/* 80CB887C 38 60 00 00 */ li r3, 0 -/* 80CB8880 48 00 00 90 */ b lbl_80CB8910 -lbl_80CB8884: -/* 80CB8884 3C 60 80 CC */ lis r3, l_arcName@ha /* 0x80CB8D10@ha */ -/* 80CB8888 38 63 8D 10 */ addi r3, r3, l_arcName@l /* 0x80CB8D10@l */ -/* 80CB888C 80 63 00 00 */ lwz r3, 0(r3) -/* 80CB8890 38 80 00 0B */ li r4, 0xb -/* 80CB8894 7F A5 EB 78 */ mr r5, r29 -/* 80CB8898 38 C0 00 80 */ li r6, 0x80 -/* 80CB889C 4B 38 3A 51 */ bl getRes__14dRes_control_cFPCclP11dRes_info_ci -/* 80CB88A0 7C 65 1B 78 */ mr r5, r3 -/* 80CB88A4 38 7F 05 8C */ addi r3, r31, 0x58c -/* 80CB88A8 38 9E 00 58 */ addi r4, r30, 0x58 -/* 80CB88AC 38 C0 00 01 */ li r6, 1 -/* 80CB88B0 38 E0 00 02 */ li r7, 2 -/* 80CB88B4 3D 00 80 CC */ lis r8, lit_3701@ha /* 0x80CB8D00@ha */ -/* 80CB88B8 C0 28 8D 00 */ lfs f1, lit_3701@l(r8) /* 0x80CB8D00@l */ -/* 80CB88BC 39 00 00 00 */ li r8, 0 -/* 80CB88C0 39 20 FF FF */ li r9, -1 -/* 80CB88C4 4B 35 4D 79 */ bl init__13mDoExt_btkAnmFP16J3DMaterialTableP19J3DAnmTextureSRTKeyiifss -/* 80CB88C8 3C 60 80 CC */ lis r3, l_arcName@ha /* 0x80CB8D10@ha */ -/* 80CB88CC 38 63 8D 10 */ addi r3, r3, l_arcName@l /* 0x80CB8D10@l */ -/* 80CB88D0 80 63 00 00 */ lwz r3, 0(r3) -/* 80CB88D4 38 80 00 08 */ li r4, 8 -/* 80CB88D8 7F A5 EB 78 */ mr r5, r29 -/* 80CB88DC 38 C0 00 80 */ li r6, 0x80 -/* 80CB88E0 4B 38 3A 0D */ bl getRes__14dRes_control_cFPCclP11dRes_info_ci -/* 80CB88E4 7C 65 1B 78 */ mr r5, r3 -/* 80CB88E8 38 7F 05 74 */ addi r3, r31, 0x574 -/* 80CB88EC 38 9E 00 58 */ addi r4, r30, 0x58 -/* 80CB88F0 38 C0 00 01 */ li r6, 1 -/* 80CB88F4 38 E0 00 00 */ li r7, 0 -/* 80CB88F8 3D 00 80 CC */ lis r8, lit_3702@ha /* 0x80CB8D04@ha */ -/* 80CB88FC C0 28 8D 04 */ lfs f1, lit_3702@l(r8) /* 0x80CB8D04@l */ -/* 80CB8900 39 00 00 00 */ li r8, 0 -/* 80CB8904 39 20 FF FF */ li r9, -1 -/* 80CB8908 4B 35 4E 05 */ bl init__13mDoExt_brkAnmFP16J3DMaterialTableP15J3DAnmTevRegKeyiifss -/* 80CB890C 38 60 00 01 */ li r3, 1 -lbl_80CB8910: -/* 80CB8910 39 61 00 20 */ addi r11, r1, 0x20 -/* 80CB8914 4B 6A 99 15 */ bl _restgpr_29 -/* 80CB8918 80 01 00 24 */ lwz r0, 0x24(r1) -/* 80CB891C 7C 08 03 A6 */ mtlr r0 -/* 80CB8920 38 21 00 20 */ addi r1, r1, 0x20 -/* 80CB8924 4E 80 00 20 */ blr diff --git a/asm/rel/d/a/obj/d_a_obj_rcircle/d_a_obj_rcircle/create__14daObjRCircle_cFv.s b/asm/rel/d/a/obj/d_a_obj_rcircle/d_a_obj_rcircle/create__14daObjRCircle_cFv.s deleted file mode 100644 index 31cde6993b..0000000000 --- a/asm/rel/d/a/obj/d_a_obj_rcircle/d_a_obj_rcircle/create__14daObjRCircle_cFv.s +++ /dev/null @@ -1,72 +0,0 @@ -lbl_80CB8928: -/* 80CB8928 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 80CB892C 7C 08 02 A6 */ mflr r0 -/* 80CB8930 90 01 00 14 */ stw r0, 0x14(r1) -/* 80CB8934 93 E1 00 0C */ stw r31, 0xc(r1) -/* 80CB8938 93 C1 00 08 */ stw r30, 8(r1) -/* 80CB893C 7C 7F 1B 78 */ mr r31, r3 -/* 80CB8940 80 03 04 A0 */ lwz r0, 0x4a0(r3) -/* 80CB8944 54 00 07 39 */ rlwinm. r0, r0, 0, 0x1c, 0x1c -/* 80CB8948 40 82 00 1C */ bne lbl_80CB8964 -/* 80CB894C 28 1F 00 00 */ cmplwi r31, 0 -/* 80CB8950 41 82 00 08 */ beq lbl_80CB8958 -/* 80CB8954 4B FF FD 25 */ bl __ct__14daObjRCircle_cFv -lbl_80CB8958: -/* 80CB8958 80 1F 04 A0 */ lwz r0, 0x4a0(r31) -/* 80CB895C 60 00 00 08 */ ori r0, r0, 8 -/* 80CB8960 90 1F 04 A0 */ stw r0, 0x4a0(r31) -lbl_80CB8964: -/* 80CB8964 80 1F 00 B0 */ lwz r0, 0xb0(r31) -/* 80CB8968 54 04 06 3E */ clrlwi r4, r0, 0x18 -/* 80CB896C 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */ -/* 80CB8970 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 0x804061C0@l */ -/* 80CB8974 88 1F 04 BA */ lbz r0, 0x4ba(r31) -/* 80CB8978 7C 05 07 74 */ extsb r5, r0 -/* 80CB897C 4B 37 C9 E5 */ bl isSwitch__10dSv_info_cCFii -/* 80CB8980 2C 03 00 00 */ cmpwi r3, 0 -/* 80CB8984 41 82 00 0C */ beq lbl_80CB8990 -/* 80CB8988 38 60 00 05 */ li r3, 5 -/* 80CB898C 48 00 00 84 */ b lbl_80CB8A10 -lbl_80CB8990: -/* 80CB8990 7F E3 FB 78 */ mr r3, r31 -/* 80CB8994 28 1F 00 00 */ cmplwi r31, 0 -/* 80CB8998 41 82 00 08 */ beq lbl_80CB89A0 -/* 80CB899C 38 7F 05 68 */ addi r3, r31, 0x568 -lbl_80CB89A0: -/* 80CB89A0 3C 80 80 CC */ lis r4, l_arcName@ha /* 0x80CB8D10@ha */ -/* 80CB89A4 38 84 8D 10 */ addi r4, r4, l_arcName@l /* 0x80CB8D10@l */ -/* 80CB89A8 80 84 00 00 */ lwz r4, 0(r4) -/* 80CB89AC 4B 37 45 11 */ bl dComIfG_resLoad__FP30request_of_phase_process_classPCc -/* 80CB89B0 7C 7E 1B 78 */ mr r30, r3 -/* 80CB89B4 2C 1E 00 04 */ cmpwi r30, 4 -/* 80CB89B8 40 82 00 54 */ bne lbl_80CB8A0C -/* 80CB89BC 7F E3 FB 78 */ mr r3, r31 -/* 80CB89C0 3C 80 80 CC */ lis r4, daObjRCircle_c_createHeap__FP10fopAc_ac_c@ha /* 0x80CB8658@ha */ -/* 80CB89C4 38 84 86 58 */ addi r4, r4, daObjRCircle_c_createHeap__FP10fopAc_ac_c@l /* 0x80CB8658@l */ -/* 80CB89C8 38 A0 10 00 */ li r5, 0x1000 -/* 80CB89CC 4B 36 1A E5 */ bl fopAcM_entrySolidHeap__FP10fopAc_ac_cPFP10fopAc_ac_c_iUl -/* 80CB89D0 54 60 06 3F */ clrlwi. r0, r3, 0x18 -/* 80CB89D4 40 82 00 0C */ bne lbl_80CB89E0 -/* 80CB89D8 38 60 00 05 */ li r3, 5 -/* 80CB89DC 48 00 00 34 */ b lbl_80CB8A10 -lbl_80CB89E0: -/* 80CB89E0 7F E3 FB 78 */ mr r3, r31 -/* 80CB89E4 48 00 02 01 */ bl init__14daObjRCircle_cFv -/* 80CB89E8 7F E3 FB 78 */ mr r3, r31 -/* 80CB89EC 48 00 02 05 */ bl setModelMtx__14daObjRCircle_cFv -/* 80CB89F0 80 7F 05 A4 */ lwz r3, 0x5a4(r31) -/* 80CB89F4 38 03 00 24 */ addi r0, r3, 0x24 -/* 80CB89F8 90 1F 05 04 */ stw r0, 0x504(r31) -/* 80CB89FC 80 7F 05 A4 */ lwz r3, 0x5a4(r31) -/* 80CB8A00 80 83 00 04 */ lwz r4, 4(r3) -/* 80CB8A04 7F E3 FB 78 */ mr r3, r31 -/* 80CB8A08 4B 36 1B 71 */ bl fopAcM_setCullSizeBox2__FP10fopAc_ac_cP12J3DModelData -lbl_80CB8A0C: -/* 80CB8A0C 7F C3 F3 78 */ mr r3, r30 -lbl_80CB8A10: -/* 80CB8A10 83 E1 00 0C */ lwz r31, 0xc(r1) -/* 80CB8A14 83 C1 00 08 */ lwz r30, 8(r1) -/* 80CB8A18 80 01 00 14 */ lwz r0, 0x14(r1) -/* 80CB8A1C 7C 08 03 A6 */ mtlr r0 -/* 80CB8A20 38 21 00 10 */ addi r1, r1, 0x10 -/* 80CB8A24 4E 80 00 20 */ blr diff --git a/asm/rel/d/a/obj/d_a_obj_rcircle/d_a_obj_rcircle/daObjRCircle_Delete__FP14daObjRCircle_c.s b/asm/rel/d/a/obj/d_a_obj_rcircle/d_a_obj_rcircle/daObjRCircle_Delete__FP14daObjRCircle_c.s deleted file mode 100644 index f622807c47..0000000000 --- a/asm/rel/d/a/obj/d_a_obj_rcircle/d_a_obj_rcircle/daObjRCircle_Delete__FP14daObjRCircle_c.s +++ /dev/null @@ -1,9 +0,0 @@ -lbl_80CB8C98: -/* 80CB8C98 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 80CB8C9C 7C 08 02 A6 */ mflr r0 -/* 80CB8CA0 90 01 00 14 */ stw r0, 0x14(r1) -/* 80CB8CA4 4B FF FD 85 */ bl Delete__14daObjRCircle_cFv -/* 80CB8CA8 80 01 00 14 */ lwz r0, 0x14(r1) -/* 80CB8CAC 7C 08 03 A6 */ mtlr r0 -/* 80CB8CB0 38 21 00 10 */ addi r1, r1, 0x10 -/* 80CB8CB4 4E 80 00 20 */ blr diff --git a/asm/rel/d/a/obj/d_a_obj_rcircle/d_a_obj_rcircle/daObjRCircle_c_createHeap__FP10fopAc_ac_c.s b/asm/rel/d/a/obj/d_a_obj_rcircle/d_a_obj_rcircle/daObjRCircle_c_createHeap__FP10fopAc_ac_c.s deleted file mode 100644 index dce6f3f6c4..0000000000 --- a/asm/rel/d/a/obj/d_a_obj_rcircle/d_a_obj_rcircle/daObjRCircle_c_createHeap__FP10fopAc_ac_c.s +++ /dev/null @@ -1,9 +0,0 @@ -lbl_80CB8658: -/* 80CB8658 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 80CB865C 7C 08 02 A6 */ mflr r0 -/* 80CB8660 90 01 00 14 */ stw r0, 0x14(r1) -/* 80CB8664 48 00 01 B1 */ bl createHeap__14daObjRCircle_cFv -/* 80CB8668 80 01 00 14 */ lwz r0, 0x14(r1) -/* 80CB866C 7C 08 03 A6 */ mtlr r0 -/* 80CB8670 38 21 00 10 */ addi r1, r1, 0x10 -/* 80CB8674 4E 80 00 20 */ blr diff --git a/asm/rel/d/a/obj/d_a_obj_rcircle/d_a_obj_rcircle/daObjRCircle_create__FP14daObjRCircle_c.s b/asm/rel/d/a/obj/d_a_obj_rcircle/d_a_obj_rcircle/daObjRCircle_create__FP14daObjRCircle_c.s deleted file mode 100644 index 5d5fa31f9a..0000000000 --- a/asm/rel/d/a/obj/d_a_obj_rcircle/d_a_obj_rcircle/daObjRCircle_create__FP14daObjRCircle_c.s +++ /dev/null @@ -1,24 +0,0 @@ -lbl_80CB8C44: -/* 80CB8C44 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 80CB8C48 7C 08 02 A6 */ mflr r0 -/* 80CB8C4C 90 01 00 14 */ stw r0, 0x14(r1) -/* 80CB8C50 93 E1 00 0C */ stw r31, 0xc(r1) -/* 80CB8C54 7C 7F 1B 78 */ mr r31, r3 -/* 80CB8C58 80 03 04 A0 */ lwz r0, 0x4a0(r3) -/* 80CB8C5C 54 00 07 39 */ rlwinm. r0, r0, 0, 0x1c, 0x1c -/* 80CB8C60 40 82 00 1C */ bne lbl_80CB8C7C -/* 80CB8C64 28 1F 00 00 */ cmplwi r31, 0 -/* 80CB8C68 41 82 00 08 */ beq lbl_80CB8C70 -/* 80CB8C6C 4B FF FA 0D */ bl __ct__14daObjRCircle_cFv -lbl_80CB8C70: -/* 80CB8C70 80 1F 04 A0 */ lwz r0, 0x4a0(r31) -/* 80CB8C74 60 00 00 08 */ ori r0, r0, 8 -/* 80CB8C78 90 1F 04 A0 */ stw r0, 0x4a0(r31) -lbl_80CB8C7C: -/* 80CB8C7C 7F E3 FB 78 */ mr r3, r31 -/* 80CB8C80 4B FF FC A9 */ bl create__14daObjRCircle_cFv -/* 80CB8C84 83 E1 00 0C */ lwz r31, 0xc(r1) -/* 80CB8C88 80 01 00 14 */ lwz r0, 0x14(r1) -/* 80CB8C8C 7C 08 03 A6 */ mtlr r0 -/* 80CB8C90 38 21 00 10 */ addi r1, r1, 0x10 -/* 80CB8C94 4E 80 00 20 */ blr diff --git a/asm/rel/d/a/obj/d_a_obj_rcircle/d_a_obj_rcircle/daObjRCircle_draw__FP14daObjRCircle_c.s b/asm/rel/d/a/obj/d_a_obj_rcircle/d_a_obj_rcircle/daObjRCircle_draw__FP14daObjRCircle_c.s deleted file mode 100644 index 949da4bef4..0000000000 --- a/asm/rel/d/a/obj/d_a_obj_rcircle/d_a_obj_rcircle/daObjRCircle_draw__FP14daObjRCircle_c.s +++ /dev/null @@ -1,9 +0,0 @@ -lbl_80CB8CD8: -/* 80CB8CD8 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 80CB8CDC 7C 08 02 A6 */ mflr r0 -/* 80CB8CE0 90 01 00 14 */ stw r0, 0x14(r1) -/* 80CB8CE4 4B FF FD 79 */ bl draw__14daObjRCircle_cFv -/* 80CB8CE8 80 01 00 14 */ lwz r0, 0x14(r1) -/* 80CB8CEC 7C 08 03 A6 */ mtlr r0 -/* 80CB8CF0 38 21 00 10 */ addi r1, r1, 0x10 -/* 80CB8CF4 4E 80 00 20 */ blr diff --git a/asm/rel/d/a/obj/d_a_obj_rcircle/d_a_obj_rcircle/daObjRCircle_execute__FP14daObjRCircle_c.s b/asm/rel/d/a/obj/d_a_obj_rcircle/d_a_obj_rcircle/daObjRCircle_execute__FP14daObjRCircle_c.s deleted file mode 100644 index 90cbea4f93..0000000000 --- a/asm/rel/d/a/obj/d_a_obj_rcircle/d_a_obj_rcircle/daObjRCircle_execute__FP14daObjRCircle_c.s +++ /dev/null @@ -1,9 +0,0 @@ -lbl_80CB8CB8: -/* 80CB8CB8 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 80CB8CBC 7C 08 02 A6 */ mflr r0 -/* 80CB8CC0 90 01 00 14 */ stw r0, 0x14(r1) -/* 80CB8CC4 4B FF FE 65 */ bl execute__14daObjRCircle_cFv -/* 80CB8CC8 80 01 00 14 */ lwz r0, 0x14(r1) -/* 80CB8CCC 7C 08 03 A6 */ mtlr r0 -/* 80CB8CD0 38 21 00 10 */ addi r1, r1, 0x10 -/* 80CB8CD4 4E 80 00 20 */ blr diff --git a/asm/rel/d/a/obj/d_a_obj_rcircle/d_a_obj_rcircle/draw__14daObjRCircle_cFv.s b/asm/rel/d/a/obj/d_a_obj_rcircle/d_a_obj_rcircle/draw__14daObjRCircle_cFv.s deleted file mode 100644 index aebaef1b5d..0000000000 --- a/asm/rel/d/a/obj/d_a_obj_rcircle/d_a_obj_rcircle/draw__14daObjRCircle_cFv.s +++ /dev/null @@ -1,52 +0,0 @@ -lbl_80CB8A5C: -/* 80CB8A5C 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 80CB8A60 7C 08 02 A6 */ mflr r0 -/* 80CB8A64 90 01 00 14 */ stw r0, 0x14(r1) -/* 80CB8A68 93 E1 00 0C */ stw r31, 0xc(r1) -/* 80CB8A6C 93 C1 00 08 */ stw r30, 8(r1) -/* 80CB8A70 7C 7E 1B 78 */ mr r30, r3 -/* 80CB8A74 3C 60 80 43 */ lis r3, g_env_light@ha /* 0x8042CA54@ha */ -/* 80CB8A78 38 63 CA 54 */ addi r3, r3, g_env_light@l /* 0x8042CA54@l */ -/* 80CB8A7C 38 80 00 10 */ li r4, 0x10 -/* 80CB8A80 38 BE 04 D0 */ addi r5, r30, 0x4d0 -/* 80CB8A84 38 DE 01 0C */ addi r6, r30, 0x10c -/* 80CB8A88 4B 4E AD 3D */ bl settingTevStruct__18dScnKy_env_light_cFiP4cXyzP12dKy_tevstr_c -/* 80CB8A8C 3C 60 80 43 */ lis r3, g_env_light@ha /* 0x8042CA54@ha */ -/* 80CB8A90 38 63 CA 54 */ addi r3, r3, g_env_light@l /* 0x8042CA54@l */ -/* 80CB8A94 80 9E 05 A4 */ lwz r4, 0x5a4(r30) -/* 80CB8A98 80 84 00 04 */ lwz r4, 4(r4) -/* 80CB8A9C 38 BE 01 0C */ addi r5, r30, 0x10c -/* 80CB8AA0 4B 4E C3 01 */ bl setLightTevColorType_MAJI__18dScnKy_env_light_cFP12J3DModelDataP12dKy_tevstr_c -/* 80CB8AA4 80 7E 05 A4 */ lwz r3, 0x5a4(r30) -/* 80CB8AA8 83 E3 00 04 */ lwz r31, 4(r3) -/* 80CB8AAC C0 3E 05 9C */ lfs f1, 0x59c(r30) -/* 80CB8AB0 38 7E 05 8C */ addi r3, r30, 0x58c -/* 80CB8AB4 38 9F 00 58 */ addi r4, r31, 0x58 -/* 80CB8AB8 4B 35 4C 21 */ bl entry__13mDoExt_btkAnmFP16J3DMaterialTablef -/* 80CB8ABC C0 3E 05 84 */ lfs f1, 0x584(r30) -/* 80CB8AC0 38 7E 05 74 */ addi r3, r30, 0x574 -/* 80CB8AC4 38 9F 00 58 */ addi r4, r31, 0x58 -/* 80CB8AC8 4B 35 4C E1 */ bl entry__13mDoExt_brkAnmFP16J3DMaterialTablef -/* 80CB8ACC 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */ -/* 80CB8AD0 38 83 61 C0 */ addi r4, r3, g_dComIfG_gameInfo@l /* 0x804061C0@l */ -/* 80CB8AD4 80 04 5F 70 */ lwz r0, 0x5f70(r4) -/* 80CB8AD8 3C 60 80 43 */ lis r3, j3dSys@ha /* 0x80434AC8@ha */ -/* 80CB8ADC 3B E3 4A C8 */ addi r31, r3, j3dSys@l /* 0x80434AC8@l */ -/* 80CB8AE0 90 1F 00 48 */ stw r0, 0x48(r31) -/* 80CB8AE4 80 04 5F 74 */ lwz r0, 0x5f74(r4) -/* 80CB8AE8 90 1F 00 4C */ stw r0, 0x4c(r31) -/* 80CB8AEC 80 7E 05 A4 */ lwz r3, 0x5a4(r30) -/* 80CB8AF0 4B 35 51 D5 */ bl mDoExt_modelUpdateDL__FP8J3DModel -/* 80CB8AF4 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */ -/* 80CB8AF8 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 0x804061C0@l */ -/* 80CB8AFC 80 03 5F 80 */ lwz r0, 0x5f80(r3) -/* 80CB8B00 90 1F 00 48 */ stw r0, 0x48(r31) -/* 80CB8B04 80 03 5F 84 */ lwz r0, 0x5f84(r3) -/* 80CB8B08 90 1F 00 4C */ stw r0, 0x4c(r31) -/* 80CB8B0C 38 60 00 01 */ li r3, 1 -/* 80CB8B10 83 E1 00 0C */ lwz r31, 0xc(r1) -/* 80CB8B14 83 C1 00 08 */ lwz r30, 8(r1) -/* 80CB8B18 80 01 00 14 */ lwz r0, 0x14(r1) -/* 80CB8B1C 7C 08 03 A6 */ mtlr r0 -/* 80CB8B20 38 21 00 10 */ addi r1, r1, 0x10 -/* 80CB8B24 4E 80 00 20 */ blr diff --git a/asm/rel/d/a/obj/d_a_obj_rcircle/d_a_obj_rcircle/execute__14daObjRCircle_cFv.s b/asm/rel/d/a/obj/d_a_obj_rcircle/d_a_obj_rcircle/execute__14daObjRCircle_cFv.s deleted file mode 100644 index 94907a0e68..0000000000 --- a/asm/rel/d/a/obj/d_a_obj_rcircle/d_a_obj_rcircle/execute__14daObjRCircle_cFv.s +++ /dev/null @@ -1,51 +0,0 @@ -lbl_80CB8B28: -/* 80CB8B28 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 80CB8B2C 7C 08 02 A6 */ mflr r0 -/* 80CB8B30 90 01 00 14 */ stw r0, 0x14(r1) -/* 80CB8B34 93 E1 00 0C */ stw r31, 0xc(r1) -/* 80CB8B38 7C 7F 1B 78 */ mr r31, r3 -/* 80CB8B3C 88 03 05 A8 */ lbz r0, 0x5a8(r3) -/* 80CB8B40 28 00 00 00 */ cmplwi r0, 0 -/* 80CB8B44 41 82 00 40 */ beq lbl_80CB8B84 -/* 80CB8B48 38 80 00 01 */ li r4, 1 -/* 80CB8B4C 88 1F 05 79 */ lbz r0, 0x579(r31) -/* 80CB8B50 54 00 07 FF */ clrlwi. r0, r0, 0x1f -/* 80CB8B54 40 82 00 1C */ bne lbl_80CB8B70 -/* 80CB8B58 3C 60 80 CC */ lis r3, lit_3702@ha /* 0x80CB8D04@ha */ -/* 80CB8B5C C0 23 8D 04 */ lfs f1, lit_3702@l(r3) /* 0x80CB8D04@l */ -/* 80CB8B60 C0 1F 05 80 */ lfs f0, 0x580(r31) -/* 80CB8B64 FC 01 00 00 */ fcmpu cr0, f1, f0 -/* 80CB8B68 41 82 00 08 */ beq lbl_80CB8B70 -/* 80CB8B6C 38 80 00 00 */ li r4, 0 -lbl_80CB8B70: -/* 80CB8B70 54 80 06 3F */ clrlwi. r0, r4, 0x18 -/* 80CB8B74 41 82 00 48 */ beq lbl_80CB8BBC -/* 80CB8B78 7F E3 FB 78 */ mr r3, r31 -/* 80CB8B7C 4B 36 11 01 */ bl fopAcM_delete__FP10fopAc_ac_c -/* 80CB8B80 48 00 00 3C */ b lbl_80CB8BBC -lbl_80CB8B84: -/* 80CB8B84 80 1F 00 B0 */ lwz r0, 0xb0(r31) -/* 80CB8B88 54 04 06 3E */ clrlwi r4, r0, 0x18 -/* 80CB8B8C 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */ -/* 80CB8B90 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 0x804061C0@l */ -/* 80CB8B94 88 1F 04 BA */ lbz r0, 0x4ba(r31) -/* 80CB8B98 7C 05 07 74 */ extsb r5, r0 -/* 80CB8B9C 4B 37 C7 C5 */ bl isSwitch__10dSv_info_cCFii -/* 80CB8BA0 2C 03 00 00 */ cmpwi r3, 0 -/* 80CB8BA4 41 82 00 18 */ beq lbl_80CB8BBC -/* 80CB8BA8 38 00 00 01 */ li r0, 1 -/* 80CB8BAC 98 1F 05 A8 */ stb r0, 0x5a8(r31) -/* 80CB8BB0 3C 60 80 CC */ lis r3, lit_3701@ha /* 0x80CB8D00@ha */ -/* 80CB8BB4 C0 03 8D 00 */ lfs f0, lit_3701@l(r3) /* 0x80CB8D00@l */ -/* 80CB8BB8 D0 1F 05 80 */ stfs f0, 0x580(r31) -lbl_80CB8BBC: -/* 80CB8BBC 38 7F 05 8C */ addi r3, r31, 0x58c -/* 80CB8BC0 4B 35 48 69 */ bl play__14mDoExt_baseAnmFv -/* 80CB8BC4 38 7F 05 74 */ addi r3, r31, 0x574 -/* 80CB8BC8 4B 35 48 61 */ bl play__14mDoExt_baseAnmFv -/* 80CB8BCC 38 60 00 01 */ li r3, 1 -/* 80CB8BD0 83 E1 00 0C */ lwz r31, 0xc(r1) -/* 80CB8BD4 80 01 00 14 */ lwz r0, 0x14(r1) -/* 80CB8BD8 7C 08 03 A6 */ mtlr r0 -/* 80CB8BDC 38 21 00 10 */ addi r1, r1, 0x10 -/* 80CB8BE0 4E 80 00 20 */ blr diff --git a/asm/rel/d/a/obj/d_a_obj_rcircle/d_a_obj_rcircle/init__14daObjRCircle_cFv.s b/asm/rel/d/a/obj/d_a_obj_rcircle/d_a_obj_rcircle/init__14daObjRCircle_cFv.s deleted file mode 100644 index 3f33257f28..0000000000 --- a/asm/rel/d/a/obj/d_a_obj_rcircle/d_a_obj_rcircle/init__14daObjRCircle_cFv.s +++ /dev/null @@ -1,4 +0,0 @@ -lbl_80CB8BE4: -/* 80CB8BE4 38 00 00 00 */ li r0, 0 -/* 80CB8BE8 98 03 05 A8 */ stb r0, 0x5a8(r3) -/* 80CB8BEC 4E 80 00 20 */ blr diff --git a/asm/rel/d/a/obj/d_a_obj_rcircle/d_a_obj_rcircle/setModelMtx__14daObjRCircle_cFv.s b/asm/rel/d/a/obj/d_a_obj_rcircle/d_a_obj_rcircle/setModelMtx__14daObjRCircle_cFv.s deleted file mode 100644 index db74862c03..0000000000 --- a/asm/rel/d/a/obj/d_a_obj_rcircle/d_a_obj_rcircle/setModelMtx__14daObjRCircle_cFv.s +++ /dev/null @@ -1,22 +0,0 @@ -lbl_80CB8BF0: -/* 80CB8BF0 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 80CB8BF4 7C 08 02 A6 */ mflr r0 -/* 80CB8BF8 90 01 00 14 */ stw r0, 0x14(r1) -/* 80CB8BFC 93 E1 00 0C */ stw r31, 0xc(r1) -/* 80CB8C00 7C 7F 1B 78 */ mr r31, r3 -/* 80CB8C04 3C 60 80 3E */ lis r3, now__14mDoMtx_stack_c@ha /* 0x803DD470@ha */ -/* 80CB8C08 38 63 D4 70 */ addi r3, r3, now__14mDoMtx_stack_c@l /* 0x803DD470@l */ -/* 80CB8C0C C0 3F 04 D0 */ lfs f1, 0x4d0(r31) -/* 80CB8C10 C0 5F 04 D4 */ lfs f2, 0x4d4(r31) -/* 80CB8C14 C0 7F 04 D8 */ lfs f3, 0x4d8(r31) -/* 80CB8C18 4B 68 DC D1 */ bl PSMTXTrans -/* 80CB8C1C 3C 60 80 3E */ lis r3, now__14mDoMtx_stack_c@ha /* 0x803DD470@ha */ -/* 80CB8C20 38 63 D4 70 */ addi r3, r3, now__14mDoMtx_stack_c@l /* 0x803DD470@l */ -/* 80CB8C24 80 9F 05 A4 */ lwz r4, 0x5a4(r31) -/* 80CB8C28 38 84 00 24 */ addi r4, r4, 0x24 -/* 80CB8C2C 4B 68 D8 85 */ bl PSMTXCopy -/* 80CB8C30 83 E1 00 0C */ lwz r31, 0xc(r1) -/* 80CB8C34 80 01 00 14 */ lwz r0, 0x14(r1) -/* 80CB8C38 7C 08 03 A6 */ mtlr r0 -/* 80CB8C3C 38 21 00 10 */ addi r1, r1, 0x10 -/* 80CB8C40 4E 80 00 20 */ blr diff --git a/include/d/com/d_com_inf_game.h b/include/d/com/d_com_inf_game.h index eb21ea5267..08c464b260 100644 --- a/include/d/com/d_com_inf_game.h +++ b/include/d/com/d_com_inf_game.h @@ -3372,6 +3372,11 @@ inline void dComIfGd_setListDark() { g_dComIfG_gameInfo.drawlist.setXluListDark(); } +inline void dComIfGd_setListInvisible() { + g_dComIfG_gameInfo.drawlist.setOpaListInvisible(); + g_dComIfG_gameInfo.drawlist.setXluListInvisible(); +} + inline void dComIfGd_setListDarkBG() { g_dComIfG_gameInfo.drawlist.setOpaListDarkBG(); g_dComIfG_gameInfo.drawlist.setXluListDarkBG(); diff --git a/include/d/d_drawlist.h b/include/d/d_drawlist.h index 5a67a9181c..3f4ddfe924 100644 --- a/include/d/d_drawlist.h +++ b/include/d/d_drawlist.h @@ -315,6 +315,8 @@ public: void setOpaListSky() { setOpaDrawList(mDrawBuffers[DB_OPA_LIST_SKY]); } void setXluListDark() { setXluDrawList(mDrawBuffers[DB_XLU_LIST_DARK]); } void setOpaListDark() { setOpaDrawList(mDrawBuffers[DB_OPA_LIST_DARK]); } + void setOpaListInvisible() { setOpaDrawList(mDrawBuffers[DB_OPA_LIST_INVISIBLE]); } + void setXluListInvisible() { setXluDrawList(mDrawBuffers[DB_XLU_LIST_INVISIBLE]); } void setXluListDarkBG() { setXluDrawList(mDrawBuffers[DB_XLU_LIST_DARK_BG]); } void setOpaListDarkBG() { setOpaDrawList(mDrawBuffers[DB_OPA_LIST_DARK_BG]); } void setOpaList() { setOpaDrawList(mDrawBuffers[DB_OPA_LIST]); } diff --git a/include/d/pane/d_pane_class.h b/include/d/pane/d_pane_class.h index 1a6f716e9e..3edc2f78cc 100644 --- a/include/d/pane/d_pane_class.h +++ b/include/d/pane/d_pane_class.h @@ -64,6 +64,9 @@ public: JUtility::TColor getInitBlack() { return mInitBlack; } JUtility::TColor getInitWhite() { return mInitWhite; } + f32 getInitGlobalPosX() { return mGlobalPos.x; } + f32 getInitGlobalPosY() { return mGlobalPos.y; } + private: /* 0x1C */ void* mpFirstStackSize; /* 0x20 */ s16* field_0x20; diff --git a/include/msg/scrn/d_msg_scrn_place.h b/include/msg/scrn/d_msg_scrn_place.h index 7b44e3622e..4d454b6a6f 100644 --- a/include/msg/scrn/d_msg_scrn_place.h +++ b/include/msg/scrn/d_msg_scrn_place.h @@ -1,6 +1,24 @@ #ifndef MSG_SCRN_D_MSG_SCRN_PLACE_H #define MSG_SCRN_D_MSG_SCRN_PLACE_H -#include "dolphin/types.h" +#include "msg/scrn/d_msg_scrn_base.h" + +class dMsgScrnPlace_c : public dMsgScrnBase_c { +public: + /* 802463CC */ dMsgScrnPlace_c(); + + /* 802467C4 */ virtual ~dMsgScrnPlace_c(); + /* 80246924 */ virtual void exec(); + /* 80246A44 */ virtual void drawSelf(); + /* 80246A9C */ virtual void fukiAlpha(f32); + /* 80246B28 */ virtual void fukiScale(f32); + /* 80246B2C */ virtual void fukiTrans(f32, f32); + /* 80246B30 */ virtual void fontAlpha(f32); + + /* 0xC4 */ CPaneMgr* mpBaseParent; + /* 0xC8 */ CPaneMgr* mpFontParent; + /* 0xCC */ f32 mScaleX; + /* 0xD0 */ f32 mScaleY; +}; #endif /* MSG_SCRN_D_MSG_SCRN_PLACE_H */ diff --git a/include/msg/scrn/d_msg_scrn_staff.h b/include/msg/scrn/d_msg_scrn_staff.h index 10ab0529aa..9ab344106a 100644 --- a/include/msg/scrn/d_msg_scrn_staff.h +++ b/include/msg/scrn/d_msg_scrn_staff.h @@ -1,6 +1,23 @@ #ifndef MSG_SCRN_D_MSG_SCRN_STAFF_H #define MSG_SCRN_D_MSG_SCRN_STAFF_H -#include "dolphin/types.h" +#include "msg/scrn/d_msg_scrn_base.h" + +class dMsgScrnStaff_c : public dMsgScrnBase_c { +public: + /* 80246B34 */ dMsgScrnStaff_c(u8); + + /* 80246DD8 */ virtual ~dMsgScrnStaff_c(); + /* 80246EE8 */ virtual void exec(); + /* 80246F68 */ virtual void drawSelf(); + /* 80246FC0 */ virtual void fukiAlpha(f32); + /* 80246FE4 */ virtual void fukiScale(f32); + /* 80246FE8 */ virtual void fukiTrans(f32, f32); + /* 80246FEC */ virtual void fontAlpha(f32); + + /* 0XC4 */ u8 field_0xc4[0xD0 - 0xC8]; + /* 0xCC */ f32 field_0xcc; + /* 0xD0 */ f32 field_0xd0; +}; #endif /* MSG_SCRN_D_MSG_SCRN_STAFF_H */ diff --git a/include/rel/d/a/obj/d_a_obj_hsTarget/d_a_obj_hsTarget.h b/include/rel/d/a/obj/d_a_obj_hsTarget/d_a_obj_hsTarget.h index c7483aad38..3fcb200228 100644 --- a/include/rel/d/a/obj/d_a_obj_hsTarget/d_a_obj_hsTarget.h +++ b/include/rel/d/a/obj/d_a_obj_hsTarget/d_a_obj_hsTarget.h @@ -1,6 +1,29 @@ #ifndef D_A_OBJ_HSTARGET_H #define D_A_OBJ_HSTARGET_H -#include "dolphin/types.h" +#include "d/bg/d_bg_s_movebg_actor.h" +#include "f_op/f_op_actor_mng.h" +#include "m_Do/m_Do_hostIO.h" +class daHsTarget_c : public dBgS_MoveBgActor { +public: + /* 80C1F490 */ void setBaseMtx(); + /* 80C1F518 */ int CreateHeap(); + /* 80C1F598 */ int create(); + /* 80C1F6B0 */ int Execute(f32 (**)[3][4]); + /* 80C1F6C4 */ int Draw(); + /* 80C1F728 */ int Delete(); + + u8 getModelType() { return fopAcM_GetParamBit(this, 0, 4); } + + /* 0x5A0 */ request_of_phase_process_class mPhaseReq; + /* 0x5A8 */ J3DModel* mpModel; + /* 0x5AC */ u8 mIndex; +}; // Size: 0x5B0 + +class daHsTarget_HIO_c : mDoHIO_entry_c { +public: + /* 80C1F42C */ daHsTarget_HIO_c(); + /* 80C1F7F4 */ virtual ~daHsTarget_HIO_c() {} +}; #endif /* D_A_OBJ_HSTARGET_H */ diff --git a/include/rel/d/a/obj/d_a_obj_onsen/d_a_obj_onsen.h b/include/rel/d/a/obj/d_a_obj_onsen/d_a_obj_onsen.h index 1ae9a205fb..c0323f8c7b 100644 --- a/include/rel/d/a/obj/d_a_obj_onsen/d_a_obj_onsen.h +++ b/include/rel/d/a/obj/d_a_obj_onsen/d_a_obj_onsen.h @@ -1,6 +1,27 @@ #ifndef D_A_OBJ_ONSEN_H #define D_A_OBJ_ONSEN_H -#include "dolphin/types.h" +#include "d/bg/d_bg_s_movebg_actor.h" +#include "d/com/d_com_inf_game.h" +#include "f_op/f_op_actor_mng.h" + +class daObjOnsen_c : public dBgS_MoveBgActor { +public: + /* 80CA7B58 */ void initBaseMtx(); + /* 80CA7BB0 */ void setBaseMtx(); + /* 80CA7C28 */ int Create(); + /* 80CA7C74 */ int CreateHeap(); + /* 80CA7E44 */ int create1st(); + /* 80CA7EEC */ int Execute(Mtx**); + /* 80CA7F1C */ int Draw(); + /* 80CA8008 */ int Delete(); + + u32 getType() { return fopAcM_GetParamBit(this, 0, 8); } + + /* 0x5A0 */ request_of_phase_process_class mPhaseReq; + /* 0x5A8 */ J3DModel* mpModel[2]; + /* 0x5B0 */ mDoExt_btkAnm* mpBtk; + /* 0x5B4 */ u8 mType; +}; // Size: 0x5B8 #endif /* D_A_OBJ_ONSEN_H */ diff --git a/include/rel/d/a/obj/d_a_obj_rcircle/d_a_obj_rcircle.h b/include/rel/d/a/obj/d_a_obj_rcircle/d_a_obj_rcircle.h index 1bd52172db..38e497c98a 100644 --- a/include/rel/d/a/obj/d_a_obj_rcircle/d_a_obj_rcircle.h +++ b/include/rel/d/a/obj/d_a_obj_rcircle/d_a_obj_rcircle.h @@ -1,6 +1,31 @@ #ifndef D_A_OBJ_RCIRCLE_H #define D_A_OBJ_RCIRCLE_H -#include "dolphin/types.h" +#include "f_op/f_op_actor_mng.h" +#include "d/com/d_com_inf_game.h" + +class daObjRCircle_c : public fopAc_ac_c { +public: + /* 80CB8678 */ daObjRCircle_c(); + + /* 80CB8814 */ int createHeap(); + /* 80CB8928 */ int create(); + /* 80CB8A28 */ int Delete(); + /* 80CB8A5C */ int draw(); + /* 80CB8B28 */ int execute(); + /* 80CB8BE4 */ void init(); + /* 80CB8BF0 */ void setModelMtx(); + + int getSwBit() { return fopAcM_GetParamBit(this, 0, 8) & 0xFF; } + + /* 0x568 */ request_of_phase_process_class mPhaseReq; + + /* 80CB874C */ virtual ~daObjRCircle_c(); + + /* 0x574 */ mDoExt_brkAnm mBrk; + /* 0x58C */ mDoExt_btkAnm mBtk; + /* 0x5A4 */ J3DModel* mpModel; + /* 0x5A8 */ u8 mSwitch; +}; #endif /* D_A_OBJ_RCIRCLE_H */ diff --git a/rel/d/a/obj/d_a_obj_hsTarget/d_a_obj_hsTarget.cpp b/rel/d/a/obj/d_a_obj_hsTarget/d_a_obj_hsTarget.cpp index cf3bcdc636..37116dde15 100644 --- a/rel/d/a/obj/d_a_obj_hsTarget/d_a_obj_hsTarget.cpp +++ b/rel/d/a/obj/d_a_obj_hsTarget/d_a_obj_hsTarget.cpp @@ -1,370 +1,135 @@ -// -// Generated By: dol2asm -// Translation Unit: d_a_obj_hsTarget -// +/** + * d_a_obj_hsTarget.cpp + * Object - Hookshot Target +*/ #include "rel/d/a/obj/d_a_obj_hsTarget/d_a_obj_hsTarget.h" -#include "dol2asm.h" -#include "dolphin/types.h" +#include "JSystem/JKernel/JKRHeap.h" +#include "d/com/d_com_inf_game.h" +#include "d/d_procname.h" -// -// Types: -// - -struct request_of_phase_process_class {}; - -struct mDoMtx_stack_c { - static u8 now[48]; -}; - -struct mDoHIO_entry_c { - /* 80C1F448 */ ~mDoHIO_entry_c(); -}; - -struct fopAc_ac_c {}; - -struct daHsTarget_c { - /* 80C1F490 */ void setBaseMtx(); - /* 80C1F518 */ void CreateHeap(); - /* 80C1F598 */ void create(); - /* 80C1F6B0 */ void Execute(f32 (**)[3][4]); - /* 80C1F6C4 */ void Draw(); - /* 80C1F728 */ void Delete(); -}; - -struct daHsTarget_HIO_c { - /* 80C1F42C */ daHsTarget_HIO_c(); - /* 80C1F7F4 */ ~daHsTarget_HIO_c(); -}; - -struct dKy_tevstr_c {}; - -struct J3DModelData {}; - -struct cXyz {}; - -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 dBgW {}; - -struct cBgS_PolyInfo {}; - -struct csXyz {}; - -struct dBgS_MoveBgActor { - /* 80078624 */ dBgS_MoveBgActor(); - /* 80078690 */ bool Create(); - /* 800786B0 */ bool IsDelete(); - /* 800786B8 */ bool ToFore(); - /* 800786C0 */ bool ToBack(); - /* 800787BC */ void MoveBGCreate(char const*, int, - void (*)(dBgW*, void*, cBgS_PolyInfo const&, bool, cXyz*, - csXyz*, csXyz*), - u32, f32 (*)[3][4]); - /* 800788DC */ void MoveBGDelete(); - /* 80078950 */ void MoveBGExecute(); -}; - -struct J3DModel {}; - -// -// Forward References: -// - -extern "C" void __ct__16daHsTarget_HIO_cFv(); -extern "C" void __dt__14mDoHIO_entry_cFv(); -extern "C" void setBaseMtx__12daHsTarget_cFv(); -extern "C" void CreateHeap__12daHsTarget_cFv(); -extern "C" void create__12daHsTarget_cFv(); -extern "C" void Execute__12daHsTarget_cFPPA3_A4_f(); -extern "C" void Draw__12daHsTarget_cFv(); -extern "C" void Delete__12daHsTarget_cFv(); -extern "C" static void daHsTarget_Draw__FP12daHsTarget_c(); -extern "C" static void daHsTarget_Execute__FP12daHsTarget_c(); -extern "C" static void daHsTarget_Delete__FP12daHsTarget_c(); -extern "C" static void daHsTarget_Create__FP10fopAc_ac_c(); -extern "C" void __dt__16daHsTarget_HIO_cFv(); -extern "C" void __sinit_d_a_obj_hsTarget_cpp(); -extern "C" extern char const* const d_a_obj_hsTarget__stringBase0; - -// -// External References: -// - -extern "C" void mDoMtx_ZXYrotM__FPA4_fsss(); -extern "C" void mDoExt_modelUpdateDL__FP8J3DModel(); -extern "C" void mDoExt_J3DModel__create__FP12J3DModelDataUlUl(); -extern "C" void fopAcM_setCullSizeBox2__FP10fopAc_ac_cP12J3DModelData(); -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 dBgS_MoveBGProc_TypicalRotY__FP4dBgWPvRC13cBgS_PolyInfobP4cXyzP5csXyzP5csXyz(); -extern "C" void __ct__16dBgS_MoveBgActorFv(); -extern "C" bool Create__16dBgS_MoveBgActorFv(); -extern "C" bool IsDelete__16dBgS_MoveBgActorFv(); -extern "C" bool ToFore__16dBgS_MoveBgActorFv(); -extern "C" bool ToBack__16dBgS_MoveBgActorFv(); -extern "C" void -MoveBGCreate__16dBgS_MoveBgActorFPCciPFP4dBgWPvRC13cBgS_PolyInfobP4cXyzP5csXyzP5csXyz_vUlPA3_A4_f(); -extern "C" void MoveBGDelete__16dBgS_MoveBgActorFv(); -extern "C" void MoveBGExecute__16dBgS_MoveBgActorFv(); -extern "C" void settingTevStruct__18dScnKy_env_light_cFiP4cXyzP12dKy_tevstr_c(); -extern "C" void setLightTevColorType_MAJI__18dScnKy_env_light_cFP12J3DModelDataP12dKy_tevstr_c(); -extern "C" void __dl__FPv(); -extern "C" void PSMTXCopy(); -extern "C" void PSMTXTrans(); -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]; -extern "C" void __register_global_object(); - -// -// Declarations: -// - -/* ############################################################################################## */ /* 80C1F8B0-80C1F8B0 000010 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ -#pragma push -#pragma force_active on -SECTION_DEAD static char const* const stringBase_80C1F8B0 = "hsMato"; -SECTION_DEAD static char const* const stringBase_80C1F8B7 = "L7HsMato"; -#pragma pop - -/* 80C1F8C0-80C1F8C8 -00001 0008+00 3/3 0/0 0/0 .data l_resNameIdx */ -SECTION_DATA static void* l_resNameIdx[2] = { - (void*)&d_a_obj_hsTarget__stringBase0, - (void*)(((char*)&d_a_obj_hsTarget__stringBase0) + 0x7), -}; - -/* 80C1F8C8-80C1F8E8 -00001 0020+00 1/0 0/0 0/0 .data l_daHsTarget_Method */ -SECTION_DATA static void* l_daHsTarget_Method[8] = { - (void*)daHsTarget_Create__FP10fopAc_ac_c, - (void*)daHsTarget_Delete__FP12daHsTarget_c, - (void*)daHsTarget_Execute__FP12daHsTarget_c, - (void*)NULL, - (void*)daHsTarget_Draw__FP12daHsTarget_c, - (void*)NULL, - (void*)NULL, - (void*)NULL, -}; - -/* 80C1F8E8-80C1F918 -00001 0030+00 0/0 0/0 1/0 .data g_profile_Obj_HsTarget */ -SECTION_DATA extern void* g_profile_Obj_HsTarget[12] = { - (void*)0xFFFFFFFD, (void*)0x0003FFFD, - (void*)0x003C0000, (void*)&g_fpcLf_Method, - (void*)0x000005B0, (void*)NULL, - (void*)NULL, (void*)&g_fopAc_Method, - (void*)0x01F50000, (void*)&l_daHsTarget_Method, - (void*)0x00040100, (void*)0x000E0000, -}; - -/* 80C1F918-80C1F940 000058 0028+00 1/1 0/0 0/0 .data __vt__12daHsTarget_c */ -SECTION_DATA extern void* __vt__12daHsTarget_c[10] = { - (void*)NULL /* RTTI */, - (void*)NULL, - (void*)CreateHeap__12daHsTarget_cFv, - (void*)Create__16dBgS_MoveBgActorFv, - (void*)Execute__12daHsTarget_cFPPA3_A4_f, - (void*)Draw__12daHsTarget_cFv, - (void*)Delete__12daHsTarget_cFv, - (void*)IsDelete__16dBgS_MoveBgActorFv, - (void*)ToFore__16dBgS_MoveBgActorFv, - (void*)ToBack__16dBgS_MoveBgActorFv, -}; - -/* 80C1F940-80C1F94C 000080 000C+00 2/2 0/0 0/0 .data __vt__16daHsTarget_HIO_c */ -SECTION_DATA extern void* __vt__16daHsTarget_HIO_c[3] = { - (void*)NULL /* RTTI */, - (void*)NULL, - (void*)__dt__16daHsTarget_HIO_cFv, -}; - -/* 80C1F94C-80C1F958 00008C 000C+00 3/3 0/0 0/0 .data __vt__14mDoHIO_entry_c */ -SECTION_DATA extern void* __vt__14mDoHIO_entry_c[3] = { - (void*)NULL /* RTTI */, - (void*)NULL, - (void*)__dt__14mDoHIO_entry_cFv, -}; +static const char* l_resNameIdx[2] = {"hsMato", "L7HsMato"}; /* 80C1F42C-80C1F448 0000EC 001C+00 1/1 0/0 0/0 .text __ct__16daHsTarget_HIO_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm daHsTarget_HIO_c::daHsTarget_HIO_c() { - nofralloc -#include "asm/rel/d/a/obj/d_a_obj_hsTarget/d_a_obj_hsTarget/__ct__16daHsTarget_HIO_cFv.s" -} -#pragma pop - -/* 80C1F448-80C1F490 000108 0048+00 1/0 0/0 0/0 .text __dt__14mDoHIO_entry_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm mDoHIO_entry_c::~mDoHIO_entry_c() { - nofralloc -#include "asm/rel/d/a/obj/d_a_obj_hsTarget/d_a_obj_hsTarget/__dt__14mDoHIO_entry_cFv.s" -} -#pragma pop +daHsTarget_HIO_c::daHsTarget_HIO_c() {} /* 80C1F490-80C1F518 000150 0088+00 1/1 0/0 0/0 .text setBaseMtx__12daHsTarget_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void daHsTarget_c::setBaseMtx() { - nofralloc -#include "asm/rel/d/a/obj/d_a_obj_hsTarget/d_a_obj_hsTarget/setBaseMtx__12daHsTarget_cFv.s" +void daHsTarget_c::setBaseMtx() { + mDoMtx_stack_c::transS(current.pos.x, current.pos.y, current.pos.z); + mDoMtx_stack_c::ZXYrotM(shape_angle.x, shape_angle.y, shape_angle.z); + mpModel->setBaseScale(mScale); + mpModel->i_setBaseTRMtx(mDoMtx_stack_c::get()); } -#pragma pop -/* ############################################################################################## */ /* 80C1F8A0-80C1F8A8 000000 0008+00 1/1 0/0 0/0 .rodata l_bmdIdx */ -SECTION_RODATA static u8 const l_bmdIdx[8] = { - 0x00, 0x00, 0x00, 0x04, 0x00, 0x00, 0x00, 0x04, -}; -COMPILER_STRIP_GATE(0x80C1F8A0, &l_bmdIdx); +static const u32 l_bmdIdx[2] = {4, 4}; /* 80C1F518-80C1F598 0001D8 0080+00 1/0 0/0 0/0 .text CreateHeap__12daHsTarget_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void daHsTarget_c::CreateHeap() { - nofralloc -#include "asm/rel/d/a/obj/d_a_obj_hsTarget/d_a_obj_hsTarget/CreateHeap__12daHsTarget_cFv.s" +int daHsTarget_c::CreateHeap() { + mpModel = mDoExt_J3DModel__create( + (J3DModelData*)dComIfG_getObjectRes(l_resNameIdx[mIndex], l_bmdIdx[mIndex]), + 0x80000, 0x11000084); + return mpModel != NULL ? 1 : 0; } -#pragma pop -/* ############################################################################################## */ /* 80C1F8A8-80C1F8B0 000008 0008+00 1/1 0/0 0/0 .rodata l_dzbIdx */ -SECTION_RODATA static u8 const l_dzbIdx[8] = { - 0x00, 0x00, 0x00, 0x07, 0x00, 0x00, 0x00, 0x07, -}; -COMPILER_STRIP_GATE(0x80C1F8A8, &l_dzbIdx); +static const u32 l_dzbIdx[2] = {7, 7}; /* 80C1F598-80C1F6B0 000258 0118+00 1/1 0/0 0/0 .text create__12daHsTarget_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void daHsTarget_c::create() { - nofralloc -#include "asm/rel/d/a/obj/d_a_obj_hsTarget/d_a_obj_hsTarget/create__12daHsTarget_cFv.s" +int daHsTarget_c::create() { + if (!fopAcM_CheckCondition(this, 8)) { + new (this) daHsTarget_c(); + fopAcM_OnCondition(this, 8); + } + + mIndex = getModelType(); + if (mIndex == 0x0f) { + mIndex = 0; + } + int phase = dComIfG_resLoad(&mPhaseReq, l_resNameIdx[mIndex]); + if (phase == cPhs_COMPLEATE_e) { + if (MoveBGCreate(l_resNameIdx[mIndex], l_dzbIdx[mIndex], + dBgS_MoveBGProc_TypicalRotY, 0xac0, NULL) == cPhs_ERROR_e) + { + return cPhs_ERROR_e; + } else { + fopAcM_SetMtx(this, mpModel->mBaseTransformMtx); + fopAcM_setCullSizeBox2(this, mpModel->getModelData()); + setBaseMtx(); + } + } + return phase; } -#pragma pop /* 80C1F6B0-80C1F6C4 000370 0014+00 1/0 0/0 0/0 .text Execute__12daHsTarget_cFPPA3_A4_f */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void daHsTarget_c::Execute(f32 (**param_0)[3][4]) { - nofralloc -#include "asm/rel/d/a/obj/d_a_obj_hsTarget/d_a_obj_hsTarget/Execute__12daHsTarget_cFPPA3_A4_f.s" +int daHsTarget_c::Execute(f32 (**param_0)[3][4]) { + *param_0 = &mpModel->getBaseTRMtx(); + return 1; } -#pragma pop /* 80C1F6C4-80C1F728 000384 0064+00 1/0 0/0 0/0 .text Draw__12daHsTarget_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void daHsTarget_c::Draw() { - nofralloc -#include "asm/rel/d/a/obj/d_a_obj_hsTarget/d_a_obj_hsTarget/Draw__12daHsTarget_cFv.s" +int daHsTarget_c::Draw() { + g_env_light.settingTevStruct(0x40, ¤t.pos, &mTevStr); + g_env_light.setLightTevColorType_MAJI(mpModel->mModelData, &mTevStr); + mDoExt_modelUpdateDL(mpModel); + return 1; } -#pragma pop /* 80C1F728-80C1F768 0003E8 0040+00 1/0 0/0 0/0 .text Delete__12daHsTarget_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void daHsTarget_c::Delete() { - nofralloc -#include "asm/rel/d/a/obj/d_a_obj_hsTarget/d_a_obj_hsTarget/Delete__12daHsTarget_cFv.s" +int daHsTarget_c::Delete() { + dComIfG_resDelete(&mPhaseReq, l_resNameIdx[mIndex]); + return 1; } -#pragma pop /* 80C1F768-80C1F794 000428 002C+00 1/0 0/0 0/0 .text daHsTarget_Draw__FP12daHsTarget_c */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -static asm void daHsTarget_Draw(daHsTarget_c* param_0) { - nofralloc -#include "asm/rel/d/a/obj/d_a_obj_hsTarget/d_a_obj_hsTarget/daHsTarget_Draw__FP12daHsTarget_c.s" +static int daHsTarget_Draw(daHsTarget_c* i_this) { + return static_cast(i_this)->MoveBGDraw(); } -#pragma pop /* 80C1F794-80C1F7B4 000454 0020+00 1/0 0/0 0/0 .text daHsTarget_Execute__FP12daHsTarget_c */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -static asm void daHsTarget_Execute(daHsTarget_c* param_0) { - nofralloc -#include "asm/rel/d/a/obj/d_a_obj_hsTarget/d_a_obj_hsTarget/daHsTarget_Execute__FP12daHsTarget_c.s" +static int daHsTarget_Execute(daHsTarget_c* i_this) { + return static_cast(i_this)->MoveBGExecute(); } -#pragma pop /* 80C1F7B4-80C1F7D4 000474 0020+00 1/0 0/0 0/0 .text daHsTarget_Delete__FP12daHsTarget_c */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -static asm void daHsTarget_Delete(daHsTarget_c* param_0) { - nofralloc -#include "asm/rel/d/a/obj/d_a_obj_hsTarget/d_a_obj_hsTarget/daHsTarget_Delete__FP12daHsTarget_c.s" +static int daHsTarget_Delete(daHsTarget_c* i_this) { + return static_cast(i_this)->MoveBGDelete(); } -#pragma pop /* 80C1F7D4-80C1F7F4 000494 0020+00 1/0 0/0 0/0 .text daHsTarget_Create__FP10fopAc_ac_c */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -static asm void daHsTarget_Create(fopAc_ac_c* param_0) { - nofralloc -#include "asm/rel/d/a/obj/d_a_obj_hsTarget/d_a_obj_hsTarget/daHsTarget_Create__FP10fopAc_ac_c.s" +static int daHsTarget_Create(fopAc_ac_c* i_this) { + return static_cast(i_this)->create(); } -#pragma pop - -/* 80C1F7F4-80C1F850 0004B4 005C+00 2/1 0/0 0/0 .text __dt__16daHsTarget_HIO_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm daHsTarget_HIO_c::~daHsTarget_HIO_c() { - nofralloc -#include "asm/rel/d/a/obj/d_a_obj_hsTarget/d_a_obj_hsTarget/__dt__16daHsTarget_HIO_cFv.s" -} -#pragma pop - -/* ############################################################################################## */ -/* 80C1F960-80C1F96C 000008 000C+00 1/1 0/0 0/0 .bss @3621 */ -static u8 lit_3621[12]; /* 80C1F96C-80C1F970 000014 0004+00 1/1 0/0 0/0 .bss l_HIO */ -static u8 l_HIO[4]; +static daHsTarget_HIO_c l_HIO; -/* 80C1F850-80C1F88C 000510 003C+00 0/0 1/0 0/0 .text __sinit_d_a_obj_hsTarget_cpp */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void __sinit_d_a_obj_hsTarget_cpp() { - nofralloc -#include "asm/rel/d/a/obj/d_a_obj_hsTarget/d_a_obj_hsTarget/__sinit_d_a_obj_hsTarget_cpp.s" -} -#pragma pop +/* 80C1F8C8-80C1F8E8 -00001 0020+00 1/0 0/0 0/0 .data l_daHsTarget_Method */ +static actor_method_class l_daHsTarget_Method = { + (process_method_func)daHsTarget_Create, (process_method_func)daHsTarget_Delete, + (process_method_func)daHsTarget_Execute, (process_method_func)NULL, + (process_method_func)daHsTarget_Draw, +}; -#pragma push -#pragma force_active on -REGISTER_CTORS(0x80C1F850, __sinit_d_a_obj_hsTarget_cpp); -#pragma pop - -/* 80C1F8B0-80C1F8B0 000010 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ +/* 80C1F8E8-80C1F918 -00001 0030+00 0/0 0/0 1/0 .data g_profile_Obj_HsTarget */ +extern actor_process_profile_definition g_profile_Obj_HsTarget = { + -3, + 3, + -3, + PROC_Obj_HsTarget, + &g_fpcLf_Method.mBase, + sizeof(daHsTarget_c), + 0, + 0, + &g_fopAc_Method.base, + 0x01F5, + &l_daHsTarget_Method, + 0x40100, + 0, + 14, +}; \ No newline at end of file diff --git a/rel/d/a/obj/d_a_obj_onsen/d_a_obj_onsen.cpp b/rel/d/a/obj/d_a_obj_onsen/d_a_obj_onsen.cpp index c8215b7f3c..648a69f81e 100644 --- a/rel/d/a/obj/d_a_obj_onsen/d_a_obj_onsen.cpp +++ b/rel/d/a/obj/d_a_obj_onsen/d_a_obj_onsen.cpp @@ -1,386 +1,169 @@ -// -// Generated By: dol2asm -// Translation Unit: d_a_obj_onsen -// +/** + * d_a_obj_onsen.cpp + * Object - Hot Spring + */ #include "rel/d/a/obj/d_a_obj_onsen/d_a_obj_onsen.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 J3DMaterialTable {}; - -struct J3DAnmTextureSRTKey {}; - -struct mDoExt_btkAnm { - /* 8000D63C */ void init(J3DMaterialTable*, J3DAnmTextureSRTKey*, int, int, f32, s16, s16); - /* 8000D6D8 */ void entry(J3DMaterialTable*, f32); -}; - -struct mDoExt_baseAnm { - /* 8000D428 */ void play(); -}; - -struct fopAc_ac_c {}; - -struct daObjOnsen_c { - /* 80CA7B58 */ void initBaseMtx(); - /* 80CA7BB0 */ void setBaseMtx(); - /* 80CA7C28 */ void Create(); - /* 80CA7C74 */ void CreateHeap(); - /* 80CA7E44 */ void create1st(); - /* 80CA7EEC */ void Execute(f32 (**)[3][4]); - /* 80CA7F1C */ void Draw(); - /* 80CA8008 */ 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 dBgW {}; - -struct cBgS_PolyInfo {}; - -struct csXyz {}; - -struct dBgS_MoveBgActor { - /* 80078624 */ dBgS_MoveBgActor(); - /* 800786B0 */ bool IsDelete(); - /* 800786B8 */ bool ToFore(); - /* 800786C0 */ bool ToBack(); - /* 800787BC */ void MoveBGCreate(char const*, int, - void (*)(dBgW*, void*, cBgS_PolyInfo const&, bool, cXyz*, - csXyz*, csXyz*), - u32, f32 (*)[3][4]); - /* 800788DC */ void MoveBGDelete(); - /* 80078950 */ void MoveBGExecute(); -}; - -struct J3DModel {}; - -struct J3DFrameCtrl { - /* 803283FC */ void init(s16); - /* 80CA7DFC */ ~J3DFrameCtrl(); -}; - -// -// Forward References: -// - -extern "C" void initBaseMtx__12daObjOnsen_cFv(); -extern "C" void setBaseMtx__12daObjOnsen_cFv(); -extern "C" void Create__12daObjOnsen_cFv(); -extern "C" void CreateHeap__12daObjOnsen_cFv(); -extern "C" void __dt__12J3DFrameCtrlFv(); -extern "C" void create1st__12daObjOnsen_cFv(); -extern "C" void Execute__12daObjOnsen_cFPPA3_A4_f(); -extern "C" void Draw__12daObjOnsen_cFv(); -extern "C" void Delete__12daObjOnsen_cFv(); -extern "C" static void daObjOnsen_create1st__FP12daObjOnsen_c(); -extern "C" static void daObjOnsen_MoveBGDelete__FP12daObjOnsen_c(); -extern "C" static void daObjOnsen_MoveBGExecute__FP12daObjOnsen_c(); -extern "C" static void daObjOnsen_MoveBGDraw__FP12daObjOnsen_c(); -extern "C" extern char const* const d_a_obj_onsen__stringBase0; - -// -// External References: -// - -extern "C" void mDoMtx_YrotM__FPA4_fs(); -extern "C" void transS__14mDoMtx_stack_cFRC4cXyz(); -extern "C" void play__14mDoExt_baseAnmFv(); -extern "C" void init__13mDoExt_btkAnmFP16J3DMaterialTableP19J3DAnmTextureSRTKeyiifss(); -extern "C" void entry__13mDoExt_btkAnmFP16J3DMaterialTablef(); -extern "C" void mDoExt_modelUpdateDL__FP8J3DModel(); -extern "C" void mDoExt_J3DModel__create__FP12J3DModelDataUlUl(); -extern "C" void fopAcM_setCullSizeBox2__FP10fopAc_ac_cP12J3DModelData(); -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 __ct__16dBgS_MoveBgActorFv(); -extern "C" bool IsDelete__16dBgS_MoveBgActorFv(); -extern "C" bool ToFore__16dBgS_MoveBgActorFv(); -extern "C" bool ToBack__16dBgS_MoveBgActorFv(); -extern "C" void -MoveBGCreate__16dBgS_MoveBgActorFPCciPFP4dBgWPvRC13cBgS_PolyInfobP4cXyzP5csXyzP5csXyz_vUlPA3_A4_f(); -extern "C" void MoveBGDelete__16dBgS_MoveBgActorFv(); -extern "C" void MoveBGExecute__16dBgS_MoveBgActorFv(); -extern "C" void settingTevStruct__18dScnKy_env_light_cFiP4cXyzP12dKy_tevstr_c(); -extern "C" void setLightTevColorType_MAJI__18dScnKy_env_light_cFP12J3DModelDataP12dKy_tevstr_c(); -extern "C" void dKy_bg_MAxx_proc__FPv(); -extern "C" void* __nw__FUl(); -extern "C" void __dl__FPv(); -extern "C" void init__12J3DFrameCtrlFs(); -extern "C" void PSMTXCopy(); -extern "C" void _savegpr_27(); -extern "C" void _restgpr_27(); -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]; -extern "C" extern u8 j3dSys[284]; - -// -// Declarations: -// +#include "JSystem/JKernel/JKRHeap.h" +#include "d/d_procname.h" /* 80CA7B58-80CA7BB0 000078 0058+00 1/1 0/0 0/0 .text initBaseMtx__12daObjOnsen_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void daObjOnsen_c::initBaseMtx() { - nofralloc -#include "asm/rel/d/a/obj/d_a_obj_onsen/d_a_obj_onsen/initBaseMtx__12daObjOnsen_cFv.s" +void daObjOnsen_c::initBaseMtx() { + mpModel[0]->setBaseScale(mScale); + mpModel[1]->setBaseScale(mScale); + setBaseMtx(); } -#pragma pop /* 80CA7BB0-80CA7C28 0000D0 0078+00 1/1 0/0 0/0 .text setBaseMtx__12daObjOnsen_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void daObjOnsen_c::setBaseMtx() { - nofralloc -#include "asm/rel/d/a/obj/d_a_obj_onsen/d_a_obj_onsen/setBaseMtx__12daObjOnsen_cFv.s" +void daObjOnsen_c::setBaseMtx() { + mDoMtx_stack_c::transS(current.pos); + mDoMtx_stack_c::YrotM(shape_angle.y); + PSMTXCopy(mDoMtx_stack_c::now, mpModel[0]->mBaseTransformMtx); + PSMTXCopy(mDoMtx_stack_c::now, mpModel[1]->mBaseTransformMtx); + PSMTXCopy(mDoMtx_stack_c::now, field_0x56c); } -#pragma pop /* 80CA7C28-80CA7C74 000148 004C+00 1/0 0/0 0/0 .text Create__12daObjOnsen_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void daObjOnsen_c::Create() { - nofralloc -#include "asm/rel/d/a/obj/d_a_obj_onsen/d_a_obj_onsen/Create__12daObjOnsen_cFv.s" +int daObjOnsen_c::Create() { + initBaseMtx(); + fopAcM_SetMtx(this, mpModel[0]->mBaseTransformMtx); + fopAcM_setCullSizeBox2(this, mpModel[0]->getModelData()); + return 1; } -#pragma pop -/* ############################################################################################## */ /* 80CA811C-80CA8124 000000 0008+00 1/1 0/0 0/0 .rodata l_bmd */ -SECTION_RODATA static u8 const l_bmd[8] = { - 0x00, 0x00, 0x00, 0x05, 0x00, 0x00, 0x00, 0x05, -}; -COMPILER_STRIP_GATE(0x80CA811C, &l_bmd); +static const u32 l_bmd[2] = {5, 5}; /* 80CA8124-80CA812C 000008 0008+00 0/1 0/0 0/0 .rodata l_btk */ -#pragma push -#pragma force_active on -SECTION_RODATA static u8 const l_btk[8] = { - 0x00, 0x00, 0x00, 0x09, 0x00, 0x00, 0x00, 0x09, -}; -COMPILER_STRIP_GATE(0x80CA8124, &l_btk); -#pragma pop +static const u32 l_btk[2] = {9, 9}; /* 80CA812C-80CA8134 000010 0008+00 0/1 0/0 0/0 .rodata l_bmd2 */ -#pragma push -#pragma force_active on -SECTION_RODATA static u8 const l_bmd2[8] = { - 0x00, 0x00, 0x00, 0x06, 0x00, 0x00, 0x00, 0x06, -}; -COMPILER_STRIP_GATE(0x80CA812C, &l_bmd2); -#pragma pop +static const u32 l_bmd2[2] = {6, 6}; /* 80CA8134-80CA813C 000018 0008+00 1/1 0/0 0/0 .rodata l_dzb */ -SECTION_RODATA static u8 const l_dzb[8] = { - 0x00, 0x00, 0x00, 0x0C, 0x00, 0x00, 0x00, 0x0C, -}; -COMPILER_STRIP_GATE(0x80CA8134, &l_dzb); +static const u32 l_dzb[2] = {12, 12}; /* 80CA813C-80CA8144 000020 0008+00 1/1 0/0 0/0 .rodata l_heap_size */ -SECTION_RODATA static u8 const l_heap_size[8] = { - 0x00, 0x00, 0x28, 0x00, 0x00, 0x00, 0x1A, 0xE0, -}; -COMPILER_STRIP_GATE(0x80CA813C, &l_heap_size); - -/* 80CA8144-80CA8148 000028 0004+00 0/1 0/0 0/0 .rodata @3694 */ -#pragma push -#pragma force_active on -SECTION_RODATA static f32 const lit_3694 = 1.0f; -COMPILER_STRIP_GATE(0x80CA8144, &lit_3694); -#pragma pop - -/* 80CA8148-80CA8148 00002C 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ -#pragma push -#pragma force_active on -SECTION_DEAD static char const* const stringBase_80CA8148 = "H_Onsen"; -SECTION_DEAD static char const* const stringBase_80CA8150 = "H_KaOnsen"; -#pragma pop +static const u32 l_heap_size[2] = {10240, 6880}; /* 80CA815C-80CA8164 -00001 0008+00 3/3 0/0 0/0 .data l_arcName */ -SECTION_DATA static void* l_arcName[2] = { - (void*)&d_a_obj_onsen__stringBase0, - (void*)(((char*)&d_a_obj_onsen__stringBase0) + 0x8), -}; - -/* 80CA8164-80CA8184 -00001 0020+00 1/0 0/0 0/0 .data daObjOnsen_METHODS */ -SECTION_DATA static void* daObjOnsen_METHODS[8] = { - (void*)daObjOnsen_create1st__FP12daObjOnsen_c, - (void*)daObjOnsen_MoveBGDelete__FP12daObjOnsen_c, - (void*)daObjOnsen_MoveBGExecute__FP12daObjOnsen_c, - (void*)NULL, - (void*)daObjOnsen_MoveBGDraw__FP12daObjOnsen_c, - (void*)NULL, - (void*)NULL, - (void*)NULL, -}; - -/* 80CA8184-80CA81B4 -00001 0030+00 0/0 0/0 1/0 .data g_profile_Obj_Onsen */ -SECTION_DATA extern void* g_profile_Obj_Onsen[12] = { - (void*)0xFFFFFFFD, (void*)0x0003FFFD, - (void*)0x00820000, (void*)&g_fpcLf_Method, - (void*)0x000005B8, (void*)NULL, - (void*)NULL, (void*)&g_fopAc_Method, - (void*)0x025A0000, (void*)&daObjOnsen_METHODS, - (void*)0x00044100, (void*)0x000E0000, -}; - -/* 80CA81B4-80CA81C0 000058 000C+00 2/2 0/0 0/0 .data __vt__12J3DFrameCtrl */ -SECTION_DATA extern void* __vt__12J3DFrameCtrl[3] = { - (void*)NULL /* RTTI */, - (void*)NULL, - (void*)__dt__12J3DFrameCtrlFv, +static char* l_arcName[2] = { + "H_Onsen", + "H_KaOnsen", }; /* 80CA7C74-80CA7DFC 000194 0188+00 1/0 0/0 0/0 .text CreateHeap__12daObjOnsen_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void daObjOnsen_c::CreateHeap() { - nofralloc -#include "asm/rel/d/a/obj/d_a_obj_onsen/d_a_obj_onsen/CreateHeap__12daObjOnsen_cFv.s" -} -#pragma pop +int daObjOnsen_c::CreateHeap() { + J3DModelData* modelData2 = (J3DModelData*)dComIfG_getObjectRes(l_arcName[mType], l_bmd[mType]); + mpModel[0] = mDoExt_J3DModel__create(modelData2, 0x80000, 0x11000084); + if (!mpModel[0]) { + return 0; + } -/* 80CA7DFC-80CA7E44 00031C 0048+00 1/0 0/0 0/0 .text __dt__12J3DFrameCtrlFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm J3DFrameCtrl::~J3DFrameCtrl() { - nofralloc -#include "asm/rel/d/a/obj/d_a_obj_onsen/d_a_obj_onsen/__dt__12J3DFrameCtrlFv.s" + J3DModelData* modelData = (J3DModelData*)dComIfG_getObjectRes(l_arcName[mType], l_bmd2[mType]); + mpModel[1] = mDoExt_J3DModel__create(modelData, 0x80000, 0x19000284); + if (!mpModel[1]) { + return 0; + } + + J3DAnmTextureSRTKey* srtKey = + (J3DAnmTextureSRTKey*)dComIfG_getObjectRes(l_arcName[mType], l_btk[mType]); + mpBtk = new mDoExt_btkAnm(); + if (!mpBtk || !mpBtk->init(modelData, srtKey, 1, 2, 1.0f, 0, -1)) { + return 0; + } + + return 1; } -#pragma pop /* 80CA7E44-80CA7EEC 000364 00A8+00 1/1 0/0 0/0 .text create1st__12daObjOnsen_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void daObjOnsen_c::create1st() { - nofralloc -#include "asm/rel/d/a/obj/d_a_obj_onsen/d_a_obj_onsen/create1st__12daObjOnsen_cFv.s" +int daObjOnsen_c::create1st() { + mType = getType(); + int phase = dComIfG_resLoad(&mPhaseReq, l_arcName[mType]); + if (phase == cPhs_COMPLEATE_e) { + phase = MoveBGCreate(l_arcName[mType], l_dzb[mType], NULL, l_heap_size[mType], NULL); + if (phase == cPhs_ERROR_e) { + return phase; + } + } + return phase; } -#pragma pop /* 80CA7EEC-80CA7F1C 00040C 0030+00 1/0 0/0 0/0 .text Execute__12daObjOnsen_cFPPA3_A4_f */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void daObjOnsen_c::Execute(f32 (**param_0)[3][4]) { - nofralloc -#include "asm/rel/d/a/obj/d_a_obj_onsen/d_a_obj_onsen/Execute__12daObjOnsen_cFPPA3_A4_f.s" +int daObjOnsen_c::Execute(Mtx** i_mtx) { + *i_mtx = &field_0x56c; + mpBtk->play(); + return 1; } -#pragma pop /* 80CA7F1C-80CA8008 00043C 00EC+00 1/0 0/0 0/0 .text Draw__12daObjOnsen_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void daObjOnsen_c::Draw() { - nofralloc -#include "asm/rel/d/a/obj/d_a_obj_onsen/d_a_obj_onsen/Draw__12daObjOnsen_cFv.s" +int daObjOnsen_c::Draw() { + g_env_light.settingTevStruct(16, ¤t.pos, &mTevStr); + g_env_light.setLightTevColorType_MAJI(mpModel[0], &mTevStr); + g_env_light.setLightTevColorType_MAJI(mpModel[1], &mTevStr); + dKy_bg_MAxx_proc(mpModel[0]); + mDoExt_modelUpdateDL(mpModel[0]); + mpBtk->entry(mpModel[1]->getModelData()); + dComIfGd_setListInvisible(); + dKy_bg_MAxx_proc(mpModel[1]); + mDoExt_modelUpdateDL(mpModel[1]); + dComIfGd_setList(); + return 1; } -#pragma pop /* 80CA8008-80CA8048 000528 0040+00 1/0 0/0 0/0 .text Delete__12daObjOnsen_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void daObjOnsen_c::Delete() { - nofralloc -#include "asm/rel/d/a/obj/d_a_obj_onsen/d_a_obj_onsen/Delete__12daObjOnsen_cFv.s" +int daObjOnsen_c::Delete() { + dComIfG_resDelete(&mPhaseReq, l_arcName[mType]); + return 1; } -#pragma pop - -/* ############################################################################################## */ -/* 80CA81C0-80CA81E8 000064 0028+00 1/1 0/0 0/0 .data __vt__12daObjOnsen_c */ -SECTION_DATA extern void* __vt__12daObjOnsen_c[10] = { - (void*)NULL /* RTTI */, - (void*)NULL, - (void*)CreateHeap__12daObjOnsen_cFv, - (void*)Create__12daObjOnsen_cFv, - (void*)Execute__12daObjOnsen_cFPPA3_A4_f, - (void*)Draw__12daObjOnsen_cFv, - (void*)Delete__12daObjOnsen_cFv, - (void*)IsDelete__16dBgS_MoveBgActorFv, - (void*)ToFore__16dBgS_MoveBgActorFv, - (void*)ToBack__16dBgS_MoveBgActorFv, -}; /* 80CA8048-80CA80A8 000568 0060+00 1/0 0/0 0/0 .text daObjOnsen_create1st__FP12daObjOnsen_c */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -static asm void daObjOnsen_create1st(daObjOnsen_c* param_0) { - nofralloc -#include "asm/rel/d/a/obj/d_a_obj_onsen/d_a_obj_onsen/daObjOnsen_create1st__FP12daObjOnsen_c.s" +static int daObjOnsen_create1st(daObjOnsen_c* i_this) { + if (!fopAcM_CheckCondition(i_this, 8)) { + new (i_this) daObjOnsen_c(); + fopAcM_OnCondition(i_this, 8); + } + return i_this->create1st(); } -#pragma pop /* 80CA80A8-80CA80C8 0005C8 0020+00 1/0 0/0 0/0 .text daObjOnsen_MoveBGDelete__FP12daObjOnsen_c */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -static asm void daObjOnsen_MoveBGDelete(daObjOnsen_c* param_0) { - nofralloc -#include "asm/rel/d/a/obj/d_a_obj_onsen/d_a_obj_onsen/daObjOnsen_MoveBGDelete__FP12daObjOnsen_c.s" +static int daObjOnsen_MoveBGDelete(daObjOnsen_c* i_this) { + return static_cast(i_this)->MoveBGDelete(); } -#pragma pop /* 80CA80C8-80CA80E8 0005E8 0020+00 1/0 0/0 0/0 .text daObjOnsen_MoveBGExecute__FP12daObjOnsen_c */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -static asm void daObjOnsen_MoveBGExecute(daObjOnsen_c* param_0) { - nofralloc -#include "asm/rel/d/a/obj/d_a_obj_onsen/d_a_obj_onsen/daObjOnsen_MoveBGExecute__FP12daObjOnsen_c.s" +static int daObjOnsen_MoveBGExecute(daObjOnsen_c* i_this) { + return static_cast(i_this)->MoveBGExecute(); } -#pragma pop /* 80CA80E8-80CA8114 000608 002C+00 1/0 0/0 0/0 .text daObjOnsen_MoveBGDraw__FP12daObjOnsen_c */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -static asm void daObjOnsen_MoveBGDraw(daObjOnsen_c* param_0) { - nofralloc -#include "asm/rel/d/a/obj/d_a_obj_onsen/d_a_obj_onsen/daObjOnsen_MoveBGDraw__FP12daObjOnsen_c.s" +static int daObjOnsen_MoveBGDraw(daObjOnsen_c* i_this) { + return static_cast(i_this)->MoveBGDraw(); } -#pragma pop -/* 80CA8148-80CA8148 00002C 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ +/* 80CA8164-80CA8184 -00001 0020+00 1/0 0/0 0/0 .data daObjOnsen_METHODS */ +static actor_method_class daObjOnsen_METHODS = { + (process_method_func)daObjOnsen_create1st, (process_method_func)daObjOnsen_MoveBGDelete, + (process_method_func)daObjOnsen_MoveBGExecute, (process_method_func)NULL, + (process_method_func)daObjOnsen_MoveBGDraw, +}; + +/* 80CA8184-80CA81B4 -00001 0030+00 0/0 0/0 1/0 .data g_profile_Obj_Onsen */ +extern actor_process_profile_definition g_profile_Obj_Onsen = { + -3, + 3, + -3, + PROC_Obj_Onsen, + &g_fpcLf_Method.mBase, + sizeof(daObjOnsen_c), + 0, + 0, + &g_fopAc_Method.base, + 0x025A, + &daObjOnsen_METHODS, + 0x00044100, + 0, + 14, +}; diff --git a/rel/d/a/obj/d_a_obj_rcircle/d_a_obj_rcircle.cpp b/rel/d/a/obj/d_a_obj_rcircle/d_a_obj_rcircle.cpp index 6d40efe259..02207eaed6 100644 --- a/rel/d/a/obj/d_a_obj_rcircle/d_a_obj_rcircle.cpp +++ b/rel/d/a/obj/d_a_obj_rcircle/d_a_obj_rcircle.cpp @@ -1,355 +1,170 @@ -// -// Generated By: dol2asm -// Translation Unit: d_a_obj_rcircle -// +/** + * d_a_obj_rcircle.cpp + * Object - River Circle + */ #include "rel/d/a/obj/d_a_obj_rcircle/d_a_obj_rcircle.h" -#include "dol2asm.h" -#include "dolphin/types.h" - -// -// Types: -// - -struct request_of_phase_process_class {}; - -struct mDoMtx_stack_c { - static u8 now[48]; -}; - -struct J3DMaterialTable {}; - -struct J3DAnmTextureSRTKey {}; - -struct mDoExt_btkAnm { - /* 8000D63C */ void init(J3DMaterialTable*, J3DAnmTextureSRTKey*, int, int, f32, s16, s16); - /* 8000D6D8 */ void entry(J3DMaterialTable*, f32); -}; - -struct J3DAnmTevRegKey {}; - -struct mDoExt_brkAnm { - /* 8000D70C */ void init(J3DMaterialTable*, J3DAnmTevRegKey*, int, int, f32, s16, s16); - /* 8000D7A8 */ void entry(J3DMaterialTable*, f32); -}; - -struct mDoExt_baseAnm { - /* 8000D428 */ void play(); -}; - -struct fopAc_ac_c { - /* 80018B64 */ fopAc_ac_c(); - /* 80018C8C */ ~fopAc_ac_c(); -}; - -struct daObjRCircle_c { - /* 80CB8678 */ daObjRCircle_c(); - /* 80CB874C */ ~daObjRCircle_c(); - /* 80CB8814 */ void createHeap(); - /* 80CB8928 */ void create(); - /* 80CB8A28 */ void Delete(); - /* 80CB8A5C */ void draw(); - /* 80CB8B28 */ void execute(); - /* 80CB8BE4 */ void init(); - /* 80CB8BF0 */ void setModelMtx(); -}; - -struct dSv_info_c { - /* 80035360 */ void isSwitch(int, int) const; -}; - -struct dKy_tevstr_c {}; - -struct J3DModelData {}; - -struct cXyz {}; - -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 {}; - -struct J3DFrameCtrl { - /* 803283FC */ void init(s16); - /* 80CB8704 */ ~J3DFrameCtrl(); -}; - -// -// Forward References: -// - -extern "C" static void daObjRCircle_c_createHeap__FP10fopAc_ac_c(); -extern "C" void __ct__14daObjRCircle_cFv(); -extern "C" void __dt__12J3DFrameCtrlFv(); -extern "C" void __dt__14daObjRCircle_cFv(); -extern "C" void createHeap__14daObjRCircle_cFv(); -extern "C" void create__14daObjRCircle_cFv(); -extern "C" void Delete__14daObjRCircle_cFv(); -extern "C" void draw__14daObjRCircle_cFv(); -extern "C" void execute__14daObjRCircle_cFv(); -extern "C" void init__14daObjRCircle_cFv(); -extern "C" void setModelMtx__14daObjRCircle_cFv(); -extern "C" static void daObjRCircle_create__FP14daObjRCircle_c(); -extern "C" static void daObjRCircle_Delete__FP14daObjRCircle_c(); -extern "C" static void daObjRCircle_execute__FP14daObjRCircle_c(); -extern "C" static void daObjRCircle_draw__FP14daObjRCircle_c(); -extern "C" extern char const* const d_a_obj_rcircle__stringBase0; - -// -// External References: -// - -extern "C" void play__14mDoExt_baseAnmFv(); -extern "C" void init__13mDoExt_btkAnmFP16J3DMaterialTableP19J3DAnmTextureSRTKeyiifss(); -extern "C" void entry__13mDoExt_btkAnmFP16J3DMaterialTablef(); -extern "C" void init__13mDoExt_brkAnmFP16J3DMaterialTableP15J3DAnmTevRegKeyiifss(); -extern "C" void entry__13mDoExt_brkAnmFP16J3DMaterialTablef(); -extern "C" void mDoExt_modelUpdateDL__FP8J3DModel(); -extern "C" void mDoExt_J3DModel__create__FP12J3DModelDataUlUl(); -extern "C" void __ct__10fopAc_ac_cFv(); -extern "C" void __dt__10fopAc_ac_cFv(); -extern "C" void fopAcM_delete__FP10fopAc_ac_c(); -extern "C" void fopAcM_entrySolidHeap__FP10fopAc_ac_cPFP10fopAc_ac_c_iUl(); -extern "C" void fopAcM_setCullSizeBox2__FP10fopAc_ac_cP12J3DModelData(); -extern "C" void dComIfG_resLoad__FP30request_of_phase_process_classPCc(); -extern "C" void dComIfG_resDelete__FP30request_of_phase_process_classPCc(); -extern "C" void isSwitch__10dSv_info_cCFii(); -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 __dl__FPv(); -extern "C" void init__12J3DFrameCtrlFs(); -extern "C" void PSMTXCopy(); -extern "C" void PSMTXTrans(); -extern "C" void _savegpr_29(); -extern "C" void _restgpr_29(); -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]; -extern "C" extern u8 j3dSys[284]; - -// -// Declarations: -// +#include "JSystem/JKernel/JKRHeap.h" +#include "d/d_procname.h" /* 80CB8658-80CB8678 000078 0020+00 1/1 0/0 0/0 .text daObjRCircle_c_createHeap__FP10fopAc_ac_c */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -static asm void daObjRCircle_c_createHeap(fopAc_ac_c* param_0) { - nofralloc -#include "asm/rel/d/a/obj/d_a_obj_rcircle/d_a_obj_rcircle/daObjRCircle_c_createHeap__FP10fopAc_ac_c.s" +static int daObjRCircle_c_createHeap(fopAc_ac_c* i_this) { + return static_cast(i_this)->createHeap(); } -#pragma pop - -/* ############################################################################################## */ -/* 80CB8D08-80CB8D08 000008 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ -#pragma push -#pragma force_active on -SECTION_DEAD static char const* const stringBase_80CB8D08 = "RCircle"; -#pragma pop /* 80CB8D10-80CB8D14 -00001 0004+00 3/3 0/0 0/0 .data l_arcName */ -SECTION_DATA static void* l_arcName = (void*)&d_a_obj_rcircle__stringBase0; +static char* l_arcName = "RCircle"; + +/* 80CB8678-80CB8704 000098 008C+00 2/2 0/0 0/0 .text __ct__14daObjRCircle_cFv */ +daObjRCircle_c::daObjRCircle_c() {} + +inline request_of_phase_process_class* daObjRCircle_getRes(daObjRCircle_c* i_rcircle) { + daObjRCircle_c* rCircle = (daObjRCircle_c*)i_rcircle; + return i_rcircle ? &rCircle->mPhaseReq : (request_of_phase_process_class*)rCircle; +} + +/* 80CB874C-80CB8814 00016C 00C8+00 1/0 0/0 0/0 .text __dt__14daObjRCircle_cFv */ +daObjRCircle_c::~daObjRCircle_c() { + dComIfG_resDelete(daObjRCircle_getRes(this), l_arcName); +} + +/* 80CB8814-80CB8928 000234 0114+00 1/1 0/0 0/0 .text createHeap__14daObjRCircle_cFv */ +int daObjRCircle_c::createHeap() { + J3DModelData* modelData = (J3DModelData*)dComIfG_getObjectRes(l_arcName, 5); + mpModel = mDoExt_J3DModel__create(modelData, 0x80000, 0x11000284); + + if (!mpModel) { + return 0; + } else { + J3DAnmTextureSRTKey* srtKey = (J3DAnmTextureSRTKey*)dComIfG_getObjectRes(l_arcName, 11); + mBtk.init(modelData, srtKey, 1, 2, 1.0f, 0, -1); + + J3DAnmTevRegKey* regKey = (J3DAnmTevRegKey*)dComIfG_getObjectRes(l_arcName, 8); + mBrk.init(modelData, regKey, 1, 0, 0.0f, 0, -1); + } + return 1; +} + +/* 80CB8928-80CB8A28 000348 0100+00 1/1 0/0 0/0 .text create__14daObjRCircle_cFv */ +int daObjRCircle_c::create() { + if (!fopAcM_CheckCondition(this, 8)) { + new (this) daObjRCircle_c(); + fopAcM_OnCondition(this, 8); + } + if (i_fopAcM_isSwitch(this, getSwBit())) { + return cPhs_ERROR_e; + } + daObjRCircle_c* tmp = this; + if (this) { + tmp = (daObjRCircle_c*)&mPhaseReq; + } + int phase = dComIfG_resLoad((request_of_phase_process_class*)tmp, l_arcName); + if (phase == cPhs_COMPLEATE_e) { + if (!fopAcM_entrySolidHeap(this, (heapCallbackFunc)daObjRCircle_c_createHeap, 0x1000)) { + return cPhs_ERROR_e; + + } else { + init(); + setModelMtx(); + fopAcM_SetMtx(this, mpModel->getBaseTRMtx()); + fopAcM_setCullSizeBox2(this, mpModel->getModelData()); + } + } + return phase; +} + +/* 80CB8A28-80CB8A5C 000448 0034+00 1/1 0/0 0/0 .text Delete__14daObjRCircle_cFv */ +int daObjRCircle_c::Delete() { + this->~daObjRCircle_c(); + return 1; +} + +/* 80CB8A5C-80CB8B28 00047C 00CC+00 1/1 0/0 0/0 .text draw__14daObjRCircle_cFv */ +int daObjRCircle_c::draw() { + g_env_light.settingTevStruct(16, ¤t.pos, &mTevStr); + g_env_light.setLightTevColorType_MAJI(mpModel->mModelData, &mTevStr); + J3DModelData* modelData = mpModel->mModelData; + mBtk.entry(modelData); + mBrk.entry(modelData); + dComIfGd_setListBG(); + mDoExt_modelUpdateDL(mpModel); + dComIfGd_setList(); + return 1; +} + +/* 80CB8B28-80CB8BE4 000548 00BC+00 1/1 0/0 0/0 .text execute__14daObjRCircle_cFv */ +int daObjRCircle_c::execute() { + if (mSwitch) { + if (mBrk.isStop()) { + fopAcM_delete(this); + } + } else { + if (i_fopAcM_isSwitch(this, getSwBit())) { + mSwitch = 1; + mBrk.setPlaySpeed(1.0f); + } + } + mBtk.play(); + mBrk.play(); + return 1; +} + +/* 80CB8BE4-80CB8BF0 000604 000C+00 1/1 0/0 0/0 .text init__14daObjRCircle_cFv */ +void daObjRCircle_c::init() { + mSwitch = 0; +} + +/* 80CB8BF0-80CB8C44 000610 0054+00 1/1 0/0 0/0 .text setModelMtx__14daObjRCircle_cFv */ +void daObjRCircle_c::setModelMtx() { + mDoMtx_stack_c::transS(current.pos.x, current.pos.y, current.pos.z); + PSMTXCopy(mDoMtx_stack_c::now, mpModel->mBaseTransformMtx); +} + +/* 80CB8C44-80CB8C98 000664 0054+00 1/0 0/0 0/0 .text daObjRCircle_create__FP14daObjRCircle_c */ +static int daObjRCircle_create(daObjRCircle_c* i_this) { + if (!fopAcM_CheckCondition(i_this, 8)) { + new (i_this) daObjRCircle_c(); + fopAcM_OnCondition(i_this, 8); + } + return i_this->create(); +} + +/* 80CB8C98-80CB8CB8 0006B8 0020+00 1/0 0/0 0/0 .text daObjRCircle_Delete__FP14daObjRCircle_c */ +static int daObjRCircle_Delete(daObjRCircle_c* i_this) { + return i_this->Delete(); +} + +/* 80CB8CB8-80CB8CD8 0006D8 0020+00 1/0 0/0 0/0 .text daObjRCircle_execute__FP14daObjRCircle_c */ +static int daObjRCircle_execute(daObjRCircle_c* i_this) { + return i_this->execute(); +} + +/* 80CB8CD8-80CB8CF8 0006F8 0020+00 1/0 0/0 0/0 .text daObjRCircle_draw__FP14daObjRCircle_c */ +static int daObjRCircle_draw(daObjRCircle_c* i_this) { + return i_this->draw(); +} /* 80CB8D14-80CB8D34 -00001 0020+00 1/0 0/0 0/0 .data daObjRCircle_METHODS */ -SECTION_DATA static void* daObjRCircle_METHODS[8] = { - (void*)daObjRCircle_create__FP14daObjRCircle_c, - (void*)daObjRCircle_Delete__FP14daObjRCircle_c, - (void*)daObjRCircle_execute__FP14daObjRCircle_c, - (void*)NULL, - (void*)daObjRCircle_draw__FP14daObjRCircle_c, - (void*)NULL, - (void*)NULL, - (void*)NULL, +static actor_method_class daObjRCircle_METHODS = { + (process_method_func)daObjRCircle_create, (process_method_func)daObjRCircle_Delete, + (process_method_func)daObjRCircle_execute, (process_method_func)NULL, + (process_method_func)daObjRCircle_draw, }; /* 80CB8D34-80CB8D64 -00001 0030+00 0/0 0/0 1/0 .data g_profile_Obj_RCircle */ -SECTION_DATA extern void* g_profile_Obj_RCircle[12] = { - (void*)0xFFFFFFFD, (void*)0x0007FFFD, - (void*)0x019D0000, (void*)&g_fpcLf_Method, - (void*)0x000005AC, (void*)NULL, - (void*)NULL, (void*)&g_fopAc_Method, - (void*)0x02E40000, (void*)&daObjRCircle_METHODS, - (void*)0x00044180, (void*)0x030E0000, -}; - -/* 80CB8D64-80CB8D70 000054 000C+00 2/2 0/0 0/0 .data __vt__14daObjRCircle_c */ -SECTION_DATA extern void* __vt__14daObjRCircle_c[3] = { - (void*)NULL /* RTTI */, - (void*)NULL, - (void*)__dt__14daObjRCircle_cFv, -}; - -/* 80CB8D70-80CB8D7C 000060 000C+00 3/3 0/0 0/0 .data __vt__12J3DFrameCtrl */ -SECTION_DATA extern void* __vt__12J3DFrameCtrl[3] = { - (void*)NULL /* RTTI */, - (void*)NULL, - (void*)__dt__12J3DFrameCtrlFv, -}; - -/* 80CB8678-80CB8704 000098 008C+00 2/2 0/0 0/0 .text __ct__14daObjRCircle_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm daObjRCircle_c::daObjRCircle_c() { - nofralloc -#include "asm/rel/d/a/obj/d_a_obj_rcircle/d_a_obj_rcircle/__ct__14daObjRCircle_cFv.s" -} -#pragma pop - -/* 80CB8704-80CB874C 000124 0048+00 1/0 0/0 0/0 .text __dt__12J3DFrameCtrlFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm J3DFrameCtrl::~J3DFrameCtrl() { - nofralloc -#include "asm/rel/d/a/obj/d_a_obj_rcircle/d_a_obj_rcircle/__dt__12J3DFrameCtrlFv.s" -} -#pragma pop - -/* 80CB874C-80CB8814 00016C 00C8+00 1/0 0/0 0/0 .text __dt__14daObjRCircle_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm daObjRCircle_c::~daObjRCircle_c() { - nofralloc -#include "asm/rel/d/a/obj/d_a_obj_rcircle/d_a_obj_rcircle/__dt__14daObjRCircle_cFv.s" -} -#pragma pop - -/* ############################################################################################## */ -/* 80CB8D00-80CB8D04 000000 0004+00 2/2 0/0 0/0 .rodata @3701 */ -SECTION_RODATA static f32 const lit_3701 = 1.0f; -COMPILER_STRIP_GATE(0x80CB8D00, &lit_3701); - -/* 80CB8D04-80CB8D08 000004 0004+00 2/2 0/0 0/0 .rodata @3702 */ -SECTION_RODATA static u8 const lit_3702[4] = { - 0x00, - 0x00, - 0x00, - 0x00, -}; -COMPILER_STRIP_GATE(0x80CB8D04, &lit_3702); - -/* 80CB8814-80CB8928 000234 0114+00 1/1 0/0 0/0 .text createHeap__14daObjRCircle_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void daObjRCircle_c::createHeap() { - nofralloc -#include "asm/rel/d/a/obj/d_a_obj_rcircle/d_a_obj_rcircle/createHeap__14daObjRCircle_cFv.s" -} -#pragma pop - -/* 80CB8928-80CB8A28 000348 0100+00 1/1 0/0 0/0 .text create__14daObjRCircle_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void daObjRCircle_c::create() { - nofralloc -#include "asm/rel/d/a/obj/d_a_obj_rcircle/d_a_obj_rcircle/create__14daObjRCircle_cFv.s" -} -#pragma pop - -/* 80CB8A28-80CB8A5C 000448 0034+00 1/1 0/0 0/0 .text Delete__14daObjRCircle_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void daObjRCircle_c::Delete() { - nofralloc -#include "asm/rel/d/a/obj/d_a_obj_rcircle/d_a_obj_rcircle/Delete__14daObjRCircle_cFv.s" -} -#pragma pop - -/* 80CB8A5C-80CB8B28 00047C 00CC+00 1/1 0/0 0/0 .text draw__14daObjRCircle_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void daObjRCircle_c::draw() { - nofralloc -#include "asm/rel/d/a/obj/d_a_obj_rcircle/d_a_obj_rcircle/draw__14daObjRCircle_cFv.s" -} -#pragma pop - -/* 80CB8B28-80CB8BE4 000548 00BC+00 1/1 0/0 0/0 .text execute__14daObjRCircle_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void daObjRCircle_c::execute() { - nofralloc -#include "asm/rel/d/a/obj/d_a_obj_rcircle/d_a_obj_rcircle/execute__14daObjRCircle_cFv.s" -} -#pragma pop - -/* 80CB8BE4-80CB8BF0 000604 000C+00 1/1 0/0 0/0 .text init__14daObjRCircle_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void daObjRCircle_c::init() { - nofralloc -#include "asm/rel/d/a/obj/d_a_obj_rcircle/d_a_obj_rcircle/init__14daObjRCircle_cFv.s" -} -#pragma pop - -/* 80CB8BF0-80CB8C44 000610 0054+00 1/1 0/0 0/0 .text setModelMtx__14daObjRCircle_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void daObjRCircle_c::setModelMtx() { - nofralloc -#include "asm/rel/d/a/obj/d_a_obj_rcircle/d_a_obj_rcircle/setModelMtx__14daObjRCircle_cFv.s" -} -#pragma pop - -/* 80CB8C44-80CB8C98 000664 0054+00 1/0 0/0 0/0 .text daObjRCircle_create__FP14daObjRCircle_c */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -static asm void daObjRCircle_create(daObjRCircle_c* param_0) { - nofralloc -#include "asm/rel/d/a/obj/d_a_obj_rcircle/d_a_obj_rcircle/daObjRCircle_create__FP14daObjRCircle_c.s" -} -#pragma pop - -/* 80CB8C98-80CB8CB8 0006B8 0020+00 1/0 0/0 0/0 .text daObjRCircle_Delete__FP14daObjRCircle_c */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -static asm void daObjRCircle_Delete(daObjRCircle_c* param_0) { - nofralloc -#include "asm/rel/d/a/obj/d_a_obj_rcircle/d_a_obj_rcircle/daObjRCircle_Delete__FP14daObjRCircle_c.s" -} -#pragma pop - -/* 80CB8CB8-80CB8CD8 0006D8 0020+00 1/0 0/0 0/0 .text daObjRCircle_execute__FP14daObjRCircle_c */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -static asm void daObjRCircle_execute(daObjRCircle_c* param_0) { - nofralloc -#include "asm/rel/d/a/obj/d_a_obj_rcircle/d_a_obj_rcircle/daObjRCircle_execute__FP14daObjRCircle_c.s" -} -#pragma pop - -/* 80CB8CD8-80CB8CF8 0006F8 0020+00 1/0 0/0 0/0 .text daObjRCircle_draw__FP14daObjRCircle_c */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -static asm void daObjRCircle_draw(daObjRCircle_c* param_0) { - nofralloc -#include "asm/rel/d/a/obj/d_a_obj_rcircle/d_a_obj_rcircle/daObjRCircle_draw__FP14daObjRCircle_c.s" -} -#pragma pop - -/* 80CB8D08-80CB8D08 000008 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ +extern actor_process_profile_definition g_profile_Obj_RCircle = { + -3, + 7, + -3, + PROC_Obj_RCircle, + &g_fpcLf_Method.mBase, + sizeof(daObjRCircle_c), + 0, + 0, + &g_fopAc_Method.base, + 0x02E4, + &daObjRCircle_METHODS, + 0x00044180, + 3, + 14, +}; \ No newline at end of file diff --git a/src/d/map/d_map_path_fmap.cpp b/src/d/map/d_map_path_fmap.cpp index 61c4e42e9b..81515cebf8 100644 --- a/src/d/map/d_map_path_fmap.cpp +++ b/src/d/map/d_map_path_fmap.cpp @@ -255,21 +255,10 @@ void fmpTresTypeGroupDataList_c::addTypeGroupData(u8 i_typeGroupNo, } /* 8003D818-8003D868 038158 0050+00 1/1 1/1 0/0 .text isArrival__22dMenu_Fmap_room_data_cFv */ -#ifdef NONMATCHING bool dMenu_Fmap_room_data_c::isArrival() { - u8 table_no = mp_parentStage->getStageArc()->getVisitedRoomSaveTableNo(); + u8 table_no = mp_parentStage->getStageArc()->mVisitedRoomSaveTableNo; return dComIfGs_isSaveVisitedRoom(table_no, m_roomNo) != false; } -#else -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm bool dMenu_Fmap_room_data_c::isArrival() { - nofralloc -#include "asm/d/map/d_map_path_fmap/isArrival__22dMenu_Fmap_room_data_cFv.s" -} -#pragma pop -#endif /* 8003D868-8003D92C 0381A8 00C4+00 1/1 0/0 0/0 .text * buildTresTypeGroup__22dMenu_Fmap_room_data_cFiii */ diff --git a/src/msg/scrn/d_msg_scrn_place.cpp b/src/msg/scrn/d_msg_scrn_place.cpp index 9bbd0669c4..fa3b5df2bd 100644 --- a/src/msg/scrn/d_msg_scrn_place.cpp +++ b/src/msg/scrn/d_msg_scrn_place.cpp @@ -1,257 +1,143 @@ -// -// Generated By: dol2asm -// Translation Unit: msg/scrn/d_msg_scrn_place -// +/** + * d_msg_scrn_place.cpp + * + */ #include "msg/scrn/d_msg_scrn_place.h" -#include "dol2asm.h" -#include "dolphin/types.h" +#include "JSystem/J2DGraph/J2DGrafContext.h" +#include "JSystem/J2DGraph/J2DScreen.h" +#include "d/msg/d_msg_object.h" +#include "d/pane/d_pane_class.h" -// -// Types: -// - -struct dMsgScrnPlace_c { - /* 802463CC */ dMsgScrnPlace_c(); - /* 802467C4 */ ~dMsgScrnPlace_c(); - /* 80246924 */ void exec(); - /* 80246A44 */ void drawSelf(); - /* 80246A9C */ void fukiAlpha(f32); - /* 80246B28 */ void fukiScale(f32); - /* 80246B2C */ void fukiTrans(f32, f32); - /* 80246B30 */ void fontAlpha(f32); -}; - -struct dMsgScrnBase_c { - /* 80238C40 */ void setSelectRubyString(char*, char*, char*); - /* 80238C44 */ void setSelectString(char*, char*, char*); - /* 80238C48 */ bool selectAnimeMove(u8, u8, bool); - /* 80238C50 */ void selectAnimeInit(u8, u8, f32, u8); - /* 80238C54 */ void arwAnimeMove(); - /* 80238C58 */ void arwAnimeInit(); - /* 80238C5C */ void fukiPosCalc(u8); - /* 80238C60 */ bool isSelect(); - /* 80238C68 */ bool selectAnimeEnd(); - /* 80238C70 */ void dotAnimeMove(); - /* 80238C74 */ void dotAnimeInit(); - /* 8023C0DC */ dMsgScrnBase_c(); - /* 8023C124 */ ~dMsgScrnBase_c(); - /* 8023C16C */ void init(); - /* 8023C234 */ void multiDraw(); - /* 8023C274 */ void draw(); - /* 8023C32C */ void drawOutFont(f32, f32, f32); - /* 8023C574 */ void isTalkNow(); -}; - -struct JKRExpHeap {}; - -struct JKRArchive {}; - -struct J2DTextBox { - /* 8030074C */ void setString(s16, char const*, ...); -}; - -struct J2DScreen { - /* 802F8498 */ J2DScreen(); - /* 802F8648 */ void setPriority(char const*, u32, JKRArchive*); -}; - -struct CPaneMgrAlpha { - /* 802557D0 */ void setAlphaRate(f32); -}; - -struct CPaneMgr { - /* 80253984 */ CPaneMgr(J2DScreen*, u64, u8, JKRExpHeap*); - /* 802542E8 */ void getGlobalPosX(); - /* 80254364 */ void getGlobalPosY(); - /* 802545B0 */ void paneTrans(f32, f32); -}; - -// -// Forward References: -// - -extern "C" void __ct__15dMsgScrnPlace_cFv(); -extern "C" void __dt__15dMsgScrnPlace_cFv(); -extern "C" void exec__15dMsgScrnPlace_cFv(); -extern "C" void drawSelf__15dMsgScrnPlace_cFv(); -extern "C" void fukiAlpha__15dMsgScrnPlace_cFf(); -extern "C" void fukiScale__15dMsgScrnPlace_cFf(); -extern "C" void fukiTrans__15dMsgScrnPlace_cFff(); -extern "C" void fontAlpha__15dMsgScrnPlace_cFf(); -extern "C" extern char const* const msg_scrn_d_msg_scrn_place__stringBase0; - -// -// External References: -// - -extern "C" void mDoExt_getRubyFont__Fv(); -extern "C" void dCam_getBody__Fv(); -extern "C" void setSelectRubyString__14dMsgScrnBase_cFPcPcPc(); -extern "C" void setSelectString__14dMsgScrnBase_cFPcPcPc(); -extern "C" bool selectAnimeMove__14dMsgScrnBase_cFUcUcb(); -extern "C" void selectAnimeInit__14dMsgScrnBase_cFUcUcfUc(); -extern "C" void arwAnimeMove__14dMsgScrnBase_cFv(); -extern "C" void arwAnimeInit__14dMsgScrnBase_cFv(); -extern "C" void fukiPosCalc__14dMsgScrnBase_cFUc(); -extern "C" bool isSelect__14dMsgScrnBase_cFv(); -extern "C" bool selectAnimeEnd__14dMsgScrnBase_cFv(); -extern "C" void dotAnimeMove__14dMsgScrnBase_cFv(); -extern "C" void dotAnimeInit__14dMsgScrnBase_cFv(); -extern "C" void __ct__14dMsgScrnBase_cFv(); -extern "C" void __dt__14dMsgScrnBase_cFv(); -extern "C" void init__14dMsgScrnBase_cFv(); -extern "C" void multiDraw__14dMsgScrnBase_cFv(); -extern "C" void draw__14dMsgScrnBase_cFv(); -extern "C" void drawOutFont__14dMsgScrnBase_cFfff(); -extern "C" void isTalkNow__14dMsgScrnBase_cFv(); -extern "C" void __ct__8CPaneMgrFP9J2DScreenUxUcP10JKRExpHeap(); -extern "C" void getGlobalPosX__8CPaneMgrFv(); -extern "C" void getGlobalPosY__8CPaneMgrFv(); -extern "C" void paneTrans__8CPaneMgrFff(); -extern "C" void dPaneClass_showNullPane__FP9J2DScreen(); -extern "C" void setAlphaRate__13CPaneMgrAlphaFf(); -extern "C" void* __nw__FUl(); -extern "C" void __dl__FPv(); -extern "C" void __ct__9J2DScreenFv(); -extern "C" void setPriority__9J2DScreenFPCcUlP10JKRArchive(); -extern "C" void setString__10J2DTextBoxFsPCce(); -extern "C" void _savegpr_26(); -extern "C" void _savegpr_29(); -extern "C" void _restgpr_26(); -extern "C" void _restgpr_29(); -extern "C" extern u8 g_dComIfG_gameInfo[122384]; -extern "C" extern u8 g_MsgObject_HIO_c[1040]; - -// -// Declarations: -// - -/* ############################################################################################## */ -/* 80399B78-80399B78 0261D8 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ -#pragma push -#pragma force_active on -SECTION_DEAD static char const* const stringBase_80399B78 = "zelda_stage_title_foreign.blo"; -SECTION_DEAD static char const* const stringBase_80399B96 = ""; -/* @stringBase0 padding */ -SECTION_DEAD static char const* const pad_80399B97 = ""; -#pragma pop - -/* 803C12B0-803C12E8 01E3D0 0038+00 1/1 0/0 0/0 .data t_tag$3877 */ -SECTION_DATA static u8 t_tag[56] = { - 0x00, 0x73, 0x66, 0x6F, 0x6E, 0x74, 0x62, 0x30, 0x00, 0x73, 0x66, 0x6F, 0x6E, 0x74, - 0x62, 0x31, 0x00, 0x73, 0x66, 0x6F, 0x6E, 0x74, 0x62, 0x32, 0x00, 0x73, 0x66, 0x6F, - 0x6E, 0x74, 0x6C, 0x30, 0x00, 0x73, 0x66, 0x6F, 0x6E, 0x74, 0x6C, 0x31, 0x00, 0x73, - 0x66, 0x6F, 0x6E, 0x74, 0x6C, 0x32, 0x00, 0x73, 0x66, 0x6F, 0x6E, 0x74, 0x30, 0x30, -}; - -/* 803C12E8-803C1340 01E408 0058+00 2/2 0/0 0/0 .data __vt__15dMsgScrnPlace_c */ -SECTION_DATA extern void* __vt__15dMsgScrnPlace_c[22] = { - (void*)NULL /* RTTI */, - (void*)NULL, - (void*)draw__14dMsgScrnBase_cFv, - (void*)__dt__15dMsgScrnPlace_cFv, - (void*)exec__15dMsgScrnPlace_cFv, - (void*)multiDraw__14dMsgScrnBase_cFv, - (void*)drawSelf__15dMsgScrnPlace_cFv, - (void*)setSelectString__14dMsgScrnBase_cFPcPcPc, - (void*)setSelectRubyString__14dMsgScrnBase_cFPcPcPc, - (void*)arwAnimeInit__14dMsgScrnBase_cFv, - (void*)arwAnimeMove__14dMsgScrnBase_cFv, - (void*)dotAnimeInit__14dMsgScrnBase_cFv, - (void*)dotAnimeMove__14dMsgScrnBase_cFv, - (void*)isSelect__14dMsgScrnBase_cFv, - (void*)selectAnimeInit__14dMsgScrnBase_cFUcUcfUc, - (void*)selectAnimeMove__14dMsgScrnBase_cFUcUcb, - (void*)selectAnimeEnd__14dMsgScrnBase_cFv, - (void*)fukiScale__15dMsgScrnPlace_cFf, - (void*)fukiTrans__15dMsgScrnPlace_cFff, - (void*)fukiAlpha__15dMsgScrnPlace_cFf, - (void*)fontAlpha__15dMsgScrnPlace_cFf, - (void*)fukiPosCalc__14dMsgScrnBase_cFUc, -}; - -/* 80454CE8-80454CEC 0032E8 0004+00 2/2 0/0 0/0 .sdata2 @3998 */ -SECTION_SDATA2 static u8 lit_3998[4] = { - 0x00, - 0x00, - 0x00, - 0x00, -}; - -/* 80454CEC-80454CF0 0032EC 0004+00 3/3 0/0 0/0 .sdata2 @3999 */ -SECTION_SDATA2 static f32 lit_3999 = 1.0f; - -/* 80454CF0-80454CF8 0032F0 0004+04 1/1 0/0 0/0 .sdata2 @4000 */ -SECTION_SDATA2 static f32 lit_4000[1 + 1 /* padding */] = { - 6.0f / 5.0f, - /* padding */ - 0.0f, -}; +extern "C" extern dMsgObject_HIO_c g_MsgObject_HIO_c; /* 802463CC-802467C4 240D0C 03F8+00 0/0 1/1 0/0 .text __ct__15dMsgScrnPlace_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm dMsgScrnPlace_c::dMsgScrnPlace_c() { - nofralloc -#include "asm/msg/scrn/d_msg_scrn_place/__ct__15dMsgScrnPlace_cFv.s" +dMsgScrnPlace_c::dMsgScrnPlace_c() { + static u64 t_tag[7] = { + 'sfontb0', 'sfontb1', 'sfontb2', 'sfontl0', 'sfontl1', 'sfontl2', 'sfont00', + }; + init(); + + dCamera_c* camera = dCam_getBody(); + if (camera->mTrimSize && dCam_getBody()->mTrimSize != 4) { + mScaleX = g_MsgObject_HIO_c.mStageTitleCharPosY; + mScaleY = g_MsgObject_HIO_c.mStageTitleBasePosY; + } else { + mScaleY = 0.0f; + mScaleX = 0.0f; + } + + mpScreen = new J2DScreen(); + mpScreen->setPriority("zelda_stage_title_foreign.blo", 0x20000, dComIfGp_getMsgArchive(4)); + dPaneClass_showNullPane(mpScreen); + + mpPmp_c = new CPaneMgr(mpScreen, 'n_all', 2, NULL); + mpPmp_c->scale(g_MsgObject_HIO_c.mStageTitleScaleX, g_MsgObject_HIO_c.mStageTitleScaleY); + + mpFontParent = new CPaneMgr(mpScreen, 's_font_n', 0, NULL); + mpFontParent->scale(g_MsgObject_HIO_c.mStageTitleCharSizeX, + g_MsgObject_HIO_c.mStageTitleCharSizeY); + mpFontParent->paneTrans(g_MsgObject_HIO_c.mStageTitleCharPosX, + g_MsgObject_HIO_c.mStageTitleCharPosY - mScaleX); + + mpBaseParent = new CPaneMgr(mpScreen, 'base_n', 2, NULL); + mpBaseParent->scale(g_MsgObject_HIO_c.mStageTitleBaseSizeX, + g_MsgObject_HIO_c.mStageTitleBaseSizeY); + mpBaseParent->paneTrans(g_MsgObject_HIO_c.mStageTitleBasePosX, + g_MsgObject_HIO_c.mStageTitleBasePosY - mScaleY); + + for (int i = 0; i < 7; i++) { + mpTm_c[i] = new CPaneMgr(mpScreen, t_tag[i], 0, NULL); + ((J2DTextBox*)mpTm_c[i]->getPanePtr())->setFont(mDoExt_getRubyFont()); + ((J2DTextBox*)mpTm_c[i]->getPanePtr())->setString(0x80, ""); + ((J2DTextBox*)mpTm_c[i]->getPanePtr())->setCharSpace(1.0f); + } + + ((J2DTextBox*)mpTm_c[0]->getPanePtr())->getFontSize(mFontSize); + mTBoxWidth = mpTm_c[0]->getSizeX(); + mTBoxHeight = mpTm_c[0]->getSizeY(); + mLineSpace = ((J2DTextBox*)mpTm_c[0]->getPanePtr())->getLineSpace(); + mCharSpace = ((J2DTextBox*)mpTm_c[0]->getPanePtr())->getCharSpace(); + + for (int i = 0; i < 7; i++) { + ((J2DTextBox*)mpTm_c[i]->getPanePtr())->setLineSpace(mLineSpace); + ((J2DTextBox*)mpTm_c[i]->getPanePtr()) + ->resize(mpTm_c[i]->getSizeX() * 1.2f, mpTm_c[i]->getSizeY()); + } + + mTextBoxPosX = mpTm_c[0]->getGlobalPosX(); + mTextBoxPosY = mpTm_c[0]->getGlobalPosY(); } -#pragma pop /* 802467C4-80246924 241104 0160+00 1/0 0/0 0/0 .text __dt__15dMsgScrnPlace_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm dMsgScrnPlace_c::~dMsgScrnPlace_c() { - nofralloc -#include "asm/msg/scrn/d_msg_scrn_place/__dt__15dMsgScrnPlace_cFv.s" +dMsgScrnPlace_c::~dMsgScrnPlace_c() { + delete mpScreen; + mpScreen = NULL; + + delete mpPmp_c; + mpPmp_c = NULL; + + delete mpFontParent; + mpFontParent = NULL; + + delete mpBaseParent; + mpBaseParent = NULL; + + for (int i = 0; i < 7; i++) { + delete mpTm_c[i]; + mpTm_c[i] = NULL; + } + + dComIfGp_getMsgArchive(4)->removeResourceAll(); } -#pragma pop /* 80246924-80246A44 241264 0120+00 1/0 0/0 0/0 .text exec__15dMsgScrnPlace_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void dMsgScrnPlace_c::exec() { - nofralloc -#include "asm/msg/scrn/d_msg_scrn_place/exec__15dMsgScrnPlace_cFv.s" +void dMsgScrnPlace_c::exec() { + mpPmp_c->scale(g_MsgObject_HIO_c.mStageTitleScaleX, g_MsgObject_HIO_c.mStageTitleScaleY); + + mpFontParent->scale(g_MsgObject_HIO_c.mStageTitleCharSizeX, + g_MsgObject_HIO_c.mStageTitleCharSizeY); + mpFontParent->paneTrans(g_MsgObject_HIO_c.mStageTitleCharPosX, + g_MsgObject_HIO_c.mStageTitleCharPosY - mScaleX); + + mpBaseParent->scale(g_MsgObject_HIO_c.mStageTitleBaseSizeX, + g_MsgObject_HIO_c.mStageTitleBaseSizeY); + mpBaseParent->paneTrans(g_MsgObject_HIO_c.mStageTitleBasePosX, + g_MsgObject_HIO_c.mStageTitleBasePosY - mScaleY); + + if (isTalkNow()) { + fukiAlpha(1.0f); + } } -#pragma pop /* 80246A44-80246A9C 241384 0058+00 1/0 0/0 0/0 .text drawSelf__15dMsgScrnPlace_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void dMsgScrnPlace_c::drawSelf() { - nofralloc -#include "asm/msg/scrn/d_msg_scrn_place/drawSelf__15dMsgScrnPlace_cFv.s" +void dMsgScrnPlace_c::drawSelf() { + J2DGrafContext* grafContext = dComIfGp_getCurrentGrafPort(); + grafContext->setup2D(); + drawOutFont(0.0f, 0.0f, 1.0f); } -#pragma pop /* 80246A9C-80246B28 2413DC 008C+00 1/0 0/0 0/0 .text fukiAlpha__15dMsgScrnPlace_cFf */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void dMsgScrnPlace_c::fukiAlpha(f32 param_0) { - nofralloc -#include "asm/msg/scrn/d_msg_scrn_place/fukiAlpha__15dMsgScrnPlace_cFf.s" +void dMsgScrnPlace_c::fukiAlpha(f32 i_rate) { + mpPmp_c->setAlphaRate(i_rate); + mpBaseParent->setAlphaRate(i_rate * g_MsgObject_HIO_c.mStageTitleBaseAlpha); + + for (int i = 0; i < 7; i++) { + mpTm_c[i]->setAlphaRate(i_rate); + } } -#pragma pop /* 80246B28-80246B2C 241468 0004+00 1/0 0/0 0/0 .text fukiScale__15dMsgScrnPlace_cFf */ -void dMsgScrnPlace_c::fukiScale(f32 param_0) { +void dMsgScrnPlace_c::fukiScale(f32) { /* empty function */ } /* 80246B2C-80246B30 24146C 0004+00 1/0 0/0 0/0 .text fukiTrans__15dMsgScrnPlace_cFff */ -void dMsgScrnPlace_c::fukiTrans(f32 param_0, f32 param_1) { +void dMsgScrnPlace_c::fukiTrans(f32, f32) { /* empty function */ } /* 80246B30-80246B34 241470 0004+00 1/0 0/0 0/0 .text fontAlpha__15dMsgScrnPlace_cFf */ -void dMsgScrnPlace_c::fontAlpha(f32 param_0) { +void dMsgScrnPlace_c::fontAlpha(f32) { /* empty function */ } - -/* 80399B78-80399B78 0261D8 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ diff --git a/src/msg/scrn/d_msg_scrn_staff.cpp b/src/msg/scrn/d_msg_scrn_staff.cpp index 74b4e35a29..b84c880ddd 100644 --- a/src/msg/scrn/d_msg_scrn_staff.cpp +++ b/src/msg/scrn/d_msg_scrn_staff.cpp @@ -1,231 +1,93 @@ -// -// Generated By: dol2asm -// Translation Unit: msg/scrn/d_msg_scrn_staff -// +/** + * d_msg_scrn_staff.cpp + * +*/ #include "msg/scrn/d_msg_scrn_staff.h" -#include "dol2asm.h" -#include "dolphin/types.h" +#include "JSystem/J2DGraph/J2DGrafContext.h" +#include "JSystem/J2DGraph/J2DScreen.h" +#include "d/msg/d_msg_object.h" +#include "d/pane/d_pane_class.h" -// -// Types: -// - -struct dMsgScrnStaff_c { - /* 80246B34 */ dMsgScrnStaff_c(u8); - /* 80246DD8 */ ~dMsgScrnStaff_c(); - /* 80246EE8 */ void exec(); - /* 80246F68 */ void drawSelf(); - /* 80246FC0 */ void fukiAlpha(f32); - /* 80246FE4 */ void fukiScale(f32); - /* 80246FE8 */ void fukiTrans(f32, f32); - /* 80246FEC */ void fontAlpha(f32); -}; - -struct dMsgScrnBase_c { - /* 80238C40 */ void setSelectRubyString(char*, char*, char*); - /* 80238C44 */ void setSelectString(char*, char*, char*); - /* 80238C48 */ bool selectAnimeMove(u8, u8, bool); - /* 80238C50 */ void selectAnimeInit(u8, u8, f32, u8); - /* 80238C54 */ void arwAnimeMove(); - /* 80238C58 */ void arwAnimeInit(); - /* 80238C5C */ void fukiPosCalc(u8); - /* 80238C60 */ bool isSelect(); - /* 80238C68 */ bool selectAnimeEnd(); - /* 80238C70 */ void dotAnimeMove(); - /* 80238C74 */ void dotAnimeInit(); - /* 8023C0DC */ dMsgScrnBase_c(); - /* 8023C124 */ ~dMsgScrnBase_c(); - /* 8023C16C */ void init(); - /* 8023C234 */ void multiDraw(); - /* 8023C274 */ void draw(); - /* 8023C32C */ void drawOutFont(f32, f32, f32); - /* 8023C574 */ void isTalkNow(); -}; - -struct JKRExpHeap {}; - -struct JKRArchive {}; - -struct J2DTextBox { - /* 8030074C */ void setString(s16, char const*, ...); -}; - -struct J2DScreen { - /* 802F8498 */ J2DScreen(); - /* 802F8648 */ void setPriority(char const*, u32, JKRArchive*); -}; - -struct CPaneMgrAlpha { - /* 802557D0 */ void setAlphaRate(f32); -}; - -struct CPaneMgr { - /* 80253984 */ CPaneMgr(J2DScreen*, u64, u8, JKRExpHeap*); - /* 802542E8 */ void getGlobalPosX(); - /* 80254364 */ void getGlobalPosY(); -}; - -// -// Forward References: -// - -extern "C" void __ct__15dMsgScrnStaff_cFUc(); -extern "C" void __dt__15dMsgScrnStaff_cFv(); -extern "C" void exec__15dMsgScrnStaff_cFv(); -extern "C" void drawSelf__15dMsgScrnStaff_cFv(); -extern "C" void fukiAlpha__15dMsgScrnStaff_cFf(); -extern "C" void fukiScale__15dMsgScrnStaff_cFf(); -extern "C" void fukiTrans__15dMsgScrnStaff_cFff(); -extern "C" void fontAlpha__15dMsgScrnStaff_cFf(); -extern "C" extern char const* const msg_scrn_d_msg_scrn_staff__stringBase0; - -// -// External References: -// - -extern "C" void mDoExt_getMesgFont__Fv(); -extern "C" void setSelectRubyString__14dMsgScrnBase_cFPcPcPc(); -extern "C" void setSelectString__14dMsgScrnBase_cFPcPcPc(); -extern "C" bool selectAnimeMove__14dMsgScrnBase_cFUcUcb(); -extern "C" void selectAnimeInit__14dMsgScrnBase_cFUcUcfUc(); -extern "C" void arwAnimeMove__14dMsgScrnBase_cFv(); -extern "C" void arwAnimeInit__14dMsgScrnBase_cFv(); -extern "C" void fukiPosCalc__14dMsgScrnBase_cFUc(); -extern "C" bool isSelect__14dMsgScrnBase_cFv(); -extern "C" bool selectAnimeEnd__14dMsgScrnBase_cFv(); -extern "C" void dotAnimeMove__14dMsgScrnBase_cFv(); -extern "C" void dotAnimeInit__14dMsgScrnBase_cFv(); -extern "C" void __ct__14dMsgScrnBase_cFv(); -extern "C" void __dt__14dMsgScrnBase_cFv(); -extern "C" void init__14dMsgScrnBase_cFv(); -extern "C" void multiDraw__14dMsgScrnBase_cFv(); -extern "C" void draw__14dMsgScrnBase_cFv(); -extern "C" void drawOutFont__14dMsgScrnBase_cFfff(); -extern "C" void isTalkNow__14dMsgScrnBase_cFv(); -extern "C" void __ct__8CPaneMgrFP9J2DScreenUxUcP10JKRExpHeap(); -extern "C" void getGlobalPosX__8CPaneMgrFv(); -extern "C" void getGlobalPosY__8CPaneMgrFv(); -extern "C" void dPaneClass_showNullPane__FP9J2DScreen(); -extern "C" void setAlphaRate__13CPaneMgrAlphaFf(); -extern "C" void* __nw__FUl(); -extern "C" void __dl__FPv(); -extern "C" void __ct__9J2DScreenFv(); -extern "C" void setPriority__9J2DScreenFPCcUlP10JKRArchive(); -extern "C" void setString__10J2DTextBoxFsPCce(); -extern "C" void _savegpr_26(); -extern "C" void _restgpr_26(); -extern "C" extern u8 g_dComIfG_gameInfo[122384]; -extern "C" extern u8 g_MsgObject_HIO_c[1040]; - -// -// Declarations: -// - -/* ############################################################################################## */ -/* 80399B98-80399B98 0261F8 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ -#pragma push -#pragma force_active on -SECTION_DEAD static char const* const stringBase_80399B98 = "zelda_staff_roll.blo"; -SECTION_DEAD static char const* const stringBase_80399BAD = ""; -/* @stringBase0 padding */ -SECTION_DEAD static char const* const pad_80399BAE = "\0"; -#pragma pop +extern "C" extern dMsgObject_HIO_c g_MsgObject_HIO_c; /* 803C1340-803C1370 01E460 0030+00 1/1 0/0 0/0 .data t_tag$3752 */ -SECTION_DATA static u8 t_tag[48] = { - 0x00, 0x72, 0x69, 0x67, 0x68, 0x74, 0x5F, 0x73, 0x00, 0x00, 0x00, 0x72, 0x69, 0x67, 0x68, 0x74, - 0x63, 0x65, 0x6E, 0x74, 0x65, 0x72, 0x5F, 0x73, 0x00, 0x00, 0x63, 0x65, 0x6E, 0x74, 0x65, 0x72, - 0x00, 0x00, 0x6C, 0x65, 0x66, 0x74, 0x5F, 0x73, 0x00, 0x00, 0x00, 0x00, 0x6C, 0x65, 0x66, 0x74, -}; - -/* 803C1370-803C13C8 01E490 0058+00 2/2 0/0 0/0 .data __vt__15dMsgScrnStaff_c */ -SECTION_DATA extern void* __vt__15dMsgScrnStaff_c[22] = { - (void*)NULL /* RTTI */, - (void*)NULL, - (void*)draw__14dMsgScrnBase_cFv, - (void*)__dt__15dMsgScrnStaff_cFv, - (void*)exec__15dMsgScrnStaff_cFv, - (void*)multiDraw__14dMsgScrnBase_cFv, - (void*)drawSelf__15dMsgScrnStaff_cFv, - (void*)setSelectString__14dMsgScrnBase_cFPcPcPc, - (void*)setSelectRubyString__14dMsgScrnBase_cFPcPcPc, - (void*)arwAnimeInit__14dMsgScrnBase_cFv, - (void*)arwAnimeMove__14dMsgScrnBase_cFv, - (void*)dotAnimeInit__14dMsgScrnBase_cFv, - (void*)dotAnimeMove__14dMsgScrnBase_cFv, - (void*)isSelect__14dMsgScrnBase_cFv, - (void*)selectAnimeInit__14dMsgScrnBase_cFUcUcfUc, - (void*)selectAnimeMove__14dMsgScrnBase_cFUcUcb, - (void*)selectAnimeEnd__14dMsgScrnBase_cFv, - (void*)fukiScale__15dMsgScrnStaff_cFf, - (void*)fukiTrans__15dMsgScrnStaff_cFff, - (void*)fukiAlpha__15dMsgScrnStaff_cFf, - (void*)fontAlpha__15dMsgScrnStaff_cFf, - (void*)fukiPosCalc__14dMsgScrnBase_cFUc, -}; - -/* 80454CF8-80454CFC 0032F8 0004+00 2/2 0/0 0/0 .sdata2 @3842 */ -SECTION_SDATA2 static u8 lit_3842[4] = { - 0x00, - 0x00, - 0x00, - 0x00, +static u64 t_tag[6] = { + 'right_s', 'right', 'center_s', 'center', 'left_s', 'left', }; /* 80246B34-80246DD8 241474 02A4+00 0/0 1/1 0/0 .text __ct__15dMsgScrnStaff_cFUc */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm dMsgScrnStaff_c::dMsgScrnStaff_c(u8 param_0) { - nofralloc -#include "asm/msg/scrn/d_msg_scrn_staff/__ct__15dMsgScrnStaff_cFUc.s" +dMsgScrnStaff_c::dMsgScrnStaff_c(u8 param_0) { + init(); + + field_0xd0 = 0.0f; + field_0xcc = 0.0f; + + mpScreen = new J2DScreen(); + mpScreen->setPriority("zelda_staff_roll.blo", 0x20000, dComIfGp_getMsgArchive(6)); + dPaneClass_showNullPane(mpScreen); + + mpPmp_c = new CPaneMgr(mpScreen, 'ROOT', 2, NULL); + mpScreen->search('left_n')->hide(); + mpScreen->search('right_n')->hide(); + + for (int i = 0; i < 6; i++) { + mpTm_c[i] = new CPaneMgr(mpScreen, t_tag[i], NULL, NULL); + ((J2DTextBox*)mpTm_c[i]->getPanePtr())->setFont(mDoExt_getMesgFont()); + ((J2DTextBox*)mpTm_c[i]->getPanePtr())->setString(0x200, ""); + } + + ((J2DTextBox*)mpTm_c[0]->getPanePtr())->getFontSize(mFontSize); + mTBoxWidth = mpTm_c[0]->getSizeX(); + mTBoxHeight = mpTm_c[0]->getSizeY(); + mLineSpace = ((J2DTextBox*)mpTm_c[0]->getPanePtr())->getLineSpace(); + mCharSpace = ((J2DTextBox*)mpTm_c[0]->getPanePtr())->getCharSpace(); + + for (int i = 0; i < 6; i++) { + ((J2DTextBox*)mpTm_c[i]->getPanePtr())->setLineSpace(mLineSpace); + ((J2DTextBox*)mpTm_c[i]->getPanePtr()) + ->resize(mpTm_c[i]->getSizeX(), mpTm_c[i]->getSizeY()); + } + + mTextBoxPosX = mpTm_c[0]->getGlobalPosX(); + mTextBoxPosY = mpTm_c[0]->getGlobalPosY(); } -#pragma pop /* 80246DD8-80246EE8 241718 0110+00 1/0 0/0 0/0 .text __dt__15dMsgScrnStaff_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm dMsgScrnStaff_c::~dMsgScrnStaff_c() { - nofralloc -#include "asm/msg/scrn/d_msg_scrn_staff/__dt__15dMsgScrnStaff_cFv.s" -} -#pragma pop +dMsgScrnStaff_c::~dMsgScrnStaff_c() { + delete mpScreen; + mpScreen = NULL; -/* ############################################################################################## */ -/* 80454CFC-80454D00 0032FC 0004+00 2/2 0/0 0/0 .sdata2 @3877 */ -SECTION_SDATA2 static f32 lit_3877 = 1.0f; + delete mpPmp_c; + mpPmp_c = NULL; + + for (int i = 0; i < 6; i++) { + delete mpTm_c[i]; + mpTm_c[i] = 0; + } + + dComIfGp_getMsgArchive(6)->removeResourceAll(); +} /* 80246EE8-80246F68 241828 0080+00 1/0 0/0 0/0 .text exec__15dMsgScrnStaff_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void dMsgScrnStaff_c::exec() { - nofralloc -#include "asm/msg/scrn/d_msg_scrn_staff/exec__15dMsgScrnStaff_cFv.s" +void dMsgScrnStaff_c::exec() { + mpPmp_c->scale(g_MsgObject_HIO_c.mStageTitleScaleX, g_MsgObject_HIO_c.mStageTitleScaleY); + if (isTalkNow()) { + fukiAlpha(1.0f); + } } -#pragma pop /* 80246F68-80246FC0 2418A8 0058+00 1/0 0/0 0/0 .text drawSelf__15dMsgScrnStaff_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void dMsgScrnStaff_c::drawSelf() { - nofralloc -#include "asm/msg/scrn/d_msg_scrn_staff/drawSelf__15dMsgScrnStaff_cFv.s" +void dMsgScrnStaff_c::drawSelf() { + J2DGrafContext* grafContext = dComIfGp_getCurrentGrafPort(); + grafContext->setup2D(); + drawOutFont(0.0f, 0.0f, 1.0f); } -#pragma pop /* 80246FC0-80246FE4 241900 0024+00 1/0 0/0 0/0 .text fukiAlpha__15dMsgScrnStaff_cFf */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void dMsgScrnStaff_c::fukiAlpha(f32 param_0) { - nofralloc -#include "asm/msg/scrn/d_msg_scrn_staff/fukiAlpha__15dMsgScrnStaff_cFf.s" +void dMsgScrnStaff_c::fukiAlpha(f32 i_rate) { + mpPmp_c->setAlphaRate(i_rate); } -#pragma pop /* 80246FE4-80246FE8 241924 0004+00 1/0 0/0 0/0 .text fukiScale__15dMsgScrnStaff_cFf */ void dMsgScrnStaff_c::fukiScale(f32 param_0) { @@ -240,6 +102,4 @@ void dMsgScrnStaff_c::fukiTrans(f32 param_0, f32 param_1) { /* 80246FEC-80246FF0 24192C 0004+00 1/0 0/0 0/0 .text fontAlpha__15dMsgScrnStaff_cFf */ void dMsgScrnStaff_c::fontAlpha(f32 param_0) { /* empty function */ -} - -/* 80399B98-80399B98 0261F8 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ +} \ No newline at end of file