diff --git a/config/GZ2E01/rels/d_a_e_fm/symbols.txt b/config/GZ2E01/rels/d_a_e_fm/symbols.txt index 3a94ae0d531..c30352b53d4 100644 --- a/config/GZ2E01/rels/d_a_e_fm/symbols.txt +++ b/config/GZ2E01/rels/d_a_e_fm/symbols.txt @@ -4,18 +4,18 @@ _unresolved = .text:0x00000058; // type:function size:0x20 scope:global __register_global_object = .text:0x00000078; // type:function size:0x1C scope:global __destroy_global_chain = .text:0x00000094; // type:function size:0x58 scope:global __ct__12daE_FM_HIO_cFv = .text:0x000000EC; // type:function size:0x164 scope:global -s_fmobj_del__FPvPv = .text:0x00000250; // type:function size:0x4C scope:global -s_hasira_sub__FPvPv = .text:0x0000029C; // type:function size:0x6C scope:global -s_hasira_poscheck__FPvPv = .text:0x00000308; // type:function size:0xC4 scope:global -s_hasira_eff_sub__FPvPv = .text:0x000003CC; // type:function size:0x270 scope:global +s_fmobj_del__FPvPv = .text:0x00000250; // type:function size:0x4C scope:local +s_hasira_sub__FPvPv = .text:0x0000029C; // type:function size:0x6C scope:local +s_hasira_poscheck__FPvPv = .text:0x00000308; // type:function size:0xC4 scope:local +s_hasira_eff_sub__FPvPv = .text:0x000003CC; // type:function size:0x270 scope:local __dt__5csXyzFv = .text:0x0000063C; // type:function size:0x3C scope:global __dt__4cXyzFv = .text:0x00000678; // type:function size:0x3C scope:global hasira_hahen_hit__FP4cXyzffSc = .text:0x000006B4; // type:function size:0x5C scope:global carry_off__FP10e_fm_classi = .text:0x00000710; // type:function size:0xF8 scope:global anm_init__FP10e_fm_classifUcf = .text:0x00000808; // type:function size:0xB0 scope:global -nodeCallBack__FP8J3DJointi = .text:0x000008B8; // type:function size:0xE4 scope:global +nodeCallBack__FP8J3DJointi = .text:0x000008B8; // type:function size:0xE4 scope:local chain_draw__FP10e_fm_classP7chain_si = .text:0x0000099C; // type:function size:0x2A0 scope:global -daE_FM_Draw__FP10e_fm_class = .text:0x00000C3C; // type:function size:0x32C scope:global +daE_FM_Draw__FP10e_fm_class = .text:0x00000C3C; // type:function size:0x32C scope:local other_bg_check__FP10e_fm_classP10fopAc_ac_c = .text:0x00000F68; // type:function size:0xF4 scope:global pl_check__FP10e_fm_classfs = .text:0x0000105C; // type:function size:0x88 scope:global e_fm_normal__FP10e_fm_class = .text:0x000010E4; // type:function size:0x44C scope:global @@ -38,15 +38,15 @@ damage_check__FP10e_fm_class = .text:0x00005D74; // type:function size:0x3D4 sco chain_control1__FP10e_fm_classP7chain_si = .text:0x00006148; // type:function size:0x848 scope:global chain_control2__FP10e_fm_classP7chain_si = .text:0x00006990; // type:function size:0x564 scope:global chain_control3__FP10e_fm_classP7chain_si = .text:0x00006EF4; // type:function size:0x5B4 scope:global -s_ba_sub__FPvPv = .text:0x000074A8; // type:function size:0x58 scope:global -action__FP10e_fm_class = .text:0x00007500; // type:function size:0x6D0 scope:global +s_ba_sub__FPvPv = .text:0x000074A8; // type:function size:0x58 scope:local +action__FP10e_fm_class = .text:0x00007500; // type:function size:0x6D0 scope:local effect_set__FP10e_fm_class = .text:0x00007BD0; // type:function size:0x700 scope:global -daE_FM_Execute__FP10e_fm_class = .text:0x000082D0; // type:function size:0x1990 scope:global -daE_FM_IsDelete__FP10e_fm_class = .text:0x00009C60; // type:function size:0x8 scope:global -daE_FM_Delete__FP10e_fm_class = .text:0x00009C68; // type:function size:0x80 scope:global -useHeapInit__FP10fopAc_ac_c = .text:0x00009CE8; // type:function size:0x8E4 scope:global +daE_FM_Execute__FP10e_fm_class = .text:0x000082D0; // type:function size:0x1990 scope:local +daE_FM_IsDelete__FP10e_fm_class = .text:0x00009C60; // type:function size:0x8 scope:local +daE_FM_Delete__FP10e_fm_class = .text:0x00009C68; // type:function size:0x80 scope:local +useHeapInit__FP10fopAc_ac_c = .text:0x00009CE8; // type:function size:0x8E4 scope:local __dt__12J3DFrameCtrlFv = .text:0x0000A5CC; // type:function size:0x48 scope:global -daE_FM_Create__FP10fopAc_ac_c = .text:0x0000A614; // type:function size:0x550 scope:global +daE_FM_Create__FP10fopAc_ac_c = .text:0x0000A614; // type:function size:0x550 scope:local __ct__10e_fm_classFv = .text:0x0000AB64; // type:function size:0x2B0 scope:global __dt__7chain_sFv = .text:0x0000AE14; // type:function size:0xC4 scope:global __dt__12dKy_tevstr_cFv = .text:0x0000AED8; // type:function size:0x3C scope:global @@ -239,11 +239,11 @@ _dtors = .dtors:0x00000000; // type:label scope:global @8844 = .rodata:0x00000288; // type:object size:0x4 scope:local @stringBase0 = .rodata:0x0000028C; // type:object size:0x5 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 lbl_66_data_10 = .data:0x00000010; // type:object size:0x10 h_id$3853 = .data:0x00000020; // type:object size:0x6 scope:local -chain_z = .data:0x00000028; // type:object size:0x64 scope:global +chain_z = .data:0x00000028; // type:object size:0x64 scope:local tame_name$4558 = .data:0x0000008C; // type:object size:0x4 scope:local fire_name$4712 = .data:0x00000090; // type:object size:0x8 scope:local g_c_i$5284 = .data:0x00000098; // type:object size:0x20 scope:local @@ -275,7 +275,7 @@ eff_at_sph_src$8696 = .data:0x00000338; // type:object size:0x40 scope:local f_eff_at_sph_src$8697 = .data:0x00000378; // type:object size:0x40 scope:local chain_at_sph_src$8698 = .data:0x000003B8; // type:object size:0x40 scope:local chain_co_sph_src$8699 = .data:0x000003F8; // type:object size:0x40 scope:local -l_daE_FM_Method = .data:0x00000438; // type:object size:0x20 scope:global +l_daE_FM_Method = .data:0x00000438; // type:object size:0x20 scope:local g_profile_E_FM = .data:0x00000458; // type:object size:0x30 scope:global __vt__12dBgS_AcchCir = .data:0x00000488; // type:object size:0xC scope:global __vt__10cCcD_GStts = .data:0x00000494; // type:object size:0xC scope:global @@ -303,16 +303,16 @@ __global_destructor_chain = .bss:0x00000000; // type:object size:0x4 scope:globa @1012 = .bss:0x0000003C; // type:object size:0x1 scope:local @1010 = .bss:0x00000040; // type:object size:0x1 scope:local @1009 = .bss:0x00000044; // type:object size:0x1 scope:local -lbl_66_bss_45 = .bss:0x00000045; // type:object size:0x1 data:byte +lbl_66_bss_45 = .bss:0x00000045; // type:object size:0x1 scope:local data:byte @3772 = .bss:0x00000048; // type:object size:0xC scope:local -l_HIO = .bss:0x00000054; // type:object size:0xB0 scope:global data:byte +l_HIO = .bss:0x00000054; // type:object size:0xB0 scope:local data:byte @3819 = .bss:0x00000104; // type:object size:0xC scope:local h_pos = .bss:0x00000110; // type:object size:0xC scope:global h_range = .bss:0x0000011C; // type:object size:0x4 scope:global h_power = .bss:0x00000120; // type:object size:0x4 scope:global -fire_range = .bss:0x00000128; // type:object size:0x4 scope:global align:4 data:float -demo_stop = .bss:0x0000012C; // type:object size:0x4 scope:global data:4byte -ba_count = .bss:0x00000130; // type:object size:0x4 scope:global data:4byte +fire_range = .bss:0x00000128; // type:object size:0x4 scope:local align:4 data:float +demo_stop = .bss:0x0000012C; // type:object size:0x4 scope:local data:4byte +ba_count = .bss:0x00000130; // type:object size:0x4 scope:local data:4byte sInstance__40JASGlobalInstance<19JASDefaultBankTable> = .bss:0x00000134; // type:object size:0x4 scope:global sInstance__35JASGlobalInstance<14JASAudioThread> = .bss:0x00000138; // type:object size:0x4 scope:global sInstance__27JASGlobalInstance<7Z2SeMgr> = .bss:0x0000013C; // type:object size:0x4 scope:global diff --git a/config/GZ2E01/rels/d_a_e_hzelda/symbols.txt b/config/GZ2E01/rels/d_a_e_hzelda/symbols.txt index 29bd8d77246..911200ee6fd 100644 --- a/config/GZ2E01/rels/d_a_e_hzelda/symbols.txt +++ b/config/GZ2E01/rels/d_a_e_hzelda/symbols.txt @@ -5,25 +5,25 @@ __register_global_object = .text:0x00000078; // type:function size:0x1C scope:gl __destroy_global_chain = .text:0x00000094; // type:function size:0x58 scope:global __ct__16daE_HZELDA_HIO_cFv = .text:0x000000EC; // type:function size:0x24 scope:global anm_init__FP14e_hzelda_classifUcf = .text:0x00000110; // type:function size:0xAC scope:global -nodeCallBack__FP8J3DJointi = .text:0x000001BC; // type:function size:0x1E8 scope:global -daE_HZELDA_Draw__FP14e_hzelda_class = .text:0x000003A4; // type:function size:0x210 scope:global -shot_s_sub__FPvPv = .text:0x000005B4; // type:function size:0x194 scope:global +nodeCallBack__FP8J3DJointi = .text:0x000001BC; // type:function size:0x1E8 scope:local +daE_HZELDA_Draw__FP14e_hzelda_class = .text:0x000003A4; // type:function size:0x210 scope:local +shot_s_sub__FPvPv = .text:0x000005B4; // type:function size:0x194 scope:local e_hzelda_wait__FP14e_hzelda_class = .text:0x00000748; // type:function size:0x3B0 scope:global e_hzelda_attack_a__FP14e_hzelda_class = .text:0x00000AF8; // type:function size:0x544 scope:global e_hzelda_attack_b__FP14e_hzelda_class = .text:0x0000103C; // type:function size:0x308 scope:global ball_crash_eff_set__FP14e_hzelda_classf = .text:0x00001344; // type:function size:0xB0 scope:global e_hzelda_attack_c__FP14e_hzelda_class = .text:0x000013F4; // type:function size:0x874 scope:global -e_hzelda_damage__FP14e_hzelda_class = .text:0x00001C68; // type:function size:0x174 scope:global +e_hzelda_damage__FP14e_hzelda_class = .text:0x00001C68; // type:function size:0x174 scope:local action__FP14e_hzelda_class = .text:0x00001DDC; // type:function size:0x560 scope:global ball_bg_check__FP14e_hzelda_class = .text:0x0000233C; // type:function size:0xE8 scope:global demo_camera__FP14e_hzelda_class = .text:0x00002424; // type:function size:0x304 scope:global anm_se_set__FP14e_hzelda_class = .text:0x00002728; // type:function size:0x208 scope:global -daE_HZELDA_Execute__FP14e_hzelda_class = .text:0x00002930; // type:function size:0x11BC scope:global -daE_HZELDA_IsDelete__FP14e_hzelda_class = .text:0x00003AEC; // type:function size:0x8 scope:global -daE_HZELDA_Delete__FP14e_hzelda_class = .text:0x00003AF4; // type:function size:0x70 scope:global -useHeapInit__FP10fopAc_ac_c = .text:0x00003B64; // type:function size:0x310 scope:global +daE_HZELDA_Execute__FP14e_hzelda_class = .text:0x00002930; // type:function size:0x11BC scope:local +daE_HZELDA_IsDelete__FP14e_hzelda_class = .text:0x00003AEC; // type:function size:0x8 scope:local +daE_HZELDA_Delete__FP14e_hzelda_class = .text:0x00003AF4; // type:function size:0x70 scope:local +useHeapInit__FP10fopAc_ac_c = .text:0x00003B64; // type:function size:0x310 scope:local __dt__12J3DFrameCtrlFv = .text:0x00003E74; // type:function size:0x48 scope:global -daE_HZELDA_Create__FP10fopAc_ac_c = .text:0x00003EBC; // type:function size:0x32C scope:global +daE_HZELDA_Create__FP10fopAc_ac_c = .text:0x00003EBC; // type:function size:0x32C scope:local __ct__14e_hzelda_classFv = .text:0x000041E8; // type:function size:0x2C0 scope:global __dt__8cM3dGSphFv = .text:0x000044A8; // type:function size:0x48 scope:global __dt__8cM3dGAabFv = .text:0x000044F0; // type:function size:0x48 scope:global @@ -118,7 +118,7 @@ _dtors = .dtors:0x00000000; // type:label scope:global @5651 = .rodata:0x0000013C; // type:object size:0x4 scope:local @stringBase0 = .rodata:0x00000140; // type:object size:0x7 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 lbl_202_data_10 = .data:0x00000010; // type:object size:0x10 b_id$4252 = .data:0x00000020; // type:object size:0x6 scope:local @@ -132,7 +132,7 @@ ball_at_sph_src$5569 = .data:0x000000F8; // type:object size:0x40 scope:local ball_tg_sph_src$5570 = .data:0x00000138; // type:object size:0x40 scope:local tri_at_sph_src$5571 = .data:0x00000178; // type:object size:0x40 scope:local pl_at_sph_src$5572 = .data:0x000001B8; // type:object size:0x40 scope:local -l_daE_HZELDA_Method = .data:0x000001F8; // type:object size:0x20 scope:global +l_daE_HZELDA_Method = .data:0x000001F8; // type:object size:0x20 scope:local g_profile_E_HZELDA = .data:0x00000218; // type:object size:0x30 scope:global __vt__12dBgS_AcchCir = .data:0x00000248; // type:object size:0xC scope:global __vt__10cCcD_GStts = .data:0x00000254; // type:object size:0xC scope:global @@ -143,6 +143,6 @@ __vt__12dBgS_ObjAcch = .data:0x00000284; // type:object size:0x24 scope:global __vt__12J3DFrameCtrl = .data:0x000002A8; // type:object size:0xC scope:global __vt__16daE_HZELDA_HIO_c = .data:0x000002B4; // type:object size:0xC scope:global __global_destructor_chain = .bss:0x00000000; // type:object size:0x4 scope:global -lbl_202_bss_8 = .bss:0x00000008; // type:object size:0x1 data:byte +lbl_202_bss_8 = .bss:0x00000008; // type:object size:0x1 scope:local data:byte @3762 = .bss:0x0000000C; // type:object size:0xC scope:local -l_HIO = .bss:0x00000018; // type:object size:0xC scope:global data:byte +l_HIO = .bss:0x00000018; // type:object size:0xC scope:local data:byte diff --git a/configure.py b/configure.py index d4ad83fdedd..06197c224c1 100755 --- a/configure.py +++ b/configure.py @@ -1592,7 +1592,7 @@ config.libs = [ ActorRel(MatchingFor("GZ2E01", "GZ2J01"), "d_a_demo_item"), ActorRel(MatchingFor("GZ2E01", "GZ2J01"), "d_a_door_bossL1"), ActorRel(MatchingFor("GZ2E01", "GZ2J01"), "d_a_e_dn"), - ActorRel(Equivalent, "d_a_e_fm"), # regalloc + ActorRel(MatchingFor("GZ2E01"), "d_a_e_fm"), ActorRel(MatchingFor("GZ2E01", "GZ2J01"), "d_a_e_ga"), ActorRel(MatchingFor("GZ2E01", "GZ2J01"), "d_a_e_hb"), ActorRel(MatchingFor("GZ2E01", "GZ2J01"), "d_a_e_nest"), @@ -1728,7 +1728,7 @@ config.libs = [ ActorRel(NonMatching, "d_a_e_hm"), ActorRel(NonMatching, "d_a_e_hp"), ActorRel(NonMatching, "d_a_e_hz"), - ActorRel(NonMatching, "d_a_e_hzelda"), + ActorRel(MatchingFor("GZ2E01"), "d_a_e_hzelda"), ActorRel(MatchingFor("GZ2E01", "GZ2J01"), "d_a_e_is"), ActorRel(MatchingFor("GZ2E01", "GZ2J01"), "d_a_e_kg"), ActorRel(MatchingFor("GZ2E01", "GZ2J01"), "d_a_e_kk"), diff --git a/src/d/actor/d_a_e_fm.cpp b/src/d/actor/d_a_e_fm.cpp index 3490dfb22f1..28a860e8f4f 100644 --- a/src/d/actor/d_a_e_fm.cpp +++ b/src/d/actor/d_a_e_fm.cpp @@ -3520,7 +3520,6 @@ static int daE_FM_Delete(e_fm_class* i_this) { /* 804F8CE8-804F95CC 009CE8 08E4+00 1/1 0/0 0/0 .text useHeapInit__FP10fopAc_ac_c */ static int useHeapInit(fopAc_ac_c* i_this) { - // NONMATCHING - REGALLOC J3DModelData* modelData; e_fm_class* a_this = (e_fm_class*)i_this; @@ -3556,7 +3555,9 @@ static int useHeapInit(fopAc_ac_c* i_this) { BRK_FM, BRK_FM_ATTACK, BRK_FM_PUTOUT, BRK_FM_PUTOUTWAIT, BRK_FM_ANIMAL02, BRK_FM_OPDEMO, BRK_FM_HANGWAIT, BRK_FM_DEMOEND01, BRK_FM_DEMOEND02 }; - if (!a_this->mpFmBrk[i]->init(a_this->mpFmModelMorf->getModel()->getModelData(), static_cast(dComIfG_getObjectRes("E_fm", brk[i])), 1, anm_mode, 1.0f, 0, -1)) { + if (a_this->mpFmBrk[i]->init(a_this->mpFmModelMorf->getModel()->getModelData(), + static_cast(dComIfG_getObjectRes("E_fm", brk[i])), + 1, anm_mode, 1.0f, 0, -1) == FALSE) { return 0; } @@ -3569,7 +3570,9 @@ static int useHeapInit(fopAc_ac_c* i_this) { BTK_FM, BTK_FM_ATTACK, BTK_FM_PUTOUT, BTK_FM_PUTOUTWAIT, BTK_FM_ANIMAL02, BTK_FM_OPDEMO, BTK_FM_HANGWAIT, BTK_FM_DEMOEND01, BTK_FM_DEMOEND02 }; - if (!a_this->mpFmBtk[i]->init(a_this->mpFmModelMorf->getModel()->getModelData(), static_cast(dComIfG_getObjectRes("E_fm", btk[i])), 1, anm_mode, 1.0f, 0, -1)) { + if (a_this->mpFmBtk[i]->init(a_this->mpFmModelMorf->getModel()->getModelData(), + static_cast(dComIfG_getObjectRes("E_fm", btk[i])), + 1, anm_mode, 1.0f, 0, -1) == FALSE) { return 0; } } @@ -3585,7 +3588,9 @@ static int useHeapInit(fopAc_ac_c* i_this) { return 0; } - if (!a_this->mpDemoFmBrk->init(a_this->mpFmModelMorf->getModel()->getModelData(), static_cast(dComIfG_getObjectRes("E_fm", BRK_FM_DEMOEND03)), 1, 0, 1.0f, 0, -1)) { + if (a_this->mpDemoFmBrk->init(a_this->mpFmModelMorf->getModel()->getModelData(), + static_cast(dComIfG_getObjectRes("E_fm", BRK_FM_DEMOEND03)), + 1, 0, 1.0f, 0, -1) == FALSE) { return 0; } @@ -3601,7 +3606,9 @@ static int useHeapInit(fopAc_ac_c* i_this) { return 0; } - if (!a_this->mpCoreBrk->init(a_this->mpCoreModel->getModelData(), static_cast(dComIfG_getObjectRes("E_fm", BRK_CORE_LIGHTON)), 1, 2, 1.0f, 0, -1)) { + if (a_this->mpCoreBrk->init(a_this->mpCoreModel->getModelData(), + static_cast(dComIfG_getObjectRes("E_fm", BRK_CORE_LIGHTON)), + 1, 2, 1.0f, 0, -1) == FALSE) { return 0; } @@ -3610,7 +3617,9 @@ static int useHeapInit(fopAc_ac_c* i_this) { return 0; } - if (!a_this->mpCoreBtk->init(a_this->mpCoreModel->getModelData(), static_cast(dComIfG_getObjectRes("E_fm", BTK_CORE_BEAT)), 1, 0, 1.0f, 0, -1)) { + if (a_this->mpCoreBtk->init(a_this->mpCoreModel->getModelData(), + static_cast(dComIfG_getObjectRes("E_fm", BTK_CORE_BEAT)), + 1, 0, 1.0f, 0, -1) == FALSE) { return 0; } @@ -3629,7 +3638,9 @@ static int useHeapInit(fopAc_ac_c* i_this) { return 0; } - if (!a_this->mpAttackEfBrk->init(a_this->mpAttackEfModelMorf[i]->getModel()->getModelData(), static_cast(dComIfG_getObjectRes("E_fm", BRK_EF_FMATTACK_B)), 1, 2, 1.0f, 0, -1)) { + if (a_this->mpAttackEfBrk->init(a_this->mpAttackEfModelMorf[i]->getModel()->getModelData(), + static_cast(dComIfG_getObjectRes("E_fm", BRK_EF_FMATTACK_B)), + 1, 2, 1.0f, 0, -1) == FALSE) { return 0; } } @@ -3640,12 +3651,14 @@ static int useHeapInit(fopAc_ac_c* i_this) { } static int eff_btk[] = {BTK_EF_FMATTACK_A, BTK_EF_FMATTACK_B}; - if (!a_this->mpAttackEfBtk[i]->init(a_this->mpAttackEfModelMorf[i]->getModel()->getModelData(), static_cast(dComIfG_getObjectRes("E_fm", eff_btk[i])), 1, 2, 1.0f, 0, -1)) { + if (a_this->mpAttackEfBtk[i]->init(a_this->mpAttackEfModelMorf[i]->getModel()->getModelData(), + static_cast(dComIfG_getObjectRes("E_fm", eff_btk[i])), + 1, 2, 1.0f, 0, -1) == FALSE) { return 0; } } - modelData = (J3DModelData*)dComIfG_getObjectRes("E_fm", BMDR_KUSARI); + modelData = static_cast(dComIfG_getObjectRes("E_fm", BMDR_KUSARI)); JUT_ASSERT(7404, modelData != 0); J3DModelData* modelData2 = static_cast(dComIfG_getObjectRes("E_fm", BMDR_HANDLE)); @@ -3663,7 +3676,7 @@ static int useHeapInit(fopAc_ac_c* i_this) { return 0; } - dKy_tevstr_init(&a_this->mChain[i].tevstr[j], fopAcM_GetRoomNo(i_this), 0xFF); + dKy_tevstr_init(&a_this->mChain[i].tevstr[j], (int) fopAcM_GetRoomNo(i_this), 0xFF); } a_this->mChain[i].field_0x61d0 = 26; diff --git a/src/d/actor/d_a_e_hzelda.cpp b/src/d/actor/d_a_e_hzelda.cpp index 7c63404fc0b..b6250d4c708 100644 --- a/src/d/actor/d_a_e_hzelda.cpp +++ b/src/d/actor/d_a_e_hzelda.cpp @@ -1334,12 +1334,12 @@ static int daE_HZELDA_Delete(e_hzelda_class* i_this) { } /* 806F47C4-806F4AD4 003B64 0310+00 1/1 0/0 0/0 .text useHeapInit__FP10fopAc_ac_c */ -// NONMATCHING - equivalent. r30/r31 regswap static int useHeapInit(fopAc_ac_c* i_this) { e_hzelda_class* a_this = (e_hzelda_class*)i_this; - J3DModelData* modelData; - a_this->mpModelMorf = new mDoExt_McaMorfSO((J3DModelData*)dComIfG_getObjectRes("Hzelda", 0x1B), NULL, NULL, (J3DAnmTransform*)dComIfG_getObjectRes("Hzelda", 0x15), 2, 1.0f, 0, -1, &a_this->mSound, 0x80000, 0x11000284); + a_this->mpModelMorf = new mDoExt_McaMorfSO(static_cast(dComIfG_getObjectRes("Hzelda", 0x1B)), NULL, NULL, + static_cast(dComIfG_getObjectRes("Hzelda", 0x15)), + J3DFrameCtrl::EMode_LOOP, 1.0f, 0, -1, &a_this->mSound, 0x80000, 0x11000284); if (a_this->mpModelMorf == NULL || a_this->mpModelMorf->getModel() == NULL) { return 0; } @@ -1351,14 +1351,14 @@ static int useHeapInit(fopAc_ac_c* i_this) { model->getModelData()->getJointNodePointer(i)->setCallBack(nodeCallBack); } - modelData = (J3DModelData*)dComIfG_getObjectRes("Hzelda", 0x1C); + J3DModelData* modelData = static_cast(dComIfG_getObjectRes("Hzelda", 0x1C)); JUT_ASSERT(2129, modelData != 0); a_this->mpSwordModel = mDoExt_J3DModel__create(modelData, 0x80000, 0x11000084); if (a_this->mpSwordModel == NULL) { return 0; } - modelData = (J3DModelData*)dComIfG_getObjectRes("Hzelda", 0x1A); + modelData = static_cast(dComIfG_getObjectRes("Hzelda", 0x1A)); JUT_ASSERT(2149, modelData != 0); a_this->mpTriangleAtModel = mDoExt_J3DModel__create(modelData, 0x80000, 0x11000284); if (a_this->mpTriangleAtModel == NULL) { @@ -1370,7 +1370,8 @@ static int useHeapInit(fopAc_ac_c* i_this) { return 0; } - if (!a_this->mpTriangleAtBrk->init(modelData, (J3DAnmTevRegKey*)dComIfG_getObjectRes("Hzelda", 0x1F), TRUE, 2, 1.0f, 0, -1)) { + if (a_this->mpTriangleAtBrk->init(modelData, static_cast(dComIfG_getObjectRes("Hzelda", 0x1F)), + TRUE, J3DFrameCtrl::EMode_LOOP, 1.0f, 0, -1) == FALSE) { return 0; } @@ -1379,7 +1380,9 @@ static int useHeapInit(fopAc_ac_c* i_this) { return 0; } - if (!a_this->mpTriangleAtBtk->init(a_this->mpTriangleAtModel->getModelData(), (J3DAnmTextureSRTKey*)dComIfG_getObjectRes("Hzelda", 0x23), TRUE, 2, 1.0f, 0, -1)) { + if (a_this->mpTriangleAtBtk->init(a_this->mpTriangleAtModel->getModelData(), + static_cast(dComIfG_getObjectRes("Hzelda", 0x23)), + TRUE, J3DFrameCtrl::EMode_LOOP, 1.0f, 0, -1) == FALSE) { return 0; }