From f15a9c673edffa734b6fefee90efc7477a9d78e5 Mon Sep 17 00:00:00 2001 From: hatal175 Date: Mon, 9 Dec 2024 18:50:37 +0200 Subject: [PATCH] daGrdWater_c OK (#2260) --- .../rels/d_a_obj_groundwater/symbols.txt | 16 +- configure.py | 2 +- include/d/actor/d_a_obj_groundwater.h | 60 +- include/d/d_bg_s_movebg_actor.h | 2 + include/d/d_com_inf_game.h | 4 + src/d/actor/d_a_obj_groundwater.cpp | 729 +++++++++--------- 6 files changed, 425 insertions(+), 388 deletions(-) diff --git a/config/GZ2E01/rels/d_a_obj_groundwater/symbols.txt b/config/GZ2E01/rels/d_a_obj_groundwater/symbols.txt index 3b4acd8ea78..0a72fd0232e 100644 --- a/config/GZ2E01/rels/d_a_obj_groundwater/symbols.txt +++ b/config/GZ2E01/rels/d_a_obj_groundwater/symbols.txt @@ -23,10 +23,10 @@ init_modeLevelDownB__12daGrdWater_cFv = .text:0x000010C4; // type:function size: modeLevelDownB__12daGrdWater_cFv = .text:0x00001138; // type:function size:0x5C scope:global Draw__12daGrdWater_cFv = .text:0x00001194; // type:function size:0x298 scope:global Delete__12daGrdWater_cFv = .text:0x0000142C; // type:function size:0x30 scope:global -daGrdWater_Draw__FP12daGrdWater_c = .text:0x0000145C; // type:function size:0x2C scope:global -daGrdWater_Execute__FP12daGrdWater_c = .text:0x00001488; // type:function size:0x20 scope:global -daGrdWater_Delete__FP12daGrdWater_c = .text:0x000014A8; // type:function size:0x20 scope:global -daGrdWater_Create__FP10fopAc_ac_c = .text:0x000014C8; // type:function size:0x20 scope:global +daGrdWater_Draw__FP12daGrdWater_c = .text:0x0000145C; // type:function size:0x2C scope:local +daGrdWater_Execute__FP12daGrdWater_c = .text:0x00001488; // type:function size:0x20 scope:local +daGrdWater_Delete__FP12daGrdWater_c = .text:0x000014A8; // type:function size:0x20 scope:local +daGrdWater_Create__FP10fopAc_ac_c = .text:0x000014C8; // type:function size:0x20 scope:local __dt__16daGrdWater_HIO_cFv = .text:0x000014E8; // type:function size:0x5C scope:global __sinit_d_a_obj_groundwater_cpp = .text:0x00001544; // type:function size:0xC8 scope:local _ctors = .ctors:0x00000000; // type:label scope:global @@ -39,15 +39,15 @@ _dtors = .dtors:0x00000000; // type:label scope:global @4253 = .rodata:0x00000010; // type:object size:0x4 scope:local @stringBase0 = .rodata:0x00000014; // type:object size:0x6 scope:local data:string_table ...data.0 = .data:0x00000000; // type:label scope:local -cNullVec__6Z2Calc = .data:0x00000000; // type:object size:0xC scope:global +cNullVec__6Z2Calc = .data:0x00000000; // type:object size:0xC scope:local @1787 = .data:0x0000000C; // type:object size:0x4 scope:local @3993 = .data:0x00000020; // type:object size:0xC scope:local @3994 = .data:0x0000002C; // type:object size:0xC scope:local @3995 = .data:0x00000038; // type:object size:0xC scope:local @3996 = .data:0x00000044; // type:object size:0xC scope:local @3997 = .data:0x00000050; // type:object size:0xC scope:local -l_mode_func = .data:0x0000005C; // type:object size:0x3C scope:global data:4byte -l_daGrdWater_Method = .data:0x00000098; // type:object size:0x20 scope:global +l_mode_func = .data:0x0000005C; // type:object size:0x3C scope:local data:4byte +l_daGrdWater_Method = .data:0x00000098; // type:object size:0x20 scope:local g_profile_GRDWATER = .data:0x000000B8; // type:object size:0x30 scope:global __vt__12J3DFrameCtrl = .data:0x000000E8; // type:object size:0xC scope:global __vt__12daGrdWater_c = .data:0x000000F4; // type:object size:0x28 scope:global @@ -55,4 +55,4 @@ __vt__16daGrdWater_HIO_c = .data:0x0000011C; // type:object size:0xC scope:globa __vt__14mDoHIO_entry_c = .data:0x00000128; // type:object size:0xC scope:global __global_destructor_chain = .bss:0x00000000; // type:object size:0x4 scope:global @3636 = .bss:0x00000008; // type:object size:0xC scope:local -l_HIO = .bss:0x00000014; // type:object size:0x14 scope:global +l_HIO = .bss:0x00000014; // type:object size:0x14 scope:local diff --git a/configure.py b/configure.py index 23121234e61..a359d62ed82 100644 --- a/configure.py +++ b/configure.py @@ -1832,7 +1832,7 @@ config.libs = [ ActorRel(Matching, "d_a_obj_graWall"), ActorRel(NonMatching, "d_a_obj_gra_rock"), ActorRel(Matching, "d_a_obj_grave_stone"), - ActorRel(NonMatching, "d_a_obj_groundwater"), + ActorRel(Matching, "d_a_obj_groundwater"), ActorRel(NonMatching, "d_a_obj_grz_rock"), ActorRel(NonMatching, "d_a_obj_h_saku"), ActorRel(NonMatching, "d_a_obj_hakai_brl"), diff --git a/include/d/actor/d_a_obj_groundwater.h b/include/d/actor/d_a_obj_groundwater.h index c0ca0b8ffd3..b5f4bd3ed2f 100644 --- a/include/d/actor/d_a_obj_groundwater.h +++ b/include/d/actor/d_a_obj_groundwater.h @@ -1,7 +1,10 @@ #ifndef D_A_OBJ_GROUNDWATER_H #define D_A_OBJ_GROUNDWATER_H +#include "SSystem/SComponent/c_phase.h" +#include "d/d_bg_s_movebg_actor.h" #include "f_op/f_op_actor_mng.h" +#include "m_Do/m_Do_hostIO.h" /** * @ingroup actors-objects @@ -11,13 +14,23 @@ * @details * */ -class daGrdWater_c : public fopAc_ac_c { +class daGrdWater_c : public dBgS_MoveBgActor { public: + typedef void (daGrdWater_c::*modeFunc)(); + + enum Mode { + WAIT, + LEVEL_UP_A, + LEVEL_DOWN_A, + LEVEL_UP_B, + LEVEL_DOWN_B, + }; + /* 80C13540 */ void setBaseMtx(); - /* 80C13618 */ void CreateHeap(); - /* 80C139E4 */ void create(); + /* 80C13618 */ int CreateHeap(); + /* 80C139E4 */ int create(); /* 80C13DB0 */ daGrdWater_c(); - /* 80C13FEC */ void Execute(f32 (**)[3][4]); + /* 80C13FEC */ int Execute(Mtx**); /* 80C14194 */ void init_modeWait(); /* 80C141A0 */ void modeWait(); /* 80C141A4 */ void init_modeLevelUpA(); @@ -28,19 +41,48 @@ public: /* 80C14414 */ void modeLevelUpB(); /* 80C14484 */ void init_modeLevelDownB(); /* 80C144F8 */ void modeLevelDownB(); - /* 80C14554 */ void Draw(); - /* 80C147EC */ void Delete(); + /* 80C14554 */ int Draw(); + /* 80C147EC */ int Delete(); + + u8 getSw() { return fopAcM_GetParamBit(this, 8, 8); } + u8 getSw2() { return fopAcM_GetParamBit(this, 16, 8); } private: - /* 0x568 */ u8 field_0x568[0x6f4 - 0x568]; + /* 0x5A0 */ request_of_phase_process_class mPhase; + /* 0x5A8 */ J3DModel* mModel1; + /* 0x5AC */ J3DModel* mModel2; + /* 0x5B0 */ mDoExt_btkAnm mBtk1; + /* 0x5C8 */ mDoExt_btkAnm mBtk2; + /* 0x5E0 */ mDoExt_brkAnm mBrk1; + /* 0x5F8 */ mDoExt_brkAnm mBrk2; + /* 0x610 */ mDoExt_bckAnm mBck1a; + /* 0x62C */ mDoExt_bckAnm mBck1b; + /* 0x648 */ mDoExt_bckAnm mBck1c; + /* 0x664 */ mDoExt_bckAnm mBck1d; + /* 0x680 */ mDoExt_bckAnm mBck2a; + /* 0x69C */ mDoExt_bckAnm mBck2b; + /* 0x6B8 */ mDoExt_bckAnm mBck2c; + /* 0x6D4 */ mDoExt_bckAnm mBck2d; + /* 0x6F0 */ u8 field_0x6f0; + /* 0x6F1 */ u8 field_0x6f1; + /* 0x6F2 */ u8 mMode; + /* 0x6F3 */ u8 field_0x6f3; }; STATIC_ASSERT(sizeof(daGrdWater_c) == 0x6f4); -class daGrdWater_HIO_c { +class daGrdWater_HIO_c : public mDoHIO_entry_c { public: /* 80C134AC */ daGrdWater_HIO_c(); - /* 80C148A8 */ ~daGrdWater_HIO_c(); + /* 80C148A8 */ virtual ~daGrdWater_HIO_c() {} + + /* 0x04 */ u8 field_0x04; + /* 0x05 */ u8 field_0x05; + /* 0x06 */ u8 field_0x06; + /* 0x07 */ u8 field_0x07; + /* 0x08 */ f32 field_0x08; + /* 0x0C */ f32 field_0x0c; + /* 0x10 */ f32 field_0x10; }; diff --git a/include/d/d_bg_s_movebg_actor.h b/include/d/d_bg_s_movebg_actor.h index d8c605808bd..27c3f90200e 100644 --- a/include/d/d_bg_s_movebg_actor.h +++ b/include/d/d_bg_s_movebg_actor.h @@ -36,4 +36,6 @@ public: static MoveBGActor_SetFunc m_set_func; }; +STATIC_ASSERT(sizeof(dBgS_MoveBgActor) == 0x5a0); + #endif /* D_BG_D_BG_S_MOVEBG_ACTOR_H */ diff --git a/include/d/d_com_inf_game.h b/include/d/d_com_inf_game.h index 63970006218..6c7f1f27975 100644 --- a/include/d/d_com_inf_game.h +++ b/include/d/d_com_inf_game.h @@ -3947,6 +3947,10 @@ inline void dComIfGd_setListDarkBG() { g_dComIfG_gameInfo.drawlist.setXluListDarkBG(); } +inline void dComIfGd_setXluListDarkBG() { + g_dComIfG_gameInfo.drawlist.setXluListDarkBG(); +} + inline void dComIfGd_setList() { g_dComIfG_gameInfo.drawlist.setOpaList(); g_dComIfG_gameInfo.drawlist.setXluList(); diff --git a/src/d/actor/d_a_obj_groundwater.cpp b/src/d/actor/d_a_obj_groundwater.cpp index 7119dfc9a00..fce149db80c 100644 --- a/src/d/actor/d_a_obj_groundwater.cpp +++ b/src/d/actor/d_a_obj_groundwater.cpp @@ -4,114 +4,18 @@ */ #include "d/actor/d_a_obj_groundwater.h" -#include "dol2asm.h" - - - - -// -// Forward References: -// - -extern "C" void __ct__16daGrdWater_HIO_cFv(); -extern "C" void __dt__14mDoHIO_entry_cFv(); -extern "C" void setBaseMtx__12daGrdWater_cFv(); -extern "C" void CreateHeap__12daGrdWater_cFv(); -extern "C" void create__12daGrdWater_cFv(); -extern "C" void __ct__12daGrdWater_cFv(); -extern "C" void __dt__12J3DFrameCtrlFv(); -extern "C" void Execute__12daGrdWater_cFPPA3_A4_f(); -extern "C" void init_modeWait__12daGrdWater_cFv(); -extern "C" void modeWait__12daGrdWater_cFv(); -extern "C" void init_modeLevelUpA__12daGrdWater_cFv(); -extern "C" void modeLevelUpA__12daGrdWater_cFv(); -extern "C" void init_modeLevelDownA__12daGrdWater_cFv(); -extern "C" void modeLevelDownA__12daGrdWater_cFv(); -extern "C" void init_modeLevelUpB__12daGrdWater_cFv(); -extern "C" void modeLevelUpB__12daGrdWater_cFv(); -extern "C" void init_modeLevelDownB__12daGrdWater_cFv(); -extern "C" void modeLevelDownB__12daGrdWater_cFv(); -extern "C" void Draw__12daGrdWater_cFv(); -extern "C" void Delete__12daGrdWater_cFv(); -extern "C" static void daGrdWater_Draw__FP12daGrdWater_c(); -extern "C" static void daGrdWater_Execute__FP12daGrdWater_c(); -extern "C" static void daGrdWater_Delete__FP12daGrdWater_c(); -extern "C" static void daGrdWater_Create__FP10fopAc_ac_c(); -extern "C" void __dt__16daGrdWater_HIO_cFv(); -extern "C" void __sinit_d_a_obj_groundwater_cpp(); -extern "C" extern char const* const d_a_obj_groundwater__stringBase0; - -// -// External References: -// - -extern "C" void mDoMtx_YrotM__FPA4_fs(); -extern "C" void scaleM__14mDoMtx_stack_cFfff(); -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 init__13mDoExt_bckAnmFP15J3DAnmTransformiifssb(); -extern "C" void entry__13mDoExt_bckAnmFP12J3DModelDataf(); -extern "C" void mDoExt_modelUpdateDL__FP8J3DModel(); -extern "C" void mDoExt_J3DModel__create__FP12J3DModelDataUlUl(); -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 dBgS_MoveBGProc_Typical__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 dKy_bg_MAxx_proc__FPv(); -extern "C" void __dl__FPv(); -extern "C" void setEffectMtx__13J3DTexMtxInfoFPA4_f(); -extern "C" void simpleCalcMaterial__12J3DModelDataFUsPA4_f(); -extern "C" void calcAnmMtx__8J3DModelFv(); -extern "C" void init__12J3DFrameCtrlFs(); -extern "C" void __ptmf_scall(); -extern "C" void _savegpr_25(); -extern "C" void _savegpr_28(); -extern "C" void _savegpr_29(); -extern "C" void _restgpr_25(); -extern "C" void _restgpr_28(); -extern "C" void _restgpr_29(); -extern "C" u8 now__14mDoMtx_stack_c[48]; -extern "C" extern u8 g_dComIfG_gameInfo[122384]; -extern "C" void __register_global_object(); - -// -// Declarations: -// - -/* ############################################################################################## */ -/* 80C149E0-80C149E4 000000 0004+00 3/3 0/0 0/0 .rodata @3642 */ -SECTION_RODATA static u8 const lit_3642[4] = { - 0x00, - 0x00, - 0x00, - 0x00, -}; -COMPILER_STRIP_GATE(0x80C149E0, &lit_3642); +#include "d/d_com_inf_game.h" +#include "m_Do/m_Do_graphic.h" /* 80C149FC-80C14A08 000000 000C+00 1/1 0/0 0/0 .data cNullVec__6Z2Calc */ -SECTION_DATA static u8 cNullVec__6Z2Calc[12] = { +static u8 cNullVec__6Z2Calc[12] = { 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, }; /* 80C14A08-80C14A1C 00000C 0004+10 0/0 0/0 0/0 .data @1787 */ #pragma push #pragma force_active on -SECTION_DATA static u32 lit_1787[1 + 4 /* padding */] = { +static u32 lit_1787[1 + 4 /* padding */] = { 0x02000201, /* padding */ 0x40080000, @@ -121,71 +25,367 @@ SECTION_DATA static u32 lit_1787[1 + 4 /* padding */] = { }; #pragma pop -/* 80C14A1C-80C14A28 -00001 000C+00 0/1 0/0 0/0 .data @3993 */ -#pragma push -#pragma force_active on -SECTION_DATA static void* lit_3993[3] = { - (void*)NULL, - (void*)0xFFFFFFFF, - (void*)modeWait__12daGrdWater_cFv, -}; -#pragma pop - -/* 80C14A28-80C14A34 -00001 000C+00 0/1 0/0 0/0 .data @3994 */ -#pragma push -#pragma force_active on -SECTION_DATA static void* lit_3994[3] = { - (void*)NULL, - (void*)0xFFFFFFFF, - (void*)modeLevelUpA__12daGrdWater_cFv, -}; -#pragma pop - -/* 80C14A34-80C14A40 -00001 000C+00 0/1 0/0 0/0 .data @3995 */ -#pragma push -#pragma force_active on -SECTION_DATA static void* lit_3995[3] = { - (void*)NULL, - (void*)0xFFFFFFFF, - (void*)modeLevelDownA__12daGrdWater_cFv, -}; -#pragma pop - -/* 80C14A40-80C14A4C -00001 000C+00 0/1 0/0 0/0 .data @3996 */ -#pragma push -#pragma force_active on -SECTION_DATA static void* lit_3996[3] = { - (void*)NULL, - (void*)0xFFFFFFFF, - (void*)modeLevelUpB__12daGrdWater_cFv, -}; -#pragma pop - -/* 80C14A4C-80C14A58 -00001 000C+00 0/2 0/0 0/0 .data @3997 */ -#pragma push -#pragma force_active on -SECTION_DATA static void* lit_3997[3] = { - (void*)NULL, - (void*)0xFFFFFFFF, - (void*)modeLevelDownB__12daGrdWater_cFv, -}; -#pragma pop +/* 80C14B44-80C14B58 000014 0014+00 1/1 0/0 0/0 .bss l_HIO */ +static daGrdWater_HIO_c l_HIO; /* 80C14A58-80C14A94 00005C 003C+00 1/2 0/0 0/0 .data l_mode_func */ -SECTION_DATA static u8 l_mode_func[60] = { - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, +static daGrdWater_c::modeFunc l_mode_func[5] = { + &daGrdWater_c::modeWait, + &daGrdWater_c::modeLevelUpA, + &daGrdWater_c::modeLevelDownA, + &daGrdWater_c::modeLevelUpB, + &daGrdWater_c::modeLevelDownB, }; +/* 80C134AC-80C134F8 0000EC 004C+00 1/1 0/0 0/0 .text __ct__16daGrdWater_HIO_cFv */ +daGrdWater_HIO_c::daGrdWater_HIO_c() { + field_0x04 = 100; + field_0x05 = 100; + field_0x06 = 0; + field_0x07 = 30; + field_0x08 = 0.0f; + field_0x0c = 0.0f; + field_0x10 = 0.0f; +} + +/* 80C13540-80C13618 000180 00D8+00 2/2 0/0 0/0 .text setBaseMtx__12daGrdWater_cFv */ +void daGrdWater_c::setBaseMtx() { + mDoMtx_stack_c::transS(current.pos.x, current.pos.y, current.pos.z); + mDoMtx_stack_c::YrotM(shape_angle.y); + mModel1->setBaseScale(scale); + mModel1->setBaseTRMtx(mDoMtx_stack_c::get()); + mDoMtx_stack_c::transS(current.pos.x, current.pos.y, current.pos.z); + mDoMtx_stack_c::YrotM(shape_angle.y); + mModel2->setBaseScale(scale); + mModel2->setBaseTRMtx(mDoMtx_stack_c::get()); +} + +/* 80C13618-80C139E4 000258 03CC+00 1/0 0/0 0/0 .text CreateHeap__12daGrdWater_cFv */ +int daGrdWater_c::CreateHeap() { + J3DModelData* modelData = (J3DModelData*)dComIfG_getObjectRes("Water", 18); + JUT_ASSERT(189, modelData != 0); + mModel2 = mDoExt_J3DModel__create(modelData, 0x80000, 0x19000284); + if (mModel2 == NULL) { + return 0; + } + J3DAnmTextureSRTKey* srtKey = (J3DAnmTextureSRTKey*)dComIfG_getObjectRes("Water", 26); + int res = mBtk1.init(modelData, srtKey, 1, 2, 1.0f, 0, -1); + JUT_ASSERT(206, res == 1); + J3DAnmTransform* anmTransform = (J3DAnmTransform*)dComIfG_getObjectRes("Water", 10); + res = mBck2a.init(anmTransform, 1, 0, 1.0f, 0, -1, false); + JUT_ASSERT(213, res == 1); + anmTransform = (J3DAnmTransform*)dComIfG_getObjectRes("Water", 9); + res = mBck2b.init(anmTransform, 1, 0, 1.0f, 0, -1, false); + JUT_ASSERT(219, res == 1); + anmTransform = (J3DAnmTransform*)dComIfG_getObjectRes("Water", 12); + res = mBck2c.init(anmTransform, 1, 0, 1.0f, 0, -1, false); + JUT_ASSERT(225, res == 1); + anmTransform = (J3DAnmTransform*)dComIfG_getObjectRes("Water", 11); + res = mBck2d.init(anmTransform, 1, 0, 1.0f, 0, -1, false); + JUT_ASSERT(231, res == 1); + J3DModelData* modelData2 = (J3DModelData*)dComIfG_getObjectRes("Water", 0x11); + JUT_ASSERT(236, modelData2 != 0); + mModel1 = mDoExt_J3DModel__create(modelData2, 0x80000, 0x11000284); + if (mModel1 == NULL) { + return 0; + } + srtKey = (J3DAnmTextureSRTKey*)dComIfG_getObjectRes("Water", 25); + res = mBtk2.init(&modelData2->getMaterialTable(), srtKey, 1, 2, 1.0f, 0, -1); + JUT_ASSERT(253, res == 1); + J3DAnmTevRegKey* regKey = (J3DAnmTevRegKey*)dComIfG_getObjectRes("Water", 21); + res = mBrk1.init(modelData2, regKey, 1, 0, 1.0f, 0, -1); + JUT_ASSERT(262, res == 1); + regKey = (J3DAnmTevRegKey*)dComIfG_getObjectRes("Water", 22); + res = mBrk2.init(modelData2, regKey, 1, 0, 1.0f, 0, -1); + JUT_ASSERT(270, res == 1); + anmTransform = (J3DAnmTransform*)dComIfG_getObjectRes("Water", 8); + res = mBck1a.init(anmTransform, 1, 0, 1.0f, 0, -1, false); + JUT_ASSERT(277, res == 1); + anmTransform = (J3DAnmTransform*)dComIfG_getObjectRes("Water", 7); + res = mBck1b.init(anmTransform, 1, 0, 1.0f, 0, -1, false); + JUT_ASSERT(283, res == 1); + anmTransform = (J3DAnmTransform*)dComIfG_getObjectRes("Water", 14); + res = mBck1c.init(anmTransform, 1, 0, 1.0f, 0, -1, false); + JUT_ASSERT(289, res == 1); + anmTransform = (J3DAnmTransform*)dComIfG_getObjectRes("Water", 13); + res = mBck1d.init(anmTransform, 1, 0, 1.0f, 0, -1, false); + JUT_ASSERT(295, res == 1); + return 1; +} + +/* 80C139E4-80C13DB0 000624 03CC+00 1/1 0/0 0/0 .text create__12daGrdWater_cFv */ +int daGrdWater_c::create() { + fopAcM_SetupActor(this, daGrdWater_c); + int rv = dComIfG_resLoad(&mPhase, "Water"); + if (rv == cPhs_COMPLEATE_e) { + if (MoveBGCreate("Water", 29, dBgS_MoveBGProc_Typical, 0x4030, NULL) == cPhs_ERROR_e) { + return cPhs_ERROR_e; + } else { + fopAcM_SetMtx(this, mModel2->getBaseTRMtx()); + field_0x6f3 = getSw(); + if (field_0x6f3 != 0xff) { + field_0x6f0 = fopAcM_isSwitch(this, field_0x6f3); + J3DModelData* modelData1 = mModel2->getModelData(); + J3DModelData* modelData2 = mModel1->getModelData(); + if (field_0x6f0 != 0) { + u8 sw2 = getSw2(); + if (fopAcM_isSwitch(this, sw2)) { + mBck1d.setFrame(mBck1d.getEndFrame()); + mBck2d.setFrame(mBck2d.getEndFrame()); + mBck1d.entry(modelData2); + mBck2d.entry(modelData1); + mBrk2.setFrame(mBrk2.getEndFrame()); + mBrk2.entry(modelData2); + } else { + mBck1a.setFrame(mBck1a.getEndFrame()); + mBck2a.setFrame(mBck2a.getEndFrame()); + mBrk1.setFrame(mBrk1.getEndFrame()); + mBck1a.entry(modelData2); + mBrk1.entry(modelData2); + mBck2a.entry(modelData1); + } + } else { + u8 sw2 = getSw2(); + if (fopAcM_isSwitch(this, sw2)) { + mBck1c.setFrame(mBck1c.getEndFrame()); + mBck2c.setFrame(mBck2c.getEndFrame()); + mBrk2.setFrame(mBrk2.getEndFrame()); + mBck1c.entry(modelData2); + mBrk2.entry(modelData2); + mBck2c.entry(modelData1); + } else { + mBck1b.setFrame(mBck1b.getEndFrame()); + mBck2b.setFrame(mBck2b.getEndFrame()); + mBck1b.entry(modelData2); + mBck2b.entry(modelData1); + mBrk1.setFrame(mBrk1.getEndFrame()); + mBrk1.entry(modelData2); + } + } + mModel2->calcAnmMtx(); + mModel1->calcAnmMtx(); + } + setBaseMtx(); + init_modeWait(); + } + } + return rv; +} + +/* 80C13DB0-80C13FA4 0009F0 01F4+00 1/1 0/0 0/0 .text __ct__12daGrdWater_cFv */ +daGrdWater_c::daGrdWater_c() { +} + +/* 80C13FEC-80C14194 000C2C 01A8+00 1/0 0/0 0/0 .text Execute__12daGrdWater_cFPPA3_A4_f + */ +int daGrdWater_c::Execute(Mtx** pMtx) { + mBtk1.play(); + mBtk2.play(); + if (field_0x6f3 != 0xff) { + u8 prevSw = field_0x6f0; + u8 sw = getSw(); + field_0x6f0 = fopAcM_isSwitch(this, sw); + if (field_0x6f0 != prevSw) { + if (field_0x6f0 != 0) { + u8 sw2 = getSw2(); + if (fopAcM_isSwitch(this, sw2)) { + init_modeLevelDownB(); + } else { + init_modeLevelUpA(); + } + } else { + u8 sw2 = getSw2(); + if (fopAcM_isSwitch(this, sw2)) { + init_modeLevelUpB(); + } else { + init_modeLevelDownA(); + } + } + } + } + (this->*(l_mode_func[mMode]))(); + if (field_0x6f3 != 0xff) { + J3DTransformInfo& transformInfo = + mModel2->getModelData()->getJointNodePointer(0)->getTransformInfo(); + MtxP anmMtx = mModel2->getAnmMtx(0); + mDoMtx_stack_c::transS(0.0f, anmMtx[1][3] - transformInfo.mTranslate.y, 0.0f); + mDoMtx_stack_c::scaleM(scale.x, scale.y, scale.z); + MTXCopy(mDoMtx_stack_c::get(), mBgMtx); + *pMtx = &mBgMtx; + } else { + *pMtx = &mModel2->getBaseTRMtx(); + } + setBaseMtx(); + return 1; +} + +/* 80C14194-80C141A0 000DD4 000C+00 5/5 0/0 0/0 .text init_modeWait__12daGrdWater_cFv */ +void daGrdWater_c::init_modeWait() { + mMode = WAIT; +} + +/* 80C141A0-80C141A4 000DE0 0004+00 1/0 0/0 0/0 .text modeWait__12daGrdWater_cFv */ +void daGrdWater_c::modeWait() { +} + +/* 80C141A4-80C1423C 000DE4 0098+00 1/1 0/0 0/0 .text init_modeLevelUpA__12daGrdWater_cFv + */ +void daGrdWater_c::init_modeLevelUpA() { + mBck1a.reset(); + mBck2a.reset(); + mBrk1.reset(); + mMode = LEVEL_UP_A; +} + +/* 80C1423C-80C142AC 000E7C 0070+00 1/0 0/0 0/0 .text modeLevelUpA__12daGrdWater_cFv */ +void daGrdWater_c::modeLevelUpA() { + int res1 = mBck1a.play(); + int res2 = mBck2a.play(); + int res3 = mBrk1.play(); + if (res1 == 1 && res2 == 1 && res3 == 1) { + init_modeWait(); + } +} + +/* 80C142AC-80C14320 000EEC 0074+00 1/1 0/0 0/0 .text init_modeLevelDownA__12daGrdWater_cFv */ +void daGrdWater_c::init_modeLevelDownA() { + mBck1b.reset(); + mBck2b.reset(); + mMode = LEVEL_DOWN_A; +} + +/* 80C14320-80C1437C 000F60 005C+00 1/0 0/0 0/0 .text modeLevelDownA__12daGrdWater_cFv */ +void daGrdWater_c::modeLevelDownA() { + int res1 = mBck1b.play(); + int res2 = mBck2b.play(); + if (res1 == 1 && res2 == 1) { + init_modeWait(); + } +} + +/* 80C1437C-80C14414 000FBC 0098+00 1/1 0/0 0/0 .text init_modeLevelUpB__12daGrdWater_cFv + */ +void daGrdWater_c::init_modeLevelUpB() { + mBck1c.reset(); + mBck2c.reset(); + mBrk2.reset(); + mMode = LEVEL_UP_B; +} + +/* 80C14414-80C14484 001054 0070+00 1/0 0/0 0/0 .text modeLevelUpB__12daGrdWater_cFv */ +void daGrdWater_c::modeLevelUpB() { + int res1 = mBck1c.play(); + int res2 = mBck2c.play(); + int res3 = mBrk2.play(); + if (res1 == 1 && res2 == 1 && res3 == 1) { + init_modeWait(); + } +} + +/* 80C14484-80C144F8 0010C4 0074+00 1/1 0/0 0/0 .text init_modeLevelDownB__12daGrdWater_cFv */ +void daGrdWater_c::init_modeLevelDownB() { + mBck1d.reset(); + mBck2d.reset(); + mMode = LEVEL_DOWN_B; +} + +/* 80C144F8-80C14554 001138 005C+00 1/0 0/0 0/0 .text modeLevelDownB__12daGrdWater_cFv */ +void daGrdWater_c::modeLevelDownB() { + int res1 = mBck1d.play(); + int res2 = mBck2d.play(); + if (res1 == 1 && res2 == 1) { + init_modeWait(); + } +} + +/* 80C14554-80C147EC 001194 0298+00 1/0 0/0 0/0 .text Draw__12daGrdWater_cFv */ +int daGrdWater_c::Draw() { + g_env_light.settingTevStruct(0x10, ¤t.pos, &tevStr); + g_env_light.setLightTevColorType_MAJI(mModel2, &tevStr); + g_env_light.setLightTevColorType_MAJI(mModel1, &tevStr); + dKy_bg_MAxx_proc(mModel1); + dKy_bg_MAxx_proc(mModel2); + J3DModelData* modelData2 = mModel2->getModelData(); + mBtk1.entry(modelData2); + J3DModelData* modelData1 = mModel1->getModelData(); + mBtk2.entry(modelData1); + switch (mMode) { + case LEVEL_UP_A: + mBck1a.entry(modelData1); + mBrk1.entry(modelData1); + mBck2a.entry(modelData2); + break; + case LEVEL_DOWN_A: + mBck1b.entry(modelData1); + mBck2b.entry(modelData2); + break; + case LEVEL_UP_B: + mBck1c.entry(modelData1); + mBrk2.entry(modelData1); + mBck2c.entry(modelData2); + break; + case LEVEL_DOWN_B: + mBck1d.entry(modelData1); + mBck2d.entry(modelData2); + break; + } + dComIfGd_setXluListDarkBG(); + mDoExt_modelUpdateDL(mModel1); + dComIfGd_setList(); + J3DMaterial* material = modelData2->getMaterialNodePointer(0); + dComIfGd_setListInvisisble(); + if (material->getTexGenBlock()->getTexMtx(0) != NULL) { + J3DTexMtxInfo* mtxInfo = &material->getTexGenBlock()->getTexMtx(0)->getTexMtxInfo(); + if (mtxInfo != NULL) { + Mtx afStack_50; + C_MTXLightPerspective(afStack_50, dComIfGd_getView()->fovy, dComIfGd_getView()->aspect, + 1.0f, 1.0f, -0.01f, 0.0f); + mDoGph_gInf_c::setWideZoomLightProjection(afStack_50); + mtxInfo->setEffectMtx(afStack_50); + modelData2->simpleCalcMaterial(0, (MtxP)j3dDefaultMtx); + } + } + mDoExt_modelUpdateDL(mModel2); + dComIfGd_setList(); + return 1; +} + +/* 80C147EC-80C1481C 00142C 0030+00 1/0 0/0 0/0 .text Delete__12daGrdWater_cFv */ +int daGrdWater_c::Delete() { + dComIfG_resDelete(&mPhase, "Water"); + return 1; +} + +/* 80C1481C-80C14848 00145C 002C+00 1/0 0/0 0/0 .text daGrdWater_Draw__FP12daGrdWater_c + */ +static int daGrdWater_Draw(daGrdWater_c* i_this) { + return i_this->Draw(); +} + +/* 80C14848-80C14868 001488 0020+00 1/0 0/0 0/0 .text daGrdWater_Execute__FP12daGrdWater_c */ +static int daGrdWater_Execute(daGrdWater_c* i_this) { + return i_this->MoveBGExecute(); +} + +/* 80C14868-80C14888 0014A8 0020+00 1/0 0/0 0/0 .text daGrdWater_Delete__FP12daGrdWater_c + */ +static int daGrdWater_Delete(daGrdWater_c* i_this) { + return i_this->MoveBGDelete(); +} + +/* 80C14888-80C148A8 0014C8 0020+00 1/0 0/0 0/0 .text daGrdWater_Create__FP10fopAc_ac_c + */ +static int daGrdWater_Create(fopAc_ac_c* i_this) { + return static_cast(i_this)->create(); +} + /* 80C14A94-80C14AB4 -00001 0020+00 1/0 0/0 0/0 .data l_daGrdWater_Method */ static actor_method_class l_daGrdWater_Method = { - (process_method_func)daGrdWater_Create__FP10fopAc_ac_c, - (process_method_func)daGrdWater_Delete__FP12daGrdWater_c, - (process_method_func)daGrdWater_Execute__FP12daGrdWater_c, - 0, - (process_method_func)daGrdWater_Draw__FP12daGrdWater_c, + (process_method_func)daGrdWater_Create, + (process_method_func)daGrdWater_Delete, + (process_method_func)daGrdWater_Execute, + NULL, + (process_method_func)daGrdWater_Draw, }; /* 80C14AB4-80C14AE4 -00001 0030+00 0/0 0/0 1/0 .data g_profile_GRDWATER */ @@ -206,215 +406,4 @@ extern actor_process_profile_definition g_profile_GRDWATER = { fopAc_CULLBOX_CUSTOM_e, // cullType }; -/* 80C14AE4-80C14AF0 0000E8 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, -}; - -/* 80C14AF0-80C14B18 0000F4 0028+00 1/1 0/0 0/0 .data __vt__12daGrdWater_c */ -SECTION_DATA extern void* __vt__12daGrdWater_c[10] = { - (void*)NULL /* RTTI */, - (void*)NULL, - (void*)CreateHeap__12daGrdWater_cFv, - (void*)Create__16dBgS_MoveBgActorFv, - (void*)Execute__12daGrdWater_cFPPA3_A4_f, - (void*)Draw__12daGrdWater_cFv, - (void*)Delete__12daGrdWater_cFv, - (void*)IsDelete__16dBgS_MoveBgActorFv, - (void*)ToFore__16dBgS_MoveBgActorFv, - (void*)ToBack__16dBgS_MoveBgActorFv, -}; - -/* 80C14B18-80C14B24 00011C 000C+00 2/2 0/0 0/0 .data __vt__16daGrdWater_HIO_c */ -SECTION_DATA extern void* __vt__16daGrdWater_HIO_c[3] = { - (void*)NULL /* RTTI */, - (void*)NULL, - (void*)__dt__16daGrdWater_HIO_cFv, -}; - -/* 80C14B24-80C14B30 000128 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, -}; - -/* 80C134AC-80C134F8 0000EC 004C+00 1/1 0/0 0/0 .text __ct__16daGrdWater_HIO_cFv */ -daGrdWater_HIO_c::daGrdWater_HIO_c() { - // NONMATCHING -} - -/* 80C134F8-80C13540 000138 0048+00 1/0 0/0 0/0 .text __dt__14mDoHIO_entry_cFv */ -// mDoHIO_entry_c::~mDoHIO_entry_c() { -extern "C" void __dt__14mDoHIO_entry_cFv() { - // NONMATCHING -} - -/* 80C13540-80C13618 000180 00D8+00 2/2 0/0 0/0 .text setBaseMtx__12daGrdWater_cFv */ -void daGrdWater_c::setBaseMtx() { - // NONMATCHING -} - -/* ############################################################################################## */ -/* 80C149E4-80C149E8 000004 0004+00 5/6 0/0 0/0 .rodata @3712 */ -SECTION_RODATA static f32 const lit_3712 = 1.0f; -COMPILER_STRIP_GATE(0x80C149E4, &lit_3712); - -/* 80C149F4-80C149F4 000014 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ -#pragma push -#pragma force_active on -SECTION_DEAD static char const* const stringBase_80C149F4 = "Water"; -#pragma pop - -/* 80C13618-80C139E4 000258 03CC+00 1/0 0/0 0/0 .text CreateHeap__12daGrdWater_cFv */ -void daGrdWater_c::CreateHeap() { - // NONMATCHING -} - -/* ############################################################################################## */ -/* 80C149E8-80C149F0 000008 0008+00 5/5 0/0 0/0 .rodata @3891 */ -SECTION_RODATA static u8 const lit_3891[8] = { - 0x43, 0x30, 0x00, 0x00, 0x80, 0x00, 0x00, 0x00, -}; -COMPILER_STRIP_GATE(0x80C149E8, &lit_3891); - -/* 80C139E4-80C13DB0 000624 03CC+00 1/1 0/0 0/0 .text create__12daGrdWater_cFv */ -void daGrdWater_c::create() { - // NONMATCHING -} - -/* 80C13DB0-80C13FA4 0009F0 01F4+00 1/1 0/0 0/0 .text __ct__12daGrdWater_cFv */ -daGrdWater_c::daGrdWater_c() { - // NONMATCHING -} - -/* 80C13FA4-80C13FEC 000BE4 0048+00 1/0 0/0 0/0 .text __dt__12J3DFrameCtrlFv */ -// J3DFrameCtrl::~J3DFrameCtrl() { -extern "C" void __dt__12J3DFrameCtrlFv() { - // NONMATCHING -} - -/* 80C13FEC-80C14194 000C2C 01A8+00 1/0 0/0 0/0 .text Execute__12daGrdWater_cFPPA3_A4_f - */ -void daGrdWater_c::Execute(f32 (**param_0)[3][4]) { - // NONMATCHING -} - -/* 80C14194-80C141A0 000DD4 000C+00 5/5 0/0 0/0 .text init_modeWait__12daGrdWater_cFv */ -void daGrdWater_c::init_modeWait() { - // NONMATCHING -} - -/* 80C141A0-80C141A4 000DE0 0004+00 1/0 0/0 0/0 .text modeWait__12daGrdWater_cFv */ -void daGrdWater_c::modeWait() { - /* empty function */ -} - -/* 80C141A4-80C1423C 000DE4 0098+00 1/1 0/0 0/0 .text init_modeLevelUpA__12daGrdWater_cFv - */ -void daGrdWater_c::init_modeLevelUpA() { - // NONMATCHING -} - -/* 80C1423C-80C142AC 000E7C 0070+00 1/0 0/0 0/0 .text modeLevelUpA__12daGrdWater_cFv */ -void daGrdWater_c::modeLevelUpA() { - // NONMATCHING -} - -/* 80C142AC-80C14320 000EEC 0074+00 1/1 0/0 0/0 .text init_modeLevelDownA__12daGrdWater_cFv */ -void daGrdWater_c::init_modeLevelDownA() { - // NONMATCHING -} - -/* 80C14320-80C1437C 000F60 005C+00 1/0 0/0 0/0 .text modeLevelDownA__12daGrdWater_cFv */ -void daGrdWater_c::modeLevelDownA() { - // NONMATCHING -} - -/* 80C1437C-80C14414 000FBC 0098+00 1/1 0/0 0/0 .text init_modeLevelUpB__12daGrdWater_cFv - */ -void daGrdWater_c::init_modeLevelUpB() { - // NONMATCHING -} - -/* 80C14414-80C14484 001054 0070+00 1/0 0/0 0/0 .text modeLevelUpB__12daGrdWater_cFv */ -void daGrdWater_c::modeLevelUpB() { - // NONMATCHING -} - -/* 80C14484-80C144F8 0010C4 0074+00 1/1 0/0 0/0 .text init_modeLevelDownB__12daGrdWater_cFv */ -void daGrdWater_c::init_modeLevelDownB() { - // NONMATCHING -} - -/* 80C144F8-80C14554 001138 005C+00 1/0 0/0 0/0 .text modeLevelDownB__12daGrdWater_cFv */ -void daGrdWater_c::modeLevelDownB() { - // NONMATCHING -} - -/* ############################################################################################## */ -/* 80C149F0-80C149F4 000010 0004+00 0/1 0/0 0/0 .rodata @4253 */ -#pragma push -#pragma force_active on -SECTION_RODATA static f32 const lit_4253 = -1.0f / 100.0f; -COMPILER_STRIP_GATE(0x80C149F0, &lit_4253); -#pragma pop - -/* 80C14554-80C147EC 001194 0298+00 1/0 0/0 0/0 .text Draw__12daGrdWater_cFv */ -void daGrdWater_c::Draw() { - // NONMATCHING -} - -/* 80C147EC-80C1481C 00142C 0030+00 1/0 0/0 0/0 .text Delete__12daGrdWater_cFv */ -void daGrdWater_c::Delete() { - // NONMATCHING -} - -/* 80C1481C-80C14848 00145C 002C+00 1/0 0/0 0/0 .text daGrdWater_Draw__FP12daGrdWater_c - */ -static void daGrdWater_Draw(daGrdWater_c* param_0) { - // NONMATCHING -} - -/* 80C14848-80C14868 001488 0020+00 1/0 0/0 0/0 .text daGrdWater_Execute__FP12daGrdWater_c */ -static void daGrdWater_Execute(daGrdWater_c* param_0) { - // NONMATCHING -} - -/* 80C14868-80C14888 0014A8 0020+00 1/0 0/0 0/0 .text daGrdWater_Delete__FP12daGrdWater_c - */ -static void daGrdWater_Delete(daGrdWater_c* param_0) { - // NONMATCHING -} - -/* 80C14888-80C148A8 0014C8 0020+00 1/0 0/0 0/0 .text daGrdWater_Create__FP10fopAc_ac_c - */ -static void daGrdWater_Create(fopAc_ac_c* param_0) { - // NONMATCHING -} - -/* 80C148A8-80C14904 0014E8 005C+00 2/1 0/0 0/0 .text __dt__16daGrdWater_HIO_cFv */ -daGrdWater_HIO_c::~daGrdWater_HIO_c() { - // NONMATCHING -} - -/* ############################################################################################## */ -/* 80C14B38-80C14B44 000008 000C+00 1/1 0/0 0/0 .bss @3636 */ -static u8 lit_3636[12]; - -/* 80C14B44-80C14B58 000014 0014+00 1/1 0/0 0/0 .bss l_HIO */ -static u8 l_HIO[20]; - -/* 80C14904-80C149CC 001544 00C8+00 0/0 1/0 0/0 .text __sinit_d_a_obj_groundwater_cpp */ -void __sinit_d_a_obj_groundwater_cpp() { - // NONMATCHING -} - -#pragma push -#pragma force_active on -REGISTER_CTORS(0x80C14904, __sinit_d_a_obj_groundwater_cpp); -#pragma pop - /* 80C149F4-80C149F4 000014 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */