diff --git a/config/SOUE01/rels/d_a_b_lastbossNP/symbols.txt b/config/SOUE01/rels/d_a_b_lastbossNP/symbols.txt index e86f3fc1..5b01a3a5 100644 --- a/config/SOUE01/rels/d_a_b_lastbossNP/symbols.txt +++ b/config/SOUE01/rels/d_a_b_lastbossNP/symbols.txt @@ -3,36 +3,36 @@ _epilog = .text:0x00000030; // type:function size:0x2C scope:global _unresolved = .text:0x00000060; // type:function size:0x4 scope:global __register_global_object = .text:0x00000070; // type:function size:0x1C scope:global __destroy_global_chain = .text:0x00000090; // type:function size:0x54 scope:global -fn_143_F0 = .text:0x000000F0; // type:function size:0x40 +__dt__7mVec3_cFv = .text:0x000000F0; // type:function size:0x40 dAcBlastboss_c_classInit__Fv = .text:0x00000130; // type:function size:0x39C -fn_143_4D0 = .text:0x000004D0; // type:function size:0x58 -fn_143_530 = .text:0x00000530; // type:function size:0x90 -fn_143_5C0 = .text:0x000005C0; // type:function size:0x90 -fn_143_650 = .text:0x00000650; // type:function size:0x40 +__dt__Q214dAcBlastboss_c10callback_cFv = .text:0x000004D0; // type:function size:0x58 +__dt__15dCcD_Linked_CylFv = .text:0x00000530; // type:function size:0x90 +__dt__15dCcD_Linked_SphFv = .text:0x000005C0; // type:function size:0x90 +__dt__14dScnCallback_cFv = .text:0x00000650; // type:function size:0x40 __dt__27sFState_c<14dAcBlastboss_c>Fv = .text:0x00000690; // type:function size:0x58 __dt__30sFStateFct_c<14dAcBlastboss_c>Fv = .text:0x000006F0; // type:function size:0x6C __dt__83sStateMgr_c<14dAcBlastboss_c,20sStateMethodUsr_FI_c,12sFStateFct_c,13sStateIDChk_c>Fv = .text:0x00000760; // type:function size:0xA0 __dt__53sFStateMgr_c<14dAcBlastboss_c,20sStateMethodUsr_FI_c>Fv = .text:0x00000800; // type:function size:0xA4 -fn_143_8B0 = .text:0x000008B0; // type:function size:0x4 -fn_143_8C0 = .text:0x000008C0; // type:function size:0x84 -fn_143_950 = .text:0x00000950; // type:function size:0x58 -fn_143_9B0 = .text:0x000009B0; // type:function size:0x90 -fn_143_A40 = .text:0x00000A40; // type:function size:0xCC -fn_143_B10 = .text:0x00000B10; // type:function size:0xC0 -fn_143_BD0 = .text:0x00000BD0; // type:function size:0xDC -fn_143_CB0 = .text:0x00000CB0; // type:function size:0xC0 -fn_143_D70 = .text:0x00000D70; // type:function size:0xDC -fn_143_E50 = .text:0x00000E50; // type:function size:0x324 -fn_143_1180 = .text:0x00001180; // type:function size:0x3F8 -fn_143_1580 = .text:0x00001580; // type:function size:0x8 +__ct__7mVec3_cFv = .text:0x000008B0; // type:function size:0x4 +__dt__26dSwordSwingEffectProcMgr_cFv = .text:0x000008C0; // type:function size:0x84 +__ct__15dCcD_Linked_CpsFv = .text:0x00000950; // type:function size:0x58 +__dt__15dCcD_Linked_CpsFv = .text:0x000009B0; // type:function size:0x90 +__dt__16dEnemySwordMdl_cFv = .text:0x00000A40; // type:function size:0xCC +__ct__17UnkLastBossCcSph2Fv = .text:0x00000B10; // type:function size:0xC0 +__dt__17UnkLastBossCcSph2Fv = .text:0x00000BD0; // type:function size:0xDC +__ct__17UnkLastBossCcSph1Fv = .text:0x00000CB0; // type:function size:0xC0 +__dt__17UnkLastBossCcSph1Fv = .text:0x00000D70; // type:function size:0xDC +createHeap__14dAcBlastboss_cFv = .text:0x00000E50; // type:function size:0x324 +create__14dAcBlastboss_cFv = .text:0x00001180; // type:function size:0x3F8 +checkInBossRush__15MinigameManagerFv = .text:0x00001580; // type:function size:0x8 changeState__83sStateMgr_c<14dAcBlastboss_c,20sStateMethodUsr_FI_c,12sFStateFct_c,13sStateIDChk_c>FRC12sStateIDIf_c = .text:0x00001590; // type:function size:0x10 -fn_143_15A0 = .text:0x000015A0; // type:function size:0x34 -fn_143_15E0 = .text:0x000015E0; // type:function size:0x17A8 +doDelete__14dAcBlastboss_cFv = .text:0x000015A0; // type:function size:0x34 +actorExecute__14dAcBlastboss_cFv = .text:0x000015E0; // type:function size:0x17A8 executeState__83sStateMgr_c<14dAcBlastboss_c,20sStateMethodUsr_FI_c,12sFStateFct_c,13sStateIDChk_c>Fv = .text:0x00002D90; // type:function size:0x10 getStateID__83sStateMgr_c<14dAcBlastboss_c,20sStateMethodUsr_FI_c,12sFStateFct_c,13sStateIDChk_c>CFv = .text:0x00002DA0; // type:function size:0x10 -fn_143_2DB0 = .text:0x00002DB0; // type:function size:0x48 -fn_143_2E00 = .text:0x00002E00; // type:function size:0x4C -fn_143_2E50 = .text:0x00002E50; // type:function size:0x85C +ChkAtHit__10dCcD_CheckFv = .text:0x00002DB0; // type:function size:0x48 +ChkTgHit__10dCcD_CheckFv = .text:0x00002E00; // type:function size:0x4C +timingB__Q214dAcBlastboss_c10callback_cFUlPQ34nw4r3g3d13WorldMtxManipQ34nw4r3g3d6ResMdl = .text:0x00002E50; // type:function size:0x85C initializeState_Fight__14dAcBlastboss_cFv = .text:0x000036B0; // type:function size:0xBC executeState_Fight__14dAcBlastboss_cFv = .text:0x00003770; // type:function size:0x718 finalizeState_Fight__14dAcBlastboss_cFv = .text:0x00003E90; // type:function size:0x4 @@ -75,33 +75,33 @@ finalizeState_Stun__14dAcBlastboss_cFv = .text:0x00006490; // type:function size initializeState_ThunderWait__14dAcBlastboss_cFv = .text:0x000064A0; // type:function size:0x54 executeState_ThunderWait__14dAcBlastboss_cFv = .text:0x00006500; // type:function size:0x204 finalizeState_ThunderWait__14dAcBlastboss_cFv = .text:0x00006710; // type:function size:0x4 -fn_143_6720 = .text:0x00006720; // type:function size:0xBB4 -fn_143_72E0 = .text:0x000072E0; // type:function size:0x1C -fn_143_7300 = .text:0x00007300; // type:function size:0x58 -fn_143_7360 = .text:0x00007360; // type:function size:0x50 -fn_143_73B0 = .text:0x000073B0; // type:function size:0x10 -fn_143_73C0 = .text:0x000073C0; // type:function size:0x60 -fn_143_7420 = .text:0x00007420; // type:function size:0x17C -fn_143_75A0 = .text:0x000075A0; // type:function size:0x218 -fn_143_77C0 = .text:0x000077C0; // type:function size:0x338 -fn_143_7B00 = .text:0x00007B00; // type:function size:0x478 -fn_143_7F80 = .text:0x00007F80; // type:function size:0x674 -fn_143_8600 = .text:0x00008600; // type:function size:0x860 -fn_143_8E60 = .text:0x00008E60; // type:function size:0x5B4 -fn_143_9420 = .text:0x00009420; // type:function size:0x148 -fn_143_9570 = .text:0x00009570; // type:function size:0x9C -fn_143_9610 = .text:0x00009610; // type:function size:0xAF4 -fn_143_A110 = .text:0x0000A110; // type:function size:0xBC -fn_143_A1D0 = .text:0x0000A1D0; // type:function size:0x8 -fn_143_A1E0 = .text:0x0000A1E0; // type:function size:0x4 -fn_143_A1F0 = .text:0x0000A1F0; // type:function size:0x4 -fn_143_A200 = .text:0x0000A200; // type:function size:0x8 +checkDamage__14dAcBlastboss_cFv = .text:0x00006720; // type:function size:0xBB4 +calcTimer__4sLibFPUc_Uc = .text:0x000072E0; // type:function size:0x1C +setAnm__14dAcBlastboss_cFPCcf = .text:0x00007300; // type:function size:0x58 +forceSetAnm__14dAcBlastboss_cFPCcf = .text:0x00007360; // type:function size:0x50 +setAnmRate__14dAcBlastboss_cFf = .text:0x000073B0; // type:function size:0x10 +draw__14dAcBlastboss_cFv = .text:0x000073C0; // type:function size:0x60 +checkForCloseRangeAttack__14dAcBlastboss_cFv = .text:0x00007420; // type:function size:0x17C +checkForRangeAttack__14dAcBlastboss_cFv = .text:0x000075A0; // type:function size:0x218 +checkForCounter__14dAcBlastboss_cFv = .text:0x000077C0; // type:function size:0x338 +updateMainNodeTransforms__14dAcBlastboss_cFv = .text:0x00007B00; // type:function size:0x478 +updateSkirtHairTransforms__14dAcBlastboss_cFv = .text:0x00007F80; // type:function size:0x674 +updateSkirtTransform__14dAcBlastboss_cFl = .text:0x00008600; // type:function size:0x860 +updateHairTransform__14dAcBlastboss_cFl = .text:0x00008E60; // type:function size:0x5B4 +checkForLinkSwordBySwordHit__14dAcBlastboss_cFv = .text:0x00009420; // type:function size:0x148 +classifyAttackDirection__14dAcBlastboss_cFl = .text:0x00009570; // type:function size:0x9C +executeLightningStrike__14dAcBlastboss_cFv = .text:0x00009610; // type:function size:0xAF4 +setLightningTimerMaybe__14dAcBlastboss_cFl = .text:0x0000A110; // type:function size:0xBC +vt_0x88__11dAcEnBase_cFi = .text:0x0000A1D0; // type:function size:0x8 +vt_0x84__11dAcEnBase_cFv = .text:0x0000A1E0; // type:function size:0x4 +vt_0x80__11dAcEnBase_cFv = .text:0x0000A1F0; // type:function size:0x4 +getObjectListEntry__11dAcEnBase_cFv = .text:0x0000A200; // type:function size:0x8 __dt__14dAcBlastboss_cFv = .text:0x0000A210; // type:function size:0x398 -fn_143_A5B0 = .text:0x0000A5B0; // type:function size:0x4 -fn_143_A5C0 = .text:0x0000A5C0; // type:function size:0x4 -fn_143_A5D0 = .text:0x0000A5D0; // type:function size:0x4 -fn_143_A5E0 = .text:0x0000A5E0; // type:function size:0x4 -fn_143_A5F0 = .text:0x0000A5F0; // type:function size:0x4 +ExecCallback_DRAW_XLU__Q34nw4r3g3d15IScnObjCallbackFQ44nw4r3g3d6ScnObj6TimingPQ34nw4r3g3d6ScnObjUlPv = .text:0x0000A5B0; // type:function size:0x4 +ExecCallback_DRAW_OPA__Q34nw4r3g3d15IScnObjCallbackFQ44nw4r3g3d6ScnObj6TimingPQ34nw4r3g3d6ScnObjUlPv = .text:0x0000A5C0; // type:function size:0x4 +ExecCallback_CALC_MAT__Q34nw4r3g3d15IScnObjCallbackFQ44nw4r3g3d6ScnObj6TimingPQ34nw4r3g3d6ScnObjUlPv = .text:0x0000A5D0; // type:function size:0x4 +ExecCallback_CALC_WORLD__Q34nw4r3g3d15IScnObjCallbackFQ44nw4r3g3d6ScnObj6TimingPQ34nw4r3g3d6ScnObjUlPv = .text:0x0000A5E0; // type:function size:0x4 +ExecCallback_CALC_VIEW__Q34nw4r3g3d15IScnObjCallbackFQ44nw4r3g3d6ScnObj6TimingPQ34nw4r3g3d6ScnObjUlPv = .text:0x0000A5F0; // type:function size:0x4 build__30sFStateFct_c<14dAcBlastboss_c>FRC12sStateIDIf_c = .text:0x0000A600; // type:function size:0x60 dispose__30sFStateFct_c<14dAcBlastboss_c>FRP10sStateIf_c = .text:0x0000A660; // type:function size:0xC initialize__27sFState_c<14dAcBlastboss_c>Fv = .text:0x0000A670; // type:function size:0x1C @@ -119,36 +119,188 @@ initializeState__29sFStateID_c<14dAcBlastboss_c>CFR14dAcBlastboss_c = .text:0x00 __sinit_\d_a_b_lastboss_cpp = .text:0x0000A7C0; // type:function size:0xA90 scope:local __dt__29sFStateID_c<14dAcBlastboss_c>Fv = .text:0x0000B250; // type:function size:0x58 isSameName__29sFStateID_c<14dAcBlastboss_c>CFPCc = .text:0x0000B2B0; // type:function size:0x88 -fn_143_B340 = .text:0x0000B340; // type:function size:0x8 -fn_143_B350 = .text:0x0000B350; // type:function size:0x8 -fn_143_B360 = .text:0x0000B360; // type:function size:0x8 +@272@__dt__15dCcD_Linked_CpsFv = .text:0x0000B340; // type:function size:0x8 +@272@__dt__15dCcD_Linked_SphFv = .text:0x0000B350; // type:function size:0x8 +@272@__dt__15dCcD_Linked_CylFv = .text:0x0000B360; // type:function size:0x8 _ctors = .ctors:0x00000000; // type:label scope:global _dtors = .dtors:0x00000000; // type:label scope:global __destroy_global_chain_reference = .dtors:0x00000000; // type:object size:0x4 scope:global lbl_143_rodata_0 = .rodata:0x00000000; // type:object size:0xC data:float -lbl_143_rodata_C = .rodata:0x0000000C; // type:object size:0x64 align:4 data:float -lbl_143_rodata_70 = .rodata:0x00000070; // type:object size:0x20 align:4 data:float +lbl_143_rodata_C = .rodata:0x0000000C; // type:object size:0x4 align:4 data:float +lbl_143_rodata_10 = .rodata:0x00000010; // type:object size:0x4 align:4 data:float +lbl_143_rodata_14 = .rodata:0x00000014; // type:object size:0x4 align:4 data:float +lbl_143_rodata_18 = .rodata:0x00000018; // type:object size:0x4 +lbl_143_rodata_1C = .rodata:0x0000001C; // type:object size:0x4 +lbl_143_rodata_20 = .rodata:0x00000020; // type:object size:0x4 +lbl_143_rodata_24 = .rodata:0x00000024; // type:object size:0x4 +lbl_143_rodata_28 = .rodata:0x00000028; // type:object size:0x4 +lbl_143_rodata_2C = .rodata:0x0000002C; // type:object size:0x4 data:float +lbl_143_rodata_30 = .rodata:0x00000030; // type:object size:0x4 +lbl_143_rodata_38 = .rodata:0x00000038; // type:object size:0x10 +lbl_143_rodata_48 = .rodata:0x00000048; // type:object size:0x4 data:float +lbl_143_rodata_4C = .rodata:0x0000004C; // type:object size:0x4 +lbl_143_rodata_50 = .rodata:0x00000050; // type:object size:0x4 +lbl_143_rodata_54 = .rodata:0x00000054; // type:object size:0x4 data:float +lbl_143_rodata_58 = .rodata:0x00000058; // type:object size:0x4 +lbl_143_rodata_5C = .rodata:0x0000005C; // type:object size:0x4 +lbl_143_rodata_60 = .rodata:0x00000060; // type:object size:0x4 +lbl_143_rodata_64 = .rodata:0x00000064; // type:object size:0x4 +lbl_143_rodata_68 = .rodata:0x00000068; // type:object size:0x4 +lbl_143_rodata_6C = .rodata:0x0000006C; // type:object size:0x4 data:float +lbl_143_rodata_70 = .rodata:0x00000070; // type:object size:0x4 align:4 data:float +lbl_143_rodata_74 = .rodata:0x00000074; // type:object size:0x4 +lbl_143_rodata_78 = .rodata:0x00000078; // type:object size:0x4 +lbl_143_rodata_7C = .rodata:0x0000007C; // type:object size:0x4 +lbl_143_rodata_80 = .rodata:0x00000080; // type:object size:0x4 +lbl_143_rodata_84 = .rodata:0x00000084; // type:object size:0x4 +lbl_143_rodata_88 = .rodata:0x00000088; // type:object size:0x4 data:float +lbl_143_rodata_8C = .rodata:0x0000008C; // type:object size:0x4 data:float lbl_143_rodata_90 = .rodata:0x00000090; // type:object size:0x4 align:4 data:float -lbl_143_rodata_94 = .rodata:0x00000094; // type:object size:0x10 align:4 data:float -lbl_143_rodata_A4 = .rodata:0x000000A4; // type:object size:0x44 align:4 data:float -lbl_143_rodata_E8 = .rodata:0x000000E8; // type:object size:0x18 align:4 data:float -lbl_143_rodata_100 = .rodata:0x00000100; // type:object size:0x18 align:8 data:double -lbl_143_rodata_118 = .rodata:0x00000118; // type:object size:0xC align:4 data:float -lbl_143_rodata_124 = .rodata:0x00000124; // type:object size:0x10 align:4 data:float -lbl_143_rodata_134 = .rodata:0x00000134; // type:object size:0x7C align:4 data:float -lbl_143_rodata_1B0 = .rodata:0x000001B0; // type:object size:0x8 align:4 data:float -lbl_143_rodata_1B8 = .rodata:0x000001B8; // type:object size:0x10 align:4 data:float -lbl_143_rodata_1C8 = .rodata:0x000001C8; // type:object size:0xC align:4 data:float -lbl_143_rodata_1D4 = .rodata:0x000001D4; // type:object size:0x3C align:4 data:float -lbl_143_rodata_210 = .rodata:0x00000210; // type:object size:0x90 align:4 data:float -g_profile_B_LASTBOSS = .data:0x00000000; // type:object size:0x1A0 data:4byte +lbl_143_rodata_94 = .rodata:0x00000094; // type:object size:0x4 align:4 data:float +lbl_143_rodata_98 = .rodata:0x00000098; // type:object size:0x4 align:4 data:float +lbl_143_rodata_9C = .rodata:0x0000009C; // type:object size:0x4 align:4 data:float +lbl_143_rodata_A0 = .rodata:0x000000A0; // type:object size:0x4 +lbl_143_rodata_A4 = .rodata:0x000000A4; // type:object size:0x4 align:4 data:float +lbl_143_rodata_A8 = .rodata:0x000000A8; // type:object size:0x4 align:4 data:float +lbl_143_rodata_AC = .rodata:0x000000AC; // type:object size:0x4 align:4 data:float +lbl_143_rodata_B0 = .rodata:0x000000B0; // type:object size:0x4 data:float +lbl_143_rodata_B4 = .rodata:0x000000B4; // type:object size:0x4 data:float +lbl_143_rodata_B8 = .rodata:0x000000B8; // type:object size:0x4 data:float +lbl_143_rodata_BC = .rodata:0x000000BC; // type:object size:0x4 data:float +lbl_143_rodata_C0 = .rodata:0x000000C0; // type:object size:0x4 data:float +lbl_143_rodata_C4 = .rodata:0x000000C4; // type:object size:0x4 data:float +lbl_143_rodata_C8 = .rodata:0x000000C8; // type:object size:0x4 data:float +lbl_143_rodata_CC = .rodata:0x000000CC; // type:object size:0x4 data:float +lbl_143_rodata_D0 = .rodata:0x000000D0; // type:object size:0x4 data:float +lbl_143_rodata_D4 = .rodata:0x000000D4; // type:object size:0x4 data:float +lbl_143_rodata_D8 = .rodata:0x000000D8; // type:object size:0x4 data:float +lbl_143_rodata_DC = .rodata:0x000000DC; // type:object size:0x4 data:float +lbl_143_rodata_E0 = .rodata:0x000000E0; // type:object size:0x4 data:float +lbl_143_rodata_E4 = .rodata:0x000000E4; // type:object size:0x4 data:float +lbl_143_rodata_E8 = .rodata:0x000000E8; // type:object size:0x4 align:4 data:float +lbl_143_rodata_EC = .rodata:0x000000EC; // type:object size:0x4 align:4 data:float +lbl_143_rodata_F0 = .rodata:0x000000F0; // type:object size:0x4 align:4 data:float +lbl_143_rodata_F4 = .rodata:0x000000F4; // type:object size:0x4 align:4 data:float +lbl_143_rodata_F8 = .rodata:0x000000F8; // type:object size:0x8 align:8 data:double +lbl_143_rodata_100 = .rodata:0x00000100; // type:object size:0x8 align:8 data:double +lbl_143_rodata_108 = .rodata:0x00000108; // type:object size:0x4 +lbl_143_rodata_10C = .rodata:0x0000010C; // type:object size:0x4 +lbl_143_rodata_110 = .rodata:0x00000110; // type:object size:0x4 +lbl_143_rodata_114 = .rodata:0x00000114; // type:object size:0x4 +lbl_143_rodata_118 = .rodata:0x00000118; // type:object size:0x4 align:4 data:float +lbl_143_rodata_11C = .rodata:0x0000011C; // type:object size:0x4 +lbl_143_rodata_120 = .rodata:0x00000120; // type:object size:0x4 +lbl_143_rodata_124 = .rodata:0x00000124; // type:object size:0x4 align:4 data:float +lbl_143_rodata_128 = .rodata:0x00000128; // type:object size:0x4 +lbl_143_rodata_12C = .rodata:0x0000012C; // type:object size:0x4 +lbl_143_rodata_130 = .rodata:0x00000130; // type:object size:0x4 +lbl_143_rodata_134 = .rodata:0x00000134; // type:object size:0x4 align:4 data:float +lbl_143_rodata_138 = .rodata:0x00000138; // type:object size:0x4 align:4 data:float +lbl_143_rodata_13C = .rodata:0x0000013C; // type:object size:0x4 align:4 data:float +lbl_143_rodata_140 = .rodata:0x00000140; // type:object size:0x4 +lbl_143_rodata_144 = .rodata:0x00000144; // type:object size:0x4 +lbl_143_rodata_148 = .rodata:0x00000148; // type:object size:0x4 +lbl_143_rodata_14C = .rodata:0x0000014C; // type:object size:0x4 +lbl_143_rodata_150 = .rodata:0x00000150; // type:object size:0x4 data:float +lbl_143_rodata_154 = .rodata:0x00000154; // type:object size:0x4 +lbl_143_rodata_158 = .rodata:0x00000158; // type:object size:0x4 data:float +lbl_143_rodata_15C = .rodata:0x0000015C; // type:object size:0x4 data:float +lbl_143_rodata_160 = .rodata:0x00000160; // type:object size:0x4 data:float +lbl_143_rodata_164 = .rodata:0x00000164; // type:object size:0x4 data:float +lbl_143_rodata_168 = .rodata:0x00000168; // type:object size:0x4 data:float +lbl_143_rodata_16C = .rodata:0x0000016C; // type:object size:0x4 data:float +lbl_143_rodata_170 = .rodata:0x00000170; // type:object size:0x4 data:float +lbl_143_rodata_174 = .rodata:0x00000174; // type:object size:0x4 data:float +lbl_143_rodata_178 = .rodata:0x00000178; // type:object size:0x28 +lbl_143_rodata_1A0 = .rodata:0x000001A0; // type:object size:0x4 data:float +lbl_143_rodata_1A4 = .rodata:0x000001A4; // type:object size:0x4 data:float +lbl_143_rodata_1A8 = .rodata:0x000001A8; // type:object size:0x4 data:float +lbl_143_rodata_1AC = .rodata:0x000001AC; // type:object size:0x4 +lbl_143_rodata_1B0 = .rodata:0x000001B0; // type:object size:0x4 align:4 data:float +lbl_143_rodata_1B4 = .rodata:0x000001B4; // type:object size:0x4 align:4 data:float +lbl_143_rodata_1B8 = .rodata:0x000001B8; // type:object size:0x4 align:4 data:float +lbl_143_rodata_1BC = .rodata:0x000001BC; // type:object size:0x4 align:4 data:float +lbl_143_rodata_1C0 = .rodata:0x000001C0; // type:object size:0x4 align:4 data:float +lbl_143_rodata_1C4 = .rodata:0x000001C4; // type:object size:0x4 align:4 data:float +lbl_143_rodata_1C8 = .rodata:0x000001C8; // type:object size:0x4 align:4 data:float +lbl_143_rodata_1CC = .rodata:0x000001CC; // type:object size:0x4 align:4 data:float +lbl_143_rodata_1D0 = .rodata:0x000001D0; // type:object size:0x4 align:4 data:float +lbl_143_rodata_1D4 = .rodata:0x000001D4; // type:object size:0x4 align:4 data:float +lbl_143_rodata_1D8 = .rodata:0x000001D8; // type:object size:0x4 align:4 data:float +lbl_143_rodata_1E0 = .rodata:0x000001E0; // type:object size:0x10 +lbl_143_rodata_1F0 = .rodata:0x000001F0; // type:object size:0x10 +lbl_143_rodata_200 = .rodata:0x00000200; // type:object size:0x4 align:4 data:float +lbl_143_rodata_204 = .rodata:0x00000204; // type:object size:0x4 align:4 data:float +lbl_143_rodata_208 = .rodata:0x00000208; // type:object size:0x4 align:4 data:float +lbl_143_rodata_20C = .rodata:0x0000020C; // type:object size:0x4 align:4 data:float +lbl_143_rodata_210 = .rodata:0x00000210; // type:object size:0x4 align:4 data:float +lbl_143_rodata_214 = .rodata:0x00000214; // type:object size:0x24 align:4 data:float +lbl_143_rodata_238 = .rodata:0x00000238; // type:object size:0x4 align:4 data:float +lbl_143_rodata_23C = .rodata:0x0000023C; // type:object size:0x4 align:4 data:float +lbl_143_rodata_240 = .rodata:0x00000240; // type:object size:0x4 align:4 data:float +lbl_143_rodata_244 = .rodata:0x00000244; // type:object size:0x4 align:4 data:float +lbl_143_rodata_248 = .rodata:0x00000248; // type:object size:0x4 align:4 data:float +lbl_143_rodata_24C = .rodata:0x0000024C; // type:object size:0x4 align:4 data:float +lbl_143_rodata_250 = .rodata:0x00000250; // type:object size:0x4 align:4 data:float +lbl_143_rodata_254 = .rodata:0x00000254; // type:object size:0x4 align:4 data:float +lbl_143_rodata_258 = .rodata:0x00000258; // type:object size:0x4 align:4 data:float +lbl_143_rodata_25C = .rodata:0x0000025C; // type:object size:0x4 +lbl_143_rodata_260 = .rodata:0x00000260; // type:object size:0x4 +lbl_143_rodata_264 = .rodata:0x00000264; // type:object size:0x4 +lbl_143_rodata_268 = .rodata:0x00000268; // type:object size:0x4 +lbl_143_rodata_26C = .rodata:0x0000026C; // type:object size:0x4 +lbl_143_rodata_270 = .rodata:0x00000270; // type:object size:0x4 +lbl_143_rodata_274 = .rodata:0x00000274; // type:object size:0x4 +lbl_143_rodata_278 = .rodata:0x00000278; // type:object size:0x4 align:4 data:float +lbl_143_rodata_27C = .rodata:0x0000027C; // type:object size:0x4 +lbl_143_rodata_280 = .rodata:0x00000280; // type:object size:0x4 +lbl_143_rodata_284 = .rodata:0x00000284; // type:object size:0x4 +lbl_143_rodata_288 = .rodata:0x00000288; // type:object size:0x4 +lbl_143_rodata_28C = .rodata:0x0000028C; // type:object size:0x4 +lbl_143_rodata_290 = .rodata:0x00000290; // type:object size:0x4 +lbl_143_rodata_294 = .rodata:0x00000294; // type:object size:0x4 +lbl_143_rodata_298 = .rodata:0x00000298; // type:object size:0x4 +lbl_143_rodata_29C = .rodata:0x0000029C; // type:object size:0x4 +g_profile_B_LASTBOSS = .data:0x00000000; // type:object size:0x10 data:4byte +sSrcCyl1 = .data:0x00000010; // type:object size:0x30 +sSrcCyl2 = .data:0x00000040; // type:object size:0x30 +sSrcCyl3 = .data:0x00000070; // type:object size:0x30 +sSrcSph1 = .data:0x000000A0; // type:object size:0x2C +sSrcSph2 = .data:0x000000CC; // type:object size:0x2C +sSrcSph = .data:0x000000F8; // type:object size:0x2C +lbl_143_data_124 = .data:0x00000124; // type:object size:0xA data:string +lbl_143_data_130 = .data:0x00000130; // type:object size:0x9 data:string +lbl_143_data_13C = .data:0x0000013C; // type:object size:0x5 data:string +lbl_143_data_144 = .data:0x00000144; // type:object size:0x5 data:string +lbl_143_data_14C = .data:0x0000014C; // type:object size:0xE data:string +lbl_143_data_15C = .data:0x0000015C; // type:object size:0xD data:string +lbl_143_data_16C = .data:0x0000016C; // type:object size:0x1C data:string +lbl_143_data_188 = .data:0x00000188; // type:object size:0xC data:string +lbl_143_data_194 = .data:0x00000194; // type:object size:0xA data:string lbl_143_data_1A0 = .data:0x000001A0; // type:object size:0x10 data:string -lbl_143_data_1B0 = .data:0x000001B0; // type:object size:0x28 -lbl_143_data_1D8 = .data:0x000001D8; // type:object size:0x70 +lbl_143_data_1B0 = .data:0x000001B0; // type:object size:0x5 data:string +lbl_143_data_1B8 = .data:0x000001B8; // type:object size:0x5 data:string +lbl_143_data_1C0 = .data:0x000001C0; // type:object size:0x7 data:string +lbl_143_data_1C8 = .data:0x000001C8; // type:object size:0x6 data:string +lbl_143_data_1D0 = .data:0x000001D0; // type:object size:0x6 data:string +lbl_143_data_1D8 = .data:0x000001D8; // type:object size:0xC data:string +lbl_143_data_1E8 = .data:0x000001E8; // type:object size:0x8 data:string +lbl_143_data_1F0 = .data:0x000001F0; // type:object size:0x8 data:string +lbl_143_data_1F8 = .data:0x000001F8; // type:object size:0x8 data:string +lbl_143_data_200 = .data:0x00000200; // type:object size:0x8 data:string +lbl_143_data_208 = .data:0x00000208; // type:object size:0xE data:string +lbl_143_data_218 = .data:0x00000218; // type:object size:0xA data:string +lbl_143_data_224 = .data:0x00000224; // type:object size:0xC data:string +lbl_143_data_230 = .data:0x00000230; // type:object size:0xC data:string +lbl_143_data_23C = .data:0x0000023C; // type:object size:0xC data:string lbl_143_data_248 = .data:0x00000248; // type:object size:0xE data:string lbl_143_data_258 = .data:0x00000258; // type:object size:0x4 data:4byte -lbl_143_data_25C = .data:0x0000025C; // type:object size:0x1C -lbl_143_data_278 = .data:0x00000278; // type:object size:0x20 +lbl_143_data_25C = .data:0x0000025C; // type:object size:0x7 data:string +lbl_143_data_264 = .data:0x00000264; // type:object size:0x4 +lbl_143_data_268 = .data:0x00000268; // type:object size:0x4 +lbl_143_data_26C = .data:0x0000026C; // type:object size:0xC +lbl_143_data_278 = .data:0x00000278; // type:object size:0x10 data:string +lbl_143_data_288 = .data:0x00000288; // type:object size:0xF data:string lbl_143_data_298 = .data:0x00000298; // type:object size:0x11 data:string lbl_143_data_2AC = .data:0x000002AC; // type:object size:0x4 data:4byte lbl_143_data_2B0 = .data:0x000002B0; // type:object size:0x7 data:string @@ -160,36 +312,87 @@ lbl_143_data_2D8 = .data:0x000002D8; // type:object size:0x8 data:string lbl_143_data_2E0 = .data:0x000002E0; // type:object size:0x7 data:string lbl_143_data_2E8 = .data:0x000002E8; // type:object size:0x7 data:string lbl_143_data_2F0 = .data:0x000002F0; // type:object size:0x7 data:string -lbl_143_data_2F8 = .data:0x000002F8; // type:object size:0x58 +lbl_143_data_2F8 = .data:0x000002F8; // type:object size:0x7 data:string +lbl_143_data_300 = .data:0x00000300; // type:object size:0x28 +lbl_143_data_328 = .data:0x00000328; // type:object size:0xD data:string +lbl_143_data_338 = .data:0x00000338; // type:object size:0xD data:string +lbl_143_data_348 = .data:0x00000348; // type:object size:0x7 data:string lbl_143_data_350 = .data:0x00000350; // type:object size:0xB data:string lbl_143_data_35C = .data:0x0000035C; // type:object size:0xC data:string lbl_143_data_368 = .data:0x00000368; // type:object size:0x7 data:string -lbl_143_data_370 = .data:0x00000370; // type:object size:0x64 -lbl_143_data_3D4 = .data:0x000003D4; // type:object size:0x34 +lbl_143_data_370 = .data:0x00000370; // type:object size:0x7 data:string +lbl_143_data_378 = .data:0x00000378; // type:object size:0xB data:string +lbl_143_data_384 = .data:0x00000384; // type:object size:0xE data:string +lbl_143_data_394 = .data:0x00000394; // type:object size:0xE data:string +lbl_143_data_3A4 = .data:0x000003A4; // type:object size:0xE data:string +lbl_143_data_3B4 = .data:0x000003B4; // type:object size:0xE data:string +lbl_143_data_3C4 = .data:0x000003C4; // type:object size:0xE data:string +lbl_143_data_3D4 = .data:0x000003D4; // type:object size:0xB data:string +lbl_143_data_3E0 = .data:0x000003E0; // type:object size:0xA data:string +lbl_143_data_3EC = .data:0x000003EC; // type:object size:0x9 data:string +lbl_143_data_3F8 = .data:0x000003F8; // type:object size:0x9 data:string +lbl_143_data_404 = .data:0x00000404; // type:object size:0x4 data:string lbl_143_data_408 = .data:0x00000408; // type:object size:0x11 data:string jumptable_143_data_41C = .data:0x0000041C; // type:object size:0x58 scope:local lbl_143_data_474 = .data:0x00000474; // type:object size:0x9 data:string lbl_143_data_480 = .data:0x00000480; // type:object size:0xC data:string -lbl_143_data_48C = .data:0x0000048C; // type:object size:0x34 +lbl_143_data_48C = .data:0x0000048C; // type:object size:0x12 data:string +lbl_143_data_4A0 = .data:0x000004A0; // type:object size:0x4 +lbl_143_data_4A4 = .data:0x000004A4; // type:object size:0x4 +lbl_143_data_4A8 = .data:0x000004A8; // type:object size:0xC +lbl_143_data_4B4 = .data:0x000004B4; // type:object size:0xC lbl_143_data_4C0 = .data:0x000004C0; // type:object size:0x4 data:4byte -lbl_143_data_4C4 = .data:0x000004C4; // type:object size:0x5C data:4byte -lbl_143_data_520 = .data:0x00000520; // type:object size:0x90 -lbl_143_data_5B0 = .data:0x000005B0; // type:object size:0x30 -lbl_143_data_5E0 = .data:0x000005E0; // type:object size:0x30 -lbl_143_data_610 = .data:0x00000610; // type:object size:0x18 -lbl_143_data_628 = .data:0x00000628; // type:object size:0x18 -lbl_143_data_640 = .data:0x00000640; // type:object size:0x70 -lbl_143_data_6B0 = .data:0x000006B0; // type:object size:0x18 -lbl_143_data_6C8 = .data:0x000006C8; // type:object size:0x70 -lbl_143_data_738 = .data:0x00000738; // type:object size:0x10 -lbl_143_data_748 = .data:0x00000748; // type:object size:0x70 -lbl_143_data_7B8 = .data:0x000007B8; // type:object size:0x410 -lbl_143_data_BC8 = .data:0x00000BC8; // type:object size:0x34 +lbl_143_data_4C4 = .data:0x000004C4; // type:object size:0x4 data:4byte +lbl_143_data_4C8 = .data:0x000004C8; // type:object size:0x4 data:4byte +lbl_143_data_4CC = .data:0x000004CC; // type:object size:0x4 data:4byte +lbl_143_data_4D0 = .data:0x000004D0; // type:object size:0x4 +lbl_143_data_4D4 = .data:0x000004D4; // type:object size:0x4 +lbl_143_data_4D8 = .data:0x000004D8; // type:object size:0x4 +lbl_143_data_4DC = .data:0x000004DC; // type:object size:0x4 +lbl_143_data_4E0 = .data:0x000004E0; // type:object size:0x4 +lbl_143_data_4E4 = .data:0x000004E4; // type:object size:0x4 +lbl_143_data_4E8 = .data:0x000004E8; // type:object size:0x4 +lbl_143_data_4EC = .data:0x000004EC; // type:object size:0xA data:string +lbl_143_data_4F8 = .data:0x000004F8; // type:object size:0x8 data:string +lbl_143_data_500 = .data:0x00000500; // type:object size:0xA data:string +lbl_143_data_510 = .data:0x00000510; // type:object size:0x10 data:string +__vt__14dAcBlastboss_c = .data:0x00000520; // type:object size:0x8C +__vt__53sFStateMgr_c<14dAcBlastboss_c,20sStateMethodUsr_FI_c> = .data:0x000005B0; // type:object size:0x30 +__vt__83sStateMgr_c<14dAcBlastboss_c,20sStateMethodUsr_FI_c,12sFStateFct_c,13sStateIDChk_c> = .data:0x000005E0; // type:object size:0x30 +__vt__30sFStateFct_c<14dAcBlastboss_c> = .data:0x00000610; // type:object size:0x14 +__vt__27sFState_c<14dAcBlastboss_c> = .data:0x00000628; // type:object size:0x18 +__vt__15dCcD_Linked_Cyl = .data:0x00000640; // type:object size:0x70 +__vt__Q214dAcBlastboss_c10callback_c = .data:0x000006B0; // type:object size:0x18 +__vt__15dCcD_Linked_Sph = .data:0x000006C8; // type:object size:0x70 +__vt__16dEnemySwordMdl_c = .data:0x00000738; // type:object size:0xC +__vt__15dCcD_Linked_Cps = .data:0x00000748; // type:object size:0x70 +__vt__26dSwordSwingEffectProcMgr_c = .data:0x000007B8; // type:object size:0xC +__vt__Q34nw4r3g3d15IScnObjCallback = .data:0x000007C8; // type:object size:0x20 +lbl_143_data_7E8 = .data:0x000007E8; // type:object size:0x3E0 +__vt__29sFStateID_c<14dAcBlastboss_c> = .data:0x00000BC8; // type:object size:0x34 __global_destructor_chain = .bss:0x00000000; // type:object size:0x4 scope:global lbl_143_bss_8 = .bss:0x00000008; // type:object size:0x10 data:4byte -lbl_143_bss_18 = .bss:0x00000018; // type:object size:0x40 data:4byte -lbl_143_bss_58 = .bss:0x00000058; // type:object size:0x80 data:4byte -lbl_143_bss_D8 = .bss:0x000000D8; // type:object size:0x40 data:4byte -lbl_143_bss_118 = .bss:0x00000118; // type:object size:0x40 data:4byte -lbl_143_bss_158 = .bss:0x00000158; // type:object size:0x40 data:4byte -lbl_143_bss_198 = .bss:0x00000198; // type:object size:0x230 data:4byte +StateID_Fight__14dAcBlastboss_c = .bss:0x00000018; // type:object size:0x30 data:4byte +StateID_Guard__14dAcBlastboss_c = .bss:0x00000058; // type:object size:0x30 data:4byte +StateID_GuardBreak__14dAcBlastboss_c = .bss:0x00000098; // type:object size:0x30 data:4byte +StateID_Attack__14dAcBlastboss_c = .bss:0x000000D8; // type:object size:0x30 data:4byte +StateID_CounterAttack__14dAcBlastboss_c = .bss:0x00000118; // type:object size:0x30 data:4byte +StateID_PunchAttack__14dAcBlastboss_c = .bss:0x00000158; // type:object size:0x30 data:4byte +StateID_DashAttack__14dAcBlastboss_c = .bss:0x00000198; // type:object size:0x30 data:4byte +StateID_SmallAttack__14dAcBlastboss_c = .bss:0x000001D8; // type:object size:0x30 data:4byte +StateID_ThunderAttack__14dAcBlastboss_c = .bss:0x00000218; // type:object size:0x30 data:4byte +StateID_Damage__14dAcBlastboss_c = .bss:0x00000258; // type:object size:0x30 data:4byte +StateID_SitDamage__14dAcBlastboss_c = .bss:0x00000298; // type:object size:0x30 data:4byte +StateID_Down__14dAcBlastboss_c = .bss:0x000002D8; // type:object size:0x30 data:4byte +StateID_Stun__14dAcBlastboss_c = .bss:0x00000318; // type:object size:0x30 data:4byte +StateID_ThunderWait__14dAcBlastboss_c = .bss:0x00000358; // type:object size:0x30 data:4byte +lbl_143_bss_388 = .bss:0x00000388; // type:object size:0x1 data:byte +lbl_143_bss_38C = .bss:0x0000038C; // type:object size:0x6 +lbl_143_bss_392 = .bss:0x00000392; // type:object size:0x1 data:byte +lbl_143_bss_394 = .bss:0x00000394; // type:object size:0xC +lbl_143_bss_3A0 = .bss:0x000003A0; // type:object size:0x1 data:byte +lbl_143_bss_3A4 = .bss:0x000003A4; // type:object size:0x6 +lbl_143_bss_3AA = .bss:0x000003AA; // type:object size:0x1 data:byte +lbl_143_bss_3AC = .bss:0x000003AC; // type:object size:0xC +lbl_143_bss_3B8 = .bss:0x000003B8; // type:object size:0x1 data:byte +lbl_143_bss_3BC = .bss:0x000003BC; // type:object size:0xC diff --git a/config/SOUE01/rels/d_t_bb_quakeNP/symbols.txt b/config/SOUE01/rels/d_t_bb_quakeNP/symbols.txt index 0698589f..a9c449d2 100644 --- a/config/SOUE01/rels/d_t_bb_quakeNP/symbols.txt +++ b/config/SOUE01/rels/d_t_bb_quakeNP/symbols.txt @@ -4,7 +4,7 @@ _unresolved = .text:0x00000060; // type:function size:0x4 scope:global __register_global_object = .text:0x00000070; // type:function size:0x1C scope:global __destroy_global_chain = .text:0x00000090; // type:function size:0x54 scope:global dTgBBQuake_c_classInit__Fv = .text:0x000000F0; // type:function size:0xAC -__dt__12dTgBBQuake_cFv = .text:0x000001A0; // type:function size:0x58 +__dt__5dTg_cFv = .text:0x000001A0; // type:function size:0x58 __dt__25sFState_c<12dTgBBQuake_c>Fv = .text:0x00000200; // type:function size:0x58 __dt__28sFStateFct_c<12dTgBBQuake_c>Fv = .text:0x00000260; // type:function size:0x6C __dt__81sStateMgr_c<12dTgBBQuake_c,20sStateMethodUsr_FI_c,12sFStateFct_c,13sStateIDChk_c>Fv = .text:0x000002D0; // type:function size:0xA0 @@ -23,7 +23,7 @@ finalizeState_Wait__12dTgBBQuake_cFv = .text:0x000008E0; // type:function size:0 initializeState_Wake__12dTgBBQuake_cFv = .text:0x000008F0; // type:function size:0xC executeState_Wake__12dTgBBQuake_cFv = .text:0x00000900; // type:function size:0x274 finalizeState_Wake__12dTgBBQuake_cFv = .text:0x00000B80; // type:function size:0x4 -fn_125_B90 = .text:0x00000B90; // type:function size:0xC8 +__dt__12dTgBBQuake_cFv = .text:0x00000B90; // type:function size:0xC8 getStateID__81sStateMgr_c<12dTgBBQuake_c,20sStateMethodUsr_FI_c,12sFStateFct_c,13sStateIDChk_c>CFv = .text:0x00000C60; // type:function size:0x10 build__28sFStateFct_c<12dTgBBQuake_c>FRC12sStateIDIf_c = .text:0x00000C70; // type:function size:0x60 dispose__28sFStateFct_c<12dTgBBQuake_c>FRP10sStateIf_c = .text:0x00000CD0; // type:function size:0xC diff --git a/config/SOUE01/rels/d_t_bcal_tagNP/symbols.txt b/config/SOUE01/rels/d_t_bcal_tagNP/symbols.txt index a90c3293..f80d4e08 100644 --- a/config/SOUE01/rels/d_t_bcal_tagNP/symbols.txt +++ b/config/SOUE01/rels/d_t_bcal_tagNP/symbols.txt @@ -4,7 +4,7 @@ _unresolved = .text:0x00000060; // type:function size:0x4 scope:global __register_global_object = .text:0x00000070; // type:function size:0x1C scope:global __destroy_global_chain = .text:0x00000090; // type:function size:0x54 scope:global dTgBcArL_c_classInit__Fv = .text:0x000000F0; // type:function size:0xF8 -__dt__10dTgBcArL_cFv = .text:0x000001F0; // type:function size:0x58 +__dt__5dTg_cFv = .text:0x000001F0; // type:function size:0x58 __dt__23sFState_c<10dTgBcArL_c>Fv = .text:0x00000250; // type:function size:0x58 __dt__26sFStateFct_c<10dTgBcArL_c>Fv = .text:0x000002B0; // type:function size:0x6C __dt__79sStateMgr_c<10dTgBcArL_c,20sStateMethodUsr_FI_c,12sFStateFct_c,13sStateIDChk_c>Fv = .text:0x00000320; // type:function size:0xA0 @@ -31,7 +31,7 @@ finalizeState_AttackWait__10dTgBcArL_cFv = .text:0x00001670; // type:function si initializeState_Attack__10dTgBcArL_cFv = .text:0x00001680; // type:function size:0xAC executeState_Attack__10dTgBcArL_cFv = .text:0x00001730; // type:function size:0x288 finalizeState_Attack__10dTgBcArL_cFv = .text:0x000019C0; // type:function size:0x4 -fn_334_19D0 = .text:0x000019D0; // type:function size:0xF0 +__dt__10dTgBcArL_cFv = .text:0x000019D0; // type:function size:0xF0 build__26sFStateFct_c<10dTgBcArL_c>FRC12sStateIDIf_c = .text:0x00001AC0; // type:function size:0x60 dispose__26sFStateFct_c<10dTgBcArL_c>FRP10sStateIf_c = .text:0x00001B20; // type:function size:0xC initialize__23sFState_c<10dTgBcArL_c>Fv = .text:0x00001B30; // type:function size:0x1C diff --git a/config/SOUE01/rels/d_t_bczNP/symbols.txt b/config/SOUE01/rels/d_t_bczNP/symbols.txt index 94f2a1dd..f2f430fb 100644 --- a/config/SOUE01/rels/d_t_bczNP/symbols.txt +++ b/config/SOUE01/rels/d_t_bczNP/symbols.txt @@ -4,7 +4,7 @@ _unresolved = .text:0x00000060; // type:function size:0x4 scope:global __register_global_object = .text:0x00000070; // type:function size:0x1C scope:global __destroy_global_chain = .text:0x00000090; // type:function size:0x54 scope:global dTgBcZ_c_classInit__Fv = .text:0x000000F0; // type:function size:0xF0 -__dt__8dTgBcZ_cFv = .text:0x000001E0; // type:function size:0x58 +__dt__5dTg_cFv = .text:0x000001E0; // type:function size:0x58 __dt__20sFState_c<8dTgBcZ_c>Fv = .text:0x00000240; // type:function size:0x58 __dt__23sFStateFct_c<8dTgBcZ_c>Fv = .text:0x000002A0; // type:function size:0x6C __dt__76sStateMgr_c<8dTgBcZ_c,20sStateMethodUsr_FI_c,12sFStateFct_c,13sStateIDChk_c>Fv = .text:0x00000310; // type:function size:0xA0 @@ -35,7 +35,7 @@ finalizeState_ControlBcZ__8dTgBcZ_cFv = .text:0x00000FD0; // type:function size: initializeState_DoNothing__8dTgBcZ_cFv = .text:0x00000FE0; // type:function size:0x4 executeState_DoNothing__8dTgBcZ_cFv = .text:0x00000FF0; // type:function size:0x4 finalizeState_DoNothing__8dTgBcZ_cFv = .text:0x00001000; // type:function size:0x4 -fn_170_1010 = .text:0x00001010; // type:function size:0xFC +__dt__8dTgBcZ_cFv = .text:0x00001010; // type:function size:0xFC getStateID__76sStateMgr_c<8dTgBcZ_c,20sStateMethodUsr_FI_c,12sFStateFct_c,13sStateIDChk_c>CFv = .text:0x00001110; // type:function size:0x10 build__23sFStateFct_c<8dTgBcZ_c>FRC12sStateIDIf_c = .text:0x00001120; // type:function size:0x60 dispose__23sFStateFct_c<8dTgBcZ_c>FRP10sStateIf_c = .text:0x00001180; // type:function size:0xC diff --git a/config/SOUE01/rels/d_t_group_summonNP/symbols.txt b/config/SOUE01/rels/d_t_group_summonNP/symbols.txt index 1d06480f..73bfbb6a 100644 --- a/config/SOUE01/rels/d_t_group_summonNP/symbols.txt +++ b/config/SOUE01/rels/d_t_group_summonNP/symbols.txt @@ -5,7 +5,7 @@ __register_global_object = .text:0x00000070; // type:function size:0x1C scope:gl __destroy_global_chain = .text:0x00000090; // type:function size:0x54 scope:global fn_333_F0 = .text:0x000000F0; // type:function size:0x40 dTgGroupSummon_c_classInit__Fv = .text:0x00000130; // type:function size:0x164 -__dt__16dTgGroupSummon_cFv = .text:0x000002A0; // type:function size:0x58 +__dt__5dTg_cFv = .text:0x000002A0; // type:function size:0x58 __dt__29sFState_c<16dTgGroupSummon_c>Fv = .text:0x00000300; // type:function size:0x58 __dt__32sFStateFct_c<16dTgGroupSummon_c>Fv = .text:0x00000360; // type:function size:0x6C __dt__85sStateMgr_c<16dTgGroupSummon_c,20sStateMethodUsr_FI_c,12sFStateFct_c,13sStateIDChk_c>Fv = .text:0x000003D0; // type:function size:0xA0 @@ -53,7 +53,7 @@ initializeState_Demo__16dTgGroupSummon_cFv = .text:0x00003B40; // type:function executeState_Demo__16dTgGroupSummon_cFv = .text:0x00003C60; // type:function size:0x2438 finalizeState_Demo__16dTgGroupSummon_cFv = .text:0x000060A0; // type:function size:0x100 fn_333_61A0 = .text:0x000061A0; // type:function size:0x21C -fn_333_63C0 = .text:0x000063C0; // type:function size:0x158 +__dt__16dTgGroupSummon_cFv = .text:0x000063C0; // type:function size:0x158 build__32sFStateFct_c<16dTgGroupSummon_c>FRC12sStateIDIf_c = .text:0x00006520; // type:function size:0x60 dispose__32sFStateFct_c<16dTgGroupSummon_c>FRP10sStateIf_c = .text:0x00006580; // type:function size:0xC initialize__29sFState_c<16dTgGroupSummon_c>Fv = .text:0x00006590; // type:function size:0x1C diff --git a/config/SOUE01/rels/d_t_group_testNP/symbols.txt b/config/SOUE01/rels/d_t_group_testNP/symbols.txt index 510b6bea..4e9267f9 100644 --- a/config/SOUE01/rels/d_t_group_testNP/symbols.txt +++ b/config/SOUE01/rels/d_t_group_testNP/symbols.txt @@ -4,7 +4,7 @@ _unresolved = .text:0x00000060; // type:function size:0x4 scope:global __register_global_object = .text:0x00000070; // type:function size:0x1C scope:global __destroy_global_chain = .text:0x00000090; // type:function size:0x54 scope:global dTgGroupTest_c_classInit__Fv = .text:0x000000F0; // type:function size:0xF0 -__dt__14dTgGroupTest_cFv = .text:0x000001E0; // type:function size:0x58 +__dt__5dTg_cFv = .text:0x000001E0; // type:function size:0x58 __dt__27sFState_c<14dTgGroupTest_c>Fv = .text:0x00000240; // type:function size:0x58 __dt__30sFStateFct_c<14dTgGroupTest_c>Fv = .text:0x000002A0; // type:function size:0x6C __dt__83sStateMgr_c<14dTgGroupTest_c,20sStateMethodUsr_FI_c,12sFStateFct_c,13sStateIDChk_c>Fv = .text:0x00000310; // type:function size:0xA0 @@ -33,7 +33,7 @@ fn_332_F90 = .text:0x00000F90; // type:function size:0x38 fn_332_FD0 = .text:0x00000FD0; // type:function size:0x40 fn_332_1010 = .text:0x00001010; // type:function size:0x308 fn_332_1320 = .text:0x00001320; // type:function size:0x3C -fn_332_1360 = .text:0x00001360; // type:function size:0xF0 +__dt__14dTgGroupTest_cFv = .text:0x00001360; // type:function size:0xF0 getStateID__83sStateMgr_c<14dTgGroupTest_c,20sStateMethodUsr_FI_c,12sFStateFct_c,13sStateIDChk_c>CFv = .text:0x00001450; // type:function size:0x10 build__30sFStateFct_c<14dTgGroupTest_c>FRC12sStateIDIf_c = .text:0x00001460; // type:function size:0x60 dispose__30sFStateFct_c<14dTgGroupTest_c>FRP10sStateIf_c = .text:0x000014C0; // type:function size:0xC diff --git a/config/SOUE01/rels/d_t_harpNP/symbols.txt b/config/SOUE01/rels/d_t_harpNP/symbols.txt index cef90f95..00bdba5e 100644 --- a/config/SOUE01/rels/d_t_harpNP/symbols.txt +++ b/config/SOUE01/rels/d_t_harpNP/symbols.txt @@ -4,7 +4,7 @@ _unresolved = .text:0x00000060; // type:function size:0x4 scope:global __register_global_object = .text:0x00000070; // type:function size:0x1C scope:global __destroy_global_chain = .text:0x00000090; // type:function size:0x54 scope:global dTgHarp_c_classInit__Fv = .text:0x000000F0; // type:function size:0xAC -__dt__9dTgHarp_cFv = .text:0x000001A0; // type:function size:0x58 +__dt__5dTg_cFv = .text:0x000001A0; // type:function size:0x58 __dt__21sFState_c<9dTgHarp_c>Fv = .text:0x00000200; // type:function size:0x58 __dt__24sFStateFct_c<9dTgHarp_c>Fv = .text:0x00000260; // type:function size:0x6C __dt__77sStateMgr_c<9dTgHarp_c,20sStateMethodUsr_FI_c,12sFStateFct_c,13sStateIDChk_c>Fv = .text:0x000002D0; // type:function size:0xA0 @@ -22,7 +22,7 @@ fn_536_690 = .text:0x00000690; // type:function size:0x1C finalizeState_Wait__9dTgHarp_cFv = .text:0x000006B0; // type:function size:0x4 fn_536_6C0 = .text:0x000006C0; // type:function size:0x60 fn_536_720 = .text:0x00000720; // type:function size:0x84 -fn_536_7B0 = .text:0x000007B0; // type:function size:0xC8 +__dt__9dTgHarp_cFv = .text:0x000007B0; // type:function size:0xC8 getStateID__77sStateMgr_c<9dTgHarp_c,20sStateMethodUsr_FI_c,12sFStateFct_c,13sStateIDChk_c>CFv = .text:0x00000880; // type:function size:0x10 build__24sFStateFct_c<9dTgHarp_c>FRC12sStateIDIf_c = .text:0x00000890; // type:function size:0x60 dispose__24sFStateFct_c<9dTgHarp_c>FRP10sStateIf_c = .text:0x000008F0; // type:function size:0xC diff --git a/config/SOUE01/rels/d_t_ksNP/symbols.txt b/config/SOUE01/rels/d_t_ksNP/symbols.txt index d3ce1de6..828f51b9 100644 --- a/config/SOUE01/rels/d_t_ksNP/symbols.txt +++ b/config/SOUE01/rels/d_t_ksNP/symbols.txt @@ -5,7 +5,7 @@ __register_global_object = .text:0x00000070; // type:function size:0x1C scope:gl __destroy_global_chain = .text:0x00000090; // type:function size:0x54 scope:global fn_154_F0 = .text:0x000000F0; // type:function size:0x40 dTgKiesuTag_c_classInit__Fv = .text:0x00000130; // type:function size:0x10C -__dt__13dTgKiesuTag_cFv = .text:0x00000240; // type:function size:0x58 +__dt__5dTg_cFv = .text:0x00000240; // type:function size:0x58 __dt__26sFState_c<13dTgKiesuTag_c>Fv = .text:0x000002A0; // type:function size:0x58 __dt__29sFStateFct_c<13dTgKiesuTag_c>Fv = .text:0x00000300; // type:function size:0x6C __dt__82sStateMgr_c<13dTgKiesuTag_c,20sStateMethodUsr_FI_c,12sFStateFct_c,13sStateIDChk_c>Fv = .text:0x00000370; // type:function size:0xA0 @@ -67,7 +67,7 @@ finalizeState_ControlPathMove__13dTgKiesuTag_cFv = .text:0x00004AD0; // type:fun initializeState_DoNothing__13dTgKiesuTag_cFv = .text:0x00004AE0; // type:function size:0x1C executeState_DoNothing__13dTgKiesuTag_cFv = .text:0x00004B00; // type:function size:0x3C finalizeState_DoNothing__13dTgKiesuTag_cFv = .text:0x00004B40; // type:function size:0x4 -fn_154_4B50 = .text:0x00004B50; // type:function size:0x104 +__dt__13dTgKiesuTag_cFv = .text:0x00004B50; // type:function size:0x104 build__29sFStateFct_c<13dTgKiesuTag_c>FRC12sStateIDIf_c = .text:0x00004C60; // type:function size:0x60 dispose__29sFStateFct_c<13dTgKiesuTag_c>FRP10sStateIf_c = .text:0x00004CC0; // type:function size:0xC initialize__26sFState_c<13dTgKiesuTag_c>Fv = .text:0x00004CD0; // type:function size:0x1C diff --git a/config/SOUE01/rels/d_t_kytagNP/symbols.txt b/config/SOUE01/rels/d_t_kytagNP/symbols.txt index 1c2d975b..54205535 100644 --- a/config/SOUE01/rels/d_t_kytagNP/symbols.txt +++ b/config/SOUE01/rels/d_t_kytagNP/symbols.txt @@ -4,7 +4,7 @@ _unresolved = .text:0x00000060; // type:function size:0x4 scope:global __register_global_object = .text:0x00000070; // type:function size:0x1C scope:global __destroy_global_chain = .text:0x00000090; // type:function size:0x54 scope:global dKytagTag_c_classInit__Fv = .text:0x000000F0; // type:function size:0xAC -__dt__11dKytagTag_cFv = .text:0x000001A0; // type:function size:0x58 +__dt__5dTg_cFv = .text:0x000001A0; // type:function size:0x58 __dt__24sFState_c<11dKytagTag_c>Fv = .text:0x00000200; // type:function size:0x58 __dt__27sFStateFct_c<11dKytagTag_c>Fv = .text:0x00000260; // type:function size:0x6C __dt__80sStateMgr_c<11dKytagTag_c,20sStateMethodUsr_FI_c,12sFStateFct_c,13sStateIDChk_c>Fv = .text:0x000002D0; // type:function size:0xA0 @@ -20,7 +20,7 @@ fn_456_590 = .text:0x00000590; // type:function size:0x8 initializeState_Wait__11dKytagTag_cFv = .text:0x000005A0; // type:function size:0x4 executeState_Wait__11dKytagTag_cFv = .text:0x000005B0; // type:function size:0x638 finalizeState_Wait__11dKytagTag_cFv = .text:0x00000BF0; // type:function size:0x4 -fn_456_C00 = .text:0x00000C00; // type:function size:0xC8 +__dt__11dKytagTag_cFv = .text:0x00000C00; // type:function size:0xC8 getStateID__80sStateMgr_c<11dKytagTag_c,20sStateMethodUsr_FI_c,12sFStateFct_c,13sStateIDChk_c>CFv = .text:0x00000CD0; // type:function size:0x10 build__27sFStateFct_c<11dKytagTag_c>FRC12sStateIDIf_c = .text:0x00000CE0; // type:function size:0x60 dispose__27sFStateFct_c<11dKytagTag_c>FRP10sStateIf_c = .text:0x00000D40; // type:function size:0xC diff --git a/config/SOUE01/rels/d_t_miechanNP/symbols.txt b/config/SOUE01/rels/d_t_miechanNP/symbols.txt index 82b32a1b..cc41d385 100644 --- a/config/SOUE01/rels/d_t_miechanNP/symbols.txt +++ b/config/SOUE01/rels/d_t_miechanNP/symbols.txt @@ -4,7 +4,7 @@ _unresolved = .text:0x00000060; // type:function size:0x4 scope:global __register_global_object = .text:0x00000070; // type:function size:0x1C scope:global __destroy_global_chain = .text:0x00000090; // type:function size:0x54 scope:global dTgMiechan_c_classInit__Fv = .text:0x000000F0; // type:function size:0xC8 -__dt__12dTgMiechan_cFv = .text:0x000001C0; // type:function size:0x58 +__dt__5dTg_cFv = .text:0x000001C0; // type:function size:0x58 __dt__25sFState_c<12dTgMiechan_c>Fv = .text:0x00000220; // type:function size:0x58 __dt__28sFStateFct_c<12dTgMiechan_c>Fv = .text:0x00000280; // type:function size:0x6C __dt__81sStateMgr_c<12dTgMiechan_c,20sStateMethodUsr_FI_c,12sFStateFct_c,13sStateIDChk_c>Fv = .text:0x000002F0; // type:function size:0xA0 @@ -29,7 +29,7 @@ finalizeState_Wait1__12dTgMiechan_cFv = .text:0x00000AA0; // type:function size: initializeState_Wait2__12dTgMiechan_cFv = .text:0x00000AB0; // type:function size:0x4 executeState_Wait2__12dTgMiechan_cFv = .text:0x00000AC0; // type:function size:0x7C finalizeState_Wait2__12dTgMiechan_cFv = .text:0x00000B40; // type:function size:0x4 -fn_126_B50 = .text:0x00000B50; // type:function size:0xE8 +__dt__12dTgMiechan_cFv = .text:0x00000B50; // type:function size:0xE8 getStateID__81sStateMgr_c<12dTgMiechan_c,20sStateMethodUsr_FI_c,12sFStateFct_c,13sStateIDChk_c>CFv = .text:0x00000C40; // type:function size:0x10 build__28sFStateFct_c<12dTgMiechan_c>FRC12sStateIDIf_c = .text:0x00000C50; // type:function size:0x60 dispose__28sFStateFct_c<12dTgMiechan_c>FRP10sStateIf_c = .text:0x00000CB0; // type:function size:0xC diff --git a/config/SOUE01/rels/d_t_mistNP/symbols.txt b/config/SOUE01/rels/d_t_mistNP/symbols.txt index 1c54ea89..cc2e1ebd 100644 --- a/config/SOUE01/rels/d_t_mistNP/symbols.txt +++ b/config/SOUE01/rels/d_t_mistNP/symbols.txt @@ -5,7 +5,7 @@ __register_global_object = .text:0x00000070; // type:function size:0x1C scope:gl __destroy_global_chain = .text:0x00000090; // type:function size:0x54 scope:global fn_455_F0 = .text:0x000000F0; // type:function size:0x40 dMistTag_c_classInit__Fv = .text:0x00000130; // type:function size:0x134 -__dt__10dMistTag_cFv = .text:0x00000270; // type:function size:0x58 +__dt__5dTg_cFv = .text:0x00000270; // type:function size:0x58 __dt__23sFState_c<10dMistTag_c>Fv = .text:0x000002D0; // type:function size:0x58 __dt__26sFStateFct_c<10dMistTag_c>Fv = .text:0x00000330; // type:function size:0x6C __dt__79sStateMgr_c<10dMistTag_c,20sStateMethodUsr_FI_c,12sFStateFct_c,13sStateIDChk_c>Fv = .text:0x000003A0; // type:function size:0xA0 @@ -25,7 +25,7 @@ fn_455_1150 = .text:0x00001150; // type:function size:0x21C initializeState_Wait__10dMistTag_cFv = .text:0x00001370; // type:function size:0x4 executeState_Wait__10dMistTag_cFv = .text:0x00001380; // type:function size:0x8 finalizeState_Wait__10dMistTag_cFv = .text:0x00001390; // type:function size:0x4 -fn_455_13A0 = .text:0x000013A0; // type:function size:0x11C +__dt__10dMistTag_cFv = .text:0x000013A0; // type:function size:0x11C getStateID__79sStateMgr_c<10dMistTag_c,20sStateMethodUsr_FI_c,12sFStateFct_c,13sStateIDChk_c>CFv = .text:0x000014C0; // type:function size:0x10 build__26sFStateFct_c<10dMistTag_c>FRC12sStateIDIf_c = .text:0x000014D0; // type:function size:0x60 dispose__26sFStateFct_c<10dMistTag_c>FRP10sStateIf_c = .text:0x00001530; // type:function size:0xC diff --git a/config/SOUE01/rels/d_t_pumpkin_clayNP/symbols.txt b/config/SOUE01/rels/d_t_pumpkin_clayNP/symbols.txt index fce24a35..16c09085 100644 --- a/config/SOUE01/rels/d_t_pumpkin_clayNP/symbols.txt +++ b/config/SOUE01/rels/d_t_pumpkin_clayNP/symbols.txt @@ -4,7 +4,7 @@ _unresolved = .text:0x00000060; // type:function size:0x4 scope:global __register_global_object = .text:0x00000070; // type:function size:0x1C scope:global __destroy_global_chain = .text:0x00000090; // type:function size:0x54 scope:global dTgPumpkinClay_c_classInit__Fv = .text:0x000000F0; // type:function size:0xE0 -__dt__16dTgPumpkinClay_cFv = .text:0x000001D0; // type:function size:0x58 +__dt__5dTg_cFv = .text:0x000001D0; // type:function size:0x58 __dt__29sFState_c<16dTgPumpkinClay_c>Fv = .text:0x00000230; // type:function size:0x58 __dt__32sFStateFct_c<16dTgPumpkinClay_c>Fv = .text:0x00000290; // type:function size:0x6C __dt__85sStateMgr_c<16dTgPumpkinClay_c,20sStateMethodUsr_FI_c,12sFStateFct_c,13sStateIDChk_c>Fv = .text:0x00000300; // type:function size:0xA0 @@ -22,7 +22,7 @@ initializeState_Wait__16dTgPumpkinClay_cFv = .text:0x000005E0; // type:function executeState_Wait__16dTgPumpkinClay_cFv = .text:0x000005F0; // type:function size:0x284 finalizeState_Wait__16dTgPumpkinClay_cFv = .text:0x00000880; // type:function size:0x4 TgPumpkinClay__spawnPumpkin = .text:0x00000890; // type:function size:0x194 -fn_560_A30 = .text:0x00000A30; // type:function size:0xF0 +__dt__16dTgPumpkinClay_cFv = .text:0x00000A30; // type:function size:0xF0 getStateID__85sStateMgr_c<16dTgPumpkinClay_c,20sStateMethodUsr_FI_c,12sFStateFct_c,13sStateIDChk_c>CFv = .text:0x00000B20; // type:function size:0x10 build__32sFStateFct_c<16dTgPumpkinClay_c>FRC12sStateIDIf_c = .text:0x00000B30; // type:function size:0x60 dispose__32sFStateFct_c<16dTgPumpkinClay_c>FRP10sStateIf_c = .text:0x00000B90; // type:function size:0xC diff --git a/config/SOUE01/rels/d_t_ro_at_target_managerNP/symbols.txt b/config/SOUE01/rels/d_t_ro_at_target_managerNP/symbols.txt index 89299c23..6a5195c8 100644 --- a/config/SOUE01/rels/d_t_ro_at_target_managerNP/symbols.txt +++ b/config/SOUE01/rels/d_t_ro_at_target_managerNP/symbols.txt @@ -2,7 +2,7 @@ _prolog = .text:0x00000000; // type:function size:0x2C scope:global _epilog = .text:0x00000030; // type:function size:0x2C scope:global _unresolved = .text:0x00000060; // type:function size:0x4 scope:global dTgRoAtTargetManager_c_classInit__Fv = .text:0x00000070; // type:function size:0x6C -__dt__22dTgRoAtTargetManager_cFv = .text:0x000000E0; // type:function size:0x58 +__dt__5dTg_cFv = .text:0x000000E0; // type:function size:0x58 fn_586_140 = .text:0x00000140; // type:function size:0x7C fn_586_1C0 = .text:0x000001C0; // type:function size:0x30 fn_586_1F0 = .text:0x000001F0; // type:function size:0x22C @@ -14,7 +14,7 @@ fn_586_620 = .text:0x00000620; // type:function size:0xA8 fn_586_6D0 = .text:0x000006D0; // type:function size:0x1C fn_586_6F0 = .text:0x000006F0; // type:function size:0x1C fn_586_710 = .text:0x00000710; // type:function size:0x20 -fn_586_730 = .text:0x00000730; // type:function size:0x7C +__dt__22dTgRoAtTargetManager_cFv = .text:0x00000730; // type:function size:0x7C _ctors = .ctors:0x00000000; // type:label scope:global _dtors = .dtors:0x00000000; // type:label scope:global g_profile_RO_AT_TAR_MANAGER_TAG = .data:0x00000000; // type:object size:0x20 data:4byte diff --git a/config/SOUE01/rels/d_t_roll_attack_logNP/symbols.txt b/config/SOUE01/rels/d_t_roll_attack_logNP/symbols.txt index 85aef6a3..34357d53 100644 --- a/config/SOUE01/rels/d_t_roll_attack_logNP/symbols.txt +++ b/config/SOUE01/rels/d_t_roll_attack_logNP/symbols.txt @@ -4,7 +4,7 @@ _unresolved = .text:0x00000060; // type:function size:0x4 scope:global __register_global_object = .text:0x00000070; // type:function size:0x1C scope:global __destroy_global_chain = .text:0x00000090; // type:function size:0x54 scope:global dTgRollAttackLog_c_classInit__Fv = .text:0x000000F0; // type:function size:0xC4 -__dt__18dTgRollAttackLog_cFv = .text:0x000001C0; // type:function size:0x58 +__dt__5dTg_cFv = .text:0x000001C0; // type:function size:0x58 __dt__31sFState_c<18dTgRollAttackLog_c>Fv = .text:0x00000220; // type:function size:0x58 __dt__34sFStateFct_c<18dTgRollAttackLog_c>Fv = .text:0x00000280; // type:function size:0x6C __dt__87sStateMgr_c<18dTgRollAttackLog_c,20sStateMethodUsr_FI_c,12sFStateFct_c,13sStateIDChk_c>Fv = .text:0x000002F0; // type:function size:0xA0 @@ -38,7 +38,7 @@ fn_448_EA0 = .text:0x00000EA0; // type:function size:0x118 fn_448_FC0 = .text:0x00000FC0; // type:function size:0x100 fn_448_10C0 = .text:0x000010C0; // type:function size:0xA8 fn_448_1170 = .text:0x00001170; // type:function size:0x4C -fn_448_11C0 = .text:0x000011C0; // type:function size:0xE8 +__dt__18dTgRollAttackLog_cFv = .text:0x000011C0; // type:function size:0xE8 getStateID__87sStateMgr_c<18dTgRollAttackLog_c,20sStateMethodUsr_FI_c,12sFStateFct_c,13sStateIDChk_c>CFv = .text:0x000012B0; // type:function size:0x10 build__34sFStateFct_c<18dTgRollAttackLog_c>FRC12sStateIDIf_c = .text:0x000012C0; // type:function size:0x60 dispose__34sFStateFct_c<18dTgRollAttackLog_c>FRP10sStateIf_c = .text:0x00001320; // type:function size:0xC diff --git a/config/SOUE01/rels/d_t_ship_floodNP/symbols.txt b/config/SOUE01/rels/d_t_ship_floodNP/symbols.txt index 491509d3..617fe3c6 100644 --- a/config/SOUE01/rels/d_t_ship_floodNP/symbols.txt +++ b/config/SOUE01/rels/d_t_ship_floodNP/symbols.txt @@ -4,7 +4,7 @@ _unresolved = .text:0x00000060; // type:function size:0x4 scope:global __register_global_object = .text:0x00000070; // type:function size:0x1C scope:global __destroy_global_chain = .text:0x00000090; // type:function size:0x54 scope:global dTgShipFlood_c_classInit__Fv = .text:0x000000F0; // type:function size:0xDC -__dt__14dTgShipFlood_cFv = .text:0x000001D0; // type:function size:0x58 +__dt__5dTg_cFv = .text:0x000001D0; // type:function size:0x58 __dt__27sFState_c<14dTgShipFlood_c>Fv = .text:0x00000230; // type:function size:0x58 __dt__30sFStateFct_c<14dTgShipFlood_c>Fv = .text:0x00000290; // type:function size:0x6C __dt__83sStateMgr_c<14dTgShipFlood_c,20sStateMethodUsr_FI_c,12sFStateFct_c,13sStateIDChk_c>Fv = .text:0x00000300; // type:function size:0xA0 @@ -23,7 +23,7 @@ executeState_Stop__14dTgShipFlood_cFv = .text:0x00000850; // type:function size: finalizeState_Stop__14dTgShipFlood_cFv = .text:0x000008D0; // type:function size:0x4 fn_441_8E0 = .text:0x000008E0; // type:function size:0x234 fn_441_B20 = .text:0x00000B20; // type:function size:0x58 -fn_441_B80 = .text:0x00000B80; // type:function size:0xF4 +__dt__14dTgShipFlood_cFv = .text:0x00000B80; // type:function size:0xF4 getStateID__83sStateMgr_c<14dTgShipFlood_c,20sStateMethodUsr_FI_c,12sFStateFct_c,13sStateIDChk_c>CFv = .text:0x00000C80; // type:function size:0x10 build__30sFStateFct_c<14dTgShipFlood_c>FRC12sStateIDIf_c = .text:0x00000C90; // type:function size:0x60 dispose__30sFStateFct_c<14dTgShipFlood_c>FRP10sStateIf_c = .text:0x00000CF0; // type:function size:0xC diff --git a/config/SOUE01/rels/d_t_ship_slopeNP/symbols.txt b/config/SOUE01/rels/d_t_ship_slopeNP/symbols.txt index e10d342c..5b9f843a 100644 --- a/config/SOUE01/rels/d_t_ship_slopeNP/symbols.txt +++ b/config/SOUE01/rels/d_t_ship_slopeNP/symbols.txt @@ -4,7 +4,7 @@ _unresolved = .text:0x00000060; // type:function size:0x4 scope:global __register_global_object = .text:0x00000070; // type:function size:0x1C scope:global __destroy_global_chain = .text:0x00000090; // type:function size:0x54 scope:global dTgShipSlope_c_classInit__Fv = .text:0x000000F0; // type:function size:0xD0 -__dt__14dTgShipSlope_cFv = .text:0x000001C0; // type:function size:0x58 +__dt__5dTg_cFv = .text:0x000001C0; // type:function size:0x58 __dt__27sFState_c<14dTgShipSlope_c>Fv = .text:0x00000220; // type:function size:0x58 __dt__30sFStateFct_c<14dTgShipSlope_c>Fv = .text:0x00000280; // type:function size:0x6C __dt__83sStateMgr_c<14dTgShipSlope_c,20sStateMethodUsr_FI_c,12sFStateFct_c,13sStateIDChk_c>Fv = .text:0x000002F0; // type:function size:0xA0 @@ -24,7 +24,7 @@ executeState_Stop__14dTgShipSlope_cFv = .text:0x00000960; // type:function size: finalizeState_Stop__14dTgShipSlope_cFv = .text:0x000009E0; // type:function size:0x4 fn_440_9F0 = .text:0x000009F0; // type:function size:0x234 fn_440_C30 = .text:0x00000C30; // type:function size:0x58 -fn_440_C90 = .text:0x00000C90; // type:function size:0xE4 +__dt__14dTgShipSlope_cFv = .text:0x00000C90; // type:function size:0xE4 getStateID__83sStateMgr_c<14dTgShipSlope_c,20sStateMethodUsr_FI_c,12sFStateFct_c,13sStateIDChk_c>CFv = .text:0x00000D80; // type:function size:0x10 build__30sFStateFct_c<14dTgShipSlope_c>FRC12sStateIDIf_c = .text:0x00000D90; // type:function size:0x60 dispose__30sFStateFct_c<14dTgShipSlope_c>FRP10sStateIf_c = .text:0x00000DF0; // type:function size:0xC diff --git a/config/SOUE01/rels/d_t_shutter_fence_permissionNP/symbols.txt b/config/SOUE01/rels/d_t_shutter_fence_permissionNP/symbols.txt index 43eb49e4..92739d6c 100644 --- a/config/SOUE01/rels/d_t_shutter_fence_permissionNP/symbols.txt +++ b/config/SOUE01/rels/d_t_shutter_fence_permissionNP/symbols.txt @@ -3,8 +3,8 @@ _epilog = .text:0x00000030; // type:function size:0x2C scope:global _unresolved = .text:0x00000060; // type:function size:0x4 scope:global dTgShutterFencePermission_c_classInit__Fv = .text:0x00000070; // type:function size:0x30 __ct__27dTgShutterFencePermission_cFv = .text:0x000000A0; // type:function size:0x3C -__dt__27dTgShutterFencePermission_cFv = .text:0x000000E0; // type:function size:0x58 -fn_630_140 = .text:0x00000140; // type:function size:0x5C +__dt__5dTg_cFv = .text:0x000000E0; // type:function size:0x58 +__dt__27dTgShutterFencePermission_cFv = .text:0x00000140; // type:function size:0x5C TgShutterFencePermission__init = .text:0x000001A0; // type:function size:0x3D0 fn_630_570 = .text:0x00000570; // type:function size:0x1F0 fn_630_760 = .text:0x00000760; // type:function size:0x144 diff --git a/config/SOUE01/rels/d_t_siren_time_attackNP/symbols.txt b/config/SOUE01/rels/d_t_siren_time_attackNP/symbols.txt index b7750cd5..b2ed7c5e 100644 --- a/config/SOUE01/rels/d_t_siren_time_attackNP/symbols.txt +++ b/config/SOUE01/rels/d_t_siren_time_attackNP/symbols.txt @@ -6,7 +6,7 @@ __destroy_global_chain = .text:0x00000090; // type:function size:0x54 scope:glob fn_73_F0 = .text:0x000000F0; // type:function size:0xC fn_73_100 = .text:0x00000100; // type:function size:0xC dTgSirenTimeAttack_c_classInit__Fv = .text:0x00000110; // type:function size:0xD8 -__dt__20dTgSirenTimeAttack_cFv = .text:0x000001F0; // type:function size:0x58 +__dt__5dTg_cFv = .text:0x000001F0; // type:function size:0x58 __dt__33sFState_c<20dTgSirenTimeAttack_c>Fv = .text:0x00000250; // type:function size:0x58 __dt__36sFStateFct_c<20dTgSirenTimeAttack_c>Fv = .text:0x000002B0; // type:function size:0x6C __dt__89sStateMgr_c<20dTgSirenTimeAttack_c,20sStateMethodUsr_FI_c,12sFStateFct_c,13sStateIDChk_c>Fv = .text:0x00000320; // type:function size:0xA0 @@ -37,7 +37,7 @@ TgSirenTimeAttack__getBestTimeEldinTrial = .text:0x00000E60; // type:function si TgSirenTimeAttack__getBestTimeLanayruTrial = .text:0x00000F20; // type:function size:0xB4 TgSirenTimeAttack__getBestTimeSkyloftTrial = .text:0x00000FE0; // type:function size:0xB4 TgSirenTimeAttack__getTrialSelection = .text:0x000010A0; // type:function size:0x3C -fn_73_10E0 = .text:0x000010E0; // type:function size:0xF0 +__dt__20dTgSirenTimeAttack_cFv = .text:0x000010E0; // type:function size:0xF0 getStateID__89sStateMgr_c<20dTgSirenTimeAttack_c,20sStateMethodUsr_FI_c,12sFStateFct_c,13sStateIDChk_c>CFv = .text:0x000011D0; // type:function size:0x10 build__36sFStateFct_c<20dTgSirenTimeAttack_c>FRC12sStateIDIf_c = .text:0x000011E0; // type:function size:0x60 dispose__36sFStateFct_c<20dTgSirenTimeAttack_c>FRP10sStateIf_c = .text:0x00001240; // type:function size:0xC diff --git a/config/SOUE01/rels/d_t_skyEnemyNP/symbols.txt b/config/SOUE01/rels/d_t_skyEnemyNP/symbols.txt index f3b5f183..d8c6500a 100644 --- a/config/SOUE01/rels/d_t_skyEnemyNP/symbols.txt +++ b/config/SOUE01/rels/d_t_skyEnemyNP/symbols.txt @@ -4,7 +4,7 @@ _unresolved = .text:0x00000060; // type:function size:0x4 scope:global __register_global_object = .text:0x00000070; // type:function size:0x1C scope:global __destroy_global_chain = .text:0x00000090; // type:function size:0x54 scope:global dTgSkyEnemyTag_classInit__Fv = .text:0x000000F0; // type:function size:0xCC -__dt__14dTgSkyEnemyTagFv = .text:0x000001C0; // type:function size:0x58 +__dt__5dTg_cFv = .text:0x000001C0; // type:function size:0x58 __dt__27sFState_c<14dTgSkyEnemyTag>Fv = .text:0x00000220; // type:function size:0x58 __dt__30sFStateFct_c<14dTgSkyEnemyTag>Fv = .text:0x00000280; // type:function size:0x6C __dt__83sStateMgr_c<14dTgSkyEnemyTag,20sStateMethodUsr_FI_c,12sFStateFct_c,13sStateIDChk_c>Fv = .text:0x000002F0; // type:function size:0xA0 @@ -43,7 +43,7 @@ initializeState_BirthHighSpeed__14dTgSkyEnemyTagFv = .text:0x000018F0; // type:f executeState_BirthHighSpeed__14dTgSkyEnemyTagFv = .text:0x00001900; // type:function size:0x4 finalizeState_BirthHighSpeed__14dTgSkyEnemyTagFv = .text:0x00001910; // type:function size:0x4 TgSkyEnemy__checkPosInMatrixXZ = .text:0x00001920; // type:function size:0x7C -fn_564_19A0 = .text:0x000019A0; // type:function size:0xE0 +__dt__14dTgSkyEnemyTagFv = .text:0x000019A0; // type:function size:0xE0 getStateID__83sStateMgr_c<14dTgSkyEnemyTag,20sStateMethodUsr_FI_c,12sFStateFct_c,13sStateIDChk_c>CFv = .text:0x00001A80; // type:function size:0x10 build__30sFStateFct_c<14dTgSkyEnemyTag>FRC12sStateIDIf_c = .text:0x00001A90; // type:function size:0x60 dispose__30sFStateFct_c<14dTgSkyEnemyTag>FRP10sStateIf_c = .text:0x00001AF0; // type:function size:0xC diff --git a/config/SOUE01/rels/d_t_sparks2NP/symbols.txt b/config/SOUE01/rels/d_t_sparks2NP/symbols.txt index f05ead04..3ff094be 100644 --- a/config/SOUE01/rels/d_t_sparks2NP/symbols.txt +++ b/config/SOUE01/rels/d_t_sparks2NP/symbols.txt @@ -5,7 +5,7 @@ __register_global_object = .text:0x00000070; // type:function size:0x1C scope:gl __destroy_global_chain = .text:0x00000090; // type:function size:0x54 scope:global fn_453_F0 = .text:0x000000F0; // type:function size:0x40 dSparks2Tag_c_classInit__Fv = .text:0x00000130; // type:function size:0x3A0 -__dt__13dSparks2Tag_cFv = .text:0x000004D0; // type:function size:0x58 +__dt__5dTg_cFv = .text:0x000004D0; // type:function size:0x58 __dt__26sFState_c<13dSparks2Tag_c>Fv = .text:0x00000530; // type:function size:0x58 __dt__29sFStateFct_c<13dSparks2Tag_c>Fv = .text:0x00000590; // type:function size:0x6C __dt__82sStateMgr_c<13dSparks2Tag_c,20sStateMethodUsr_FI_c,12sFStateFct_c,13sStateIDChk_c>Fv = .text:0x00000600; // type:function size:0xA0 @@ -29,7 +29,7 @@ fn_453_2820 = .text:0x00002820; // type:function size:0x3BC initializeState_Wait__13dSparks2Tag_cFv = .text:0x00002BE0; // type:function size:0x4 executeState_Wait__13dSparks2Tag_cFv = .text:0x00002BF0; // type:function size:0xE4 finalizeState_Wait__13dSparks2Tag_cFv = .text:0x00002CE0; // type:function size:0x4 -fn_453_2CF0 = .text:0x00002CF0; // type:function size:0x134 +__dt__13dSparks2Tag_cFv = .text:0x00002CF0; // type:function size:0x134 getStateID__82sStateMgr_c<13dSparks2Tag_c,20sStateMethodUsr_FI_c,12sFStateFct_c,13sStateIDChk_c>CFv = .text:0x00002E30; // type:function size:0x10 build__29sFStateFct_c<13dSparks2Tag_c>FRC12sStateIDIf_c = .text:0x00002E40; // type:function size:0x60 dispose__29sFStateFct_c<13dSparks2Tag_c>FRP10sStateIf_c = .text:0x00002EA0; // type:function size:0xC diff --git a/config/SOUE01/rels/d_t_sparksNP/symbols.txt b/config/SOUE01/rels/d_t_sparksNP/symbols.txt index 9fcbe58e..d3d48d06 100644 --- a/config/SOUE01/rels/d_t_sparksNP/symbols.txt +++ b/config/SOUE01/rels/d_t_sparksNP/symbols.txt @@ -4,7 +4,7 @@ _unresolved = .text:0x00000060; // type:function size:0x4 scope:global __register_global_object = .text:0x00000070; // type:function size:0x1C scope:global __destroy_global_chain = .text:0x00000090; // type:function size:0x54 scope:global dTgSparksTag_classInit__Fv = .text:0x000000F0; // type:function size:0xC0 -__dt__12dTgSparksTagFv = .text:0x000001B0; // type:function size:0x58 +__dt__5dTg_cFv = .text:0x000001B0; // type:function size:0x58 __dt__25sFState_c<12dTgSparksTag>Fv = .text:0x00000210; // type:function size:0x58 __dt__28sFStateFct_c<12dTgSparksTag>Fv = .text:0x00000270; // type:function size:0x6C __dt__81sStateMgr_c<12dTgSparksTag,20sStateMethodUsr_FI_c,12sFStateFct_c,13sStateIDChk_c>Fv = .text:0x000002E0; // type:function size:0xA0 @@ -20,7 +20,7 @@ executeState_Wait__12dTgSparksTagFv = .text:0x000005D0; // type:function size:0x finalizeState_Wait__12dTgSparksTagFv = .text:0x000005E0; // type:function size:0x4 fn_452_5F0 = .text:0x000005F0; // type:function size:0xFC fn_452_6F0 = .text:0x000006F0; // type:function size:0x1E8 -fn_452_8E0 = .text:0x000008E0; // type:function size:0xE0 +__dt__12dTgSparksTagFv = .text:0x000008E0; // type:function size:0xE0 getStateID__81sStateMgr_c<12dTgSparksTag,20sStateMethodUsr_FI_c,12sFStateFct_c,13sStateIDChk_c>CFv = .text:0x000009C0; // type:function size:0x10 build__28sFStateFct_c<12dTgSparksTag>FRC12sStateIDIf_c = .text:0x000009D0; // type:function size:0x60 dispose__28sFStateFct_c<12dTgSparksTag>FRP10sStateIf_c = .text:0x00000A30; // type:function size:0xC diff --git a/config/SOUE01/splits.txt b/config/SOUE01/splits.txt index 53a51fc3..cba06a37 100644 --- a/config/SOUE01/splits.txt +++ b/config/SOUE01/splits.txt @@ -91,8 +91,13 @@ toBeSorted/d_shadow.cpp: .sbss start:0x80575028 end:0x80575038 .sdata2 start:0x80576A78 end:0x80576B08 -toBeSorted/d_unk_mdl_stuff_1.cpp: - .text start:0x8001BFA0 end:0x8001E444 align:16 +toBeSorted/d_sword_swing_effect.cpp: + .text start:0x8001BFA0 end:0x8001CB9C align:16 + .data start:0x80500AF0 end:0x80500B48 + .sdata2 start:0x80576B08 end:0x80576B28 + +toBeSorted/d_unk_mdl_stuff_3.cpp: + .text start:0x8001CBA0 end:0x8001E444 align:16 .ctors start:0x804DB654 end:0x804DB658 .sbss start:0x80575038 end:0x80575058 @@ -396,11 +401,14 @@ toBeSorted/actor_info.cpp: .rodata start:0x804E0FA8 end:0x804E3418 .sdata2 start:0x805779F8 end:0x80579210 -toBeSorted/unk_vec_math.cpp: - .text start:0x8006A8D0 end:0x8006B3A4 align:16 +toBeSorted/d_sword_swing_effect_mgr.cpp: + .text start:0x8006A8D0 end:0x8006B3C0 align:16 + .sdata2 start:0x80579210 end:0x80579230 -toBeSorted/unk_mdl_cc.cpp: - .text start:0x8006B3B0 end:0x8006BBD4 align:16 +toBeSorted/d_enemy_sword_mdl.cpp: + .text start:0x8006B3C0 end:0x8006BBD4 align:16 + .data start:0x8050E060 end:0x8050E090 + .sdata2 start:0x80579230 end:0x80579238 toBeSorted/d_camera.cpp: .text start:0x8006BBE0 end:0x80083370 align:16 diff --git a/config/SOUE01/symbols.txt b/config/SOUE01/symbols.txt index b46f6318..dca5d34b 100644 --- a/config/SOUE01/symbols.txt +++ b/config/SOUE01/symbols.txt @@ -600,7 +600,7 @@ remove__Q23d3d12UnkWithWaterFv = .text:0x800190B0; // type:function size:0xB8 apply__Q23d3d16UnkWithWaterNodeFPC9_GXTexObj = .text:0x80019170; // type:function size:0x74 entry__Q23d3d14EggTextureProcFv = .text:0x800191F0; // type:function size:0x9C fn_80019290 = .text:0x80019290; // type:function size:0x5C -fn_800192F0 = .text:0x800192F0; // type:function size:0x6C +fn_800192F0__Q23d3d14EggTextureProcFUcRC6mMtx_cUc = .text:0x800192F0; // type:function size:0x6C doDraw__Q23d3d14EggTextureProcFv = .text:0x80019360; // type:function size:0x204 doRemove__Q23d3d14EggTextureProcFv = .text:0x80019570; // type:function size:0x44 create__Q23d3d7UnkProcFiiP12mAllocator_c = .text:0x800195C0; // type:function size:0xAC @@ -657,20 +657,20 @@ fn_8001BE90 = .text:0x8001BE90; // type:function size:0x60 fn_8001BEF0 = .text:0x8001BEF0; // type:function size:0x58 fn_8001BF50 = .text:0x8001BF50; // type:function size:0x40 fn_8001BF90 = .text:0x8001BF90; // type:function size:0x4 -fn_8001BFA0 = .text:0x8001BFA0; // type:function size:0x54 -fn_8001C000 = .text:0x8001C000; // type:function size:0x40 -fn_8001C040 = .text:0x8001C040; // type:function size:0x30C -fn_8001C350 = .text:0x8001C350; // type:function size:0x14 -fn_8001C370 = .text:0x8001C370; // type:function size:0x44 -fn_8001C3C0 = .text:0x8001C3C0; // type:function size:0xCC -fn_8001C490 = .text:0x8001C490; // type:function size:0x18 -fn_8001C4B0 = .text:0x8001C4B0; // type:function size:0x78 -fn_8001C530 = .text:0x8001C530; // type:function size:0x94 -fn_8001C5D0 = .text:0x8001C5D0; // type:function size:0x3E4 -fn_8001C9C0 = .text:0x8001C9C0; // type:function size:0x60 -fn_8001CA20 = .text:0x8001CA20; // type:function size:0x7C -fn_8001CAA0 = .text:0x8001CAA0; // type:function size:0x80 -fn_8001CB20 = .text:0x8001CB20; // type:function size:0x7C +remove__27dSwordSwingEffectProcBase_cFv = .text:0x8001BFA0; // type:function size:0x54 +__dt__Q227dSwordSwingEffectProcBase_c11swing_entryFv = .text:0x8001C000; // type:function size:0x40 +drawXlu__27dSwordSwingEffectProcBase_cFv = .text:0x8001C040; // type:function size:0x30C +hasSwings__27dSwordSwingEffectProcBase_cCFv = .text:0x8001C350; // type:function size:0x14 +entry__27dSwordSwingEffectProcBase_cFv = .text:0x8001C370; // type:function size:0x44 +create__27dSwordSwingEffectProcBase_cFlP12mAllocator_c = .text:0x8001C3C0; // type:function size:0xCC +__ct__Q227dSwordSwingEffectProcBase_c11swing_entryFv = .text:0x8001C490; // type:function size:0x18 +addSwing__27dSwordSwingEffectProcBase_cFRC7mVec3_c6mColorRC7mVec3_c6mColor = .text:0x8001C4B0; // type:function size:0x78 +calc__27dSwordSwingEffectProcBase_cFf = .text:0x8001C530; // type:function size:0x94 +drawXlu__23dSwordSwingEffectProc_cFv = .text:0x8001C5D0; // type:function size:0x3E4 +create__23dSwordSwingEffectProc_cFlP12mAllocator_cPQ23EGG7ResTIMGf = .text:0x8001C9C0; // type:function size:0x60 +set__Q227dSwordSwingEffectProcBase_c11swing_entryFRC7mVec3_c6mColorRC7mVec3_c6mColor = .text:0x8001CA20; // type:function size:0x7C +__dt__23dSwordSwingEffectProc_cFv = .text:0x8001CAA0; // type:function size:0x80 +__dt__27dSwordSwingEffectProcBase_cFv = .text:0x8001CB20; // type:function size:0x7C fn_8001CBA0 = .text:0x8001CBA0; // type:function size:0x20C fn_8001CDB0 = .text:0x8001CDB0; // type:function size:0x308 fn_8001D0C0 = .text:0x8001D0C0; // type:function size:0x35C @@ -1134,7 +1134,7 @@ fn_8002EA60 = .text:0x8002EA60; // type:function size:0xD0 fn_8002EB30 = .text:0x8002EB30; // type:function size:0x5C ActorObjectBase__putInODesert = .text:0x8002EB90; // type:function size:0xD8 drawModelType1__12dAcObjBase_cFPQ23m3d6smdl_c = .text:0x8002EC70; // type:function size:0x60 -fn_8002ECD0 = .text:0x8002ECD0; // type:function size:0x50 +fn_8002ECD0__12dAcObjBase_cFPQ23m3d6smdl_ci = .text:0x8002ECD0; // type:function size:0x50 fn_8002ED20 = .text:0x8002ED20; // type:function size:0x88 fn_8002edb0__12dAcObjBase_cFRQ23m3d15mShadowCircle_cRQ23m3d6smdl_cPC7mQuat_cllf = .text:0x8002EDB0; // type:function size:0x8C drawShadow__12dAcObjBase_cFRQ23m3d15mShadowCircle_cPvRC6mMtx_cPC7mQuat_clllllf = .text:0x8002EE40; // type:function size:0xFC @@ -1146,10 +1146,10 @@ createInsectActor__12dAcObjBase_cFP9dAcBase_cQ28fProfile14PROFILE_NAME_eUlP7mVec createActorUnkGroup3__12dAcObjBase_cFQ28fProfile14PROFILE_NAME_eUlUlP7mVec3_cP7mAng3_cP7mVec3_cUl = .text:0x8002F1C0; // type:function size:0x98 createActorUnkGroup3__12dAcObjBase_cFPCcUlUlPC7mVec3_cPC7mAng3_cPC7mVec3_cUlUsSc = .text:0x8002F260; // type:function size:0xA0 __ct__11dAcEnBase_cFv = .text:0x8002F300; // type:function size:0x74 -ActorEnemyBase__dtor = .text:0x8002F380; // type:function size:0x74 -ActorEnemyBase__shouldUpdateMaybe = .text:0x8002F400; // type:function size:0xB4 -ActorEnemyBase__postUpdate = .text:0x8002F4C0; // type:function size:0x7C -ActorEnemyBase__preDraw = .text:0x8002F540; // type:function size:0x74 +__dt__11dAcEnBase_cFv = .text:0x8002F380; // type:function size:0x74 +preExecute__11dAcEnBase_cFv = .text:0x8002F400; // type:function size:0xB4 +postExecute__11dAcEnBase_cFQ27fBase_c12MAIN_STATE_e = .text:0x8002F4C0; // type:function size:0x7C +preDraw__11dAcEnBase_cFv = .text:0x8002F540; // type:function size:0x74 fn_8002F5C0 = .text:0x8002F5C0; // type:function size:0x110 checkBeetleActorReferences__17daPlayerActBase_cFl = .text:0x8002F6D0; // type:function size:0x8 getBeetleActorReferencesSize__17daPlayerActBase_cFv = .text:0x8002F6E0; // type:function size:0x8 @@ -1170,7 +1170,7 @@ fn_8002FBC0 = .text:0x8002FBC0; // type:function size:0x4 fn_8002FBD0 = .text:0x8002FBD0; // type:function size:0x18 fn_8002FBF0 = .text:0x8002FBF0; // type:function size:0x20 fn_8002FC10 = .text:0x8002FC10; // type:function size:0xF4 -someEnemyDamageCollisionStuffMaybe = .text:0x8002FD10; // type:function size:0x7C +someEnemyDamageCollisionStuffMaybe__11dAcEnBase_cFR19dColliderLinkedListPUs = .text:0x8002FD10; // type:function size:0x7C fn_8002FD90 = .text:0x8002FD90; // type:function size:0x4C fn_8002FDE0 = .text:0x8002FDE0; // type:function size:0x170 fn_8002FF50 = .text:0x8002FF50; // type:function size:0xD4 @@ -1188,7 +1188,7 @@ fn_80030820 = .text:0x80030820; // type:function size:0x14 fn_80030840 = .text:0x80030840; // type:function size:0x13C fn_80030980 = .text:0x80030980; // type:function size:0x188 fn_80030B10 = .text:0x80030B10; // type:function size:0x10C -fn_80030C20 = .text:0x80030C20; // type:function size:0x28 +fn_80030c20__11dAcEnBase_cFUlffff = .text:0x80030C20; // type:function size:0x28 fn_80030C50 = .text:0x80030C50; // type:function size:0x8 fn_80030C60 = .text:0x80030C60; // type:function size:0x4 fn_80030C70 = .text:0x80030C70; // type:function size:0x4 @@ -1290,7 +1290,7 @@ ActorLink__setObjActorFlags0x200 = .text:0x800346B0; // type:function size:0x14 ActorLink__unsetObjActorFlags0x200 = .text:0x800346D0; // type:function size:0x14 fn_800346F0 = .text:0x800346F0; // type:function size:0xDC vt_0x2AC__17daPlayerActBase_cFv = .text:0x800347D0; // type:function size:0x4 -triggerMoveEventMaybe__17daPlayerActBase_cFUlUlUlR7mVec3_cRC4mAngUlUl = .text:0x800347E0; // type:function size:0x4 +triggerMoveEventMaybe__17daPlayerActBase_cFUlUlUlPC7mVec3_cRC4mAngUlUl = .text:0x800347E0; // type:function size:0x4 vt_0x2C4__17daPlayerActBase_cFv = .text:0x800347F0; // type:function size:0x8 fn_80034800 = .text:0x80034800; // type:function size:0x170 fn_80034970 = .text:0x80034970; // type:function size:0xFC @@ -3046,23 +3046,23 @@ getNameForProfileId__FUl = .text:0x8006A670; // type:function size:0xB8 getActorName__FPC9ActorInfo = .text:0x8006A730; // type:function size:0x18 getActorInfoByProfileAndSubtype__FUlUl = .text:0x8006A750; // type:function size:0x134 getSoundSourceTypeForName__FPCc = .text:0x8006A890; // type:function size:0x38 -fn_8006A8D0 = .text:0x8006A8D0; // type:function size:0x1DC -fn_8006AAB0 = .text:0x8006AAB0; // type:function size:0x85C -fn_8006B310 = .text:0x8006B310; // type:function size:0x94 -fn_8006B3B0 = .text:0x8006B3B0; // type:function size:0x10 -fn_8006B3C0 = .text:0x8006B3C0; // type:function size:0x140 -fn_8006B500 = .text:0x8006B500; // type:function size:0x13C -fn_8006B640 = .text:0x8006B640; // type:function size:0x20 -fn_8006B660 = .text:0x8006B660; // type:function size:0xB4 -fn_8006B720 = .text:0x8006B720; // type:function size:0x10 +fn_8006A8D0__FRC7mVec2_cRC7mVec2_cRC7mVec2_cRC7mVec2_cR7mVec2_c = .text:0x8006A8D0; // type:function size:0x1DC +createSwingEntries__26dSwordSwingEffectProcMgr_cFRC7mVec3_cRC7mVec3_c = .text:0x8006AAB0; // type:function size:0x85C +calc__26dSwordSwingEffectProcMgr_cFRC7mVec3_cRC7mVec3_c = .text:0x8006B310; // type:function size:0x94 +entry__26dSwordSwingEffectProcMgr_cFv = .text:0x8006B3B0; // type:function size:0x10 +create__16dEnemySwordMdl_cFP12mAllocator_cPvPCcUlRC7mVec3_cRC7mVec3_cR9cCcD_SttsPQ23EGG7ResTIMGiPUl = .text:0x8006B3C0; // type:function size:0x140 +create__16dEnemySwordMdl_cFP12mAllocator_cQ34nw4r3g3d7ResFilePCcUlRC7mVec3_cRC7mVec3_cR9cCcD_SttsPQ23EGG7ResTIMGiPUl = .text:0x8006B500; // type:function size:0x13C +enableAttack__16dEnemySwordMdl_cFv = .text:0x8006B640; // type:function size:0x20 +fn_8006B660__16dEnemySwordMdl_cFiiiiiiiiif = .text:0x8006B660; // type:function size:0xB4 +setDamageMaybe__16dEnemySwordMdl_cFUc = .text:0x8006B720; // type:function size:0x10 fn_8006B730 = .text:0x8006B730; // type:function size:0x5C fn_8006B790 = .text:0x8006B790; // type:function size:0x10 -fn_8006B7A0 = .text:0x8006B7A0; // type:function size:0x5C -fn_8006B800 = .text:0x8006B800; // type:function size:0x10 +fn_8006B7A0__16dEnemySwordMdl_cFUl = .text:0x8006B7A0; // type:function size:0x5C +fn_8006B800__16dEnemySwordMdl_cFUl = .text:0x8006B800; // type:function size:0x10 fn_8006B810 = .text:0x8006B810; // type:function size:0x5C fn_8006B870 = .text:0x8006B870; // type:function size:0x10 -fn_8006B880 = .text:0x8006B880; // type:function size:0x2A8 -fn_8006BB30 = .text:0x8006BB30; // type:function size:0xA4 +calc__16dEnemySwordMdl_cFRC6mMtx_cRC7mVec3_cb = .text:0x8006B880; // type:function size:0x2A8 +entry__16dEnemySwordMdl_cFP12dAcObjBase_cP15dShadowCircle_cP7mQuat_c = .text:0x8006BB30; // type:function size:0xA4 fn_8006BBE0 = .text:0x8006BBE0; // type:function size:0x70 fn_8006BC50 = .text:0x8006BC50; // type:function size:0x18 fn_8006BC70 = .text:0x8006BC70; // type:function size:0xA8 @@ -10578,7 +10578,7 @@ isSTIFAreaEldin__11dStageMgr_cCFv = .text:0x80199AA0; // type:function size:0x3C isSTIFAreaLanayru__11dStageMgr_cCFv = .text:0x80199AE0; // type:function size:0x3C getSTIFunk1__11dStageMgr_cCFv = .text:0x80199B20; // type:function size:0x20 getSTIFRoomType__11dStageMgr_cCFv = .text:0x80199B40; // type:function size:0x1C -fn_80199B60 = .text:0x80199B60; // type:function size:0xC +fn_80199B60__11dStageMgr_cFUc = .text:0x80199B60; // type:function size:0xC fn_80199B70 = .text:0x80199B70; // type:function size:0x1C fn_80199B90 = .text:0x80199B90; // type:function size:0x3A8 fn_80199F40 = .text:0x80199F40; // type:function size:0x90 @@ -10737,8 +10737,8 @@ fn_8019E890 = .text:0x8019E890; // type:function size:0x40 fn_8019E8D0 = .text:0x8019E8D0; // type:function size:0x54 fn_8019E930 = .text:0x8019E930; // type:function size:0xC fn_8019E940 = .text:0x8019E940; // type:function size:0xC0 -fn_8019EA00 = .text:0x8019EA00; // type:function size:0x70 -fn_8019EA70 = .text:0x8019EA70; // type:function size:0x11C +fn_8019EA00__9dCamera_cFRC7mVec3_cRC7mVec3_cff = .text:0x8019EA00; // type:function size:0x70 +fn_8019EA70__9dCamera_cFb = .text:0x8019EA70; // type:function size:0x11C fn_8019EB90 = .text:0x8019EB90; // type:function size:0xC fn_8019EBA0 = .text:0x8019EBA0; // type:function size:0x160 fn_8019ED00 = .text:0x8019ED00; // type:function size:0xC @@ -15768,7 +15768,7 @@ fn_8029FE90 = .text:0x8029FE90; // type:function size:0x21C fn_802A00B0 = .text:0x802A00B0; // type:function size:0x10 fn_802A00C0 = .text:0x802A00C0; // type:function size:0x10 fn_802A00D0 = .text:0x802A00D0; // type:function size:0x40 -showBossCaption = .text:0x802A0110; // type:function size:0x158 +show__17dLytBossCaption_cFPCci = .text:0x802A0110; // type:function size:0x158 fn_802A0270 = .text:0x802A0270; // type:function size:0x9C fn_802A0310 = .text:0x802A0310; // type:function size:0x9C fn_802A03B0 = .text:0x802A03B0; // type:function size:0x4C @@ -17264,7 +17264,7 @@ ModuleDestructorsX = .text:0x802DFD30; // type:function size:0x44 cLib__memSet = .text:0x802DFD80; // type:function size:0x4 addCalcPos__4cLibFP7mVec3_cRC7mVec3_cfff = .text:0x802DFD90; // type:function size:0x234 addCalcPosXZ__4cLibFP7mVec3_cRC7mVec3_cfff = .text:0x802DFFD0; // type:function size:0x1B8 -cLib__addCalcPos2 = .text:0x802E0190; // type:function size:0x13C +addCalcPos2__4cLibFP7mVec3_cRC7mVec3_cff = .text:0x802E0190; // type:function size:0x13C cLib__addCalcPosXZ2 = .text:0x802E02D0; // type:function size:0xF8 cLib__chasePos = .text:0x802E03D0; // type:function size:0x174 chasePosXZ__4cLibFR7mVec3_cR7mVec3_cf = .text:0x802E0550; // type:function size:0x124 @@ -20536,7 +20536,7 @@ getNextInBgmSoundList__12dSndBgmMgr_cFQ212dSndBgmMgr_c14BgmSoundList_eP14dSndBgm getLastInBgmSoundList__12dSndBgmMgr_cFQ212dSndBgmMgr_c14BgmSoundList_e = .text:0x80372C20; // type:function size:0x28 fn_80372C50 = .text:0x80372C50; // type:function size:0x8C fn_80372CE0 = .text:0x80372CE0; // type:function size:0x8C -fn_80372D70 = .text:0x80372D70; // type:function size:0x74 +fn_80372D70__12dSndBgmMgr_cFi = .text:0x80372D70; // type:function size:0x74 fn_80372DF0 = .text:0x80372DF0; // type:function size:0x40 fn_80372E30 = .text:0x80372E30; // type:function size:0x40 fn_80372E70 = .text:0x80372E70; // type:function size:0xB0 @@ -29953,8 +29953,8 @@ __vt__Q23d3d13AnmMdlWrapper = .data:0x80500A20; // type:object size:0x50 @15227 = .data:0x80500AA8; // type:object size:0x10 scope:local data:string __vt__14dScnCallback_c = .data:0x80500AB8; // type:object size:0x20 lbl_80500AD8 = .data:0x80500AD8; // type:object size:0x18 -lbl_80500AF0 = .data:0x80500AF0; // type:object size:0x2C -lbl_80500B1C = .data:0x80500B1C; // type:object size:0x2C +__vt__23dSwordSwingEffectProc_c = .data:0x80500AF0; // type:object size:0x2C +__vt__27dSwordSwingEffectProcBase_c = .data:0x80500B1C; // type:object size:0x2C lbl_80500B48 = .data:0x80500B48; // type:object size:0xA data:string lbl_80500B54 = .data:0x80500B54; // type:object size:0xA data:string lbl_80500B60 = .data:0x80500B60; // type:object size:0x40 @@ -42598,7 +42598,7 @@ sInstance__21dLytMiniGameScoreSd_c = .sbss:0x80575984; // type:object size:0x4 d sInstance__14dLytMiniGame_c = .sbss:0x80575988; // type:object size:0x8 data:4byte lbl_80575990 = .sbss:0x80575990; // type:object size:0x8 data:4byte lbl_80575998 = .sbss:0x80575998; // type:object size:0x8 data:4byte -BOSS_CAPTION_PTR = .sbss:0x805759A0; // type:object size:0x8 data:4byte +sInstance__17dLytBossCaption_c = .sbss:0x805759A0; // type:object size:0x8 data:4byte sInstance__17dLytDemoDowsing_c = .sbss:0x805759A8; // type:object size:0x8 data:4byte lbl_805759B0 = .sbss:0x805759B0; // type:object size:0x2 data:2byte sInstance__10dLytShop_c = .sbss:0x805759B4; // type:object size:0x4 data:4byte @@ -42673,7 +42673,7 @@ l_lightMgr_pp__Q23m3d8internal = .sbss:0x80575BDC; // type:object size:0x4 data: l_numFogMgr__Q23m3d8internal = .sbss:0x80575BE0; // type:object size:0x4 data:4byte l_fogMgr_pp__Q23m3d8internal = .sbss:0x80575BE4; // type:object size:0x4 data:4byte l_alignment__Q23m3d8internal = .sbss:0x80575BE8; // type:object size:0x4 data:4byte -lbl_80575BF0 = .sbss:0x80575BF0; // type:object size:0x4 data:4byte +sInstance__Q23m3d9mShadow_c = .sbss:0x80575BF0; // type:object size:0x4 data:4byte lbl_80575BF4 = .sbss:0x80575BF4; // type:object size:0x4 data:4byte lbl_80575BF8 = .sbss:0x80575BF8; // type:object size:0x4 data:4byte @GUARD@draw__Q23m3d15mCustomShadow_cFRC6mMtx_c@nullMat = .sbss:0x80575BFC; // type:object size:0x1 data:byte diff --git a/configure.py b/configure.py index 51409cd2..86ce4cf8 100644 --- a/configure.py +++ b/configure.py @@ -427,7 +427,8 @@ config.libs = [ ), Object(NonMatching, "toBeSorted/d_unk_proc.cpp"), Object(NonMatching, "toBeSorted/d_shadow.cpp"), - Object(NonMatching, "toBeSorted/d_unk_mdl_stuff_1.cpp"), + Object(Matching, "toBeSorted/d_sword_swing_effect.cpp"), + Object(NonMatching, "toBeSorted/d_unk_mdl_stuff_3.cpp"), Object(NonMatching, "toBeSorted/d_unk_mdl_stuff_2.cpp"), Object(Matching, "d/d_light_env.cpp"), Object(NonMatching, "toBeSorted/d_emitter.cpp"), @@ -481,8 +482,8 @@ config.libs = [ Object(Matching, "toBeSorted/arc_managers/layout_arc_manager.cpp"), Object(NonMatching, "toBeSorted/arc_managers/layout_arc_control.cpp"), Object(Matching, "toBeSorted/actor_info.cpp"), - Object(NonMatching, "toBeSorted/unk_vec_math.cpp"), - Object(NonMatching, "toBeSorted/unk_mdl_cc.cpp"), + Object(NonMatching, "toBeSorted/d_sword_swing_effect_mgr.cpp"), + Object(NonMatching, "toBeSorted/d_enemy_sword_mdl.cpp"), Object(NonMatching, "toBeSorted/d_camera.cpp"), Object(NonMatching, "toBeSorted/d_event_1.cpp"), Object(NonMatching, "toBeSorted/unk_map_cam.cpp"), diff --git a/include/d/a/b/d_a_b_asura.h b/include/d/a/b/d_a_b_asura.h index 2d5c85db..0771fef0 100644 --- a/include/d/a/b/d_a_b_asura.h +++ b/include/d/a/b/d_a_b_asura.h @@ -3,11 +3,10 @@ #include "d/a/e/d_a_en_base.h" #include "s/s_State.hpp" -#include "s/s_StateMgr.hpp" class dAcBAsura_c : public dAcEnBase_c { public: - dAcBAsura_c() : mStateMgr(*this, sStateID::null) {} + dAcBAsura_c() : mStateMgr(*this) {} virtual ~dAcBAsura_c() {} STATE_FUNC_DECLARE(dAcBAsura_c, Attack); diff --git a/include/d/a/b/d_a_b_asura_arm.h b/include/d/a/b/d_a_b_asura_arm.h index cb0a54f0..b0bcfae7 100644 --- a/include/d/a/b/d_a_b_asura_arm.h +++ b/include/d/a/b/d_a_b_asura_arm.h @@ -3,11 +3,10 @@ #include "d/a/obj/d_a_obj_base.h" #include "s/s_State.hpp" -#include "s/s_StateMgr.hpp" class dAcAsuraArm_c : public dAcObjBase_c { public: - dAcAsuraArm_c() : mStateMgr(*this, sStateID::null) {} + dAcAsuraArm_c() : mStateMgr(*this) {} virtual ~dAcAsuraArm_c() {} STATE_FUNC_DECLARE(dAcAsuraArm_c, Pulled); diff --git a/include/d/a/b/d_a_b_asura_foot.h b/include/d/a/b/d_a_b_asura_foot.h index e9f9fbf0..35d2f7cc 100644 --- a/include/d/a/b/d_a_b_asura_foot.h +++ b/include/d/a/b/d_a_b_asura_foot.h @@ -3,11 +3,10 @@ #include "d/a/obj/d_a_obj_base.h" #include "s/s_State.hpp" -#include "s/s_StateMgr.hpp" class dAcAsuraFoot_c : public dAcObjBase_c { public: - dAcAsuraFoot_c() : mStateMgr(*this, sStateID::null) {} + dAcAsuraFoot_c() : mStateMgr(*this) {} virtual ~dAcAsuraFoot_c() {} STATE_FUNC_DECLARE(dAcAsuraFoot_c, Pulled); diff --git a/include/d/a/b/d_a_b_bigboss.h b/include/d/a/b/d_a_b_bigboss.h index 98090395..c5e47f7b 100644 --- a/include/d/a/b/d_a_b_bigboss.h +++ b/include/d/a/b/d_a_b_bigboss.h @@ -3,11 +3,10 @@ #include "d/a/e/d_a_en_base.h" #include "s/s_State.hpp" -#include "s/s_StateMgr.hpp" class dAcBBigBoss_c : public dAcEnBase_c { public: - dAcBBigBoss_c() : mStateMgr(*this, sStateID::null) {} + dAcBBigBoss_c() : mStateMgr(*this) {} virtual ~dAcBBigBoss_c() {} STATE_FUNC_DECLARE(dAcBBigBoss_c, AppearWait); diff --git a/include/d/a/b/d_a_b_bigboss2.h b/include/d/a/b/d_a_b_bigboss2.h index c4677ae8..4c11a628 100644 --- a/include/d/a/b/d_a_b_bigboss2.h +++ b/include/d/a/b/d_a_b_bigboss2.h @@ -3,11 +3,10 @@ #include "d/a/e/d_a_en_base.h" #include "s/s_State.hpp" -#include "s/s_StateMgr.hpp" class dAcBBigBoss2_c : public dAcEnBase_c { public: - dAcBBigBoss2_c() : mStateMgr(*this, sStateID::null) {} + dAcBBigBoss2_c() : mStateMgr(*this) {} virtual ~dAcBBigBoss2_c() {} STATE_FUNC_DECLARE(dAcBBigBoss2_c, AppearWait); diff --git a/include/d/a/b/d_a_b_bigboss3.h b/include/d/a/b/d_a_b_bigboss3.h index f250b1dd..a673f585 100644 --- a/include/d/a/b/d_a_b_bigboss3.h +++ b/include/d/a/b/d_a_b_bigboss3.h @@ -3,11 +3,10 @@ #include "d/a/e/d_a_en_base.h" #include "s/s_State.hpp" -#include "s/s_StateMgr.hpp" class dAcBBigBoss3_c : public dAcEnBase_c { public: - dAcBBigBoss3_c() : mStateMgr(*this, sStateID::null) {} + dAcBBigBoss3_c() : mStateMgr(*this) {} virtual ~dAcBBigBoss3_c() {} STATE_FUNC_DECLARE(dAcBBigBoss3_c, AppearWait); diff --git a/include/d/a/b/d_a_b_girahimu.h b/include/d/a/b/d_a_b_girahimu.h index 5d977c11..07c3a272 100644 --- a/include/d/a/b/d_a_b_girahimu.h +++ b/include/d/a/b/d_a_b_girahimu.h @@ -3,11 +3,10 @@ #include "d/a/e/d_a_en_base.h" #include "s/s_State.hpp" -#include "s/s_StateMgr.hpp" class dAcGirahimu_c : public dAcEnBase_c { public: - dAcGirahimu_c() : mStateMgr(*this, sStateID::null) {} + dAcGirahimu_c() : mStateMgr(*this) {} virtual ~dAcGirahimu_c() {} private: diff --git a/include/d/a/b/d_a_b_girahimu2.h b/include/d/a/b/d_a_b_girahimu2.h index 90fca0c8..67a39339 100644 --- a/include/d/a/b/d_a_b_girahimu2.h +++ b/include/d/a/b/d_a_b_girahimu2.h @@ -3,11 +3,10 @@ #include "d/a/e/d_a_en_base.h" #include "s/s_State.hpp" -#include "s/s_StateMgr.hpp" class dAcGirahimu2_c : public dAcEnBase_c { public: - dAcGirahimu2_c() : mStateMgr(*this, sStateID::null) {} + dAcGirahimu2_c() : mStateMgr(*this) {} virtual ~dAcGirahimu2_c() {} private: diff --git a/include/d/a/b/d_a_b_girahimu3_base.h b/include/d/a/b/d_a_b_girahimu3_base.h index c7a9ecd2..1fe8c78d 100644 --- a/include/d/a/b/d_a_b_girahimu3_base.h +++ b/include/d/a/b/d_a_b_girahimu3_base.h @@ -3,11 +3,10 @@ #include "d/a/e/d_a_en_base.h" #include "s/s_State.hpp" -#include "s/s_StateMgr.hpp" class dAcGirahimu3Base_c : public dAcEnBase_c { public: - dAcGirahimu3Base_c() : mStateMgr(*this, sStateID::null) {} + dAcGirahimu3Base_c() : mStateMgr(*this) {} virtual ~dAcGirahimu3Base_c() {} private: diff --git a/include/d/a/b/d_a_b_girahimu3_second.h b/include/d/a/b/d_a_b_girahimu3_second.h index e0097d12..ca5b3228 100644 --- a/include/d/a/b/d_a_b_girahimu3_second.h +++ b/include/d/a/b/d_a_b_girahimu3_second.h @@ -3,11 +3,10 @@ #include "d/a/e/d_a_en_base.h" #include "s/s_State.hpp" -#include "s/s_StateMgr.hpp" class dAcGirahimu3Second_c : public dAcEnBase_c { public: - dAcGirahimu3Second_c() : mStateMgr(*this, sStateID::null) {} + dAcGirahimu3Second_c() : mStateMgr(*this) {} virtual ~dAcGirahimu3Second_c() {} STATE_FUNC_DECLARE(dAcGirahimu3Second_c, Demo); diff --git a/include/d/a/b/d_a_b_girahimu3_third.h b/include/d/a/b/d_a_b_girahimu3_third.h index 375bab29..89baa30b 100644 --- a/include/d/a/b/d_a_b_girahimu3_third.h +++ b/include/d/a/b/d_a_b_girahimu3_third.h @@ -3,11 +3,10 @@ #include "d/a/e/d_a_en_base.h" #include "s/s_State.hpp" -#include "s/s_StateMgr.hpp" class dAcGirahimu3Third_c : public dAcEnBase_c { public: - dAcGirahimu3Third_c() : mStateMgr(*this, sStateID::null) {} + dAcGirahimu3Third_c() : mStateMgr(*this) {} virtual ~dAcGirahimu3Third_c() {} STATE_FUNC_DECLARE(dAcGirahimu3Third_c, Demo); diff --git a/include/d/a/b/d_a_b_girahimu_base.h b/include/d/a/b/d_a_b_girahimu_base.h index fa3b5c45..1f6a9729 100644 --- a/include/d/a/b/d_a_b_girahimu_base.h +++ b/include/d/a/b/d_a_b_girahimu_base.h @@ -3,11 +3,10 @@ #include "d/a/e/d_a_en_base.h" #include "s/s_State.hpp" -#include "s/s_StateMgr.hpp" class dAcGirahimuBase_c : public dAcEnBase_c { public: - dAcGirahimuBase_c() : mStateMgr(*this, sStateID::null) {} + dAcGirahimuBase_c() : mStateMgr(*this) {} virtual ~dAcGirahimuBase_c() {} private: diff --git a/include/d/a/b/d_a_b_kr.h b/include/d/a/b/d_a_b_kr.h index e4a42140..fa7a8ab8 100644 --- a/include/d/a/b/d_a_b_kr.h +++ b/include/d/a/b/d_a_b_kr.h @@ -3,11 +3,10 @@ #include "d/a/e/d_a_en_base.h" #include "s/s_State.hpp" -#include "s/s_StateMgr.hpp" class dAcBkr_c : public dAcEnBase_c { public: - dAcBkr_c() : mStateMgr(*this, sStateID::null) {} + dAcBkr_c() : mStateMgr(*this) {} virtual ~dAcBkr_c() {} STATE_FUNC_DECLARE(dAcBkr_c, StartDemo); diff --git a/include/d/a/b/d_a_b_kr_arm.h b/include/d/a/b/d_a_b_kr_arm.h index 761ee984..642260e3 100644 --- a/include/d/a/b/d_a_b_kr_arm.h +++ b/include/d/a/b/d_a_b_kr_arm.h @@ -3,11 +3,10 @@ #include "d/a/e/d_a_en_base.h" #include "s/s_State.hpp" -#include "s/s_StateMgr.hpp" class dAcBkra_c : public dAcEnBase_c { public: - dAcBkra_c() : mStateMgr(*this, sStateID::null) {} + dAcBkra_c() : mStateMgr(*this) {} virtual ~dAcBkra_c() {} STATE_FUNC_DECLARE(dAcBkra_c, Wait); diff --git a/include/d/a/b/d_a_b_kr_hair.h b/include/d/a/b/d_a_b_kr_hair.h index 579502ed..36307a94 100644 --- a/include/d/a/b/d_a_b_kr_hair.h +++ b/include/d/a/b/d_a_b_kr_hair.h @@ -3,11 +3,10 @@ #include "d/a/e/d_a_en_base.h" #include "s/s_State.hpp" -#include "s/s_StateMgr.hpp" class dAcBkrh_c : public dAcEnBase_c { public: - dAcBkrh_c() : mStateMgr(*this, sStateID::null) {} + dAcBkrh_c() : mStateMgr(*this) {} virtual ~dAcBkrh_c() {} STATE_FUNC_DECLARE(dAcBkrh_c, Normal); diff --git a/include/d/a/b/d_a_b_lastboss.h b/include/d/a/b/d_a_b_lastboss.h index 1d01a3f3..84bf0baa 100644 --- a/include/d/a/b/d_a_b_lastboss.h +++ b/include/d/a/b/d_a_b_lastboss.h @@ -2,14 +2,286 @@ #define D_A_B_LASTBOSS_H #include "d/a/e/d_a_en_base.h" +#include "d/d_cc.h" +#include "d/d_light_env.h" +#include "m/m3d/m_anmmatclr.h" +#include "m/m3d/m_anmtexsrt.h" +#include "m/m3d/m_mdl.h" +#include "m/m3d/m_smdl.h" +#include "m/m_angle.h" +#include "m/m_vec.h" #include "s/s_State.hpp" -#include "s/s_StateMgr.hpp" +#include "toBeSorted/d_emitter.h" +#include "toBeSorted/d_enemy_sword_mdl.h" +#include "toBeSorted/stage_render_stuff.h" + +class dTgSwordBattleGame_c; + +// TODO this might be a template but what about the offset? +struct UnkLastBossCcSph1 { + /* 0x000 */ u8 _0x000[0x002 - 0x000]; + /* 0x002 */ s16 field_0x002; + /* 0x004 */ s16 field_0x004; + /* 0x006 */ s16 field_0x006; + /* 0x008 */ mVec3_c field_0x008[5]; + /* 0x044 */ mVec3_c field_0x044[5]; + /* 0x080 */ mVec3_c field_0x080[5]; + /* 0x0BC */ dCcD_Linked_Sph mCc; +}; + +struct UnkLastBossCcSph2 { + /* 0x000 */ s16 field_0x000; + /* 0x002 */ s16 field_0x002; + /* 0x004 */ s16 field_0x004; + /* 0x006 */ s16 field_0x006; + /* 0x008 */ s16 field_0x008; + /* 0x00A */ s16 field_0x00A; + /* 0x00C */ f32 field_0x00C; + /* 0x010 */ f32 field_0x010; + /* 0x014 */ mVec3_c field_0x014[10]; + /* 0x08C */ mVec3_c field_0x08C[10]; + /* 0x104 */ mVec3_c field_0x104[10]; + /* 0x17C */ dCcD_Linked_Sph mCc; +}; class dAcBlastboss_c : public dAcEnBase_c { + class callback_c : public m3d::callback_c { + public: + virtual void timingB(u32, nw4r::g3d::WorldMtxManip *, nw4r::g3d::ResMdl) override; + + /* 0x04 */ mAng field_0x04; + /* 0x06 */ mAng field_0x06; + /* 0x08 */ mAng field_0x08; + /* 0x0A */ mAng field_0x0A; + /* 0x0C */ mAng field_0x0C; + /* 0x0E */ mAng field_0x0E; + /* 0x10 */ mAng field_0x10; + /* 0x12 */ mAng field_0x12; + /* 0x14 */ mAng field_0x14; + /* 0x16 */ mAng field_0x16; + /* 0x18 */ mAng field_0x18; + /* 0x1A */ mAng field_0x1A; + /* 0x1C */ mAng field_0x1C[9]; + /* 0x2E */ mAng field_0x2E; + /* 0x30 */ f32 field_0x30; + /* 0x34 */ dAcBlastboss_c *mpOwner; + }; + + friend class callback_c; + + // BLastBoss.arc > g3d > model.brres > 3DModels(NW4R) > LastBoss > Bones > ... + enum BLastBossModelNode_e { + B_LAST_BOSS_NODE_center = 0, + B_LAST_BOSS_NODE_backbone1 = 1, + B_LAST_BOSS_NODE_backbone2 = 2, + B_LAST_BOSS_NODE_chest = 3, + B_LAST_BOSS_NODE_neck = 4, + B_LAST_BOSS_NODE_head = 5, + B_LAST_BOSS_NODE_browL = 6, + B_LAST_BOSS_NODE_browR = 7, + B_LAST_BOSS_NODE_chin = 8, + B_LAST_BOSS_NODE_hairA1 = 9, + B_LAST_BOSS_NODE_hairA2 = 10, + B_LAST_BOSS_NODE_hairA3 = 11, + B_LAST_BOSS_NODE_hairA4 = 12, + B_LAST_BOSS_NODE_hairBL1 = 13, + B_LAST_BOSS_NODE_hairBL2 = 14, + B_LAST_BOSS_NODE_hairBL3 = 15, + B_LAST_BOSS_NODE_hairBR1 = 16, + B_LAST_BOSS_NODE_hairBR2 = 17, + B_LAST_BOSS_NODE_hairBR3 = 18, + B_LAST_BOSS_NODE_hairC1 = 19, + B_LAST_BOSS_NODE_hairC2 = 20, + B_LAST_BOSS_NODE_hairC3 = 21, + B_LAST_BOSS_NODE_mouthL = 22, + B_LAST_BOSS_NODE_mouthR = 23, + B_LAST_BOSS_NODE_shoulderL = 24, + B_LAST_BOSS_NODE_armL1 = 25, + B_LAST_BOSS_NODE_armL2 = 26, + B_LAST_BOSS_NODE_assistanceL = 27, + B_LAST_BOSS_NODE_wristL = 28, + B_LAST_BOSS_NODE_indexL1 = 29, + B_LAST_BOSS_NODE_indexL2 = 30, + B_LAST_BOSS_NODE_littleL1 = 31, + B_LAST_BOSS_NODE_littleL2 = 32, + B_LAST_BOSS_NODE_middleL1 = 33, + B_LAST_BOSS_NODE_middleL2 = 34, + B_LAST_BOSS_NODE_ringL1 = 35, + B_LAST_BOSS_NODE_ringL2 = 36, + B_LAST_BOSS_NODE_thumbL1 = 37, + B_LAST_BOSS_NODE_thumbL2 = 38, + B_LAST_BOSS_NODE_shoulderR = 39, + B_LAST_BOSS_NODE_armR1 = 40, + B_LAST_BOSS_NODE_armR2 = 41, + B_LAST_BOSS_NODE_assistanceR = 42, + B_LAST_BOSS_NODE_wristR = 43, + B_LAST_BOSS_NODE_indexR1 = 44, + B_LAST_BOSS_NODE_indexR2 = 45, + B_LAST_BOSS_NODE_littleR1 = 46, + B_LAST_BOSS_NODE_littleR2 = 47, + B_LAST_BOSS_NODE_loc_sword01 = 48, + B_LAST_BOSS_NODE_middleR1 = 49, + B_LAST_BOSS_NODE_middleR2 = 50, + B_LAST_BOSS_NODE_ringR1 = 51, + B_LAST_BOSS_NODE_ringR2 = 52, + B_LAST_BOSS_NODE_thumbR1 = 53, + B_LAST_BOSS_NODE_thumbR2 = 54, + B_LAST_BOSS_NODE_belly = 55, + B_LAST_BOSS_NODE_waist = 56, + B_LAST_BOSS_NODE_legL1 = 57, + B_LAST_BOSS_NODE_legL2 = 58, + B_LAST_BOSS_NODE_ankleL = 59, + B_LAST_BOSS_NODE_toeL = 60, + B_LAST_BOSS_NODE_legR1 = 61, + B_LAST_BOSS_NODE_legR2 = 62, + B_LAST_BOSS_NODE_ankleR = 63, + B_LAST_BOSS_NODE_toeR = 64, + B_LAST_BOSS_NODE_skirtA1 = 65, + B_LAST_BOSS_NODE_skirtA2 = 66, + B_LAST_BOSS_NODE_skirtAU1 = 67, + B_LAST_BOSS_NODE_skirtB1 = 68, + B_LAST_BOSS_NODE_skirtB2 = 69, + B_LAST_BOSS_NODE_skirtB3 = 70, + B_LAST_BOSS_NODE_skirtB4 = 71, + B_LAST_BOSS_NODE_skirtB5 = 72, + B_LAST_BOSS_NODE_skirtB6 = 73, + B_LAST_BOSS_NODE_skirtB7 = 74, + B_LAST_BOSS_NODE_skirtB8 = 75, + B_LAST_BOSS_NODE_skirtB9 = 76, + B_LAST_BOSS_NODE_skirtBU1 = 77, + B_LAST_BOSS_NODE_skirtC1 = 78, + B_LAST_BOSS_NODE_skirtC2 = 79, + B_LAST_BOSS_NODE_skirtC3 = 80, + B_LAST_BOSS_NODE_skirtC4 = 81, + B_LAST_BOSS_NODE_skirtC5 = 82, + B_LAST_BOSS_NODE_skirtC6 = 83, + B_LAST_BOSS_NODE_skirtC7 = 84, + B_LAST_BOSS_NODE_skirtC8 = 85, + B_LAST_BOSS_NODE_skirtC9 = 86, + B_LAST_BOSS_NODE_skirtCU1 = 87, + B_LAST_BOSS_NODE_skirtD1 = 88, + B_LAST_BOSS_NODE_skirtD2 = 89, + B_LAST_BOSS_NODE_skirtD3 = 90, + B_LAST_BOSS_NODE_skirtD4 = 91, + B_LAST_BOSS_NODE_skirtD5 = 92, + B_LAST_BOSS_NODE_skirtD6 = 93, + B_LAST_BOSS_NODE_skirtD7 = 94, + B_LAST_BOSS_NODE_skirtD8 = 95, + B_LAST_BOSS_NODE_skirtD9 = 96, + B_LAST_BOSS_NODE_skirtDU1 = 97, + B_LAST_BOSS_NODE_skirtE1 = 98, + B_LAST_BOSS_NODE_skirtE2 = 99, + B_LAST_BOSS_NODE_skirtE3 = 100, + B_LAST_BOSS_NODE_skirtE4 = 101, + B_LAST_BOSS_NODE_skirtE5 = 102, + B_LAST_BOSS_NODE_skirtE6 = 103, + B_LAST_BOSS_NODE_skirtE7 = 104, + B_LAST_BOSS_NODE_skirtE8 = 105, + B_LAST_BOSS_NODE_skirtE9 = 106, + B_LAST_BOSS_NODE_skirtEU1 = 107, + B_LAST_BOSS_NODE_skirtEU2 = 108, + B_LAST_BOSS_NODE_skirtF1 = 109, + B_LAST_BOSS_NODE_skirtF2 = 110, + B_LAST_BOSS_NODE_skirtF3 = 111, + B_LAST_BOSS_NODE_skirtF4 = 112, + B_LAST_BOSS_NODE_skirtF5 = 113, + B_LAST_BOSS_NODE_skirtF6 = 114, + B_LAST_BOSS_NODE_skirtF7 = 115, + B_LAST_BOSS_NODE_skirtF8 = 116, + B_LAST_BOSS_NODE_skirtF9 = 117, + B_LAST_BOSS_NODE_skirtFU1 = 118, + B_LAST_BOSS_NODE_skirtG1 = 119, + B_LAST_BOSS_NODE_skirtG2 = 120, + B_LAST_BOSS_NODE_skirtG3 = 121, + B_LAST_BOSS_NODE_skirtG4 = 122, + B_LAST_BOSS_NODE_skirtG5 = 123, + B_LAST_BOSS_NODE_skirtG6 = 124, + B_LAST_BOSS_NODE_skirtG7 = 125, + B_LAST_BOSS_NODE_skirtG8 = 126, + B_LAST_BOSS_NODE_skirtG9 = 127, + B_LAST_BOSS_NODE_skirtGU1 = 128, + B_LAST_BOSS_NODE_skirtH1 = 129, + B_LAST_BOSS_NODE_skirtH2 = 130, + B_LAST_BOSS_NODE_skirtH3 = 131, + B_LAST_BOSS_NODE_skirtH4 = 132, + B_LAST_BOSS_NODE_skirtH5 = 133, + B_LAST_BOSS_NODE_skirtHU1 = 134, + }; + + // TODO: mFightState probably means different things in + // different states, so maybe we need to either remove + // this again or split this up further. + enum SubState_e { + SUB_STATE_0 = 0, + SUB_STATE_1, + SUB_STATE_2, + SUB_STATE_3, + SUB_STATE_4, + SUB_STATE_5, + SUB_STATE_6, + + SUB_STATE_10 = 10, + SUB_STATE_11, + + SUB_STATE_20 = 20, + SUB_STATE_21, + + SUB_STATE_50 = 50, + }; + + enum Timer_e { + TIMER_0, + TIMER_1, + TIMER_2, + TIMER_3, + TIMER_4, + TIMER_5, + + TIMER_MAX, + }; + + // TODO: Maybe reused in other sword fight bosses? + // Names taken from the string array + enum GuardDirection_e { + GUARD_RIGHT, + GUARD_UPRIGHT, + GUARD_DOWNRIGHT, + GUARD_LEFT, + GUARD_UPLEFT, + GUARD_DOWNLEFT, + GUARD_UP, + GUARD_DOWN, + GUARD_CENTER, + GUARD_BT, // not sure + }; + + enum LightningState_e { + LIGHTNING_STRIKE_STATE_NONE = 0, + + LIGHTNING_STRIKE_START_DEMO = 1, + LIGHTNING_STRIKE_DEMO, + LIGHTNING_STRIKE_WAIT, + + LIGHTNING_STRIKE_TRIGGER_END = 100, + LIGHTNING_STRIKE_ENDING, + + LIGHTNING_STRIKE_TRIGGER_START = 200, + LIGHTNING_STRIKE_START, + LIGHTNING_STRIKE_START_LAST = 299, + + LIGHTNING_STRIKE_FINISH = 1000, + }; + public: - dAcBlastboss_c() : mStateMgr(*this, sStateID::null) {} + dAcBlastboss_c() : mStateMgr(*this), mScnCallback(this) {} virtual ~dAcBlastboss_c() {} + virtual bool createHeap() override; + int create() override; + int doDelete() override; + int actorExecute() override; + int draw() override; + STATE_FUNC_DECLARE(dAcBlastboss_c, Fight); STATE_FUNC_DECLARE(dAcBlastboss_c, Guard); STATE_FUNC_DECLARE(dAcBlastboss_c, GuardBreak); @@ -26,7 +298,157 @@ public: STATE_FUNC_DECLARE(dAcBlastboss_c, ThunderWait); private: - /* 0x??? */ STATE_MGR_DECLARE(dAcBlastboss_c); + void setAnm(const char *anim, f32 blend); + void forceSetAnm(const char *anim, f32 blend); + void setAnmRate(f32 rate); + + bool checkDamage(); + bool checkForCloseRangeAttack(); + bool checkForRangeAttack(); + bool checkForCounter(); + void updateMainNodeTransforms(); + void updateSkirtHairTransforms(); + void updateSkirtTransform(s32 level); + void updateHairTransform(s32 level); + bool checkForLinkSwordBySwordHit(); + u8 classifyAttackDirection(s32 attackDir); + void executeLightningStrike(); + void setLightningTimerMaybe(s32); + + /* 0x0378 */ d3d::AnmMdlWrapper mMdl; + /* 0x03E8 */ m3d::anmTexSrt_c mAnmTexSrt; + /* 0x0414 */ m3d::anmMatClr_c mAnmMatClr1; + /* 0x0440 */ m3d::smdl_c mThunderMdl; + /* 0x045C */ m3d::anmMatClr_c mThunderAnmMatClr; + /* 0x0488 */ callback_c mMdlCallback; + /* 0x04C0 */ dCcD_Linked_Cyl mCc1; + /* 0x0620 */ dCcD_Linked_Cyl mCc2; + /* 0x0780 */ dCcD_Linked_Cyl mCc3; + /* 0x08E0 */ dCcD_Linked_Sph mCc4; + /* 0x0A40 */ dCcD_Linked_Sph mLightningCc; + /* 0x0BA0 */ dScnCallback_c mScnCallback; + /* 0x0BAC */ STATE_MGR_DECLARE(dAcBlastboss_c); + /* 0x0BE8 */ dColliderLinkedList mCcList; + /* 0x0BF4 */ dEnemySwordMdl_c mSwordMdl; + /* 0x1130 */ u8 mThunderWaitSceneFlag; + /* 0x1131 */ u8 field_0x1131; + /* 0x1132 */ bool field_0x1132; + /* 0x1133 */ u8 field_0x1133; + /* 0x1134 */ u8 field_0x1134; + /* 0x1135 */ s8 mNumConsecutiveOppositeDirectionAttacks; + /* 0x1136 */ s8 mNumConsecutiveSameDirectionAttacks; + /* 0x1137 */ u8 field_0x1137; + /* 0x1138 */ u8 field_0x1138; + /* 0x1139 */ u8 field_0x1139; + /* 0x113A */ u8 mChanceAttackCounter; + /* 0x113B */ u8 field_0x113B; + /* 0x113C */ u8 mChanceCounter; + /* 0x113D */ u8 field_0x113D; + /* 0x113E */ u8 field_0x113E; + /* 0x113F */ u8 field_0x113F; + /* 0x1140 */ bool field_0x1140; + /* 0x1141 */ bool mIsDown; + /* 0x1142 */ u8 field_0x1142; + /* 0x1143 */ u8 mInvulnerabilityTimerMaybe; + /* 0x1144 */ s8 mGuardDirection; + /* 0x1145 */ s8 mLinkCloseRangeShieldTime; + /* 0x1146 */ bool mIsSwordEmpowered; + /* 0x1147 */ bool mIsThunderBeamAttackActive; + /* 0x1148 */ u8 mThunderBeamTimer; + /* 0x1149 */ s8 mIsPhaseTwo; + /* 0x114A */ u8 mLightingFallSwordTimer; + /* 0x114B */ u8 mStunState; + /* 0x114C */ u8 field_0x114C; + /* 0x114D */ bool mInBossRush; + /* 0x114E */ u8 field_0x114E; + /* 0x114F */ bool mIsDead; + /* 0x1150 */ bool mThunderBeamReflected; + /* 0x1152 */ u16 field_0x1152; + /* 0x1154 */ u16 mStunCounter; + /* 0x1156 */ u16 mTimers[TIMER_MAX]; + /* 0x1162 */ u16 field_0x1162; + /* 0x1164 */ s16 mCounter; + /* 0x1166 */ s16 mSubState; + + /* 0x1168 */ u8 _0x1168[0x116A - 0x1168]; + + /* 0x116A */ s16 mYAngleToLink; + + /* 0x116C */ u8 _0x116C[0x1170 - 0x116C]; + + /* 0x1170 */ s16 field_0x1170; + /* 0x1172 */ s16 field_0x1172; + /* 0x1174 */ s16 field_0x1174; + + /* 0x1176 */ u8 _0x1176[0x1178 - 0x1176]; + + /* 0x1178 */ s16 field_0x1178; + /* 0x117A */ s16 field_0x117A; + /* 0x117C */ s16 field_0x117C; + /* 0x117E */ s16 field_0x117E; + /* 0x1180 */ s16 field_0x1180; + /* 0x1182 */ s16 field_0x1182; + /* 0x1184 */ s16 mLightningTimerMaybe; + /* 0x1186 */ s16 mYRotationRelativeToLink; + /* 0x1188 */ s16 field_0x1188; + /* 0x118A */ mAng field_0x118A; + /* 0x118C */ mAng field_0x118C; + + /* 0x118E */ u8 _0x118E[0x1190 - 0x118E]; + + /* 0x1190 */ f32 mXZDistanceToLink; + + /* 0x1194 */ u8 _0x1194[0x119C - 0x1194]; + + /* 0x119C */ f32 mAttackKnockbackX; + /* 0x11A0 */ f32 mAttackKnockbackZ; + /* 0x11A4 */ f32 field_0x11A4; + /* 0x11A8 */ f32 mAnmRate; + /* 0x11AC */ f32 field_0x11AC; + /* 0x11B0 */ f32 field_0x11B0; + /* 0x11B0 */ f32 field_0x11B4; + /* 0x11B8 */ f32 field_0x11B8; + /* 0x11BC */ f32 field_0x11BC; + /* 0x11C0 */ f32 field_0x11C0; + /* 0x11C4 */ f32 field_0x11C4; + /* 0x11C8 */ f32 field_0x11C8; + /* 0x11CC */ f32 field_0x11CC; + /* 0x11D0 */ f32 field_0x11D0; + /* 0x11D4 */ s32 mLastAttackDir; + /* 0x11D8 */ s32 mSecondLastAttackDirection; + /* 0x11DC */ mAng3_c mThunderBeamRotation; + /* 0x11E4 */ mVec3_c mThumbL2Translation; + /* 0x11F0 */ mVec3_c mBackbone1Translation; + /* 0x11FC */ mVec3_c mChestTranslation; + /* 0x1208 */ mVec3_c mSwordPosition; + /* 0x1214 */ mVec3_c mBugNetPos; + /* 0x1220 */ mVec3_c mThunderBeamPosition; + /* 0x122C */ mVec3_c mThunderBeamVelocity; + /* 0x1238 */ mVec3_c mToeTranslation[2]; + /* 0x1250 */ mVec3_c field_0x1250[2]; + + /* 0x1268 */ UnkLastBossCcSph2 field_0x1268[8]; + /* 0x2948 */ UnkLastBossCcSph1 field_0x2948[1]; + + /* 0x2B64 */ dEmitter_c mWaterEmitter; + /* 0x2B98 */ dEmitter_c mEmitter2; + /* 0x2BCC */ dEmitter_c mEmitter3; + /* 0x2C00 */ dEmitter_c mEmitter4; + /* 0x2C34 */ dEmitter_c mEmitter5; + /* 0x2C68 */ dEmitter_c mEmitter6; + /* 0x2C9C */ dEmitter_c mEmitter7; + /* 0x2CD0 */ LIGHT_INFLUENCE mLightInfo; + /* 0x2CEC */ s16 mLightingStrikeState; + /* 0x2CEE */ s16 field_0x2CEE; + /* 0x2CF0 */ s16 field_0x2CF0; + /* 0x2CF4 */ f32 field_0x2CF4; + /* 0x2CF8 */ u8 _0x2CF8[0x2CFC - 0x2CF8]; + /* 0x2CFC */ f32 field_0x2CFC; + /* 0x2D00 */ f32 field_0x2D00; + /* 0x2D04 */ mVec3_c field_0x2D04; + /* 0x2D10 */ mVec3_c field_0x2D10; + /* 0x2D1C */ const char *mpCurrentAnm; + /* 0x2D20 */ dTgSwordBattleGame_c *mpSwordBattleGame; }; #endif diff --git a/include/d/a/b/d_a_b_mg.h b/include/d/a/b/d_a_b_mg.h index 95a04d54..fd8d2420 100644 --- a/include/d/a/b/d_a_b_mg.h +++ b/include/d/a/b/d_a_b_mg.h @@ -3,11 +3,10 @@ #include "d/a/e/d_a_en_base.h" #include "s/s_State.hpp" -#include "s/s_StateMgr.hpp" class dAcBmg_c : public dAcEnBase_c { public: - dAcBmg_c() : mStateMgr(*this, sStateID::null) {} + dAcBmg_c() : mStateMgr(*this) {} virtual ~dAcBmg_c() {} STATE_FUNC_DECLARE(dAcBmg_c, Start); diff --git a/include/d/a/b/d_a_b_nusi.h b/include/d/a/b/d_a_b_nusi.h index 04724f20..fb35d21e 100644 --- a/include/d/a/b/d_a_b_nusi.h +++ b/include/d/a/b/d_a_b_nusi.h @@ -3,11 +3,10 @@ #include "d/a/e/d_a_en_base.h" #include "s/s_State.hpp" -#include "s/s_StateMgr.hpp" class dAcNusi_c : public dAcEnBase_c { public: - dAcNusi_c() : mStateMgr(*this, sStateID::null) {} + dAcNusi_c() : mStateMgr(*this) {} virtual ~dAcNusi_c() {} private: diff --git a/include/d/a/b/d_a_b_nusi_bullet.h b/include/d/a/b/d_a_b_nusi_bullet.h index 6417ff6e..1af67ca2 100644 --- a/include/d/a/b/d_a_b_nusi_bullet.h +++ b/include/d/a/b/d_a_b_nusi_bullet.h @@ -3,11 +3,10 @@ #include "d/a/e/d_a_en_base.h" #include "s/s_State.hpp" -#include "s/s_StateMgr.hpp" class dAcNusi_Bullet_c : public dAcEnBase_c { public: - dAcNusi_Bullet_c() : mStateMgr(*this, sStateID::null) {} + dAcNusi_Bullet_c() : mStateMgr(*this) {} virtual ~dAcNusi_Bullet_c() {} STATE_FUNC_DECLARE(dAcNusi_Bullet_c, Move); diff --git a/include/d/a/b/d_a_b_nusi_tentakle.h b/include/d/a/b/d_a_b_nusi_tentakle.h index 21ec871f..5406dd5d 100644 --- a/include/d/a/b/d_a_b_nusi_tentakle.h +++ b/include/d/a/b/d_a_b_nusi_tentakle.h @@ -3,11 +3,10 @@ #include "d/a/e/d_a_en_base.h" #include "s/s_State.hpp" -#include "s/s_StateMgr.hpp" class dAcNusiTentakle_c : public dAcEnBase_c { public: - dAcNusiTentakle_c() : mStateMgr(*this, sStateID::null) {} + dAcNusiTentakle_c() : mStateMgr(*this) {} virtual ~dAcNusiTentakle_c() {} STATE_FUNC_DECLARE(dAcNusiTentakle_c, Hide); diff --git a/include/d/a/b/d_a_b_vd.h b/include/d/a/b/d_a_b_vd.h index 9c5c95f4..843920e6 100644 --- a/include/d/a/b/d_a_b_vd.h +++ b/include/d/a/b/d_a_b_vd.h @@ -3,11 +3,10 @@ #include "d/a/e/d_a_en_base.h" #include "s/s_State.hpp" -#include "s/s_StateMgr.hpp" class dAcBvd_c : public dAcEnBase_c { public: - dAcBvd_c() : mStateMgr(*this, sStateID::null) {} + dAcBvd_c() : mStateMgr(*this) {} virtual ~dAcBvd_c() {} STATE_FUNC_DECLARE(dAcBvd_c, Opening); diff --git a/include/d/a/d_a_asura_bullet.h b/include/d/a/d_a_asura_bullet.h index 19fcc3da..f435baf5 100644 --- a/include/d/a/d_a_asura_bullet.h +++ b/include/d/a/d_a_asura_bullet.h @@ -3,11 +3,10 @@ #include "d/a/obj/d_a_obj_base.h" #include "s/s_State.hpp" -#include "s/s_StateMgr.hpp" class dAcAsuraBullet_c : public dAcObjBase_c { public: - dAcAsuraBullet_c() : mStateMgr(*this, sStateID::null) {} + dAcAsuraBullet_c() : mStateMgr(*this) {} virtual ~dAcAsuraBullet_c() {} STATE_FUNC_DECLARE(dAcAsuraBullet_c, Attack); diff --git a/include/d/a/d_a_avater_bullet.h b/include/d/a/d_a_avater_bullet.h index 4cb7204f..e6415df9 100644 --- a/include/d/a/d_a_avater_bullet.h +++ b/include/d/a/d_a_avater_bullet.h @@ -3,11 +3,10 @@ #include "d/a/obj/d_a_obj_base.h" #include "s/s_State.hpp" -#include "s/s_StateMgr.hpp" class dAcAvater_Bullet_c : public dAcObjBase_c { public: - dAcAvater_Bullet_c() : mStateMgr(*this, sStateID::null) {} + dAcAvater_Bullet_c() : mStateMgr(*this) {} virtual ~dAcAvater_Bullet_c() {} STATE_FUNC_DECLARE(dAcAvater_Bullet_c, Move); diff --git a/include/d/a/d_a_avater_race_mng.h b/include/d/a/d_a_avater_race_mng.h index 39852293..90481210 100644 --- a/include/d/a/d_a_avater_race_mng.h +++ b/include/d/a/d_a_avater_race_mng.h @@ -3,11 +3,10 @@ #include "d/a/d_a_base.h" #include "s/s_State.hpp" -#include "s/s_StateMgr.hpp" class dAvater_Race_Mng_c : public dAcBase_c { public: - dAvater_Race_Mng_c() : mStateMgr(*this, sStateID::null) {} + dAvater_Race_Mng_c() : mStateMgr(*this) {} virtual ~dAvater_Race_Mng_c() {} STATE_FUNC_DECLARE(dAvater_Race_Mng_c, StartWait); diff --git a/include/d/a/d_a_bird.h b/include/d/a/d_a_bird.h index 05450e45..a4afd616 100644 --- a/include/d/a/d_a_bird.h +++ b/include/d/a/d_a_bird.h @@ -3,11 +3,10 @@ #include "d/a/obj/d_a_obj_base.h" #include "s/s_State.hpp" -#include "s/s_StateMgr.hpp" class dBird_c : public dAcObjBase_c { public: - dBird_c() : mStateMgr(*this, sStateID::null) {} + dBird_c() : mStateMgr(*this) {} virtual ~dBird_c() {} STATE_FUNC_DECLARE(dBird_c, Wait); diff --git a/include/d/a/d_a_bird_kobunA.h b/include/d/a/d_a_bird_kobunA.h index 3cc9294a..2bd3cdb2 100644 --- a/include/d/a/d_a_bird_kobunA.h +++ b/include/d/a/d_a_bird_kobunA.h @@ -3,11 +3,10 @@ #include "d/a/obj/d_a_obj_base.h" #include "s/s_State.hpp" -#include "s/s_StateMgr.hpp" class dBird_KobunA_c : public dAcObjBase_c { public: - dBird_KobunA_c() : mStateMgr(*this, sStateID::null) {} + dBird_KobunA_c() : mStateMgr(*this) {} virtual ~dBird_KobunA_c() {} STATE_FUNC_DECLARE(dBird_KobunA_c, Wait); diff --git a/include/d/a/d_a_bird_kobunB.h b/include/d/a/d_a_bird_kobunB.h index fc2f9482..eba52eb4 100644 --- a/include/d/a/d_a_bird_kobunB.h +++ b/include/d/a/d_a_bird_kobunB.h @@ -3,11 +3,10 @@ #include "d/a/obj/d_a_obj_base.h" #include "s/s_State.hpp" -#include "s/s_StateMgr.hpp" class dBird_KobunB_c : public dAcObjBase_c { public: - dBird_KobunB_c() : mStateMgr(*this, sStateID::null) {} + dBird_KobunB_c() : mStateMgr(*this) {} virtual ~dBird_KobunB_c() {} STATE_FUNC_DECLARE(dBird_KobunB_c, Wait); diff --git a/include/d/a/d_a_bird_mob.h b/include/d/a/d_a_bird_mob.h index 9e180518..d6adc521 100644 --- a/include/d/a/d_a_bird_mob.h +++ b/include/d/a/d_a_bird_mob.h @@ -3,11 +3,10 @@ #include "d/a/obj/d_a_obj_base.h" #include "s/s_State.hpp" -#include "s/s_StateMgr.hpp" class dAcBirdMob_c : public dAcObjBase_c { public: - dAcBirdMob_c() : mStateMgr(*this, sStateID::null) {} + dAcBirdMob_c() : mStateMgr(*this) {} virtual ~dAcBirdMob_c() {} STATE_FUNC_DECLARE(dAcBirdMob_c, Wait); diff --git a/include/d/a/d_a_bird_npc.h b/include/d/a/d_a_bird_npc.h index e6312267..0e7a8fc3 100644 --- a/include/d/a/d_a_bird_npc.h +++ b/include/d/a/d_a_bird_npc.h @@ -3,11 +3,10 @@ #include "d/a/obj/d_a_obj_base.h" #include "s/s_State.hpp" -#include "s/s_StateMgr.hpp" class dBird_Npc_c : public dAcObjBase_c { public: - dBird_Npc_c() : mStateMgr(*this, sStateID::null) {} + dBird_Npc_c() : mStateMgr(*this) {} virtual ~dBird_Npc_c() {} STATE_FUNC_DECLARE(dBird_Npc_c, Hide); diff --git a/include/d/a/d_a_bird_rival.h b/include/d/a/d_a_bird_rival.h index c5f23aad..cb78319e 100644 --- a/include/d/a/d_a_bird_rival.h +++ b/include/d/a/d_a_bird_rival.h @@ -3,11 +3,10 @@ #include "d/a/obj/d_a_obj_base.h" #include "s/s_State.hpp" -#include "s/s_StateMgr.hpp" class dBird_Rival_c : public dAcObjBase_c { public: - dBird_Rival_c() : mStateMgr(*this, sStateID::null) {} + dBird_Rival_c() : mStateMgr(*this) {} virtual ~dBird_Rival_c() {} STATE_FUNC_DECLARE(dBird_Rival_c, Wait); diff --git a/include/d/a/d_a_bird_target.h b/include/d/a/d_a_bird_target.h index 541d219d..afe3932a 100644 --- a/include/d/a/d_a_bird_target.h +++ b/include/d/a/d_a_bird_target.h @@ -3,11 +3,10 @@ #include "d/a/obj/d_a_obj_base.h" #include "s/s_State.hpp" -#include "s/s_StateMgr.hpp" class dBird_Target_c : public dAcObjBase_c { public: - dBird_Target_c() : mStateMgr(*this, sStateID::null) {} + dBird_Target_c() : mStateMgr(*this) {} virtual ~dBird_Target_c() {} STATE_FUNC_DECLARE(dBird_Target_c, Wait); diff --git a/include/d/a/d_a_bird_zelda_training.h b/include/d/a/d_a_bird_zelda_training.h index a3615f96..41ba3673 100644 --- a/include/d/a/d_a_bird_zelda_training.h +++ b/include/d/a/d_a_bird_zelda_training.h @@ -3,11 +3,10 @@ #include "d/a/obj/d_a_obj_base.h" #include "s/s_State.hpp" -#include "s/s_StateMgr.hpp" class dBird_ZeldaTraining_c : public dAcObjBase_c { public: - dBird_ZeldaTraining_c() : mStateMgr(*this, sStateID::null) {} + dBird_ZeldaTraining_c() : mStateMgr(*this) {} virtual ~dBird_ZeldaTraining_c() {} STATE_FUNC_DECLARE(dBird_ZeldaTraining_c, Wait); diff --git a/include/d/a/d_a_bombf.h b/include/d/a/d_a_bombf.h index 83ab3a9f..5a0d6c54 100644 --- a/include/d/a/d_a_bombf.h +++ b/include/d/a/d_a_bombf.h @@ -9,7 +9,7 @@ class dAcBombf_c : public dAcObjBase_c { public: - dAcBombf_c() : mStateMgr(*this, sStateID::null) {} + dAcBombf_c() : mStateMgr(*this) {} virtual ~dAcBombf_c() {} virtual bool createHeap() override; virtual int create() override; diff --git a/include/d/a/d_a_bullet_gue.h b/include/d/a/d_a_bullet_gue.h index 9ffa58d7..92f827bd 100644 --- a/include/d/a/d_a_bullet_gue.h +++ b/include/d/a/d_a_bullet_gue.h @@ -3,11 +3,10 @@ #include "d/a/obj/d_a_obj_base.h" #include "s/s_State.hpp" -#include "s/s_StateMgr.hpp" class dAcBulletGue_c : public dAcObjBase_c { public: - dAcBulletGue_c() : mStateMgr(*this, sStateID::null) {} + dAcBulletGue_c() : mStateMgr(*this) {} virtual ~dAcBulletGue_c() {} STATE_FUNC_DECLARE(dAcBulletGue_c, Wait); diff --git a/include/d/a/d_a_bullet_maguppo.h b/include/d/a/d_a_bullet_maguppo.h index 5c96153c..7da365d2 100644 --- a/include/d/a/d_a_bullet_maguppo.h +++ b/include/d/a/d_a_bullet_maguppo.h @@ -3,11 +3,10 @@ #include "d/a/obj/d_a_obj_base.h" #include "s/s_State.hpp" -#include "s/s_StateMgr.hpp" class dAcBulletMaguppo_c : public dAcObjBase_c { public: - dAcBulletMaguppo_c() : mStateMgr(*this, sStateID::null) {} + dAcBulletMaguppo_c() : mStateMgr(*this) {} virtual ~dAcBulletMaguppo_c() {} STATE_FUNC_DECLARE(dAcBulletMaguppo_c, Move); diff --git a/include/d/a/d_a_co_test.h b/include/d/a/d_a_co_test.h index dfe6a839..3e1e37cd 100644 --- a/include/d/a/d_a_co_test.h +++ b/include/d/a/d_a_co_test.h @@ -3,11 +3,10 @@ #include "d/a/obj/d_a_obj_base.h" #include "s/s_State.hpp" -#include "s/s_StateMgr.hpp" class dAcCoTest : public dAcObjBase_c { public: - dAcCoTest() : mStateMgr(*this, sStateID::null) {} + dAcCoTest() : mStateMgr(*this) {} virtual ~dAcCoTest() {} STATE_FUNC_DECLARE(dAcCoTest, Wait); diff --git a/include/d/a/d_a_control.h b/include/d/a/d_a_control.h index 683ad875..3fa31e0e 100644 --- a/include/d/a/d_a_control.h +++ b/include/d/a/d_a_control.h @@ -3,11 +3,10 @@ #include "d/a/obj/d_a_obj_base.h" #include "s/s_State.hpp" -#include "s/s_StateMgr.hpp" class dAcEnCl_c : public dAcObjBase_c { public: - dAcEnCl_c() : mStateMgr(*this, sStateID::null) {} + dAcEnCl_c() : mStateMgr(*this) {} virtual ~dAcEnCl_c() {} STATE_FUNC_DECLARE(dAcEnCl_c, pathMove); diff --git a/include/d/a/d_a_demo_npc_bird.h b/include/d/a/d_a_demo_npc_bird.h index 14ddae37..32955f5f 100644 --- a/include/d/a/d_a_demo_npc_bird.h +++ b/include/d/a/d_a_demo_npc_bird.h @@ -3,11 +3,10 @@ #include "d/a/obj/d_a_obj_base.h" #include "s/s_State.hpp" -#include "s/s_StateMgr.hpp" class dAcDemoNpcBird_c : public dAcObjBase_c { public: - dAcDemoNpcBird_c() : mStateMgr(*this, sStateID::null) {} + dAcDemoNpcBird_c() : mStateMgr(*this) {} virtual ~dAcDemoNpcBird_c() {} STATE_FUNC_DECLARE(dAcDemoNpcBird_c, Hide); diff --git a/include/d/a/d_a_fly_slb.h b/include/d/a/d_a_fly_slb.h index f6821bb0..c10d3ec0 100644 --- a/include/d/a/d_a_fly_slb.h +++ b/include/d/a/d_a_fly_slb.h @@ -3,11 +3,10 @@ #include "d/a/obj/d_a_obj_base.h" #include "s/s_State.hpp" -#include "s/s_StateMgr.hpp" class dAcFlySlb_c : public dAcObjBase_c { public: - dAcFlySlb_c() : mStateMgr(*this, sStateID::null) {} + dAcFlySlb_c() : mStateMgr(*this) {} virtual ~dAcFlySlb_c() {} STATE_FUNC_DECLARE(dAcFlySlb_c, Fly); diff --git a/include/d/a/d_a_girahimu_sword_beam.h b/include/d/a/d_a_girahimu_sword_beam.h index 41a14965..7f81614c 100644 --- a/include/d/a/d_a_girahimu_sword_beam.h +++ b/include/d/a/d_a_girahimu_sword_beam.h @@ -3,11 +3,10 @@ #include "d/a/obj/d_a_obj_base.h" #include "s/s_State.hpp" -#include "s/s_StateMgr.hpp" class dAcGirahimuSwordBeam_c : public dAcObjBase_c { public: - dAcGirahimuSwordBeam_c() : mStateMgr(*this, sStateID::null) {} + dAcGirahimuSwordBeam_c() : mStateMgr(*this) {} virtual ~dAcGirahimuSwordBeam_c() {} STATE_FUNC_DECLARE(dAcGirahimuSwordBeam_c, BulletMove); diff --git a/include/d/a/d_a_heartf.h b/include/d/a/d_a_heartf.h index bfeaa51a..9ca63f18 100644 --- a/include/d/a/d_a_heartf.h +++ b/include/d/a/d_a_heartf.h @@ -3,11 +3,10 @@ #include "d/a/obj/d_a_obj_base.h" #include "s/s_State.hpp" -#include "s/s_StateMgr.hpp" class dAcHeartf_c : public dAcObjBase_c { public: - dAcHeartf_c() : mStateMgr(*this, sStateID::null) {} + dAcHeartf_c() : mStateMgr(*this) {} virtual ~dAcHeartf_c() {} STATE_FUNC_DECLARE(dAcHeartf_c, Wait); diff --git a/include/d/a/d_a_hidory_fire.h b/include/d/a/d_a_hidory_fire.h index 5795db97..7bfeb9ab 100644 --- a/include/d/a/d_a_hidory_fire.h +++ b/include/d/a/d_a_hidory_fire.h @@ -3,11 +3,10 @@ #include "d/a/obj/d_a_obj_base.h" #include "s/s_State.hpp" -#include "s/s_StateMgr.hpp" class dAcHidoryFire_c : public dAcObjBase_c { public: - dAcHidoryFire_c() : mStateMgr(*this, sStateID::null) {} + dAcHidoryFire_c() : mStateMgr(*this) {} virtual ~dAcHidoryFire_c() {} STATE_FUNC_DECLARE(dAcHidoryFire_c, BulletMove); diff --git a/include/d/a/d_a_insect_ant.h b/include/d/a/d_a_insect_ant.h index 32e982ea..8d7e3d97 100644 --- a/include/d/a/d_a_insect_ant.h +++ b/include/d/a/d_a_insect_ant.h @@ -3,11 +3,10 @@ #include "d/a/obj/d_a_obj_base.h" #include "s/s_State.hpp" -#include "s/s_StateMgr.hpp" class dAcInsectAnt_c : public dAcObjBase_c { public: - dAcInsectAnt_c() : mStateMgr(*this, sStateID::null) {} + dAcInsectAnt_c() : mStateMgr(*this) {} virtual ~dAcInsectAnt_c() {} STATE_FUNC_DECLARE(dAcInsectAnt_c, Wait); diff --git a/include/d/a/d_a_insect_beetle.h b/include/d/a/d_a_insect_beetle.h index 84515a90..a1a82400 100644 --- a/include/d/a/d_a_insect_beetle.h +++ b/include/d/a/d_a_insect_beetle.h @@ -3,11 +3,10 @@ #include "d/a/obj/d_a_obj_base.h" #include "s/s_State.hpp" -#include "s/s_StateMgr.hpp" class dAcInsectBeetle_c : public dAcObjBase_c { public: - dAcInsectBeetle_c() : mStateMgr(*this, sStateID::null) {} + dAcInsectBeetle_c() : mStateMgr(*this) {} virtual ~dAcInsectBeetle_c() {} STATE_FUNC_DECLARE(dAcInsectBeetle_c, Wait); diff --git a/include/d/a/d_a_insect_butterfly.h b/include/d/a/d_a_insect_butterfly.h index 14ccfd5d..3905c973 100644 --- a/include/d/a/d_a_insect_butterfly.h +++ b/include/d/a/d_a_insect_butterfly.h @@ -3,12 +3,11 @@ #include "d/a/obj/d_a_obj_base.h" #include "s/s_State.hpp" -#include "s/s_StateMgr.hpp" #include "d/a/d_a_insect.h" class dAcInsectButterfly_c : public dAcOInsect_c { public: - dAcInsectButterfly_c() : mStateMgr(*this, sStateID::null) {} + dAcInsectButterfly_c() : mStateMgr(*this) {} virtual ~dAcInsectButterfly_c() {} STATE_FUNC_DECLARE(dAcInsectButterfly_c, Move); diff --git a/include/d/a/d_a_insect_cicada.h b/include/d/a/d_a_insect_cicada.h index 9166ff4c..b4750566 100644 --- a/include/d/a/d_a_insect_cicada.h +++ b/include/d/a/d_a_insect_cicada.h @@ -3,11 +3,10 @@ #include "d/a/obj/d_a_obj_base.h" #include "s/s_State.hpp" -#include "s/s_StateMgr.hpp" class dAcInsectCicada_c : public dAcObjBase_c { public: - dAcInsectCicada_c() : mStateMgr(*this, sStateID::null) {} + dAcInsectCicada_c() : mStateMgr(*this) {} virtual ~dAcInsectCicada_c() {} STATE_FUNC_DECLARE(dAcInsectCicada_c, Wait); diff --git a/include/d/a/d_a_insect_dragonfly.h b/include/d/a/d_a_insect_dragonfly.h index 0f5c9572..afa73d80 100644 --- a/include/d/a/d_a_insect_dragonfly.h +++ b/include/d/a/d_a_insect_dragonfly.h @@ -3,11 +3,10 @@ #include "d/a/obj/d_a_obj_base.h" #include "s/s_State.hpp" -#include "s/s_StateMgr.hpp" class dAcInsectDragonfly_c : public dAcObjBase_c { public: - dAcInsectDragonfly_c() : mStateMgr(*this, sStateID::null) {} + dAcInsectDragonfly_c() : mStateMgr(*this) {} virtual ~dAcInsectDragonfly_c() {} STATE_FUNC_DECLARE(dAcInsectDragonfly_c, Wait); diff --git a/include/d/a/d_a_insect_firefly.h b/include/d/a/d_a_insect_firefly.h index b03af30d..2c3fe3a2 100644 --- a/include/d/a/d_a_insect_firefly.h +++ b/include/d/a/d_a_insect_firefly.h @@ -3,11 +3,10 @@ #include "d/a/obj/d_a_obj_base.h" #include "s/s_State.hpp" -#include "s/s_StateMgr.hpp" class dAcInsectFirefly_c : public dAcObjBase_c { public: - dAcInsectFirefly_c() : mStateMgr(*this, sStateID::null) {} + dAcInsectFirefly_c() : mStateMgr(*this) {} virtual ~dAcInsectFirefly_c() {} STATE_FUNC_DECLARE(dAcInsectFirefly_c, Move); diff --git a/include/d/a/d_a_insect_grasshopper.h b/include/d/a/d_a_insect_grasshopper.h index 43e83645..f7d9be53 100644 --- a/include/d/a/d_a_insect_grasshopper.h +++ b/include/d/a/d_a_insect_grasshopper.h @@ -3,11 +3,10 @@ #include "d/a/obj/d_a_obj_base.h" #include "s/s_State.hpp" -#include "s/s_StateMgr.hpp" class dAcInsectGrasshopper_c : public dAcObjBase_c { public: - dAcInsectGrasshopper_c() : mStateMgr(*this, sStateID::null) {} + dAcInsectGrasshopper_c() : mStateMgr(*this) {} virtual ~dAcInsectGrasshopper_c() {} STATE_FUNC_DECLARE(dAcInsectGrasshopper_c, Wait); diff --git a/include/d/a/d_a_insect_ladybug.h b/include/d/a/d_a_insect_ladybug.h index de272be4..9406374a 100644 --- a/include/d/a/d_a_insect_ladybug.h +++ b/include/d/a/d_a_insect_ladybug.h @@ -3,11 +3,10 @@ #include "d/a/obj/d_a_obj_base.h" #include "s/s_State.hpp" -#include "s/s_StateMgr.hpp" class dAcInsectLadybug_c : public dAcObjBase_c { public: - dAcInsectLadybug_c() : mStateMgr(*this, sStateID::null) {} + dAcInsectLadybug_c() : mStateMgr(*this) {} virtual ~dAcInsectLadybug_c() {} STATE_FUNC_DECLARE(dAcInsectLadybug_c, Wait); diff --git a/include/d/a/d_a_insect_scarab.h b/include/d/a/d_a_insect_scarab.h index a91229b1..bea7a145 100644 --- a/include/d/a/d_a_insect_scarab.h +++ b/include/d/a/d_a_insect_scarab.h @@ -3,11 +3,10 @@ #include "d/a/obj/d_a_obj_base.h" #include "s/s_State.hpp" -#include "s/s_StateMgr.hpp" class dAcInsectScarab_c : public dAcObjBase_c { public: - dAcInsectScarab_c() : mStateMgr(*this, sStateID::null) {} + dAcInsectScarab_c() : mStateMgr(*this) {} virtual ~dAcInsectScarab_c() {} STATE_FUNC_DECLARE(dAcInsectScarab_c, Wait); diff --git a/include/d/a/d_a_invisible.h b/include/d/a/d_a_invisible.h index b29c0b47..2591343f 100644 --- a/include/d/a/d_a_invisible.h +++ b/include/d/a/d_a_invisible.h @@ -8,7 +8,7 @@ class dAcInvisible : public dAcObjBase_c { public: - dAcInvisible() : mStateMgr(*this, sStateID::null) {} + dAcInvisible() : mStateMgr(*this) {} virtual ~dAcInvisible() {} virtual int create() override; diff --git a/include/d/a/d_a_kanban.h b/include/d/a/d_a_kanban.h index a50a31c2..6e1a900e 100644 --- a/include/d/a/d_a_kanban.h +++ b/include/d/a/d_a_kanban.h @@ -3,7 +3,6 @@ #include "d/a/obj/d_a_obj_base.h" #include "s/s_State.hpp" -#include "s/s_StateMgr.hpp" class dAcKanban_c : public dAcObjBase_c { public: diff --git a/include/d/a/d_a_knight_leader_bird.h b/include/d/a/d_a_knight_leader_bird.h index 461f2001..4844ba19 100644 --- a/include/d/a/d_a_knight_leader_bird.h +++ b/include/d/a/d_a_knight_leader_bird.h @@ -9,7 +9,7 @@ class dAcKnightLeaderBird_c : public dAcBirdBase_c { public: - dAcKnightLeaderBird_c() : mStateMgr(*this, sStateID::null) {} + dAcKnightLeaderBird_c() : mStateMgr(*this) {} virtual ~dAcKnightLeaderBird_c() {} virtual bool createHeap() override; diff --git a/include/d/a/d_a_little_bird.h b/include/d/a/d_a_little_bird.h index ed70796b..5c0d4b25 100644 --- a/include/d/a/d_a_little_bird.h +++ b/include/d/a/d_a_little_bird.h @@ -3,11 +3,10 @@ #include "d/a/obj/d_a_obj_base.h" #include "s/s_State.hpp" -#include "s/s_StateMgr.hpp" class dAcLittleBird_c : public dAcObjBase_c { public: - dAcLittleBird_c() : mStateMgr(*this, sStateID::null) {} + dAcLittleBird_c() : mStateMgr(*this) {} virtual ~dAcLittleBird_c() {} STATE_FUNC_DECLARE(dAcLittleBird_c, Init); diff --git a/include/d/a/d_a_little_bird_mgr.h b/include/d/a/d_a_little_bird_mgr.h index e45b4a80..9705b1f4 100644 --- a/include/d/a/d_a_little_bird_mgr.h +++ b/include/d/a/d_a_little_bird_mgr.h @@ -3,11 +3,10 @@ #include "d/a/d_a_base.h" #include "s/s_State.hpp" -#include "s/s_StateMgr.hpp" class dAcLittleBirdMgr_c : public dAcBase_c { public: - dAcLittleBirdMgr_c() : mStateMgr(*this, sStateID::null) {} + dAcLittleBirdMgr_c() : mStateMgr(*this) {} virtual ~dAcLittleBirdMgr_c() {} STATE_FUNC_DECLARE(dAcLittleBirdMgr_c, Set); diff --git a/include/d/a/d_a_morita_test.h b/include/d/a/d_a_morita_test.h index 1592234f..f9780f66 100644 --- a/include/d/a/d_a_morita_test.h +++ b/include/d/a/d_a_morita_test.h @@ -3,11 +3,10 @@ #include "d/a/e/d_a_en_base.h" #include "s/s_State.hpp" -#include "s/s_StateMgr.hpp" class dAcJtest_c : public dAcEnBase_c { public: - dAcJtest_c() : mStateMgr(*this, sStateID::null) {} + dAcJtest_c() : mStateMgr(*this) {} virtual ~dAcJtest_c() {} STATE_FUNC_DECLARE(dAcJtest_c, FishNormalSwim); diff --git a/include/d/a/d_a_nusi_base.h b/include/d/a/d_a_nusi_base.h index bbee3685..e14ce6a8 100644 --- a/include/d/a/d_a_nusi_base.h +++ b/include/d/a/d_a_nusi_base.h @@ -3,11 +3,10 @@ #include "d/a/e/d_a_en_base.h" #include "s/s_State.hpp" -#include "s/s_StateMgr.hpp" class dAcNusiBase_c : public dAcEnBase_c { public: - dAcNusiBase_c() : mStateMgr(*this, sStateID::null) {} + dAcNusiBase_c() : mStateMgr(*this) {} virtual ~dAcNusiBase_c() {} private: diff --git a/include/d/a/d_a_nusi_npc.h b/include/d/a/d_a_nusi_npc.h index 1af40b00..0ace178b 100644 --- a/include/d/a/d_a_nusi_npc.h +++ b/include/d/a/d_a_nusi_npc.h @@ -3,11 +3,10 @@ #include "d/a/e/d_a_en_base.h" #include "s/s_State.hpp" -#include "s/s_StateMgr.hpp" class dAcNusiNpc_c : public dAcEnBase_c { public: - dAcNusiNpc_c() : mStateMgr(*this, sStateID::null) {} + dAcNusiNpc_c() : mStateMgr(*this) {} virtual ~dAcNusiNpc_c() {} private: diff --git a/include/d/a/d_a_or_cannon_bullet.h b/include/d/a/d_a_or_cannon_bullet.h index 10eb8c83..4322bc2d 100644 --- a/include/d/a/d_a_or_cannon_bullet.h +++ b/include/d/a/d_a_or_cannon_bullet.h @@ -3,11 +3,10 @@ #include "d/a/obj/d_a_obj_base.h" #include "s/s_State.hpp" -#include "s/s_StateMgr.hpp" class dAcOrCannBullet_c : public dAcObjBase_c { public: - dAcOrCannBullet_c() : mStateMgr(*this, sStateID::null) {} + dAcOrCannBullet_c() : mStateMgr(*this) {} virtual ~dAcOrCannBullet_c() {} STATE_FUNC_DECLARE(dAcOrCannBullet_c, Wait); diff --git a/include/d/a/d_a_pumpkin.h b/include/d/a/d_a_pumpkin.h index f28d678d..f4247c6e 100644 --- a/include/d/a/d_a_pumpkin.h +++ b/include/d/a/d_a_pumpkin.h @@ -3,11 +3,10 @@ #include "d/a/obj/d_a_obj_base.h" #include "s/s_State.hpp" -#include "s/s_StateMgr.hpp" class dAcPumpkin_c : public dAcObjBase_c { public: - dAcPumpkin_c() : mStateMgr(*this, sStateID::null) {} + dAcPumpkin_c() : mStateMgr(*this) {} virtual ~dAcPumpkin_c() {} STATE_FUNC_DECLARE(dAcPumpkin_c, Stick); diff --git a/include/d/a/d_a_shop_sample.h b/include/d/a/d_a_shop_sample.h index 73f3b001..54110248 100644 --- a/include/d/a/d_a_shop_sample.h +++ b/include/d/a/d_a_shop_sample.h @@ -3,11 +3,10 @@ #include "d/a/obj/d_a_obj_base.h" #include "s/s_State.hpp" -#include "s/s_StateMgr.hpp" class dAcShopSample_c : public dAcObjBase_c { public: - dAcShopSample_c() : mStateMgr(*this, sStateID::null) {} + dAcShopSample_c() : mStateMgr(*this) {} virtual ~dAcShopSample_c() {} STATE_FUNC_DECLARE(dAcShopSample_c, Wait); diff --git a/include/d/a/d_a_t_wood_area.h b/include/d/a/d_a_t_wood_area.h index a964d342..b9059435 100644 --- a/include/d/a/d_a_t_wood_area.h +++ b/include/d/a/d_a_t_wood_area.h @@ -4,11 +4,10 @@ #include "d/a/obj/d_a_obj_base.h" #include "f/f_list_nd.h" #include "s/s_State.hpp" -#include "s/s_StateMgr.hpp" class dAcTWoodArea_c : public dAcObjBase_c { public: - dAcTWoodArea_c() : mStateMgr(*this, sStateID::null) {} + dAcTWoodArea_c() : mStateMgr(*this) {} virtual ~dAcTWoodArea_c() {} virtual int actorCreate() override; virtual int actorPostCreate() override; diff --git a/include/d/a/e/d_a_e_am.h b/include/d/a/e/d_a_e_am.h index 655500aa..a4590984 100644 --- a/include/d/a/e/d_a_e_am.h +++ b/include/d/a/e/d_a_e_am.h @@ -3,11 +3,10 @@ #include "d/a/e/d_a_en_base.h" #include "s/s_State.hpp" -#include "s/s_StateMgr.hpp" class dAcEAm_c : public dAcEnBase_c { public: - dAcEAm_c() : mStateMgr(*this, sStateID::null) {} + dAcEAm_c() : mStateMgr(*this) {} virtual ~dAcEAm_c() {} STATE_FUNC_DECLARE(dAcEAm_c, Stop); diff --git a/include/d/a/e/d_a_e_battleshipfish.h b/include/d/a/e/d_a_e_battleshipfish.h index 1a086d2f..637499ad 100644 --- a/include/d/a/e/d_a_e_battleshipfish.h +++ b/include/d/a/e/d_a_e_battleshipfish.h @@ -3,11 +3,10 @@ #include "d/a/e/d_a_en_base.h" #include "s/s_State.hpp" -#include "s/s_StateMgr.hpp" class dAcEbfish_c : public dAcEnBase_c { public: - dAcEbfish_c() : mStateMgr(*this, sStateID::null) {} + dAcEbfish_c() : mStateMgr(*this) {} virtual ~dAcEbfish_c() {} STATE_FUNC_DECLARE(dAcEbfish_c, Wait); diff --git a/include/d/a/e/d_a_e_bc.h b/include/d/a/e/d_a_e_bc.h index 950e74ad..520aa7d9 100644 --- a/include/d/a/e/d_a_e_bc.h +++ b/include/d/a/e/d_a_e_bc.h @@ -3,11 +3,10 @@ #include "d/a/e/d_a_en_base.h" #include "s/s_State.hpp" -#include "s/s_StateMgr.hpp" class dAcEbc_c : public dAcEnBase_c { public: - dAcEbc_c() : mStateMgr(*this, sStateID::null) {} + dAcEbc_c() : mStateMgr(*this) {} virtual ~dAcEbc_c() {} STATE_FUNC_DECLARE(dAcEbc_c, Standby); diff --git a/include/d/a/e/d_a_e_bc_arrow.h b/include/d/a/e/d_a_e_bc_arrow.h index 35d2ec49..3fda4463 100644 --- a/include/d/a/e/d_a_e_bc_arrow.h +++ b/include/d/a/e/d_a_e_bc_arrow.h @@ -3,11 +3,10 @@ #include "d/a/e/d_a_en_base.h" #include "s/s_State.hpp" -#include "s/s_StateMgr.hpp" class dAcEbcarrow_c : public dAcEnBase_c { public: - dAcEbcarrow_c() : mStateMgr(*this, sStateID::null) {} + dAcEbcarrow_c() : mStateMgr(*this) {} virtual ~dAcEbcarrow_c() {} STATE_FUNC_DECLARE(dAcEbcarrow_c, Move); diff --git a/include/d/a/e/d_a_e_bcal.h b/include/d/a/e/d_a_e_bcal.h index 2195909e..fc47c528 100644 --- a/include/d/a/e/d_a_e_bcal.h +++ b/include/d/a/e/d_a_e_bcal.h @@ -3,11 +3,10 @@ #include "d/a/e/d_a_en_base.h" #include "s/s_State.hpp" -#include "s/s_StateMgr.hpp" class dAcEbcaL_c : public dAcEnBase_c { public: - dAcEbcaL_c() : mStateMgr(*this, sStateID::null) {} + dAcEbcaL_c() : mStateMgr(*this) {} virtual ~dAcEbcaL_c() {} STATE_FUNC_DECLARE(dAcEbcaL_c, Standby); diff --git a/include/d/a/e/d_a_e_bcal_arrow.h b/include/d/a/e/d_a_e_bcal_arrow.h index dc4000f2..72f4a225 100644 --- a/include/d/a/e/d_a_e_bcal_arrow.h +++ b/include/d/a/e/d_a_e_bcal_arrow.h @@ -3,11 +3,10 @@ #include "d/a/e/d_a_en_base.h" #include "s/s_State.hpp" -#include "s/s_StateMgr.hpp" class dAcEbcalarrow_c : public dAcEnBase_c { public: - dAcEbcalarrow_c() : mStateMgr(*this, sStateID::null) {} + dAcEbcalarrow_c() : mStateMgr(*this) {} virtual ~dAcEbcalarrow_c() {} STATE_FUNC_DECLARE(dAcEbcalarrow_c, Move); diff --git a/include/d/a/e/d_a_e_bce.h b/include/d/a/e/d_a_e_bce.h index 02e13f4e..8de3b894 100644 --- a/include/d/a/e/d_a_e_bce.h +++ b/include/d/a/e/d_a_e_bce.h @@ -3,11 +3,10 @@ #include "d/a/e/d_a_en_base.h" #include "s/s_State.hpp" -#include "s/s_StateMgr.hpp" class dAcEbce_c : public dAcEnBase_c { public: - dAcEbce_c() : mStateMgr(*this, sStateID::null) {} + dAcEbce_c() : mStateMgr(*this) {} virtual ~dAcEbce_c() {} STATE_FUNC_DECLARE(dAcEbce_c, Standby); diff --git a/include/d/a/e/d_a_e_bcz.h b/include/d/a/e/d_a_e_bcz.h index bcaec44c..81d78cfa 100644 --- a/include/d/a/e/d_a_e_bcz.h +++ b/include/d/a/e/d_a_e_bcz.h @@ -3,11 +3,10 @@ #include "d/a/e/d_a_en_base.h" #include "s/s_State.hpp" -#include "s/s_StateMgr.hpp" class dAcEBcZ_c : public dAcEnBase_c { public: - dAcEBcZ_c() : mStateMgr(*this, sStateID::null) {} + dAcEBcZ_c() : mStateMgr(*this) {} virtual ~dAcEBcZ_c() {} STATE_FUNC_DECLARE(dAcEBcZ_c, Arise); diff --git a/include/d/a/e/d_a_e_beamos.h b/include/d/a/e/d_a_e_beamos.h index 24b887e9..a31064d8 100644 --- a/include/d/a/e/d_a_e_beamos.h +++ b/include/d/a/e/d_a_e_beamos.h @@ -3,11 +3,10 @@ #include "d/a/e/d_a_en_base.h" #include "s/s_State.hpp" -#include "s/s_StateMgr.hpp" class dAcEbeamos : public dAcEnBase_c { public: - dAcEbeamos() : mStateMgr(*this, sStateID::null) {} + dAcEbeamos() : mStateMgr(*this) {} virtual ~dAcEbeamos() {} STATE_FUNC_DECLARE(dAcEbeamos, Attack); diff --git a/include/d/a/e/d_a_e_bs.h b/include/d/a/e/d_a_e_bs.h index 575313c6..5cc7a418 100644 --- a/include/d/a/e/d_a_e_bs.h +++ b/include/d/a/e/d_a_e_bs.h @@ -3,11 +3,10 @@ #include "d/a/e/d_a_en_base.h" #include "s/s_State.hpp" -#include "s/s_StateMgr.hpp" class dAcEbs_c : public dAcEnBase_c { public: - dAcEbs_c() : mStateMgr(*this, sStateID::null) {} + dAcEbs_c() : mStateMgr(*this) {} virtual ~dAcEbs_c() {} STATE_FUNC_DECLARE(dAcEbs_c, Standby); diff --git a/include/d/a/e/d_a_e_captain.h b/include/d/a/e/d_a_e_captain.h index a868bbb8..72cd3632 100644 --- a/include/d/a/e/d_a_e_captain.h +++ b/include/d/a/e/d_a_e_captain.h @@ -3,11 +3,10 @@ #include "d/a/e/d_a_en_base.h" #include "s/s_State.hpp" -#include "s/s_StateMgr.hpp" class dAcEcaptain_c : public dAcEnBase_c { public: - dAcEcaptain_c() : mStateMgr(*this, sStateID::null) {} + dAcEcaptain_c() : mStateMgr(*this) {} virtual ~dAcEcaptain_c() {} STATE_FUNC_DECLARE(dAcEcaptain_c, Opening); diff --git a/include/d/a/e/d_a_e_chaser_b.h b/include/d/a/e/d_a_e_chaser_b.h index b749e0b5..53c0b5c3 100644 --- a/include/d/a/e/d_a_e_chaser_b.h +++ b/include/d/a/e/d_a_e_chaser_b.h @@ -3,11 +3,10 @@ #include "d/a/e/d_a_en_base.h" #include "s/s_State.hpp" -#include "s/s_StateMgr.hpp" class dAcEChb_c : public dAcEnBase_c { public: - dAcEChb_c() : mStateMgr(*this, sStateID::null) {} + dAcEChb_c() : mStateMgr(*this) {} virtual ~dAcEChb_c() {} STATE_FUNC_DECLARE(dAcEChb_c, Standby); diff --git a/include/d/a/e/d_a_e_eye.h b/include/d/a/e/d_a_e_eye.h index 8814dd31..6f79435d 100644 --- a/include/d/a/e/d_a_e_eye.h +++ b/include/d/a/e/d_a_e_eye.h @@ -3,11 +3,10 @@ #include "d/a/obj/d_a_obj_base.h" #include "s/s_State.hpp" -#include "s/s_StateMgr.hpp" class dAcEEye_c : public dAcObjBase_c { public: - dAcEEye_c() : mStateMgr(*this, sStateID::null) {} + dAcEEye_c() : mStateMgr(*this) {} virtual ~dAcEEye_c() {} STATE_FUNC_DECLARE(dAcEEye_c, Open); diff --git a/include/d/a/e/d_a_e_ge.h b/include/d/a/e/d_a_e_ge.h index c97b4a2d..95fa6af0 100644 --- a/include/d/a/e/d_a_e_ge.h +++ b/include/d/a/e/d_a_e_ge.h @@ -3,11 +3,10 @@ #include "d/a/e/d_a_en_base.h" #include "s/s_State.hpp" -#include "s/s_StateMgr.hpp" class dAcEge_c : public dAcEnBase_c { public: - dAcEge_c() : mStateMgr(*this, sStateID::null) {} + dAcEge_c() : mStateMgr(*this) {} virtual ~dAcEge_c() {} STATE_FUNC_DECLARE(dAcEge_c, Wait); diff --git a/include/d/a/e/d_a_e_geko.h b/include/d/a/e/d_a_e_geko.h index b299c1a2..8c21cd3c 100644 --- a/include/d/a/e/d_a_e_geko.h +++ b/include/d/a/e/d_a_e_geko.h @@ -3,11 +3,10 @@ #include "d/a/e/d_a_en_base.h" #include "s/s_State.hpp" -#include "s/s_StateMgr.hpp" class dAcEgeko_c : public dAcEnBase_c { public: - dAcEgeko_c() : mStateMgr(*this, sStateID::null) {} + dAcEgeko_c() : mStateMgr(*this) {} virtual ~dAcEgeko_c() {} STATE_FUNC_DECLARE(dAcEgeko_c, Wait); diff --git a/include/d/a/e/d_a_e_gerock.h b/include/d/a/e/d_a_e_gerock.h index e9dbd27d..0b95df96 100644 --- a/include/d/a/e/d_a_e_gerock.h +++ b/include/d/a/e/d_a_e_gerock.h @@ -3,11 +3,10 @@ #include "d/a/e/d_a_en_base.h" #include "s/s_State.hpp" -#include "s/s_StateMgr.hpp" class dAcEgerock_c : public dAcEnBase_c { public: - dAcEgerock_c() : mStateMgr(*this, sStateID::null) {} + dAcEgerock_c() : mStateMgr(*this) {} virtual ~dAcEgerock_c() {} STATE_FUNC_DECLARE(dAcEgerock_c, Attack); diff --git a/include/d/a/e/d_a_e_gue.h b/include/d/a/e/d_a_e_gue.h index f88a58a6..1c4acdd2 100644 --- a/include/d/a/e/d_a_e_gue.h +++ b/include/d/a/e/d_a_e_gue.h @@ -3,11 +3,10 @@ #include "d/a/e/d_a_en_base.h" #include "s/s_State.hpp" -#include "s/s_StateMgr.hpp" class dAcEgue_c : public dAcEnBase_c { public: - dAcEgue_c() : mStateMgr(*this, sStateID::null) {} + dAcEgue_c() : mStateMgr(*this) {} virtual ~dAcEgue_c() {} STATE_FUNC_DECLARE(dAcEgue_c, Attack); diff --git a/include/d/a/e/d_a_e_gumarm.h b/include/d/a/e/d_a_e_gumarm.h index 249d1f79..db5801a7 100644 --- a/include/d/a/e/d_a_e_gumarm.h +++ b/include/d/a/e/d_a_e_gumarm.h @@ -3,11 +3,10 @@ #include "d/a/e/d_a_en_base.h" #include "s/s_State.hpp" -#include "s/s_StateMgr.hpp" class dAcGumarm_c : public dAcEnBase_c { public: - dAcGumarm_c() : mStateMgr(*this, sStateID::null) {} + dAcGumarm_c() : mStateMgr(*this) {} virtual ~dAcGumarm_c() {} STATE_FUNC_DECLARE(dAcGumarm_c, Hide); diff --git a/include/d/a/e/d_a_e_gunho.h b/include/d/a/e/d_a_e_gunho.h index c9f19a0a..dd5eba7e 100644 --- a/include/d/a/e/d_a_e_gunho.h +++ b/include/d/a/e/d_a_e_gunho.h @@ -3,11 +3,10 @@ #include "d/a/e/d_a_en_base.h" #include "s/s_State.hpp" -#include "s/s_StateMgr.hpp" class dAcEgunho_c : public dAcEnBase_c { public: - dAcEgunho_c() : mStateMgr(*this, sStateID::null) {} + dAcEgunho_c() : mStateMgr(*this) {} virtual ~dAcEgunho_c() {} STATE_FUNC_DECLARE(dAcEgunho_c, OpenClose); diff --git a/include/d/a/e/d_a_e_gunhob.h b/include/d/a/e/d_a_e_gunhob.h index d854828d..45eaa4c2 100644 --- a/include/d/a/e/d_a_e_gunhob.h +++ b/include/d/a/e/d_a_e_gunhob.h @@ -3,11 +3,10 @@ #include "d/a/e/d_a_en_base.h" #include "s/s_State.hpp" -#include "s/s_StateMgr.hpp" class dAcEgunhob_c : public dAcEnBase_c { public: - dAcEgunhob_c() : mStateMgr(*this, sStateID::null) {} + dAcEgunhob_c() : mStateMgr(*this) {} virtual ~dAcEgunhob_c() {} STATE_FUNC_DECLARE(dAcEgunhob_c, BulletMove); diff --git a/include/d/a/e/d_a_e_hb.h b/include/d/a/e/d_a_e_hb.h index ef40a2f0..d1deedc3 100644 --- a/include/d/a/e/d_a_e_hb.h +++ b/include/d/a/e/d_a_e_hb.h @@ -3,11 +3,10 @@ #include "d/a/e/d_a_en_base.h" #include "s/s_State.hpp" -#include "s/s_StateMgr.hpp" class dAcEhb_c : public dAcEnBase_c { public: - dAcEhb_c() : mStateMgr(*this, sStateID::null) {} + dAcEhb_c() : mStateMgr(*this) {} virtual ~dAcEhb_c() {} STATE_FUNC_DECLARE(dAcEhb_c, Under); diff --git a/include/d/a/e/d_a_e_hidokari.h b/include/d/a/e/d_a_e_hidokari.h index c7c20d90..3575e4a6 100644 --- a/include/d/a/e/d_a_e_hidokari.h +++ b/include/d/a/e/d_a_e_hidokari.h @@ -3,11 +3,10 @@ #include "d/a/e/d_a_en_base.h" #include "s/s_State.hpp" -#include "s/s_StateMgr.hpp" class dAcEhidokari_c : public dAcEnBase_c { public: - dAcEhidokari_c() : mStateMgr(*this, sStateID::null) {} + dAcEhidokari_c() : mStateMgr(*this) {} virtual ~dAcEhidokari_c() {} STATE_FUNC_DECLARE(dAcEhidokari_c, Wait); diff --git a/include/d/a/e/d_a_e_hidokaris.h b/include/d/a/e/d_a_e_hidokaris.h index bd0cff48..64eb83aa 100644 --- a/include/d/a/e/d_a_e_hidokaris.h +++ b/include/d/a/e/d_a_e_hidokaris.h @@ -3,11 +3,10 @@ #include "d/a/obj/d_a_obj_base.h" #include "s/s_State.hpp" -#include "s/s_StateMgr.hpp" class dAcEhidokaris_c : public dAcObjBase_c { public: - dAcEhidokaris_c() : mStateMgr(*this, sStateID::null) {} + dAcEhidokaris_c() : mStateMgr(*this) {} virtual ~dAcEhidokaris_c() {} STATE_FUNC_DECLARE(dAcEhidokaris_c, Wait); diff --git a/include/d/a/e/d_a_e_hidory.h b/include/d/a/e/d_a_e_hidory.h index be270dc8..e3fa980b 100644 --- a/include/d/a/e/d_a_e_hidory.h +++ b/include/d/a/e/d_a_e_hidory.h @@ -3,11 +3,10 @@ #include "d/a/e/d_a_en_base.h" #include "s/s_State.hpp" -#include "s/s_StateMgr.hpp" class dAcEHidory_c : public dAcEnBase_c { public: - dAcEHidory_c() : mStateMgr(*this, sStateID::null) {} + dAcEHidory_c() : mStateMgr(*this) {} virtual ~dAcEHidory_c() {} STATE_FUNC_DECLARE(dAcEHidory_c, Wait); diff --git a/include/d/a/e/d_a_e_hoc.h b/include/d/a/e/d_a_e_hoc.h index a15b44ea..4e589215 100644 --- a/include/d/a/e/d_a_e_hoc.h +++ b/include/d/a/e/d_a_e_hoc.h @@ -3,11 +3,10 @@ #include "d/a/e/d_a_en_base.h" #include "s/s_State.hpp" -#include "s/s_StateMgr.hpp" class dAcEhoc_c : public dAcEnBase_c { public: - dAcEhoc_c() : mStateMgr(*this, sStateID::null) {} + dAcEhoc_c() : mStateMgr(*this) {} virtual ~dAcEhoc_c() {} STATE_FUNC_DECLARE(dAcEhoc_c, Fight); diff --git a/include/d/a/e/d_a_e_hp.h b/include/d/a/e/d_a_e_hp.h index dd8bdc5c..feeb16da 100644 --- a/include/d/a/e/d_a_e_hp.h +++ b/include/d/a/e/d_a_e_hp.h @@ -3,11 +3,10 @@ #include "d/a/e/d_a_en_base.h" #include "s/s_State.hpp" -#include "s/s_StateMgr.hpp" class dAcEHp_c : public dAcEnBase_c { public: - dAcEHp_c() : mStateMgr(*this, sStateID::null) {} + dAcEHp_c() : mStateMgr(*this) {} virtual ~dAcEHp_c() {} STATE_FUNC_DECLARE(dAcEHp_c, BobUpAndDown); diff --git a/include/d/a/e/d_a_e_hydra.h b/include/d/a/e/d_a_e_hydra.h index b59c68c1..e19ecbb3 100644 --- a/include/d/a/e/d_a_e_hydra.h +++ b/include/d/a/e/d_a_e_hydra.h @@ -3,11 +3,10 @@ #include "d/a/e/d_a_en_base.h" #include "s/s_State.hpp" -#include "s/s_StateMgr.hpp" class dAcEhydra_c : public dAcEnBase_c { public: - dAcEhydra_c() : mStateMgr(*this, sStateID::null) {} + dAcEhydra_c() : mStateMgr(*this) {} virtual ~dAcEhydra_c() {} STATE_FUNC_DECLARE(dAcEhydra_c, Wait); diff --git a/include/d/a/e/d_a_e_kg.h b/include/d/a/e/d_a_e_kg.h index 658d48bd..276d0a40 100644 --- a/include/d/a/e/d_a_e_kg.h +++ b/include/d/a/e/d_a_e_kg.h @@ -3,11 +3,10 @@ #include "d/a/e/d_a_en_base.h" #include "s/s_State.hpp" -#include "s/s_StateMgr.hpp" class dAcEkg_c : public dAcEnBase_c { public: - dAcEkg_c() : mStateMgr(*this, sStateID::null) {} + dAcEkg_c() : mStateMgr(*this) {} virtual ~dAcEkg_c() {} STATE_FUNC_DECLARE(dAcEkg_c, Wait); diff --git a/include/d/a/e/d_a_e_ks.h b/include/d/a/e/d_a_e_ks.h index 2c92b881..73fbc269 100644 --- a/include/d/a/e/d_a_e_ks.h +++ b/include/d/a/e/d_a_e_ks.h @@ -3,11 +3,10 @@ #include "d/a/e/d_a_en_base.h" #include "s/s_State.hpp" -#include "s/s_StateMgr.hpp" class dAcEKs_c : public dAcEnBase_c { public: - dAcEKs_c() : mStateMgr(*this, sStateID::null) {} + dAcEKs_c() : mStateMgr(*this) {} virtual ~dAcEKs_c() {} STATE_FUNC_DECLARE(dAcEKs_c, Wait); diff --git a/include/d/a/e/d_a_e_kumite_gira.h b/include/d/a/e/d_a_e_kumite_gira.h index ea6dfbe6..bfb8250e 100644 --- a/include/d/a/e/d_a_e_kumite_gira.h +++ b/include/d/a/e/d_a_e_kumite_gira.h @@ -3,11 +3,10 @@ #include "d/a/e/d_a_en_base.h" #include "s/s_State.hpp" -#include "s/s_StateMgr.hpp" class dAcEKumiteGira_c : public dAcEnBase_c { public: - dAcEKumiteGira_c() : mStateMgr(*this, sStateID::null) {} + dAcEKumiteGira_c() : mStateMgr(*this) {} virtual ~dAcEKumiteGira_c() {} STATE_FUNC_DECLARE(dAcEKumiteGira_c, Wait); diff --git a/include/d/a/e/d_a_e_liza_tail.h b/include/d/a/e/d_a_e_liza_tail.h index 1d5e9ce0..68bc3ad0 100644 --- a/include/d/a/e/d_a_e_liza_tail.h +++ b/include/d/a/e/d_a_e_liza_tail.h @@ -3,11 +3,10 @@ #include "d/a/e/d_a_en_base.h" #include "s/s_State.hpp" -#include "s/s_StateMgr.hpp" class dAcEliza_tail_c : public dAcEnBase_c { public: - dAcEliza_tail_c() : mStateMgr(*this, sStateID::null) {} + dAcEliza_tail_c() : mStateMgr(*this) {} virtual ~dAcEliza_tail_c() {} STATE_FUNC_DECLARE(dAcEliza_tail_c, Wait); diff --git a/include/d/a/e/d_a_e_lizarufos.h b/include/d/a/e/d_a_e_lizarufos.h index 21c5cc07..e9a5f327 100644 --- a/include/d/a/e/d_a_e_lizarufos.h +++ b/include/d/a/e/d_a_e_lizarufos.h @@ -3,11 +3,10 @@ #include "d/a/e/d_a_en_base.h" #include "s/s_State.hpp" -#include "s/s_StateMgr.hpp" class dAcELizarufos_c : public dAcEnBase_c { public: - dAcELizarufos_c() : mStateMgr(*this, sStateID::null) {} + dAcELizarufos_c() : mStateMgr(*this) {} virtual ~dAcELizarufos_c() {} STATE_FUNC_DECLARE(dAcELizarufos_c, Demo); diff --git a/include/d/a/e/d_a_e_magma.h b/include/d/a/e/d_a_e_magma.h index 4d128667..d99a7294 100644 --- a/include/d/a/e/d_a_e_magma.h +++ b/include/d/a/e/d_a_e_magma.h @@ -3,11 +3,10 @@ #include "d/a/obj/d_a_obj_base.h" #include "s/s_State.hpp" -#include "s/s_StateMgr.hpp" class dAcEmagma_c : public dAcObjBase_c { public: - dAcEmagma_c() : mStateMgr(*this, sStateID::null) {} + dAcEmagma_c() : mStateMgr(*this) {} virtual ~dAcEmagma_c() {} STATE_FUNC_DECLARE(dAcEmagma_c, Birth); diff --git a/include/d/a/e/d_a_e_maguppo.h b/include/d/a/e/d_a_e_maguppo.h index 2263f1ac..75736b16 100644 --- a/include/d/a/e/d_a_e_maguppo.h +++ b/include/d/a/e/d_a_e_maguppo.h @@ -3,11 +3,10 @@ #include "d/a/e/d_a_en_base.h" #include "s/s_State.hpp" -#include "s/s_StateMgr.hpp" class dAcEmaguppo_c : public dAcEnBase_c { public: - dAcEmaguppo_c() : mStateMgr(*this, sStateID::null) {} + dAcEmaguppo_c() : mStateMgr(*this) {} virtual ~dAcEmaguppo_c() {} STATE_FUNC_DECLARE(dAcEmaguppo_c, Attack); diff --git a/include/d/a/e/d_a_e_mr.h b/include/d/a/e/d_a_e_mr.h index ca7649f5..a26f0353 100644 --- a/include/d/a/e/d_a_e_mr.h +++ b/include/d/a/e/d_a_e_mr.h @@ -3,11 +3,10 @@ #include "d/a/e/d_a_en_base.h" #include "s/s_State.hpp" -#include "s/s_StateMgr.hpp" class dAcEmr_c : public dAcEnBase_c { public: - dAcEmr_c() : mStateMgr(*this, sStateID::null) {} + dAcEmr_c() : mStateMgr(*this) {} virtual ~dAcEmr_c() {} STATE_FUNC_DECLARE(dAcEmr_c, Wait); diff --git a/include/d/a/e/d_a_e_mr_shield.h b/include/d/a/e/d_a_e_mr_shield.h index 8bd559aa..8771c82d 100644 --- a/include/d/a/e/d_a_e_mr_shield.h +++ b/include/d/a/e/d_a_e_mr_shield.h @@ -3,11 +3,10 @@ #include "d/a/e/d_a_en_base.h" #include "s/s_State.hpp" -#include "s/s_StateMgr.hpp" class dAcE_Mr_Shield_c : public dAcEnBase_c { public: - dAcE_Mr_Shield_c() : mStateMgr(*this, sStateID::null) {} + dAcE_Mr_Shield_c() : mStateMgr(*this) {} virtual ~dAcE_Mr_Shield_c() {} STATE_FUNC_DECLARE(dAcE_Mr_Shield_c, Move); diff --git a/include/d/a/e/d_a_e_oc.h b/include/d/a/e/d_a_e_oc.h index f4e3e007..d01844a0 100644 --- a/include/d/a/e/d_a_e_oc.h +++ b/include/d/a/e/d_a_e_oc.h @@ -3,11 +3,10 @@ #include "d/a/e/d_a_en_base.h" #include "s/s_State.hpp" -#include "s/s_StateMgr.hpp" class dAcEoc_c : public dAcEnBase_c { public: - dAcEoc_c() : mStateMgr(*this, sStateID::null) {} + dAcEoc_c() : mStateMgr(*this) {} virtual ~dAcEoc_c() {} STATE_FUNC_DECLARE(dAcEoc_c, Wait); diff --git a/include/d/a/e/d_a_e_or.h b/include/d/a/e/d_a_e_or.h index 363c0ef0..222f225d 100644 --- a/include/d/a/e/d_a_e_or.h +++ b/include/d/a/e/d_a_e_or.h @@ -3,11 +3,10 @@ #include "d/a/e/d_a_en_base.h" #include "s/s_State.hpp" -#include "s/s_StateMgr.hpp" class dAcEor_c : public dAcEnBase_c { public: - dAcEor_c() : mStateMgr(*this, sStateID::null) {} + dAcEor_c() : mStateMgr(*this) {} virtual ~dAcEor_c() {} STATE_FUNC_DECLARE(dAcEor_c, Wait); diff --git a/include/d/a/e/d_a_e_or_cannon.h b/include/d/a/e/d_a_e_or_cannon.h index 10619b94..d48107c7 100644 --- a/include/d/a/e/d_a_e_or_cannon.h +++ b/include/d/a/e/d_a_e_or_cannon.h @@ -3,11 +3,10 @@ #include "d/a/e/d_a_en_base.h" #include "s/s_State.hpp" -#include "s/s_StateMgr.hpp" class dAcEorCannon_c : public dAcEnBase_c { public: - dAcEorCannon_c() : mStateMgr(*this, sStateID::null) {} + dAcEorCannon_c() : mStateMgr(*this) {} virtual ~dAcEorCannon_c() {} STATE_FUNC_DECLARE(dAcEorCannon_c, Wait); diff --git a/include/d/a/e/d_a_e_ph.h b/include/d/a/e/d_a_e_ph.h index 6af35a8a..d29ffc28 100644 --- a/include/d/a/e/d_a_e_ph.h +++ b/include/d/a/e/d_a_e_ph.h @@ -3,11 +3,10 @@ #include "d/a/e/d_a_en_base.h" #include "s/s_State.hpp" -#include "s/s_StateMgr.hpp" class dAcEPh_c : public dAcEnBase_c { public: - dAcEPh_c() : mStateMgr(*this, sStateID::null) {} + dAcEPh_c() : mStateMgr(*this) {} virtual ~dAcEPh_c() {} STATE_FUNC_DECLARE(dAcEPh_c, Stop); diff --git a/include/d/a/e/d_a_e_po.h b/include/d/a/e/d_a_e_po.h index fe1b26a4..a2f034c5 100644 --- a/include/d/a/e/d_a_e_po.h +++ b/include/d/a/e/d_a_e_po.h @@ -3,11 +3,10 @@ #include "d/a/e/d_a_en_base.h" #include "s/s_State.hpp" -#include "s/s_StateMgr.hpp" class dAcEPo_c : public dAcEnBase_c { public: - dAcEPo_c() : mStateMgr(*this, sStateID::null) {} + dAcEPo_c() : mStateMgr(*this) {} virtual ~dAcEPo_c() {} STATE_FUNC_DECLARE(dAcEPo_c, Stop); diff --git a/include/d/a/e/d_a_e_remly.h b/include/d/a/e/d_a_e_remly.h index 74b9375d..c958e582 100644 --- a/include/d/a/e/d_a_e_remly.h +++ b/include/d/a/e/d_a_e_remly.h @@ -3,11 +3,10 @@ #include "d/a/e/d_a_en_base.h" #include "s/s_State.hpp" -#include "s/s_StateMgr.hpp" class dAcEremly_c : public dAcEnBase_c { public: - dAcEremly_c() : mStateMgr(*this, sStateID::null) {} + dAcEremly_c() : mStateMgr(*this) {} virtual ~dAcEremly_c() {} STATE_FUNC_DECLARE(dAcEremly_c, Wait); diff --git a/include/d/a/e/d_a_e_rupee_gue.h b/include/d/a/e/d_a_e_rupee_gue.h index 9a204c94..d43d7aa7 100644 --- a/include/d/a/e/d_a_e_rupee_gue.h +++ b/include/d/a/e/d_a_e_rupee_gue.h @@ -3,11 +3,10 @@ #include "d/a/e/d_a_en_base.h" #include "s/s_State.hpp" -#include "s/s_StateMgr.hpp" class dAcErupeeGue_c : public dAcEnBase_c { public: - dAcErupeeGue_c() : mStateMgr(*this, sStateID::null) {} + dAcErupeeGue_c() : mStateMgr(*this) {} virtual ~dAcErupeeGue_c() {} STATE_FUNC_DECLARE(dAcErupeeGue_c, Wait); diff --git a/include/d/a/e/d_a_e_sf.h b/include/d/a/e/d_a_e_sf.h index f285e02e..5ec2cdf7 100644 --- a/include/d/a/e/d_a_e_sf.h +++ b/include/d/a/e/d_a_e_sf.h @@ -3,11 +3,10 @@ #include "d/a/e/d_a_en_base.h" #include "s/s_State.hpp" -#include "s/s_StateMgr.hpp" class dAcEsf_c : public dAcEnBase_c { public: - dAcEsf_c() : mStateMgr(*this, sStateID::null) {} + dAcEsf_c() : mStateMgr(*this) {} virtual ~dAcEsf_c() {} STATE_FUNC_DECLARE(dAcEsf_c, Standby); diff --git a/include/d/a/e/d_a_e_sf4.h b/include/d/a/e/d_a_e_sf4.h index 3560c1a2..2f874cd5 100644 --- a/include/d/a/e/d_a_e_sf4.h +++ b/include/d/a/e/d_a_e_sf4.h @@ -3,11 +3,10 @@ #include "d/a/e/d_a_en_base.h" #include "s/s_State.hpp" -#include "s/s_StateMgr.hpp" class dAcEsf4_c : public dAcEnBase_c { public: - dAcEsf4_c() : mStateMgr(*this, sStateID::null) {} + dAcEsf4_c() : mStateMgr(*this) {} virtual ~dAcEsf4_c() {} STATE_FUNC_DECLARE(dAcEsf4_c, Standby); diff --git a/include/d/a/e/d_a_e_siren.h b/include/d/a/e/d_a_e_siren.h index aaf05db2..34c52731 100644 --- a/include/d/a/e/d_a_e_siren.h +++ b/include/d/a/e/d_a_e_siren.h @@ -3,11 +3,10 @@ #include "d/a/e/d_a_en_base.h" #include "s/s_State.hpp" -#include "s/s_StateMgr.hpp" class dAcESiren_c : public dAcEnBase_c { public: - dAcESiren_c() : mStateMgr(*this, sStateID::null) {} + dAcESiren_c() : mStateMgr(*this) {} virtual ~dAcESiren_c() {} STATE_FUNC_DECLARE(dAcESiren_c, Wait); diff --git a/include/d/a/e/d_a_e_skytail.h b/include/d/a/e/d_a_e_skytail.h index 1ebe879b..dea260dd 100644 --- a/include/d/a/e/d_a_e_skytail.h +++ b/include/d/a/e/d_a_e_skytail.h @@ -3,11 +3,10 @@ #include "d/a/e/d_a_en_base.h" #include "s/s_State.hpp" -#include "s/s_StateMgr.hpp" class dAcESkytail_c : public dAcEnBase_c { public: - dAcESkytail_c() : mStateMgr(*this, sStateID::null) {} + dAcESkytail_c() : mStateMgr(*this) {} virtual ~dAcESkytail_c() {} STATE_FUNC_DECLARE(dAcESkytail_c, RandomMove); diff --git a/include/d/a/e/d_a_e_sm.h b/include/d/a/e/d_a_e_sm.h index aa365022..bc0e05e1 100644 --- a/include/d/a/e/d_a_e_sm.h +++ b/include/d/a/e/d_a_e_sm.h @@ -46,7 +46,7 @@ public: }; public: - dAcEsm_c() : mScnCallback(this), mStateMgr(*this, sStateID::null) {} + dAcEsm_c() : mScnCallback(this), mStateMgr(*this) {} virtual ~dAcEsm_c() {} virtual int doDelete(); virtual int draw(); diff --git a/include/d/a/e/d_a_e_spark.h b/include/d/a/e/d_a_e_spark.h index 1fd92add..700a13d1 100644 --- a/include/d/a/e/d_a_e_spark.h +++ b/include/d/a/e/d_a_e_spark.h @@ -3,11 +3,10 @@ #include "d/a/e/d_a_en_base.h" #include "s/s_State.hpp" -#include "s/s_StateMgr.hpp" class dAcEspark_c : public dAcEnBase_c { public: - dAcEspark_c() : mStateMgr(*this, sStateID::null) {} + dAcEspark_c() : mStateMgr(*this) {} virtual ~dAcEspark_c() {} STATE_FUNC_DECLARE(dAcEspark_c, Wait); diff --git a/include/d/a/e/d_a_e_st.h b/include/d/a/e/d_a_e_st.h index a35e502d..3ac6f3ff 100644 --- a/include/d/a/e/d_a_e_st.h +++ b/include/d/a/e/d_a_e_st.h @@ -3,11 +3,10 @@ #include "d/a/e/d_a_en_base.h" #include "s/s_State.hpp" -#include "s/s_StateMgr.hpp" class dAcEst_c : public dAcEnBase_c { public: - dAcEst_c() : mStateMgr(*this, sStateID::null) {} + dAcEst_c() : mStateMgr(*this) {} virtual ~dAcEst_c() {} STATE_FUNC_DECLARE(dAcEst_c, Home); diff --git a/include/d/a/e/d_a_e_st_wire.h b/include/d/a/e/d_a_e_st_wire.h index 3c8e75c3..631dc4be 100644 --- a/include/d/a/e/d_a_e_st_wire.h +++ b/include/d/a/e/d_a_e_st_wire.h @@ -3,11 +3,10 @@ #include "d/a/e/d_a_en_base.h" #include "s/s_State.hpp" -#include "s/s_StateMgr.hpp" class dAcEstwire_c : public dAcEnBase_c { public: - dAcEstwire_c() : mStateMgr(*this, sStateID::null) {} + dAcEstwire_c() : mStateMgr(*this) {} virtual ~dAcEstwire_c() {} STATE_FUNC_DECLARE(dAcEstwire_c, Shoot); diff --git a/include/d/a/e/d_a_e_syakomaito.h b/include/d/a/e/d_a_e_syakomaito.h index ad31ad45..0a92123c 100644 --- a/include/d/a/e/d_a_e_syakomaito.h +++ b/include/d/a/e/d_a_e_syakomaito.h @@ -3,11 +3,10 @@ #include "d/a/e/d_a_en_base.h" #include "s/s_State.hpp" -#include "s/s_StateMgr.hpp" class dAcESyakomaito_c : public dAcEnBase_c { public: - dAcESyakomaito_c() : mStateMgr(*this, sStateID::null) {} + dAcESyakomaito_c() : mStateMgr(*this) {} virtual ~dAcESyakomaito_c() {} STATE_FUNC_DECLARE(dAcESyakomaito_c, Wait); diff --git a/include/d/a/e/d_a_e_tn2.h b/include/d/a/e/d_a_e_tn2.h index 3a9269b4..8675abf0 100644 --- a/include/d/a/e/d_a_e_tn2.h +++ b/include/d/a/e/d_a_e_tn2.h @@ -3,11 +3,10 @@ #include "d/a/e/d_a_en_base.h" #include "s/s_State.hpp" -#include "s/s_StateMgr.hpp" class dAcEtn2_c : public dAcEnBase_c { public: - dAcEtn2_c() : mStateMgr(*this, sStateID::null) {} + dAcEtn2_c() : mStateMgr(*this) {} virtual ~dAcEtn2_c() {} STATE_FUNC_DECLARE(dAcEtn2_c, ArmorAttack); diff --git a/include/d/a/e/d_a_e_ws.h b/include/d/a/e/d_a_e_ws.h index 6080f034..fe15ad91 100644 --- a/include/d/a/e/d_a_e_ws.h +++ b/include/d/a/e/d_a_e_ws.h @@ -3,11 +3,10 @@ #include "d/a/e/d_a_en_base.h" #include "s/s_State.hpp" -#include "s/s_StateMgr.hpp" class dAcEws_c : public dAcEnBase_c { public: - dAcEws_c() : mStateMgr(*this, sStateID::null) {} + dAcEws_c() : mStateMgr(*this) {} virtual ~dAcEws_c() {} STATE_FUNC_DECLARE(dAcEws_c, Wait); diff --git a/include/d/a/e/d_a_en_base.h b/include/d/a/e/d_a_en_base.h index 10cb60d1..328992a1 100644 --- a/include/d/a/e/d_a_en_base.h +++ b/include/d/a/e/d_a_en_base.h @@ -4,6 +4,7 @@ #include "common.h" #include "d/a/obj/d_a_obj_base.h" #include "d/a/obj/d_a_obj_bomb.h" +#include "d/d_cc.h" #include "m/m_angle.h" #include "m/m_vec.h" @@ -15,10 +16,22 @@ struct dAcEnData { // size: // non-official name class dAcEnBase_c : public dAcObjBase_c { +public: + enum InteractionFlags_e { + INTERACT_0x1 = (1 << 0), + INTERACT_0x4 = (1 << 2), + INTERACT_0x40 = (1 << 6), + INTERACT_0x1000 = (1 << 12), + }; + public: dAcEnBase_c(); virtual ~dAcEnBase_c(); + virtual int preExecute() override; + virtual void postExecute(MAIN_STATE_e state) override; + virtual int preDraw() override; + virtual void *getObjectListEntry() override { return &mEnemyLink; } @@ -36,7 +49,9 @@ public: /* 0x33C */ u32 mInteractionFlags; /* 0x340 */ u16 field_0x338; /* 0x342 */ u16 mHealth; - /* 0x344 */ u8 _344[0x374 - 0x344]; + /* 0x344 */ u8 _344[0x358 - 0x344]; + /* 0x358 */ mVec3_c mFinalBlowPosition; + /* 0x364 */ u8 _364[0x374 - 0x364]; /* 0x374 */ dAcEnData *mpEnemyData; bool checkInteractionFlags(u32 mask) { @@ -62,6 +77,8 @@ public: void fn_80030700(); void fn_80030c20(u32 flags, f32, f32, f32, f32); + s32 someEnemyDamageCollisionStuffMaybe(dColliderLinkedList &list, u16 *pOutFlags); + bool ChkCrossPlayer(f32 height); protected: diff --git a/include/d/a/npc/d_a_npc_akumakun.h b/include/d/a/npc/d_a_npc_akumakun.h index 6c2e69f7..4bfec82c 100644 --- a/include/d/a/npc/d_a_npc_akumakun.h +++ b/include/d/a/npc/d_a_npc_akumakun.h @@ -3,11 +3,10 @@ #include "d/a/npc/d_a_npc.h" #include "s/s_State.hpp" -#include "s/s_StateMgr.hpp" class dAcNpcAkumakun_c : public dAcNpc_c { public: - dAcNpcAkumakun_c() : mStateMgr(*this, sStateID::null) {} + dAcNpcAkumakun_c() : mStateMgr(*this) {} virtual ~dAcNpcAkumakun_c() {} private: diff --git a/include/d/a/npc/d_a_npc_aqua_dragon.h b/include/d/a/npc/d_a_npc_aqua_dragon.h index 1a69bf6e..ab4b533b 100644 --- a/include/d/a/npc/d_a_npc_aqua_dragon.h +++ b/include/d/a/npc/d_a_npc_aqua_dragon.h @@ -3,11 +3,10 @@ #include "d/a/npc/d_a_npc.h" #include "s/s_State.hpp" -#include "s/s_StateMgr.hpp" class dAcNpcAdr_c : public dAcNpc_c { public: - dAcNpcAdr_c() : mStateMgr(*this, sStateID::null) {} + dAcNpcAdr_c() : mStateMgr(*this) {} virtual ~dAcNpcAdr_c() {} private: diff --git a/include/d/a/npc/d_a_npc_azukariya_night.h b/include/d/a/npc/d_a_npc_azukariya_night.h index da407a5b..32940500 100644 --- a/include/d/a/npc/d_a_npc_azukariya_night.h +++ b/include/d/a/npc/d_a_npc_azukariya_night.h @@ -3,11 +3,10 @@ #include "d/a/npc/d_a_npc.h" #include "s/s_State.hpp" -#include "s/s_StateMgr.hpp" class dAcNpcAzukariyaNight_c : public dAcNpc_c { public: - dAcNpcAzukariyaNight_c() : mStateMgr(*this, sStateID::null) {} + dAcNpcAzukariyaNight_c() : mStateMgr(*this) {} virtual ~dAcNpcAzukariyaNight_c() {} private: diff --git a/include/d/a/npc/d_a_npc_bamboo_goron.h b/include/d/a/npc/d_a_npc_bamboo_goron.h index 9a0636e7..5f81f992 100644 --- a/include/d/a/npc/d_a_npc_bamboo_goron.h +++ b/include/d/a/npc/d_a_npc_bamboo_goron.h @@ -3,11 +3,10 @@ #include "d/a/npc/d_a_npc.h" #include "s/s_State.hpp" -#include "s/s_StateMgr.hpp" class dAcNpcBgr_c : public dAcNpc_c { public: - dAcNpcBgr_c() : mStateMgr(*this, sStateID::null) {} + dAcNpcBgr_c() : mStateMgr(*this) {} virtual ~dAcNpcBgr_c() {} private: diff --git a/include/d/a/npc/d_a_npc_bbrvl.h b/include/d/a/npc/d_a_npc_bbrvl.h index 3d66c67c..e01d1fbb 100644 --- a/include/d/a/npc/d_a_npc_bbrvl.h +++ b/include/d/a/npc/d_a_npc_bbrvl.h @@ -3,11 +3,10 @@ #include "d/a/npc/d_a_npc.h" #include "s/s_State.hpp" -#include "s/s_StateMgr.hpp" class dAcNpcBBRvl_c : public dAcNpc_c { public: - dAcNpcBBRvl_c() : mStateMgr(*this, sStateID::null) {} + dAcNpcBBRvl_c() : mStateMgr(*this) {} virtual ~dAcNpcBBRvl_c() {} private: diff --git a/include/d/a/npc/d_a_npc_bird.h b/include/d/a/npc/d_a_npc_bird.h index 66d06012..29e31f1a 100644 --- a/include/d/a/npc/d_a_npc_bird.h +++ b/include/d/a/npc/d_a_npc_bird.h @@ -3,11 +3,10 @@ #include "d/a/obj/d_a_obj_base.h" #include "s/s_State.hpp" -#include "s/s_StateMgr.hpp" class dNpc_Bird_c : public dAcObjBase_c { public: - dNpc_Bird_c() : mStateMgr(*this, sStateID::null) {} + dNpc_Bird_c() : mStateMgr(*this) {} virtual ~dNpc_Bird_c() {} STATE_FUNC_DECLARE(dNpc_Bird_c, Wait); diff --git a/include/d/a/npc/d_a_npc_bird_sowoman.h b/include/d/a/npc/d_a_npc_bird_sowoman.h index 9bd86fc3..72d4d3e9 100644 --- a/include/d/a/npc/d_a_npc_bird_sowoman.h +++ b/include/d/a/npc/d_a_npc_bird_sowoman.h @@ -3,11 +3,10 @@ #include "d/a/obj/d_a_obj_base.h" #include "s/s_State.hpp" -#include "s/s_StateMgr.hpp" class dAcNpcBdsw_c : public dAcObjBase_c { public: - dAcNpcBdsw_c() : mStateMgr(*this, sStateID::null) {} + dAcNpcBdsw_c() : mStateMgr(*this) {} virtual ~dAcNpcBdsw_c() {} STATE_FUNC_DECLARE(dAcNpcBdsw_c, Wait); diff --git a/include/d/a/npc/d_a_npc_bird_zelda.h b/include/d/a/npc/d_a_npc_bird_zelda.h index 09433fe8..e0d00c1c 100644 --- a/include/d/a/npc/d_a_npc_bird_zelda.h +++ b/include/d/a/npc/d_a_npc_bird_zelda.h @@ -3,11 +3,10 @@ #include "d/a/obj/d_a_obj_base.h" #include "s/s_State.hpp" -#include "s/s_StateMgr.hpp" class dAcNpcBdz_c : public dAcObjBase_c { public: - dAcNpcBdz_c() : mStateMgr(*this, sStateID::null) {} + dAcNpcBdz_c() : mStateMgr(*this) {} virtual ~dAcNpcBdz_c() {} STATE_FUNC_DECLARE(dAcNpcBdz_c, Wait); diff --git a/include/d/a/npc/d_a_npc_ce_friend.h b/include/d/a/npc/d_a_npc_ce_friend.h index a5a5f5d6..1dd66772 100644 --- a/include/d/a/npc/d_a_npc_ce_friend.h +++ b/include/d/a/npc/d_a_npc_ce_friend.h @@ -4,11 +4,10 @@ #include "d/a/npc/d_a_npc.h" #include "d/col/c/c_cc_d.h" #include "s/s_State.hpp" -#include "s/s_StateMgr.hpp" class dAcNpcCeFriend_c : public dAcNpc_c { public: - dAcNpcCeFriend_c() : mStateMgr(*this, sStateID::null) {} + dAcNpcCeFriend_c() : mStateMgr(*this) {} virtual ~dAcNpcCeFriend_c() {} bool fn_11_17C0(dAcObjBase_c *); diff --git a/include/d/a/npc/d_a_npc_ce_lady.h b/include/d/a/npc/d_a_npc_ce_lady.h index 4afd9267..8497d356 100644 --- a/include/d/a/npc/d_a_npc_ce_lady.h +++ b/include/d/a/npc/d_a_npc_ce_lady.h @@ -4,11 +4,10 @@ #include "d/a/npc/d_a_npc.h" #include "d/col/c/c_cc_d.h" #include "s/s_State.hpp" -#include "s/s_StateMgr.hpp" class dAcNpcCeLady_c : public dAcNpc_c { public: - dAcNpcCeLady_c() : mStateMgr(*this, sStateID::null) {} + dAcNpcCeLady_c() : mStateMgr(*this) {} virtual ~dAcNpcCeLady_c() {} bool fn_12_1C20(dAcObjBase_c *); diff --git a/include/d/a/npc/d_a_npc_desertrobot.h b/include/d/a/npc/d_a_npc_desertrobot.h index 095a713a..2d5a9f07 100644 --- a/include/d/a/npc/d_a_npc_desertrobot.h +++ b/include/d/a/npc/d_a_npc_desertrobot.h @@ -3,11 +3,10 @@ #include "d/a/npc/d_a_npc.h" #include "s/s_State.hpp" -#include "s/s_StateMgr.hpp" class dAcNpcDrb_c : public dAcNpc_c { public: - dAcNpcDrb_c() : mStateMgr(*this, sStateID::null) {} + dAcNpcDrb_c() : mStateMgr(*this) {} virtual ~dAcNpcDrb_c() {} private: diff --git a/include/d/a/npc/d_a_npc_desertrobot_captain.h b/include/d/a/npc/d_a_npc_desertrobot_captain.h index ac5f2e8c..9ccbf9a0 100644 --- a/include/d/a/npc/d_a_npc_desertrobot_captain.h +++ b/include/d/a/npc/d_a_npc_desertrobot_captain.h @@ -3,11 +3,10 @@ #include "d/a/npc/d_a_npc.h" #include "s/s_State.hpp" -#include "s/s_StateMgr.hpp" class dAcNpcDrbC_c : public dAcNpc_c { public: - dAcNpcDrbC_c() : mStateMgr(*this, sStateID::null) {} + dAcNpcDrbC_c() : mStateMgr(*this) {} virtual ~dAcNpcDrbC_c() {} private: diff --git a/include/d/a/npc/d_a_npc_dive_game_judge.h b/include/d/a/npc/d_a_npc_dive_game_judge.h index 3428ee4f..b069857f 100644 --- a/include/d/a/npc/d_a_npc_dive_game_judge.h +++ b/include/d/a/npc/d_a_npc_dive_game_judge.h @@ -3,11 +3,10 @@ #include "d/a/npc/d_a_npc.h" #include "s/s_State.hpp" -#include "s/s_StateMgr.hpp" class dAcNpcDiveGameJudge_c : public dAcNpc_c { public: - dAcNpcDiveGameJudge_c() : mStateMgr(*this, sStateID::null) {} + dAcNpcDiveGameJudge_c() : mStateMgr(*this) {} virtual ~dAcNpcDiveGameJudge_c() {} STATE_FUNC_DECLARE(dAcNpcDiveGameJudge_c, Sad); diff --git a/include/d/a/npc/d_a_npc_fire_dragon.h b/include/d/a/npc/d_a_npc_fire_dragon.h index ac86689d..d1eb3c2a 100644 --- a/include/d/a/npc/d_a_npc_fire_dragon.h +++ b/include/d/a/npc/d_a_npc_fire_dragon.h @@ -3,11 +3,10 @@ #include "d/a/npc/d_a_npc.h" #include "s/s_State.hpp" -#include "s/s_StateMgr.hpp" class dAcNpcFdr_c : public dAcNpc_c { public: - dAcNpcFdr_c() : mStateMgr(*this, sStateID::null) {} + dAcNpcFdr_c() : mStateMgr(*this) {} virtual ~dAcNpcFdr_c() {} private: diff --git a/include/d/a/npc/d_a_npc_goddess_zelda.h b/include/d/a/npc/d_a_npc_goddess_zelda.h index 45ed454c..84c38be9 100644 --- a/include/d/a/npc/d_a_npc_goddess_zelda.h +++ b/include/d/a/npc/d_a_npc_goddess_zelda.h @@ -3,11 +3,10 @@ #include "d/a/npc/d_a_npc.h" #include "s/s_State.hpp" -#include "s/s_StateMgr.hpp" class dAcNpcGzl_c : public dAcNpc_c { public: - dAcNpcGzl_c() : mStateMgr(*this, sStateID::null) {} + dAcNpcGzl_c() : mStateMgr(*this) {} virtual ~dAcNpcGzl_c() {} private: diff --git a/include/d/a/npc/d_a_npc_gra.h b/include/d/a/npc/d_a_npc_gra.h index d52941be..584b36d1 100644 --- a/include/d/a/npc/d_a_npc_gra.h +++ b/include/d/a/npc/d_a_npc_gra.h @@ -3,11 +3,10 @@ #include "d/a/npc/d_a_npc.h" #include "s/s_State.hpp" -#include "s/s_StateMgr.hpp" class dAcNpcGra_c : public dAcNpc_c { public: - dAcNpcGra_c() : mStateMgr(*this, sStateID::null) {} + dAcNpcGra_c() : mStateMgr(*this) {} virtual ~dAcNpcGra_c() {} private: diff --git a/include/d/a/npc/d_a_npc_grc.h b/include/d/a/npc/d_a_npc_grc.h index e54c5da6..098447b0 100644 --- a/include/d/a/npc/d_a_npc_grc.h +++ b/include/d/a/npc/d_a_npc_grc.h @@ -3,11 +3,10 @@ #include "d/a/npc/d_a_npc.h" #include "s/s_State.hpp" -#include "s/s_StateMgr.hpp" class dAcNpcGrc_c : public dAcNpc_c { public: - dAcNpcGrc_c() : mStateMgr(*this, sStateID::null) {} + dAcNpcGrc_c() : mStateMgr(*this) {} virtual ~dAcNpcGrc_c() {} private: diff --git a/include/d/a/npc/d_a_npc_insect_capture_game_kobun.h b/include/d/a/npc/d_a_npc_insect_capture_game_kobun.h index f352035a..ffec4454 100644 --- a/include/d/a/npc/d_a_npc_insect_capture_game_kobun.h +++ b/include/d/a/npc/d_a_npc_insect_capture_game_kobun.h @@ -3,11 +3,10 @@ #include "d/a/npc/d_a_npc.h" #include "s/s_State.hpp" -#include "s/s_StateMgr.hpp" class dAcNpcIcgKobun_c : public dAcNpc_c { public: - dAcNpcIcgKobun_c() : mStateMgr(*this, sStateID::null) {} + dAcNpcIcgKobun_c() : mStateMgr(*this) {} virtual ~dAcNpcIcgKobun_c() {} private: diff --git a/include/d/a/npc/d_a_npc_junk_night.h b/include/d/a/npc/d_a_npc_junk_night.h index bf3f7476..3c02fab6 100644 --- a/include/d/a/npc/d_a_npc_junk_night.h +++ b/include/d/a/npc/d_a_npc_junk_night.h @@ -3,11 +3,10 @@ #include "d/a/npc/d_a_npc.h" #include "s/s_State.hpp" -#include "s/s_StateMgr.hpp" class dAcNpcJunkNight_c : public dAcNpc_c { public: - dAcNpcJunkNight_c() : mStateMgr(*this, sStateID::null) {} + dAcNpcJunkNight_c() : mStateMgr(*this) {} virtual ~dAcNpcJunkNight_c() {} private: diff --git a/include/d/a/npc/d_a_npc_kensei.h b/include/d/a/npc/d_a_npc_kensei.h index 292f8e31..eae99957 100644 --- a/include/d/a/npc/d_a_npc_kensei.h +++ b/include/d/a/npc/d_a_npc_kensei.h @@ -3,11 +3,10 @@ #include "d/a/npc/d_a_npc.h" #include "s/s_State.hpp" -#include "s/s_StateMgr.hpp" class dAcNpcKensei_c : public dAcNpc_c { public: - dAcNpcKensei_c() : mStateMgr(*this, sStateID::null) {} + dAcNpcKensei_c() : mStateMgr(*this) {} virtual ~dAcNpcKensei_c() {} static dAcNpcKensei_c* GetInstance() { diff --git a/include/d/a/npc/d_a_npc_knight_leader.h b/include/d/a/npc/d_a_npc_knight_leader.h index 3c9b5459..d20e701b 100644 --- a/include/d/a/npc/d_a_npc_knight_leader.h +++ b/include/d/a/npc/d_a_npc_knight_leader.h @@ -3,11 +3,10 @@ #include "d/a/npc/d_a_npc.h" #include "s/s_State.hpp" -#include "s/s_StateMgr.hpp" class dAcNpcKnightLeader_c : public dAcNpc_c { public: - dAcNpcKnightLeader_c() : mStateMgr(*this, sStateID::null) {} + dAcNpcKnightLeader_c() : mStateMgr(*this) {} virtual ~dAcNpcKnightLeader_c() {} private: diff --git a/include/d/a/npc/d_a_npc_kobun.h b/include/d/a/npc/d_a_npc_kobun.h index 981bb4b7..6e010831 100644 --- a/include/d/a/npc/d_a_npc_kobun.h +++ b/include/d/a/npc/d_a_npc_kobun.h @@ -3,11 +3,10 @@ #include "d/a/npc/d_a_npc.h" #include "s/s_State.hpp" -#include "s/s_StateMgr.hpp" class dAcNpcKbn_c : public dAcNpc_c { public: - dAcNpcKbn_c() : mStateMgr(*this, sStateID::null) {} + dAcNpcKbn_c() : mStateMgr(*this) {} virtual ~dAcNpcKbn_c() {} STATE_FUNC_DECLARE(dAcNpcKbn_c, RaceInit); diff --git a/include/d/a/npc/d_a_npc_kobun2.h b/include/d/a/npc/d_a_npc_kobun2.h index 460adc7f..336cb212 100644 --- a/include/d/a/npc/d_a_npc_kobun2.h +++ b/include/d/a/npc/d_a_npc_kobun2.h @@ -3,11 +3,10 @@ #include "d/a/npc/d_a_npc.h" #include "s/s_State.hpp" -#include "s/s_StateMgr.hpp" class dAcNpcKbn2_c : public dAcNpc_c { public: - dAcNpcKbn2_c() : mStateMgr(*this, sStateID::null) {} + dAcNpcKbn2_c() : mStateMgr(*this) {} virtual ~dAcNpcKbn2_c() {} STATE_FUNC_DECLARE(dAcNpcKbn2_c, RaceInit); diff --git a/include/d/a/npc/d_a_npc_kyui4.h b/include/d/a/npc/d_a_npc_kyui4.h index 631c2a4a..945b5cf9 100644 --- a/include/d/a/npc/d_a_npc_kyui4.h +++ b/include/d/a/npc/d_a_npc_kyui4.h @@ -3,11 +3,10 @@ #include "d/a/npc/d_a_npc.h" #include "s/s_State.hpp" -#include "s/s_StateMgr.hpp" class dAcNpcKyui4_c : public dAcNpc_c { public: - dAcNpcKyui4_c() : mStateMgr(*this, sStateID::null) {} + dAcNpcKyui4_c() : mStateMgr(*this) {} virtual ~dAcNpcKyui4_c() {} private: diff --git a/include/d/a/npc/d_a_npc_kyui_elder.h b/include/d/a/npc/d_a_npc_kyui_elder.h index 30552eae..e98a340d 100644 --- a/include/d/a/npc/d_a_npc_kyui_elder.h +++ b/include/d/a/npc/d_a_npc_kyui_elder.h @@ -3,11 +3,10 @@ #include "d/a/npc/d_a_npc.h" #include "s/s_State.hpp" -#include "s/s_StateMgr.hpp" class dAcNpcKyuiElder_c : public dAcNpc_c { public: - dAcNpcKyuiElder_c() : mStateMgr(*this, sStateID::null) {} + dAcNpcKyuiElder_c() : mStateMgr(*this) {} virtual ~dAcNpcKyuiElder_c() {} private: diff --git a/include/d/a/npc/d_a_npc_kyui_first.h b/include/d/a/npc/d_a_npc_kyui_first.h index 7f55b400..5b82a63e 100644 --- a/include/d/a/npc/d_a_npc_kyui_first.h +++ b/include/d/a/npc/d_a_npc_kyui_first.h @@ -3,11 +3,10 @@ #include "d/a/npc/d_a_npc.h" #include "s/s_State.hpp" -#include "s/s_StateMgr.hpp" class dAcNpcKyuiFirst_c : public dAcNpc_c { public: - dAcNpcKyuiFirst_c() : mStateMgr(*this, sStateID::null) {} + dAcNpcKyuiFirst_c() : mStateMgr(*this) {} virtual ~dAcNpcKyuiFirst_c() {} STATE_FUNC_DECLARE(dAcNpcKyuiFirst_c, Fear); diff --git a/include/d/a/npc/d_a_npc_kyui_third.h b/include/d/a/npc/d_a_npc_kyui_third.h index 82e3ab7e..e8f15354 100644 --- a/include/d/a/npc/d_a_npc_kyui_third.h +++ b/include/d/a/npc/d_a_npc_kyui_third.h @@ -3,11 +3,10 @@ #include "d/a/npc/d_a_npc.h" #include "s/s_State.hpp" -#include "s/s_StateMgr.hpp" class dAcNpcKyuiThird_c : public dAcNpc_c { public: - dAcNpcKyuiThird_c() : mStateMgr(*this, sStateID::null) {} + dAcNpcKyuiThird_c() : mStateMgr(*this) {} virtual ~dAcNpcKyuiThird_c() {} STATE_FUNC_DECLARE(dAcNpcKyuiThird_c, Wait2); diff --git a/include/d/a/npc/d_a_npc_kyui_wizard.h b/include/d/a/npc/d_a_npc_kyui_wizard.h index 01327c66..5bb6bccb 100644 --- a/include/d/a/npc/d_a_npc_kyui_wizard.h +++ b/include/d/a/npc/d_a_npc_kyui_wizard.h @@ -3,11 +3,10 @@ #include "d/a/npc/d_a_npc.h" #include "s/s_State.hpp" -#include "s/s_StateMgr.hpp" class dAcNpcKyuiWizard_c : public dAcNpc_c { public: - dAcNpcKyuiWizard_c() : mStateMgr(*this, sStateID::null) {} + dAcNpcKyuiWizard_c() : mStateMgr(*this) {} virtual ~dAcNpcKyuiWizard_c() {} STATE_FUNC_DECLARE(dAcNpcKyuiWizard_c, SleepFirst); diff --git a/include/d/a/npc/d_a_npc_mole.h b/include/d/a/npc/d_a_npc_mole.h index 1f1c366d..a70db16c 100644 --- a/include/d/a/npc/d_a_npc_mole.h +++ b/include/d/a/npc/d_a_npc_mole.h @@ -3,11 +3,10 @@ #include "d/a/npc/d_a_npc.h" #include "s/s_State.hpp" -#include "s/s_StateMgr.hpp" class dAcNpcMole_c : public dAcNpc_c { public: - dAcNpcMole_c() : mStateMgr(*this, sStateID::null) {} + dAcNpcMole_c() : mStateMgr(*this) {} virtual ~dAcNpcMole_c() {} private: diff --git a/include/d/a/npc/d_a_npc_mole_elder.h b/include/d/a/npc/d_a_npc_mole_elder.h index a1f6c589..625a12a7 100644 --- a/include/d/a/npc/d_a_npc_mole_elder.h +++ b/include/d/a/npc/d_a_npc_mole_elder.h @@ -3,11 +3,10 @@ #include "d/a/npc/d_a_npc.h" #include "s/s_State.hpp" -#include "s/s_StateMgr.hpp" class dAcNpcMoleElder_c : public dAcNpc_c { public: - dAcNpcMoleElder_c() : mStateMgr(*this, sStateID::null) {} + dAcNpcMoleElder_c() : mStateMgr(*this) {} virtual ~dAcNpcMoleElder_c() {} private: diff --git a/include/d/a/npc/d_a_npc_mole_es_nml.h b/include/d/a/npc/d_a_npc_mole_es_nml.h index 657412be..e85a0403 100644 --- a/include/d/a/npc/d_a_npc_mole_es_nml.h +++ b/include/d/a/npc/d_a_npc_mole_es_nml.h @@ -3,11 +3,10 @@ #include "d/a/npc/d_a_npc.h" #include "s/s_State.hpp" -#include "s/s_StateMgr.hpp" class dAcNpcMoleEsNml_c : public dAcNpc_c { public: - dAcNpcMoleEsNml_c() : mStateMgr(*this, sStateID::null) {} + dAcNpcMoleEsNml_c() : mStateMgr(*this) {} virtual ~dAcNpcMoleEsNml_c() {} private: diff --git a/include/d/a/npc/d_a_npc_mole_mg.h b/include/d/a/npc/d_a_npc_mole_mg.h index 8787d6fa..a33e134c 100644 --- a/include/d/a/npc/d_a_npc_mole_mg.h +++ b/include/d/a/npc/d_a_npc_mole_mg.h @@ -3,11 +3,10 @@ #include "d/a/npc/d_a_npc.h" #include "s/s_State.hpp" -#include "s/s_StateMgr.hpp" class dAcNpcMoleMg_c : public dAcNpc_c { public: - dAcNpcMoleMg_c() : mStateMgr(*this, sStateID::null) {} + dAcNpcMoleMg_c() : mStateMgr(*this) {} virtual ~dAcNpcMoleMg_c() {} STATE_FUNC_DECLARE(dAcNpcMoleMg_c, Result); diff --git a/include/d/a/npc/d_a_npc_mole_normal.h b/include/d/a/npc/d_a_npc_mole_normal.h index 1fbf497a..fb0cfc58 100644 --- a/include/d/a/npc/d_a_npc_mole_normal.h +++ b/include/d/a/npc/d_a_npc_mole_normal.h @@ -3,11 +3,10 @@ #include "d/a/npc/d_a_npc.h" #include "s/s_State.hpp" -#include "s/s_StateMgr.hpp" class NPC_MOLE_NML_CLASS : public dAcNpc_c { public: - NPC_MOLE_NML_CLASS() : mStateMgr(*this, sStateID::null) {} + NPC_MOLE_NML_CLASS() : mStateMgr(*this) {} virtual ~NPC_MOLE_NML_CLASS() {} private: diff --git a/include/d/a/npc/d_a_npc_mole_normal2.h b/include/d/a/npc/d_a_npc_mole_normal2.h index d409b304..3e768188 100644 --- a/include/d/a/npc/d_a_npc_mole_normal2.h +++ b/include/d/a/npc/d_a_npc_mole_normal2.h @@ -3,11 +3,10 @@ #include "d/a/npc/d_a_npc.h" #include "s/s_State.hpp" -#include "s/s_StateMgr.hpp" class NPC_MOLE_NML_CLASS : public dAcNpc_c { public: - NPC_MOLE_NML_CLASS() : mStateMgr(*this, sStateID::null) {} + NPC_MOLE_NML_CLASS() : mStateMgr(*this) {} virtual ~NPC_MOLE_NML_CLASS() {} private: diff --git a/include/d/a/npc/d_a_npc_mole_sal.h b/include/d/a/npc/d_a_npc_mole_sal.h index 31f9d85f..9690872d 100644 --- a/include/d/a/npc/d_a_npc_mole_sal.h +++ b/include/d/a/npc/d_a_npc_mole_sal.h @@ -3,11 +3,10 @@ #include "d/a/npc/d_a_npc.h" #include "s/s_State.hpp" -#include "s/s_StateMgr.hpp" class dAcNpcMoleSal_c : public dAcNpc_c { public: - dAcNpcMoleSal_c() : mStateMgr(*this, sStateID::null) {} + dAcNpcMoleSal_c() : mStateMgr(*this) {} virtual ~dAcNpcMoleSal_c() {} private: diff --git a/include/d/a/npc/d_a_npc_mole_tackle.h b/include/d/a/npc/d_a_npc_mole_tackle.h index e45bb2a6..cf658b45 100644 --- a/include/d/a/npc/d_a_npc_mole_tackle.h +++ b/include/d/a/npc/d_a_npc_mole_tackle.h @@ -3,11 +3,10 @@ #include "d/a/npc/d_a_npc.h" #include "s/s_State.hpp" -#include "s/s_StateMgr.hpp" class dAcNpcMoleTackle_c : public dAcNpc_c { public: - dAcNpcMoleTackle_c() : mStateMgr(*this, sStateID::null) {} + dAcNpcMoleTackle_c() : mStateMgr(*this) {} virtual ~dAcNpcMoleTackle_c() {} private: diff --git a/include/d/a/npc/d_a_npc_mole_tackle2.h b/include/d/a/npc/d_a_npc_mole_tackle2.h index 52bd046a..b2e46f59 100644 --- a/include/d/a/npc/d_a_npc_mole_tackle2.h +++ b/include/d/a/npc/d_a_npc_mole_tackle2.h @@ -3,11 +3,10 @@ #include "d/a/npc/d_a_npc.h" #include "s/s_State.hpp" -#include "s/s_StateMgr.hpp" class dAcNpcMoleTackle2_c : public dAcNpc_c { public: - dAcNpcMoleTackle2_c() : mStateMgr(*this, sStateID::null) {} + dAcNpcMoleTackle2_c() : mStateMgr(*this) {} virtual ~dAcNpcMoleTackle2_c() {} private: diff --git a/include/d/a/npc/d_a_npc_old_impa.h b/include/d/a/npc/d_a_npc_old_impa.h index 38ad1bee..cec10b94 100644 --- a/include/d/a/npc/d_a_npc_old_impa.h +++ b/include/d/a/npc/d_a_npc_old_impa.h @@ -3,11 +3,10 @@ #include "d/a/npc/d_a_npc.h" #include "s/s_State.hpp" -#include "s/s_StateMgr.hpp" class dAcNpcOim_c : public dAcNpc_c { public: - dAcNpcOim_c() : mStateMgr(*this, sStateID::null) {} + dAcNpcOim_c() : mStateMgr(*this) {} virtual ~dAcNpcOim_c() {} private: diff --git a/include/d/a/npc/d_a_npc_ord_kyui.h b/include/d/a/npc/d_a_npc_ord_kyui.h index 6fd9e74e..536d399e 100644 --- a/include/d/a/npc/d_a_npc_ord_kyui.h +++ b/include/d/a/npc/d_a_npc_ord_kyui.h @@ -3,11 +3,10 @@ #include "d/a/npc/d_a_npc.h" #include "s/s_State.hpp" -#include "s/s_StateMgr.hpp" class dAcNpcOrdKyui_c : public dAcNpc_c { public: - dAcNpcOrdKyui_c() : mStateMgr(*this, sStateID::null) {} + dAcNpcOrdKyui_c() : mStateMgr(*this) {} virtual ~dAcNpcOrdKyui_c() {} STATE_FUNC_DECLARE(dAcNpcOrdKyui_c, Hide); diff --git a/include/d/a/npc/d_a_npc_pumpkin_clay_shooting.h b/include/d/a/npc/d_a_npc_pumpkin_clay_shooting.h index 5f1d0509..c0d7a1cd 100644 --- a/include/d/a/npc/d_a_npc_pumpkin_clay_shooting.h +++ b/include/d/a/npc/d_a_npc_pumpkin_clay_shooting.h @@ -3,11 +3,10 @@ #include "d/a/npc/d_a_npc.h" #include "s/s_State.hpp" -#include "s/s_StateMgr.hpp" class dAcNpcPcs_c : public dAcNpc_c { public: - dAcNpcPcs_c() : mStateMgr(*this, sStateID::null) {} + dAcNpcPcs_c() : mStateMgr(*this) {} virtual ~dAcNpcPcs_c() {} private: diff --git a/include/d/a/npc/d_a_npc_pumpkin_daughter.h b/include/d/a/npc/d_a_npc_pumpkin_daughter.h index 3b3436d4..c871c29c 100644 --- a/include/d/a/npc/d_a_npc_pumpkin_daughter.h +++ b/include/d/a/npc/d_a_npc_pumpkin_daughter.h @@ -3,11 +3,10 @@ #include "d/a/npc/d_a_npc.h" #include "s/s_State.hpp" -#include "s/s_StateMgr.hpp" class dAcNpcPdu_c : public dAcNpc_c { public: - dAcNpcPdu_c() : mStateMgr(*this, sStateID::null) {} + dAcNpcPdu_c() : mStateMgr(*this) {} virtual ~dAcNpcPdu_c() {} private: diff --git a/include/d/a/npc/d_a_npc_pumpkin_master.h b/include/d/a/npc/d_a_npc_pumpkin_master.h index 9f81d4fe..281b8886 100644 --- a/include/d/a/npc/d_a_npc_pumpkin_master.h +++ b/include/d/a/npc/d_a_npc_pumpkin_master.h @@ -3,11 +3,10 @@ #include "d/a/npc/d_a_npc.h" #include "s/s_State.hpp" -#include "s/s_StateMgr.hpp" class dAcNpcPma_c : public dAcNpc_c { public: - dAcNpcPma_c() : mStateMgr(*this, sStateID::null) {} + dAcNpcPma_c() : mStateMgr(*this) {} virtual ~dAcNpcPma_c() {} private: diff --git a/include/d/a/npc/d_a_npc_regret_rival.h b/include/d/a/npc/d_a_npc_regret_rival.h index 4fddb084..b15713f0 100644 --- a/include/d/a/npc/d_a_npc_regret_rival.h +++ b/include/d/a/npc/d_a_npc_regret_rival.h @@ -3,11 +3,10 @@ #include "d/a/npc/d_a_npc.h" #include "s/s_State.hpp" -#include "s/s_StateMgr.hpp" class dAcNpcRegretRvl_c : public dAcNpc_c { public: - dAcNpcRegretRvl_c() : mStateMgr(*this, sStateID::null) {} + dAcNpcRegretRvl_c() : mStateMgr(*this) {} virtual ~dAcNpcRegretRvl_c() {} STATE_FUNC_DECLARE(dAcNpcRegretRvl_c, Ready); diff --git a/include/d/a/npc/d_a_npc_rescue.h b/include/d/a/npc/d_a_npc_rescue.h index a7ed919d..e09b46d0 100644 --- a/include/d/a/npc/d_a_npc_rescue.h +++ b/include/d/a/npc/d_a_npc_rescue.h @@ -3,11 +3,10 @@ #include "d/a/obj/d_a_obj_base.h" #include "s/s_State.hpp" -#include "s/s_StateMgr.hpp" class dAcNpcRescue_c : public dAcObjBase_c { public: - dAcNpcRescue_c() : mStateMgr(*this, sStateID::null) {} + dAcNpcRescue_c() : mStateMgr(*this) {} virtual ~dAcNpcRescue_c() {} STATE_FUNC_DECLARE(dAcNpcRescue_c, Wait); diff --git a/include/d/a/npc/d_a_npc_rival.h b/include/d/a/npc/d_a_npc_rival.h index f5126ae1..9f4bb95f 100644 --- a/include/d/a/npc/d_a_npc_rival.h +++ b/include/d/a/npc/d_a_npc_rival.h @@ -3,11 +3,10 @@ #include "d/a/npc/d_a_npc.h" #include "s/s_State.hpp" -#include "s/s_StateMgr.hpp" class dAcNpcRvl_c : public dAcNpc_c { public: - dAcNpcRvl_c() : mStateMgr(*this, sStateID::null) {} + dAcNpcRvl_c() : mStateMgr(*this) {} virtual ~dAcNpcRvl_c() {} STATE_FUNC_DECLARE(dAcNpcRvl_c, RaceInit); diff --git a/include/d/a/npc/d_a_npc_rival_lod.h b/include/d/a/npc/d_a_npc_rival_lod.h index 93b5b92d..1a35faf7 100644 --- a/include/d/a/npc/d_a_npc_rival_lod.h +++ b/include/d/a/npc/d_a_npc_rival_lod.h @@ -9,7 +9,7 @@ class dAcNpcRivalLOD_c : public dAcNpc_c { public: - dAcNpcRivalLOD_c() : mStateMgr(*this, sStateID::null) {} + dAcNpcRivalLOD_c() : mStateMgr(*this) {} virtual ~dAcNpcRivalLOD_c() {} virtual bool createHeap() override; diff --git a/include/d/a/npc/d_a_npc_salbage_morry.h b/include/d/a/npc/d_a_npc_salbage_morry.h index 5470abcd..52bc75ee 100644 --- a/include/d/a/npc/d_a_npc_salbage_morry.h +++ b/include/d/a/npc/d_a_npc_salbage_morry.h @@ -3,11 +3,10 @@ #include "d/a/npc/d_a_npc.h" #include "s/s_State.hpp" -#include "s/s_StateMgr.hpp" class dAcNpcSalbageMorry_c : public dAcNpc_c { public: - dAcNpcSalbageMorry_c() : mStateMgr(*this, sStateID::null) {} + dAcNpcSalbageMorry_c() : mStateMgr(*this) {} virtual ~dAcNpcSalbageMorry_c() {} private: diff --git a/include/d/a/npc/d_a_npc_salbage_robot_fly.h b/include/d/a/npc/d_a_npc_salbage_robot_fly.h index 568ce95a..4d0a346d 100644 --- a/include/d/a/npc/d_a_npc_salbage_robot_fly.h +++ b/include/d/a/npc/d_a_npc_salbage_robot_fly.h @@ -3,11 +3,10 @@ #include "d/a/npc/d_a_npc.h" #include "s/s_State.hpp" -#include "s/s_StateMgr.hpp" class dAcNpcSalbageRobotFly_c : public dAcNpc_c { public: - dAcNpcSalbageRobotFly_c() : mStateMgr(*this, sStateID::null) {} + dAcNpcSalbageRobotFly_c() : mStateMgr(*this) {} virtual ~dAcNpcSalbageRobotFly_c() {} STATE_FUNC_DECLARE(dAcNpcSalbageRobotFly_c, ChasePlayerBird); diff --git a/include/d/a/npc/d_a_npc_salbage_robot_repair.h b/include/d/a/npc/d_a_npc_salbage_robot_repair.h index f0713af5..5c4cc34d 100644 --- a/include/d/a/npc/d_a_npc_salbage_robot_repair.h +++ b/include/d/a/npc/d_a_npc_salbage_robot_repair.h @@ -3,11 +3,10 @@ #include "d/a/npc/d_a_npc.h" #include "s/s_State.hpp" -#include "s/s_StateMgr.hpp" class dAcNpcSalbageRobotRepair_c : public dAcNpc_c { public: - dAcNpcSalbageRobotRepair_c() : mStateMgr(*this, sStateID::null) {} + dAcNpcSalbageRobotRepair_c() : mStateMgr(*this) {} virtual ~dAcNpcSalbageRobotRepair_c() {} private: diff --git a/include/d/a/npc/d_a_npc_salesman_s.h b/include/d/a/npc/d_a_npc_salesman_s.h index 4f02bc73..034a861c 100644 --- a/include/d/a/npc/d_a_npc_salesman_s.h +++ b/include/d/a/npc/d_a_npc_salesman_s.h @@ -3,11 +3,10 @@ #include "d/a/npc/d_a_npc.h" #include "s/s_State.hpp" -#include "s/s_StateMgr.hpp" class dAcNpcSalesmanS_c : public dAcNpc_c { public: - dAcNpcSalesmanS_c() : mStateMgr(*this, sStateID::null) {} + dAcNpcSalesmanS_c() : mStateMgr(*this) {} virtual ~dAcNpcSalesmanS_c() {} private: diff --git a/include/d/a/npc/d_a_npc_senpai.h b/include/d/a/npc/d_a_npc_senpai.h index 63447edb..6efe2811 100644 --- a/include/d/a/npc/d_a_npc_senpai.h +++ b/include/d/a/npc/d_a_npc_senpai.h @@ -3,11 +3,10 @@ #include "d/a/npc/d_a_npc.h" #include "s/s_State.hpp" -#include "s/s_StateMgr.hpp" class dAcNpcSenpai_c : public dAcNpc_c { public: - dAcNpcSenpai_c() : mStateMgr(*this, sStateID::null) {} + dAcNpcSenpai_c() : mStateMgr(*this) {} virtual ~dAcNpcSenpai_c() {} STATE_FUNC_DECLARE(dAcNpcSenpai_c, ReadyWatch1); diff --git a/include/d/a/npc/d_a_npc_senpai_b.h b/include/d/a/npc/d_a_npc_senpai_b.h index 993d1884..dead84c9 100644 --- a/include/d/a/npc/d_a_npc_senpai_b.h +++ b/include/d/a/npc/d_a_npc_senpai_b.h @@ -3,11 +3,10 @@ #include "d/a/npc/d_a_npc.h" #include "s/s_State.hpp" -#include "s/s_StateMgr.hpp" class dAcNpcSenpaiB_c : public dAcNpc_c { public: - dAcNpcSenpaiB_c() : mStateMgr(*this, sStateID::null) {} + dAcNpcSenpaiB_c() : mStateMgr(*this) {} virtual ~dAcNpcSenpaiB_c() {} STATE_FUNC_DECLARE(dAcNpcSenpaiB_c, Think); diff --git a/include/d/a/npc/d_a_npc_shinkan.h b/include/d/a/npc/d_a_npc_shinkan.h index 0edb9458..3870b7fd 100644 --- a/include/d/a/npc/d_a_npc_shinkan.h +++ b/include/d/a/npc/d_a_npc_shinkan.h @@ -3,11 +3,10 @@ #include "d/a/npc/d_a_npc.h" #include "s/s_State.hpp" -#include "s/s_StateMgr.hpp" class dAcNpcSkn_c : public dAcNpc_c { public: - dAcNpcSkn_c() : mStateMgr(*this, sStateID::null) {} + dAcNpcSkn_c() : mStateMgr(*this) {} virtual ~dAcNpcSkn_c() {} STATE_FUNC_DECLARE(dAcNpcSkn_c, RaceWatch); diff --git a/include/d/a/npc/d_a_npc_shinkan2.h b/include/d/a/npc/d_a_npc_shinkan2.h index 1ac19812..ef3f2ab5 100644 --- a/include/d/a/npc/d_a_npc_shinkan2.h +++ b/include/d/a/npc/d_a_npc_shinkan2.h @@ -3,11 +3,10 @@ #include "d/a/npc/d_a_npc.h" #include "s/s_State.hpp" -#include "s/s_StateMgr.hpp" class dAcNpcSkn2_c : public dAcNpc_c { public: - dAcNpcSkn2_c() : mStateMgr(*this, sStateID::null) {} + dAcNpcSkn2_c() : mStateMgr(*this) {} virtual ~dAcNpcSkn2_c() {} STATE_FUNC_DECLARE(dAcNpcSkn2_c, Watch); diff --git a/include/d/a/npc/d_a_npc_sorajima_boy.h b/include/d/a/npc/d_a_npc_sorajima_boy.h index fa0dff0e..35891d85 100644 --- a/include/d/a/npc/d_a_npc_sorajima_boy.h +++ b/include/d/a/npc/d_a_npc_sorajima_boy.h @@ -3,11 +3,10 @@ #include "d/a/npc/d_a_npc.h" #include "s/s_State.hpp" -#include "s/s_StateMgr.hpp" class dAcNpcSorajimaBoy_c : public dAcNpc_c { public: - dAcNpcSorajimaBoy_c() : mStateMgr(*this, sStateID::null) {} + dAcNpcSorajimaBoy_c() : mStateMgr(*this) {} virtual ~dAcNpcSorajimaBoy_c() {} private: diff --git a/include/d/a/npc/d_a_npc_sorajima_father.h b/include/d/a/npc/d_a_npc_sorajima_father.h index b9200bef..8bc18c67 100644 --- a/include/d/a/npc/d_a_npc_sorajima_father.h +++ b/include/d/a/npc/d_a_npc_sorajima_father.h @@ -3,11 +3,10 @@ #include "d/a/npc/d_a_npc.h" #include "s/s_State.hpp" -#include "s/s_StateMgr.hpp" class dAcNpcSorajimaFather_c : public dAcNpc_c { public: - dAcNpcSorajimaFather_c() : mStateMgr(*this, sStateID::null) {} + dAcNpcSorajimaFather_c() : mStateMgr(*this) {} virtual ~dAcNpcSorajimaFather_c() {} private: diff --git a/include/d/a/npc/d_a_npc_sorajima_female.h b/include/d/a/npc/d_a_npc_sorajima_female.h index 89b9d9cb..2543ad58 100644 --- a/include/d/a/npc/d_a_npc_sorajima_female.h +++ b/include/d/a/npc/d_a_npc_sorajima_female.h @@ -3,11 +3,10 @@ #include "d/a/npc/d_a_npc.h" #include "s/s_State.hpp" -#include "s/s_StateMgr.hpp" class dAcNpcSorajimaFemale_c : public dAcNpc_c { public: - dAcNpcSorajimaFemale_c() : mStateMgr(*this, sStateID::null) {} + dAcNpcSorajimaFemale_c() : mStateMgr(*this) {} virtual ~dAcNpcSorajimaFemale_c() {} private: diff --git a/include/d/a/npc/d_a_npc_sorajima_girl.h b/include/d/a/npc/d_a_npc_sorajima_girl.h index 5809f1f5..990a6beb 100644 --- a/include/d/a/npc/d_a_npc_sorajima_girl.h +++ b/include/d/a/npc/d_a_npc_sorajima_girl.h @@ -3,11 +3,10 @@ #include "d/a/npc/d_a_npc.h" #include "s/s_State.hpp" -#include "s/s_StateMgr.hpp" class dAcNpcSorajimaGirl_c : public dAcNpc_c { public: - dAcNpcSorajimaGirl_c() : mStateMgr(*this, sStateID::null) {} + dAcNpcSorajimaGirl_c() : mStateMgr(*this) {} virtual ~dAcNpcSorajimaGirl_c() {} private: diff --git a/include/d/a/npc/d_a_npc_sorajima_male.h b/include/d/a/npc/d_a_npc_sorajima_male.h index 510be1b5..baebbfef 100644 --- a/include/d/a/npc/d_a_npc_sorajima_male.h +++ b/include/d/a/npc/d_a_npc_sorajima_male.h @@ -3,11 +3,10 @@ #include "d/a/npc/d_a_npc.h" #include "s/s_State.hpp" -#include "s/s_StateMgr.hpp" class dAcNpcSorajimaMale_c : public dAcNpc_c { public: - dAcNpcSorajimaMale_c() : mStateMgr(*this, sStateID::null) {} + dAcNpcSorajimaMale_c() : mStateMgr(*this) {} virtual ~dAcNpcSorajimaMale_c() {} private: diff --git a/include/d/a/npc/d_a_npc_sorajima_male2.h b/include/d/a/npc/d_a_npc_sorajima_male2.h index 166977cc..14054208 100644 --- a/include/d/a/npc/d_a_npc_sorajima_male2.h +++ b/include/d/a/npc/d_a_npc_sorajima_male2.h @@ -3,11 +3,10 @@ #include "d/a/npc/d_a_npc.h" #include "s/s_State.hpp" -#include "s/s_StateMgr.hpp" class dAcNpcSma2_c : public dAcNpc_c { public: - dAcNpcSma2_c() : mStateMgr(*this, sStateID::null) {} + dAcNpcSma2_c() : mStateMgr(*this) {} virtual ~dAcNpcSma2_c() {} private: diff --git a/include/d/a/npc/d_a_npc_sorajima_male3.h b/include/d/a/npc/d_a_npc_sorajima_male3.h index ed4bfa8e..cda4abec 100644 --- a/include/d/a/npc/d_a_npc_sorajima_male3.h +++ b/include/d/a/npc/d_a_npc_sorajima_male3.h @@ -3,11 +3,10 @@ #include "d/a/npc/d_a_npc.h" #include "s/s_State.hpp" -#include "s/s_StateMgr.hpp" class dAcNpcSma3_c : public dAcNpc_c { public: - dAcNpcSma3_c() : mStateMgr(*this, sStateID::null) {} + dAcNpcSma3_c() : mStateMgr(*this) {} virtual ~dAcNpcSma3_c() {} private: diff --git a/include/d/a/npc/d_a_npc_sorajima_mother.h b/include/d/a/npc/d_a_npc_sorajima_mother.h index cb206408..50e78428 100644 --- a/include/d/a/npc/d_a_npc_sorajima_mother.h +++ b/include/d/a/npc/d_a_npc_sorajima_mother.h @@ -3,11 +3,10 @@ #include "d/a/npc/d_a_npc.h" #include "s/s_State.hpp" -#include "s/s_StateMgr.hpp" class dAcNpcSorajimaMother_c : public dAcNpc_c { public: - dAcNpcSorajimaMother_c() : mStateMgr(*this, sStateID::null) {} + dAcNpcSorajimaMother_c() : mStateMgr(*this) {} virtual ~dAcNpcSorajimaMother_c() {} private: diff --git a/include/d/a/npc/d_a_npc_suisei.h b/include/d/a/npc/d_a_npc_suisei.h index e6ffabff..8fb6acc8 100644 --- a/include/d/a/npc/d_a_npc_suisei.h +++ b/include/d/a/npc/d_a_npc_suisei.h @@ -3,11 +3,10 @@ #include "d/a/npc/d_a_npc.h" #include "s/s_State.hpp" -#include "s/s_StateMgr.hpp" class dAcNpcSuisei_c : public dAcNpc_c { public: - dAcNpcSuisei_c() : mStateMgr(*this, sStateID::null) {} + dAcNpcSuisei_c() : mStateMgr(*this) {} virtual ~dAcNpcSuisei_c() {} private: diff --git a/include/d/a/npc/d_a_npc_suisei_normal.h b/include/d/a/npc/d_a_npc_suisei_normal.h index 45b583c4..66f7309f 100644 --- a/include/d/a/npc/d_a_npc_suisei_normal.h +++ b/include/d/a/npc/d_a_npc_suisei_normal.h @@ -3,11 +3,10 @@ #include "d/a/npc/d_a_npc.h" #include "s/s_State.hpp" -#include "s/s_StateMgr.hpp" class dAcNpcSuiseiNml_c : public dAcNpc_c { public: - dAcNpcSuiseiNml_c() : mStateMgr(*this, sStateID::null) {} + dAcNpcSuiseiNml_c() : mStateMgr(*this) {} virtual ~dAcNpcSuiseiNml_c() {} private: diff --git a/include/d/a/npc/d_a_npc_suisei_sub.h b/include/d/a/npc/d_a_npc_suisei_sub.h index c17f7905..121639f2 100644 --- a/include/d/a/npc/d_a_npc_suisei_sub.h +++ b/include/d/a/npc/d_a_npc_suisei_sub.h @@ -3,11 +3,10 @@ #include "d/a/npc/d_a_npc.h" #include "s/s_State.hpp" -#include "s/s_StateMgr.hpp" class dAcNpcSuiseiSub_c : public dAcNpc_c { public: - dAcNpcSuiseiSub_c() : mStateMgr(*this, sStateID::null) {} + dAcNpcSuiseiSub_c() : mStateMgr(*this) {} virtual ~dAcNpcSuiseiSub_c() {} private: diff --git a/include/d/a/npc/d_a_npc_terry.h b/include/d/a/npc/d_a_npc_terry.h index 0f1bf82f..f7eca058 100644 --- a/include/d/a/npc/d_a_npc_terry.h +++ b/include/d/a/npc/d_a_npc_terry.h @@ -3,11 +3,10 @@ #include "d/a/npc/d_a_npc.h" #include "s/s_State.hpp" -#include "s/s_StateMgr.hpp" class dAcNpcTerry_c : public dAcNpc_c { public: - dAcNpcTerry_c() : mStateMgr(*this, sStateID::null) {} + dAcNpcTerry_c() : mStateMgr(*this) {} virtual ~dAcNpcTerry_c() {} private: diff --git a/include/d/a/npc/d_a_npc_testman.h b/include/d/a/npc/d_a_npc_testman.h index df65a714..7e37e010 100644 --- a/include/d/a/npc/d_a_npc_testman.h +++ b/include/d/a/npc/d_a_npc_testman.h @@ -3,11 +3,10 @@ #include "d/a/npc/d_a_npc.h" #include "s/s_State.hpp" -#include "s/s_StateMgr.hpp" class dAcNpcTmn_c : public dAcNpc_c { public: - dAcNpcTmn_c() : mStateMgr(*this, sStateID::null) {} + dAcNpcTmn_c() : mStateMgr(*this) {} virtual ~dAcNpcTmn_c() {} private: diff --git a/include/d/a/npc/d_a_npc_thunder_dragon.h b/include/d/a/npc/d_a_npc_thunder_dragon.h index ff6f917b..6fd5edd9 100644 --- a/include/d/a/npc/d_a_npc_thunder_dragon.h +++ b/include/d/a/npc/d_a_npc_thunder_dragon.h @@ -3,11 +3,10 @@ #include "d/a/npc/d_a_npc.h" #include "s/s_State.hpp" -#include "s/s_StateMgr.hpp" class dAcNpcTdr_c : public dAcNpc_c { public: - dAcNpcTdr_c() : mStateMgr(*this, sStateID::null) {} + dAcNpcTdr_c() : mStateMgr(*this) {} virtual ~dAcNpcTdr_c() {} private: diff --git a/include/d/a/npc/d_a_npc_thunder_dragon_bone.h b/include/d/a/npc/d_a_npc_thunder_dragon_bone.h index 40bcb34b..268e13fe 100644 --- a/include/d/a/npc/d_a_npc_thunder_dragon_bone.h +++ b/include/d/a/npc/d_a_npc_thunder_dragon_bone.h @@ -3,11 +3,10 @@ #include "d/a/obj/d_a_obj_base.h" #include "s/s_State.hpp" -#include "s/s_StateMgr.hpp" class dAcNpcTdrB_c : public dAcObjBase_c { public: - dAcNpcTdrB_c() : mStateMgr(*this, sStateID::null) {} + dAcNpcTdrB_c() : mStateMgr(*this) {} virtual ~dAcNpcTdrB_c() {} STATE_FUNC_DECLARE(dAcNpcTdrB_c, Wait); diff --git a/include/d/a/npc/d_a_npc_thunder_dragon_skull.h b/include/d/a/npc/d_a_npc_thunder_dragon_skull.h index 33c8e0a1..3b8c0341 100644 --- a/include/d/a/npc/d_a_npc_thunder_dragon_skull.h +++ b/include/d/a/npc/d_a_npc_thunder_dragon_skull.h @@ -3,11 +3,10 @@ #include "d/a/npc/d_a_npc.h" #include "s/s_State.hpp" -#include "s/s_StateMgr.hpp" class dAcNpcTds_c : public dAcNpc_c { public: - dAcNpcTds_c() : mStateMgr(*this, sStateID::null) {} + dAcNpcTds_c() : mStateMgr(*this) {} virtual ~dAcNpcTds_c() {} private: diff --git a/include/d/a/npc/d_a_npc_toilet_ghost.h b/include/d/a/npc/d_a_npc_toilet_ghost.h index 83eabb65..41bd3fb4 100644 --- a/include/d/a/npc/d_a_npc_toilet_ghost.h +++ b/include/d/a/npc/d_a_npc_toilet_ghost.h @@ -3,11 +3,10 @@ #include "d/a/npc/d_a_npc.h" #include "s/s_State.hpp" -#include "s/s_StateMgr.hpp" class dAcNpcToiletGhost_c : public dAcNpc_c { public: - dAcNpcToiletGhost_c() : mStateMgr(*this, sStateID::null) {} + dAcNpcToiletGhost_c() : mStateMgr(*this) {} virtual ~dAcNpcToiletGhost_c() {} private: diff --git a/include/d/a/npc/d_a_npc_uranaiya.h b/include/d/a/npc/d_a_npc_uranaiya.h index e7bb7293..64fd1ed8 100644 --- a/include/d/a/npc/d_a_npc_uranaiya.h +++ b/include/d/a/npc/d_a_npc_uranaiya.h @@ -3,11 +3,10 @@ #include "d/a/npc/d_a_npc.h" #include "s/s_State.hpp" -#include "s/s_StateMgr.hpp" class dAcNpcSha_c : public dAcNpc_c { public: - dAcNpcSha_c() : mStateMgr(*this, sStateID::null) {} + dAcNpcSha_c() : mStateMgr(*this) {} virtual ~dAcNpcSha_c() {} private: diff --git a/include/d/a/npc/d_a_npc_volcano_f2_salbo.h b/include/d/a/npc/d_a_npc_volcano_f2_salbo.h index f01df7d9..03b288b1 100644 --- a/include/d/a/npc/d_a_npc_volcano_f2_salbo.h +++ b/include/d/a/npc/d_a_npc_volcano_f2_salbo.h @@ -6,7 +6,7 @@ class dAcNpcSlb2_c : public dAcOrdinaryNpc_c { public: - dAcNpcSlb2_c() : mStateMgr(*this, sStateID::null) {} + dAcNpcSlb2_c() : mStateMgr(*this) {} virtual ~dAcNpcSlb2_c() {} void fn_61_58C0(int, int); diff --git a/include/d/a/npc/d_a_npc_young_impa.h b/include/d/a/npc/d_a_npc_young_impa.h index 24d4b84b..2e55a33a 100644 --- a/include/d/a/npc/d_a_npc_young_impa.h +++ b/include/d/a/npc/d_a_npc_young_impa.h @@ -3,11 +3,10 @@ #include "d/a/npc/d_a_npc.h" #include "s/s_State.hpp" -#include "s/s_StateMgr.hpp" class dAcNpcYim_c : public dAcNpc_c { public: - dAcNpcYim_c() : mStateMgr(*this, sStateID::null) {} + dAcNpcYim_c() : mStateMgr(*this) {} virtual ~dAcNpcYim_c() {} private: diff --git a/include/d/a/npc/d_a_npc_zelda.h b/include/d/a/npc/d_a_npc_zelda.h index 9b0eca7e..20f1534b 100644 --- a/include/d/a/npc/d_a_npc_zelda.h +++ b/include/d/a/npc/d_a_npc_zelda.h @@ -3,11 +3,10 @@ #include "d/a/npc/d_a_npc.h" #include "s/s_State.hpp" -#include "s/s_StateMgr.hpp" class dAcNpcZld_c : public dAcNpc_c { public: - dAcNpcZld_c() : mStateMgr(*this, sStateID::null) {} + dAcNpcZld_c() : mStateMgr(*this) {} virtual ~dAcNpcZld_c() {} private: diff --git a/include/d/a/obj/d_a_obj_B300_sand.h b/include/d/a/obj/d_a_obj_B300_sand.h index b6cf9ee6..5562699e 100644 --- a/include/d/a/obj/d_a_obj_B300_sand.h +++ b/include/d/a/obj/d_a_obj_B300_sand.h @@ -3,11 +3,10 @@ #include "d/a/obj/d_a_obj_base.h" #include "s/s_State.hpp" -#include "s/s_StateMgr.hpp" class dAcOB300Sand_c : public dAcObjBase_c { public: - dAcOB300Sand_c() : mStateMgr(*this, sStateID::null) {} + dAcOB300Sand_c() : mStateMgr(*this) {} virtual ~dAcOB300Sand_c() {} STATE_FUNC_DECLARE(dAcOB300Sand_c, Wait); diff --git a/include/d/a/obj/d_a_obj_D300.h b/include/d/a/obj/d_a_obj_D300.h index 90b4ab34..9d7e64fc 100644 --- a/include/d/a/obj/d_a_obj_D300.h +++ b/include/d/a/obj/d_a_obj_D300.h @@ -3,11 +3,10 @@ #include "d/a/obj/d_a_obj_base.h" #include "s/s_State.hpp" -#include "s/s_StateMgr.hpp" class dAcOD300_c : public dAcObjBase_c { public: - dAcOD300_c() : mStateMgr(*this, sStateID::null) {} + dAcOD300_c() : mStateMgr(*this) {} virtual ~dAcOD300_c() {} STATE_FUNC_DECLARE(dAcOD300_c, Wait); diff --git a/include/d/a/obj/d_a_obj_D3_dummy.h b/include/d/a/obj/d_a_obj_D3_dummy.h index 5de8e220..6038bd67 100644 --- a/include/d/a/obj/d_a_obj_D3_dummy.h +++ b/include/d/a/obj/d_a_obj_D3_dummy.h @@ -3,11 +3,10 @@ #include "d/a/obj/d_a_obj_base.h" #include "s/s_State.hpp" -#include "s/s_StateMgr.hpp" class dAcOD3Dummy_c : public dAcObjBase_c { public: - dAcOD3Dummy_c() : mStateMgr(*this, sStateID::null) {} + dAcOD3Dummy_c() : mStateMgr(*this) {} virtual ~dAcOD3Dummy_c() {} STATE_FUNC_DECLARE(dAcOD3Dummy_c, Wait); diff --git a/include/d/a/obj/d_a_obj_F302_light.h b/include/d/a/obj/d_a_obj_F302_light.h index c9aa4d19..c8ca5a1f 100644 --- a/include/d/a/obj/d_a_obj_F302_light.h +++ b/include/d/a/obj/d_a_obj_F302_light.h @@ -7,13 +7,12 @@ #include "m/m3d/m_smdl.h" #include "nw4r/g3d/res/g3d_resfile.h" #include "s/s_State.hpp" -#include "s/s_StateMgr.hpp" #include "toBeSorted/actor_event.h" #include "toBeSorted/time_area_mgr.h" class dAcOF302Light_c : public dAcObjBase_c { public: - dAcOF302Light_c() : mEvent(*this, nullptr), mStateMgr(*this, sStateID::null) {} + dAcOF302Light_c() : mEvent(*this, nullptr), mStateMgr(*this) {} virtual ~dAcOF302Light_c() {} virtual bool createHeap() override; diff --git a/include/d/a/obj/d_a_obj_ancient_jewels.h b/include/d/a/obj/d_a_obj_ancient_jewels.h index 5357e031..dd9e8841 100644 --- a/include/d/a/obj/d_a_obj_ancient_jewels.h +++ b/include/d/a/obj/d_a_obj_ancient_jewels.h @@ -3,11 +3,10 @@ #include "d/a/obj/d_a_obj_base.h" #include "s/s_State.hpp" -#include "s/s_StateMgr.hpp" class dAcOAncientJewels_c : public dAcObjBase_c { public: - dAcOAncientJewels_c() : mStateMgr(*this, sStateID::null) {} + dAcOAncientJewels_c() : mStateMgr(*this) {} virtual ~dAcOAncientJewels_c() {} STATE_FUNC_DECLARE(dAcOAncientJewels_c, Wait); diff --git a/include/d/a/obj/d_a_obj_appear_bridge.h b/include/d/a/obj/d_a_obj_appear_bridge.h index ee8d986d..b3946e98 100644 --- a/include/d/a/obj/d_a_obj_appear_bridge.h +++ b/include/d/a/obj/d_a_obj_appear_bridge.h @@ -13,7 +13,7 @@ class dAcOappearBridge_c : public dAcObjBase_c { public: - dAcOappearBridge_c() : mStateMgr(*this, sStateID::null), mActorEvent(*this, nullptr), mSceneCallback(this) {} + dAcOappearBridge_c() : mStateMgr(*this), mActorEvent(*this, nullptr), mSceneCallback(this) {} virtual ~dAcOappearBridge_c() {} virtual bool createHeap() override; virtual int create() override; diff --git a/include/d/a/obj/d_a_obj_arrow.h b/include/d/a/obj/d_a_obj_arrow.h index 052fdf08..b3d68cda 100644 --- a/include/d/a/obj/d_a_obj_arrow.h +++ b/include/d/a/obj/d_a_obj_arrow.h @@ -13,7 +13,7 @@ class dAcArrow_c : public dAcObjBase_c { public: - dAcArrow_c() : mPolyInfo(), mStateMgr(*this, sStateID::null) {} + dAcArrow_c() : mPolyInfo(), mStateMgr(*this) {} virtual ~dAcArrow_c(); virtual bool createHeap() override; diff --git a/include/d/a/obj/d_a_obj_arrow_switch.h b/include/d/a/obj/d_a_obj_arrow_switch.h index 61160c34..8581b98f 100644 --- a/include/d/a/obj/d_a_obj_arrow_switch.h +++ b/include/d/a/obj/d_a_obj_arrow_switch.h @@ -3,11 +3,10 @@ #include "d/a/obj/d_a_obj_base.h" #include "s/s_State.hpp" -#include "s/s_StateMgr.hpp" class dAcOarrowSwitch_c : public dAcObjBase_c { public: - dAcOarrowSwitch_c() : mStateMgr(*this, sStateID::null) {} + dAcOarrowSwitch_c() : mStateMgr(*this) {} virtual ~dAcOarrowSwitch_c() {} STATE_FUNC_DECLARE(dAcOarrowSwitch_c, Off); diff --git a/include/d/a/obj/d_a_obj_asura_pillar.h b/include/d/a/obj/d_a_obj_asura_pillar.h index 511c3f0b..35988e9a 100644 --- a/include/d/a/obj/d_a_obj_asura_pillar.h +++ b/include/d/a/obj/d_a_obj_asura_pillar.h @@ -3,11 +3,10 @@ #include "d/a/obj/d_a_obj_base.h" #include "s/s_State.hpp" -#include "s/s_StateMgr.hpp" class dAcAsuraPillar_c : public dAcObjBase_c { public: - dAcAsuraPillar_c() : mStateMgr(*this, sStateID::null) {} + dAcAsuraPillar_c() : mStateMgr(*this) {} virtual ~dAcAsuraPillar_c() {} STATE_FUNC_DECLARE(dAcAsuraPillar_c, Damage); diff --git a/include/d/a/obj/d_a_obj_asura_sword.h b/include/d/a/obj/d_a_obj_asura_sword.h index 13322c30..6826c369 100644 --- a/include/d/a/obj/d_a_obj_asura_sword.h +++ b/include/d/a/obj/d_a_obj_asura_sword.h @@ -3,11 +3,10 @@ #include "d/a/obj/d_a_obj_base.h" #include "s/s_State.hpp" -#include "s/s_StateMgr.hpp" class dAcAsuraSword_c : public dAcObjBase_c { public: - dAcAsuraSword_c() : mStateMgr(*this, sStateID::null) {} + dAcAsuraSword_c() : mStateMgr(*this) {} virtual ~dAcAsuraSword_c() {} STATE_FUNC_DECLARE(dAcAsuraSword_c, Carried); diff --git a/include/d/a/obj/d_a_obj_ballista.h b/include/d/a/obj/d_a_obj_ballista.h index 487a4443..3836bf18 100644 --- a/include/d/a/obj/d_a_obj_ballista.h +++ b/include/d/a/obj/d_a_obj_ballista.h @@ -3,11 +3,10 @@ #include "d/a/obj/d_a_obj_base.h" #include "s/s_State.hpp" -#include "s/s_StateMgr.hpp" class dAcOBallista_c : public dAcObjBase_c { public: - dAcOBallista_c() : mStateMgr(*this, sStateID::null) {} + dAcOBallista_c() : mStateMgr(*this) {} virtual ~dAcOBallista_c() {} STATE_FUNC_DECLARE(dAcOBallista_c, Wait); diff --git a/include/d/a/obj/d_a_obj_ballista_f3.h b/include/d/a/obj/d_a_obj_ballista_f3.h index b47a871d..2e77b066 100644 --- a/include/d/a/obj/d_a_obj_ballista_f3.h +++ b/include/d/a/obj/d_a_obj_ballista_f3.h @@ -3,11 +3,10 @@ #include "d/a/obj/d_a_obj_base.h" #include "s/s_State.hpp" -#include "s/s_StateMgr.hpp" class dAcOBallistaF3_c : public dAcObjBase_c { public: - dAcOBallistaF3_c() : mStateMgr(*this, sStateID::null) {} + dAcOBallistaF3_c() : mStateMgr(*this) {} virtual ~dAcOBallistaF3_c() {} STATE_FUNC_DECLARE(dAcOBallistaF3_c, Wait); diff --git a/include/d/a/obj/d_a_obj_ballista_handle.h b/include/d/a/obj/d_a_obj_ballista_handle.h index 306e7961..ac3a81bb 100644 --- a/include/d/a/obj/d_a_obj_ballista_handle.h +++ b/include/d/a/obj/d_a_obj_ballista_handle.h @@ -3,11 +3,10 @@ #include "d/a/obj/d_a_obj_base.h" #include "s/s_State.hpp" -#include "s/s_StateMgr.hpp" class dAcOBallistaHandle_c : public dAcObjBase_c { public: - dAcOBallistaHandle_c() : mStateMgr(*this, sStateID::null) {} + dAcOBallistaHandle_c() : mStateMgr(*this) {} virtual ~dAcOBallistaHandle_c() {} STATE_FUNC_DECLARE(dAcOBallistaHandle_c, Wait); diff --git a/include/d/a/obj/d_a_obj_bamboo.h b/include/d/a/obj/d_a_obj_bamboo.h index 562c2459..c60e019f 100644 --- a/include/d/a/obj/d_a_obj_bamboo.h +++ b/include/d/a/obj/d_a_obj_bamboo.h @@ -3,7 +3,6 @@ #include "d/a/obj/d_a_obj_base.h" #include "s/s_State.hpp" -#include "s/s_StateMgr.hpp" class dAcObamboo_c : public dAcObjBase_c { public: diff --git a/include/d/a/obj/d_a_obj_barrel.h b/include/d/a/obj/d_a_obj_barrel.h index 969014e8..2a7110dd 100644 --- a/include/d/a/obj/d_a_obj_barrel.h +++ b/include/d/a/obj/d_a_obj_barrel.h @@ -30,7 +30,7 @@ public: Kraken, }; - dAcOBarrel_c() : mStateMgr(*this, sStateID::null) {} + dAcOBarrel_c() : mStateMgr(*this) {} virtual ~dAcOBarrel_c() {} virtual int doDelete() override; diff --git a/include/d/a/obj/d_a_obj_base.h b/include/d/a/obj/d_a_obj_base.h index 6b798af5..57f1222a 100644 --- a/include/d/a/obj/d_a_obj_base.h +++ b/include/d/a/obj/d_a_obj_base.h @@ -197,6 +197,7 @@ public: void fn_8002EA60(void *); void fn_8002EB30(void *); void putInODesert(f32 depth, mVec3_c *position); + void fn_8002ECD0(m3d::smdl_c *smdl, UNKWORD); // Disabling makes Items and Link Disappear void drawModelType1(m3d::smdl_c *smdl); // Disabling make Lava and other objects Disappear @@ -220,11 +221,11 @@ public: fProfile::PROFILE_NAME_e actorId, u32 params1, mVec3_c *pos, mAng3_c *rot, mVec3_c *scale, u32 params2, u32 roomId ); - + // These may not belong here - static dAcBase_c* createInsectActor( - dAcBase_c* parent, - fProfile::PROFILE_NAME_e actorId, u32 params1, mVec3_c *pos, mAng3_c *rot, mVec3_c *scale, u32 params2, s32 roomId + static dAcBase_c *createInsectActor( + dAcBase_c *parent, fProfile::PROFILE_NAME_e actorId, u32 params1, mVec3_c *pos, mAng3_c *rot, mVec3_c *scale, + u32 params2, s32 roomId ); static dAcBase_c *createActorUnkGroup3( fProfile::PROFILE_NAME_e actorId, u32 roomId, u32 params1, mVec3_c *pos, mAng3_c *rot, mVec3_c *scale, @@ -243,6 +244,16 @@ public: if (!result) \ return result; \ } while (0) + +// Actors' createHeap functions often have patterns that can be matched with this macro +// `bool result;` needs to be defined in scope prior to use +#define TRY_CREATE2(thing) \ + do { \ + result = (thing); \ + if (!result) \ + return result; \ + } while (0) + // Use this in actors' create functions #define CREATE_ALLOCATOR(className) \ do { \ diff --git a/include/d/a/obj/d_a_obj_bb_bridge.h b/include/d/a/obj/d_a_obj_bb_bridge.h index 05ab26fb..6de5a833 100644 --- a/include/d/a/obj/d_a_obj_bb_bridge.h +++ b/include/d/a/obj/d_a_obj_bb_bridge.h @@ -3,11 +3,10 @@ #include "d/a/obj/d_a_obj_base.h" #include "s/s_State.hpp" -#include "s/s_StateMgr.hpp" class dAcObbBridge_c : public dAcObjBase_c { public: - dAcObbBridge_c() : mStateMgr(*this, sStateID::null) {} + dAcObbBridge_c() : mStateMgr(*this) {} virtual ~dAcObbBridge_c() {} STATE_FUNC_DECLARE(dAcObbBridge_c, Wait); diff --git a/include/d/a/obj/d_a_obj_bb_broken_parts.h b/include/d/a/obj/d_a_obj_bb_broken_parts.h index c8305c66..6a0c13d3 100644 --- a/include/d/a/obj/d_a_obj_bb_broken_parts.h +++ b/include/d/a/obj/d_a_obj_bb_broken_parts.h @@ -3,11 +3,10 @@ #include "d/a/obj/d_a_obj_base.h" #include "s/s_State.hpp" -#include "s/s_StateMgr.hpp" class dAcObbBrokenParts_c : public dAcObjBase_c { public: - dAcObbBrokenParts_c() : mStateMgr(*this, sStateID::null) {} + dAcObbBrokenParts_c() : mStateMgr(*this) {} virtual ~dAcObbBrokenParts_c() {} STATE_FUNC_DECLARE(dAcObbBrokenParts_c, Wait); diff --git a/include/d/a/obj/d_a_obj_bb_objects.h b/include/d/a/obj/d_a_obj_bb_objects.h index b904d08a..ef645aa3 100644 --- a/include/d/a/obj/d_a_obj_bb_objects.h +++ b/include/d/a/obj/d_a_obj_bb_objects.h @@ -3,11 +3,10 @@ #include "d/a/obj/d_a_obj_base.h" #include "s/s_State.hpp" -#include "s/s_StateMgr.hpp" class dAcObbObjects_c : public dAcObjBase_c { public: - dAcObbObjects_c() : mStateMgr(*this, sStateID::null) {} + dAcObbObjects_c() : mStateMgr(*this) {} virtual ~dAcObbObjects_c() {} STATE_FUNC_DECLARE(dAcObbObjects_c, Wait); diff --git a/include/d/a/obj/d_a_obj_bblargebomb.h b/include/d/a/obj/d_a_obj_bblargebomb.h index aa5d98fa..06e60327 100644 --- a/include/d/a/obj/d_a_obj_bblargebomb.h +++ b/include/d/a/obj/d_a_obj_bblargebomb.h @@ -3,11 +3,10 @@ #include "d/a/obj/d_a_obj_base.h" #include "s/s_State.hpp" -#include "s/s_StateMgr.hpp" class dAcOBblargebomb_c : public dAcObjBase_c { public: - dAcOBblargebomb_c() : mStateMgr(*this, sStateID::null) {} + dAcOBblargebomb_c() : mStateMgr(*this) {} virtual ~dAcOBblargebomb_c() {} STATE_FUNC_DECLARE(dAcOBblargebomb_c, Wait); diff --git a/include/d/a/obj/d_a_obj_bbstone.h b/include/d/a/obj/d_a_obj_bbstone.h index 5ab1e4c1..30d70e9e 100644 --- a/include/d/a/obj/d_a_obj_bbstone.h +++ b/include/d/a/obj/d_a_obj_bbstone.h @@ -3,11 +3,10 @@ #include "d/a/obj/d_a_obj_base.h" #include "s/s_State.hpp" -#include "s/s_StateMgr.hpp" class dAcOBBStone : public dAcObjBase_c { public: - dAcOBBStone() : mStateMgr(*this, sStateID::null) {} + dAcOBBStone() : mStateMgr(*this) {} virtual ~dAcOBBStone() {} STATE_FUNC_DECLARE(dAcOBBStone, Wait); diff --git a/include/d/a/obj/d_a_obj_bell.h b/include/d/a/obj/d_a_obj_bell.h index f1ad90c6..45cdbae5 100644 --- a/include/d/a/obj/d_a_obj_bell.h +++ b/include/d/a/obj/d_a_obj_bell.h @@ -3,11 +3,10 @@ #include "d/a/obj/d_a_obj_base.h" #include "s/s_State.hpp" -#include "s/s_StateMgr.hpp" class dAcObell_c : public dAcObjBase_c { public: - dAcObell_c() : mStateMgr(*this, sStateID::null) {} + dAcObell_c() : mStateMgr(*this) {} virtual ~dAcObell_c() {} STATE_FUNC_DECLARE(dAcObell_c, Wait); diff --git a/include/d/a/obj/d_a_obj_belt_cvr.h b/include/d/a/obj/d_a_obj_belt_cvr.h index 388cda22..4786fe32 100644 --- a/include/d/a/obj/d_a_obj_belt_cvr.h +++ b/include/d/a/obj/d_a_obj_belt_cvr.h @@ -3,11 +3,10 @@ #include "d/a/obj/d_a_obj_base.h" #include "s/s_State.hpp" -#include "s/s_StateMgr.hpp" class dAcObeltCvr_c : public dAcObjBase_c { public: - dAcObeltCvr_c() : mStateMgr(*this, sStateID::null) {} + dAcObeltCvr_c() : mStateMgr(*this) {} virtual ~dAcObeltCvr_c() {} STATE_FUNC_DECLARE(dAcObeltCvr_c, Wait); diff --git a/include/d/a/obj/d_a_obj_belt_obstacle.h b/include/d/a/obj/d_a_obj_belt_obstacle.h index 8083dca5..db7d102a 100644 --- a/include/d/a/obj/d_a_obj_belt_obstacle.h +++ b/include/d/a/obj/d_a_obj_belt_obstacle.h @@ -3,11 +3,10 @@ #include "d/a/obj/d_a_obj_base.h" #include "s/s_State.hpp" -#include "s/s_StateMgr.hpp" class dAcObeltObstacle_c : public dAcObjBase_c { public: - dAcObeltObstacle_c() : mStateMgr(*this, sStateID::null) {} + dAcObeltObstacle_c() : mStateMgr(*this) {} virtual ~dAcObeltObstacle_c() {} STATE_FUNC_DECLARE(dAcObeltObstacle_c, Wait); diff --git a/include/d/a/obj/d_a_obj_bigbomb_flower.h b/include/d/a/obj/d_a_obj_bigbomb_flower.h index a28414a0..97ff75f4 100644 --- a/include/d/a/obj/d_a_obj_bigbomb_flower.h +++ b/include/d/a/obj/d_a_obj_bigbomb_flower.h @@ -3,11 +3,10 @@ #include "d/a/obj/d_a_obj_base.h" #include "s/s_State.hpp" -#include "s/s_StateMgr.hpp" class dAcOBBombFlower_c : public dAcObjBase_c { public: - dAcOBBombFlower_c() : mStateMgr(*this, sStateID::null) {} + dAcOBBombFlower_c() : mStateMgr(*this) {} virtual ~dAcOBBombFlower_c() {} STATE_FUNC_DECLARE(dAcOBBombFlower_c, Wait); diff --git a/include/d/a/obj/d_a_obj_blast_rock.h b/include/d/a/obj/d_a_obj_blast_rock.h index 53a640c4..7d48b0c7 100644 --- a/include/d/a/obj/d_a_obj_blast_rock.h +++ b/include/d/a/obj/d_a_obj_blast_rock.h @@ -3,11 +3,10 @@ #include "d/a/obj/d_a_obj_base.h" #include "s/s_State.hpp" -#include "s/s_StateMgr.hpp" class dAcOBlastRock_c : public dAcObjBase_c { public: - dAcOBlastRock_c() : mStateMgr(*this, sStateID::null) {} + dAcOBlastRock_c() : mStateMgr(*this) {} virtual ~dAcOBlastRock_c() {} STATE_FUNC_DECLARE(dAcOBlastRock_c, Wait); diff --git a/include/d/a/obj/d_a_obj_block_rope.h b/include/d/a/obj/d_a_obj_block_rope.h index 20f485da..ac5addd6 100644 --- a/include/d/a/obj/d_a_obj_block_rope.h +++ b/include/d/a/obj/d_a_obj_block_rope.h @@ -3,11 +3,10 @@ #include "d/a/obj/d_a_obj_base.h" #include "s/s_State.hpp" -#include "s/s_StateMgr.hpp" class dAcOblockRope_c : public dAcObjBase_c { public: - dAcOblockRope_c() : mStateMgr(*this, sStateID::null) {} + dAcOblockRope_c() : mStateMgr(*this) {} virtual ~dAcOblockRope_c() {} STATE_FUNC_DECLARE(dAcOblockRope_c, Wait); diff --git a/include/d/a/obj/d_a_obj_blow_coal.h b/include/d/a/obj/d_a_obj_blow_coal.h index f01e1b69..b547a93a 100644 --- a/include/d/a/obj/d_a_obj_blow_coal.h +++ b/include/d/a/obj/d_a_obj_blow_coal.h @@ -3,11 +3,10 @@ #include "d/a/obj/d_a_obj_base.h" #include "s/s_State.hpp" -#include "s/s_StateMgr.hpp" class dAcOblowCoal_c : public dAcObjBase_c { public: - dAcOblowCoal_c() : mStateMgr(*this, sStateID::null) {} + dAcOblowCoal_c() : mStateMgr(*this) {} virtual ~dAcOblowCoal_c() {} STATE_FUNC_DECLARE(dAcOblowCoal_c, Wait); diff --git a/include/d/a/obj/d_a_obj_boat.h b/include/d/a/obj/d_a_obj_boat.h index 4d5b9ed1..0ad3f5bb 100644 --- a/include/d/a/obj/d_a_obj_boat.h +++ b/include/d/a/obj/d_a_obj_boat.h @@ -3,11 +3,10 @@ #include "d/a/obj/d_a_obj_base.h" #include "s/s_State.hpp" -#include "s/s_StateMgr.hpp" class dAcOBoat_c : public dAcObjBase_c { public: - dAcOBoat_c() : mStateMgr(*this, sStateID::null) {} + dAcOBoat_c() : mStateMgr(*this) {} virtual ~dAcOBoat_c() {} STATE_FUNC_DECLARE(dAcOBoat_c, Wait); diff --git a/include/d/a/obj/d_a_obj_bomb.h b/include/d/a/obj/d_a_obj_bomb.h index 02c95f3c..9d0bfe99 100644 --- a/include/d/a/obj/d_a_obj_bomb.h +++ b/include/d/a/obj/d_a_obj_bomb.h @@ -26,7 +26,7 @@ public: class dAcBomb_c : public dAcObjBase_c { public: - dAcBomb_c() : mStateMgr(*this, sStateID::null), mSelfRef(this), mEffect1(this), mEffect2(this) {} + dAcBomb_c() : mStateMgr(*this), mSelfRef(this), mEffect1(this), mEffect2(this) {} virtual ~dAcBomb_c(); /* vt 0x08 */ virtual int create() override; diff --git a/include/d/a/obj/d_a_obj_boxcage_F300.h b/include/d/a/obj/d_a_obj_boxcage_F300.h index 3c629d41..16ca2f16 100644 --- a/include/d/a/obj/d_a_obj_boxcage_F300.h +++ b/include/d/a/obj/d_a_obj_boxcage_F300.h @@ -3,11 +3,10 @@ #include "d/a/obj/d_a_obj_base.h" #include "s/s_State.hpp" -#include "s/s_StateMgr.hpp" class dAcOBoxCageF300_c : public dAcObjBase_c { public: - dAcOBoxCageF300_c() : mStateMgr(*this, sStateID::null) {} + dAcOBoxCageF300_c() : mStateMgr(*this) {} virtual ~dAcOBoxCageF300_c() {} STATE_FUNC_DECLARE(dAcOBoxCageF300_c, Wait); diff --git a/include/d/a/obj/d_a_obj_bridge_bone.h b/include/d/a/obj/d_a_obj_bridge_bone.h index 74cd3920..36f46bb0 100644 --- a/include/d/a/obj/d_a_obj_bridge_bone.h +++ b/include/d/a/obj/d_a_obj_bridge_bone.h @@ -3,11 +3,10 @@ #include "d/a/obj/d_a_obj_base.h" #include "s/s_State.hpp" -#include "s/s_StateMgr.hpp" class dAcOBridgeBone_c : public dAcObjBase_c { public: - dAcOBridgeBone_c() : mStateMgr(*this, sStateID::null) {} + dAcOBridgeBone_c() : mStateMgr(*this) {} virtual ~dAcOBridgeBone_c() {} STATE_FUNC_DECLARE(dAcOBridgeBone_c, Wait); diff --git a/include/d/a/obj/d_a_obj_bridge_building.h b/include/d/a/obj/d_a_obj_bridge_building.h index dca2d0e4..64db07a8 100644 --- a/include/d/a/obj/d_a_obj_bridge_building.h +++ b/include/d/a/obj/d_a_obj_bridge_building.h @@ -3,11 +3,10 @@ #include "d/a/obj/d_a_obj_base.h" #include "s/s_State.hpp" -#include "s/s_StateMgr.hpp" class dAcObridgeBuilding_c : public dAcObjBase_c { public: - dAcObridgeBuilding_c() : mStateMgr(*this, sStateID::null) {} + dAcObridgeBuilding_c() : mStateMgr(*this) {} virtual ~dAcObridgeBuilding_c() {} STATE_FUNC_DECLARE(dAcObridgeBuilding_c, Wait); diff --git a/include/d/a/obj/d_a_obj_bridge_fall.h b/include/d/a/obj/d_a_obj_bridge_fall.h index 6162a5f2..184bdd0c 100644 --- a/include/d/a/obj/d_a_obj_bridge_fall.h +++ b/include/d/a/obj/d_a_obj_bridge_fall.h @@ -3,11 +3,10 @@ #include "d/a/obj/d_a_obj_base.h" #include "s/s_State.hpp" -#include "s/s_StateMgr.hpp" class dAcOBridgeFall_c : public dAcObjBase_c { public: - dAcOBridgeFall_c() : mStateMgr(*this, sStateID::null) {} + dAcOBridgeFall_c() : mStateMgr(*this) {} virtual ~dAcOBridgeFall_c() {} STATE_FUNC_DECLARE(dAcOBridgeFall_c, Wait); diff --git a/include/d/a/obj/d_a_obj_bridge_step.h b/include/d/a/obj/d_a_obj_bridge_step.h index 3d4d4212..258c422d 100644 --- a/include/d/a/obj/d_a_obj_bridge_step.h +++ b/include/d/a/obj/d_a_obj_bridge_step.h @@ -3,11 +3,10 @@ #include "d/a/obj/d_a_obj_base.h" #include "s/s_State.hpp" -#include "s/s_StateMgr.hpp" class dAcOBridgeStep_c : public dAcObjBase_c { public: - dAcOBridgeStep_c() : mStateMgr(*this, sStateID::null) {} + dAcOBridgeStep_c() : mStateMgr(*this) {} virtual ~dAcOBridgeStep_c() {} STATE_FUNC_DECLARE(dAcOBridgeStep_c, Wait); diff --git a/include/d/a/obj/d_a_obj_bridge_stretch.h b/include/d/a/obj/d_a_obj_bridge_stretch.h index 4fa5a1ef..e58b120a 100644 --- a/include/d/a/obj/d_a_obj_bridge_stretch.h +++ b/include/d/a/obj/d_a_obj_bridge_stretch.h @@ -3,11 +3,10 @@ #include "d/a/obj/d_a_obj_base.h" #include "s/s_State.hpp" -#include "s/s_StateMgr.hpp" class dAcObridgeStretch_c : public dAcObjBase_c { public: - dAcObridgeStretch_c() : mStateMgr(*this, sStateID::null) {} + dAcObridgeStretch_c() : mStateMgr(*this) {} virtual ~dAcObridgeStretch_c() {} STATE_FUNC_DECLARE(dAcObridgeStretch_c, Wait); diff --git a/include/d/a/obj/d_a_obj_bridge_time.h b/include/d/a/obj/d_a_obj_bridge_time.h index bba3fa3a..ff146e7c 100644 --- a/include/d/a/obj/d_a_obj_bridge_time.h +++ b/include/d/a/obj/d_a_obj_bridge_time.h @@ -3,11 +3,10 @@ #include "d/a/obj/d_a_obj_base.h" #include "s/s_State.hpp" -#include "s/s_StateMgr.hpp" class dAcOBridgeTime_c : public dAcObjBase_c { public: - dAcOBridgeTime_c() : mStateMgr(*this, sStateID::null) {} + dAcOBridgeTime_c() : mStateMgr(*this) {} virtual ~dAcOBridgeTime_c() {} STATE_FUNC_DECLARE(dAcOBridgeTime_c, Wait); diff --git a/include/d/a/obj/d_a_obj_bulb_switch.h b/include/d/a/obj/d_a_obj_bulb_switch.h index de28f462..356a3020 100644 --- a/include/d/a/obj/d_a_obj_bulb_switch.h +++ b/include/d/a/obj/d_a_obj_bulb_switch.h @@ -3,11 +3,10 @@ #include "d/a/obj/d_a_obj_base.h" #include "s/s_State.hpp" -#include "s/s_StateMgr.hpp" class dAcObulbSwitch_c : public dAcObjBase_c { public: - dAcObulbSwitch_c() : mStateMgr(*this, sStateID::null) {} + dAcObulbSwitch_c() : mStateMgr(*this) {} virtual ~dAcObulbSwitch_c() {} STATE_FUNC_DECLARE(dAcObulbSwitch_c, Close); diff --git a/include/d/a/obj/d_a_obj_cannon.h b/include/d/a/obj/d_a_obj_cannon.h index 0885926e..816f7e31 100644 --- a/include/d/a/obj/d_a_obj_cannon.h +++ b/include/d/a/obj/d_a_obj_cannon.h @@ -3,11 +3,10 @@ #include "d/a/obj/d_a_obj_base.h" #include "s/s_State.hpp" -#include "s/s_StateMgr.hpp" class dAcOcannon_c : public dAcObjBase_c { public: - dAcOcannon_c() : mStateMgr(*this, sStateID::null) {} + dAcOcannon_c() : mStateMgr(*this) {} virtual ~dAcOcannon_c() {} STATE_FUNC_DECLARE(dAcOcannon_c, Wait); diff --git a/include/d/a/obj/d_a_obj_cannon_cover.h b/include/d/a/obj/d_a_obj_cannon_cover.h index 0a16cd9a..470833d7 100644 --- a/include/d/a/obj/d_a_obj_cannon_cover.h +++ b/include/d/a/obj/d_a_obj_cannon_cover.h @@ -3,7 +3,6 @@ #include "d/a/obj/d_a_obj_base.h" #include "s/s_State.hpp" -#include "s/s_StateMgr.hpp" class dAcOcannonCover_c : public dAcObjBase_c { public: diff --git a/include/d/a/obj/d_a_obj_carry_stone.h b/include/d/a/obj/d_a_obj_carry_stone.h index 24f89305..770785d4 100644 --- a/include/d/a/obj/d_a_obj_carry_stone.h +++ b/include/d/a/obj/d_a_obj_carry_stone.h @@ -3,11 +3,10 @@ #include "d/a/obj/d_a_obj_base.h" #include "s/s_State.hpp" -#include "s/s_StateMgr.hpp" class dAcOcarryStone_c : public dAcObjBase_c { public: - dAcOcarryStone_c() : mStateMgr(*this, sStateID::null) {} + dAcOcarryStone_c() : mStateMgr(*this) {} virtual ~dAcOcarryStone_c() {} STATE_FUNC_DECLARE(dAcOcarryStone_c, Wait); diff --git a/include/d/a/obj/d_a_obj_chair.h b/include/d/a/obj/d_a_obj_chair.h index ab8a2d40..d5b7e746 100644 --- a/include/d/a/obj/d_a_obj_chair.h +++ b/include/d/a/obj/d_a_obj_chair.h @@ -26,7 +26,7 @@ public: CHAIR_I, // In Front of ET }; - dAcOChair_c() : mStateMgr(*this, sStateID::null) {} + dAcOChair_c() : mStateMgr(*this) {} virtual ~dAcOChair_c() {} virtual int create() override; diff --git a/include/d/a/obj/d_a_obj_chandelier.h b/include/d/a/obj/d_a_obj_chandelier.h index 5435eba5..913972f2 100644 --- a/include/d/a/obj/d_a_obj_chandelier.h +++ b/include/d/a/obj/d_a_obj_chandelier.h @@ -3,11 +3,10 @@ #include "d/a/obj/d_a_obj_base.h" #include "s/s_State.hpp" -#include "s/s_StateMgr.hpp" class dAcOChandelier_c : public dAcObjBase_c { public: - dAcOChandelier_c() : mStateMgr(*this, sStateID::null) {} + dAcOChandelier_c() : mStateMgr(*this) {} virtual ~dAcOChandelier_c() {} STATE_FUNC_DECLARE(dAcOChandelier_c, Wait); diff --git a/include/d/a/obj/d_a_obj_chest.h b/include/d/a/obj/d_a_obj_chest.h index 7af4e884..15617749 100644 --- a/include/d/a/obj/d_a_obj_chest.h +++ b/include/d/a/obj/d_a_obj_chest.h @@ -15,7 +15,7 @@ class dAcOChest_c : public dAcObjBase_c { public: dAcOChest_c() - : mStateMgr(*this, sStateID::null), mEvent(*this, nullptr), mDowsingTarget(this, DowsingTarget::SLOT_NONE) {} + : mStateMgr(*this), mEvent(*this, nullptr), mDowsingTarget(this, DowsingTarget::SLOT_NONE) {} virtual ~dAcOChest_c() {} static void changeStateOpenCallback(dAcOChest_c *); diff --git a/include/d/a/obj/d_a_obj_claw_shot_tg.h b/include/d/a/obj/d_a_obj_claw_shot_tg.h index c889b32c..385f32ab 100644 --- a/include/d/a/obj/d_a_obj_claw_shot_tg.h +++ b/include/d/a/obj/d_a_obj_claw_shot_tg.h @@ -3,11 +3,10 @@ #include "d/a/obj/d_a_obj_base.h" #include "s/s_State.hpp" -#include "s/s_StateMgr.hpp" class dAcOclawShotTg_c : public dAcObjBase_c { public: - dAcOclawShotTg_c() : mStateMgr(*this, sStateID::null) {} + dAcOclawShotTg_c() : mStateMgr(*this) {} virtual ~dAcOclawShotTg_c() {} STATE_FUNC_DECLARE(dAcOclawShotTg_c, Wait); diff --git a/include/d/a/obj/d_a_obj_clef.h b/include/d/a/obj/d_a_obj_clef.h index aeb1f672..d718df9e 100644 --- a/include/d/a/obj/d_a_obj_clef.h +++ b/include/d/a/obj/d_a_obj_clef.h @@ -3,7 +3,6 @@ #include "d/a/obj/d_a_obj_base.h" #include "s/s_State.hpp" -#include "s/s_StateMgr.hpp" class dAcOClef_c : public dAcObjBase_c { public: diff --git a/include/d/a/obj/d_a_obj_cloud_dive.h b/include/d/a/obj/d_a_obj_cloud_dive.h index a0125752..25c1f93d 100644 --- a/include/d/a/obj/d_a_obj_cloud_dive.h +++ b/include/d/a/obj/d_a_obj_cloud_dive.h @@ -9,7 +9,7 @@ class dAcOcloudDive_c : public dAcObjBase_c { public: - dAcOcloudDive_c() : mStateMgr(*this, sStateID::null) {} + dAcOcloudDive_c() : mStateMgr(*this) {} virtual ~dAcOcloudDive_c() {} virtual bool createHeap() override; diff --git a/include/d/a/obj/d_a_obj_control_panel.h b/include/d/a/obj/d_a_obj_control_panel.h index 82463855..4427b2c5 100644 --- a/include/d/a/obj/d_a_obj_control_panel.h +++ b/include/d/a/obj/d_a_obj_control_panel.h @@ -3,11 +3,10 @@ #include "d/a/obj/d_a_obj_base.h" #include "s/s_State.hpp" -#include "s/s_StateMgr.hpp" class dAcOCtrlPnl_c : public dAcObjBase_c { public: - dAcOCtrlPnl_c() : mStateMgr(*this, sStateID::null) {} + dAcOCtrlPnl_c() : mStateMgr(*this) {} virtual ~dAcOCtrlPnl_c() {} STATE_FUNC_DECLARE(dAcOCtrlPnl_c, Wait); diff --git a/include/d/a/obj/d_a_obj_cumul_cloud.h b/include/d/a/obj/d_a_obj_cumul_cloud.h index b0ab6dca..1dcbdb00 100644 --- a/include/d/a/obj/d_a_obj_cumul_cloud.h +++ b/include/d/a/obj/d_a_obj_cumul_cloud.h @@ -3,11 +3,10 @@ #include "d/a/obj/d_a_obj_base.h" #include "s/s_State.hpp" -#include "s/s_StateMgr.hpp" class dAcOcumulCloud_c : public dAcObjBase_c { public: - dAcOcumulCloud_c() : mStateMgr(*this, sStateID::null) {} + dAcOcumulCloud_c() : mStateMgr(*this) {} virtual ~dAcOcumulCloud_c() {} STATE_FUNC_DECLARE(dAcOcumulCloud_c, Wait); diff --git a/include/d/a/obj/d_a_obj_daynight.h b/include/d/a/obj/d_a_obj_daynight.h index b3cf8ca1..77962447 100644 --- a/include/d/a/obj/d_a_obj_daynight.h +++ b/include/d/a/obj/d_a_obj_daynight.h @@ -3,11 +3,10 @@ #include "d/a/obj/d_a_obj_base.h" #include "s/s_State.hpp" -#include "s/s_StateMgr.hpp" class dAcODayNight_c : public dAcObjBase_c { public: - dAcODayNight_c() : mStateMgr(*this, sStateID::null) {} + dAcODayNight_c() : mStateMgr(*this) {} virtual ~dAcODayNight_c() {} STATE_FUNC_DECLARE(dAcODayNight_c, Wait); diff --git a/include/d/a/obj/d_a_obj_decoA.h b/include/d/a/obj/d_a_obj_decoA.h index a1a9f6a6..fde28ea2 100644 --- a/include/d/a/obj/d_a_obj_decoA.h +++ b/include/d/a/obj/d_a_obj_decoA.h @@ -3,11 +3,10 @@ #include "d/a/obj/d_a_obj_base.h" #include "s/s_State.hpp" -#include "s/s_StateMgr.hpp" class dAcODecoA_c : public dAcObjBase_c { public: - dAcODecoA_c() : mStateMgr(*this, sStateID::null) {} + dAcODecoA_c() : mStateMgr(*this) {} virtual ~dAcODecoA_c() {} STATE_FUNC_DECLARE(dAcODecoA_c, Wait); diff --git a/include/d/a/obj/d_a_obj_decoB.h b/include/d/a/obj/d_a_obj_decoB.h index 16572b2d..0865c6b6 100644 --- a/include/d/a/obj/d_a_obj_decoB.h +++ b/include/d/a/obj/d_a_obj_decoB.h @@ -9,7 +9,7 @@ class dAcODecoB_c : public dAcObjBase_c { public: - dAcODecoB_c() : mStateMgr(*this, sStateID::null) {} + dAcODecoB_c() : mStateMgr(*this) {} virtual ~dAcODecoB_c() {} virtual bool createHeap() override; diff --git a/include/d/a/obj/d_a_obj_desert_ago.h b/include/d/a/obj/d_a_obj_desert_ago.h index 6a782c83..121b0300 100644 --- a/include/d/a/obj/d_a_obj_desert_ago.h +++ b/include/d/a/obj/d_a_obj_desert_ago.h @@ -3,11 +3,10 @@ #include "d/a/obj/d_a_obj_base.h" #include "s/s_State.hpp" -#include "s/s_StateMgr.hpp" class dAcODesertAgo_c : public dAcObjBase_c { public: - dAcODesertAgo_c() : mStateMgr(*this, sStateID::null) {} + dAcODesertAgo_c() : mStateMgr(*this) {} virtual ~dAcODesertAgo_c() {} STATE_FUNC_DECLARE(dAcODesertAgo_c, Wait); diff --git a/include/d/a/obj/d_a_obj_desert_meter.h b/include/d/a/obj/d_a_obj_desert_meter.h index f0144755..aaab9bb0 100644 --- a/include/d/a/obj/d_a_obj_desert_meter.h +++ b/include/d/a/obj/d_a_obj_desert_meter.h @@ -3,11 +3,10 @@ #include "d/a/obj/d_a_obj_base.h" #include "s/s_State.hpp" -#include "s/s_StateMgr.hpp" class dAcODesertMeter_c : public dAcObjBase_c { public: - dAcODesertMeter_c() : mStateMgr(*this, sStateID::null) {} + dAcODesertMeter_c() : mStateMgr(*this) {} virtual ~dAcODesertMeter_c() {} STATE_FUNC_DECLARE(dAcODesertMeter_c, Wait); diff --git a/include/d/a/obj/d_a_obj_door_boss.h b/include/d/a/obj/d_a_obj_door_boss.h index b4ef8602..fd1b0315 100644 --- a/include/d/a/obj/d_a_obj_door_boss.h +++ b/include/d/a/obj/d_a_obj_door_boss.h @@ -3,11 +3,10 @@ #include "d/a/obj/d_a_obj_door_base.h" #include "s/s_State.hpp" -#include "s/s_StateMgr.hpp" class dAcOdoorBoss_c : public dAcObjDoor_c { public: - dAcOdoorBoss_c() : mStateMgr(*this, sStateID::null) {} + dAcOdoorBoss_c() : mStateMgr(*this) {} virtual ~dAcOdoorBoss_c() {} virtual bool canOpen() override; diff --git a/include/d/a/obj/d_a_obj_door_bossD101.h b/include/d/a/obj/d_a_obj_door_bossD101.h index 67effd8c..3a865943 100644 --- a/include/d/a/obj/d_a_obj_door_bossD101.h +++ b/include/d/a/obj/d_a_obj_door_bossD101.h @@ -3,11 +3,10 @@ #include "d/a/obj/d_a_obj_base.h" #include "s/s_State.hpp" -#include "s/s_StateMgr.hpp" class dAcODoorBossD101_c : public dAcObjBase_c { public: - dAcODoorBossD101_c() : mStateMgr(*this, sStateID::null) {} + dAcODoorBossD101_c() : mStateMgr(*this) {} virtual ~dAcODoorBossD101_c() {} STATE_FUNC_DECLARE(dAcODoorBossD101_c, Wait); diff --git a/include/d/a/obj/d_a_obj_dormitory_gate.h b/include/d/a/obj/d_a_obj_dormitory_gate.h index 7fe21da3..3e0ab410 100644 --- a/include/d/a/obj/d_a_obj_dormitory_gate.h +++ b/include/d/a/obj/d_a_obj_dormitory_gate.h @@ -3,11 +3,10 @@ #include "d/a/obj/d_a_obj_base.h" #include "s/s_State.hpp" -#include "s/s_StateMgr.hpp" class dAcODormitoryGate_c : public dAcObjBase_c { public: - dAcODormitoryGate_c() : mStateMgr(*this, sStateID::null) {} + dAcODormitoryGate_c() : mStateMgr(*this) {} virtual ~dAcODormitoryGate_c() {} STATE_FUNC_DECLARE(dAcODormitoryGate_c, Wait); diff --git a/include/d/a/obj/d_a_obj_down_lava.h b/include/d/a/obj/d_a_obj_down_lava.h index 33df7988..91af0120 100644 --- a/include/d/a/obj/d_a_obj_down_lava.h +++ b/include/d/a/obj/d_a_obj_down_lava.h @@ -3,11 +3,10 @@ #include "d/a/obj/d_a_obj_base.h" #include "s/s_State.hpp" -#include "s/s_StateMgr.hpp" class dAcOdownLava_c : public dAcObjBase_c { public: - dAcOdownLava_c() : mStateMgr(*this, sStateID::null) {} + dAcOdownLava_c() : mStateMgr(*this) {} virtual ~dAcOdownLava_c() {} STATE_FUNC_DECLARE(dAcOdownLava_c, Wait); diff --git a/include/d/a/obj/d_a_obj_drum.h b/include/d/a/obj/d_a_obj_drum.h index ec44852f..5280dca5 100644 --- a/include/d/a/obj/d_a_obj_drum.h +++ b/include/d/a/obj/d_a_obj_drum.h @@ -3,11 +3,10 @@ #include "d/a/obj/d_a_obj_base.h" #include "s/s_State.hpp" -#include "s/s_StateMgr.hpp" class dAcOdrum_c : public dAcObjBase_c { public: - dAcOdrum_c() : mStateMgr(*this, sStateID::null) {} + dAcOdrum_c() : mStateMgr(*this) {} virtual ~dAcOdrum_c() {} STATE_FUNC_DECLARE(dAcOdrum_c, Wait); diff --git a/include/d/a/obj/d_a_obj_dungeon_ship.h b/include/d/a/obj/d_a_obj_dungeon_ship.h index 1388023f..d87fa41c 100644 --- a/include/d/a/obj/d_a_obj_dungeon_ship.h +++ b/include/d/a/obj/d_a_obj_dungeon_ship.h @@ -19,7 +19,7 @@ class dAcODungeonShip_c : public dAcObjBase_c { public: dAcODungeonShip_c() - : mStateMgr(*this, sStateID::null), mDowsingTarget(this, DowsingTarget::SLOT_NONE), mEvent(*this, nullptr) {} + : mStateMgr(*this), mDowsingTarget(this, DowsingTarget::SLOT_NONE), mEvent(*this, nullptr) {} virtual ~dAcODungeonShip_c() {} virtual bool createHeap() override; diff --git a/include/d/a/obj/d_a_obj_electric_light.h b/include/d/a/obj/d_a_obj_electric_light.h index 8e11d10c..8dfa77a6 100644 --- a/include/d/a/obj/d_a_obj_electric_light.h +++ b/include/d/a/obj/d_a_obj_electric_light.h @@ -3,11 +3,10 @@ #include "d/a/obj/d_a_obj_base.h" #include "s/s_State.hpp" -#include "s/s_StateMgr.hpp" class dAcOelectricLight_c : public dAcObjBase_c { public: - dAcOelectricLight_c() : mStateMgr(*this, sStateID::null) {} + dAcOelectricLight_c() : mStateMgr(*this) {} virtual ~dAcOelectricLight_c() {} STATE_FUNC_DECLARE(dAcOelectricLight_c, Wait); diff --git a/include/d/a/obj/d_a_obj_evil_field.h b/include/d/a/obj/d_a_obj_evil_field.h index b6a953f6..1bc387b1 100644 --- a/include/d/a/obj/d_a_obj_evil_field.h +++ b/include/d/a/obj/d_a_obj_evil_field.h @@ -3,11 +3,10 @@ #include "d/a/obj/d_a_obj_base.h" #include "s/s_State.hpp" -#include "s/s_StateMgr.hpp" class dAcOevilField_c : public dAcObjBase_c { public: - dAcOevilField_c() : mStateMgr(*this, sStateID::null) {} + dAcOevilField_c() : mStateMgr(*this) {} virtual ~dAcOevilField_c() {} STATE_FUNC_DECLARE(dAcOevilField_c, Wait); diff --git a/include/d/a/obj/d_a_obj_fairy.h b/include/d/a/obj/d_a_obj_fairy.h index 814dc70c..c33fc46c 100644 --- a/include/d/a/obj/d_a_obj_fairy.h +++ b/include/d/a/obj/d_a_obj_fairy.h @@ -14,7 +14,7 @@ class dAcOFairy_c : public dAcObjBase_c { public: - dAcOFairy_c() : field_0x330(0), mStateMgr(*this, sStateID::null) {} + dAcOFairy_c() : field_0x330(0), mStateMgr(*this) {} virtual ~dAcOFairy_c() {} virtual bool createHeap() override; diff --git a/include/d/a/obj/d_a_obj_farmland.h b/include/d/a/obj/d_a_obj_farmland.h index fe75d1cf..f27a2115 100644 --- a/include/d/a/obj/d_a_obj_farmland.h +++ b/include/d/a/obj/d_a_obj_farmland.h @@ -3,11 +3,10 @@ #include "d/a/obj/d_a_obj_base.h" #include "s/s_State.hpp" -#include "s/s_StateMgr.hpp" class dAcOFarmLand_c : public dAcObjBase_c { public: - dAcOFarmLand_c() : mStateMgr(*this, sStateID::null) {} + dAcOFarmLand_c() : mStateMgr(*this) {} virtual ~dAcOFarmLand_c() {} STATE_FUNC_DECLARE(dAcOFarmLand_c, Wait); diff --git a/include/d/a/obj/d_a_obj_fence.h b/include/d/a/obj/d_a_obj_fence.h index 8b7afd5d..760a0596 100644 --- a/include/d/a/obj/d_a_obj_fence.h +++ b/include/d/a/obj/d_a_obj_fence.h @@ -3,7 +3,6 @@ #include "d/a/obj/d_a_obj_base.h" #include "s/s_State.hpp" -#include "s/s_StateMgr.hpp" class dAcOFence_c : public dAcObjBase_c { public: diff --git a/include/d/a/obj/d_a_obj_fence_iron.h b/include/d/a/obj/d_a_obj_fence_iron.h index c32bf627..080207d4 100644 --- a/include/d/a/obj/d_a_obj_fence_iron.h +++ b/include/d/a/obj/d_a_obj_fence_iron.h @@ -3,11 +3,10 @@ #include "d/a/obj/d_a_obj_base.h" #include "s/s_State.hpp" -#include "s/s_StateMgr.hpp" class dAcOfenceIron_c : public dAcObjBase_c { public: - dAcOfenceIron_c() : mStateMgr(*this, sStateID::null) {} + dAcOfenceIron_c() : mStateMgr(*this) {} virtual ~dAcOfenceIron_c() {} STATE_FUNC_DECLARE(dAcOfenceIron_c, Close); diff --git a/include/d/a/obj/d_a_obj_fire.h b/include/d/a/obj/d_a_obj_fire.h index 44a185ab..786bfa59 100644 --- a/include/d/a/obj/d_a_obj_fire.h +++ b/include/d/a/obj/d_a_obj_fire.h @@ -3,11 +3,10 @@ #include "d/a/obj/d_a_obj_base.h" #include "s/s_State.hpp" -#include "s/s_StateMgr.hpp" class dAcOfire_c : public dAcObjBase_c { public: - dAcOfire_c() : mStateMgr(*this, sStateID::null) {} + dAcOfire_c() : mStateMgr(*this) {} virtual ~dAcOfire_c() {} STATE_FUNC_DECLARE(dAcOfire_c, Wait); diff --git a/include/d/a/obj/d_a_obj_fire_obstacle.h b/include/d/a/obj/d_a_obj_fire_obstacle.h index 9eb4d271..f24c0b38 100644 --- a/include/d/a/obj/d_a_obj_fire_obstacle.h +++ b/include/d/a/obj/d_a_obj_fire_obstacle.h @@ -3,11 +3,10 @@ #include "d/a/obj/d_a_obj_base.h" #include "s/s_State.hpp" -#include "s/s_StateMgr.hpp" class dAcOfireObstacle_c : public dAcObjBase_c { public: - dAcOfireObstacle_c() : mStateMgr(*this, sStateID::null) {} + dAcOfireObstacle_c() : mStateMgr(*this) {} virtual ~dAcOfireObstacle_c() {} STATE_FUNC_DECLARE(dAcOfireObstacle_c, Wait); diff --git a/include/d/a/obj/d_a_obj_fire_pillar.h b/include/d/a/obj/d_a_obj_fire_pillar.h index c5fda7d4..97cbca2e 100644 --- a/include/d/a/obj/d_a_obj_fire_pillar.h +++ b/include/d/a/obj/d_a_obj_fire_pillar.h @@ -3,11 +3,10 @@ #include "d/a/obj/d_a_obj_base.h" #include "s/s_State.hpp" -#include "s/s_StateMgr.hpp" class dAcOfirePillar_c : public dAcObjBase_c { public: - dAcOfirePillar_c() : mStateMgr(*this, sStateID::null) {} + dAcOfirePillar_c() : mStateMgr(*this) {} virtual ~dAcOfirePillar_c() {} STATE_FUNC_DECLARE(dAcOfirePillar_c, Wait); diff --git a/include/d/a/obj/d_a_obj_firewall.h b/include/d/a/obj/d_a_obj_firewall.h index 54cde572..023f170e 100644 --- a/include/d/a/obj/d_a_obj_firewall.h +++ b/include/d/a/obj/d_a_obj_firewall.h @@ -3,11 +3,10 @@ #include "d/a/obj/d_a_obj_base.h" #include "s/s_State.hpp" -#include "s/s_StateMgr.hpp" class dAcOFireWall_c : public dAcObjBase_c { public: - dAcOFireWall_c() : mStateMgr(*this, sStateID::null) {} + dAcOFireWall_c() : mStateMgr(*this) {} virtual ~dAcOFireWall_c() {} STATE_FUNC_DECLARE(dAcOFireWall_c, Wait); diff --git a/include/d/a/obj/d_a_obj_flag.h b/include/d/a/obj/d_a_obj_flag.h index 35ac761a..a021f691 100644 --- a/include/d/a/obj/d_a_obj_flag.h +++ b/include/d/a/obj/d_a_obj_flag.h @@ -3,11 +3,10 @@ #include "d/a/obj/d_a_obj_base.h" #include "s/s_State.hpp" -#include "s/s_StateMgr.hpp" class dAcOFlag_c : public dAcObjBase_c { public: - dAcOFlag_c() : mStateMgr(*this, sStateID::null) {} + dAcOFlag_c() : mStateMgr(*this) {} virtual ~dAcOFlag_c() {} STATE_FUNC_DECLARE(dAcOFlag_c, Wait); diff --git a/include/d/a/obj/d_a_obj_flower_ancient.h b/include/d/a/obj/d_a_obj_flower_ancient.h index 860290fa..c21a9646 100644 --- a/include/d/a/obj/d_a_obj_flower_ancient.h +++ b/include/d/a/obj/d_a_obj_flower_ancient.h @@ -3,11 +3,10 @@ #include "d/a/obj/d_a_obj_base.h" #include "s/s_State.hpp" -#include "s/s_StateMgr.hpp" class dAcOFlowerAncient_c : public dAcObjBase_c { public: - dAcOFlowerAncient_c() : mStateMgr(*this, sStateID::null) {} + dAcOFlowerAncient_c() : mStateMgr(*this) {} virtual ~dAcOFlowerAncient_c() {} STATE_FUNC_DECLARE(dAcOFlowerAncient_c, Wait); diff --git a/include/d/a/obj/d_a_obj_fortune_ring.h b/include/d/a/obj/d_a_obj_fortune_ring.h index 5e10b440..53f7c3a9 100644 --- a/include/d/a/obj/d_a_obj_fortune_ring.h +++ b/include/d/a/obj/d_a_obj_fortune_ring.h @@ -3,7 +3,6 @@ #include "d/a/obj/d_a_obj_base.h" #include "s/s_State.hpp" -#include "s/s_StateMgr.hpp" class dAcOfortuneRing_c : public dAcObjBase_c { public: diff --git a/include/d/a/obj/d_a_obj_fruit.h b/include/d/a/obj/d_a_obj_fruit.h index 8b5189e7..1af0a9c4 100644 --- a/include/d/a/obj/d_a_obj_fruit.h +++ b/include/d/a/obj/d_a_obj_fruit.h @@ -3,11 +3,10 @@ #include "d/a/obj/d_a_obj_base.h" #include "s/s_State.hpp" -#include "s/s_StateMgr.hpp" class dAcOFruit_c : public dAcObjBase_c { public: - dAcOFruit_c() : mStateMgr(*this, sStateID::null) {} + dAcOFruit_c() : mStateMgr(*this) {} virtual ~dAcOFruit_c() {} STATE_FUNC_DECLARE(dAcOFruit_c, NormalWait); diff --git a/include/d/a/obj/d_a_obj_fruitB.h b/include/d/a/obj/d_a_obj_fruitB.h index aa3870ce..86659cee 100644 --- a/include/d/a/obj/d_a_obj_fruitB.h +++ b/include/d/a/obj/d_a_obj_fruitB.h @@ -3,11 +3,10 @@ #include "d/a/obj/d_a_obj_base.h" #include "s/s_State.hpp" -#include "s/s_StateMgr.hpp" class dAcOFruitB_c : public dAcObjBase_c { public: - dAcOFruitB_c() : mStateMgr(*this, sStateID::null) {} + dAcOFruitB_c() : mStateMgr(*this) {} virtual ~dAcOFruitB_c() {} STATE_FUNC_DECLARE(dAcOFruitB_c, Stick); diff --git a/include/d/a/obj/d_a_obj_fruit_tree.h b/include/d/a/obj/d_a_obj_fruit_tree.h index f35c45fa..284cb65e 100644 --- a/include/d/a/obj/d_a_obj_fruit_tree.h +++ b/include/d/a/obj/d_a_obj_fruit_tree.h @@ -3,11 +3,10 @@ #include "d/a/obj/d_a_obj_base.h" #include "s/s_State.hpp" -#include "s/s_StateMgr.hpp" class dAcOFruitTree_c : public dAcObjBase_c { public: - dAcOFruitTree_c() : mStateMgr(*this, sStateID::null) {} + dAcOFruitTree_c() : mStateMgr(*this) {} virtual ~dAcOFruitTree_c() {} STATE_FUNC_DECLARE(dAcOFruitTree_c, Wait); diff --git a/include/d/a/obj/d_a_obj_gear.h b/include/d/a/obj/d_a_obj_gear.h index c489d3b1..98e445e4 100644 --- a/include/d/a/obj/d_a_obj_gear.h +++ b/include/d/a/obj/d_a_obj_gear.h @@ -3,11 +3,10 @@ #include "d/a/obj/d_a_obj_base.h" #include "s/s_State.hpp" -#include "s/s_StateMgr.hpp" class dAcOGear_c : public dAcObjBase_c { public: - dAcOGear_c() : mStateMgr(*this, sStateID::null) {} + dAcOGear_c() : mStateMgr(*this) {} virtual ~dAcOGear_c() {} STATE_FUNC_DECLARE(dAcOGear_c, Wait); diff --git a/include/d/a/obj/d_a_obj_girahim_foot.h b/include/d/a/obj/d_a_obj_girahim_foot.h index ddc5199a..55fab69f 100644 --- a/include/d/a/obj/d_a_obj_girahim_foot.h +++ b/include/d/a/obj/d_a_obj_girahim_foot.h @@ -10,7 +10,7 @@ class dAcOgirahimFoot_c : public dAcObjBase_c { public: - dAcOgirahimFoot_c() : mStateMgr(*this, sStateID::null) {} + dAcOgirahimFoot_c() : mStateMgr(*this) {} virtual ~dAcOgirahimFoot_c() {} virtual int create() override; diff --git a/include/d/a/obj/d_a_obj_girahimu_floor.h b/include/d/a/obj/d_a_obj_girahimu_floor.h index f0174792..c1eee1c1 100644 --- a/include/d/a/obj/d_a_obj_girahimu_floor.h +++ b/include/d/a/obj/d_a_obj_girahimu_floor.h @@ -3,11 +3,10 @@ #include "d/a/obj/d_a_obj_base.h" #include "s/s_State.hpp" -#include "s/s_StateMgr.hpp" class dAcOGirahimuFloor_c : public dAcObjBase_c { public: - dAcOGirahimuFloor_c() : mStateMgr(*this, sStateID::null) {} + dAcOGirahimuFloor_c() : mStateMgr(*this) {} virtual ~dAcOGirahimuFloor_c() {} STATE_FUNC_DECLARE(dAcOGirahimuFloor_c, Wait); diff --git a/include/d/a/obj/d_a_obj_girahimu_knife.h b/include/d/a/obj/d_a_obj_girahimu_knife.h index 28bf6f9f..a94ed7e9 100644 --- a/include/d/a/obj/d_a_obj_girahimu_knife.h +++ b/include/d/a/obj/d_a_obj_girahimu_knife.h @@ -3,11 +3,10 @@ #include "d/a/e/d_a_en_base.h" #include "s/s_State.hpp" -#include "s/s_StateMgr.hpp" class dAcObjGirahimuKnife_c : public dAcEnBase_c { public: - dAcObjGirahimuKnife_c() : mStateMgr(*this, sStateID::null) {} + dAcObjGirahimuKnife_c() : mStateMgr(*this) {} virtual ~dAcObjGirahimuKnife_c() {} STATE_FUNC_DECLARE(dAcObjGirahimuKnife_c, Wait); diff --git a/include/d/a/obj/d_a_obj_girahimu_sword_link.h b/include/d/a/obj/d_a_obj_girahimu_sword_link.h index fe74fec5..b510f157 100644 --- a/include/d/a/obj/d_a_obj_girahimu_sword_link.h +++ b/include/d/a/obj/d_a_obj_girahimu_sword_link.h @@ -3,11 +3,10 @@ #include "d/a/obj/d_a_obj_base.h" #include "s/s_State.hpp" -#include "s/s_StateMgr.hpp" class dAcObjGirahimuSwordLink_c : public dAcObjBase_c { public: - dAcObjGirahimuSwordLink_c() : mStateMgr(*this, sStateID::null) {} + dAcObjGirahimuSwordLink_c() : mStateMgr(*this) {} virtual ~dAcObjGirahimuSwordLink_c() {} STATE_FUNC_DECLARE(dAcObjGirahimuSwordLink_c, Hide); diff --git a/include/d/a/obj/d_a_obj_god_mark.h b/include/d/a/obj/d_a_obj_god_mark.h index 40542738..ffbe17d4 100644 --- a/include/d/a/obj/d_a_obj_god_mark.h +++ b/include/d/a/obj/d_a_obj_god_mark.h @@ -3,11 +3,10 @@ #include "d/a/obj/d_a_obj_base.h" #include "s/s_State.hpp" -#include "s/s_StateMgr.hpp" class dAcOgodMark_c : public dAcObjBase_c { public: - dAcOgodMark_c() : mStateMgr(*this, sStateID::null) {} + dAcOgodMark_c() : mStateMgr(*this) {} virtual ~dAcOgodMark_c() {} STATE_FUNC_DECLARE(dAcOgodMark_c, Wait); diff --git a/include/d/a/obj/d_a_obj_goddess_cube.h b/include/d/a/obj/d_a_obj_goddess_cube.h index f050cd52..3ef85b75 100644 --- a/include/d/a/obj/d_a_obj_goddess_cube.h +++ b/include/d/a/obj/d_a_obj_goddess_cube.h @@ -3,11 +3,10 @@ #include "d/a/obj/d_a_obj_base.h" #include "s/s_State.hpp" -#include "s/s_StateMgr.hpp" class dAcOGoddessCube_c : public dAcObjBase_c { public: - dAcOGoddessCube_c() : mStateMgr(*this, sStateID::null) {} + dAcOGoddessCube_c() : mStateMgr(*this) {} virtual ~dAcOGoddessCube_c() {} STATE_FUNC_DECLARE(dAcOGoddessCube_c, Wait); diff --git a/include/d/a/obj/d_a_obj_goddess_statue.h b/include/d/a/obj/d_a_obj_goddess_statue.h index 6ce560ff..0f351d14 100644 --- a/include/d/a/obj/d_a_obj_goddess_statue.h +++ b/include/d/a/obj/d_a_obj_goddess_statue.h @@ -3,11 +3,10 @@ #include "d/a/obj/d_a_obj_base.h" #include "s/s_State.hpp" -#include "s/s_StateMgr.hpp" class dAcOGoddessStatue_c : public dAcObjBase_c { public: - dAcOGoddessStatue_c() : mStateMgr(*this, sStateID::null) {} + dAcOGoddessStatue_c() : mStateMgr(*this) {} virtual ~dAcOGoddessStatue_c() {} STATE_FUNC_DECLARE(dAcOGoddessStatue_c, Wait); diff --git a/include/d/a/obj/d_a_obj_grass_coil.h b/include/d/a/obj/d_a_obj_grass_coil.h index db611207..71aa1aad 100644 --- a/include/d/a/obj/d_a_obj_grass_coil.h +++ b/include/d/a/obj/d_a_obj_grass_coil.h @@ -8,11 +8,10 @@ #include "m/m_vec.h" #include "nw4r/g3d/res/g3d_resfile.h" #include "s/s_State.hpp" -#include "s/s_StateMgr.hpp" class dAcOgrassCoil_c : public dAcObjBase_c { public: - dAcOgrassCoil_c() : mStateMgr(*this, sStateID::null) {} + dAcOgrassCoil_c() : mStateMgr(*this) {} virtual ~dAcOgrassCoil_c() {} virtual bool createHeap() override; diff --git a/include/d/a/obj/d_a_obj_grave.h b/include/d/a/obj/d_a_obj_grave.h index 1cd82c67..05fc3bde 100644 --- a/include/d/a/obj/d_a_obj_grave.h +++ b/include/d/a/obj/d_a_obj_grave.h @@ -10,11 +10,10 @@ #include "m/m_vec.h" #include "nw4r/g3d/res/g3d_resfile.h" #include "s/s_State.hpp" -#include "s/s_StateMgr.hpp" class dAcOGrave_c : public dAcObjBase_c { public: - dAcOGrave_c() : mStateMgr(*this, sStateID::null) {} + dAcOGrave_c() : mStateMgr(*this) {} virtual ~dAcOGrave_c() {} virtual bool createHeap(); diff --git a/include/d/a/obj/d_a_obj_ground_cover.h b/include/d/a/obj/d_a_obj_ground_cover.h index 694f3224..6aaf5d60 100644 --- a/include/d/a/obj/d_a_obj_ground_cover.h +++ b/include/d/a/obj/d_a_obj_ground_cover.h @@ -3,7 +3,6 @@ #include "d/a/obj/d_a_obj_base.h" #include "s/s_State.hpp" -#include "s/s_StateMgr.hpp" class dAcOgroundCover_c : public dAcObjBase_c { public: diff --git a/include/d/a/obj/d_a_obj_guard_log.h b/include/d/a/obj/d_a_obj_guard_log.h index 27070faf..7196f3af 100644 --- a/include/d/a/obj/d_a_obj_guard_log.h +++ b/include/d/a/obj/d_a_obj_guard_log.h @@ -3,11 +3,10 @@ #include "d/a/obj/d_a_obj_base.h" #include "s/s_State.hpp" -#include "s/s_StateMgr.hpp" class dAcOguardLog_c : public dAcObjBase_c { public: - dAcOguardLog_c() : mStateMgr(*this, sStateID::null) {} + dAcOguardLog_c() : mStateMgr(*this) {} virtual ~dAcOguardLog_c() {} STATE_FUNC_DECLARE(dAcOguardLog_c, Init); diff --git a/include/d/a/obj/d_a_obj_harp_hint.h b/include/d/a/obj/d_a_obj_harp_hint.h index 80198e35..d0fe109d 100644 --- a/include/d/a/obj/d_a_obj_harp_hint.h +++ b/include/d/a/obj/d_a_obj_harp_hint.h @@ -3,11 +3,10 @@ #include "d/a/obj/d_a_obj_base.h" #include "s/s_State.hpp" -#include "s/s_StateMgr.hpp" class dAcOHarpHint_c : public dAcObjBase_c { public: - dAcOHarpHint_c() : mStateMgr(*this, sStateID::null) {} + dAcOHarpHint_c() : mStateMgr(*this) {} virtual ~dAcOHarpHint_c() {} STATE_FUNC_DECLARE(dAcOHarpHint_c, Wait); diff --git a/include/d/a/obj/d_a_obj_himo.h b/include/d/a/obj/d_a_obj_himo.h index 227003bd..a1dc0e46 100644 --- a/include/d/a/obj/d_a_obj_himo.h +++ b/include/d/a/obj/d_a_obj_himo.h @@ -3,11 +3,10 @@ #include "d/a/obj/d_a_obj_base.h" #include "s/s_State.hpp" -#include "s/s_StateMgr.hpp" class dAcOhimo_c : public dAcObjBase_c { public: - dAcOhimo_c() : mStateMgr(*this, sStateID::null) {} + dAcOhimo_c() : mStateMgr(*this) {} virtual ~dAcOhimo_c() {} STATE_FUNC_DECLARE(dAcOhimo_c, Wait); diff --git a/include/d/a/obj/d_a_obj_hit_lever_sw.h b/include/d/a/obj/d_a_obj_hit_lever_sw.h index 4c61bf91..32de6667 100644 --- a/include/d/a/obj/d_a_obj_hit_lever_sw.h +++ b/include/d/a/obj/d_a_obj_hit_lever_sw.h @@ -3,11 +3,10 @@ #include "d/a/obj/d_a_obj_base.h" #include "s/s_State.hpp" -#include "s/s_StateMgr.hpp" class dAcOhitLeverSw_c : public dAcObjBase_c { public: - dAcOhitLeverSw_c() : mStateMgr(*this, sStateID::null) {} + dAcOhitLeverSw_c() : mStateMgr(*this) {} virtual ~dAcOhitLeverSw_c() {} STATE_FUNC_DECLARE(dAcOhitLeverSw_c, Right); diff --git a/include/d/a/obj/d_a_obj_hole.h b/include/d/a/obj/d_a_obj_hole.h index 56d4eb29..109a4f0c 100644 --- a/include/d/a/obj/d_a_obj_hole.h +++ b/include/d/a/obj/d_a_obj_hole.h @@ -6,11 +6,10 @@ #include "m/m3d/m_smdl.h" #include "nw4r/g3d/res/g3d_resfile.h" #include "s/s_State.hpp" -#include "s/s_StateMgr.hpp" class dAcOhole_c : public dAcObjBase_c { public: - dAcOhole_c() : mStateMgr(*this, sStateID::null) {} + dAcOhole_c() : mStateMgr(*this) {} virtual ~dAcOhole_c() {} virtual bool createHeap() override; diff --git a/include/d/a/obj/d_a_obj_hole_minigame.h b/include/d/a/obj/d_a_obj_hole_minigame.h index f33ea7ea..55e5c789 100644 --- a/include/d/a/obj/d_a_obj_hole_minigame.h +++ b/include/d/a/obj/d_a_obj_hole_minigame.h @@ -3,11 +3,10 @@ #include "d/a/obj/d_a_obj_base.h" #include "s/s_State.hpp" -#include "s/s_StateMgr.hpp" class dAcOholeMinigame_c : public dAcObjBase_c { public: - dAcOholeMinigame_c() : mStateMgr(*this, sStateID::null) {} + dAcOholeMinigame_c() : mStateMgr(*this) {} virtual ~dAcOholeMinigame_c() {} STATE_FUNC_DECLARE(dAcOholeMinigame_c, Wait); diff --git a/include/d/a/obj/d_a_obj_impa_door.h b/include/d/a/obj/d_a_obj_impa_door.h index 2ba7f85f..170d4634 100644 --- a/include/d/a/obj/d_a_obj_impa_door.h +++ b/include/d/a/obj/d_a_obj_impa_door.h @@ -8,7 +8,7 @@ class dAcOimpaDoor_c : public dAcObjBase_c { public: - dAcOimpaDoor_c() : mStateMgr(*this, sStateID::null) {} + dAcOimpaDoor_c() : mStateMgr(*this) {} virtual ~dAcOimpaDoor_c() {} STATE_FUNC_DECLARE(dAcOimpaDoor_c, Wait); diff --git a/include/d/a/obj/d_a_obj_island_nusi.h b/include/d/a/obj/d_a_obj_island_nusi.h index 8cb26c77..f4eb33af 100644 --- a/include/d/a/obj/d_a_obj_island_nusi.h +++ b/include/d/a/obj/d_a_obj_island_nusi.h @@ -6,11 +6,10 @@ #include "m/m3d/m_smdl.h" #include "nw4r/g3d/res/g3d_resfile.h" #include "s/s_State.hpp" -#include "s/s_StateMgr.hpp" class dAcOislandNusi_c : public dAcObjBase_c { public: - dAcOislandNusi_c() : mStateMgr(*this, sStateID::null) {} + dAcOislandNusi_c() : mStateMgr(*this) {} virtual ~dAcOislandNusi_c() {} virtual bool createHeap() override; diff --git a/include/d/a/obj/d_a_obj_item_heart_container.h b/include/d/a/obj/d_a_obj_item_heart_container.h index b7702ad8..ee488c4f 100644 --- a/include/d/a/obj/d_a_obj_item_heart_container.h +++ b/include/d/a/obj/d_a_obj_item_heart_container.h @@ -3,7 +3,6 @@ #include "d/a/obj/d_a_obj_base.h" #include "s/s_State.hpp" -#include "s/s_StateMgr.hpp" class dAcOItemHeartContainer_c : public dAcObjBase_c { public: diff --git a/include/d/a/obj/d_a_obj_ivy_rope.h b/include/d/a/obj/d_a_obj_ivy_rope.h index 09038c43..3c1852b1 100644 --- a/include/d/a/obj/d_a_obj_ivy_rope.h +++ b/include/d/a/obj/d_a_obj_ivy_rope.h @@ -17,7 +17,7 @@ class dAcOivyRope_c : public dAcObjBase_c { public: - dAcOivyRope_c() : field_0x330(0), mStateMgr(*this, sStateID::null), mStts2(this), mEvent(*this, nullptr) {} + dAcOivyRope_c() : field_0x330(0), mStateMgr(*this), mStts2(this), mEvent(*this, nullptr) {} virtual ~dAcOivyRope_c(); virtual int create() override; diff --git a/include/d/a/obj/d_a_obj_junk_repairing.h b/include/d/a/obj/d_a_obj_junk_repairing.h index 44bb607b..c40e9c26 100644 --- a/include/d/a/obj/d_a_obj_junk_repairing.h +++ b/include/d/a/obj/d_a_obj_junk_repairing.h @@ -11,7 +11,7 @@ class dMyShadowCircle_c : public m3d::mShadowCircle_c {}; class dAcOJunkRep_c : public dAcObjBase_c { public: - dAcOJunkRep_c() : mStateMgr(*this, sStateID::null), mpModelToUse(nullptr) {} + dAcOJunkRep_c() : mStateMgr(*this), mpModelToUse(nullptr) {} virtual ~dAcOJunkRep_c() {} virtual bool createHeap() override; virtual int create() override; diff --git a/include/d/a/obj/d_a_obj_kanban_stone.h b/include/d/a/obj/d_a_obj_kanban_stone.h index 68945c16..8ebda9ab 100644 --- a/include/d/a/obj/d_a_obj_kanban_stone.h +++ b/include/d/a/obj/d_a_obj_kanban_stone.h @@ -3,11 +3,10 @@ #include "d/a/obj/d_a_obj_base.h" #include "s/s_State.hpp" -#include "s/s_StateMgr.hpp" class dAcOKanbanStone_c : public dAcObjBase_c { public: - dAcOKanbanStone_c() : mStateMgr(*this, sStateID::null) {} + dAcOKanbanStone_c() : mStateMgr(*this) {} virtual ~dAcOKanbanStone_c() {} STATE_FUNC_DECLARE(dAcOKanbanStone_c, Wait); diff --git a/include/d/a/obj/d_a_obj_kibako.h b/include/d/a/obj/d_a_obj_kibako.h index 1b4f24d4..8ebf320f 100644 --- a/include/d/a/obj/d_a_obj_kibako.h +++ b/include/d/a/obj/d_a_obj_kibako.h @@ -3,11 +3,10 @@ #include "d/a/obj/d_a_obj_base.h" #include "s/s_State.hpp" -#include "s/s_StateMgr.hpp" class dAcOkibako_c : public dAcObjBase_c { public: - dAcOkibako_c() : mStateMgr(*this, sStateID::null) {} + dAcOkibako_c() : mStateMgr(*this) {} virtual ~dAcOkibako_c() {} STATE_FUNC_DECLARE(dAcOkibako_c, Wait); diff --git a/include/d/a/obj/d_a_obj_kumite_wall.h b/include/d/a/obj/d_a_obj_kumite_wall.h index b01f66e6..5033de2c 100644 --- a/include/d/a/obj/d_a_obj_kumite_wall.h +++ b/include/d/a/obj/d_a_obj_kumite_wall.h @@ -3,11 +3,10 @@ #include "d/a/obj/d_a_obj_base.h" #include "s/s_State.hpp" -#include "s/s_StateMgr.hpp" class dAcOkumiteWall_c : public dAcObjBase_c { public: - dAcOkumiteWall_c() : mStateMgr(*this, sStateID::null) {} + dAcOkumiteWall_c() : mStateMgr(*this) {} virtual ~dAcOkumiteWall_c() {} STATE_FUNC_DECLARE(dAcOkumiteWall_c, Wait); diff --git a/include/d/a/obj/d_a_obj_lamp.h b/include/d/a/obj/d_a_obj_lamp.h index 251a1bfe..3eb43432 100644 --- a/include/d/a/obj/d_a_obj_lamp.h +++ b/include/d/a/obj/d_a_obj_lamp.h @@ -3,11 +3,10 @@ #include "d/a/obj/d_a_obj_base.h" #include "s/s_State.hpp" -#include "s/s_StateMgr.hpp" class dAcOLamp_c : public dAcObjBase_c { public: - dAcOLamp_c() : mStateMgr(*this, sStateID::null) {} + dAcOLamp_c() : mStateMgr(*this) {} virtual ~dAcOLamp_c() {} STATE_FUNC_DECLARE(dAcOLamp_c, Wait); diff --git a/include/d/a/obj/d_a_obj_lava_d201.h b/include/d/a/obj/d_a_obj_lava_d201.h index f9489f4a..11631af6 100644 --- a/include/d/a/obj/d_a_obj_lava_d201.h +++ b/include/d/a/obj/d_a_obj_lava_d201.h @@ -3,11 +3,10 @@ #include "d/a/obj/d_a_obj_base.h" #include "s/s_State.hpp" -#include "s/s_StateMgr.hpp" class dAcOLavaD201_c : public dAcObjBase_c { public: - dAcOLavaD201_c() : mStateMgr(*this, sStateID::null) {} + dAcOLavaD201_c() : mStateMgr(*this) {} virtual ~dAcOLavaD201_c() {} STATE_FUNC_DECLARE(dAcOLavaD201_c, Wait); diff --git a/include/d/a/obj/d_a_obj_lava_plate.h b/include/d/a/obj/d_a_obj_lava_plate.h index 8ed81b3f..a75287f9 100644 --- a/include/d/a/obj/d_a_obj_lava_plate.h +++ b/include/d/a/obj/d_a_obj_lava_plate.h @@ -3,11 +3,10 @@ #include "d/a/obj/d_a_obj_base.h" #include "s/s_State.hpp" -#include "s/s_StateMgr.hpp" class dAcOLavaPlate_c : public dAcObjBase_c { public: - dAcOLavaPlate_c() : mStateMgr(*this, sStateID::null) {} + dAcOLavaPlate_c() : mStateMgr(*this) {} virtual ~dAcOLavaPlate_c() {} STATE_FUNC_DECLARE(dAcOLavaPlate_c, Wait); diff --git a/include/d/a/obj/d_a_obj_leaf_swing.h b/include/d/a/obj/d_a_obj_leaf_swing.h index d9be189b..65e2e7c8 100644 --- a/include/d/a/obj/d_a_obj_leaf_swing.h +++ b/include/d/a/obj/d_a_obj_leaf_swing.h @@ -3,11 +3,10 @@ #include "d/a/obj/d_a_obj_base.h" #include "s/s_State.hpp" -#include "s/s_StateMgr.hpp" class dAcOleafSwing_c : public dAcObjBase_c { public: - dAcOleafSwing_c() : mStateMgr(*this, sStateID::null) {} + dAcOleafSwing_c() : mStateMgr(*this) {} virtual ~dAcOleafSwing_c() {} STATE_FUNC_DECLARE(dAcOleafSwing_c, SwingCalc); diff --git a/include/d/a/obj/d_a_obj_light_line.h b/include/d/a/obj/d_a_obj_light_line.h index 3e5edf6a..a39de699 100644 --- a/include/d/a/obj/d_a_obj_light_line.h +++ b/include/d/a/obj/d_a_obj_light_line.h @@ -3,11 +3,10 @@ #include "d/a/obj/d_a_obj_base.h" #include "s/s_State.hpp" -#include "s/s_StateMgr.hpp" class dAcOlightLine_c : public dAcObjBase_c { public: - dAcOlightLine_c() : mStateMgr(*this, sStateID::null) {} + dAcOlightLine_c() : mStateMgr(*this) {} virtual ~dAcOlightLine_c() {} STATE_FUNC_DECLARE(dAcOlightLine_c, OutSide); diff --git a/include/d/a/obj/d_a_obj_light_shaft_small.h b/include/d/a/obj/d_a_obj_light_shaft_small.h index fef27133..3a0cf050 100644 --- a/include/d/a/obj/d_a_obj_light_shaft_small.h +++ b/include/d/a/obj/d_a_obj_light_shaft_small.h @@ -3,11 +3,10 @@ #include "d/a/obj/d_a_obj_base.h" #include "s/s_State.hpp" -#include "s/s_StateMgr.hpp" class dAcOLightShaftSmall_c : public dAcObjBase_c { public: - dAcOLightShaftSmall_c() : mStateMgr(*this, sStateID::null) {} + dAcOLightShaftSmall_c() : mStateMgr(*this) {} virtual ~dAcOLightShaftSmall_c() {} STATE_FUNC_DECLARE(dAcOLightShaftSmall_c, Wait); diff --git a/include/d/a/obj/d_a_obj_lighthouse_harp.h b/include/d/a/obj/d_a_obj_lighthouse_harp.h index 2c5f764e..9c0847a8 100644 --- a/include/d/a/obj/d_a_obj_lighthouse_harp.h +++ b/include/d/a/obj/d_a_obj_lighthouse_harp.h @@ -3,11 +3,10 @@ #include "d/a/obj/d_a_obj_base.h" #include "s/s_State.hpp" -#include "s/s_StateMgr.hpp" class dAcOlighthouseHarp_c : public dAcObjBase_c { public: - dAcOlighthouseHarp_c() : mStateMgr(*this, sStateID::null) {} + dAcOlighthouseHarp_c() : mStateMgr(*this) {} virtual ~dAcOlighthouseHarp_c() {} STATE_FUNC_DECLARE(dAcOlighthouseHarp_c, Wait); diff --git a/include/d/a/obj/d_a_obj_lighthouse_light.h b/include/d/a/obj/d_a_obj_lighthouse_light.h index 875aaf1a..838ae556 100644 --- a/include/d/a/obj/d_a_obj_lighthouse_light.h +++ b/include/d/a/obj/d_a_obj_lighthouse_light.h @@ -3,11 +3,10 @@ #include "d/a/obj/d_a_obj_base.h" #include "s/s_State.hpp" -#include "s/s_StateMgr.hpp" class dAcOlighthouseLight_c : public dAcObjBase_c { public: - dAcOlighthouseLight_c() : mStateMgr(*this, sStateID::null) {} + dAcOlighthouseLight_c() : mStateMgr(*this) {} virtual ~dAcOlighthouseLight_c() {} STATE_FUNC_DECLARE(dAcOlighthouseLight_c, Wait); diff --git a/include/d/a/obj/d_a_obj_lock.h b/include/d/a/obj/d_a_obj_lock.h index 071bf5c5..054b543f 100644 --- a/include/d/a/obj/d_a_obj_lock.h +++ b/include/d/a/obj/d_a_obj_lock.h @@ -3,11 +3,10 @@ #include "d/a/obj/d_a_obj_base.h" #include "s/s_State.hpp" -#include "s/s_StateMgr.hpp" class dAcOLock_c : public dAcObjBase_c { public: - dAcOLock_c() : mStateMgr(*this, sStateID::null) {} + dAcOLock_c() : mStateMgr(*this) {} virtual ~dAcOLock_c() {} STATE_FUNC_DECLARE(dAcOLock_c, Wait); diff --git a/include/d/a/obj/d_a_obj_log.h b/include/d/a/obj/d_a_obj_log.h index 0357a724..02ba701b 100644 --- a/include/d/a/obj/d_a_obj_log.h +++ b/include/d/a/obj/d_a_obj_log.h @@ -3,11 +3,10 @@ #include "d/a/obj/d_a_obj_base.h" #include "s/s_State.hpp" -#include "s/s_StateMgr.hpp" class dAcOlog_c : public dAcObjBase_c { public: - dAcOlog_c() : mStateMgr(*this, sStateID::null) {} + dAcOlog_c() : mStateMgr(*this) {} virtual ~dAcOlog_c() {} STATE_FUNC_DECLARE(dAcOlog_c, Wait); diff --git a/include/d/a/obj/d_a_obj_log_water.h b/include/d/a/obj/d_a_obj_log_water.h index 08fc36d9..3fd9f530 100644 --- a/include/d/a/obj/d_a_obj_log_water.h +++ b/include/d/a/obj/d_a_obj_log_water.h @@ -3,11 +3,10 @@ #include "d/a/obj/d_a_obj_base.h" #include "s/s_State.hpp" -#include "s/s_StateMgr.hpp" class dAcOlogWater_c : public dAcObjBase_c { public: - dAcOlogWater_c() : mStateMgr(*this, sStateID::null) {} + dAcOlogWater_c() : mStateMgr(*this) {} virtual ~dAcOlogWater_c() {} STATE_FUNC_DECLARE(dAcOlogWater_c, Wait); diff --git a/include/d/a/obj/d_a_obj_lotus.h b/include/d/a/obj/d_a_obj_lotus.h index 7e0955d4..ec2bdc02 100644 --- a/include/d/a/obj/d_a_obj_lotus.h +++ b/include/d/a/obj/d_a_obj_lotus.h @@ -3,11 +3,10 @@ #include "d/a/obj/d_a_obj_base.h" #include "s/s_State.hpp" -#include "s/s_StateMgr.hpp" class dAcOLotus_c : public dAcObjBase_c { public: - dAcOLotus_c() : mStateMgr(*this, sStateID::null) {} + dAcOLotus_c() : mStateMgr(*this) {} virtual ~dAcOLotus_c() {} STATE_FUNC_DECLARE(dAcOLotus_c, Wait); diff --git a/include/d/a/obj/d_a_obj_lotus_flower.h b/include/d/a/obj/d_a_obj_lotus_flower.h index 4e14d4ad..6aa4d657 100644 --- a/include/d/a/obj/d_a_obj_lotus_flower.h +++ b/include/d/a/obj/d_a_obj_lotus_flower.h @@ -3,11 +3,10 @@ #include "d/a/obj/d_a_obj_base.h" #include "s/s_State.hpp" -#include "s/s_StateMgr.hpp" class dAcOLotusFlower_c : public dAcObjBase_c { public: - dAcOLotusFlower_c() : mStateMgr(*this, sStateID::null) {} + dAcOLotusFlower_c() : mStateMgr(*this) {} virtual ~dAcOLotusFlower_c() {} STATE_FUNC_DECLARE(dAcOLotusFlower_c, Wait); diff --git a/include/d/a/obj/d_a_obj_lotus_seed.h b/include/d/a/obj/d_a_obj_lotus_seed.h index 43875326..d1e4228c 100644 --- a/include/d/a/obj/d_a_obj_lotus_seed.h +++ b/include/d/a/obj/d_a_obj_lotus_seed.h @@ -3,11 +3,10 @@ #include "d/a/obj/d_a_obj_base.h" #include "s/s_State.hpp" -#include "s/s_StateMgr.hpp" class dAcOLotusSeed_c : public dAcObjBase_c { public: - dAcOLotusSeed_c() : mStateMgr(*this, sStateID::null) {} + dAcOLotusSeed_c() : mStateMgr(*this) {} virtual ~dAcOLotusSeed_c() {} STATE_FUNC_DECLARE(dAcOLotusSeed_c, Init); diff --git a/include/d/a/obj/d_a_obj_mg_pumpkin.h b/include/d/a/obj/d_a_obj_mg_pumpkin.h index 2aac75ad..fea5daa9 100644 --- a/include/d/a/obj/d_a_obj_mg_pumpkin.h +++ b/include/d/a/obj/d_a_obj_mg_pumpkin.h @@ -3,11 +3,10 @@ #include "d/a/obj/d_a_obj_base.h" #include "s/s_State.hpp" -#include "s/s_StateMgr.hpp" class dAcOMgPumpkin_c : public dAcObjBase_c { public: - dAcOMgPumpkin_c() : mStateMgr(*this, sStateID::null) {} + dAcOMgPumpkin_c() : mStateMgr(*this) {} virtual ~dAcOMgPumpkin_c() {} STATE_FUNC_DECLARE(dAcOMgPumpkin_c, Wait); diff --git a/include/d/a/obj/d_a_obj_mole_soil.h b/include/d/a/obj/d_a_obj_mole_soil.h index f52fb85c..1f2d2514 100644 --- a/include/d/a/obj/d_a_obj_mole_soil.h +++ b/include/d/a/obj/d_a_obj_mole_soil.h @@ -8,7 +8,7 @@ class dAcOmoleSoil_c : public dAcObjBase_c { public: - dAcOmoleSoil_c() : mStateMgr(*this, sStateID::null) {} + dAcOmoleSoil_c() : mStateMgr(*this) {} virtual ~dAcOmoleSoil_c() {} virtual bool createHeap() override; virtual int create() override; diff --git a/include/d/a/obj/d_a_obj_move_elec.h b/include/d/a/obj/d_a_obj_move_elec.h index 36943a5d..df6c2231 100644 --- a/include/d/a/obj/d_a_obj_move_elec.h +++ b/include/d/a/obj/d_a_obj_move_elec.h @@ -3,11 +3,10 @@ #include "d/a/obj/d_a_obj_base.h" #include "s/s_State.hpp" -#include "s/s_StateMgr.hpp" class dAcOMoveElec_c : public dAcObjBase_c { public: - dAcOMoveElec_c() : mStateMgr(*this, sStateID::null) {} + dAcOMoveElec_c() : mStateMgr(*this) {} virtual ~dAcOMoveElec_c() {} STATE_FUNC_DECLARE(dAcOMoveElec_c, WaitOff); diff --git a/include/d/a/obj/d_a_obj_move_lift_vol.h b/include/d/a/obj/d_a_obj_move_lift_vol.h index 46967c52..24f7436a 100644 --- a/include/d/a/obj/d_a_obj_move_lift_vol.h +++ b/include/d/a/obj/d_a_obj_move_lift_vol.h @@ -3,11 +3,10 @@ #include "d/a/obj/d_a_obj_base.h" #include "s/s_State.hpp" -#include "s/s_StateMgr.hpp" class dAcOmoveLiftVol_c : public dAcObjBase_c { public: - dAcOmoveLiftVol_c() : mStateMgr(*this, sStateID::null) {} + dAcOmoveLiftVol_c() : mStateMgr(*this) {} virtual ~dAcOmoveLiftVol_c() {} STATE_FUNC_DECLARE(dAcOmoveLiftVol_c, Wait); diff --git a/include/d/a/obj/d_a_obj_musasabi.h b/include/d/a/obj/d_a_obj_musasabi.h index 79b87fdd..24f2f9f0 100644 --- a/include/d/a/obj/d_a_obj_musasabi.h +++ b/include/d/a/obj/d_a_obj_musasabi.h @@ -3,11 +3,10 @@ #include "d/a/obj/d_a_obj_base.h" #include "s/s_State.hpp" -#include "s/s_StateMgr.hpp" class dAcOmusasabi_c : public dAcObjBase_c { public: - dAcOmusasabi_c() : mStateMgr(*this, sStateID::null) {} + dAcOmusasabi_c() : mStateMgr(*this) {} virtual ~dAcOmusasabi_c() {} STATE_FUNC_DECLARE(dAcOmusasabi_c, Wait); diff --git a/include/d/a/obj/d_a_obj_mushroom.h b/include/d/a/obj/d_a_obj_mushroom.h index 2822e634..be711fa7 100644 --- a/include/d/a/obj/d_a_obj_mushroom.h +++ b/include/d/a/obj/d_a_obj_mushroom.h @@ -3,11 +3,10 @@ #include "d/a/obj/d_a_obj_base.h" #include "s/s_State.hpp" -#include "s/s_StateMgr.hpp" class dAcOMushRoom_c : public dAcObjBase_c { public: - dAcOMushRoom_c() : mStateMgr(*this, sStateID::null) {} + dAcOMushRoom_c() : mStateMgr(*this) {} virtual ~dAcOMushRoom_c() {} STATE_FUNC_DECLARE(dAcOMushRoom_c, Wait); diff --git a/include/d/a/obj/d_a_obj_needle_desert.h b/include/d/a/obj/d_a_obj_needle_desert.h index 6162cbed..76a51a25 100644 --- a/include/d/a/obj/d_a_obj_needle_desert.h +++ b/include/d/a/obj/d_a_obj_needle_desert.h @@ -3,11 +3,10 @@ #include "d/a/obj/d_a_obj_base.h" #include "s/s_State.hpp" -#include "s/s_StateMgr.hpp" class dAcONeedleDesert_c : public dAcObjBase_c { public: - dAcONeedleDesert_c() : mStateMgr(*this, sStateID::null) {} + dAcONeedleDesert_c() : mStateMgr(*this) {} virtual ~dAcONeedleDesert_c() {} STATE_FUNC_DECLARE(dAcONeedleDesert_c, On); diff --git a/include/d/a/obj/d_a_obj_needle_underground.h b/include/d/a/obj/d_a_obj_needle_underground.h index 1817e765..b7d8c973 100644 --- a/include/d/a/obj/d_a_obj_needle_underground.h +++ b/include/d/a/obj/d_a_obj_needle_underground.h @@ -3,11 +3,10 @@ #include "d/a/obj/d_a_obj_base.h" #include "s/s_State.hpp" -#include "s/s_StateMgr.hpp" class dAcONeedleUnderground_c : public dAcObjBase_c { public: - dAcONeedleUnderground_c() : mStateMgr(*this, sStateID::null) {} + dAcONeedleUnderground_c() : mStateMgr(*this) {} virtual ~dAcONeedleUnderground_c() {} STATE_FUNC_DECLARE(dAcONeedleUnderground_c, RemainOpen); diff --git a/include/d/a/obj/d_a_obj_oct_grass.h b/include/d/a/obj/d_a_obj_oct_grass.h index b60c2692..4a65626c 100644 --- a/include/d/a/obj/d_a_obj_oct_grass.h +++ b/include/d/a/obj/d_a_obj_oct_grass.h @@ -8,7 +8,7 @@ class dAcOOctGrass_c : public dAcObjBase_c { public: - dAcOOctGrass_c() : mStateMgr(*this, sStateID::null) {} + dAcOOctGrass_c() : mStateMgr(*this) {} virtual ~dAcOOctGrass_c() {} virtual bool createHeap() override; diff --git a/include/d/a/obj/d_a_obj_oct_grass_leaf.h b/include/d/a/obj/d_a_obj_oct_grass_leaf.h index e7a71231..0d133de9 100644 --- a/include/d/a/obj/d_a_obj_oct_grass_leaf.h +++ b/include/d/a/obj/d_a_obj_oct_grass_leaf.h @@ -3,11 +3,10 @@ #include "d/a/obj/d_a_obj_base.h" #include "s/s_State.hpp" -#include "s/s_StateMgr.hpp" class dAcOOctGrassLeaf_c : public dAcObjBase_c { public: - dAcOOctGrassLeaf_c() : mStateMgr(*this, sStateID::null) {} + dAcOOctGrassLeaf_c() : mStateMgr(*this) {} virtual ~dAcOOctGrassLeaf_c() {} STATE_FUNC_DECLARE(dAcOOctGrassLeaf_c, Wait); diff --git a/include/d/a/obj/d_a_obj_paint.h b/include/d/a/obj/d_a_obj_paint.h index e614f139..74f9c54e 100644 --- a/include/d/a/obj/d_a_obj_paint.h +++ b/include/d/a/obj/d_a_obj_paint.h @@ -8,7 +8,6 @@ #include "m/m_angle.h" #include "nw4r/g3d/res/g3d_resfile.h" #include "s/s_State.hpp" -#include "s/s_StateMgr.hpp" class dAcOpaint_c : public dAcObjBase_c { public: @@ -17,7 +16,7 @@ public: Groose = 1, }; - dAcOpaint_c() : mStateMgr(*this, sStateID::null) {} + dAcOpaint_c() : mStateMgr(*this) {} virtual ~dAcOpaint_c() {} virtual bool createHeap() override; diff --git a/include/d/a/obj/d_a_obj_pinwheel.h b/include/d/a/obj/d_a_obj_pinwheel.h index 3086cdba..cc519d3d 100644 --- a/include/d/a/obj/d_a_obj_pinwheel.h +++ b/include/d/a/obj/d_a_obj_pinwheel.h @@ -7,11 +7,10 @@ #include "m/m3d/m_smdl.h" #include "nw4r/g3d/res/g3d_resfile.h" #include "s/s_State.hpp" -#include "s/s_StateMgr.hpp" class dAcOpinwheel_c : public dAcObjBase_c { public: - dAcOpinwheel_c() : mStateMgr(*this, sStateID::null) {} + dAcOpinwheel_c() : mStateMgr(*this) {} virtual ~dAcOpinwheel_c() {} virtual bool createHeap() override; diff --git a/include/d/a/obj/d_a_obj_pipe.h b/include/d/a/obj/d_a_obj_pipe.h index 9a8e3778..223cb87f 100644 --- a/include/d/a/obj/d_a_obj_pipe.h +++ b/include/d/a/obj/d_a_obj_pipe.h @@ -3,11 +3,10 @@ #include "d/a/obj/d_a_obj_base.h" #include "s/s_State.hpp" -#include "s/s_StateMgr.hpp" class dAcOPipe_c : public dAcObjBase_c { public: - dAcOPipe_c() : mStateMgr(*this, sStateID::null) {} + dAcOPipe_c() : mStateMgr(*this) {} virtual ~dAcOPipe_c() {} STATE_FUNC_DECLARE(dAcOPipe_c, Hold); diff --git a/include/d/a/obj/d_a_obj_piston.h b/include/d/a/obj/d_a_obj_piston.h index da4dee1a..2e2f1945 100644 --- a/include/d/a/obj/d_a_obj_piston.h +++ b/include/d/a/obj/d_a_obj_piston.h @@ -3,11 +3,10 @@ #include "d/a/obj/d_a_obj_base.h" #include "s/s_State.hpp" -#include "s/s_StateMgr.hpp" class dAcOPiston_c : public dAcObjBase_c { public: - dAcOPiston_c() : mStateMgr(*this, sStateID::null) {} + dAcOPiston_c() : mStateMgr(*this) {} virtual ~dAcOPiston_c() {} STATE_FUNC_DECLARE(dAcOPiston_c, WaitDelay); diff --git a/include/d/a/obj/d_a_obj_pool_cock.h b/include/d/a/obj/d_a_obj_pool_cock.h index 51639126..b4352d18 100644 --- a/include/d/a/obj/d_a_obj_pool_cock.h +++ b/include/d/a/obj/d_a_obj_pool_cock.h @@ -8,7 +8,7 @@ class dAcOPoolCock_c : public dAcObjBase_c { public: - dAcOPoolCock_c() : mStateMgr(*this, sStateID::null) {} + dAcOPoolCock_c() : mStateMgr(*this) {} virtual ~dAcOPoolCock_c() {} virtual bool createHeap() override; virtual int actorCreate() override; diff --git a/include/d/a/obj/d_a_obj_propeller_lift.h b/include/d/a/obj/d_a_obj_propeller_lift.h index 0a5c1366..a842e14e 100644 --- a/include/d/a/obj/d_a_obj_propeller_lift.h +++ b/include/d/a/obj/d_a_obj_propeller_lift.h @@ -3,11 +3,10 @@ #include "d/a/obj/d_a_obj_base.h" #include "s/s_State.hpp" -#include "s/s_StateMgr.hpp" class dAcOPropellerLift_c : public dAcObjBase_c { public: - dAcOPropellerLift_c() : mStateMgr(*this, sStateID::null) {} + dAcOPropellerLift_c() : mStateMgr(*this) {} virtual ~dAcOPropellerLift_c() {} STATE_FUNC_DECLARE(dAcOPropellerLift_c, Normal); diff --git a/include/d/a/obj/d_a_obj_pumpkin_leaf.h b/include/d/a/obj/d_a_obj_pumpkin_leaf.h index 5f96099a..32d7297a 100644 --- a/include/d/a/obj/d_a_obj_pumpkin_leaf.h +++ b/include/d/a/obj/d_a_obj_pumpkin_leaf.h @@ -8,7 +8,7 @@ class dAcOPumpkinLeaf_c : public dAcObjBase_c { public: - dAcOPumpkinLeaf_c() : mStateMgr(*this, sStateID::null) {} + dAcOPumpkinLeaf_c() : mStateMgr(*this) {} virtual ~dAcOPumpkinLeaf_c() {} virtual bool createHeap() override; virtual int create() override; diff --git a/include/d/a/obj/d_a_obj_push_block.h b/include/d/a/obj/d_a_obj_push_block.h index 7409d6e6..cdc0c346 100644 --- a/include/d/a/obj/d_a_obj_push_block.h +++ b/include/d/a/obj/d_a_obj_push_block.h @@ -3,11 +3,10 @@ #include "d/a/obj/d_a_obj_base.h" #include "s/s_State.hpp" -#include "s/s_StateMgr.hpp" class dAcOpushBlk_c : public dAcObjBase_c { public: - dAcOpushBlk_c() : mStateMgr(*this, sStateID::null) {} + dAcOpushBlk_c() : mStateMgr(*this) {} virtual ~dAcOpushBlk_c() {} STATE_FUNC_DECLARE(dAcOpushBlk_c, Wait); diff --git a/include/d/a/obj/d_a_obj_ride_rock.h b/include/d/a/obj/d_a_obj_ride_rock.h index 01224acb..e2cf193b 100644 --- a/include/d/a/obj/d_a_obj_ride_rock.h +++ b/include/d/a/obj/d_a_obj_ride_rock.h @@ -3,11 +3,10 @@ #include "d/a/obj/d_a_obj_base.h" #include "s/s_State.hpp" -#include "s/s_StateMgr.hpp" class dAcOrideRock_c : public dAcObjBase_c { public: - dAcOrideRock_c() : mStateMgr(*this, sStateID::null) {} + dAcOrideRock_c() : mStateMgr(*this) {} virtual ~dAcOrideRock_c() {} STATE_FUNC_DECLARE(dAcOrideRock_c, Wait); diff --git a/include/d/a/obj/d_a_obj_ring.h b/include/d/a/obj/d_a_obj_ring.h index c461b7df..29d8022a 100644 --- a/include/d/a/obj/d_a_obj_ring.h +++ b/include/d/a/obj/d_a_obj_ring.h @@ -7,7 +7,7 @@ class dAcOring_c : public dAcObjBase_c { public: - dAcOring_c() : mStateMgr(*this, sStateID::null) {} + dAcOring_c() : mStateMgr(*this) {} virtual ~dAcOring_c() {} virtual bool createHeap() override; virtual int create() override; diff --git a/include/d/a/obj/d_a_obj_ro_at_target.h b/include/d/a/obj/d_a_obj_ro_at_target.h index 11e48c6e..b27cf847 100644 --- a/include/d/a/obj/d_a_obj_ro_at_target.h +++ b/include/d/a/obj/d_a_obj_ro_at_target.h @@ -3,11 +3,10 @@ #include "d/a/obj/d_a_obj_base.h" #include "s/s_State.hpp" -#include "s/s_StateMgr.hpp" class dAcOroAtTarget_c : public dAcObjBase_c { public: - dAcOroAtTarget_c() : mStateMgr(*this, sStateID::null) {} + dAcOroAtTarget_c() : mStateMgr(*this) {} virtual ~dAcOroAtTarget_c() {} STATE_FUNC_DECLARE(dAcOroAtTarget_c, Wait); diff --git a/include/d/a/obj/d_a_obj_rock_boat.h b/include/d/a/obj/d_a_obj_rock_boat.h index 85278c87..7400581b 100644 --- a/include/d/a/obj/d_a_obj_rock_boat.h +++ b/include/d/a/obj/d_a_obj_rock_boat.h @@ -3,11 +3,10 @@ #include "d/a/obj/d_a_obj_base.h" #include "s/s_State.hpp" -#include "s/s_StateMgr.hpp" class dAcORockBoat_c : public dAcObjBase_c { public: - dAcORockBoat_c() : mStateMgr(*this, sStateID::null) {} + dAcORockBoat_c() : mStateMgr(*this) {} virtual ~dAcORockBoat_c() {} STATE_FUNC_DECLARE(dAcORockBoat_c, Appear); diff --git a/include/d/a/obj/d_a_obj_rock_dragon.h b/include/d/a/obj/d_a_obj_rock_dragon.h index 144e9c21..355e624d 100644 --- a/include/d/a/obj/d_a_obj_rock_dragon.h +++ b/include/d/a/obj/d_a_obj_rock_dragon.h @@ -3,11 +3,10 @@ #include "d/a/obj/d_a_obj_base.h" #include "s/s_State.hpp" -#include "s/s_StateMgr.hpp" class dAcORockDragon_c : public dAcObjBase_c { public: - dAcORockDragon_c() : mStateMgr(*this, sStateID::null) {} + dAcORockDragon_c() : mStateMgr(*this) {} virtual ~dAcORockDragon_c() {} STATE_FUNC_DECLARE(dAcORockDragon_c, Upper_Wait); diff --git a/include/d/a/obj/d_a_obj_roll_pillar.h b/include/d/a/obj/d_a_obj_roll_pillar.h index 2d43fa13..92d226b2 100644 --- a/include/d/a/obj/d_a_obj_roll_pillar.h +++ b/include/d/a/obj/d_a_obj_roll_pillar.h @@ -3,11 +3,10 @@ #include "d/a/obj/d_a_obj_base.h" #include "s/s_State.hpp" -#include "s/s_StateMgr.hpp" class dAcORollPillar_c : public dAcObjBase_c { public: - dAcORollPillar_c() : mStateMgr(*this, sStateID::null) {} + dAcORollPillar_c() : mStateMgr(*this) {} virtual ~dAcORollPillar_c() {} STATE_FUNC_DECLARE(dAcORollPillar_c, Wait); diff --git a/include/d/a/obj/d_a_obj_roll_rock.h b/include/d/a/obj/d_a_obj_roll_rock.h index 8956787e..55a59972 100644 --- a/include/d/a/obj/d_a_obj_roll_rock.h +++ b/include/d/a/obj/d_a_obj_roll_rock.h @@ -3,11 +3,10 @@ #include "d/a/obj/d_a_obj_base.h" #include "s/s_State.hpp" -#include "s/s_StateMgr.hpp" class dAcOrollRock_c : public dAcObjBase_c { public: - dAcOrollRock_c() : mStateMgr(*this, sStateID::null) {} + dAcOrollRock_c() : mStateMgr(*this) {} virtual ~dAcOrollRock_c() {} STATE_FUNC_DECLARE(dAcOrollRock_c, Wait); diff --git a/include/d/a/obj/d_a_obj_rope_igaiga.h b/include/d/a/obj/d_a_obj_rope_igaiga.h index 25178c0f..a41b0fee 100644 --- a/include/d/a/obj/d_a_obj_rope_igaiga.h +++ b/include/d/a/obj/d_a_obj_rope_igaiga.h @@ -9,13 +9,12 @@ #include "m/m_vec.h" #include "nw4r/g3d/res/g3d_resfile.h" #include "s/s_State.hpp" -#include "s/s_StateMgr.hpp" class dAcOivyRope_c; class dAcOropeIgaiga_c : public dAcObjBase_c { public: - dAcOropeIgaiga_c() : mStateMgr(*this, sStateID::null) {} + dAcOropeIgaiga_c() : mStateMgr(*this) {} virtual ~dAcOropeIgaiga_c() {} virtual bool createHeap() override; diff --git a/include/d/a/obj/d_a_obj_roulette_island_c.h b/include/d/a/obj/d_a_obj_roulette_island_c.h index f7da6dcd..eca7efc9 100644 --- a/include/d/a/obj/d_a_obj_roulette_island_c.h +++ b/include/d/a/obj/d_a_obj_roulette_island_c.h @@ -3,7 +3,6 @@ #include "d/a/obj/d_a_obj_base.h" #include "s/s_State.hpp" -#include "s/s_StateMgr.hpp" class dAcOrouletteIslandC_c : public dAcObjBase_c { public: diff --git a/include/d/a/obj/d_a_obj_roulette_island_r.h b/include/d/a/obj/d_a_obj_roulette_island_r.h index 309a4f71..92bf53a9 100644 --- a/include/d/a/obj/d_a_obj_roulette_island_r.h +++ b/include/d/a/obj/d_a_obj_roulette_island_r.h @@ -3,7 +3,6 @@ #include "d/a/obj/d_a_obj_base.h" #include "s/s_State.hpp" -#include "s/s_StateMgr.hpp" class dAcOrouletteIslandR_c : public dAcObjBase_c { public: diff --git a/include/d/a/obj/d_a_obj_ruined_save.h b/include/d/a/obj/d_a_obj_ruined_save.h index 95107c28..8f16906f 100644 --- a/include/d/a/obj/d_a_obj_ruined_save.h +++ b/include/d/a/obj/d_a_obj_ruined_save.h @@ -6,12 +6,11 @@ #include "m/m3d/m_smdl.h" #include "nw4r/g3d/res/g3d_resfile.h" #include "s/s_State.hpp" -#include "s/s_StateMgr.hpp" #include "toBeSorted/actor_event.h" class dAcOruinedSave_c : public dAcObjBase_c { public: - dAcOruinedSave_c() : mStateMgr(*this, sStateID::null), mEvent(*this, nullptr) {} + dAcOruinedSave_c() : mStateMgr(*this), mEvent(*this, nullptr) {} virtual ~dAcOruinedSave_c() {} virtual bool createHeap() override; diff --git a/include/d/a/obj/d_a_obj_sail.h b/include/d/a/obj/d_a_obj_sail.h index 51422320..38312ffa 100644 --- a/include/d/a/obj/d_a_obj_sail.h +++ b/include/d/a/obj/d_a_obj_sail.h @@ -3,11 +3,10 @@ #include "d/a/obj/d_a_obj_base.h" #include "s/s_State.hpp" -#include "s/s_StateMgr.hpp" class dAcOSail_c : public dAcObjBase_c { public: - dAcOSail_c() : mStateMgr(*this, sStateID::null) {} + dAcOSail_c() : mStateMgr(*this) {} virtual ~dAcOSail_c() {} STATE_FUNC_DECLARE(dAcOSail_c, Wait); diff --git a/include/d/a/obj/d_a_obj_sand_D301.h b/include/d/a/obj/d_a_obj_sand_D301.h index 44bffbb8..7bf1a878 100644 --- a/include/d/a/obj/d_a_obj_sand_D301.h +++ b/include/d/a/obj/d_a_obj_sand_D301.h @@ -3,11 +3,10 @@ #include "d/a/obj/d_a_obj_base.h" #include "s/s_State.hpp" -#include "s/s_StateMgr.hpp" class dAcOSandD301_c : public dAcObjBase_c { public: - dAcOSandD301_c() : mStateMgr(*this, sStateID::null) {} + dAcOSandD301_c() : mStateMgr(*this) {} virtual ~dAcOSandD301_c() {} STATE_FUNC_DECLARE(dAcOSandD301_c, Wait); diff --git a/include/d/a/obj/d_a_obj_sand_floor.h b/include/d/a/obj/d_a_obj_sand_floor.h index 90c9caf6..4e4fd631 100644 --- a/include/d/a/obj/d_a_obj_sand_floor.h +++ b/include/d/a/obj/d_a_obj_sand_floor.h @@ -3,11 +3,10 @@ #include "d/a/obj/d_a_obj_base.h" #include "s/s_State.hpp" -#include "s/s_StateMgr.hpp" class dAcOSandFloor_c : public dAcObjBase_c { public: - dAcOSandFloor_c() : mStateMgr(*this, sStateID::null) {} + dAcOSandFloor_c() : mStateMgr(*this) {} virtual ~dAcOSandFloor_c() {} STATE_FUNC_DECLARE(dAcOSandFloor_c, Wait); diff --git a/include/d/a/obj/d_a_obj_sandbag.h b/include/d/a/obj/d_a_obj_sandbag.h index 6be2837c..fc991513 100644 --- a/include/d/a/obj/d_a_obj_sandbag.h +++ b/include/d/a/obj/d_a_obj_sandbag.h @@ -3,11 +3,10 @@ #include "d/a/obj/d_a_obj_base.h" #include "s/s_State.hpp" -#include "s/s_StateMgr.hpp" class dAcOSandbag_c : public dAcObjBase_c { public: - dAcOSandbag_c() : mStateMgr(*this, sStateID::null) {} + dAcOSandbag_c() : mStateMgr(*this) {} virtual ~dAcOSandbag_c() {} STATE_FUNC_DECLARE(dAcOSandbag_c, Wait); diff --git a/include/d/a/obj/d_a_obj_save.h b/include/d/a/obj/d_a_obj_save.h index 9f2222a3..dc54f6a2 100644 --- a/include/d/a/obj/d_a_obj_save.h +++ b/include/d/a/obj/d_a_obj_save.h @@ -3,7 +3,6 @@ #include "d/a/obj/d_a_obj_base.h" #include "s/s_State.hpp" -#include "s/s_StateMgr.hpp" class dAcOSave_c : public dAcObjBase_c { public: diff --git a/include/d/a/obj/d_a_obj_sea_F301.h b/include/d/a/obj/d_a_obj_sea_F301.h index c45c86ab..d6a5f9f9 100644 --- a/include/d/a/obj/d_a_obj_sea_F301.h +++ b/include/d/a/obj/d_a_obj_sea_F301.h @@ -3,11 +3,10 @@ #include "d/a/obj/d_a_obj_base.h" #include "s/s_State.hpp" -#include "s/s_StateMgr.hpp" class dAcOSeaF301_c : public dAcObjBase_c { public: - dAcOSeaF301_c() : mStateMgr(*this, sStateID::null) {} + dAcOSeaF301_c() : mStateMgr(*this) {} virtual ~dAcOSeaF301_c() {} STATE_FUNC_DECLARE(dAcOSeaF301_c, Wait); diff --git a/include/d/a/obj/d_a_obj_sealed_door.h b/include/d/a/obj/d_a_obj_sealed_door.h index ab2ea418..c62d8986 100644 --- a/include/d/a/obj/d_a_obj_sealed_door.h +++ b/include/d/a/obj/d_a_obj_sealed_door.h @@ -3,11 +3,10 @@ #include "d/a/obj/d_a_obj_base.h" #include "s/s_State.hpp" -#include "s/s_StateMgr.hpp" class dAcOsealedDoor_c : public dAcObjBase_c { public: - dAcOsealedDoor_c() : mStateMgr(*this, sStateID::null) {} + dAcOsealedDoor_c() : mStateMgr(*this) {} virtual ~dAcOsealedDoor_c() {} STATE_FUNC_DECLARE(dAcOsealedDoor_c, Wait); diff --git a/include/d/a/obj/d_a_obj_seat_sword.h b/include/d/a/obj/d_a_obj_seat_sword.h index 542fb9b9..7c78a4c0 100644 --- a/include/d/a/obj/d_a_obj_seat_sword.h +++ b/include/d/a/obj/d_a_obj_seat_sword.h @@ -14,14 +14,13 @@ #include "nw4r/math/math_types.h" #include "rvl/MTX/mtx.h" #include "s/s_State.hpp" -#include "s/s_StateMgr.hpp" #include "toBeSorted/actor_event.h" #include "toBeSorted/attention.h" #include "toBeSorted/d_emitter.h" class dAcOSeatSword_c : public dAcObjBase_c { public: - dAcOSeatSword_c() : mEvent(*this, nullptr), mStateMgr(*this, sStateID::null) {} + dAcOSeatSword_c() : mEvent(*this, nullptr), mStateMgr(*this) {} virtual ~dAcOSeatSword_c() {} virtual int create() override; diff --git a/include/d/a/obj/d_a_obj_shed.h b/include/d/a/obj/d_a_obj_shed.h index 58f47398..0558fdeb 100644 --- a/include/d/a/obj/d_a_obj_shed.h +++ b/include/d/a/obj/d_a_obj_shed.h @@ -7,12 +7,11 @@ #include "m/m_vec.h" #include "nw4r/g3d/res/g3d_resfile.h" #include "s/s_State.hpp" -#include "s/s_StateMgr.hpp" #include "toBeSorted/actor_event.h" class dAcOShed_c : public dAcObjBase_c { public: - dAcOShed_c() : mEvent(*this, nullptr), mStateMgr(*this, sStateID::null) {} + dAcOShed_c() : mEvent(*this, nullptr), mStateMgr(*this) {} virtual ~dAcOShed_c() {} virtual bool createHeap() override; diff --git a/include/d/a/obj/d_a_obj_ship_window.h b/include/d/a/obj/d_a_obj_ship_window.h index ece2c7bf..322cbb45 100644 --- a/include/d/a/obj/d_a_obj_ship_window.h +++ b/include/d/a/obj/d_a_obj_ship_window.h @@ -3,11 +3,10 @@ #include "d/a/obj/d_a_obj_base.h" #include "s/s_State.hpp" -#include "s/s_StateMgr.hpp" class dAcOshipWindow_c : public dAcObjBase_c { public: - dAcOshipWindow_c() : mStateMgr(*this, sStateID::null) {} + dAcOshipWindow_c() : mStateMgr(*this) {} virtual ~dAcOshipWindow_c() {} STATE_FUNC_DECLARE(dAcOshipWindow_c, Close); diff --git a/include/d/a/obj/d_a_obj_shutter.h b/include/d/a/obj/d_a_obj_shutter.h index d33554c8..b947e867 100644 --- a/include/d/a/obj/d_a_obj_shutter.h +++ b/include/d/a/obj/d_a_obj_shutter.h @@ -3,11 +3,10 @@ #include "d/a/obj/d_a_obj_door_base.h" #include "s/s_State.hpp" -#include "s/s_StateMgr.hpp" class dAcOShutter_c : public dAcObjDoor_c { public: - dAcOShutter_c() : mStateMgr(*this, sStateID::null) {} + dAcOShutter_c() : mStateMgr(*this) {} virtual ~dAcOShutter_c() {} virtual bool canOpen() override; diff --git a/include/d/a/obj/d_a_obj_shutter_change_scene.h b/include/d/a/obj/d_a_obj_shutter_change_scene.h index 71a8b17f..959d2616 100644 --- a/include/d/a/obj/d_a_obj_shutter_change_scene.h +++ b/include/d/a/obj/d_a_obj_shutter_change_scene.h @@ -3,11 +3,10 @@ #include "d/a/obj/d_a_obj_door_base.h" #include "s/s_State.hpp" -#include "s/s_StateMgr.hpp" class dAcOShutterChangeScene_c : public dAcObjDoor_c { public: - dAcOShutterChangeScene_c() : mStateMgr(*this, sStateID::null) {} + dAcOShutterChangeScene_c() : mStateMgr(*this) {} virtual ~dAcOShutterChangeScene_c() {} virtual bool canOpen() override; diff --git a/include/d/a/obj/d_a_obj_shutter_fence.h b/include/d/a/obj/d_a_obj_shutter_fence.h index 3f3b1061..c963b13b 100644 --- a/include/d/a/obj/d_a_obj_shutter_fence.h +++ b/include/d/a/obj/d_a_obj_shutter_fence.h @@ -3,11 +3,10 @@ #include "d/a/obj/d_a_obj_base.h" #include "s/s_State.hpp" -#include "s/s_StateMgr.hpp" class dAcOshutterfence_c : public dAcObjBase_c { public: - dAcOshutterfence_c() : mStateMgr(*this, sStateID::null) {} + dAcOshutterfence_c() : mStateMgr(*this) {} virtual ~dAcOshutterfence_c() {} STATE_FUNC_DECLARE(dAcOshutterfence_c, Wait); diff --git a/include/d/a/obj/d_a_obj_shutter_waterD101.h b/include/d/a/obj/d_a_obj_shutter_waterD101.h index d2db5253..9ee7ba6c 100644 --- a/include/d/a/obj/d_a_obj_shutter_waterD101.h +++ b/include/d/a/obj/d_a_obj_shutter_waterD101.h @@ -3,11 +3,10 @@ #include "d/a/obj/d_a_obj_base.h" #include "s/s_State.hpp" -#include "s/s_StateMgr.hpp" class dAcOShutterWaterD101_c : public dAcObjBase_c { public: - dAcOShutterWaterD101_c() : mStateMgr(*this, sStateID::null) {} + dAcOShutterWaterD101_c() : mStateMgr(*this) {} virtual ~dAcOShutterWaterD101_c() {} STATE_FUNC_DECLARE(dAcOShutterWaterD101_c, Wait); diff --git a/include/d/a/obj/d_a_obj_side_shutter.h b/include/d/a/obj/d_a_obj_side_shutter.h index ed99a8be..686f1fef 100644 --- a/include/d/a/obj/d_a_obj_side_shutter.h +++ b/include/d/a/obj/d_a_obj_side_shutter.h @@ -3,11 +3,10 @@ #include "d/a/obj/d_a_obj_base.h" #include "s/s_State.hpp" -#include "s/s_StateMgr.hpp" class dAcOsideShutter_c : public dAcObjBase_c { public: - dAcOsideShutter_c() : mStateMgr(*this, sStateID::null) {} + dAcOsideShutter_c() : mStateMgr(*this) {} virtual ~dAcOsideShutter_c() {} STATE_FUNC_DECLARE(dAcOsideShutter_c, Off); diff --git a/include/d/a/obj/d_a_obj_sink_floor_f.h b/include/d/a/obj/d_a_obj_sink_floor_f.h index 41d56728..053465a0 100644 --- a/include/d/a/obj/d_a_obj_sink_floor_f.h +++ b/include/d/a/obj/d_a_obj_sink_floor_f.h @@ -3,11 +3,10 @@ #include "d/a/obj/d_a_obj_base.h" #include "s/s_State.hpp" -#include "s/s_StateMgr.hpp" class dAcOSinkFloorF_c : public dAcObjBase_c { public: - dAcOSinkFloorF_c() : mStateMgr(*this, sStateID::null) {} + dAcOSinkFloorF_c() : mStateMgr(*this) {} virtual ~dAcOSinkFloorF_c() {} STATE_FUNC_DECLARE(dAcOSinkFloorF_c, Wait); diff --git a/include/d/a/obj/d_a_obj_skull.h b/include/d/a/obj/d_a_obj_skull.h index 05a0da74..4db575c1 100644 --- a/include/d/a/obj/d_a_obj_skull.h +++ b/include/d/a/obj/d_a_obj_skull.h @@ -3,11 +3,10 @@ #include "d/a/obj/d_a_obj_base.h" #include "s/s_State.hpp" -#include "s/s_StateMgr.hpp" class dAcOSkull_c : public dAcObjBase_c { public: - dAcOSkull_c() : mStateMgr(*this, sStateID::null) {} + dAcOSkull_c() : mStateMgr(*this) {} virtual ~dAcOSkull_c() {} STATE_FUNC_DECLARE(dAcOSkull_c, NormalWait); diff --git a/include/d/a/obj/d_a_obj_slice_log.h b/include/d/a/obj/d_a_obj_slice_log.h index fe50eb78..f6a92d27 100644 --- a/include/d/a/obj/d_a_obj_slice_log.h +++ b/include/d/a/obj/d_a_obj_slice_log.h @@ -3,11 +3,10 @@ #include "d/a/obj/d_a_obj_base.h" #include "s/s_State.hpp" -#include "s/s_StateMgr.hpp" class dAcOsliceLog_c : public dAcObjBase_c { public: - dAcOsliceLog_c() : mStateMgr(*this, sStateID::null) {} + dAcOsliceLog_c() : mStateMgr(*this) {} virtual ~dAcOsliceLog_c() {} STATE_FUNC_DECLARE(dAcOsliceLog_c, Fall); diff --git a/include/d/a/obj/d_a_obj_slice_log_parts.h b/include/d/a/obj/d_a_obj_slice_log_parts.h index 0691def7..6caac58e 100644 --- a/include/d/a/obj/d_a_obj_slice_log_parts.h +++ b/include/d/a/obj/d_a_obj_slice_log_parts.h @@ -3,11 +3,10 @@ #include "d/a/e/d_a_en_base.h" #include "s/s_State.hpp" -#include "s/s_StateMgr.hpp" class dAcOsliceLogParts_c : public dAcEnBase_c { public: - dAcOsliceLogParts_c() : mStateMgr(*this, sStateID::null) {} + dAcOsliceLogParts_c() : mStateMgr(*this) {} virtual ~dAcOsliceLogParts_c() {} STATE_FUNC_DECLARE(dAcOsliceLogParts_c, Wait); diff --git a/include/d/a/obj/d_a_obj_smoke.h b/include/d/a/obj/d_a_obj_smoke.h index cb833878..755a5124 100644 --- a/include/d/a/obj/d_a_obj_smoke.h +++ b/include/d/a/obj/d_a_obj_smoke.h @@ -9,7 +9,7 @@ class dAcOsmoke_c : public dAcObjBase_c { public: - dAcOsmoke_c() : mStateMgr(*this, sStateID::null) {} + dAcOsmoke_c() : mStateMgr(*this) {} virtual ~dAcOsmoke_c() {} virtual bool createHeap() override; virtual int create() override; diff --git a/include/d/a/obj/d_a_obj_soil.h b/include/d/a/obj/d_a_obj_soil.h index 4dcc4dde..703fcc9a 100644 --- a/include/d/a/obj/d_a_obj_soil.h +++ b/include/d/a/obj/d_a_obj_soil.h @@ -11,7 +11,6 @@ #include "nw4r/g3d/res/g3d_resfile.h" #include "rvl/GX/GXTypes.h" #include "s/s_State.hpp" -#include "s/s_StateMgr.hpp" #include "toBeSorted/dowsing_target.h" class dAcTbox_c; @@ -19,7 +18,7 @@ class dTgInsect_c; class dAcOsoil_c : public dAcObjBase_c { public: - dAcOsoil_c() : mStateMgr(*this, sStateID::null), mResFile(nullptr), mDowsingTarget(this, DowsingTarget::SLOT_NONE) {} + dAcOsoil_c() : mStateMgr(*this), mResFile(nullptr), mDowsingTarget(this, DowsingTarget::SLOT_NONE) {} virtual ~dAcOsoil_c() {} STATE_FUNC_DECLARE(dAcOsoil_c, Soil); diff --git a/include/d/a/obj/d_a_obj_spider_line.h b/include/d/a/obj/d_a_obj_spider_line.h index edd7ef00..b1ab3128 100644 --- a/include/d/a/obj/d_a_obj_spider_line.h +++ b/include/d/a/obj/d_a_obj_spider_line.h @@ -3,11 +3,10 @@ #include "d/a/obj/d_a_obj_base.h" #include "s/s_State.hpp" -#include "s/s_StateMgr.hpp" class dObjSpiderLine_c : public dAcObjBase_c { public: - dObjSpiderLine_c() : mStateMgr(*this, sStateID::null) {} + dObjSpiderLine_c() : mStateMgr(*this) {} virtual ~dObjSpiderLine_c() {} STATE_FUNC_DECLARE(dObjSpiderLine_c, Wait); diff --git a/include/d/a/obj/d_a_obj_spike.h b/include/d/a/obj/d_a_obj_spike.h index 783152ab..79b97750 100644 --- a/include/d/a/obj/d_a_obj_spike.h +++ b/include/d/a/obj/d_a_obj_spike.h @@ -11,7 +11,7 @@ class dAcOspike_c : public dAcObjBase_c { public: - dAcOspike_c() : mStateMgr(*this, sStateID::null) {} + dAcOspike_c() : mStateMgr(*this) {} virtual ~dAcOspike_c() {} virtual bool createHeap() override; virtual int create() override; diff --git a/include/d/a/obj/d_a_obj_stage_cover.h b/include/d/a/obj/d_a_obj_stage_cover.h index e7c07e82..ec73f80f 100644 --- a/include/d/a/obj/d_a_obj_stage_cover.h +++ b/include/d/a/obj/d_a_obj_stage_cover.h @@ -8,7 +8,7 @@ class dAcOstageCover_c : public dAcObjBase_c { public: - dAcOstageCover_c() : mStateMgr(*this, sStateID::null) {} + dAcOstageCover_c() : mStateMgr(*this) {} virtual ~dAcOstageCover_c() {} virtual bool createHeap() override; virtual int create() override; diff --git a/include/d/a/obj/d_a_obj_stage_crack.h b/include/d/a/obj/d_a_obj_stage_crack.h index 2d1339d2..360ba096 100644 --- a/include/d/a/obj/d_a_obj_stage_crack.h +++ b/include/d/a/obj/d_a_obj_stage_crack.h @@ -3,11 +3,10 @@ #include "d/a/obj/d_a_obj_base.h" #include "s/s_State.hpp" -#include "s/s_StateMgr.hpp" class dAcOstageCrack_c : public dAcObjBase_c { public: - dAcOstageCrack_c() : mStateMgr(*this, sStateID::null) {} + dAcOstageCrack_c() : mStateMgr(*this) {} virtual ~dAcOstageCrack_c() {} STATE_FUNC_DECLARE(dAcOstageCrack_c, Wait); diff --git a/include/d/a/obj/d_a_obj_stage_debris.h b/include/d/a/obj/d_a_obj_stage_debris.h index 7e482fda..3a29fda4 100644 --- a/include/d/a/obj/d_a_obj_stage_debris.h +++ b/include/d/a/obj/d_a_obj_stage_debris.h @@ -3,11 +3,10 @@ #include "d/a/obj/d_a_obj_base.h" #include "s/s_State.hpp" -#include "s/s_StateMgr.hpp" class dAcOstageDebris_c : public dAcObjBase_c { public: - dAcOstageDebris_c() : mStateMgr(*this, sStateID::null) {} + dAcOstageDebris_c() : mStateMgr(*this) {} virtual ~dAcOstageDebris_c() {} STATE_FUNC_DECLARE(dAcOstageDebris_c, Wait); diff --git a/include/d/a/obj/d_a_obj_stage_kraken.h b/include/d/a/obj/d_a_obj_stage_kraken.h index 1b0ab998..2476ce6d 100644 --- a/include/d/a/obj/d_a_obj_stage_kraken.h +++ b/include/d/a/obj/d_a_obj_stage_kraken.h @@ -3,11 +3,10 @@ #include "d/a/obj/d_a_obj_base.h" #include "s/s_State.hpp" -#include "s/s_StateMgr.hpp" class dAcOstageKraken_c : public dAcObjBase_c { public: - dAcOstageKraken_c() : mStateMgr(*this, sStateID::null) {} + dAcOstageKraken_c() : mStateMgr(*this) {} virtual ~dAcOstageKraken_c() {} STATE_FUNC_DECLARE(dAcOstageKraken_c, Wait); diff --git a/include/d/a/obj/d_a_obj_stage_kraken_parts.h b/include/d/a/obj/d_a_obj_stage_kraken_parts.h index a2c434a1..2c1e802e 100644 --- a/include/d/a/obj/d_a_obj_stage_kraken_parts.h +++ b/include/d/a/obj/d_a_obj_stage_kraken_parts.h @@ -3,11 +3,10 @@ #include "d/a/obj/d_a_obj_base.h" #include "s/s_State.hpp" -#include "s/s_StateMgr.hpp" class dAcOstageKrakenParts_c : public dAcObjBase_c { public: - dAcOstageKrakenParts_c() : mStateMgr(*this, sStateID::null) {} + dAcOstageKrakenParts_c() : mStateMgr(*this) {} virtual ~dAcOstageKrakenParts_c() {} STATE_FUNC_DECLARE(dAcOstageKrakenParts_c, Shake); diff --git a/include/d/a/obj/d_a_obj_stage_sink.h b/include/d/a/obj/d_a_obj_stage_sink.h index 7a0340b4..42151937 100644 --- a/include/d/a/obj/d_a_obj_stage_sink.h +++ b/include/d/a/obj/d_a_obj_stage_sink.h @@ -6,7 +6,7 @@ class dAcOstageSink_c : public dAcObjBase_c { public: - dAcOstageSink_c() : mStateMgr(*this, sStateID::null) {} + dAcOstageSink_c() : mStateMgr(*this) {} virtual ~dAcOstageSink_c() {} STATE_FUNC_DECLARE(dAcOstageSink_c, Wait); diff --git a/include/d/a/obj/d_a_obj_stage_water.h b/include/d/a/obj/d_a_obj_stage_water.h index 0a9f70d4..eff691f7 100644 --- a/include/d/a/obj/d_a_obj_stage_water.h +++ b/include/d/a/obj/d_a_obj_stage_water.h @@ -3,11 +3,10 @@ #include "d/a/obj/d_a_obj_base.h" #include "s/s_State.hpp" -#include "s/s_StateMgr.hpp" class dAcOstageWater_c : public dAcObjBase_c { public: - dAcOstageWater_c() : mStateMgr(*this, sStateID::null) {} + dAcOstageWater_c() : mStateMgr(*this) {} virtual ~dAcOstageWater_c() {} STATE_FUNC_DECLARE(dAcOstageWater_c, Wait); diff --git a/include/d/a/obj/d_a_obj_step_gumarm.h b/include/d/a/obj/d_a_obj_step_gumarm.h index 5e382bf2..ffb98159 100644 --- a/include/d/a/obj/d_a_obj_step_gumarm.h +++ b/include/d/a/obj/d_a_obj_step_gumarm.h @@ -3,11 +3,10 @@ #include "d/a/obj/d_a_obj_base.h" #include "s/s_State.hpp" -#include "s/s_StateMgr.hpp" class dAcOStepGumarm_c : public dAcObjBase_c { public: - dAcOStepGumarm_c() : mStateMgr(*this, sStateID::null) {} + dAcOStepGumarm_c() : mStateMgr(*this) {} virtual ~dAcOStepGumarm_c() {} STATE_FUNC_DECLARE(dAcOStepGumarm_c, Wait); diff --git a/include/d/a/obj/d_a_obj_step_statue.h b/include/d/a/obj/d_a_obj_step_statue.h index 8a7548a9..954a99b6 100644 --- a/include/d/a/obj/d_a_obj_step_statue.h +++ b/include/d/a/obj/d_a_obj_step_statue.h @@ -3,11 +3,10 @@ #include "d/a/obj/d_a_obj_base.h" #include "s/s_State.hpp" -#include "s/s_StateMgr.hpp" class dAcOStepStatue_c : public dAcObjBase_c { public: - dAcOStepStatue_c() : mStateMgr(*this, sStateID::null) {} + dAcOStepStatue_c() : mStateMgr(*this) {} virtual ~dAcOStepStatue_c() {} STATE_FUNC_DECLARE(dAcOStepStatue_c, Wait); diff --git a/include/d/a/obj/d_a_obj_step_time_slip.h b/include/d/a/obj/d_a_obj_step_time_slip.h index cf920a77..00099dbb 100644 --- a/include/d/a/obj/d_a_obj_step_time_slip.h +++ b/include/d/a/obj/d_a_obj_step_time_slip.h @@ -3,11 +3,10 @@ #include "d/a/obj/d_a_obj_base.h" #include "s/s_State.hpp" -#include "s/s_StateMgr.hpp" class dAcOStepTimeSlip_c : public dAcObjBase_c { public: - dAcOStepTimeSlip_c() : mStateMgr(*this, sStateID::null) {} + dAcOStepTimeSlip_c() : mStateMgr(*this) {} virtual ~dAcOStepTimeSlip_c() {} STATE_FUNC_DECLARE(dAcOStepTimeSlip_c, Wait); diff --git a/include/d/a/obj/d_a_obj_stone_stand.h b/include/d/a/obj/d_a_obj_stone_stand.h index 8482bdf2..c44ed5cc 100644 --- a/include/d/a/obj/d_a_obj_stone_stand.h +++ b/include/d/a/obj/d_a_obj_stone_stand.h @@ -3,11 +3,10 @@ #include "d/a/obj/d_a_obj_base.h" #include "s/s_State.hpp" -#include "s/s_StateMgr.hpp" class dAcOStoneStand_c : public dAcObjBase_c { public: - dAcOStoneStand_c() : mStateMgr(*this, sStateID::null) {} + dAcOStoneStand_c() : mStateMgr(*this) {} virtual ~dAcOStoneStand_c() {} STATE_FUNC_DECLARE(dAcOStoneStand_c, Wait); diff --git a/include/d/a/obj/d_a_obj_stopper_rock.h b/include/d/a/obj/d_a_obj_stopper_rock.h index 11e9c190..160e95ce 100644 --- a/include/d/a/obj/d_a_obj_stopper_rock.h +++ b/include/d/a/obj/d_a_obj_stopper_rock.h @@ -3,11 +3,10 @@ #include "d/a/obj/d_a_obj_base.h" #include "s/s_State.hpp" -#include "s/s_StateMgr.hpp" class dAcOstopperRock_c : public dAcObjBase_c { public: - dAcOstopperRock_c() : mStateMgr(*this, sStateID::null) {} + dAcOstopperRock_c() : mStateMgr(*this) {} virtual ~dAcOstopperRock_c() {} STATE_FUNC_DECLARE(dAcOstopperRock_c, Wait); diff --git a/include/d/a/obj/d_a_obj_stopping_rope.h b/include/d/a/obj/d_a_obj_stopping_rope.h index 6d5fb773..fdf1dd34 100644 --- a/include/d/a/obj/d_a_obj_stopping_rope.h +++ b/include/d/a/obj/d_a_obj_stopping_rope.h @@ -11,7 +11,7 @@ class dAcOStoppingRope_c : public dAcObjBase_c { public: - dAcOStoppingRope_c() : mStateMgr(*this, sStateID::null) {} + dAcOStoppingRope_c() : mStateMgr(*this) {} virtual ~dAcOStoppingRope_c() {} virtual bool createHeap() override; diff --git a/include/d/a/obj/d_a_obj_stream_lava.h b/include/d/a/obj/d_a_obj_stream_lava.h index 78857b24..338b7223 100644 --- a/include/d/a/obj/d_a_obj_stream_lava.h +++ b/include/d/a/obj/d_a_obj_stream_lava.h @@ -13,7 +13,7 @@ class dAcOstreamLava_c : public dAcObjBase_c { public: - dAcOstreamLava_c() : mStateMgr(*this, sStateID::null), mEvent(*this, nullptr), mScnCallback(this) {} + dAcOstreamLava_c() : mStateMgr(*this), mEvent(*this, nullptr), mScnCallback(this) {} virtual int create() override; virtual int doDelete() override; virtual int draw() override; diff --git a/include/d/a/obj/d_a_obj_sun_light.h b/include/d/a/obj/d_a_obj_sun_light.h index 7c0b52ef..c28bc66f 100644 --- a/include/d/a/obj/d_a_obj_sun_light.h +++ b/include/d/a/obj/d_a_obj_sun_light.h @@ -9,7 +9,7 @@ class dAcOsunLight_c : public dAcObjBase_c { public: - dAcOsunLight_c() : mStateMgr(*this, sStateID::null) {} + dAcOsunLight_c() : mStateMgr(*this) {} virtual ~dAcOsunLight_c() {} virtual bool createHeap() override; virtual int create() override; diff --git a/include/d/a/obj/d_a_obj_sw_bank.h b/include/d/a/obj/d_a_obj_sw_bank.h index 8e8117bb..30297e6d 100644 --- a/include/d/a/obj/d_a_obj_sw_bank.h +++ b/include/d/a/obj/d_a_obj_sw_bank.h @@ -3,11 +3,10 @@ #include "d/a/obj/d_a_obj_base.h" #include "s/s_State.hpp" -#include "s/s_StateMgr.hpp" class dAcOSwBank_c : public dAcObjBase_c { public: - dAcOSwBank_c() : mStateMgr(*this, sStateID::null) {} + dAcOSwBank_c() : mStateMgr(*this) {} virtual ~dAcOSwBank_c() {} STATE_FUNC_DECLARE(dAcOSwBank_c, Wait); diff --git a/include/d/a/obj/d_a_obj_sw_bank_small.h b/include/d/a/obj/d_a_obj_sw_bank_small.h index 2e9502f5..38db45cb 100644 --- a/include/d/a/obj/d_a_obj_sw_bank_small.h +++ b/include/d/a/obj/d_a_obj_sw_bank_small.h @@ -3,11 +3,10 @@ #include "d/a/obj/d_a_obj_base.h" #include "s/s_State.hpp" -#include "s/s_StateMgr.hpp" class dAcOSwBankSmall_c : public dAcObjBase_c { public: - dAcOSwBankSmall_c() : mStateMgr(*this, sStateID::null) {} + dAcOSwBankSmall_c() : mStateMgr(*this) {} virtual ~dAcOSwBankSmall_c() {} STATE_FUNC_DECLARE(dAcOSwBankSmall_c, Wait); diff --git a/include/d/a/obj/d_a_obj_sw_dir.h b/include/d/a/obj/d_a_obj_sw_dir.h index ba067f76..ba81e61f 100644 --- a/include/d/a/obj/d_a_obj_sw_dir.h +++ b/include/d/a/obj/d_a_obj_sw_dir.h @@ -3,11 +3,10 @@ #include "d/a/obj/d_a_obj_base.h" #include "s/s_State.hpp" -#include "s/s_StateMgr.hpp" class dAcOSwDir_c : public dAcObjBase_c { public: - dAcOSwDir_c() : mStateMgr(*this, sStateID::null) {} + dAcOSwDir_c() : mStateMgr(*this) {} virtual ~dAcOSwDir_c() {} STATE_FUNC_DECLARE(dAcOSwDir_c, Wait); diff --git a/include/d/a/obj/d_a_obj_sw_dir_door.h b/include/d/a/obj/d_a_obj_sw_dir_door.h index 77794810..e9b3221f 100644 --- a/include/d/a/obj/d_a_obj_sw_dir_door.h +++ b/include/d/a/obj/d_a_obj_sw_dir_door.h @@ -3,11 +3,10 @@ #include "d/a/obj/d_a_obj_base.h" #include "s/s_State.hpp" -#include "s/s_StateMgr.hpp" class dAcOSwDirDoor_c : public dAcObjBase_c { public: - dAcOSwDirDoor_c() : mStateMgr(*this, sStateID::null) {} + dAcOSwDirDoor_c() : mStateMgr(*this) {} virtual ~dAcOSwDirDoor_c() {} STATE_FUNC_DECLARE(dAcOSwDirDoor_c, Wait); diff --git a/include/d/a/obj/d_a_obj_sw_harp.h b/include/d/a/obj/d_a_obj_sw_harp.h index e1999504..f234c21e 100644 --- a/include/d/a/obj/d_a_obj_sw_harp.h +++ b/include/d/a/obj/d_a_obj_sw_harp.h @@ -3,11 +3,10 @@ #include "d/a/obj/d_a_obj_base.h" #include "s/s_State.hpp" -#include "s/s_StateMgr.hpp" class dAcOSwHarp_c : public dAcObjBase_c { public: - dAcOSwHarp_c() : mStateMgr(*this, sStateID::null) {} + dAcOSwHarp_c() : mStateMgr(*this) {} virtual ~dAcOSwHarp_c() {} STATE_FUNC_DECLARE(dAcOSwHarp_c, Wait); diff --git a/include/d/a/obj/d_a_obj_sw_sword_beam.h b/include/d/a/obj/d_a_obj_sw_sword_beam.h index a3c6703c..b5f5aead 100644 --- a/include/d/a/obj/d_a_obj_sw_sword_beam.h +++ b/include/d/a/obj/d_a_obj_sw_sword_beam.h @@ -3,11 +3,10 @@ #include "d/a/obj/d_a_obj_base.h" #include "s/s_State.hpp" -#include "s/s_StateMgr.hpp" class dAcOSwSwordBeam_c : public dAcObjBase_c { public: - dAcOSwSwordBeam_c() : mStateMgr(*this, sStateID::null) {} + dAcOSwSwordBeam_c() : mStateMgr(*this) {} virtual ~dAcOSwSwordBeam_c() {} STATE_FUNC_DECLARE(dAcOSwSwordBeam_c, Wait); diff --git a/include/d/a/obj/d_a_obj_sw_syako.h b/include/d/a/obj/d_a_obj_sw_syako.h index 39781114..5b74b346 100644 --- a/include/d/a/obj/d_a_obj_sw_syako.h +++ b/include/d/a/obj/d_a_obj_sw_syako.h @@ -3,11 +3,10 @@ #include "d/a/obj/d_a_obj_base.h" #include "s/s_State.hpp" -#include "s/s_StateMgr.hpp" class dAcOSwSyako_c : public dAcObjBase_c { public: - dAcOSwSyako_c() : mStateMgr(*this, sStateID::null) {} + dAcOSwSyako_c() : mStateMgr(*this) {} virtual ~dAcOSwSyako_c() {} STATE_FUNC_DECLARE(dAcOSwSyako_c, Wait); diff --git a/include/d/a/obj/d_a_obj_sw_whiplever.h b/include/d/a/obj/d_a_obj_sw_whiplever.h index cdc5499c..331521f6 100644 --- a/include/d/a/obj/d_a_obj_sw_whiplever.h +++ b/include/d/a/obj/d_a_obj_sw_whiplever.h @@ -3,11 +3,10 @@ #include "d/a/obj/d_a_obj_base.h" #include "s/s_State.hpp" -#include "s/s_StateMgr.hpp" class dAcOSwWhipLever_c : public dAcObjBase_c { public: - dAcOSwWhipLever_c() : mStateMgr(*this, sStateID::null) {} + dAcOSwWhipLever_c() : mStateMgr(*this) {} virtual ~dAcOSwWhipLever_c() {} STATE_FUNC_DECLARE(dAcOSwWhipLever_c, Wait); diff --git a/include/d/a/obj/d_a_obj_swhit.h b/include/d/a/obj/d_a_obj_swhit.h index fec7f019..9287464e 100644 --- a/include/d/a/obj/d_a_obj_swhit.h +++ b/include/d/a/obj/d_a_obj_swhit.h @@ -3,11 +3,10 @@ #include "d/a/obj/d_a_obj_base.h" #include "s/s_State.hpp" -#include "s/s_StateMgr.hpp" class dAcOswhit_c : public dAcObjBase_c { public: - dAcOswhit_c() : mStateMgr(*this, sStateID::null) {} + dAcOswhit_c() : mStateMgr(*this) {} virtual ~dAcOswhit_c() {} STATE_FUNC_DECLARE(dAcOswhit_c, OnWait); diff --git a/include/d/a/obj/d_a_obj_switch.h b/include/d/a/obj/d_a_obj_switch.h index bde9d8cc..90428b87 100644 --- a/include/d/a/obj/d_a_obj_switch.h +++ b/include/d/a/obj/d_a_obj_switch.h @@ -41,7 +41,7 @@ public: class dAcOsw_c : public dAcObjBase_c { public: - dAcOsw_c() : mStateMgr(*this, sStateID::null), field_0x5A0(0.0f) {} + dAcOsw_c() : mStateMgr(*this), field_0x5A0(0.0f) {} virtual ~dAcOsw_c() {} virtual int actorCreate() override; diff --git a/include/d/a/obj/d_a_obj_switch_shutter.h b/include/d/a/obj/d_a_obj_switch_shutter.h index 8e13afa6..33ae73ec 100644 --- a/include/d/a/obj/d_a_obj_switch_shutter.h +++ b/include/d/a/obj/d_a_obj_switch_shutter.h @@ -3,11 +3,10 @@ #include "d/a/obj/d_a_obj_base.h" #include "s/s_State.hpp" -#include "s/s_StateMgr.hpp" class dAcOSwShutter_c : public dAcObjBase_c { public: - dAcOSwShutter_c() : mStateMgr(*this, sStateID::null) {} + dAcOSwShutter_c() : mStateMgr(*this) {} virtual ~dAcOSwShutter_c() {} STATE_FUNC_DECLARE(dAcOSwShutter_c, Wait); diff --git a/include/d/a/obj/d_a_obj_switch_wall.h b/include/d/a/obj/d_a_obj_switch_wall.h index a132aea0..91445163 100644 --- a/include/d/a/obj/d_a_obj_switch_wall.h +++ b/include/d/a/obj/d_a_obj_switch_wall.h @@ -3,11 +3,10 @@ #include "d/a/obj/d_a_obj_base.h" #include "s/s_State.hpp" -#include "s/s_StateMgr.hpp" class dAcOswitchWall_c : public dAcObjBase_c { public: - dAcOswitchWall_c() : mStateMgr(*this, sStateID::null) {} + dAcOswitchWall_c() : mStateMgr(*this) {} virtual ~dAcOswitchWall_c() {} STATE_FUNC_DECLARE(dAcOswitchWall_c, Up); diff --git a/include/d/a/obj/d_a_obj_sword_candle.h b/include/d/a/obj/d_a_obj_sword_candle.h index 3afc0b7a..3d5d649b 100644 --- a/include/d/a/obj/d_a_obj_sword_candle.h +++ b/include/d/a/obj/d_a_obj_sword_candle.h @@ -3,11 +3,10 @@ #include "d/a/obj/d_a_obj_base.h" #include "s/s_State.hpp" -#include "s/s_StateMgr.hpp" class dAcOSwordCandle_c : public dAcObjBase_c { public: - dAcOSwordCandle_c() : mStateMgr(*this, sStateID::null) {} + dAcOSwordCandle_c() : mStateMgr(*this) {} virtual ~dAcOSwordCandle_c() {} STATE_FUNC_DECLARE(dAcOSwordCandle_c, Wait); diff --git a/include/d/a/obj/d_a_obj_sword_stab.h b/include/d/a/obj/d_a_obj_sword_stab.h index 535d6d58..edfe0cbd 100644 --- a/include/d/a/obj/d_a_obj_sword_stab.h +++ b/include/d/a/obj/d_a_obj_sword_stab.h @@ -3,11 +3,10 @@ #include "d/a/obj/d_a_obj_base.h" #include "s/s_State.hpp" -#include "s/s_StateMgr.hpp" class dAcOSwordStab_c : public dAcObjBase_c { public: - dAcOSwordStab_c() : mStateMgr(*this, sStateID::null) {} + dAcOSwordStab_c() : mStateMgr(*this) {} virtual ~dAcOSwordStab_c() {} STATE_FUNC_DECLARE(dAcOSwordStab_c, Wait); diff --git a/include/d/a/obj/d_a_obj_swrd_prj.h b/include/d/a/obj/d_a_obj_swrd_prj.h index afb48f5f..202cca93 100644 --- a/include/d/a/obj/d_a_obj_swrd_prj.h +++ b/include/d/a/obj/d_a_obj_swrd_prj.h @@ -3,7 +3,6 @@ #include "d/a/obj/d_a_obj_base.h" #include "s/s_State.hpp" -#include "s/s_StateMgr.hpp" class dAcOSwrdPrj : public dAcObjBase_c { public: diff --git a/include/d/a/obj/d_a_obj_syako_shutter.h b/include/d/a/obj/d_a_obj_syako_shutter.h index c43ba1cf..64466633 100644 --- a/include/d/a/obj/d_a_obj_syako_shutter.h +++ b/include/d/a/obj/d_a_obj_syako_shutter.h @@ -3,11 +3,10 @@ #include "d/a/obj/d_a_obj_base.h" #include "s/s_State.hpp" -#include "s/s_StateMgr.hpp" class dAcOSyakoShutter_c : public dAcObjBase_c { public: - dAcOSyakoShutter_c() : mStateMgr(*this, sStateID::null) {} + dAcOSyakoShutter_c() : mStateMgr(*this) {} virtual ~dAcOSyakoShutter_c() {} STATE_FUNC_DECLARE(dAcOSyakoShutter_c, Wait); diff --git a/include/d/a/obj/d_a_obj_tableware.h b/include/d/a/obj/d_a_obj_tableware.h index 3cabbf9d..b597cf52 100644 --- a/include/d/a/obj/d_a_obj_tableware.h +++ b/include/d/a/obj/d_a_obj_tableware.h @@ -3,11 +3,10 @@ #include "d/a/obj/d_a_obj_base.h" #include "s/s_State.hpp" -#include "s/s_StateMgr.hpp" class dAcOTableWare_c : public dAcObjBase_c { public: - dAcOTableWare_c() : mStateMgr(*this, sStateID::null) {} + dAcOTableWare_c() : mStateMgr(*this) {} virtual ~dAcOTableWare_c() {} STATE_FUNC_DECLARE(dAcOTableWare_c, Wait); diff --git a/include/d/a/obj/d_a_obj_tackle.h b/include/d/a/obj/d_a_obj_tackle.h index b2b28db2..5db22f3c 100644 --- a/include/d/a/obj/d_a_obj_tackle.h +++ b/include/d/a/obj/d_a_obj_tackle.h @@ -3,11 +3,10 @@ #include "d/a/obj/d_a_obj_base.h" #include "s/s_State.hpp" -#include "s/s_StateMgr.hpp" class dAcOTackle_c : public dAcObjBase_c { public: - dAcOTackle_c() : mStateMgr(*this, sStateID::null) {} + dAcOTackle_c() : mStateMgr(*this) {} virtual ~dAcOTackle_c() {} STATE_FUNC_DECLARE(dAcOTackle_c, Wait); diff --git a/include/d/a/obj/d_a_obj_terry_bicycle.h b/include/d/a/obj/d_a_obj_terry_bicycle.h index 8d52682e..bb5e032d 100644 --- a/include/d/a/obj/d_a_obj_terry_bicycle.h +++ b/include/d/a/obj/d_a_obj_terry_bicycle.h @@ -3,11 +3,10 @@ #include "d/a/obj/d_a_obj_base.h" #include "s/s_State.hpp" -#include "s/s_StateMgr.hpp" class dAcOTerryBicycle_c : public dAcObjBase_c { public: - dAcOTerryBicycle_c() : mStateMgr(*this, sStateID::null) {} + dAcOTerryBicycle_c() : mStateMgr(*this) {} virtual ~dAcOTerryBicycle_c() {} STATE_FUNC_DECLARE(dAcOTerryBicycle_c, Wait); diff --git a/include/d/a/obj/d_a_obj_terry_gimmick.h b/include/d/a/obj/d_a_obj_terry_gimmick.h index f84794a1..40cfc7fa 100644 --- a/include/d/a/obj/d_a_obj_terry_gimmick.h +++ b/include/d/a/obj/d_a_obj_terry_gimmick.h @@ -3,11 +3,10 @@ #include "d/a/obj/d_a_obj_base.h" #include "s/s_State.hpp" -#include "s/s_StateMgr.hpp" class dAcOTerryGimmick_c : public dAcObjBase_c { public: - dAcOTerryGimmick_c() : mStateMgr(*this, sStateID::null) {} + dAcOTerryGimmick_c() : mStateMgr(*this) {} virtual ~dAcOTerryGimmick_c() {} STATE_FUNC_DECLARE(dAcOTerryGimmick_c, Wait); diff --git a/include/d/a/obj/d_a_obj_terry_hole.h b/include/d/a/obj/d_a_obj_terry_hole.h index 46e7cace..a63d1936 100644 --- a/include/d/a/obj/d_a_obj_terry_hole.h +++ b/include/d/a/obj/d_a_obj_terry_hole.h @@ -3,11 +3,10 @@ #include "d/a/obj/d_a_obj_base.h" #include "s/s_State.hpp" -#include "s/s_StateMgr.hpp" class dAcOTerryHole_c : public dAcObjBase_c { public: - dAcOTerryHole_c() : mStateMgr(*this, sStateID::null) {} + dAcOTerryHole_c() : mStateMgr(*this) {} virtual ~dAcOTerryHole_c() {} STATE_FUNC_DECLARE(dAcOTerryHole_c, Wait); diff --git a/include/d/a/obj/d_a_obj_terry_island.h b/include/d/a/obj/d_a_obj_terry_island.h index e68dc17f..4dcce686 100644 --- a/include/d/a/obj/d_a_obj_terry_island.h +++ b/include/d/a/obj/d_a_obj_terry_island.h @@ -3,11 +3,10 @@ #include "d/a/obj/d_a_obj_base.h" #include "s/s_State.hpp" -#include "s/s_StateMgr.hpp" class dAcOterryIsland_c : public dAcObjBase_c { public: - dAcOterryIsland_c() : mStateMgr(*this, sStateID::null) {} + dAcOterryIsland_c() : mStateMgr(*this) {} virtual ~dAcOterryIsland_c() {} STATE_FUNC_DECLARE(dAcOterryIsland_c, Wait); diff --git a/include/d/a/obj/d_a_obj_terry_shop.h b/include/d/a/obj/d_a_obj_terry_shop.h index 955d3134..0a22a530 100644 --- a/include/d/a/obj/d_a_obj_terry_shop.h +++ b/include/d/a/obj/d_a_obj_terry_shop.h @@ -3,11 +3,10 @@ #include "d/a/obj/d_a_obj_base.h" #include "s/s_State.hpp" -#include "s/s_StateMgr.hpp" class dAcOterryShop_c : public dAcObjBase_c { public: - dAcOterryShop_c() : mStateMgr(*this, sStateID::null) {} + dAcOterryShop_c() : mStateMgr(*this) {} virtual ~dAcOterryShop_c() {} STATE_FUNC_DECLARE(dAcOterryShop_c, Move); diff --git a/include/d/a/obj/d_a_obj_terry_switch.h b/include/d/a/obj/d_a_obj_terry_switch.h index f8d1ad85..d52e0151 100644 --- a/include/d/a/obj/d_a_obj_terry_switch.h +++ b/include/d/a/obj/d_a_obj_terry_switch.h @@ -3,11 +3,10 @@ #include "d/a/obj/d_a_obj_base.h" #include "s/s_State.hpp" -#include "s/s_StateMgr.hpp" class dAcOTerrySwitch_c : public dAcObjBase_c { public: - dAcOTerrySwitch_c() : mStateMgr(*this, sStateID::null) {} + dAcOTerrySwitch_c() : mStateMgr(*this) {} virtual ~dAcOTerrySwitch_c() {} STATE_FUNC_DECLARE(dAcOTerrySwitch_c, Wait); diff --git a/include/d/a/obj/d_a_obj_time_base.h b/include/d/a/obj/d_a_obj_time_base.h index 117f980d..083e225c 100644 --- a/include/d/a/obj/d_a_obj_time_base.h +++ b/include/d/a/obj/d_a_obj_time_base.h @@ -3,11 +3,10 @@ #include "d/a/obj/d_a_obj_base.h" #include "s/s_State.hpp" -#include "s/s_StateMgr.hpp" class dAcOTimeBase_c : public dAcObjBase_c { public: - dAcOTimeBase_c() : mStateMgr(*this, sStateID::null) {} + dAcOTimeBase_c() : mStateMgr(*this) {} virtual ~dAcOTimeBase_c() {} STATE_FUNC_DECLARE(dAcOTimeBase_c, Wait); diff --git a/include/d/a/obj/d_a_obj_time_block.h b/include/d/a/obj/d_a_obj_time_block.h index 5b456d09..880b7977 100644 --- a/include/d/a/obj/d_a_obj_time_block.h +++ b/include/d/a/obj/d_a_obj_time_block.h @@ -3,11 +3,10 @@ #include "d/a/obj/d_a_obj_base.h" #include "s/s_State.hpp" -#include "s/s_StateMgr.hpp" class dAcOTimeBlock_c : public dAcObjBase_c { public: - dAcOTimeBlock_c() : mStateMgr(*this, sStateID::null) {} + dAcOTimeBlock_c() : mStateMgr(*this) {} virtual ~dAcOTimeBlock_c() {} STATE_FUNC_DECLARE(dAcOTimeBlock_c, Wait); diff --git a/include/d/a/obj/d_a_obj_time_boat.h b/include/d/a/obj/d_a_obj_time_boat.h index f282b400..a686483e 100644 --- a/include/d/a/obj/d_a_obj_time_boat.h +++ b/include/d/a/obj/d_a_obj_time_boat.h @@ -3,11 +3,10 @@ #include "d/a/obj/d_a_obj_base.h" #include "s/s_State.hpp" -#include "s/s_StateMgr.hpp" class dAcOTimeBoat_c : public dAcObjBase_c { public: - dAcOTimeBoat_c() : mStateMgr(*this, sStateID::null) {} + dAcOTimeBoat_c() : mStateMgr(*this) {} virtual ~dAcOTimeBoat_c() {} STATE_FUNC_DECLARE(dAcOTimeBoat_c, Wait); diff --git a/include/d/a/obj/d_a_obj_time_boat_bullet.h b/include/d/a/obj/d_a_obj_time_boat_bullet.h index c6b7bcee..2127cff2 100644 --- a/include/d/a/obj/d_a_obj_time_boat_bullet.h +++ b/include/d/a/obj/d_a_obj_time_boat_bullet.h @@ -3,11 +3,10 @@ #include "d/a/obj/d_a_obj_base.h" #include "s/s_State.hpp" -#include "s/s_StateMgr.hpp" class dAcOTimeBoatBullet_c : public dAcObjBase_c { public: - dAcOTimeBoatBullet_c() : mStateMgr(*this, sStateID::null) {} + dAcOTimeBoatBullet_c() : mStateMgr(*this) {} virtual ~dAcOTimeBoatBullet_c() {} STATE_FUNC_DECLARE(dAcOTimeBoatBullet_c, Wait); diff --git a/include/d/a/obj/d_a_obj_time_door.h b/include/d/a/obj/d_a_obj_time_door.h index bc930299..bb552995 100644 --- a/include/d/a/obj/d_a_obj_time_door.h +++ b/include/d/a/obj/d_a_obj_time_door.h @@ -3,11 +3,10 @@ #include "d/a/obj/d_a_obj_base.h" #include "s/s_State.hpp" -#include "s/s_StateMgr.hpp" class dAcOTimeDoor_c : public dAcObjBase_c { public: - dAcOTimeDoor_c() : mStateMgr(*this, sStateID::null) {} + dAcOTimeDoor_c() : mStateMgr(*this) {} virtual ~dAcOTimeDoor_c() {} STATE_FUNC_DECLARE(dAcOTimeDoor_c, Wait); diff --git a/include/d/a/obj/d_a_obj_time_door_before.h b/include/d/a/obj/d_a_obj_time_door_before.h index 596896d5..e102eff1 100644 --- a/include/d/a/obj/d_a_obj_time_door_before.h +++ b/include/d/a/obj/d_a_obj_time_door_before.h @@ -3,11 +3,10 @@ #include "d/a/obj/d_a_obj_base.h" #include "s/s_State.hpp" -#include "s/s_StateMgr.hpp" class dAcOTimeDoorBefore_c : public dAcObjBase_c { public: - dAcOTimeDoorBefore_c() : mStateMgr(*this, sStateID::null) {} + dAcOTimeDoorBefore_c() : mStateMgr(*this) {} virtual ~dAcOTimeDoorBefore_c() {} STATE_FUNC_DECLARE(dAcOTimeDoorBefore_c, Wait); diff --git a/include/d/a/obj/d_a_obj_time_stage_bg.h b/include/d/a/obj/d_a_obj_time_stage_bg.h index 7f7afeb5..10878637 100644 --- a/include/d/a/obj/d_a_obj_time_stage_bg.h +++ b/include/d/a/obj/d_a_obj_time_stage_bg.h @@ -7,13 +7,12 @@ #include "m/m_vec.h" #include "nw4r/g3d/res/g3d_resfile.h" #include "s/s_State.hpp" -#include "s/s_StateMgr.hpp" #include "toBeSorted/stage_render_stuff.h" #include "toBeSorted/time_area_mgr.h" class dAcOTimeStageBg_c : public dAcObjBase_c { public: - dAcOTimeStageBg_c() : mStateMgr(*this, sStateID::null), mSceneCallback(this) {} + dAcOTimeStageBg_c() : mStateMgr(*this), mSceneCallback(this) {} virtual ~dAcOTimeStageBg_c() {} virtual bool createHeap() override; diff --git a/include/d/a/obj/d_a_obj_time_stone.h b/include/d/a/obj/d_a_obj_time_stone.h index 567cf60b..2fce231a 100644 --- a/include/d/a/obj/d_a_obj_time_stone.h +++ b/include/d/a/obj/d_a_obj_time_stone.h @@ -3,11 +3,10 @@ #include "d/a/obj/d_a_obj_base.h" #include "s/s_State.hpp" -#include "s/s_StateMgr.hpp" class dAcOTimeStone_c : public dAcObjBase_c { public: - dAcOTimeStone_c() : mStateMgr(*this, sStateID::null) {} + dAcOTimeStone_c() : mStateMgr(*this) {} virtual ~dAcOTimeStone_c() {} STATE_FUNC_DECLARE(dAcOTimeStone_c, Wait); diff --git a/include/d/a/obj/d_a_obj_toD3_stone_figure.h b/include/d/a/obj/d_a_obj_toD3_stone_figure.h index ba9a8b30..20566d59 100644 --- a/include/d/a/obj/d_a_obj_toD3_stone_figure.h +++ b/include/d/a/obj/d_a_obj_toD3_stone_figure.h @@ -7,11 +7,10 @@ #include "m/m3d/m_smdl.h" #include "nw4r/g3d/res/g3d_resfile.h" #include "s/s_State.hpp" -#include "s/s_StateMgr.hpp" class dAcOtoD3StoneFigure_c : public dAcObjBase_c { public: - dAcOtoD3StoneFigure_c() : mStateMgr(*this, sStateID::null) {} + dAcOtoD3StoneFigure_c() : mStateMgr(*this) {} virtual ~dAcOtoD3StoneFigure_c() {} virtual bool createHeap() override; virtual int create() override; diff --git a/include/d/a/obj/d_a_obj_toge_trap.h b/include/d/a/obj/d_a_obj_toge_trap.h index 635f9aff..3a1a4e3d 100644 --- a/include/d/a/obj/d_a_obj_toge_trap.h +++ b/include/d/a/obj/d_a_obj_toge_trap.h @@ -3,11 +3,10 @@ #include "d/a/obj/d_a_obj_base.h" #include "s/s_State.hpp" -#include "s/s_StateMgr.hpp" class dAcOtogeTrap_c : public dAcObjBase_c { public: - dAcOtogeTrap_c() : mStateMgr(*this, sStateID::null) {} + dAcOtogeTrap_c() : mStateMgr(*this) {} virtual ~dAcOtogeTrap_c() {} STATE_FUNC_DECLARE(dAcOtogeTrap_c, Wait); diff --git a/include/d/a/obj/d_a_obj_tornado.h b/include/d/a/obj/d_a_obj_tornado.h index 54a7c025..8513feaf 100644 --- a/include/d/a/obj/d_a_obj_tornado.h +++ b/include/d/a/obj/d_a_obj_tornado.h @@ -3,11 +3,10 @@ #include "d/a/obj/d_a_obj_base.h" #include "s/s_State.hpp" -#include "s/s_StateMgr.hpp" class dAcOTornado_c : public dAcObjBase_c { public: - dAcOTornado_c() : mStateMgr(*this, sStateID::null) {} + dAcOTornado_c() : mStateMgr(*this) {} virtual ~dAcOTornado_c() {} STATE_FUNC_DECLARE(dAcOTornado_c, Wait); diff --git a/include/d/a/obj/d_a_obj_tower_D101.h b/include/d/a/obj/d_a_obj_tower_D101.h index c1b1e763..cfeb4a39 100644 --- a/include/d/a/obj/d_a_obj_tower_D101.h +++ b/include/d/a/obj/d_a_obj_tower_D101.h @@ -6,7 +6,7 @@ class dAcOTowerD101_c : public dAcObjBase_c { public: - dAcOTowerD101_c() : mStateMgr(*this, sStateID::null) {} + dAcOTowerD101_c() : mStateMgr(*this) {} virtual ~dAcOTowerD101_c() {} STATE_FUNC_DECLARE(dAcOTowerD101_c, Wait); diff --git a/include/d/a/obj/d_a_obj_tower_bomb.h b/include/d/a/obj/d_a_obj_tower_bomb.h index aa312740..8a728cfb 100644 --- a/include/d/a/obj/d_a_obj_tower_bomb.h +++ b/include/d/a/obj/d_a_obj_tower_bomb.h @@ -3,11 +3,10 @@ #include "d/a/obj/d_a_obj_base.h" #include "s/s_State.hpp" -#include "s/s_StateMgr.hpp" class dAcOTowerBomb_c : public dAcObjBase_c { public: - dAcOTowerBomb_c() : mStateMgr(*this, sStateID::null) {} + dAcOTowerBomb_c() : mStateMgr(*this) {} virtual ~dAcOTowerBomb_c() {} STATE_FUNC_DECLARE(dAcOTowerBomb_c, Wait); diff --git a/include/d/a/obj/d_a_obj_tower_gearD101.h b/include/d/a/obj/d_a_obj_tower_gearD101.h index 7fc78760..f7ea9a32 100644 --- a/include/d/a/obj/d_a_obj_tower_gearD101.h +++ b/include/d/a/obj/d_a_obj_tower_gearD101.h @@ -31,7 +31,7 @@ public: class dAcOTowerGearD101_c : public dAcObjBase_c { public: dAcOTowerGearD101_c() - : mStateMgr(*this, sStateID::null), + : mStateMgr(*this), field_0x3A0(mVec3_c::Zero.x, mVec3_c::Zero.y, mVec3_c::Zero.z), field_0x3AC(mVec3_c::Zero.x, mVec3_c::Zero.y, mVec3_c::Zero.z), field_0x3B8(mAng3_c::Zero) {} diff --git a/include/d/a/obj/d_a_obj_tower_hand_D101.h b/include/d/a/obj/d_a_obj_tower_hand_D101.h index 83886c83..e926fda9 100644 --- a/include/d/a/obj/d_a_obj_tower_hand_D101.h +++ b/include/d/a/obj/d_a_obj_tower_hand_D101.h @@ -11,14 +11,13 @@ #include "m/m_mtx.h" #include "m/m_vec.h" #include "s/s_State.hpp" -#include "s/s_StateMgr.hpp" #include "toBeSorted/actor_event.h" #include "toBeSorted/d_emitter.h" class dAcOTowerHandD101_c : public dAcObjBase_c { public: - dAcOTowerHandD101_c() : mStateMgr(*this, sStateID::null), mEffects(this), mEvent(*this, nullptr), mFlags(0) {} + dAcOTowerHandD101_c() : mStateMgr(*this), mEffects(this), mEvent(*this, nullptr), mFlags(0) {} virtual ~dAcOTowerHandD101_c() {} STATE_FUNC_DECLARE(dAcOTowerHandD101_c, RemainOpen); diff --git a/include/d/a/obj/d_a_obj_tr_shutter_cs.h b/include/d/a/obj/d_a_obj_tr_shutter_cs.h index 7f2d150a..a84d42b6 100644 --- a/include/d/a/obj/d_a_obj_tr_shutter_cs.h +++ b/include/d/a/obj/d_a_obj_tr_shutter_cs.h @@ -3,11 +3,10 @@ #include "d/a/obj/d_a_obj_door_base.h" #include "s/s_State.hpp" -#include "s/s_StateMgr.hpp" class dAcOTrlyShtrChgScn_c : public dAcObjDoor_c { public: - dAcOTrlyShtrChgScn_c() : mStateMgr(*this, sStateID::null) {} + dAcOTrlyShtrChgScn_c() : mStateMgr(*this) {} virtual ~dAcOTrlyShtrChgScn_c() {} virtual bool canOpen() override; diff --git a/include/d/a/obj/d_a_obj_trap_bird_wood.h b/include/d/a/obj/d_a_obj_trap_bird_wood.h index 7306798f..c8563f08 100644 --- a/include/d/a/obj/d_a_obj_trap_bird_wood.h +++ b/include/d/a/obj/d_a_obj_trap_bird_wood.h @@ -3,11 +3,10 @@ #include "d/a/obj/d_a_obj_base.h" #include "s/s_State.hpp" -#include "s/s_StateMgr.hpp" class dAcOTrapBirdWood_c : public dAcObjBase_c { public: - dAcOTrapBirdWood_c() : mStateMgr(*this, sStateID::null) {} + dAcOTrapBirdWood_c() : mStateMgr(*this) {} virtual ~dAcOTrapBirdWood_c() {} STATE_FUNC_DECLARE(dAcOTrapBirdWood_c, Wait); diff --git a/include/d/a/obj/d_a_obj_trap_rock_1.h b/include/d/a/obj/d_a_obj_trap_rock_1.h index 1a25d6de..80e72d5e 100644 --- a/include/d/a/obj/d_a_obj_trap_rock_1.h +++ b/include/d/a/obj/d_a_obj_trap_rock_1.h @@ -6,11 +6,10 @@ #include "m/m3d/m_smdl.h" #include "nw4r/g3d/res/g3d_resfile.h" #include "s/s_State.hpp" -#include "s/s_StateMgr.hpp" class dAcOtrapRock1_c : public dAcObjBase_c { public: - dAcOtrapRock1_c() : mStateMgr(*this, sStateID::null) {} + dAcOtrapRock1_c() : mStateMgr(*this) {} virtual ~dAcOtrapRock1_c() {} virtual bool createHeap() override; diff --git a/include/d/a/obj/d_a_obj_treasure_island_b.h b/include/d/a/obj/d_a_obj_treasure_island_b.h index 27e6d291..c4e6fce4 100644 --- a/include/d/a/obj/d_a_obj_treasure_island_b.h +++ b/include/d/a/obj/d_a_obj_treasure_island_b.h @@ -3,11 +3,10 @@ #include "d/a/obj/d_a_obj_base.h" #include "s/s_State.hpp" -#include "s/s_StateMgr.hpp" class dAcOtreasureIslandB_c : public dAcObjBase_c { public: - dAcOtreasureIslandB_c() : mStateMgr(*this, sStateID::null) {} + dAcOtreasureIslandB_c() : mStateMgr(*this) {} virtual ~dAcOtreasureIslandB_c() {} STATE_FUNC_DECLARE(dAcOtreasureIslandB_c, Wait); diff --git a/include/d/a/obj/d_a_obj_trolley.h b/include/d/a/obj/d_a_obj_trolley.h index 1fa8b916..2875c45b 100644 --- a/include/d/a/obj/d_a_obj_trolley.h +++ b/include/d/a/obj/d_a_obj_trolley.h @@ -3,11 +3,10 @@ #include "d/a/obj/d_a_obj_base.h" #include "s/s_State.hpp" -#include "s/s_StateMgr.hpp" class dAcOTrolley_c : public dAcObjBase_c { public: - dAcOTrolley_c() : mStateMgr(*this, sStateID::null) {} + dAcOTrolley_c() : mStateMgr(*this) {} virtual ~dAcOTrolley_c() {} STATE_FUNC_DECLARE(dAcOTrolley_c, Wait); diff --git a/include/d/a/obj/d_a_obj_trolley_shutter.h b/include/d/a/obj/d_a_obj_trolley_shutter.h index f7ed3c3c..4a36c354 100644 --- a/include/d/a/obj/d_a_obj_trolley_shutter.h +++ b/include/d/a/obj/d_a_obj_trolley_shutter.h @@ -3,11 +3,10 @@ #include "d/a/obj/d_a_obj_door_base.h" #include "s/s_State.hpp" -#include "s/s_StateMgr.hpp" class dAcOTrolleyShutter_c : public dAcObjDoor_c { public: - dAcOTrolleyShutter_c() : mStateMgr(*this, sStateID::null) {} + dAcOTrolleyShutter_c() : mStateMgr(*this) {} virtual ~dAcOTrolleyShutter_c() {} virtual bool canOpen() override; diff --git a/include/d/a/obj/d_a_obj_truck.h b/include/d/a/obj/d_a_obj_truck.h index 46628cde..70736657 100644 --- a/include/d/a/obj/d_a_obj_truck.h +++ b/include/d/a/obj/d_a_obj_truck.h @@ -3,11 +3,10 @@ #include "d/a/obj/d_a_obj_base.h" #include "s/s_State.hpp" -#include "s/s_StateMgr.hpp" class dAcOtruck_c : public dAcObjBase_c { public: - dAcOtruck_c() : mStateMgr(*this, sStateID::null) {} + dAcOtruck_c() : mStateMgr(*this) {} virtual ~dAcOtruck_c() {} STATE_FUNC_DECLARE(dAcOtruck_c, Wait); diff --git a/include/d/a/obj/d_a_obj_truck_rail_col.h b/include/d/a/obj/d_a_obj_truck_rail_col.h index c707cd95..3cb8e98a 100644 --- a/include/d/a/obj/d_a_obj_truck_rail_col.h +++ b/include/d/a/obj/d_a_obj_truck_rail_col.h @@ -3,7 +3,6 @@ #include "d/a/obj/d_a_obj_base.h" #include "s/s_State.hpp" -#include "s/s_StateMgr.hpp" class dAcOTruckRailCol_c : public dAcObjBase_c { public: diff --git a/include/d/a/obj/d_a_obj_truck_stopper.h b/include/d/a/obj/d_a_obj_truck_stopper.h index 6687f778..40496eb4 100644 --- a/include/d/a/obj/d_a_obj_truck_stopper.h +++ b/include/d/a/obj/d_a_obj_truck_stopper.h @@ -3,11 +3,10 @@ #include "d/a/obj/d_a_obj_base.h" #include "s/s_State.hpp" -#include "s/s_StateMgr.hpp" class dAcOtruckStopper_c : public dAcObjBase_c { public: - dAcOtruckStopper_c() : mStateMgr(*this, sStateID::null) {} + dAcOtruckStopper_c() : mStateMgr(*this) {} virtual ~dAcOtruckStopper_c() {} STATE_FUNC_DECLARE(dAcOtruckStopper_c, Wait); diff --git a/include/d/a/obj/d_a_obj_tubo.h b/include/d/a/obj/d_a_obj_tubo.h index 83b1e44e..ff2156da 100644 --- a/include/d/a/obj/d_a_obj_tubo.h +++ b/include/d/a/obj/d_a_obj_tubo.h @@ -20,7 +20,7 @@ class dAcOtubo_c : public dAcObjBase_c { public: - dAcOtubo_c() : mStateMgr(*this, sStateID::null), field_0x8F0(this) {} + dAcOtubo_c() : mStateMgr(*this), field_0x8F0(this) {} virtual ~dAcOtubo_c() {} virtual int doDelete() override; diff --git a/include/d/a/obj/d_a_obj_tubo_big.h b/include/d/a/obj/d_a_obj_tubo_big.h index f97a8e74..e59541ea 100644 --- a/include/d/a/obj/d_a_obj_tubo_big.h +++ b/include/d/a/obj/d_a_obj_tubo_big.h @@ -3,11 +3,10 @@ #include "d/a/obj/d_a_obj_base.h" #include "s/s_State.hpp" -#include "s/s_StateMgr.hpp" class dAcOTuboBig_c : public dAcObjBase_c { public: - dAcOTuboBig_c() : mStateMgr(*this, sStateID::null) {} + dAcOTuboBig_c() : mStateMgr(*this) {} virtual ~dAcOTuboBig_c() {} STATE_FUNC_DECLARE(dAcOTuboBig_c, Wait); diff --git a/include/d/a/obj/d_a_obj_tumble_weed.h b/include/d/a/obj/d_a_obj_tumble_weed.h index a449b1c5..11808235 100644 --- a/include/d/a/obj/d_a_obj_tumble_weed.h +++ b/include/d/a/obj/d_a_obj_tumble_weed.h @@ -17,7 +17,7 @@ class dAcOTumbleWeed_c : public dAcObjBase_c { public: - dAcOTumbleWeed_c() : mDowsingTarget(this, DowsingTarget::SLOT_NONE), mStateMgr(*this, sStateID::null) {} + dAcOTumbleWeed_c() : mDowsingTarget(this, DowsingTarget::SLOT_NONE), mStateMgr(*this) {} virtual ~dAcOTumbleWeed_c() {} virtual int doDelete() override; diff --git a/include/d/a/obj/d_a_obj_underground_switch.h b/include/d/a/obj/d_a_obj_underground_switch.h index ab55c4a7..e496da1a 100644 --- a/include/d/a/obj/d_a_obj_underground_switch.h +++ b/include/d/a/obj/d_a_obj_underground_switch.h @@ -10,7 +10,7 @@ class dAcOUgSwitch_c : public dAcObjBase_c { public: - dAcOUgSwitch_c() : mStateMgr(*this, sStateID::null) {} + dAcOUgSwitch_c() : mStateMgr(*this) {} virtual ~dAcOUgSwitch_c() {} virtual bool createHeap() override; diff --git a/include/d/a/obj/d_a_obj_updown_lava.h b/include/d/a/obj/d_a_obj_updown_lava.h index 176ce19b..32728012 100644 --- a/include/d/a/obj/d_a_obj_updown_lava.h +++ b/include/d/a/obj/d_a_obj_updown_lava.h @@ -3,11 +3,10 @@ #include "d/a/obj/d_a_obj_base.h" #include "s/s_State.hpp" -#include "s/s_StateMgr.hpp" class dAcOupdownLava_c : public dAcObjBase_c { public: - dAcOupdownLava_c() : mStateMgr(*this, sStateID::null) {} + dAcOupdownLava_c() : mStateMgr(*this) {} virtual ~dAcOupdownLava_c() {} STATE_FUNC_DECLARE(dAcOupdownLava_c, Wait); diff --git a/include/d/a/obj/d_a_obj_utajima_island.h b/include/d/a/obj/d_a_obj_utajima_island.h index c9b54035..637fe6e1 100644 --- a/include/d/a/obj/d_a_obj_utajima_island.h +++ b/include/d/a/obj/d_a_obj_utajima_island.h @@ -10,11 +10,10 @@ #include "m/m_vec.h" #include "nw4r/g3d/res/g3d_resfile.h" #include "s/s_State.hpp" -#include "s/s_StateMgr.hpp" class dAcOutajimaIsland_c : public dAcObjBase_c { public: - dAcOutajimaIsland_c() : mStateMgr(*this, sStateID::null) {} + dAcOutajimaIsland_c() : mStateMgr(*this) {} virtual ~dAcOutajimaIsland_c() {} virtual bool createHeap() override; diff --git a/include/d/a/obj/d_a_obj_utajima_main_mecha.h b/include/d/a/obj/d_a_obj_utajima_main_mecha.h index 6cdd3057..42182dfe 100644 --- a/include/d/a/obj/d_a_obj_utajima_main_mecha.h +++ b/include/d/a/obj/d_a_obj_utajima_main_mecha.h @@ -3,11 +3,10 @@ #include "d/a/obj/d_a_obj_base.h" #include "s/s_State.hpp" -#include "s/s_StateMgr.hpp" class dAcOutajimaMainMecha_c : public dAcObjBase_c { public: - dAcOutajimaMainMecha_c() : mStateMgr(*this, sStateID::null) {} + dAcOutajimaMainMecha_c() : mStateMgr(*this) {} virtual ~dAcOutajimaMainMecha_c() {} STATE_FUNC_DECLARE(dAcOutajimaMainMecha_c, Before); diff --git a/include/d/a/obj/d_a_obj_utajima_pedestal.h b/include/d/a/obj/d_a_obj_utajima_pedestal.h index 1f904762..6da69bbd 100644 --- a/include/d/a/obj/d_a_obj_utajima_pedestal.h +++ b/include/d/a/obj/d_a_obj_utajima_pedestal.h @@ -3,11 +3,10 @@ #include "d/a/obj/d_a_obj_base.h" #include "s/s_State.hpp" -#include "s/s_StateMgr.hpp" class dAcOutajimaPedestal_c : public dAcObjBase_c { public: - dAcOutajimaPedestal_c() : mStateMgr(*this, sStateID::null) {} + dAcOutajimaPedestal_c() : mStateMgr(*this) {} virtual ~dAcOutajimaPedestal_c() {} STATE_FUNC_DECLARE(dAcOutajimaPedestal_c, Wait); diff --git a/include/d/a/obj/d_a_obj_utajima_stopper.h b/include/d/a/obj/d_a_obj_utajima_stopper.h index ad5c81af..ab3dd557 100644 --- a/include/d/a/obj/d_a_obj_utajima_stopper.h +++ b/include/d/a/obj/d_a_obj_utajima_stopper.h @@ -3,11 +3,10 @@ #include "d/a/obj/d_a_obj_base.h" #include "s/s_State.hpp" -#include "s/s_StateMgr.hpp" class dAcOutajimaStopper_c : public dAcObjBase_c { public: - dAcOutajimaStopper_c() : mStateMgr(*this, sStateID::null) {} + dAcOutajimaStopper_c() : mStateMgr(*this) {} virtual ~dAcOutajimaStopper_c() {} STATE_FUNC_DECLARE(dAcOutajimaStopper_c, Down); diff --git a/include/d/a/obj/d_a_obj_vd_bullet.h b/include/d/a/obj/d_a_obj_vd_bullet.h index b49a7e6d..4f5f0cd9 100644 --- a/include/d/a/obj/d_a_obj_vd_bullet.h +++ b/include/d/a/obj/d_a_obj_vd_bullet.h @@ -3,11 +3,10 @@ #include "d/a/obj/d_a_obj_base.h" #include "s/s_State.hpp" -#include "s/s_StateMgr.hpp" class dAcObjVdb_c : public dAcObjBase_c { public: - dAcObjVdb_c() : mStateMgr(*this, sStateID::null) {} + dAcObjVdb_c() : mStateMgr(*this) {} virtual ~dAcObjVdb_c() {} STATE_FUNC_DECLARE(dAcObjVdb_c, BulletMove); diff --git a/include/d/a/obj/d_a_obj_vent_fan.h b/include/d/a/obj/d_a_obj_vent_fan.h index 2e83c040..4147f004 100644 --- a/include/d/a/obj/d_a_obj_vent_fan.h +++ b/include/d/a/obj/d_a_obj_vent_fan.h @@ -3,11 +3,10 @@ #include "d/a/obj/d_a_obj_base.h" #include "s/s_State.hpp" -#include "s/s_StateMgr.hpp" class dAcOventFan_c : public dAcObjBase_c { public: - dAcOventFan_c() : mStateMgr(*this, sStateID::null) {} + dAcOventFan_c() : mStateMgr(*this) {} virtual ~dAcOventFan_c() {} STATE_FUNC_DECLARE(dAcOventFan_c, Normal); diff --git a/include/d/a/obj/d_a_obj_vortex.h b/include/d/a/obj/d_a_obj_vortex.h index 5529116d..5d06e77d 100644 --- a/include/d/a/obj/d_a_obj_vortex.h +++ b/include/d/a/obj/d_a_obj_vortex.h @@ -3,11 +3,10 @@ #include "d/a/obj/d_a_obj_base.h" #include "s/s_State.hpp" -#include "s/s_StateMgr.hpp" class dAcOVortex_c : public dAcObjBase_c { public: - dAcOVortex_c() : mStateMgr(*this, sStateID::null) {} + dAcOVortex_c() : mStateMgr(*this) {} virtual ~dAcOVortex_c() {} STATE_FUNC_DECLARE(dAcOVortex_c, Wait); diff --git a/include/d/a/obj/d_a_obj_warp.h b/include/d/a/obj/d_a_obj_warp.h index 0b2f4874..33bb80de 100644 --- a/include/d/a/obj/d_a_obj_warp.h +++ b/include/d/a/obj/d_a_obj_warp.h @@ -4,11 +4,10 @@ #include "d/a/obj/d_a_obj_base.h" #include "d/flag/storyflag_manager.h" #include "s/s_State.hpp" -#include "s/s_StateMgr.hpp" class dAcOWarp_c : public dAcObjBase_c { public: - dAcOWarp_c() : mStateMgr(*this, sStateID::null) {} + dAcOWarp_c() : mStateMgr(*this) {} virtual ~dAcOWarp_c() {} STATE_FUNC_DECLARE(dAcOWarp_c, Wait); diff --git a/include/d/a/obj/d_a_obj_water_igaiga.h b/include/d/a/obj/d_a_obj_water_igaiga.h index 0839b6d1..8960e3df 100644 --- a/include/d/a/obj/d_a_obj_water_igaiga.h +++ b/include/d/a/obj/d_a_obj_water_igaiga.h @@ -3,11 +3,10 @@ #include "d/a/obj/d_a_obj_base.h" #include "s/s_State.hpp" -#include "s/s_StateMgr.hpp" class dAcOwaterIgaiga_c : public dAcObjBase_c { public: - dAcOwaterIgaiga_c() : mStateMgr(*this, sStateID::null) {} + dAcOwaterIgaiga_c() : mStateMgr(*this) {} virtual ~dAcOwaterIgaiga_c() {} STATE_FUNC_DECLARE(dAcOwaterIgaiga_c, Wait); diff --git a/include/d/a/obj/d_a_obj_water_nut.h b/include/d/a/obj/d_a_obj_water_nut.h index 9e85ca82..ca3ea792 100644 --- a/include/d/a/obj/d_a_obj_water_nut.h +++ b/include/d/a/obj/d_a_obj_water_nut.h @@ -3,11 +3,10 @@ #include "d/a/obj/d_a_obj_base.h" #include "s/s_State.hpp" -#include "s/s_StateMgr.hpp" class dAcOWaterNut_c : public dAcObjBase_c { public: - dAcOWaterNut_c() : mStateMgr(*this, sStateID::null) {} + dAcOWaterNut_c() : mStateMgr(*this) {} virtual ~dAcOWaterNut_c() {} STATE_FUNC_DECLARE(dAcOWaterNut_c, Wait); diff --git a/include/d/a/obj/d_a_obj_water_nut_leaf.h b/include/d/a/obj/d_a_obj_water_nut_leaf.h index 319fe01b..c83025d3 100644 --- a/include/d/a/obj/d_a_obj_water_nut_leaf.h +++ b/include/d/a/obj/d_a_obj_water_nut_leaf.h @@ -3,11 +3,10 @@ #include "d/a/obj/d_a_obj_base.h" #include "s/s_State.hpp" -#include "s/s_StateMgr.hpp" class dAcOWaterNutLeaf_c : public dAcObjBase_c { public: - dAcOWaterNutLeaf_c() : mStateMgr(*this, sStateID::null) {} + dAcOWaterNutLeaf_c() : mStateMgr(*this) {} virtual ~dAcOWaterNutLeaf_c() {} STATE_FUNC_DECLARE(dAcOWaterNutLeaf_c, Wait); diff --git a/include/d/a/obj/d_a_obj_water_spout.h b/include/d/a/obj/d_a_obj_water_spout.h index 345e1325..524cd929 100644 --- a/include/d/a/obj/d_a_obj_water_spout.h +++ b/include/d/a/obj/d_a_obj_water_spout.h @@ -7,11 +7,10 @@ #include "m/m3d/m_anmtexsrt.h" #include "nw4r/g3d/res/g3d_resfile.h" #include "s/s_State.hpp" -#include "s/s_StateMgr.hpp" class dAcOwaterSpout_c : public dAcObjBase_c { public: - dAcOwaterSpout_c() : mStateMgr(*this, sStateID::null) {} + dAcOwaterSpout_c() : mStateMgr(*this) {} virtual ~dAcOwaterSpout_c() {} virtual bool createHeap() override; diff --git a/include/d/a/obj/d_a_obj_water_surface.h b/include/d/a/obj/d_a_obj_water_surface.h index ff98f226..0e89b45e 100644 --- a/include/d/a/obj/d_a_obj_water_surface.h +++ b/include/d/a/obj/d_a_obj_water_surface.h @@ -3,11 +3,10 @@ #include "d/a/obj/d_a_obj_base.h" #include "s/s_State.hpp" -#include "s/s_StateMgr.hpp" class dAcOwaterSurface_c : public dAcObjBase_c { public: - dAcOwaterSurface_c() : mStateMgr(*this, sStateID::null) {} + dAcOwaterSurface_c() : mStateMgr(*this) {} virtual ~dAcOwaterSurface_c() {} STATE_FUNC_DECLARE(dAcOwaterSurface_c, Wait); diff --git a/include/d/a/obj/d_a_obj_water_switch.h b/include/d/a/obj/d_a_obj_water_switch.h index 61c12720..0948b2a7 100644 --- a/include/d/a/obj/d_a_obj_water_switch.h +++ b/include/d/a/obj/d_a_obj_water_switch.h @@ -3,11 +3,10 @@ #include "d/a/obj/d_a_obj_base.h" #include "s/s_State.hpp" -#include "s/s_StateMgr.hpp" class dAcOwaterSwitch_c : public dAcObjBase_c { public: - dAcOwaterSwitch_c() : mStateMgr(*this, sStateID::null) {} + dAcOwaterSwitch_c() : mStateMgr(*this) {} virtual ~dAcOwaterSwitch_c() {} STATE_FUNC_DECLARE(dAcOwaterSwitch_c, Off); diff --git a/include/d/a/obj/d_a_obj_waterfall_D100.h b/include/d/a/obj/d_a_obj_waterfall_D100.h index e519da1c..f2aac1f6 100644 --- a/include/d/a/obj/d_a_obj_waterfall_D100.h +++ b/include/d/a/obj/d_a_obj_waterfall_D100.h @@ -3,11 +3,10 @@ #include "d/a/obj/d_a_obj_base.h" #include "s/s_State.hpp" -#include "s/s_StateMgr.hpp" class dAcOwaterfallD100_c : public dAcObjBase_c { public: - dAcOwaterfallD100_c() : mStateMgr(*this, sStateID::null) {} + dAcOwaterfallD100_c() : mStateMgr(*this) {} virtual ~dAcOwaterfallD100_c() {} STATE_FUNC_DECLARE(dAcOwaterfallD100_c, Wait); diff --git a/include/d/a/obj/d_a_obj_waterfall_D101.h b/include/d/a/obj/d_a_obj_waterfall_D101.h index ee181775..7c8c9a20 100644 --- a/include/d/a/obj/d_a_obj_waterfall_D101.h +++ b/include/d/a/obj/d_a_obj_waterfall_D101.h @@ -3,11 +3,10 @@ #include "d/a/obj/d_a_obj_base.h" #include "s/s_State.hpp" -#include "s/s_StateMgr.hpp" class dAcOWaterFallD101_c : public dAcObjBase_c { public: - dAcOWaterFallD101_c() : mStateMgr(*this, sStateID::null) {} + dAcOWaterFallD101_c() : mStateMgr(*this) {} virtual ~dAcOWaterFallD101_c() {} STATE_FUNC_DECLARE(dAcOWaterFallD101_c, Wait); diff --git a/include/d/a/obj/d_a_obj_waterfall_F102.h b/include/d/a/obj/d_a_obj_waterfall_F102.h index 907e5ecc..660573c3 100644 --- a/include/d/a/obj/d_a_obj_waterfall_F102.h +++ b/include/d/a/obj/d_a_obj_waterfall_F102.h @@ -3,11 +3,10 @@ #include "d/a/obj/d_a_obj_base.h" #include "s/s_State.hpp" -#include "s/s_StateMgr.hpp" class dAcOwaterfallF102_c : public dAcObjBase_c { public: - dAcOwaterfallF102_c() : mStateMgr(*this, sStateID::null) {} + dAcOwaterfallF102_c() : mStateMgr(*this) {} virtual ~dAcOwaterfallF102_c() {} STATE_FUNC_DECLARE(dAcOwaterfallF102_c, Wait); diff --git a/include/d/a/obj/d_a_obj_wind.h b/include/d/a/obj/d_a_obj_wind.h index 9ad07358..c024f587 100644 --- a/include/d/a/obj/d_a_obj_wind.h +++ b/include/d/a/obj/d_a_obj_wind.h @@ -3,11 +3,10 @@ #include "d/a/obj/d_a_obj_base.h" #include "s/s_State.hpp" -#include "s/s_StateMgr.hpp" class dAcOwind_c : public dAcObjBase_c { public: - dAcOwind_c() : mStateMgr(*this, sStateID::null) {} + dAcOwind_c() : mStateMgr(*this) {} virtual ~dAcOwind_c() {} STATE_FUNC_DECLARE(dAcOwind_c, Wait); diff --git a/include/d/a/obj/d_a_obj_wind02.h b/include/d/a/obj/d_a_obj_wind02.h index 96a3b681..0f509b69 100644 --- a/include/d/a/obj/d_a_obj_wind02.h +++ b/include/d/a/obj/d_a_obj_wind02.h @@ -3,11 +3,10 @@ #include "d/a/obj/d_a_obj_base.h" #include "s/s_State.hpp" -#include "s/s_StateMgr.hpp" class dAcOwind02_c : public dAcObjBase_c { public: - dAcOwind02_c() : mStateMgr(*this, sStateID::null) {} + dAcOwind02_c() : mStateMgr(*this) {} virtual ~dAcOwind02_c() {} STATE_FUNC_DECLARE(dAcOwind02_c, Wait); diff --git a/include/d/a/obj/d_a_obj_wind03.h b/include/d/a/obj/d_a_obj_wind03.h index 4ce91f21..0b1e00ef 100644 --- a/include/d/a/obj/d_a_obj_wind03.h +++ b/include/d/a/obj/d_a_obj_wind03.h @@ -3,11 +3,10 @@ #include "d/a/obj/d_a_obj_base.h" #include "s/s_State.hpp" -#include "s/s_StateMgr.hpp" class dAcOwind03_c : public dAcObjBase_c { public: - dAcOwind03_c() : mStateMgr(*this, sStateID::null) {} + dAcOwind03_c() : mStateMgr(*this) {} virtual ~dAcOwind03_c() {} STATE_FUNC_DECLARE(dAcOwind03_c, Wait); diff --git a/include/d/a/obj/d_a_obj_wind04.h b/include/d/a/obj/d_a_obj_wind04.h index df8e31cf..6c172345 100644 --- a/include/d/a/obj/d_a_obj_wind04.h +++ b/include/d/a/obj/d_a_obj_wind04.h @@ -3,11 +3,10 @@ #include "d/a/obj/d_a_obj_base.h" #include "s/s_State.hpp" -#include "s/s_StateMgr.hpp" class dAcOwind04_c : public dAcObjBase_c { public: - dAcOwind04_c() : mStateMgr(*this, sStateID::null) {} + dAcOwind04_c() : mStateMgr(*this) {} virtual ~dAcOwind04_c() {} STATE_FUNC_DECLARE(dAcOwind04_c, Wait); diff --git a/include/d/a/obj/d_a_obj_windmill.h b/include/d/a/obj/d_a_obj_windmill.h index 24b3e72c..a5c92955 100644 --- a/include/d/a/obj/d_a_obj_windmill.h +++ b/include/d/a/obj/d_a_obj_windmill.h @@ -16,7 +16,7 @@ class dAcOwindmill_c : public dAcObjBase_c { public: - dAcOwindmill_c() : mStateMgr(*this, sStateID::null), mCallback(this) {} + dAcOwindmill_c() : mStateMgr(*this), mCallback(this) {} virtual ~dAcOwindmill_c() {} virtual bool createHeap() override; diff --git a/include/d/a/obj/d_a_obj_windmill_desert.h b/include/d/a/obj/d_a_obj_windmill_desert.h index d7c344b2..9c54ad7c 100644 --- a/include/d/a/obj/d_a_obj_windmill_desert.h +++ b/include/d/a/obj/d_a_obj_windmill_desert.h @@ -3,11 +3,10 @@ #include "d/a/obj/d_a_obj_base.h" #include "s/s_State.hpp" -#include "s/s_StateMgr.hpp" class dAcOwindmillDesert_c : public dAcObjBase_c { public: - dAcOwindmillDesert_c() : mStateMgr(*this, sStateID::null) {} + dAcOwindmillDesert_c() : mStateMgr(*this) {} virtual ~dAcOwindmillDesert_c() {} STATE_FUNC_DECLARE(dAcOwindmillDesert_c, Wait); diff --git a/include/d/a/obj/d_a_obj_wood_board.h b/include/d/a/obj/d_a_obj_wood_board.h index 1f6e1816..91cb0c7a 100644 --- a/include/d/a/obj/d_a_obj_wood_board.h +++ b/include/d/a/obj/d_a_obj_wood_board.h @@ -3,11 +3,10 @@ #include "d/a/obj/d_a_obj_base.h" #include "s/s_State.hpp" -#include "s/s_StateMgr.hpp" class dAcOwoodBoard_c : public dAcObjBase_c { public: - dAcOwoodBoard_c() : mStateMgr(*this, sStateID::null) {} + dAcOwoodBoard_c() : mStateMgr(*this) {} virtual ~dAcOwoodBoard_c() {} STATE_FUNC_DECLARE(dAcOwoodBoard_c, Wait); diff --git a/include/d/col/c/c_cc_d.h b/include/d/col/c/c_cc_d.h index 7e51421a..b4f7f4f2 100644 --- a/include/d/col/c/c_cc_d.h +++ b/include/d/col/c/c_cc_d.h @@ -836,7 +836,14 @@ public: void OffAtGrp(u32 grp) { mAt.SetAtFlag(GetAtGrp() & ~grp); } + void SetTgRpm(u32 f) { + mTg.SetRPrm(f); + } + void SetAtRpm(u32 f) { + mAt.SetRPrm(f); + } + // Related to directional attacks? void SetTgFlag_0xA(u16 flag) { mTg.SetFlag_0xA(flag); } @@ -878,7 +885,9 @@ public: return mTg.ChkSet(); } - + void ClrAtActorInfo() { mAt.ClrActorInfo(); } + void ClrTgActorInfo() { mTg.ClrActorInfo(); } + void ClrCoActorInfo() { mCo.ClrActorInfo(); } bool ChkAtEffCounter() { return mAt.ChkEffCounter(); } bool ChkTgEffCounter() { return mTg.ChkEffCounter(); } void ClrAtEffCounter() { mAt.ClrEffCounter(); } @@ -978,9 +987,18 @@ public: void OnTgElectric() { return mTg.OnSPrm(0x40000); } + void OnTg_0x8000000() { + return mTg.OnSPrm(0x8000000); + } void ClrTgElectric() { return mTg.OffSPrm(0x40000); } + void ClrTg_0x10000() { + return mTg.OffSPrm(0x10000); + } + void ClrTg_0x8000000() { + return mTg.OffSPrm(0x8000000); + } u32 ChkTgBonk() const { return mTg.MskSPrm(0x200000); } diff --git a/include/d/col/cc/d_cc_d.h b/include/d/col/cc/d_cc_d.h index 88dff6b7..4af5b6ff 100644 --- a/include/d/col/cc/d_cc_d.h +++ b/include/d/col/cc/d_cc_d.h @@ -18,6 +18,7 @@ public: virtual cCcD_ShapeAttr *GetShapeAttr() override; using cM3dGCps::Set; + using cM3dGLin::Set; void Set(const dCcD_SrcCps &src); void unknownCalc(); }; diff --git a/include/d/d_camera.h b/include/d/d_camera.h index 8f4560a0..059647ba 100644 --- a/include/d/d_camera.h +++ b/include/d/d_camera.h @@ -61,9 +61,11 @@ public: bool isUnderwater() const; f32 getUnderwaterDepth() const; + void fn_8019EA00(const mVec3_c&, const mVec3_c&, f32, f32); void fn_8019E430(); void fn_8019E410(); mAng fn_8019E3B0() const; + void fn_8019EA70(bool); private: /* 0x068 */ u8 _0x068[0x6C - 0x068]; diff --git a/include/d/d_cc.h b/include/d/d_cc.h index c5349190..c06a35e5 100644 --- a/include/d/d_cc.h +++ b/include/d/d_cc.h @@ -27,15 +27,14 @@ public: /* 0x210 */ LinkedColliderNode mNode; }; -class dCcD_Linked_Cyl : public dCcD_Cyl { +class dCcD_Linked_Cps : public dCcD_Cps { public: - dCcD_Linked_Cyl() : mNode(this) {} - virtual ~dCcD_Linked_Cyl() { + dCcD_Linked_Cps() : mNode(this) {} + virtual ~dCcD_Linked_Cps() { mNode.remove(); } - /* 0x150 */ LinkedColliderNode mNode; + /* 0x170 */ LinkedColliderNode mNode; }; - class dCcD_Linked_Sph : public dCcD_Sph { public: dCcD_Linked_Sph() : mNode(this) {} @@ -44,14 +43,13 @@ public: } /* 0x150 */ LinkedColliderNode mNode; }; - -class dCcD_Linked_Cps : public dCcD_Cps { +class dCcD_Linked_Cyl : public dCcD_Cyl { public: - dCcD_Linked_Cps() : mNode(this) {} - virtual ~dCcD_Linked_Cps() { + dCcD_Linked_Cyl() : mNode(this) {} + virtual ~dCcD_Linked_Cyl() { mNode.remove(); } - /* 0x170 */ LinkedColliderNode mNode; + /* 0x150 */ LinkedColliderNode mNode; }; class dColliderLinkedList { @@ -86,7 +84,8 @@ public: // a ptmf. It's not immediately clear how this works, // does every actor subclass the LinkedCollider___, // or are the functions all added here for the other - // files to implement? + // files to implement? d_a_b_lastboss commits a typing crime here + // to make it work... typedef bool (cCcD_Obj::*ccPtmf)(); cCcD_Obj *find(ccPtmf f) const; diff --git a/include/d/d_cs_game.h b/include/d/d_cs_game.h index 52940b71..4c2f1228 100644 --- a/include/d/d_cs_game.h +++ b/include/d/d_cs_game.h @@ -149,7 +149,7 @@ public: class lytBowCsr_c { public: lytBowCsr_c(d2d::AnmGroups g, d2d::LytBase_c *lyt) - : mAnm(g), mpLyt(lyt), mStateMgr(*this, sStateID::null), field_0x50(0.0f), field_0x54(0.0f) {} + : mAnm(g), mpLyt(lyt), mStateMgr(*this), field_0x50(0.0f), field_0x54(0.0f) {} virtual ~lytBowCsr_c() {} void init(); @@ -188,7 +188,7 @@ public: lytDowsingCsr_c(d2d::AnmGroups g, d2d::LytBase_c *lyt) : mAnm(g), mpLyt(lyt), - mStateMgr(*this, sStateID::null), + mStateMgr(*this), mpRingAllPane(nullptr), mpDowsingPane(nullptr), field_0xC0(0.0f), @@ -239,7 +239,7 @@ public: lytPachinkoCsr_c(d2d::AnmGroups g, d2d::LytBase_c *lyt) : mAnm(g), mpLyt(lyt), - mStateMgr(*this, sStateID::null), + mStateMgr(*this), mIsCharging(false), mDrawProgress(0.0f), mSavedOnProgress(0.0f) {} @@ -272,7 +272,7 @@ public: class lytCrawShotCsr_c { public: lytCrawShotCsr_c(d2d::AnmGroups g, d2d::LytBase_c *lyt) - : mAnm(g), mpLyt(lyt), mStateMgr(*this, sStateID::null), mLocked(false) {} + : mAnm(g), mpLyt(lyt), mStateMgr(*this), mLocked(false) {} virtual ~lytCrawShotCsr_c() {} void init(); @@ -303,7 +303,7 @@ public: class lytVacuumCsr_c { public: lytVacuumCsr_c(d2d::AnmGroups g, d2d::LytBase_c *lyt) - : mAnm(g), mpLyt(lyt), mStateMgr(*this, sStateID::null), mLocked(false) {} + : mAnm(g), mpLyt(lyt), mStateMgr(*this), mLocked(false) {} virtual ~lytVacuumCsr_c() {} void init(); @@ -331,7 +331,7 @@ public: public: lytItemCursor_c() - : mStateMgr(*this, sStateID::null), + : mStateMgr(*this), mAnm(mAnmGroups.tmp.mAnmGroups, 0x17), mBow(mAnm, &mLyt), mDowsing(mAnm, &mLyt), diff --git a/include/d/d_light_env.h b/include/d/d_light_env.h index 8e4cc20b..5e48e39e 100644 --- a/include/d/d_light_env.h +++ b/include/d/d_light_env.h @@ -414,6 +414,10 @@ public: return currentSpf; } + SpfSetting &GetOverrideSpf() { + return mOverrideSpfSetting; + } + const PaletteEAF_smol_entry &getSmallEAF(s32 idx1, s32 idx2) { return field_0x38E4.field_0x00[idx1].field_0x00[idx2]; } @@ -430,6 +434,18 @@ public: return field_0x2F1C; } + s32 getField_0x38DC() const { + return field_0x38DC; + } + + void setField_0x38DC(s32 v) { + field_0x38DC = v; + } + + void setField_0x5D48(f32 val) { + field_0x5D48 = val; + } + private: /* 0x0004 */ Spf currentSpf; /* 0x020C */ Spf spfs[20]; @@ -487,7 +503,9 @@ private: /* 0x48E4 */ Bpm4 field_0x48E4; /* 0x5CE4 */ PaletteDefaultMCF field_0x5CE4; /* 0x5D04 */ TwoPaletteDefaultMCF field_0x5D04; - /* 0x5D44 */ u8 field_0x5D44[0x5D59 - 0x5D44]; + /* 0x5D44 */ u8 field_0x5D44[0x5D48 - 0x5D44]; + /* 0x5D48 */ f32 field_0x5D48; + /* 0x5D4C */ u8 field_0x5D4C[0x5D59 - 0x5D4C]; /* 0x5D59 */ struct { // Anonymous until more is known bool mEnabled; u8 mValue; diff --git a/include/d/d_lyt_seeker_stone.h b/include/d/d_lyt_seeker_stone.h index 1c2cdc19..4bf491ca 100644 --- a/include/d/d_lyt_seeker_stone.h +++ b/include/d/d_lyt_seeker_stone.h @@ -3,7 +3,6 @@ #include "d/d_base.h" #include "s/s_State.hpp" -#include "s/s_StateMgr.hpp" class dLytSeekerStone_c : public dBase_c { public: diff --git a/include/d/d_player_act.h b/include/d/d_player_act.h index 2a948aa8..4d3b9dc2 100644 --- a/include/d/d_player_act.h +++ b/include/d/d_player_act.h @@ -413,7 +413,7 @@ public: /* vt 0x2A8 */ virtual void lookTowardItem() {} /* vt 0x2AC */ virtual void vt_0x2AC() {} /* vt 0x2B0 */ virtual void vt_0x2B0() {} - /* vt 0x2B4 */ virtual void triggerMoveEventMaybe(u32, u32, u32, mVec3_c &, const mAng &, u32, u32) {} + /* vt 0x2B4 */ virtual void triggerMoveEventMaybe(u32, u32, u32, const mVec3_c *, const mAng&, u32, u32) {} /* vt 0x2B8 */ virtual void setActorRef9() {} /* vt 0x2BC */ virtual void unlinkActorRef9() {} /* vt 0x2C0 */ virtual bool vt_0x2C0() { @@ -463,6 +463,19 @@ public: ATTACK_FINAL_BLOW = 11, }; + enum SpecificPlayerAttackDirection_e { + /* 0x000 */ ATTACK_DIRECTION_NONE = 0, + /* 0x001 */ ATTACK_DIRECTION_DOWN = 1 << 0, + /* 0x002 */ ATTACK_DIRECTION_DOWNRIGHT = 1 << 1, + /* 0x004 */ ATTACK_DIRECTION_RIGHT = 1 << 2, + /* 0x008 */ ATTACK_DIRECTION_UPRIGHT = 1 << 3, + /* 0x010 */ ATTACK_DIRECTION_UP = 1 << 4, + /* 0x020 */ ATTACK_DIRECTION_UPLEFT = 1 << 5, + /* 0x040 */ ATTACK_DIRECTION_LEFT = 1 << 6, + /* 0x080 */ ATTACK_DIRECTION_DOWNLEFT = 1 << 7, + /* 0x100 */ ATTACK_DIRECTION_STAB = 1 << 8, + }; + enum ModelUpdateFlags_e { UPDATE_MODEL_SWORD = 0x20, UPDATE_MODEL_SHIELD = 0x40, @@ -625,6 +638,14 @@ public: return mAttackDirection != ATTACK_NONE; } + bool isAttackingJumpSlash() const { + return mAttackDirection == ATTACK_JUMP_SLASH; + } + + u16 getSpecificAttackDirection() const { + return mSpecificAttackDirection; + } + inline bool hasvt_0x1C0() const { return vt_0x1C0() != nullptr; } @@ -637,6 +658,9 @@ public: bool isAttackingStab() const; bool isAttackingSpinHorizontal() const; bool isAttackingSpinVertical() const; + bool isAttackingSpin() const { + return isAttackingSpinHorizontal() || isAttackingSpinVertical(); + } void setBonkRelatedAnimFlag(bool b); void setPosYRot(const mVec3_c &pos, mAng rot, bool force = false, UNKWORD = 0, UNKWORD = 0); void setTransform(const mMtx_c &mtx, bool force, UNKWORD, UNKWORD); @@ -668,7 +692,8 @@ protected: /* 0x334 */ f32 field_0x334; /* 0x338 */ u8 mAttackDirection; /* 0x339 */ u8 mRidingActorType; - /* 0x33A */ u8 unk_0x33A[0x340 - 0x33A]; + /* 0x33A */ u16 mSpecificAttackDirection; + /* 0x33C */ u8 unk_0x33C[0x340 - 0x33C]; /* 0x340 */ u32 someFlags_0x340; /* 0x344 */ u32 mFaceUpdateFlags; /* 0x348 */ u32 mSwordAndMoreStates; diff --git a/include/d/d_room.h b/include/d/d_room.h index 225b0bf1..c8a04abb 100644 --- a/include/d/d_room.h +++ b/include/d/d_room.h @@ -79,7 +79,7 @@ class dRoom_c : public dBase_c { public: dRoom_c() - : mStateMgr(*this, sStateID::null), + : mStateMgr(*this), mpFile(nullptr), mpScen(nullptr), mpPly(nullptr), diff --git a/include/d/d_sc_game.h b/include/d/d_sc_game.h index b1ba5573..67bbddb4 100644 --- a/include/d/d_sc_game.h +++ b/include/d/d_sc_game.h @@ -172,6 +172,10 @@ public: sUpdateFrameCount = 0; } + static u32 getUpdateFrameCount() { + return sUpdateFrameCount; + } + bool savePromptFlag() const { return mSavePromptFlag; } diff --git a/include/d/d_stage_mgr.h b/include/d/d_stage_mgr.h index de4d0b47..f20c541d 100644 --- a/include/d/d_stage_mgr.h +++ b/include/d/d_stage_mgr.h @@ -5,6 +5,7 @@ #include "d/col/cc/d_cc_s.h" #include "d/d_base.h" #include "d/d_bzs_types.h" +#include "d/d_cursor_hit_check.h" #include "d/d_dylink.h" #include "d/d_fader.h" #include "egg/gfx/eggCpuTexture.h" @@ -12,6 +13,7 @@ #include "m/m_allocator.h" #include "m/m_dvd.h" #include "m/m_fader_base.h" +#include "m/m_mtx.h" #include "nw4r/g3d/g3d_camera.h" #include "s/s_FPhase.h" #include "s/s_State.hpp" @@ -103,6 +105,9 @@ public: s32 getMapNameId() const; bool fn_80199250(); + void procfn_800192F0(u8 a1, const mMtx_c &mtx, u8 a2) { + mProc1.fn_800192F0(a1, mtx, a2); + } static dStageMgr_c *GetInstance() { return sInstance; @@ -169,6 +174,8 @@ public: nw4r::g3d::Camera getCamera(s32 idx); + void fn_80199B60(u8); + dFader_c *getFader() { return &mFader; } @@ -202,11 +209,19 @@ private: /* 0x0580 */ LayoutArcControl mLayoutArcCtrl2; /* 0x058C */ dBgS mBg; // ... - u8 _0x00001[0x778]; + u8 _0x00001[0x6C8]; + + /* 0x3E38 */ // ... + /* 0x3E40 */ dCcS mCc; + + /* 0x75D8 */ dCursorHitCheckCC_c mCsHitCheck; // ... /* 0x7814 */ dParticle::tex_c mParticleTex[2]; - // ... + /* 0x7898 */ d3d::EggTextureProc mProc1; + /* 0x78EC */ d3d::XluProc mProc2; + u8 _0x00002[0x28]; + /* 0x790C */ // ... /* 0x7930 */ dFader_c mFader; /* 0x7954 */ u16 mPcamCount; @@ -218,6 +233,8 @@ private: /* 0x7964 */ const STIF *mpStif; /* 0x7968 */ const RMPL *mpRmpl; + u8 _0x00003[0x30]; + /* 0x799C */ mDvd_callback_c *mpDvdCallback; /* 0x79A0 */ mDvd_callback_c *mpDvdCallback2; @@ -227,7 +244,7 @@ private: /* 0x8694 */ dTimeAreaMgr_c mTimeAreaMgr; // ... - u8 ___[438]; + u8 ___[390]; /* 0x8898 */ EGG::CpuTexture *field_0x8898; u8 _0x889C[4]; diff --git a/include/d/d_title_manager.h b/include/d/d_title_manager.h index 77c3d000..a56cbf94 100644 --- a/include/d/d_title_manager.h +++ b/include/d/d_title_manager.h @@ -3,7 +3,6 @@ #include "d/d_base.h" #include "s/s_State.hpp" -#include "s/s_StateMgr.hpp" class dTitleMgr_c : public dBase_c { public: diff --git a/include/d/lyt/d_lyt_area_caption.h b/include/d/lyt/d_lyt_area_caption.h index 8f71818d..b6e7ea61 100644 --- a/include/d/lyt/d_lyt_area_caption.h +++ b/include/d/lyt/d_lyt_area_caption.h @@ -6,7 +6,7 @@ class dLytAreaCaptionParts_c { public: - dLytAreaCaptionParts_c() : mStateMgr(*this, sStateID::null) {} + dLytAreaCaptionParts_c() : mStateMgr(*this) {} ~dLytAreaCaptionParts_c() {} bool init(int first); diff --git a/include/d/lyt/d_lyt_battery.h b/include/d/lyt/d_lyt_battery.h index 06abee5f..c3959945 100644 --- a/include/d/lyt/d_lyt_battery.h +++ b/include/d/lyt/d_lyt_battery.h @@ -3,7 +3,6 @@ #include "d/lyt/d2d.h" #include "s/s_State.hpp" -#include "s/s_StateMgr.hpp" class dLytBattery_c { public: @@ -16,7 +15,7 @@ public: } private: - dLytBattery_c() : mStateMgr(*this, sStateID::null) { + dLytBattery_c() : mStateMgr(*this) { sInstance = this; } diff --git a/include/d/lyt/d_lyt_bird_gauge.h b/include/d/lyt/d_lyt_bird_gauge.h index dea08876..74b5195c 100644 --- a/include/d/lyt/d_lyt_bird_gauge.h +++ b/include/d/lyt/d_lyt_bird_gauge.h @@ -53,7 +53,7 @@ private: class dLytBirdGauge_c : public d2d::dSubPane { public: - dLytBirdGauge_c() : mStateMgr(*this, sStateID::null) {} + dLytBirdGauge_c() : mStateMgr(*this) {} virtual bool build(d2d::ResAccIf_c *resAcc) override; virtual bool remove() override; virtual bool execute() override; diff --git a/include/d/lyt/d_lyt_boss_caption.h b/include/d/lyt/d_lyt_boss_caption.h new file mode 100644 index 00000000..65436c12 --- /dev/null +++ b/include/d/lyt/d_lyt_boss_caption.h @@ -0,0 +1,28 @@ +#ifndef D_LYT_BOSS_CAPTION_H +#define D_LYT_BOSS_CAPTION_H + +#include "common.h" + +class dLytBossCaption_c { +public: + static dLytBossCaption_c *GetInstance() { + return sInstance; + } + + void show(const char *label, UNKWORD); + + // I believe this is the inline that causes all the Rev0 -> Rev1 pain in RELs... + void unk_inline() { + field_0x645 = 0; + field_0x646 = 0; + } + +private: + static dLytBossCaption_c *sInstance; + + u8 _0x00[0x645 - 0x00]; + u8 field_0x645; + u8 field_0x646; +}; + +#endif diff --git a/include/d/lyt/d_lyt_boss_gauge.h b/include/d/lyt/d_lyt_boss_gauge.h index c663454d..2beff090 100644 --- a/include/d/lyt/d_lyt_boss_gauge.h +++ b/include/d/lyt/d_lyt_boss_gauge.h @@ -6,7 +6,7 @@ class dLytBossGauge_c { public: - dLytBossGauge_c() : mStateMgr(*this, sStateID::null) {} + dLytBossGauge_c() : mStateMgr(*this) {} virtual ~dLytBossGauge_c() {} bool build(); diff --git a/include/d/lyt/d_lyt_common_icon_item.h b/include/d/lyt/d_lyt_common_icon_item.h index 4f6ad8c2..a2e6791c 100644 --- a/include/d/lyt/d_lyt_common_icon_item.h +++ b/include/d/lyt/d_lyt_common_icon_item.h @@ -210,7 +210,7 @@ public: DOWSING, }; - dLytCommonIconItem_c() : mStateMgr(*this, sStateID::null), mPart(3) {} + dLytCommonIconItem_c() : mStateMgr(*this), mPart(3) {} ~dLytCommonIconItem_c() {} virtual bool build(d2d::ResAccIf_c *resAcc) override; diff --git a/include/d/lyt/d_lyt_common_icon_material.h b/include/d/lyt/d_lyt_common_icon_material.h index 4b87781c..1bdebf2e 100644 --- a/include/d/lyt/d_lyt_common_icon_material.h +++ b/include/d/lyt/d_lyt_common_icon_material.h @@ -137,7 +137,7 @@ public: TREASURE, }; - dLytCommonIconMaterial_c() : mStateMgr(*this, sStateID::null), mPart(2) {} + dLytCommonIconMaterial_c() : mStateMgr(*this), mPart(2) {} ~dLytCommonIconMaterial_c() {} virtual bool build(d2d::ResAccIf_c *resAcc) override; diff --git a/include/d/lyt/d_lyt_cursor_stick.h b/include/d/lyt/d_lyt_cursor_stick.h index 80670a58..6e9e837b 100644 --- a/include/d/lyt/d_lyt_cursor_stick.h +++ b/include/d/lyt/d_lyt_cursor_stick.h @@ -9,7 +9,7 @@ /** 2D UI - element outline when selecting with cursor */ class dLytCursorStick_c { public: - dLytCursorStick_c() : mStateMgr(*this, sStateID::null) { + dLytCursorStick_c() : mStateMgr(*this) { sInstance = this; } ~dLytCursorStick_c() { diff --git a/include/d/lyt/d_lyt_demo_dowsing.h b/include/d/lyt/d_lyt_demo_dowsing.h index e361b60f..4f5d4d69 100644 --- a/include/d/lyt/d_lyt_demo_dowsing.h +++ b/include/d/lyt/d_lyt_demo_dowsing.h @@ -8,7 +8,7 @@ class dLytDemoDowsing_c : public dBase_c { public: - dLytDemoDowsing_c() : mStateMgr(*this, sStateID::null) { + dLytDemoDowsing_c() : mStateMgr(*this) { sInstance = this; } virtual ~dLytDemoDowsing_c() { diff --git a/include/d/lyt/d_lyt_do_button.h b/include/d/lyt/d_lyt_do_button.h index 41e95b8f..cbfd7ef1 100644 --- a/include/d/lyt/d_lyt_do_button.h +++ b/include/d/lyt/d_lyt_do_button.h @@ -161,7 +161,7 @@ public: ACT_DO_INVALID = 94, }; - dLytDobutton_c() : mStateMgr(*this, sStateID::null) { + dLytDobutton_c() : mStateMgr(*this) { sInstance = this; } virtual ~dLytDobutton_c() { diff --git a/include/d/lyt/d_lyt_help.h b/include/d/lyt/d_lyt_help.h index 10f9f377..dd88ce5e 100644 --- a/include/d/lyt/d_lyt_help.h +++ b/include/d/lyt/d_lyt_help.h @@ -51,7 +51,7 @@ private: class dLytHelp_c : public m2d::Base_c { public: - dLytHelp_c() : mStateMgr(*this, sStateID::null) { + dLytHelp_c() : mStateMgr(*this) { sInstance = this; } virtual ~dLytHelp_c() { diff --git a/include/d/lyt/d_lyt_map.h b/include/d/lyt/d_lyt_map.h index 539c0721..69289ffd 100644 --- a/include/d/lyt/d_lyt_map.h +++ b/include/d/lyt/d_lyt_map.h @@ -194,7 +194,7 @@ public: friend class dLytMapPinIconAggregate_c; dLytMapPinIcon_c() - : mStateMgr(*this, sStateID::null), + : mStateMgr(*this), mpBounding(nullptr), field_0x1BC(0), mPosition(0.0f, 0.0f, 0.0f), @@ -253,7 +253,7 @@ class dLytMapPinIconAggregate_c { friend class dLytMapMain_c; public: - dLytMapPinIconAggregate_c() : mStateMgr(*this, sStateID::null) { + dLytMapPinIconAggregate_c() : mStateMgr(*this) { field_0x9A0 = nullptr; mLoopFrame = 0; mLoopFrameMax = 0; @@ -296,7 +296,7 @@ class dLytMapFloorBtn_c { public: dLytMapFloorBtn_c() - : mStateMgr(*this, sStateID::null), + : mStateMgr(*this), mpOwnerLyt(nullptr), mpAnmGroups(nullptr), field_0x44(0), @@ -338,7 +338,7 @@ class dLytMapFloorBtnMgr_c : public d2d::dSubPane { public: dLytMapFloorBtnMgr_c(dLytMapGlobal_c *global) - : mpGlobal(global), mpPane(nullptr), mStateMgr(*this, sStateID::null) { + : mpGlobal(global), mpPane(nullptr), mStateMgr(*this) { mNumFloors = 1; mBaseFloorOffset = 0; mSelectedBtnIdx = 0; @@ -437,7 +437,7 @@ class dLytMapPopupInfo_c { friend class dLytMapMain_c; public: - dLytMapPopupInfo_c() : mStateMgr(*this, sStateID::null) {} + dLytMapPopupInfo_c() : mStateMgr(*this) {} STATE_FUNC_DECLARE(dLytMapPopupInfo_c, Invisible); STATE_FUNC_DECLARE(dLytMapPopupInfo_c, In); @@ -461,7 +461,7 @@ class dLytMapSavePopupAction_c { friend class dLytMapSavePopup_c; public: - dLytMapSavePopupAction_c() : mStateMgr(*this, sStateID::null), mInOutFrame(0.0f), mInRequest(false) {} + dLytMapSavePopupAction_c() : mStateMgr(*this), mInOutFrame(0.0f), mInRequest(false) {} STATE_FUNC_DECLARE(dLytMapSavePopupAction_c, Invisible); STATE_FUNC_DECLARE(dLytMapSavePopupAction_c, In); @@ -512,7 +512,7 @@ class dLytMapSaveCaption_c { friend class dLytMapMain_c; public: - dLytMapSaveCaption_c() : mStateMgr(*this, sStateID::null) {} + dLytMapSaveCaption_c() : mStateMgr(*this) {} STATE_FUNC_DECLARE(dLytMapSaveCaption_c, Invisible); STATE_FUNC_DECLARE(dLytMapSaveCaption_c, In); @@ -539,7 +539,7 @@ class dLytMapSaveObj_c { public: dLytMapSaveObj_c() - : mStateMgr(*this, sStateID::null), mSelectRequest(false), mDecideRequest(false), mDecideFinished(false) {} + : mStateMgr(*this), mSelectRequest(false), mDecideRequest(false), mDecideFinished(false) {} ~dLytMapSaveObj_c() {} STATE_FUNC_DECLARE(dLytMapSaveObj_c, Wait); diff --git a/include/d/lyt/d_lyt_map_capture.h b/include/d/lyt/d_lyt_map_capture.h index fd44a144..a99fb335 100644 --- a/include/d/lyt/d_lyt_map_capture.h +++ b/include/d/lyt/d_lyt_map_capture.h @@ -8,7 +8,7 @@ class dLytMapCapture_c { public: - dLytMapCapture_c() :mStateMgr(*this, sStateID::null), mpPicture(nullptr) { + dLytMapCapture_c() :mStateMgr(*this), mpPicture(nullptr) { field_0x070 = 0.0f; field_0x074 = 0.0f; mRenderRequest = false; diff --git a/include/d/lyt/d_lyt_note.h b/include/d/lyt/d_lyt_note.h index 6f702fcb..1e437031 100644 --- a/include/d/lyt/d_lyt_note.h +++ b/include/d/lyt/d_lyt_note.h @@ -7,7 +7,7 @@ // size 0x27C class dLytNote_c { public: - dLytNote_c() : mStateMgr(*this, sStateID::null) {} + dLytNote_c() : mStateMgr(*this) {} virtual ~dLytNote_c() {} bool build(d2d::ResAccIf_c *); diff --git a/include/d/lyt/d_lyt_sky_gauge.h b/include/d/lyt/d_lyt_sky_gauge.h index 82390128..c480a754 100644 --- a/include/d/lyt/d_lyt_sky_gauge.h +++ b/include/d/lyt/d_lyt_sky_gauge.h @@ -49,7 +49,7 @@ private: class dLytSkyGauge_c : public d2d::dSubPane { public: - dLytSkyGauge_c() : mStateMgr(*this, sStateID::null) {} + dLytSkyGauge_c() : mStateMgr(*this) {} virtual bool build(d2d::ResAccIf_c *resAcc) override; virtual bool remove() override; virtual bool execute() override; diff --git a/include/d/lyt/d_lyt_wipe.h b/include/d/lyt/d_lyt_wipe.h index 58558856..4c63c343 100644 --- a/include/d/lyt/d_lyt_wipe.h +++ b/include/d/lyt/d_lyt_wipe.h @@ -43,7 +43,7 @@ private: class dLytWipe_c { public: - dLytWipe_c() : mStateMgr(*this, sStateID::null) {} + dLytWipe_c() : mStateMgr(*this) {} bool build(); bool remove(); diff --git a/include/d/lyt/meter/d_lyt_meter_a_btn.h b/include/d/lyt/meter/d_lyt_meter_a_btn.h index 9a16a66d..9e2fc385 100644 --- a/include/d/lyt/meter/d_lyt_meter_a_btn.h +++ b/include/d/lyt/meter/d_lyt_meter_a_btn.h @@ -6,7 +6,7 @@ class dLytMeterABtn_c : public d2d::dSubPane { public: - dLytMeterABtn_c() : mStateMgr(*this, sStateID::null) {} + dLytMeterABtn_c() : mStateMgr(*this) {} virtual bool build(d2d::ResAccIf_c *resAcc) override; virtual bool remove() override; virtual bool execute() override; diff --git a/include/d/lyt/meter/d_lyt_meter_cross_btn.h b/include/d/lyt/meter/d_lyt_meter_cross_btn.h index 56f91edd..b74d8899 100644 --- a/include/d/lyt/meter/d_lyt_meter_cross_btn.h +++ b/include/d/lyt/meter/d_lyt_meter_cross_btn.h @@ -12,7 +12,7 @@ class dLytMeterCrossBtnParts_c { friend class dLytMeterCrossBtn_c; public: - dLytMeterCrossBtnParts_c() : mStateMgr(*this, sStateID::null) {} + dLytMeterCrossBtnParts_c() : mStateMgr(*this) {} ~dLytMeterCrossBtnParts_c() {} void init(); @@ -65,7 +65,7 @@ public: CROSS_ICON_NONE = 6, }; - dLytMeterCrossBtn_c() : mStateMgr(*this, sStateID::null) {} + dLytMeterCrossBtn_c() : mStateMgr(*this) {} virtual bool build(d2d::ResAccIf_c *resAcc) override; virtual bool remove() override; virtual bool execute() override; diff --git a/include/d/lyt/meter/d_lyt_meter_dowsing.h b/include/d/lyt/meter/d_lyt_meter_dowsing.h index a95a3d29..efaae1d0 100644 --- a/include/d/lyt/meter/d_lyt_meter_dowsing.h +++ b/include/d/lyt/meter/d_lyt_meter_dowsing.h @@ -9,7 +9,7 @@ class dLytMeterDowsingMenuIcon_c { public: - dLytMeterDowsingMenuIcon_c() : mStateMgr(*this, sStateID::null) {} + dLytMeterDowsingMenuIcon_c() : mStateMgr(*this) {} virtual ~dLytMeterDowsingMenuIcon_c() {} void init(); @@ -40,7 +40,7 @@ private: class dLytMeterDowsingBlink_c { public: - dLytMeterDowsingBlink_c() : mStateMgr(*this, sStateID::null) {} + dLytMeterDowsingBlink_c() : mStateMgr(*this) {} ~dLytMeterDowsingBlink_c() {} void init(); @@ -70,7 +70,7 @@ private: class dLytMeterDowsingInput_c { public: - dLytMeterDowsingInput_c() : mStateMgr(*this, sStateID::null) {} + dLytMeterDowsingInput_c() : mStateMgr(*this) {} ~dLytMeterDowsingInput_c() {} void init(); @@ -100,7 +100,7 @@ private: class dLytMeterDowsingText_c { public: - dLytMeterDowsingText_c() : mStateMgr(*this, sStateID::null) {} + dLytMeterDowsingText_c() : mStateMgr(*this) {} ~dLytMeterDowsingText_c() {} void init(); @@ -130,7 +130,7 @@ private: class dLytMeterDowsing_c : public d2d::dSubPane { public: - dLytMeterDowsing_c() : mStateMgr(*this, sStateID::null) {} + dLytMeterDowsing_c() : mStateMgr(*this) {} virtual bool build(d2d::ResAccIf_c *resAcc) override; virtual bool remove() override; virtual bool execute() override; diff --git a/include/d/lyt/meter/d_lyt_meter_drink.h b/include/d/lyt/meter/d_lyt_meter_drink.h index 7ba0fe9f..7086ee51 100644 --- a/include/d/lyt/meter/d_lyt_meter_drink.h +++ b/include/d/lyt/meter/d_lyt_meter_drink.h @@ -29,7 +29,7 @@ class dLytMeterDrinkParts_c { }; public: - dLytMeterDrinkParts_c() : mStateMgr(*this, sStateID::null) {} + dLytMeterDrinkParts_c() : mStateMgr(*this) {} ~dLytMeterDrinkParts_c() {} void init(); @@ -57,7 +57,7 @@ private: class dLytMeterDrink_c { public: - dLytMeterDrink_c() : mStateMgr(*this, sStateID::null) {} + dLytMeterDrink_c() : mStateMgr(*this) {} ~dLytMeterDrink_c() {} virtual d2d::dLytSub *getLyt() { diff --git a/include/d/lyt/meter/d_lyt_meter_event_skip.h b/include/d/lyt/meter/d_lyt_meter_event_skip.h index b806d48c..f1840c7e 100644 --- a/include/d/lyt/meter/d_lyt_meter_event_skip.h +++ b/include/d/lyt/meter/d_lyt_meter_event_skip.h @@ -8,7 +8,7 @@ class dLytMeterEventSkip_c { public: - dLytMeterEventSkip_c() : mStateMgr(*this, sStateID::null) {} + dLytMeterEventSkip_c() : mStateMgr(*this) {} virtual ~dLytMeterEventSkip_c() {} bool build(d2d::ResAccIf_c *resAcc); bool remove(); diff --git a/include/d/lyt/meter/d_lyt_meter_ganbari_gauge.h b/include/d/lyt/meter/d_lyt_meter_ganbari_gauge.h index 03a5726a..2356a36f 100644 --- a/include/d/lyt/meter/d_lyt_meter_ganbari_gauge.h +++ b/include/d/lyt/meter/d_lyt_meter_ganbari_gauge.h @@ -9,7 +9,7 @@ class dLytMeterGanbariGauge_c : public d2d::dSubPane { public: - dLytMeterGanbariGauge_c() : mStateMgrMain(*this, sStateID::null), mStateMgrWheel(*this, sStateID::null) {} + dLytMeterGanbariGauge_c() : mStateMgrMain(*this), mStateMgrWheel(*this) {} virtual bool build(d2d::ResAccIf_c *resAcc) override; virtual bool remove() override; virtual bool execute() override; diff --git a/include/d/lyt/meter/d_lyt_meter_item_select.h b/include/d/lyt/meter/d_lyt_meter_item_select.h index c88047b8..1ef2dc50 100644 --- a/include/d/lyt/meter/d_lyt_meter_item_select.h +++ b/include/d/lyt/meter/d_lyt_meter_item_select.h @@ -12,7 +12,7 @@ class dLytMeterItemSelectIcon_c { public: - dLytMeterItemSelectIcon_c() : mStateMgr(*this, sStateID::null) {} + dLytMeterItemSelectIcon_c() : mStateMgr(*this) {} ~dLytMeterItemSelectIcon_c() {} void init(); @@ -40,7 +40,7 @@ private: class dLytMeterItemSelectBlink_c { public: - dLytMeterItemSelectBlink_c() : mStateMgr(*this, sStateID::null) {} + dLytMeterItemSelectBlink_c() : mStateMgr(*this) {} ~dLytMeterItemSelectBlink_c() {} void init(); @@ -68,7 +68,7 @@ private: class dLytMeterItemSelectText_c { public: - dLytMeterItemSelectText_c() : mStateMgr(*this, sStateID::null) {} + dLytMeterItemSelectText_c() : mStateMgr(*this) {} ~dLytMeterItemSelectText_c() {} void init(); @@ -96,7 +96,7 @@ private: class dLytMeterItemSelectBtn_c { public: - dLytMeterItemSelectBtn_c() : mStateMgr(*this, sStateID::null) {} + dLytMeterItemSelectBtn_c() : mStateMgr(*this) {} ~dLytMeterItemSelectBtn_c() {} void init(s32 i, d2d::dLytSub *lyt, nw4r::lyt::Pane *pane); diff --git a/include/d/lyt/meter/d_lyt_meter_key.h b/include/d/lyt/meter/d_lyt_meter_key.h index 43885d4e..494ad94b 100644 --- a/include/d/lyt/meter/d_lyt_meter_key.h +++ b/include/d/lyt/meter/d_lyt_meter_key.h @@ -9,7 +9,7 @@ class dLytMeterKakeraKey_c { public: - dLytMeterKakeraKey_c() : mStateMgr(*this, sStateID::null) {} + dLytMeterKakeraKey_c() : mStateMgr(*this) {} ~dLytMeterKakeraKey_c() {} bool build(d2d::ResAccIf_c *); @@ -48,7 +48,7 @@ private: class dLytMeterBossKey_c { public: - dLytMeterBossKey_c() : mStateMgr(*this, sStateID::null) {} + dLytMeterBossKey_c() : mStateMgr(*this) {} ~dLytMeterBossKey_c() {} virtual d2d::LytBase_c *getLyt() { @@ -91,7 +91,7 @@ private: class dLytMeterSmallKey_c { public: - dLytMeterSmallKey_c() : mStateMgr(*this, sStateID::null) {} + dLytMeterSmallKey_c() : mStateMgr(*this) {} ~dLytMeterSmallKey_c() {} virtual d2d::LytBase_c *getLyt() { diff --git a/include/d/lyt/meter/d_lyt_meter_minus_btn.h b/include/d/lyt/meter/d_lyt_meter_minus_btn.h index 30ac205e..91fbdd05 100644 --- a/include/d/lyt/meter/d_lyt_meter_minus_btn.h +++ b/include/d/lyt/meter/d_lyt_meter_minus_btn.h @@ -12,7 +12,7 @@ // At 0x8, [8], size 0x48 class dLytMeterMinusBtnMenuIcon_c { public: - dLytMeterMinusBtnMenuIcon_c() : mStateMgr(*this, sStateID::null) {} + dLytMeterMinusBtnMenuIcon_c() : mStateMgr(*this) {} virtual ~dLytMeterMinusBtnMenuIcon_c() {} void init(); @@ -43,7 +43,7 @@ private: // At 0x248, standalone class dLytMeterMinusBtnBlink_c { public: - dLytMeterMinusBtnBlink_c() : mStateMgr(*this, sStateID::null) {} + dLytMeterMinusBtnBlink_c() : mStateMgr(*this) {} ~dLytMeterMinusBtnBlink_c() {} void init(); @@ -74,7 +74,7 @@ private: // At 0x28C, [2], size 0x44 class dLytMeterMinusBtnText_c { public: - dLytMeterMinusBtnText_c() : mStateMgr(*this, sStateID::null) {} + dLytMeterMinusBtnText_c() : mStateMgr(*this) {} ~dLytMeterMinusBtnText_c() {} void init(); @@ -104,7 +104,7 @@ private: class dLytMeterMinusBtn_c : public d2d::dSubPane { public: - dLytMeterMinusBtn_c() : mStateMgr(*this, sStateID::null) {} + dLytMeterMinusBtn_c() : mStateMgr(*this) {} virtual bool build(d2d::ResAccIf_c *resAcc) override; virtual bool remove() override; virtual bool execute() override; diff --git a/include/d/lyt/meter/d_lyt_meter_nun_stk.h b/include/d/lyt/meter/d_lyt_meter_nun_stk.h index 825b7153..5a7bc47f 100644 --- a/include/d/lyt/meter/d_lyt_meter_nun_stk.h +++ b/include/d/lyt/meter/d_lyt_meter_nun_stk.h @@ -7,7 +7,7 @@ class dLytMeterNunStk_c : public d2d::dSubPane { public: - dLytMeterNunStk_c() : mStateMgr(*this, sStateID::null) {} + dLytMeterNunStk_c() : mStateMgr(*this) {} virtual bool build(d2d::ResAccIf_c *resAcc) override; virtual bool remove() override; virtual bool execute() override; diff --git a/include/d/lyt/meter/d_lyt_meter_nunchaku_bg.h b/include/d/lyt/meter/d_lyt_meter_nunchaku_bg.h index 86a280d9..0eacc92b 100644 --- a/include/d/lyt/meter/d_lyt_meter_nunchaku_bg.h +++ b/include/d/lyt/meter/d_lyt_meter_nunchaku_bg.h @@ -6,7 +6,7 @@ class dLytMeterNunchakuBg_c : public d2d::dSubPane { public: - dLytMeterNunchakuBg_c() : mStateMgr(*this, sStateID::null) {} + dLytMeterNunchakuBg_c() : mStateMgr(*this) {} virtual bool build(d2d::ResAccIf_c *resAcc) override; virtual bool remove() override; virtual bool execute() override; diff --git a/include/d/lyt/meter/d_lyt_meter_parts.h b/include/d/lyt/meter/d_lyt_meter_parts.h index 06c330f2..3c161c65 100644 --- a/include/d/lyt/meter/d_lyt_meter_parts.h +++ b/include/d/lyt/meter/d_lyt_meter_parts.h @@ -7,7 +7,7 @@ class dLytMeter1Button_c : public d2d::dSubPane { public: - dLytMeter1Button_c() : mStateMgr(*this, sStateID::null) {} + dLytMeter1Button_c() : mStateMgr(*this) {} virtual ~dLytMeter1Button_c() {} virtual bool build(d2d::ResAccIf_c *resAcc) override; virtual bool remove() override; @@ -48,7 +48,7 @@ private: class dLytMeter2Button_c : public d2d::dSubPane { public: - dLytMeter2Button_c() : mStateMgr(*this, sStateID::null) {} + dLytMeter2Button_c() : mStateMgr(*this) {} virtual ~dLytMeter2Button_c() {} virtual bool build(d2d::ResAccIf_c *resAcc) override; virtual bool remove() override; @@ -89,7 +89,7 @@ private: class dLytMeterParts_c { public: - dLytMeterParts_c() : mStateMgr(*this, sStateID::null) {} + dLytMeterParts_c() : mStateMgr(*this) {} void build(s32 index); void execute(); diff --git a/include/d/lyt/meter/d_lyt_meter_plus_btn.h b/include/d/lyt/meter/d_lyt_meter_plus_btn.h index ccbe9781..19eebfa7 100644 --- a/include/d/lyt/meter/d_lyt_meter_plus_btn.h +++ b/include/d/lyt/meter/d_lyt_meter_plus_btn.h @@ -8,7 +8,7 @@ class dLytMeterPlusBtn_c : public d2d::dSubPane { public: - dLytMeterPlusBtn_c() : mStateMgr(*this, sStateID::null) {} + dLytMeterPlusBtn_c() : mStateMgr(*this) {} virtual bool build(d2d::ResAccIf_c *resAcc) override; virtual bool remove() override; virtual bool execute() override; diff --git a/include/d/lyt/meter/d_lyt_meter_remocon_bg.h b/include/d/lyt/meter/d_lyt_meter_remocon_bg.h index b3900cde..1d64e8b9 100644 --- a/include/d/lyt/meter/d_lyt_meter_remocon_bg.h +++ b/include/d/lyt/meter/d_lyt_meter_remocon_bg.h @@ -6,7 +6,7 @@ class dLytMeterRemoconBg_c : public d2d::dSubPane { public: - dLytMeterRemoconBg_c() : mStateMgr(*this, sStateID::null) {} + dLytMeterRemoconBg_c() : mStateMgr(*this) {} virtual bool build(d2d::ResAccIf_c *resAcc) override; virtual bool remove() override; virtual bool execute() override; diff --git a/include/d/lyt/meter/d_lyt_meter_rupy.h b/include/d/lyt/meter/d_lyt_meter_rupy.h index d295d749..522ed7dc 100644 --- a/include/d/lyt/meter/d_lyt_meter_rupy.h +++ b/include/d/lyt/meter/d_lyt_meter_rupy.h @@ -8,7 +8,7 @@ class dLytMeterRupyStart_c { public: - dLytMeterRupyStart_c() : mStateMgr(*this, sStateID::null) {} + dLytMeterRupyStart_c() : mStateMgr(*this) {} void init(); void execute(); @@ -39,7 +39,7 @@ private: class dLytMeterRupyBlink_c { public: - dLytMeterRupyBlink_c() : mStateMgr(*this, sStateID::null) {} + dLytMeterRupyBlink_c() : mStateMgr(*this) {} void init(); void execute(); @@ -71,7 +71,7 @@ private: class dLytMeterRupy_c : public d2d::dSubPane { public: - dLytMeterRupy_c() : mStateMgr(*this, sStateID::null) {} + dLytMeterRupy_c() : mStateMgr(*this) {} virtual bool build(d2d::ResAccIf_c *resAcc) override; virtual bool remove() override; virtual bool execute() override; diff --git a/include/d/lyt/meter/d_lyt_meter_shield_gauge.h b/include/d/lyt/meter/d_lyt_meter_shield_gauge.h index 38cf0baf..de8147e3 100644 --- a/include/d/lyt/meter/d_lyt_meter_shield_gauge.h +++ b/include/d/lyt/meter/d_lyt_meter_shield_gauge.h @@ -7,7 +7,7 @@ class dLytMeterShieldGauge_c : public d2d::dSubPane { public: - dLytMeterShieldGauge_c() : mStateMgr(*this, sStateID::null) {} + dLytMeterShieldGauge_c() : mStateMgr(*this) {} virtual bool build(d2d::ResAccIf_c *resAcc) override; virtual bool remove() override; virtual bool execute() override; diff --git a/include/d/lyt/meter/d_lyt_meter_timer.h b/include/d/lyt/meter/d_lyt_meter_timer.h index b57e6538..3c5cf87a 100644 --- a/include/d/lyt/meter/d_lyt_meter_timer.h +++ b/include/d/lyt/meter/d_lyt_meter_timer.h @@ -226,7 +226,7 @@ private: class dLytMeterTimer_c { public: dLytMeterTimer_c() - : mStateMgr(*this, sStateID::null), + : mStateMgr(*this), mpPart1(nullptr), mpPart2(nullptr), field_0x48(0), diff --git a/include/d/lyt/meter/d_lyt_meter_z_btn.h b/include/d/lyt/meter/d_lyt_meter_z_btn.h index 826ffa25..5516feea 100644 --- a/include/d/lyt/meter/d_lyt_meter_z_btn.h +++ b/include/d/lyt/meter/d_lyt_meter_z_btn.h @@ -10,7 +10,7 @@ class dLytMeterZBtn_c : public d2d::dSubPane { public: - dLytMeterZBtn_c() : mStateMgr(*this, sStateID::null) {} + dLytMeterZBtn_c() : mStateMgr(*this) {} virtual bool build(d2d::ResAccIf_c *resAcc) override; virtual bool remove() override; virtual bool execute() override; diff --git a/include/d/snd/d_snd_bgm_mgr.h b/include/d/snd/d_snd_bgm_mgr.h index ff8a31d7..3ff73f12 100644 --- a/include/d/snd/d_snd_bgm_mgr.h +++ b/include/d/snd/d_snd_bgm_mgr.h @@ -101,6 +101,8 @@ public: // always returns false bool weirdCheckAlwaysFalse(); + void fn_80372D70(UNKWORD); + dSndBgmSound_c *getActiveBgmSound(); // I don't love this inline but it fixes one regswap // TODO look into getting rid of this one diff --git a/include/d/t/d_t_D3_scene_change.h b/include/d/t/d_t_D3_scene_change.h index 4f95d56d..bdf8fc7d 100644 --- a/include/d/t/d_t_D3_scene_change.h +++ b/include/d/t/d_t_D3_scene_change.h @@ -1,9 +1,9 @@ #ifndef D_T_D3_SCENE_CHANGE_H #define D_T_D3_SCENE_CHANGE_H -#include "d/a/d_a_base.h" +#include "d/t/d_tg.h" -class dTgD3SceneChange_c : public dAcBase_c { +class dTgD3SceneChange_c : public dTg_c { public: dTgD3SceneChange_c() {} virtual ~dTgD3SceneChange_c() {} diff --git a/include/d/t/d_t_at0.h b/include/d/t/d_t_at0.h index fe7b2e14..9c0b948b 100644 --- a/include/d/t/d_t_at0.h +++ b/include/d/t/d_t_at0.h @@ -1,9 +1,9 @@ #ifndef D_T_AT0_H #define D_T_AT0_H -#include "d/a/d_a_base.h" +#include "d/t/d_tg.h" -class dTgAt0_c : public dAcBase_c { +class dTgAt0_c : public dTg_c { public: dTgAt0_c() {} virtual ~dTgAt0_c() {} diff --git a/include/d/t/d_t_auto_message.h b/include/d/t/d_t_auto_message.h index d17f8dcd..8f15c98f 100644 --- a/include/d/t/d_t_auto_message.h +++ b/include/d/t/d_t_auto_message.h @@ -1,9 +1,9 @@ #ifndef D_T_AUTO_MESSAGE_H #define D_T_AUTO_MESSAGE_H -#include "d/a/d_a_base.h" +#include "d/t/d_tg.h" -class dTgAutoMessage_c : public dAcBase_c { +class dTgAutoMessage_c : public dTg_c { public: dTgAutoMessage_c() {} virtual ~dTgAutoMessage_c() {} diff --git a/include/d/t/d_t_barrel.h b/include/d/t/d_t_barrel.h index 19fb57e8..ebbb48e8 100644 --- a/include/d/t/d_t_barrel.h +++ b/include/d/t/d_t_barrel.h @@ -14,7 +14,7 @@ class dAcOstageSink_c; class dTgBarrel_c : public dTg_c { public: - dTgBarrel_c() : mStateMgr(*this, sStateID::null) {} + dTgBarrel_c() : mStateMgr(*this) {} virtual ~dTgBarrel_c() {} virtual int doDelete() override; diff --git a/include/d/t/d_t_bb_quake.h b/include/d/t/d_t_bb_quake.h index eb62d866..e6502668 100644 --- a/include/d/t/d_t_bb_quake.h +++ b/include/d/t/d_t_bb_quake.h @@ -1,13 +1,12 @@ #ifndef D_T_BB_QUAKE_H #define D_T_BB_QUAKE_H -#include "d/a/d_a_base.h" +#include "d/t/d_tg.h" #include "s/s_State.hpp" -#include "s/s_StateMgr.hpp" -class dTgBBQuake_c : public dAcBase_c { +class dTgBBQuake_c : public dTg_c { public: - dTgBBQuake_c() : mStateMgr(*this, sStateID::null) {} + dTgBBQuake_c() : mStateMgr(*this) {} virtual ~dTgBBQuake_c() {} STATE_FUNC_DECLARE(dTgBBQuake_c, Wait); diff --git a/include/d/t/d_t_bcal_tag.h b/include/d/t/d_t_bcal_tag.h index 405b61fe..504d58c2 100644 --- a/include/d/t/d_t_bcal_tag.h +++ b/include/d/t/d_t_bcal_tag.h @@ -1,13 +1,12 @@ #ifndef D_T_BCAL_TAG_H #define D_T_BCAL_TAG_H -#include "d/a/d_a_base.h" +#include "d/t/d_tg.h" #include "s/s_State.hpp" -#include "s/s_StateMgr.hpp" -class dTgBcArL_c : public dAcBase_c { +class dTgBcArL_c : public dTg_c { public: - dTgBcArL_c() : mStateMgr(*this, sStateID::null) {} + dTgBcArL_c() : mStateMgr(*this) {} virtual ~dTgBcArL_c() {} STATE_FUNC_DECLARE(dTgBcArL_c, Wait); diff --git a/include/d/t/d_t_bcz.h b/include/d/t/d_t_bcz.h index af50ea9c..76acd00b 100644 --- a/include/d/t/d_t_bcz.h +++ b/include/d/t/d_t_bcz.h @@ -1,13 +1,12 @@ #ifndef D_T_BCZ_H #define D_T_BCZ_H -#include "d/a/d_a_base.h" +#include "d/t/d_tg.h" #include "s/s_State.hpp" -#include "s/s_StateMgr.hpp" -class dTgBcZ_c : public dAcBase_c { +class dTgBcZ_c : public dTg_c { public: - dTgBcZ_c() : mStateMgr(*this, sStateID::null) {} + dTgBcZ_c() : mStateMgr(*this) {} virtual ~dTgBcZ_c() {} STATE_FUNC_DECLARE(dTgBcZ_c, Wait); diff --git a/include/d/t/d_t_beetle.h b/include/d/t/d_t_beetle.h index 44c3ccba..fab00d6d 100644 --- a/include/d/t/d_t_beetle.h +++ b/include/d/t/d_t_beetle.h @@ -1,9 +1,9 @@ #ifndef D_T_BEETLE_H #define D_T_BEETLE_H -#include "d/a/d_a_base.h" +#include "d/t/d_tg.h" -class dTgBeetle_c : public dAcBase_c { +class dTgBeetle_c : public dTg_c { public: dTgBeetle_c() {} virtual ~dTgBeetle_c() {} diff --git a/include/d/t/d_t_belt_obstacle.h b/include/d/t/d_t_belt_obstacle.h index a0a00b83..e806a6ac 100644 --- a/include/d/t/d_t_belt_obstacle.h +++ b/include/d/t/d_t_belt_obstacle.h @@ -1,9 +1,9 @@ #ifndef D_T_BELT_OBSTACLE_H #define D_T_BELT_OBSTACLE_H -#include "d/a/d_a_base.h" +#include "d/t/d_tg.h" -class dTgBeltObstacle_c : public dAcBase_c { +class dTgBeltObstacle_c : public dTg_c { public: dTgBeltObstacle_c() {} virtual ~dTgBeltObstacle_c() {} diff --git a/include/d/t/d_t_clef_game.h b/include/d/t/d_t_clef_game.h index c6513670..2864ad10 100644 --- a/include/d/t/d_t_clef_game.h +++ b/include/d/t/d_t_clef_game.h @@ -1,9 +1,9 @@ #ifndef D_T_CLEF_GAME_H #define D_T_CLEF_GAME_H -#include "d/a/d_a_base.h" +#include "d/t/d_tg.h" -class dTgClefGame_c : public dAcBase_c { +class dTgClefGame_c : public dTg_c { public: dTgClefGame_c() {} virtual ~dTgClefGame_c() {} diff --git a/include/d/t/d_t_clef_manager.h b/include/d/t/d_t_clef_manager.h index e93efaa9..3b08cf22 100644 --- a/include/d/t/d_t_clef_manager.h +++ b/include/d/t/d_t_clef_manager.h @@ -1,9 +1,9 @@ #ifndef D_T_CLEF_MANAGER_H #define D_T_CLEF_MANAGER_H -#include "d/a/d_a_base.h" +#include "d/t/d_tg.h" -class dTgClefManager_c : public dAcBase_c { +class dTgClefManager_c : public dTg_c { public: dTgClefManager_c(); virtual ~dTgClefManager_c(); diff --git a/include/d/t/d_t_col_bomb_shield.h b/include/d/t/d_t_col_bomb_shield.h index fa02157e..8ddfea35 100644 --- a/include/d/t/d_t_col_bomb_shield.h +++ b/include/d/t/d_t_col_bomb_shield.h @@ -7,7 +7,7 @@ class dTgColBombShield : public dTg_c { public: - dTgColBombShield() : mStateMgr(*this, sStateID::null) {} + dTgColBombShield() : mStateMgr(*this) {} virtual ~dTgColBombShield() {} virtual bool createHeap() override; diff --git a/include/d/t/d_t_defeat_boss.h b/include/d/t/d_t_defeat_boss.h index f5415680..35d66f5b 100644 --- a/include/d/t/d_t_defeat_boss.h +++ b/include/d/t/d_t_defeat_boss.h @@ -1,9 +1,9 @@ #ifndef D_T_DEFEAT_BOSS_H #define D_T_DEFEAT_BOSS_H -#include "d/a/d_a_base.h" +#include "d/t/d_tg.h" -class dTgDefeatBoss_c : public dAcBase_c { +class dTgDefeatBoss_c : public dTg_c { public: dTgDefeatBoss_c() {} virtual ~dTgDefeatBoss_c() {} diff --git a/include/d/t/d_t_drum.h b/include/d/t/d_t_drum.h index 6743ab92..5b1fce2c 100644 --- a/include/d/t/d_t_drum.h +++ b/include/d/t/d_t_drum.h @@ -1,9 +1,9 @@ #ifndef D_T_DRUM_H #define D_T_DRUM_H -#include "d/a/d_a_base.h" +#include "d/t/d_tg.h" -class dTgDrum_c : public dAcBase_c { +class dTgDrum_c : public dTg_c { public: dTgDrum_c() {} virtual ~dTgDrum_c() {} diff --git a/include/d/t/d_t_dungeon_start.h b/include/d/t/d_t_dungeon_start.h index 3546726d..01e54986 100644 --- a/include/d/t/d_t_dungeon_start.h +++ b/include/d/t/d_t_dungeon_start.h @@ -1,9 +1,9 @@ #ifndef D_T_DUNGEON_START_H #define D_T_DUNGEON_START_H -#include "d/a/obj/d_a_obj_base.h" +#include "d/t/d_tg.h" -class dAcDungeonStartTag_c : public dAcObjBase_c { +class dAcDungeonStartTag_c : public dTg_c { public: dAcDungeonStartTag_c() {} virtual ~dAcDungeonStartTag_c() {} diff --git a/include/d/t/d_t_effect_gen.h b/include/d/t/d_t_effect_gen.h index 3d946b7b..70144c4b 100644 --- a/include/d/t/d_t_effect_gen.h +++ b/include/d/t/d_t_effect_gen.h @@ -1,9 +1,9 @@ #ifndef D_T_EFFECT_GEN_H #define D_T_EFFECT_GEN_H -#include "d/a/d_a_base.h" +#include "d/t/d_tg.h" -class dTgEffectGen_c : public dAcBase_c { +class dTgEffectGen_c : public dTg_c { public: dTgEffectGen_c() {} virtual ~dTgEffectGen_c() {} diff --git a/include/d/t/d_t_fence_synchronizer.h b/include/d/t/d_t_fence_synchronizer.h index dfc279d1..1e431fa8 100644 --- a/include/d/t/d_t_fence_synchronizer.h +++ b/include/d/t/d_t_fence_synchronizer.h @@ -1,9 +1,9 @@ #ifndef D_T_FENCE_SYNCHRONIZER_H #define D_T_FENCE_SYNCHRONIZER_H -#include "d/a/d_a_base.h" +#include "d/t/d_tg.h" -class dTgFenceSynchronizer_c : public dAcBase_c { +class dTgFenceSynchronizer_c : public dTg_c { public: dTgFenceSynchronizer_c(); virtual ~dTgFenceSynchronizer_c(); diff --git a/include/d/t/d_t_gekotag.h b/include/d/t/d_t_gekotag.h index 2e1f0d9a..6c61a576 100644 --- a/include/d/t/d_t_gekotag.h +++ b/include/d/t/d_t_gekotag.h @@ -5,11 +5,10 @@ #include "d/a/e/d_a_e_geko.h" #include "d/t/d_tg.h" #include "s/s_State.hpp" -#include "s/s_StateMgr.hpp" class dTgGekoTag : public dTg_c { public: - dTgGekoTag() : mStateMgr(*this, sStateID::null) {} + dTgGekoTag() : mStateMgr(*this) {} virtual ~dTgGekoTag() {} virtual int create() override; diff --git a/include/d/t/d_t_group_summon.h b/include/d/t/d_t_group_summon.h index f1f25e65..116c72eb 100644 --- a/include/d/t/d_t_group_summon.h +++ b/include/d/t/d_t_group_summon.h @@ -1,13 +1,12 @@ #ifndef D_T_GROUP_SUMMON_H #define D_T_GROUP_SUMMON_H -#include "d/a/d_a_base.h" +#include "d/t/d_tg.h" #include "s/s_State.hpp" -#include "s/s_StateMgr.hpp" -class dTgGroupSummon_c : public dAcBase_c { +class dTgGroupSummon_c : public dTg_c { public: - dTgGroupSummon_c() : mStateMgr(*this, sStateID::null) {} + dTgGroupSummon_c() : mStateMgr(*this) {} virtual ~dTgGroupSummon_c() {} STATE_FUNC_DECLARE(dTgGroupSummon_c, Wait); diff --git a/include/d/t/d_t_group_test.h b/include/d/t/d_t_group_test.h index ad49ed89..24d7d2ee 100644 --- a/include/d/t/d_t_group_test.h +++ b/include/d/t/d_t_group_test.h @@ -1,13 +1,12 @@ #ifndef D_T_GROUP_TEST_H #define D_T_GROUP_TEST_H -#include "d/a/d_a_base.h" +#include "d/t/d_tg.h" #include "s/s_State.hpp" -#include "s/s_StateMgr.hpp" -class dTgGroupTest_c : public dAcBase_c { +class dTgGroupTest_c : public dTg_c { public: - dTgGroupTest_c() : mStateMgr(*this, sStateID::null) {} + dTgGroupTest_c() : mStateMgr(*this) {} virtual ~dTgGroupTest_c() {} STATE_FUNC_DECLARE(dTgGroupTest_c, Wait); diff --git a/include/d/t/d_t_harp.h b/include/d/t/d_t_harp.h index 16a0a5bc..b38b22c9 100644 --- a/include/d/t/d_t_harp.h +++ b/include/d/t/d_t_harp.h @@ -1,13 +1,12 @@ #ifndef D_T_HARP_H #define D_T_HARP_H -#include "d/a/d_a_base.h" +#include "d/t/d_tg.h" #include "s/s_State.hpp" -#include "s/s_StateMgr.hpp" -class dTgHarp_c : public dAcBase_c { +class dTgHarp_c : public dTg_c { public: - dTgHarp_c() : mStateMgr(*this, sStateID::null) {} + dTgHarp_c() : mStateMgr(*this) {} virtual ~dTgHarp_c() {} STATE_FUNC_DECLARE(dTgHarp_c, Wait); diff --git a/include/d/t/d_t_insect.h b/include/d/t/d_t_insect.h index 4264805f..6a507f69 100644 --- a/include/d/t/d_t_insect.h +++ b/include/d/t/d_t_insect.h @@ -6,7 +6,6 @@ #include "d/t/d_tg.h" #include "m/m_vec.h" #include "s/s_State.hpp" -#include "s/s_StateMgr.hpp" extern "C" bool fn_801BB750(nw4r::math::AABB *aabb, f32 f); @@ -36,7 +35,7 @@ public: SPAWN_GODDESS_WALL, SPAWN_DEFAULT = 0xF, }; - dTgInsect_c() : mStateMgr(*this, sStateID::null) {} + dTgInsect_c() : mStateMgr(*this) {} virtual ~dTgInsect_c() {} virtual int doDelete() override; diff --git a/include/d/t/d_t_ks.h b/include/d/t/d_t_ks.h index 23e51bda..e0b066c0 100644 --- a/include/d/t/d_t_ks.h +++ b/include/d/t/d_t_ks.h @@ -1,13 +1,12 @@ #ifndef D_T_KS_H #define D_T_KS_H -#include "d/a/d_a_base.h" +#include "d/t/d_tg.h" #include "s/s_State.hpp" -#include "s/s_StateMgr.hpp" -class dTgKiesuTag_c : public dAcBase_c { +class dTgKiesuTag_c : public dTg_c { public: - dTgKiesuTag_c() : mStateMgr(*this, sStateID::null) {} + dTgKiesuTag_c() : mStateMgr(*this) {} virtual ~dTgKiesuTag_c() {} STATE_FUNC_DECLARE(dTgKiesuTag_c, CreateChildren); diff --git a/include/d/t/d_t_kytag.h b/include/d/t/d_t_kytag.h index 3fcdf765..169a1c1c 100644 --- a/include/d/t/d_t_kytag.h +++ b/include/d/t/d_t_kytag.h @@ -1,13 +1,12 @@ #ifndef D_T_KYTAG_H #define D_T_KYTAG_H -#include "d/a/d_a_base.h" +#include "d/t/d_tg.h" #include "s/s_State.hpp" -#include "s/s_StateMgr.hpp" -class dKytagTag_c : public dAcBase_c { +class dKytagTag_c : public dTg_c { public: - dKytagTag_c() : mStateMgr(*this, sStateID::null) {} + dKytagTag_c() : mStateMgr(*this) {} virtual ~dKytagTag_c() {} STATE_FUNC_DECLARE(dKytagTag_c, Wait); diff --git a/include/d/t/d_t_lb_thunder.h b/include/d/t/d_t_lb_thunder.h index 1a9cf564..adb2f1cb 100644 --- a/include/d/t/d_t_lb_thunder.h +++ b/include/d/t/d_t_lb_thunder.h @@ -1,14 +1,16 @@ #ifndef D_T_LB_THUNDER_H #define D_T_LB_THUNDER_H -#include "d/a/d_a_base.h" +#include "d/t/d_tg.h" +#include "s/s_State.hpp" -class dTgLbThunder_c : public dAcBase_c { +class dTgLbThunder_c : public dTg_c { public: - dTgLbThunder_c() {} + dTgLbThunder_c() : mStateMgr(*this) {} virtual ~dTgLbThunder_c() {} private: + /* 0x??? */ STATE_MGR_DECLARE(dTgLbThunder_c); }; #endif diff --git a/include/d/t/d_t_megami_diving.h b/include/d/t/d_t_megami_diving.h index 4f0005ed..250faf43 100644 --- a/include/d/t/d_t_megami_diving.h +++ b/include/d/t/d_t_megami_diving.h @@ -1,9 +1,9 @@ #ifndef D_T_MEGAMI_DIVING_H #define D_T_MEGAMI_DIVING_H -#include "d/a/d_a_base.h" +#include "d/t/d_tg.h" -class dTgMegamiDiving_c : public dAcBase_c { +class dTgMegamiDiving_c : public dTg_c { public: dTgMegamiDiving_c() {} virtual ~dTgMegamiDiving_c() {} diff --git a/include/d/t/d_t_miechan.h b/include/d/t/d_t_miechan.h index 7f4b24db..a324f2db 100644 --- a/include/d/t/d_t_miechan.h +++ b/include/d/t/d_t_miechan.h @@ -1,13 +1,12 @@ #ifndef D_T_MIECHAN_H #define D_T_MIECHAN_H -#include "d/a/d_a_base.h" +#include "d/t/d_tg.h" #include "s/s_State.hpp" -#include "s/s_StateMgr.hpp" -class dTgMiechan_c : public dAcBase_c { +class dTgMiechan_c : public dTg_c { public: - dTgMiechan_c() : mStateMgr(*this, sStateID::null) {} + dTgMiechan_c() : mStateMgr(*this) {} virtual ~dTgMiechan_c() {} STATE_FUNC_DECLARE(dTgMiechan_c, Search); diff --git a/include/d/t/d_t_minigame_insect_capture.h b/include/d/t/d_t_minigame_insect_capture.h index a9b17361..c905809e 100644 --- a/include/d/t/d_t_minigame_insect_capture.h +++ b/include/d/t/d_t_minigame_insect_capture.h @@ -1,9 +1,9 @@ #ifndef D_T_MINIGAME_INSECT_CAPTURE_H #define D_T_MINIGAME_INSECT_CAPTURE_H -#include "d/a/d_a_base.h" +#include "d/t/d_tg.h" -class dTgMinigameInsectCapture_c : public dAcBase_c { +class dTgMinigameInsectCapture_c : public dTg_c { public: dTgMinigameInsectCapture_c(); virtual ~dTgMinigameInsectCapture_c(); diff --git a/include/d/t/d_t_mist.h b/include/d/t/d_t_mist.h index faee54ad..a52e66b0 100644 --- a/include/d/t/d_t_mist.h +++ b/include/d/t/d_t_mist.h @@ -1,13 +1,12 @@ #ifndef D_T_MIST_H #define D_T_MIST_H -#include "d/a/d_a_base.h" +#include "d/t/d_tg.h" #include "s/s_State.hpp" -#include "s/s_StateMgr.hpp" -class dMistTag_c : public dAcBase_c { +class dMistTag_c : public dTg_c { public: - dMistTag_c() : mStateMgr(*this, sStateID::null) {} + dMistTag_c() : mStateMgr(*this) {} virtual ~dMistTag_c() {} STATE_FUNC_DECLARE(dMistTag_c, Wait); diff --git a/include/d/t/d_t_mole_mgr.h b/include/d/t/d_t_mole_mgr.h index b984471b..a462ed8c 100644 --- a/include/d/t/d_t_mole_mgr.h +++ b/include/d/t/d_t_mole_mgr.h @@ -1,9 +1,9 @@ #ifndef D_T_MOLE_MGR_H #define D_T_MOLE_MGR_H -#include "d/a/d_a_base.h" +#include "d/t/d_tg.h" -class dTgMoleMgr_c : public dAcBase_c { +class dTgMoleMgr_c : public dTg_c { public: dTgMoleMgr_c() {} virtual ~dTgMoleMgr_c() {} diff --git a/include/d/t/d_t_mole_prohibit.h b/include/d/t/d_t_mole_prohibit.h index b8391ffd..4a93f0f9 100644 --- a/include/d/t/d_t_mole_prohibit.h +++ b/include/d/t/d_t_mole_prohibit.h @@ -3,11 +3,10 @@ #include "d/t/d_tg.h" #include "s/s_State.hpp" -#include "s/s_StateMgr.hpp" class dTgMoleProhibit_c : public dTg_c { public: - dTgMoleProhibit_c() : mStateMgr(*this, sStateID::null) {} + dTgMoleProhibit_c() : mStateMgr(*this) {} virtual ~dTgMoleProhibit_c() {} virtual int create() override; virtual int actorExecute() override; diff --git a/include/d/t/d_t_musasabi.h b/include/d/t/d_t_musasabi.h index 4086bcdb..4e218b2b 100644 --- a/include/d/t/d_t_musasabi.h +++ b/include/d/t/d_t_musasabi.h @@ -1,9 +1,9 @@ #ifndef D_T_MUSASABI_H #define D_T_MUSASABI_H -#include "d/a/d_a_base.h" +#include "d/t/d_tg.h" -class dTgMusasabi_c : public dAcBase_c { +class dTgMusasabi_c : public dTg_c { public: dTgMusasabi_c() {} virtual ~dTgMusasabi_c() {} diff --git a/include/d/t/d_t_musou.h b/include/d/t/d_t_musou.h index aab7d821..4e7eae27 100644 --- a/include/d/t/d_t_musou.h +++ b/include/d/t/d_t_musou.h @@ -1,9 +1,9 @@ #ifndef D_T_MUSOU_H #define D_T_MUSOU_H -#include "d/a/d_a_base.h" +#include "d/t/d_tg.h" -class dTgMusou_c : public dAcBase_c { +class dTgMusou_c : public dTg_c { public: dTgMusou_c() {} virtual ~dTgMusou_c() {} diff --git a/include/d/t/d_t_player_restart.h b/include/d/t/d_t_player_restart.h index 0d539ff8..8c1dae3a 100644 --- a/include/d/t/d_t_player_restart.h +++ b/include/d/t/d_t_player_restart.h @@ -1,9 +1,9 @@ #ifndef D_T_PLAYER_RESTART_H #define D_T_PLAYER_RESTART_H -#include "d/a/d_a_base.h" +#include "d/t/d_tg.h" -class dTgPlayerRestart_c : public dAcBase_c { +class dTgPlayerRestart_c : public dTg_c { public: dTgPlayerRestart_c() {} virtual ~dTgPlayerRestart_c() {} diff --git a/include/d/t/d_t_plight.h b/include/d/t/d_t_plight.h index c41977ee..f7ba53f5 100644 --- a/include/d/t/d_t_plight.h +++ b/include/d/t/d_t_plight.h @@ -1,9 +1,9 @@ #ifndef D_T_PLIGHT_H #define D_T_PLIGHT_H -#include "d/a/d_a_base.h" +#include "d/t/d_tg.h" -class dTgPlight_c : public dAcBase_c { +class dTgPlight_c : public dTg_c { public: dTgPlight_c() {} virtual ~dTgPlight_c() {} diff --git a/include/d/t/d_t_pltchg.h b/include/d/t/d_t_pltchg.h index 8746c34f..6a423bf2 100644 --- a/include/d/t/d_t_pltchg.h +++ b/include/d/t/d_t_pltchg.h @@ -1,9 +1,9 @@ #ifndef D_T_PLTCHG_H #define D_T_PLTCHG_H -#include "d/a/d_a_base.h" +#include "d/t/d_tg.h" -class dTgPltchg_c : public dAcBase_c { +class dTgPltchg_c : public dTg_c { public: dTgPltchg_c() {} virtual ~dTgPltchg_c() {} diff --git a/include/d/t/d_t_pumpkin_clay.h b/include/d/t/d_t_pumpkin_clay.h index 939f4e88..b1c600c5 100644 --- a/include/d/t/d_t_pumpkin_clay.h +++ b/include/d/t/d_t_pumpkin_clay.h @@ -1,13 +1,12 @@ #ifndef D_T_PUMPKIN_CLAY_H #define D_T_PUMPKIN_CLAY_H -#include "d/a/d_a_base.h" +#include "d/t/d_tg.h" #include "s/s_State.hpp" -#include "s/s_StateMgr.hpp" -class dTgPumpkinClay_c : public dAcBase_c { +class dTgPumpkinClay_c : public dTg_c { public: - dTgPumpkinClay_c() : mStateMgr(*this, sStateID::null) {} + dTgPumpkinClay_c() : mStateMgr(*this) {} virtual ~dTgPumpkinClay_c() {} STATE_FUNC_DECLARE(dTgPumpkinClay_c, Wait); diff --git a/include/d/t/d_t_reaction.h b/include/d/t/d_t_reaction.h index f21e3a89..140443f9 100644 --- a/include/d/t/d_t_reaction.h +++ b/include/d/t/d_t_reaction.h @@ -9,7 +9,7 @@ class dTgReaction_c : public dAcObjBase_c { public: - dTgReaction_c() : mStateMgr(*this, sStateID::null), mDowsingTarget(this, DowsingTarget::SLOT_NONE) {} + dTgReaction_c() : mStateMgr(*this), mDowsingTarget(this, DowsingTarget::SLOT_NONE) {} virtual ~dTgReaction_c() {} virtual bool createHeap() override; virtual int create() override; diff --git a/include/d/t/d_t_restart_time_stone.h b/include/d/t/d_t_restart_time_stone.h index 1dbb5a2b..216a5a61 100644 --- a/include/d/t/d_t_restart_time_stone.h +++ b/include/d/t/d_t_restart_time_stone.h @@ -1,9 +1,9 @@ #ifndef D_T_RESTART_TIME_STONE_H #define D_T_RESTART_TIME_STONE_H -#include "d/a/d_a_base.h" +#include "d/t/d_tg.h" -class dTgRestartTimeStone_c : public dAcBase_c { +class dTgRestartTimeStone_c : public dTg_c { public: dTgRestartTimeStone_c() {} virtual ~dTgRestartTimeStone_c() {} diff --git a/include/d/t/d_t_ride_rock_set.h b/include/d/t/d_t_ride_rock_set.h index ade6bbdd..253a6587 100644 --- a/include/d/t/d_t_ride_rock_set.h +++ b/include/d/t/d_t_ride_rock_set.h @@ -1,9 +1,9 @@ #ifndef D_T_RIDE_ROCK_SET_H #define D_T_RIDE_ROCK_SET_H -#include "d/a/d_a_base.h" +#include "d/t/d_tg.h" -class dTgRideRockSet_c : public dAcBase_c { +class dTgRideRockSet_c : public dTg_c { public: dTgRideRockSet_c() {} virtual ~dTgRideRockSet_c() {} diff --git a/include/d/t/d_t_ro_at_target_manager.h b/include/d/t/d_t_ro_at_target_manager.h index ac617a33..25de0487 100644 --- a/include/d/t/d_t_ro_at_target_manager.h +++ b/include/d/t/d_t_ro_at_target_manager.h @@ -1,9 +1,9 @@ #ifndef D_T_RO_AT_TARGET_MANAGER_H #define D_T_RO_AT_TARGET_MANAGER_H -#include "d/a/d_a_base.h" +#include "d/t/d_tg.h" -class dTgRoAtTargetManager_c : public dAcBase_c { +class dTgRoAtTargetManager_c : public dTg_c { public: dTgRoAtTargetManager_c() {} virtual ~dTgRoAtTargetManager_c() {} diff --git a/include/d/t/d_t_rock_boat.h b/include/d/t/d_t_rock_boat.h index 8e251387..d6cbc2e1 100644 --- a/include/d/t/d_t_rock_boat.h +++ b/include/d/t/d_t_rock_boat.h @@ -4,11 +4,10 @@ #include "d/t/d_tg.h" #include "f/f_list_nd.h" #include "s/s_State.hpp" -#include "s/s_StateMgr.hpp" class dTgRockBoat_c : public dTg_c { public: - dTgRockBoat_c() : mStateMgr(*this, sStateID::null) {} + dTgRockBoat_c() : mStateMgr(*this) {} virtual ~dTgRockBoat_c() {} virtual int create() override; virtual int actorExecute() override; diff --git a/include/d/t/d_t_roll_attack_log.h b/include/d/t/d_t_roll_attack_log.h index e87992d8..8bd93197 100644 --- a/include/d/t/d_t_roll_attack_log.h +++ b/include/d/t/d_t_roll_attack_log.h @@ -1,13 +1,12 @@ #ifndef D_T_ROLL_ATTACK_LOG_H #define D_T_ROLL_ATTACK_LOG_H -#include "d/a/d_a_base.h" +#include "d/t/d_tg.h" #include "s/s_State.hpp" -#include "s/s_StateMgr.hpp" -class dTgRollAttackLog_c : public dAcBase_c { +class dTgRollAttackLog_c : public dTg_c { public: - dTgRollAttackLog_c() : mStateMgr(*this, sStateID::null) {} + dTgRollAttackLog_c() : mStateMgr(*this) {} virtual ~dTgRollAttackLog_c() {} STATE_FUNC_DECLARE(dTgRollAttackLog_c, Wait); diff --git a/include/d/t/d_t_scene_change.h b/include/d/t/d_t_scene_change.h index dfaca1b2..0b6c063b 100644 --- a/include/d/t/d_t_scene_change.h +++ b/include/d/t/d_t_scene_change.h @@ -1,9 +1,9 @@ #ifndef D_T_SCENE_CHANGE_H #define D_T_SCENE_CHANGE_H -#include "d/a/d_a_base.h" +#include "d/t/d_tg.h" -class dTgSceneChange_c : public dAcBase_c { +class dTgSceneChange_c : public dTg_c { public: dTgSceneChange_c() {} virtual ~dTgSceneChange_c() {} diff --git a/include/d/t/d_t_ship_flood.h b/include/d/t/d_t_ship_flood.h index 914369d1..117e4fdc 100644 --- a/include/d/t/d_t_ship_flood.h +++ b/include/d/t/d_t_ship_flood.h @@ -1,13 +1,12 @@ #ifndef D_T_SHIP_FLOOD_H #define D_T_SHIP_FLOOD_H -#include "d/a/d_a_base.h" +#include "d/t/d_tg.h" #include "s/s_State.hpp" -#include "s/s_StateMgr.hpp" -class dTgShipFlood_c : public dAcBase_c { +class dTgShipFlood_c : public dTg_c { public: - dTgShipFlood_c() : mStateMgr(*this, sStateID::null) {} + dTgShipFlood_c() : mStateMgr(*this) {} virtual ~dTgShipFlood_c() {} STATE_FUNC_DECLARE(dTgShipFlood_c, Wait); diff --git a/include/d/t/d_t_ship_slope.h b/include/d/t/d_t_ship_slope.h index 1cb215b6..35aac4ea 100644 --- a/include/d/t/d_t_ship_slope.h +++ b/include/d/t/d_t_ship_slope.h @@ -1,13 +1,12 @@ #ifndef D_T_SHIP_SLOPE_H #define D_T_SHIP_SLOPE_H -#include "d/a/d_a_base.h" +#include "d/t/d_tg.h" #include "s/s_State.hpp" -#include "s/s_StateMgr.hpp" -class dTgShipSlope_c : public dAcBase_c { +class dTgShipSlope_c : public dTg_c { public: - dTgShipSlope_c() : mStateMgr(*this, sStateID::null) {} + dTgShipSlope_c() : mStateMgr(*this) {} virtual ~dTgShipSlope_c() {} STATE_FUNC_DECLARE(dTgShipSlope_c, Wait); diff --git a/include/d/t/d_t_ship_window.h b/include/d/t/d_t_ship_window.h index 40f7c4a2..90d49f83 100644 --- a/include/d/t/d_t_ship_window.h +++ b/include/d/t/d_t_ship_window.h @@ -7,7 +7,7 @@ class dTgShipWindow_c : public dTg_c { public: - dTgShipWindow_c() : mStateMgr(*this, sStateID::null), mEvent(*this, nullptr) {} + dTgShipWindow_c() : mStateMgr(*this), mEvent(*this, nullptr) {} virtual ~dTgShipWindow_c() {} virtual int create() override; virtual int actorExecute() override; diff --git a/include/d/t/d_t_shutter_fence_permission.h b/include/d/t/d_t_shutter_fence_permission.h index 56316505..cd93b38d 100644 --- a/include/d/t/d_t_shutter_fence_permission.h +++ b/include/d/t/d_t_shutter_fence_permission.h @@ -1,9 +1,9 @@ #ifndef D_T_SHUTTER_FENCE_PERMISSION_H #define D_T_SHUTTER_FENCE_PERMISSION_H -#include "d/a/d_a_base.h" +#include "d/t/d_tg.h" -class dTgShutterFencePermission_c : public dAcBase_c { +class dTgShutterFencePermission_c : public dTg_c { public: dTgShutterFencePermission_c(); virtual ~dTgShutterFencePermission_c(); diff --git a/include/d/t/d_t_siren_time_attack.h b/include/d/t/d_t_siren_time_attack.h index d398ba07..25176acf 100644 --- a/include/d/t/d_t_siren_time_attack.h +++ b/include/d/t/d_t_siren_time_attack.h @@ -1,13 +1,12 @@ #ifndef D_T_SIREN_TIME_ATTACK_H #define D_T_SIREN_TIME_ATTACK_H -#include "d/a/d_a_base.h" +#include "d/t/d_tg.h" #include "s/s_State.hpp" -#include "s/s_StateMgr.hpp" -class dTgSirenTimeAttack_c : public dAcBase_c { +class dTgSirenTimeAttack_c : public dTg_c { public: - dTgSirenTimeAttack_c() : mStateMgr(*this, sStateID::null) {} + dTgSirenTimeAttack_c() : mStateMgr(*this) {} virtual ~dTgSirenTimeAttack_c() {} private: diff --git a/include/d/t/d_t_skyEnemy.h b/include/d/t/d_t_skyEnemy.h index f3361b97..0d4c769c 100644 --- a/include/d/t/d_t_skyEnemy.h +++ b/include/d/t/d_t_skyEnemy.h @@ -1,13 +1,12 @@ #ifndef D_T_SKYENEMY_H #define D_T_SKYENEMY_H -#include "d/a/d_a_base.h" +#include "d/t/d_tg.h" #include "s/s_State.hpp" -#include "s/s_StateMgr.hpp" -class dTgSkyEnemyTag : public dAcBase_c { +class dTgSkyEnemyTag : public dTg_c { public: - dTgSkyEnemyTag() : mStateMgr(*this, sStateID::null) {} + dTgSkyEnemyTag() : mStateMgr(*this) {} virtual ~dTgSkyEnemyTag() {} STATE_FUNC_DECLARE(dTgSkyEnemyTag, Wait); diff --git a/include/d/t/d_t_sound.h b/include/d/t/d_t_sound.h index 8de31c07..fc35792b 100644 --- a/include/d/t/d_t_sound.h +++ b/include/d/t/d_t_sound.h @@ -1,9 +1,9 @@ #ifndef D_T_SOUND_H #define D_T_SOUND_H -#include "d/a/d_a_base.h" +#include "d/t/d_tg.h" -class dTgSound_c : public dAcBase_c { +class dTgSound_c : public dTg_c { public: dTgSound_c() {} virtual ~dTgSound_c() {} diff --git a/include/d/t/d_t_sparks.h b/include/d/t/d_t_sparks.h index 55fd6d8f..685afde1 100644 --- a/include/d/t/d_t_sparks.h +++ b/include/d/t/d_t_sparks.h @@ -1,13 +1,12 @@ #ifndef D_T_SPARKS_H #define D_T_SPARKS_H -#include "d/a/d_a_base.h" +#include "d/t/d_tg.h" #include "s/s_State.hpp" -#include "s/s_StateMgr.hpp" -class dTgSparksTag : public dAcBase_c { +class dTgSparksTag : public dTg_c { public: - dTgSparksTag() : mStateMgr(*this, sStateID::null) {} + dTgSparksTag() : mStateMgr(*this) {} virtual ~dTgSparksTag() {} STATE_FUNC_DECLARE(dTgSparksTag, Wait); diff --git a/include/d/t/d_t_sparks2.h b/include/d/t/d_t_sparks2.h index 21e1defc..fa720a59 100644 --- a/include/d/t/d_t_sparks2.h +++ b/include/d/t/d_t_sparks2.h @@ -1,13 +1,12 @@ #ifndef D_T_SPARKS2_H #define D_T_SPARKS2_H -#include "d/a/d_a_base.h" +#include "d/t/d_tg.h" #include "s/s_State.hpp" -#include "s/s_StateMgr.hpp" -class dSparks2Tag_c : public dAcBase_c { +class dSparks2Tag_c : public dTg_c { public: - dSparks2Tag_c() : mStateMgr(*this, sStateID::null) {} + dSparks2Tag_c() : mStateMgr(*this) {} virtual ~dSparks2Tag_c() {} STATE_FUNC_DECLARE(dSparks2Tag_c, Wait); diff --git a/include/d/t/d_t_spore.h b/include/d/t/d_t_spore.h index e24375e3..1ad286c9 100644 --- a/include/d/t/d_t_spore.h +++ b/include/d/t/d_t_spore.h @@ -42,7 +42,7 @@ private: class dSporeTag_c : public dTg_c { public: - dSporeTag_c() : mStateMgr(*this, sStateID::null) {} + dSporeTag_c() : mStateMgr(*this) {} virtual ~dSporeTag_c() {} virtual int create() override; diff --git a/include/d/t/d_t_switch.h b/include/d/t/d_t_switch.h index 4a48fd18..56a1cc56 100644 --- a/include/d/t/d_t_switch.h +++ b/include/d/t/d_t_switch.h @@ -3,12 +3,11 @@ #include "d/t/d_tg.h" #include "s/s_State.hpp" -#include "s/s_StateMgr.hpp" #include "toBeSorted/actor_event.h" class dTgSw_c : public dTg_c { public: - dTgSw_c() : mStateMgr(*this, sStateID::null), mActorEvent(*this, nullptr) {} + dTgSw_c() : mStateMgr(*this), mActorEvent(*this, nullptr) {} virtual ~dTgSw_c() {} virtual int create() override; diff --git a/include/d/t/d_t_sword_battle_game.h b/include/d/t/d_t_sword_battle_game.h index d5503033..f3055100 100644 --- a/include/d/t/d_t_sword_battle_game.h +++ b/include/d/t/d_t_sword_battle_game.h @@ -8,7 +8,7 @@ class dTgSwordBattleGame_c : public dTg_c { public: - dTgSwordBattleGame_c() : mStateMgr(*this, sStateID::null), mEventRelated(*this, 0) {} + dTgSwordBattleGame_c() : mStateMgr(*this), mEventRelated(*this, 0) {} virtual ~dTgSwordBattleGame_c() {} virtual int create() override; diff --git a/include/d/t/d_t_timer.h b/include/d/t/d_t_timer.h index f15dffab..5009ca84 100644 --- a/include/d/t/d_t_timer.h +++ b/include/d/t/d_t_timer.h @@ -1,7 +1,6 @@ #ifndef D_T_TIMER_H #define D_T_TIMER_H -#include "d/a/d_a_base.h" #include "d/t/d_tg.h" class dTgTimer_c : public dTg_c { diff --git a/include/d/t/d_t_touch.h b/include/d/t/d_t_touch.h index 5c24951b..bf0413bc 100644 --- a/include/d/t/d_t_touch.h +++ b/include/d/t/d_t_touch.h @@ -4,11 +4,10 @@ #include "d/t/d_tg.h" #include "m/m_mtx.h" #include "s/s_State.hpp" -#include "s/s_StateMgr.hpp" class dTgTouchTag : public dTg_c { public: - dTgTouchTag() : mStateMgr(*this, sStateID::null) {} + dTgTouchTag() : mStateMgr(*this) {} virtual ~dTgTouchTag() {} virtual int create() override; virtual int actorExecute() override; diff --git a/include/d/t/d_t_tumble_weed.h b/include/d/t/d_t_tumble_weed.h index a1918cfa..76e23518 100644 --- a/include/d/t/d_t_tumble_weed.h +++ b/include/d/t/d_t_tumble_weed.h @@ -7,7 +7,7 @@ class dAcOTumbleWeed_c; class dTgTumbleWeed_c : public dTg_c { public: - dTgTumbleWeed_c() : mStateMgr(*this, sStateID::null) {} + dTgTumbleWeed_c() : mStateMgr(*this) {} virtual ~dTgTumbleWeed_c() {} virtual int create() override; virtual int actorExecute() override; diff --git a/include/toBeSorted/d_d3d.h b/include/toBeSorted/d_d3d.h index ebfeafd2..e565ddf2 100644 --- a/include/toBeSorted/d_d3d.h +++ b/include/toBeSorted/d_d3d.h @@ -203,6 +203,8 @@ public: doDraw(); } + void fn_800192F0(u8, const mMtx_c&, u8); + private: void doRemove(); void doDraw(); diff --git a/include/toBeSorted/d_enemy_sword_mdl.h b/include/toBeSorted/d_enemy_sword_mdl.h new file mode 100644 index 00000000..40883513 --- /dev/null +++ b/include/toBeSorted/d_enemy_sword_mdl.h @@ -0,0 +1,75 @@ +#ifndef D_ENEMY_SWORD_MDL_H +#define D_ENEMY_SWORD_MDL_H + +#include "common.h" +#include "d/a/obj/d_a_obj_base.h" +#include "d/d_cc.h" +#include "d/d_shadow.h" +#include "egg/gfx/eggTexture.h" +#include "m/m3d/m_smdl.h" +#include "m/m_allocator.h" +#include "m/m_angle.h" +#include "m/m_mtx.h" +#include "m/m_quat.h" +#include "m/m_vec.h" +#include "nw4r/types_nw4r.h" +#include "toBeSorted/d_sword_swing_effect_mgr.h" + +class dEnemySwordMdl_c { +public: + /* 0x000 */ m3d::smdl_c mMdl; + /* 0x01C */ dSwordSwingEffectProcMgr_c mProc; + +private: + /* 0x070 */ bool mIsActive; + /* 0x071 */ bool mFirstFramePassed; + /* 0x074 */ mVec3_c field_0x074; + /* 0x080 */ mVec3_c field_0x080; + /* 0x08C */ mVec3_c field_0x08C; + /* 0x098 */ mVec3_c field_0x098; + /* 0x0A4 */ f32 field_0x0A4; + /* 0x0A8 */ f32 field_0x0A8; + /* 0x0AC */ dCcD_Linked_Cps mCcs[3]; + +public: + /* 0x52C */ dColliderLinkedList mCcList; + +public: + dEnemySwordMdl_c() {} + virtual ~dEnemySwordMdl_c() {} + + bool create( + mAllocator_c *alloc, void *pData, const char *mdlName, u32 bufferOption, const mVec3_c &v1, const mVec3_c &v2, + cCcD_Stts &stts, EGG::ResTIMG *pImg, int nView, u32 *pSize + ); + bool create( + mAllocator_c *alloc, nw4r::g3d::ResFile resFile, const char *mdlName, u32 bufferOption, const mVec3_c &v1, + const mVec3_c &v2, cCcD_Stts &stts, EGG::ResTIMG *pImg, int nView, u32 *pSize + ); + + void calc(const mMtx_c &mtx, const mVec3_c &v1, bool mass); + void calc(const mMtx_c &mtx, mAng angle, bool mass) { + // A bit of a wild inline but this vector is very low on the dAcBlastboss_c::actorExecute stack + mVec3_c v1 = mVec3_c(angle.sin(), 0.0f, angle.cos()); + calc(mtx, v1, mass); + } + bool entry(dAcObjBase_c *obj, dShadowCircle_c *shadow, mQuat_c *quat); + + void enableAttack(); + void fn_8006B660(UNKWORD, UNKWORD, UNKWORD, UNKWORD, UNKWORD, UNKWORD, UNKWORD, UNKWORD, UNKWORD, f32); + void setDamageMaybe(u8 damage); + void fn_8006B7A0(u32); + void fn_8006B800(u32); + + void enable() { + enableAttack(); + mProc.setActive(true); + } + + void disable() { + mIsActive = false; + mProc.setActive(false); + } +}; + +#endif diff --git a/include/toBeSorted/d_sword_swing_effect.h b/include/toBeSorted/d_sword_swing_effect.h new file mode 100644 index 00000000..1a97f0cd --- /dev/null +++ b/include/toBeSorted/d_sword_swing_effect.h @@ -0,0 +1,65 @@ +#ifndef D_SWORD_SWING_EFFECT_H +#define D_SWORD_SWING_EFFECT_H + +#include "common.h" +#include "egg/gfx/eggTexture.h" +#include "m/m3d/m_proc.h" +#include "m/m_allocator.h" +#include "m/m_color.h" +#include "m/m_vec.h" + +class dSwordSwingEffectProcBase_c : public m3d::proc_c { +protected: + struct swing_entry { + swing_entry() { + mLifetime = 0.0f; + } + ~swing_entry() {} + + void set(const mVec3_c &pos1, const mColor &c1, const mVec3_c &pos2, const mColor &c2); + + /* 0x00 */ f32 mLifetime; + /* 0x04 */ mVec3_c mv1; + /* 0x10 */ mVec3_c mv2; + /* 0x1C */ mColor mc1; + /* 0x20 */ mColor mc2; + }; + +public: + dSwordSwingEffectProcBase_c() : mpEntries(nullptr), mCount(0), mHead(0) {} + virtual ~dSwordSwingEffectProcBase_c() { + remove(); + } + + virtual int entry() override; + virtual void remove() override; + virtual void drawXlu() override; + + bool create(s32 num, mAllocator_c *alloc); + void addSwing(const mVec3_c &pos1, const mColor c1, const mVec3_c &pos2, const mColor c2); + void calc(f32 f); + +protected: + bool hasSwings() const; + + /* 0x18 */ swing_entry *mpEntries; + /* 0x1C */ u16 mNum; + /* 0x1E */ u16 mCount; + /* 0x20 */ u16 mHead; +}; + +class dSwordSwingEffectProc_c : public dSwordSwingEffectProcBase_c { +public: + dSwordSwingEffectProc_c() : mpImg(nullptr) {} + virtual ~dSwordSwingEffectProc_c() {} + + virtual void drawXlu() override; + + bool create(s32 num, mAllocator_c *alloc, EGG::ResTIMG *pImg, f32 scale); + +private: + /* 0x24 */ EGG::ResTIMG *mpImg; + /* 0x28 */ f32 mTexScale; +}; + +#endif diff --git a/include/toBeSorted/d_sword_swing_effect_mgr.h b/include/toBeSorted/d_sword_swing_effect_mgr.h new file mode 100644 index 00000000..e14600ad --- /dev/null +++ b/include/toBeSorted/d_sword_swing_effect_mgr.h @@ -0,0 +1,43 @@ +#ifndef D_SWORD_SWING_EFFECT_MGR_H +#define D_SWORD_SWING_EFFECT_MGR_H + +#include "m/m_color.h" +#include "m/m_vec.h" +#include "toBeSorted/d_sword_swing_effect.h" + +// TODO better name +class dSwordSwingEffectProcMgr_c { +private: + /* 0x00 */ dSwordSwingEffectProc_c mProc; + /* 0x2C */ bool mIsActive; + /* 0x30 */ mColor mC1; + /* 0x34 */ mColor mC2; + /* 0x38 */ mVec3_c field_0x38; + /* 0x44 */ mVec3_c field_0x44; + + void createSwingEntries(const mVec3_c &v1, const mVec3_c &v2); + +public: + dSwordSwingEffectProcMgr_c() : mC1(0xFF, 0xFF, 0xFF, 0x40), mC2(0xFF, 0xFF, 0xFF, 0x20) {} + virtual ~dSwordSwingEffectProcMgr_c() {} + + void setColor1(mColor c1) { + mC1 = c1; + } + + void setColor2(mColor c1) { + mC2 = c1; + } + + void setActive(bool v) { + mIsActive = v; + } + + bool create(s32 num, mAllocator_c *alloc, EGG::ResTIMG *pImg, f32 scale) { + return mProc.create(num, alloc, pImg, scale); + } + void calc(const mVec3_c &v1, const mVec3_c &v2); + void entry(); +}; + +#endif diff --git a/src/REL/d/a/b/d_a_b_lastboss.cpp b/src/REL/d/a/b/d_a_b_lastboss.cpp index af5d73b5..875845d1 100644 --- a/src/REL/d/a/b/d_a_b_lastboss.cpp +++ b/src/REL/d/a/b/d_a_b_lastboss.cpp @@ -1,5 +1,44 @@ #include "d/a/b/d_a_b_lastboss.h" +#include "c/c_lib.h" +#include "c/c_math.h" +#include "common.h" +#include "d/a/d_a_player.h" +#include "d/a/obj/d_a_obj_base.h" +#include "d/col/c/c_cc_d.h" +#include "d/col/cc/d_cc_s.h" +#include "d/d_base.h" +#include "d/d_camera.h" +#include "d/d_cc.h" +#include "d/d_light_env.h" +#include "d/d_player_act.h" +#include "d/d_rumble.h" +#include "d/d_sc_game.h" +#include "d/d_stage.h" +#include "d/d_stage_mgr.h" +#include "d/flag/sceneflag_manager.h" +#include "d/flag/storyflag_manager.h" +#include "d/lyt/d_lyt_boss_caption.h" +#include "d/snd/d_snd_bgm_mgr.h" +#include "d/snd/d_snd_wzsound.h" +#include "d/t/d_t_sword_battle_game.h" +#include "f/f_base.h" +#include "f/f_manager.h" +#include "f/f_profile_name.h" +#include "m/m3d/m_fanm.h" +#include "m/m_angle.h" +#include "m/m_mtx.h" +#include "m/m_vec.h" +#include "nw4r/g3d/res/g3d_resfile.h" +#include "nw4r/g3d/res/g3d_resmdl.h" +#include "nw4r/math/math_arithmetic.h" +#include "rvl/MTX/mtxvec.h" +#include "s/s_Math.h" +#include "toBeSorted/d_emitter.h" +#include "toBeSorted/event.h" +#include "toBeSorted/event_manager.h" +#include "toBeSorted/minigame_mgr.h" + SPECIAL_ACTOR_PROFILE(B_LASTBOSS, dAcBlastboss_c, fProfile::B_LASTBOSS, 0xBA, 0, 0); STATE_DEFINE(dAcBlastboss_c, Fight); @@ -17,45 +56,3286 @@ STATE_DEFINE(dAcBlastboss_c, Down); STATE_DEFINE(dAcBlastboss_c, Stun); STATE_DEFINE(dAcBlastboss_c, ThunderWait); -void dAcBlastboss_c::initializeState_Fight() {} -void dAcBlastboss_c::executeState_Fight() {} +static dCcD_SrcCyl sSrcCyl1 = { + /* mObjInf */ + {/* mObjAt */ {0, 0, {0, 0, 0}, 0, 0, 0, 0, 0, 0}, + /* mObjTg */ + {~(AT_TYPE_BUGNET | AT_TYPE_0x80000 | AT_TYPE_BELLOWS | AT_TYPE_BEETLE | AT_TYPE_WIND | AT_TYPE_0x8000), + 0x4103, + {0, 0x4, 0x407}, + 0x0, + 0x0}, + /* mObjCo */ {0x0}}, + /* mCylInf */ + {40.f, 300.f} +}; + +static dCcD_SrcCyl sSrcCyl2 = { + /* mObjInf */ + {/* mObjAt */ {0, 0, {0, 0, 0}, 0, 0, 0, 0, 0, 0}, + /* mObjTg */ + {AT_TYPE_BELLOWS, 0x103, {0, 0x4, 0x407}, 0x0, 0x0}, + /* mObjCo */ {0x0}}, + /* mCylInf */ + {70.f, 30.f} +}; + +static dCcD_SrcCyl sSrcCyl3 = { + /* mObjInf */ + {/* mObjAt */ {0, 0, {0, 0, 0}, 0, 0, 0, 0, 0, 0}, + /* mObjTg */ + {0x0, 0x0, {0, 0x0, 0x407}, 0x0, 0x0}, + /* mObjCo */ {0xE5}}, + /* mCylInf */ + {100.f, 250.f} +}; + +static dCcD_SrcSph sSrcSph1 = { + /* mObjInf */ + {/* mObjAt */ {AT_TYPE_DAMAGE, 0x2008D, {0, 0, 0}, 4, 0, 0, 0, 0, 0}, + /* mObjTg */ + {0, 0, {0, 0x0, 0x407}, 0, 0}, + /* mObjCo */ {0}}, + /* mSphInf */ + {100.0f} +}; + +static dCcD_SrcSph sSrcSph2 = { + /* mObjInf */ + {/* mObjAt */ {AT_TYPE_DAMAGE, 0x22008D, {0, 0, 4}, 8, 0, 0, 0, 0, 0}, + /* mObjTg */ + {AT_TYPE_0x800000 | AT_TYPE_BUGNET, 0x103, {0, 0x19, 0x407}, 0, 0}, + /* mObjCo */ {0}}, + /* mSphInf */ + {100.0f} +}; + +static dCcD_SrcSph sSrcSph = { + /* mObjInf */ + {/* mObjAt */ {0, 0, {0, 0, 0}, 0, 0, 0, 0, 0, 0}, + /* mObjTg */ + {AT_TYPE_BELLOWS, 0x4103, {0, 0x0, 0x40F}, 0, 0}, + /* mObjCo */ {0}}, + /* mSphInf */ + {30.0f} +}; + +s32 useUnused() { + static const f32 a1[] = { + 0.95f, + 1.05f, + 0.0f, + }; + return (s32)a1; +} + +bool dAcBlastboss_c::createHeap() { + bool result; + void *pData = getOarcResFile("BLastBoss"); + + TRY_CREATE2(mMdl.create3(*this, pData, "LastBoss", "Wait", 0x334)); + mScnCallback.attach(mMdl.getModel()); + + nw4r::g3d::ResFile res(pData); + + TRY_CREATE2(mAnmTexSrt.create(mMdl.getModel().getResMdl(), res.GetResAnmTexSrt("Hair"), &mAllocator, nullptr, 1)); + mMdl.getModel().setAnm(mAnmTexSrt); + + TRY_CREATE2(mAnmMatClr1.create(mMdl.getModel().getResMdl(), res.GetResAnmClr("Wait"), &mAllocator, nullptr, 2)); + mAnmMatClr1.setAnm(mMdl.getModel(), res.GetResAnmClr("Hair"), 1, m3d::PLAY_MODE_0); + mMdl.getModel().setAnm(mAnmMatClr1); + + mMdl.getModel().setCallback(&mMdlCallback); + mMdlCallback.mpOwner = this; + + TRY_CREATE2(mSwordMdl.create( + &mAllocator, pData, "LastBossSword", 0x130, mVec3_c(0.0f, 0.0f, 0.0f), mVec3_c(0.0f, -230.0f, 0.0f), mStts, + nullptr, 1, nullptr + )); + // TODO I'm not going to try and make sense of this for now + mSwordMdl.fn_8006B660(4, 1, 0, 0x10000, 0, 0, 0, 0x400, 0xc, 60.0f); + mSwordMdl.mProc.setColor1(mColor(0xFF, 0xFF, 0xFF, 0x14)); + mSwordMdl.mProc.setColor2(mColor(0xFF, 0xFF, 0xFF, 0x14)); + + TRY_CREATE2(mThunderMdl.create(res.GetResMdl("FX_LBThunder"), &mAllocator, 0x120)); + + TRY_CREATE2( + mThunderAnmMatClr.create(mThunderMdl.getResMdl(), res.GetResAnmClr("FX_LBThunder"), &mAllocator, nullptr, 1) + ); + mThunderMdl.setAnm(mThunderAnmMatClr); + + dBase_c::createBase(fProfile::LYT_BOSS_CAPTION, this, 0, OTHER); + + return result; +} + +int dAcBlastboss_c::create() { + mThunderWaitSceneFlag = getFromParams(0, 0xFF); + if (MinigameManager::GetInstance()->checkInBossRush()) { + mInBossRush = true; + } + CREATE_ALLOCATOR(dAcBlastboss_c); + + mStts.SetRank(10); + mCcList.addCc(mCc1, sSrcCyl1); + mCcList.addCc(mCc2, sSrcCyl2); + mCcList.addCc(mCc3, sSrcCyl3); + + for (int i = 0; i < (int)ARRAY_LENGTH(field_0x1268); i++) { + field_0x1268[i].field_0x000 = i; + field_0x1268[i].field_0x002 = cM::rndF(65536.0f); + mCcList.addCc(field_0x1268[i].mCc, sSrcSph); + for (int j = 0; j < (int)ARRAY_LENGTH(field_0x1268[j].field_0x014); j++) { + field_0x1268[i].field_0x014[j] = mPosition; + } + field_0x1268[i].field_0x008 = i * 15000; + } + + // TODO loop of length 1 might not exist + for (int i = 0; i < (int)ARRAY_LENGTH(field_0x2948); i++) { + mCcList.addCc(field_0x2948[i].mCc, sSrcSph); + for (int j = 0; j < (int)ARRAY_LENGTH(field_0x2948[j].field_0x008); j++) { + field_0x2948[i].field_0x008[j] = mPosition; + } + } + + mCcList.SetStts(mStts); + + mCc4.Set(sSrcSph1); + mCc4.SetStts(mStts); + + mLightningCc.Set(sSrcSph2); + mLightningCc.mTg.Set_0x4C(-1); + mLightningCc.SetStts(mStts); + + mAcceleration = -5.0f; + mMaxSpeed = -80.0f; + + mBoundingBox.Set(mVec3_c(-200.0f, -300.0f, -200.0f), mVec3_c(200.0f, 300.0f, 200.0f)); + mStateMgr.changeState(StateID_Fight); + + field_0x1132 = true; + mCounter = cM::rndF(65536.0f); + + mHealth = 400; + mPositionCopy3 = mPosition; + + mLastAttackDir = mSecondLastAttackDirection = -1; + + mWaterEmitter.init(this); + mEmitter2.init(this); + // mEmitter3.init(this); // TODO why not this one... + mEmitter4.init(this); + mEmitter5.init(this); + mEmitter6.init(this); + mEmitter7.init(this); + + mLightInfo.SetPosition(mPosition); + mLightInfo.mClr.Set(100, 150, 255, 255); + dLightEnv_c::GetPInstance()->plight_set(&mLightInfo); + setLightningTimerMaybe(100); + + if (!mInBossRush) { + mLightingStrikeState = LIGHTNING_STRIKE_TRIGGER_START; + setActorProperty(AC_PROP_0x4); + } + + return SUCCEEDED; +} + +// why are these up here? +static const s16 moreAngs[] = {0xA000, 0xC000, 0xE000, 0xF000, 0x0000, 0x1000, 0x2000, 0x4000}; + +int dAcBlastboss_c::doDelete() { + dLightEnv_c::GetPInstance()->plight_cut(&mLightInfo); + return SUCCEEDED; +} + +int dAcBlastboss_c::actorExecute() { + if (mInBossRush && mpSwordBattleGame == nullptr) { + mpSwordBattleGame = static_cast( + fManager_c::searchBaseByProfName(fProfile::TAG_SWORD_BATTLE_GAME, mpSwordBattleGame) + ); + } + dAcPy_c *link = dAcPy_c::GetLinkM(); + + mCounter++; + + field_0x1133 = 0; + field_0x1131 = 0; + mIsDown = false; + field_0x114E = 0; + + field_0x11A4 = 0.0f; + mLightInfo.mScale = 0.0f; + field_0x11B0 = 0.7f; + + for (int i = 0; i < TIMER_MAX; i++) { + if (mTimers[i] != 0) { + mTimers[i]--; + } + } + + if (mMdlCallback.field_0x04.mVal != 0) { + mMdlCallback.field_0x04.mVal--; + } + + if (field_0x117C != 0) { + field_0x117C--; + } + + if (field_0x113D != 0) { + field_0x113D--; + } + + if (field_0x113F != 0) { + field_0x113F--; + } + + if (field_0x113E != 0) { + field_0x113E--; + } + + mVec3_c vEff; + mVec3_c linkPos = link->getPosition(); + mYAngleToLink = cLib::targetAngleY(mPosition, linkPos); + mXZDistanceToLink = link->getPosition().absXZTo(mPosition); + + mYRotationRelativeToLink = mYAngleToLink - mRotation.y; + mSwordMdl.disable(); + + mCc4.ClrAtSet(); + mLightningCc.ClrAtSet(); + + checkDamage(); + if (mpSwordBattleGame == nullptr || mpSwordBattleGame->checkFightStarted() == true) { + mStateMgr.executeState(); + } + + mRotation.x = mAngle.x; + mRotation.z = mAngle.z; + sLib::addCalcAngle(mRotation.y.ref(), mAngle.y, 2, 0x800); + + mMdl.play(); + if (!mIsDead) { + mAnmMatClr1.play(); + } + + calcVelocity(); + mPosition += mVelocity; + mPosition += mStts.GetCcMove(); + mPosition.x += mAttackKnockbackX; + mPosition.z += mAttackKnockbackZ; + + mAttackKnockbackX *= 0.6f; + mAttackKnockbackZ *= 0.6f; + + f32 f5 = 0.0f; + if (mRotation.x != 0) { + f5 += field_0x11C0 * mRotation.x.sin(); + } + + field_0x1140 = false; + if (mPosition.y <= f5) { + mPosition.y = f5; + field_0x11BC = mVelocity.y; + mVelocity.y = 0.0f; + field_0x1140 = true; + } + + updateMainNodeTransforms(); + + mWorldMtx.transS(mPosition); + mWorldMtx.ZXYrotM(mRotation); + mScale.set(0.95f, 0.95f, 0.95f); + mMdl.getModel().setScale(mScale); + mMdl.getModel().setLocalMtx(mWorldMtx); + if (!mIsDown) { + mAnmTexSrt.play(); + } + + mMdl.getModel().calc(false); + + nw4r::g3d::ResMdl resMdl = mMdl.getModel().getResMdl(); + // TODO: These very deliberately placed matrices might work better with + // inlines but I haven't found an inline that places rotMtx where it needs + // to be. + mMtx_c nodeMtx; + mMtx_c rotMtx; + mMtx_c scaleMtx; + mMdl.getModel().getNodeWorldMtx(resMdl.GetResNode("loc_sword01").GetID(), nodeMtx); + scaleMtx.scaleS(1.05f, 1.05f, 1.05f); + MTXConcat(nodeMtx, scaleMtx, nodeMtx); + + mSwordMdl.calc(nodeMtx, mRotation.y, false); + + vEff.set(0.0f, -120.0f, 0.0f); + if (mGuardDirection == GUARD_BT) { + vEff.y = -80.0f; + if (mXZDistanceToLink > 300.0f) { + vEff.y -= (mXZDistanceToLink - 300.0f); + if (vEff.y < -280.0f) { + vEff.y = -280.0f; + } + } + } + MTXMultVec(nodeMtx, vEff, mSwordPosition); + + if (mIsSwordEmpowered) { + mEmitter4.holdEffect(PARTICLE_RESOURCE_ID_MAPPING_619_, nodeMtx, nullptr, nullptr); + mLightInfo.mPos = mSwordPosition; + if (dScGame_c::getUpdateFrameCount() & 2) { + mLightInfo.SetScale(300.0f); + } else { + mLightInfo.SetScale(200.0f); + } + holdSound(SE_BLasBos_SwordEnpowered); + } + + if (mStunState != 0) { + if (mStunState == 1) { + mEmitter7.holdEffect(PARTICLE_RESOURCE_ID_MAPPING_852_, nodeMtx, nullptr, nullptr); + mMdl.getModel().getNodeWorldMtx(resMdl.GetResNode("backbone2").GetID(), nodeMtx); + mEmitter6.holdEffect(PARTICLE_RESOURCE_ID_MAPPING_853_, nodeMtx, nullptr, nullptr); + holdSound(SE_BLasBos_UnderElecShock); + } else if (mStunState == 2) { + mMdl.getModel().getNodeWorldMtx(resMdl.GetResNode("backbone2").GetID(), nodeMtx); + dJEffManager_c::spawnEffect(PARTICLE_RESOURCE_ID_MAPPING_851_, nodeMtx, nullptr, nullptr, 0, 0); + mMtx_c transMtx; + transMtx.transS(0.0f, -100000.0f, 0.0f); + MTXConcat(nodeMtx, transMtx, nodeMtx); + mEmitter7.holdEffect(PARTICLE_RESOURCE_ID_MAPPING_852_, nodeMtx, nullptr, nullptr); + mEmitter6.holdEffect(PARTICLE_RESOURCE_ID_MAPPING_853_, nodeMtx, nullptr, nullptr); + holdSound(SE_BLasBos_KillOffElecShock); + } + mLightInfo.mPos = mSwordPosition; + if (dScGame_c::getUpdateFrameCount() & 2) { + mLightInfo.SetScale(400.0f); + } else { + mLightInfo.SetScale(300.0f); + } + mStunState = 0; + } + + mMdl.getModel().getNodeWorldMtx(B_LAST_BOSS_NODE_thumbL2, nodeMtx); + nodeMtx.getTranslation(mThumbL2Translation); + mMdl.getModel().getNodeWorldMtx(B_LAST_BOSS_NODE_backbone1, nodeMtx); + nodeMtx.getTranslation(mBackbone1Translation); + mMdl.getModel().getNodeWorldMtx(B_LAST_BOSS_NODE_chest, nodeMtx); + nodeMtx.getTranslation(mChestTranslation); + mMdl.getModel().getNodeWorldMtx(B_LAST_BOSS_NODE_toeL, nodeMtx); + nodeMtx.getTranslation(mToeTranslation[0]); + mMdl.getModel().getNodeWorldMtx(B_LAST_BOSS_NODE_toeR, nodeMtx); + nodeMtx.getTranslation(mToeTranslation[1]); + + mMdl.getModel().getNodeWorldMtx(B_LAST_BOSS_NODE_head, nodeMtx); + mVec3_c tmp1(0.0f, 0.0f, 0.0f); + MTXMultVec(nodeMtx, tmp1, mPositionCopy2); + mVec3_c v3; + v3.x = mPositionCopy2.x; + v3.y = mPositionCopy2.y + 50.0f; + v3.z = mPositionCopy2.z; + mPositionCopy3 = v3; + + if (field_0x1132) { + fn_80030c20(0, 1500.0f, 50.0f, -200.0f, 200.0f); + } + + nodeMtx.YrotS(mRotation.y); + + mVec3_c tmpCc; + if (link->isAttacking() && mStateMgr.isState(StateID_Guard)) { + if (mGuardDirection == GUARD_BT) { + tmpCc.x = 0.0f; + tmpCc.y = 0.0f; + tmpCc.z = 100.0f; + if (mXZDistanceToLink > 300.0f) { + tmpCc.z = (mXZDistanceToLink - 300.0f) + 100.0f; + if (tmpCc.z > 300) { + tmpCc.z = 300.0f; + } + } + } else { + tmpCc.x = 0.0f; + tmpCc.y = 0.0f; + tmpCc.z = 130.0f; + } + mCc1.SetR(20.0f); + } else if (mStateMgr.isState(StateID_ThunderWait)) { + tmpCc.set(0.0f, 0.0f, 0.0f); + mCc1.SetR(150.0f); + } else { + tmpCc.set(0.0f, 0.0f, 80.0f); + mCc1.SetR(55.0f); + } + + MTXMultVec(nodeMtx, tmpCc, tmpCc); + tmpCc += mPosition; + + if (link->isAttacking() && mXZDistanceToLink < 400.0f) { + tmpCc.y += 100.0f; + mCc1.SetH(100.0f); + } else { + mCc1.SetH(250.0f); + } + mCc1.SetC(tmpCc); + + tmpCc.x = mChestTranslation.x; + tmpCc.y = mChestTranslation.y; + tmpCc.z = mChestTranslation.z; + tmpCc.y = mPosition.y; + + if (!mIsDown) { + mCc3.SetR(100.0f); + } else { + mCc3.SetR(200.0f); + } + mCc3.SetC(tmpCc); + + tmpCc.x = mPosition.x; + tmpCc.y = mPosition.y + 150.0f; + tmpCc.z = mPosition.z; + + mCc2.SetC(tmpCc); + + field_0x1250[0] = mToeTranslation[0] + (mToeTranslation[1] - mToeTranslation[0]) * 0.5f; + // UB: this should use string comparison functions for robustness, but + // probably works fine in MWCC + if ((mpCurrentAnm == "CatchThunderEnd" || mpCurrentAnm == "Stan") && mMdl.getAnm().getFrame() <= 3.0f) { + field_0x11A4 = 25.0f; + } + + updateSkirtHairTransforms(); + + if (!link->isAttacking()) { + mInvulnerabilityTimerMaybe = 1; + } + + if (mInvulnerabilityTimerMaybe == 0) { + mCc1.SetTg_0x4B(1); + // TODO + mCc1.mTg.field_0x6C = mSwordPosition; + } else { + mInvulnerabilityTimerMaybe--; + tmpCc.set(0.0f, -10000.0f, 0.0); + mCc1.SetTg_0x4B(1); + // TODO + mCc1.mTg.field_0x6C = tmpCc; + } + + mCc1.ClrTg_0x10000(); + + if (field_0x1142 != 0) { + field_0x1142--; + mCcList.ClrTg(); + } else { + mCcList.TgSet(); + } + mCcList.registerColliders(); + + if (field_0x1139 != 0) { + mCc4.OnAtSet(); + if (field_0x1139 == 1) { + mCc4.setCenter(mThumbL2Translation); + field_0x1139 = 2; + } else { + mCc4.moveCenter(mThumbL2Translation); + } + dCcS::GetInstance()->Set(&mCc4); + } + + static mAng3_c sEffRot(0, 0, 0); + static mVec3_c sEffScale(1.5f, 1.5f, 1.5f); + mVec3_c effPos(mPosition.x, 10.0f, mPosition.z); + // Basically the same code as in dWaterEffect_c::execute + mWaterEmitter.holdEffect(PARTICLE_RESOURCE_ID_MAPPING_127_, effPos, &sEffRot, &sEffScale, nullptr, nullptr); + f32 rate = nw4r::math::FAbs(mSpeed) * 0.02f; + rate = rate > 0.95f ? 0.95f : rate; + mWaterEmitter.setRate(rate + 0.05f); + + bool footSplash[2] = {false, false}; + // UB: this should use string comparison functions for robustness, but + // probably works fine in MWCC + if (mpCurrentAnm == "Walk" || mpCurrentAnm == "WalkBt") { + if (mMdl.getAnm().checkFrame(22.0f)) { + footSplash[0] = true; + } else if (mMdl.getAnm().checkFrame(48.0f)) { + footSplash[1] = true; + } + } else if (mpCurrentAnm == "TurnR") { + if (mMdl.getAnm().checkFrame(31.0f)) { + footSplash[0] = true; + } else if (mMdl.getAnm().checkFrame(19.0f)) { + footSplash[1] = true; + } + } else if (mpCurrentAnm == "TurnL") { + if (mMdl.getAnm().checkFrame(31.0f)) { + footSplash[1] = true; + } else if (mMdl.getAnm().checkFrame(19.0f)) { + footSplash[0] = true; + } + } else if (mpCurrentAnm == "AttackBreak") { + if (mMdl.getAnm().checkFrame(16.0f)) { + footSplash[0] = true; + } + } else if (mpCurrentAnm == "AttackL") { + if (mMdl.getAnm().checkFrame(26.0f)) { + footSplash[1] = true; + } + } else if (mpCurrentAnm == "AttackR") { + if (mMdl.getAnm().checkFrame(24.0f)) { + footSplash[1] = true; + } + } else if (mpCurrentAnm == "AttackU") { + if (mMdl.getAnm().checkFrame(10.0f)) { + footSplash[1] = true; + } else if (mMdl.getAnm().checkFrame(24.0f)) { + footSplash[0] = true; + } + } else if (mpCurrentAnm == "Counter") { + if (mMdl.getAnm().checkFrame(21.0f)) { + footSplash[0] = true; + } else if (mMdl.getAnm().checkFrame(45.0f)) { + footSplash[1] = true; + } + } else if (mpCurrentAnm == "AttackJumpEnd") { + if (mMdl.getAnm().checkFrame(6.0f)) { + footSplash[1] = true; + } + } else if (mpCurrentAnm == "DownGetUp") { + if (mMdl.getAnm().checkFrame(137.0f)) { + footSplash[1] = true; + } + } else if (mpCurrentAnm == "DownEscapeL") { + if (mMdl.getAnm().checkFrame(15.0f)) { + footSplash[0] = true; + } else if (mMdl.getAnm().checkFrame(17.0f)) { + footSplash[1] = true; + } + } else if (mpCurrentAnm == "DownEscapeR") { + if (mMdl.getAnm().checkFrame(15.0f)) { + footSplash[1] = true; + } else if (mMdl.getAnm().checkFrame(17.0f)) { + footSplash[0] = true; + } + } else if (mpCurrentAnm == "ThunderDemo") { + if (mMdl.getAnm().checkFrame(18.0f)) { + footSplash[1] = true; + } + } else if (mpCurrentAnm == "AttackThunder") { + if (mMdl.getAnm().checkFrame(25.0f)) { + footSplash[0] = true; + } + } + + // Spawn splash effects + for (int i = 0; i < 2; i++) { + if (footSplash[i]) { + mToeTranslation[i].y = 10.0f; + dJEffManager_c::spawnEffect( + PARTICLE_RESOURCE_ID_MAPPING_855_, mToeTranslation[i], nullptr, nullptr, nullptr, nullptr, 0, 0 + ); + } + } + + if (mIsPhaseTwo != 0) { + if (!link->checkSwordAndMoreStates(0x400000) && (mIsPhaseTwo < 0 || !mIsSwordEmpowered)) { + if (mLightningTimerMaybe == 0) { + if (dLightEnv_c::GetPInstance()->getField_0x38DC() == 0) { + dLightEnv_c::GetPInstance()->setField_0x38DC(1); + setLightningTimerMaybe(100); + } + } else if (!mIsSwordEmpowered || (dScGame_c::getUpdateFrameCount() & 0b11) == 0) { + mLightningTimerMaybe--; + } + } else { + setLightningTimerMaybe(100); + } + sLib::addCalcScaledDiff(&field_0x11CC, 1.0f, 1.0f, 0.01f); + } + + // TODO: inline doesn't work :( + dLightEnv_c::GetInstance().GetOverrideSpf().mIdxStart = 1; + dLightEnv_c::GetInstance().GetOverrideSpf().mIdxEnd = 2; + dLightEnv_c::GetInstance().GetOverrideSpf().mRatio = field_0x11CC; + + if (mIsThunderBeamAttackActive && mThunderBeamTimer != 0) { + mThunderBeamTimer--; + mThunderBeamPosition += mThunderBeamVelocity; + nodeMtx.transS(mThunderBeamPosition); + nodeMtx.ZXYrotM(mThunderBeamRotation); + + if (!mThunderBeamReflected) { + if (mLightningCc.ChkAtHit() || mLightningCc.ChkTgHit()) { + dJEffManager_c::spawnEffect(PARTICLE_RESOURCE_ID_MAPPING_850_, nodeMtx, nullptr, nullptr, 0, 0); + if (mLightningCc.ChkTgHit() && mLightningCc.ChkTgAtHitType(AT_TYPE_BUGNET)) { + // Reflect thunder beam attack with Bug Net + getSoundSource()->startSoundAtPosition2(SE_BLasBos_EmitThunderBeam, mThunderBeamPosition); + mThunderBeamTimer = 0x3C; + mThunderBeamVelocity *= -1.0f; + dRumble_c::start(dRumble_c::sRumblePreset2, dRumble_c::FLAG_SLOT0); + dStageMgr_c::GetInstance()->fn_80199B60(3); + mThunderBeamReflected = true; + } else { + mIsThunderBeamAttackActive = false; + mMtx_c mtx; + mtx.transS(0.0f, -100000.0f, 0.0f); + MTXConcat(nodeMtx, mtx, nodeMtx); + getSoundSource()->startSoundAtPosition2(SE_BLasBos_BeamCrossCrush, mThunderBeamPosition); + } + mLightningCc.SetTgRpm(0); + mLightningCc.ClrTgActorInfo(); + mLightningCc.SubtractTgEffCounter(); + mLightningCc.SetAtRpm(0); + mLightningCc.ClrAtActorInfo(); + mLightningCc.SubtractAtEffCounter(); + } + } else { + if ((mThunderBeamPosition - mPosition).absXZ() < 150.0f) { + // Boss hit by bug net reflected attack + dJEffManager_c::spawnEffect(PARTICLE_RESOURCE_ID_MAPPING_850_, nodeMtx, nullptr, nullptr, 0, 0); + mIsThunderBeamAttackActive = false; + mMtx_c mtx; + mtx.transS(0.0f, -100000.0f, 0.0f); + MTXConcat(nodeMtx, mtx, nodeMtx); + getSoundSource()->startSoundAtPosition2(SE_BLasBos_BeamCrossCrush, mThunderBeamPosition); + v3.set(0.0f, 0.0f, 20.0f); + rotMtx.YrotS(link->mRotation.y); + MTXMultVec(rotMtx, v3, v3); + mAttackKnockbackX = v3.x; + mAttackKnockbackZ = v3.z; + mStateMgr.changeState(StateID_Stun); + } + } + mLightInfo.mPos = mThunderBeamPosition; + if ((dScGame_c::getUpdateFrameCount() & 2) != 0) { + mLightInfo.SetScale(300.0f); + } else { + mLightInfo.SetScale(200.0f); + } + + if (mThunderBeamTimer <= 10) { + // TODO: lightning timer? + if (mThunderBeamTimer == 10) { + mEmitter5.setFading(10); + } + if (mThunderBeamTimer == 0) { + mIsThunderBeamAttackActive = false; + } + mLightningCc.ClrAtSet(); + } else { + if (!mThunderBeamReflected) { + mLightningCc.OnAtSet(); + mLightningCc.SetR(100.0f); + mLightningCc.moveCenter(mThunderBeamPosition); + dCcS::GetInstance()->Set(&mLightningCc); + } + getSoundSource()->holdSoundAtPosition(SE_BLasBos_ThunderBeamFly, mThunderBeamPosition); + } + mEmitter5.holdEffect(PARTICLE_RESOURCE_ID_MAPPING_618_, nodeMtx, nullptr, nullptr); + } + + if (mLightingFallSwordTimer != 0) { + mLightingFallSwordTimer--; + mLightningCc.OnAtSet(); + mLightningCc.SetC(mPosition); + mLightningCc.SetR(300.0f - mLightingFallSwordTimer * 30.0f); + mLightningCc.SetAtVec(link->getPosition() - mPosition); + dCcS::GetInstance()->Set(&mLightningCc); + if (mLightingFallSwordTimer == 8) { + vEff.x = mPosition.x; + vEff.y = 10.0f; + vEff.z = mPosition.z; + dJEffManager_c::spawnEffect( + PARTICLE_RESOURCE_ID_MAPPING_842_, vEff, nullptr, nullptr, nullptr, nullptr, 0, 0 + ); + } + } + executeLightningStrike(); + + SceneflagManager *mgr = SceneflagManager::sInstance; + if (mgr != nullptr) { + if (mStateMgr.isState(StateID_ThunderWait)) { + mgr->setFlag(getRoomId(), mThunderWaitSceneFlag); + } else { + mgr->unsetFlag(getRoomId(), mThunderWaitSceneFlag); + } + } + + if (mIsPhaseTwo != 0) { + // "Target lock: Demise" (Phase 2) + mTargetFiTextID = 0x38; + } else { + // "Target lock: Demise" (Phase 1) + mTargetFiTextID = 0x37; + } + + return SUCCEEDED; +} + +struct dCcD_Check : public cCcD_Obj { + bool ChkAtHit(); + bool ChkTgHit(); +}; + +bool dCcD_Check::ChkAtHit() { + if (cCcD_Obj::ChkAtHit()) { + return true; + } + return false; +} + +bool dCcD_Check::ChkTgHit() { + if (cCcD_Obj::ChkTgHit()) { + return true; + } + return false; +} + +void dAcBlastboss_c::callback_c::timingB(u32 nodeId, nw4r::g3d::WorldMtxManip *manip, nw4r::g3d::ResMdl mdl) { + u32 baseNodeIdSkirt = 0; + u32 baseNodeIdHair = 0; + int r27; + int param_4; + + if (nodeId >= B_LAST_BOSS_NODE_skirtA1 && nodeId < B_LAST_BOSS_NODE_skirtAU1) { + baseNodeIdSkirt = B_LAST_BOSS_NODE_skirtA1; + param_4 = 0; + } else if (nodeId >= B_LAST_BOSS_NODE_skirtB1 && nodeId < B_LAST_BOSS_NODE_skirtBU1) { + baseNodeIdSkirt = B_LAST_BOSS_NODE_skirtB1; + param_4 = 1; + } else if (nodeId >= B_LAST_BOSS_NODE_skirtC1 && nodeId < B_LAST_BOSS_NODE_skirtCU1) { + baseNodeIdSkirt = B_LAST_BOSS_NODE_skirtC1; + param_4 = 2; + } else if (nodeId >= B_LAST_BOSS_NODE_skirtD1 && nodeId < B_LAST_BOSS_NODE_skirtDU1) { + baseNodeIdSkirt = B_LAST_BOSS_NODE_skirtD1; + param_4 = 3; + } else if (nodeId >= B_LAST_BOSS_NODE_skirtE1 && nodeId < B_LAST_BOSS_NODE_skirtEU1) { + baseNodeIdSkirt = B_LAST_BOSS_NODE_skirtE1; + param_4 = 4; + } else if (nodeId >= B_LAST_BOSS_NODE_skirtF1 && nodeId < B_LAST_BOSS_NODE_skirtFU1) { + baseNodeIdSkirt = B_LAST_BOSS_NODE_skirtF1; + param_4 = 5; + } else if (nodeId >= B_LAST_BOSS_NODE_skirtG1 && nodeId < B_LAST_BOSS_NODE_skirtGU1) { + baseNodeIdSkirt = B_LAST_BOSS_NODE_skirtG1; + param_4 = 6; + } else if (nodeId >= B_LAST_BOSS_NODE_skirtH1 && nodeId < B_LAST_BOSS_NODE_skirtHU1) { + baseNodeIdSkirt = B_LAST_BOSS_NODE_skirtH1; + param_4 = 7; + } + + if (baseNodeIdSkirt != 0) { + u32 nodeOffset = nodeId - baseNodeIdSkirt; + + mMtx_c mtx; + mtx.transS(mpOwner->field_0x1268[param_4].field_0x014[nodeOffset]); + mtx.XrotM(mpOwner->field_0x1268[param_4].field_0x08C[nodeOffset].x); + mtx.YrotM(mpOwner->field_0x1268[param_4].field_0x08C[nodeOffset].y); + mtx.ZrotM(-mpOwner->field_0x1268[param_4].field_0x08C[nodeOffset].z); + mtx.scaleM(0.95f, 0.95f, 1.0f); + mtx.YrotM(-0x4000); + manip->SetMtx(mtx); + } + + if (nodeId >= B_LAST_BOSS_NODE_hairA1 && nodeId < B_LAST_BOSS_NODE_hairBL1) { + baseNodeIdHair = B_LAST_BOSS_NODE_hairA1; + r27 = 0; + } + + if (baseNodeIdHair != 0) { + u32 nodeOffset = nodeId - baseNodeIdHair; + mMtx_c mtx; + mtx.transS(mpOwner->field_0x2948[r27].field_0x008[nodeOffset]); + mtx.YrotM(mpOwner->field_0x2948[r27].field_0x044[nodeOffset].y); + mtx.XrotM(mpOwner->field_0x2948[r27].field_0x044[nodeOffset].x); + mtx.ZrotM(-mpOwner->field_0x2948[r27].field_0x044[nodeOffset].z); + mtx.scaleM(0.95f, 0.95f, 1.0f); + mtx.YrotM(-0x4000); + manip->SetMtx(mtx); + } + + if (nodeId == B_LAST_BOSS_NODE_center) { + mMtx_c mtx; + manip->GetMtx(mtx); + mtx.XrotM(-field_0x0E.mVal / 2); + mtx.ZrotM(-field_0x10.mVal / 2); + manip->SetMtx(mtx); + } else if (nodeId == B_LAST_BOSS_NODE_backbone1 || nodeId == B_LAST_BOSS_NODE_backbone2) { + mMtx_c mtx; + manip->GetMtx(mtx); + mtx.YrotM(field_0x0E); + mtx.XrotM(field_0x2E - field_0x0E); + mtx.ZrotM(-field_0x10); + manip->SetMtx(mtx); + } else if (nodeId == B_LAST_BOSS_NODE_head) { + mMtx_c mtx; + manip->GetMtx(mtx); + mtx.YrotM(field_0x0E * 2 + field_0x08 + field_0x06); + mtx.ZrotM(field_0x0A - field_0x10 * 2); + mtx.XrotM(field_0x0C); + manip->SetMtx(mtx); + } else if (nodeId == B_LAST_BOSS_NODE_chin) { + mMtx_c mtx; + manip->GetMtx(mtx); + mtx.ZrotM(field_0x12); + manip->SetMtx(mtx); + } else if (nodeId >= B_LAST_BOSS_NODE_hairBL1 && nodeId <= B_LAST_BOSS_NODE_hairC3) { + mMtx_c mtx; + manip->GetMtx(mtx); + + if (nodeId >= B_LAST_BOSS_NODE_hairC1) { + mtx.XrotM(field_0x1C[nodeId - B_LAST_BOSS_NODE_hairBL1]); + mtx.ZrotM(field_0x1C[nodeId - B_LAST_BOSS_NODE_hairBL1]); + } else { + mtx.YrotM(field_0x1C[nodeId - B_LAST_BOSS_NODE_hairBL1]); + mtx.XrotM(field_0x1C[nodeId - B_LAST_BOSS_NODE_hairBL1]); + } + + manip->SetMtx(mtx); + } else if (nodeId == B_LAST_BOSS_NODE_armR1) { + int blah = field_0x04 * mAng(field_0x04 * 0x4300).sin() * 80.0f; + + mMtx_c mtx; + manip->GetMtx(mtx); + + mtx.XrotM(blah + (int)(300.0f * field_0x30)); + mtx.ZrotM(blah + (int)(200.0f * field_0x30)); + + manip->SetMtx(mtx); + } else if (nodeId == B_LAST_BOSS_NODE_armR2) { + mMtx_c mtx; + manip->GetMtx(mtx); + mtx.ZrotM(field_0x30 * 200.0f); + manip->SetMtx(mtx); + } else if (nodeId == B_LAST_BOSS_NODE_wristR) { + // unused + int blah = field_0x04 * (f32)mAng(field_0x04 * 0x4300).sin(); + + mMtx_c mtx; + manip->GetMtx(mtx); + + int i2 = 0; + if (field_0x30 > 0.0f) { + i2 = field_0x30 * -200.0f; + } + + mtx.XrotM(i2 + field_0x18); + mtx.ZrotM(i2 + field_0x1A); + + manip->SetMtx(mtx); + } else if (nodeId == B_LAST_BOSS_NODE_legR1 || nodeId == B_LAST_BOSS_NODE_legR2) { + mMtx_c mtx; + manip->GetMtx(mtx); + mtx.XrotM(field_0x14); + if (nodeId == B_LAST_BOSS_NODE_legR2) { + mtx.XrotM(field_0x14); + } + manip->SetMtx(mtx); + } else if (nodeId == B_LAST_BOSS_NODE_legL1 || nodeId == B_LAST_BOSS_NODE_legL2) { + mMtx_c mtx; + manip->GetMtx(mtx); + mtx.XrotM(field_0x16); + if (nodeId == B_LAST_BOSS_NODE_legL2) { + mtx.XrotM(field_0x16); + } + manip->SetMtx(mtx); + } +} + +void dAcBlastboss_c::initializeState_Fight() { + setAnm("WaitBt", 20.0f); + mAnmRate = 1.0f; + mSubState = SUB_STATE_0; + field_0x118A = 0; + if (mIsPhaseTwo == 0) { + mTimers[TIMER_2] = cM::rndF(50.0f) + 50.0f; + } else { + mTimers[TIMER_2] = cM::rndF(20.0f) + 10.0f; + } + mGuardDirection = GUARD_BT; +} +void dAcBlastboss_c::executeState_Fight() { + dAcPy_c *link = dAcPy_c::GetLinkM(); + field_0x1131 = 1; + f32 targetSpeed = 0.0f; + f32 targetAnmRate = 1.5f; + f32 puVar2 = 0.0f; + + bool b = false; + s16 diff = mAngle.y - mYAngleToLink; + + if (mLightingStrikeState >= LIGHTNING_STRIKE_TRIGGER_START && mLightingStrikeState <= LIGHTNING_STRIKE_START_LAST) { + puVar2 = -100.0f; + mTimers[TIMER_2] = cM::rndF(50.0f) + 100.0f; + } + + switch (mSubState) { + case SUB_STATE_0: { + b = true; + field_0x118C = 0; + targetAnmRate = 1.0f; + field_0x117E = 0; + if (mXZDistanceToLink > puVar2 + 450.0f) { + mSubState = SUB_STATE_2; + break; + } else if (mXZDistanceToLink < puVar2 + 250.0f + 100.0f) { + mSubState = SUB_STATE_1; + mTimers[TIMER_0] = 8; + mAnmRate = -1.0f; + field_0x1180 = 0; + // fall-through... + } else { + setAnm("WaitBt", 20.0f); + mAnmRate = 1.0f; + if (diff < -0x1000 || diff > 0x1000) { + mSubState = SUB_STATE_4; + if (diff < 0) { + setAnm("TurnL", 10.0f); + } else { + setAnm("TurnR", 10.0f); + } + } + break; + } + } + case SUB_STATE_1: { + b = true; + setAnm("WalkBt", 20.0f); + targetSpeed = -5.0f; + targetAnmRate = -2.5f; + if (mXZDistanceToLink < 200.0f) { + field_0x1180++; + if (field_0x1180 > 40) { + mStateMgr.changeState(StateID_PunchAttack); + return; + } + } else if (mXZDistanceToLink >= puVar2 + 200.0f && mTimers[TIMER_0] == 0) { + mSubState = SUB_STATE_0; + } + break; + } + case SUB_STATE_2: { + b = true; + field_0x117E = 0; + if (mXZDistanceToLink > puVar2 + 850.0f) { + mSubState = SUB_STATE_3; + } else { + setAnm("WalkBt", 20.0f); + if (mMdl.getAnm().getFrame() >= 25.0f && mMdl.getAnm().getFrame() <= 50.0f) { + targetSpeed = 5.0f; + } + field_0x11A4 = 5.0f; + targetAnmRate = 1.5f; + } + if (mXZDistanceToLink < puVar2 + 400.0f) { + mSubState = SUB_STATE_0; + if (mIsPhaseTwo == 0) { + mTimers[TIMER_2] = cM::rndF(50.0f) + 50.0f; + } else { + mTimers[TIMER_2] = cM::rndF(20.0f) + 10.0f; + } + } + break; + } + case SUB_STATE_3: { + setAnm("Walk", 20.0f); + targetSpeed = 7.5f; + field_0x11A4 = 7.5f; + targetAnmRate = 1.0f; + if (mXZDistanceToLink < puVar2 + 750.0f) { + mSubState = SUB_STATE_2; + } else if (!link->isRecovering()) { + field_0x117E++; + if (field_0x117E > 70) { + mStateMgr.changeState(StateID_DashAttack); + return; + } + } else { + field_0x117E = 0; + } + break; + } + case SUB_STATE_4: { + field_0x117E = 0; + b = true; + if (mMdl.getAnm().isStop()) { + mSubState = SUB_STATE_0; + } + break; + } + } + + sLib::addCalcScaledDiff(&mAnmRate, targetAnmRate, 1.0f, 0.5f); + setAnmRate(mAnmRate); + sLib::addCalcScaledDiff(&mSpeed, targetSpeed, 1.0f, 2.0f); + + if (mSubState != SUB_STATE_0) { + sLib::addCalcAngle(field_0x118C.ref(), 0x800, 1, 100); + sLib::addCalcAngle(mAngle.y.ref(), mYAngleToLink, 2, field_0x118C); + } + + if (b) { + if (diff > 0x1000) { + diff = 0x1000; + } else if (diff < -0x1000) { + diff = -0x1000; + } + field_0x1172 = diff / 2; + // approx. 160/65536, but maybe hardcoded? + sLib::addCalcScaledDiff(&mMdlCallback.field_0x30, diff * (1.0f / 409.59937f), 0.5f, 1.0f); + if (mLightingStrikeState == LIGHTNING_STRIKE_STATE_NONE && !link->isUsingShield() && link->isUsingSword()) { + mMtx_c rotMtx; + rotMtx.YrotS(-mYAngleToLink); + mVec3_c v = mVec3_c(link->getSwordPos() - mPosition); + MTXMultVec(rotMtx, v, v); + if (v.x > 150.0f) { + v.x = 150.0f; + } else if (v.x < -150.0f) { + v.x = -150.0f; + } + sLib::addCalcAngle(field_0x118A.ref(), 400, 1, 20); + sLib::addCalcAngle(mMdlCallback.field_0x18.ref(), mAng(v.x * -40.0f), 2, field_0x118A); + v.y -= 270.0f; + if (v.y > 100.0f) { + v.y = 100.0f; + } else if (v.y < -150.0f) { + v.y = -150.0f; + } + sLib::addCalcAngle(mMdlCallback.field_0x1A.ref(), mAng(v.y * -40.0f), 2, field_0x118A); + } else { + field_0x118A = 0; + sLib::addCalcAngle(mMdlCallback.field_0x18.ref(), 0, 4, 400); + sLib::addCalcAngle(mMdlCallback.field_0x1A.ref(), 0, 4, 400); + } + field_0x1133 = 1; + } + + if (field_0x117C == 0) { + if (!checkForRangeAttack()) { + checkForCloseRangeAttack(); + checkForCounter(); + } + mCc1.SetTgFlag_0xA(0x1FF); + } else { + // TODO + mCc1.SetTgFlag_0xA(0); + } + + if (mTimers[TIMER_4] == 1) { + field_0x1178 = 40; + } else if (mTimers[TIMER_4] <= 10) { + mNumConsecutiveSameDirectionAttacks = 0; + mNumConsecutiveOppositeDirectionAttacks = 0; + mChanceAttackCounter = 0; + mLastAttackDir = mSecondLastAttackDirection = -1; + } +} void dAcBlastboss_c::finalizeState_Fight() {} -void dAcBlastboss_c::initializeState_Guard() {} -void dAcBlastboss_c::executeState_Guard() {} -void dAcBlastboss_c::finalizeState_Guard() {} -void dAcBlastboss_c::initializeState_GuardBreak() {} -void dAcBlastboss_c::executeState_GuardBreak() {} -void dAcBlastboss_c::finalizeState_GuardBreak() {} -void dAcBlastboss_c::initializeState_Attack() {} -void dAcBlastboss_c::executeState_Attack() {} + +void dAcBlastboss_c::initializeState_Attack() { + f32 rnd = cM::rnd(); + mSubState = SUB_STATE_0; + if (rnd < 0.3333f) { + setAnm("AttackU", 5.0f); + } else if (rnd < 0.6666f) { + setAnm("AttackR", 5.0f); + } else { + setAnm("AttackL", 5.0f); + } + + if (mIsSwordEmpowered) { + mSwordMdl.setDamageMaybe(8); + } else { + mSwordMdl.setDamageMaybe(4); + } + mSwordMdl.fn_8006B7A0(0x20000); +} +void dAcBlastboss_c::executeState_Attack() { + dAcPy_c *link = dAcPy_c::GetLinkM(); + field_0x1131 = 1; + f32 speed = 0.0f; + // TODO major typing crime here but I'm not sure how this actually works + cCcD_Obj *atHit = mSwordMdl.mCcList.find((dColliderLinkedList::ccPtmf)&dCcD_Check::ChkAtHit); + + switch (mSubState) { + case SUB_STATE_0: { + if (field_0x1152 >= 15 && mMdl.getAnm().checkFrame(7.0f) && cM::rnd() < 0.1f) { + mStateMgr.changeState(StateID_Fight); + field_0x113F = 20; + } else { + if (mMdl.getAnm().getFrame() < 20.0f) { + sLib::addCalcAngle(mAngle.y.ref(), mYAngleToLink, 2, 0x800); + } + + if (mMdl.getAnm().getFrame() >= 25.0f && mMdl.getAnm().getFrame() <= 28.0f) { + mSwordMdl.enable(); + speed = 20.0f; + field_0x11A4 = 20.0f; + field_0x113D = 10; + } + if (atHit != nullptr) { + mSubState = SUB_STATE_1; + } else { + if (mMdl.getAnm().getFrame() > 28.0f) { + mSubState = SUB_STATE_1; + if (field_0x113E != 0) { + setAnmRate(0.5f); + } + } + } + } + break; + } + case SUB_STATE_1: { + if (mMdl.getAnm().isStop()) { + mStateMgr.changeState(StateID_Fight); + } + break; + } + } + + mSpeed = speed; + if (!mIsPhaseTwo && link->checkCurrentAction(/* BACKFLIP */ 0x62)) { + field_0x113E = 20; + } + if (field_0x113E != 0) { + if (mIsPhaseTwo) { + mSubState = SUB_STATE_0; + mStateMgr.changeState(StateID_CounterAttack); + return; + } + mCc1.SetTgFlag_0xA(0); + } else { + if (mpCurrentAnm == "AttackR") { + mCc1.SetTgFlag_0xA(0xE); + } else if (mpCurrentAnm == "AttackL") { + mCc1.SetTgFlag_0xA(0xE0); + } else { + mCc1.SetTgFlag_0xA(0x1); + } + } + checkForCounter(); +} void dAcBlastboss_c::finalizeState_Attack() {} -void dAcBlastboss_c::initializeState_CounterAttack() {} -void dAcBlastboss_c::executeState_CounterAttack() {} + +void dAcBlastboss_c::initializeState_CounterAttack() { + mSwordMdl.fn_8006B7A0(0x20000); + if (mSubState == 0) { + setAnm("Counter", 5.0f); + } else { + f32 rnd = cM::rnd(); + if (rnd < 0.3333f) { + setAnm("AttackU", 5.0f); + } else if (rnd < 0.6666f) { + setAnm("AttackR", 5.0f); + } else { + setAnm("AttackL", 5.0f); + } + mMdl.setFrame(5.0f); + } + + mNumConsecutiveSameDirectionAttacks = 0; + mNumConsecutiveOppositeDirectionAttacks = 0; + mLastAttackDir = mSecondLastAttackDirection = -1; +} +void dAcBlastboss_c::executeState_CounterAttack() { + dAcPy_c *link = dAcPy_c::GetLinkM(); + f32 speed = 0.0f; + bool b = false; + field_0x1131 = 1; + if (mSubState == SUB_STATE_0) { + if (mMdl.getAnm().getFrame() < 15.0f) { + speed = -10.0f; + } + if (mMdl.getAnm().getFrame() < 10.0f || + (mMdl.getAnm().getFrame() > 30.0f && mMdl.getAnm().getFrame() < 40.0f)) { + sLib::addCalcAngle(mAngle.y.ref(), mYAngleToLink, 2, 0x800); + } + + if ((mMdl.getAnm().getFrame() >= 20.0f && mMdl.getAnm().getFrame() <= 23.0f) || + (mMdl.getAnm().getFrame() >= 43.0f && mMdl.getAnm().getFrame() <= 47.0f)) { + mSwordMdl.enable(); + speed = 30.0f; + field_0x11A4 = 20.0f; + } + + int targetFrame = 42; + if (mMdl.getAnm().checkFrame(targetFrame) && mXZDistanceToLink > 400.0f) { + mStateMgr.changeState(StateID_Fight); + return; + } + if (mMdl.getAnm().getFrame() >= 52.0f) { + b = true; + } + } else { + if (mMdl.getAnm().getFrame() < 20.0f) { + sLib::addCalcAngle(mAngle.y.ref(), mYAngleToLink, 2, 0x800); + } + if (mMdl.getAnm().getFrame() >= 25.0f && mMdl.getAnm().getFrame() <= 28.0f) { + mSwordMdl.enable(); + speed = 10.0f; + field_0x11A4 = 20.0f; + field_0x113D = 5; + } + if (mMdl.getAnm().getFrame() >= 33.0f) { + b = true; + } + } + + if (link->checkCurrentAction(/* BACKFLIP */ 0x62)) { + field_0x113E = 20; + } + mCc1.SetTgFlag_0xA(0); + if (field_0x113E != 0) { + field_0x1142 = 0; + field_0x1134 = 0; + } else if (b) { + mCc1.SetTgFlag_0xA(0x1FF); + field_0x1142 = 0; + checkForCounter(); + } + + if (mMdl.getAnm().isStop()) { + mStateMgr.changeState(StateID_Fight); + } + mSpeed = speed; +} void dAcBlastboss_c::finalizeState_CounterAttack() {} -void dAcBlastboss_c::initializeState_PunchAttack() {} -void dAcBlastboss_c::executeState_PunchAttack() {} + +void dAcBlastboss_c::initializeState_PunchAttack() { + setAnm("AttackBreak", 5.0f); + mSwordMdl.fn_8006B7A0(0x20000); + mSubState = 0; +} +void dAcBlastboss_c::executeState_PunchAttack() { + f32 speed = 0.0f; + field_0x1131 = 1; + mCc1.SetTgFlag_0xA(0); + sLib::addCalcAngle(mAngle.y.ref(), mYAngleToLink, 2, 0x800); + if (mMdl.getAnm().getFrame() < 15.0f) { + speed = -10.0f; + } + if (mMdl.getAnm().getFrame() >= 15.0f && mMdl.getAnm().getFrame() <= 23.0f) { + speed = 40.0f; + } + if (mMdl.getAnm().checkFrame(15.0f)) { + field_0x1139 = 1; + } + if (mMdl.getAnm().checkFrame(23.0f)) { + field_0x1139 = 0; + } + if (mMdl.getAnm().isStop()) { + mStateMgr.changeState(StateID_Fight); + } + mSpeed = speed; +} void dAcBlastboss_c::finalizeState_PunchAttack() {} -void dAcBlastboss_c::initializeState_DashAttack() {} -void dAcBlastboss_c::executeState_DashAttack() {} + +void dAcBlastboss_c::initializeState_DashAttack() { + mSubState = 0; + mSwordMdl.setDamageMaybe(8); + mSwordMdl.fn_8006B7A0(0x20000); +} +void dAcBlastboss_c::executeState_DashAttack() { + field_0x1131 = 1; + f32 targetSpeed = 0.0f; + f32 stepSize = 40.0f; // never set differently + mCc1.SetTgFlag_0xA(0x1FF); + sLib::addCalcAngle(mAngle.y.ref(), mYAngleToLink, 2, 0x1000); + switch (mSubState) { + case SUB_STATE_0: { + if (mXZDistanceToLink < 400.0f) { + mStateMgr.changeState(StateID_CounterAttack); + return; + } + setAnm("AttackJumpStart", 5.0f); + mSwordMdl.fn_8006B7A0(0x20000); + mSubState = SUB_STATE_1; + // fall-through + } + case SUB_STATE_1: { + if (mMdl.getAnm().getFrame() >= 23.0f) { + field_0x11A4 = 30.0f; + targetSpeed = 40.0f; + } + if (mMdl.getAnm().isStop()) { + setAnm("AttackJumpLoop", 0.0f); + mSubState = SUB_STATE_2; + mTimers[TIMER_0] = 200; + } + break; + } + case SUB_STATE_2: { + field_0x11A4 = 30.0f; + targetSpeed = 80.0f; + field_0x11B8 = 5.0f; + if (mXZDistanceToLink < 750.0f) { + setAnm("AttackJumpEnd", 0.0f); + mSubState = SUB_STATE_3; + } else if (mTimers[TIMER_0] == 0) { + mStateMgr.changeState(StateID_Fight); + } + break; + } + case SUB_STATE_3: { + if (mXZDistanceToLink > 300.0f && mMdl.getAnm().getFrame() <= 6.0f) { + targetSpeed = 80.0f; + } else { + stepSize = 40.0f; + } + if (mMdl.getAnm().getFrame() >= 6.0f && mMdl.getAnm().getFrame() <= 9.0f) { + mSwordMdl.enable(); + field_0x113D = 10; + } + + if (mMdl.getAnm().isStop()) { + mStateMgr.changeState(StateID_Fight); + } + break; + } + } + + sLib::addCalcScaledDiff(&mSpeed, targetSpeed, 1.0f, stepSize); + if (mSpeed > 50.0f) { + // @bug: effect rotation never updated due to static... + static mAng3_c sEffRot(0, mRotation.y, 0); + static mVec3_c sEffScale(1.0f, 1.0f, 1.0f); + mVec3_c effPos(mPosition.x, 10.0f, mPosition.z); + mEmitter2.holdEffect(PARTICLE_RESOURCE_ID_MAPPING_858_, effPos, &sEffRot, &sEffScale, nullptr, nullptr); + } +} void dAcBlastboss_c::finalizeState_DashAttack() {} -void dAcBlastboss_c::initializeState_SmallAttack() {} -void dAcBlastboss_c::executeState_SmallAttack() {} + +void dAcBlastboss_c::initializeState_SmallAttack() { + setAnm("AttackSwordBreak", 5.0f); + mSubState = SUB_STATE_0; +} +void dAcBlastboss_c::executeState_SmallAttack() { + dAcPy_c *link = dAcPy_c::GetLinkM(); + field_0x1131 = 1; + f32 targetSpeed = 0.0f; + + mCc1.SetTgFlag_0xA(0); + switch (mSubState) { + case SUB_STATE_0: { + if (mMdl.getAnm().getFrame() >= 31.0f && mMdl.getAnm().getFrame() <= 33.0f) { + field_0x11A4 = 15.0f; + if (checkForLinkSwordBySwordHit()) { + mVec3_c effPos; + + effPos = link->vt_0x278() + (link->getSwordPos() - link->vt_0x278()) * 0.4f; + dJEffManager_c::spawnEffect( + PARTICLE_RESOURCE_ID_MAPPING_388_, effPos, &mRotation, nullptr, nullptr, nullptr, 0, 0 + ); + dRumble_c::start(dRumble_c::sRumblePreset4, dRumble_c::FLAG_SLOT0); + startSound(SE_BLasBos_SwordBySword); + link->onForceOrPreventActionFlags(0x80000); + mSubState = SUB_STATE_1; + } + } + break; + } + } + + if (mMdl.getAnm().checkFrame(44.0f) && mSubState != SUB_STATE_1) { + mStateMgr.changeState(StateID_Fight); + mpCurrentAnm = nullptr; + setAnm("WaitBt", 40.0f); + field_0x113E = 10; + field_0x1134 = 0; + } + + if (mMdl.getAnm().getFrame() >= 55.0f && mMdl.getAnm().getFrame() <= 59.0f) { + mSwordMdl.enable(); + targetSpeed = 40.0f; + field_0x11A4 = 20.0f; + } + + if (mMdl.getAnm().isStop()) { + mStateMgr.changeState(StateID_Fight); + } + + sLib::addCalcScaledDiff(&mSpeed, targetSpeed, 1.0f, 20.0f); + sLib::addCalcAngle(mAngle.y.ref(), mYAngleToLink, 2, 0x200); +} void dAcBlastboss_c::finalizeState_SmallAttack() {} -void dAcBlastboss_c::initializeState_ThunderAttack() {} -void dAcBlastboss_c::executeState_ThunderAttack() {} + +void dAcBlastboss_c::initializeState_ThunderAttack() { + setAnm("AttackThunder", 5.0f); + mSubState = SUB_STATE_0; +} +void dAcBlastboss_c::executeState_ThunderAttack() { + field_0x1131 = 1; + f32 targetSpeed = 0.0f; + mCc1.SetTgFlag_0xA(0); + sLib::addCalcAngle(mAngle.y.ref(), mYAngleToLink, 2, 0x400); + if (mMdl.getAnm().getFrame() >= 21.0f && mMdl.getAnm().getFrame() <= 25.0f) { + mSwordMdl.enable(); + field_0x11A4 = 20.0f; + if (mMdl.getAnm().checkFrame(23.0f)) { + mIsSwordEmpowered = false; + mCc1.ClrTg_0x8000000(); + mSwordMdl.fn_8006B800(0); + mIsThunderBeamAttackActive = true; + mThunderBeamTimer = 60; + mThunderBeamReflected = false; + mThunderBeamRotation = mRotation; + mVec3_c v(0.0f, 100.0f, 300.0f); + mMtx_c mtx; + mtx.YrotS(mRotation.y); + MTXMultVec(mtx, v, mThunderBeamPosition); + mThunderBeamPosition += mPosition; + + v.set(0.0f, 0.0f, 50.0f); + MTXMultVec(mtx, v, mThunderBeamVelocity); + mLightningCc.setCenter(mThunderBeamPosition); + setLightningTimerMaybe(30); + startSound(SE_BLasBos_EmitThunderBeam); + } + } + if (mMdl.getAnm().isStop()) { + mStateMgr.changeState(StateID_Fight); + } + + sLib::addCalcScaledDiff(&mSpeed, targetSpeed, 1.0f, 5.0f); +} void dAcBlastboss_c::finalizeState_ThunderAttack() {} -void dAcBlastboss_c::initializeState_Damage() {} -void dAcBlastboss_c::executeState_Damage() {} + +void dAcBlastboss_c::initializeState_Guard() { + mSubState = SUB_STATE_0; + mMdlCallback.field_0x30 = 0.0f; + mMdlCallback.field_0x18 = 0; +} +void dAcBlastboss_c::executeState_Guard() { + dAcPy_c *link = dAcPy_c::GetLinkM(); + field_0x1131 = 1; + f32 targetSpeed = 0.0f; + + static const char *sGuardNames[] = { + "GuardR", "GuardRU", "GuardRD", "GuardL", "GuardLU", "GuardLD", "GuardU", "GuardD", "GuardC", "WaitBt", + }; + + static const u32 sGuardFlags[] = { + 0x8 | 0x4 | 0x2, + 0x8 | 0x4 | 0x2, + 0x10 | 0x8 | 0x4 | 0x2, + 0x80 | 0x40 | 0x20, + 0x80 | 0x40 | 0x20, + 0x80 | 0x40 | 0x20 | 0x10, + 0x80 | 0x2 | 0x1, + 0x20 | 0x10 | 0x8, + 0x100, + 0x100 | 0x80 | 0x40 | 0x20 | 0x10 | 0x8 | 0x4 | 0x2 | 0x1, + }; + + switch (mSubState) { + case SUB_STATE_0: { + if (link->isAttackingJumpSlash()) { + mSubState = SUB_STATE_2; + setAnm("WalkBt", 2.0f); + setAnmRate(-2.0f); + mTimers[TIMER_0] = 5; + break; + } else { + if (mGuardDirection == GUARD_BT) { + setAnm(sGuardNames[mGuardDirection], 3.0f); + mTimers[TIMER_0] = 14; + } else { + forceSetAnm(sGuardNames[mGuardDirection], 3.0f); + } + mSubState = SUB_STATE_1; + // fall-through + } + } + case SUB_STATE_1: { + if (link->isAttackingSpin()) { + mTimers[TIMER_0] = 5; + } + + if (mGuardDirection == GUARD_BT) { + field_0x1133 = 1; + if (mTimers[TIMER_0] == 0) { + mStateMgr.changeState(StateID_Fight); + mTimers[TIMER_4] = 15; + } + } else if (mMdl.getAnm().getFrame() >= 13.0f) { + mStateMgr.changeState(StateID_Fight); + mTimers[TIMER_4] = 15; + } + + if (!link->isAttackingJumpSlash()) { + checkForCounter(); + } + break; + } + case SUB_STATE_2: { + field_0x11A4 = 20.0f; + targetSpeed = -30.0f; + if (mTimers[TIMER_0] == 0) { + mGuardDirection = GUARD_UP; + forceSetAnm(sGuardNames[mGuardDirection], 3.0); + mSubState = SUB_STATE_1; + } + break; + } + case SUB_STATE_10: { + if (mGuardDirection == GUARD_RIGHT) { + setAnm("AttackRGuard", 3.0f); + } else if (mGuardDirection == GUARD_LEFT) { + setAnm("AttackLGuard", 3.0f); + } else { + setAnm("GuardU", 3.0f); + } + mSubState = SUB_STATE_11; + // fall-through + } + case SUB_STATE_11: { + if (mMdl.getAnm().getFrame() >= 13.0f) { + mStateMgr.changeState(StateID_Fight); + mTimers[TIMER_4] = 15; + } + break; + } + } + + sLib::addCalcScaledDiff(&mSpeed, targetSpeed, 1.0f, 5.0f); + sLib::addCalcAngle(mAngle.y.ref(), mYAngleToLink, 2, 0x1000); + + if (field_0x113E != 0) { + setAnmRate(0.2f); + } else { + setAnmRate(1.0f); + if (link->isAttacking()) { + switch (dAcPy_c::GetLinkM()->getSpecificAttackDirection()) { + case daPlayerActBase_c::ATTACK_DIRECTION_DOWN: mGuardDirection = GUARD_UP; break; + case daPlayerActBase_c::ATTACK_DIRECTION_LEFT: mGuardDirection = GUARD_LEFT; break; + case daPlayerActBase_c::ATTACK_DIRECTION_DOWNLEFT: mGuardDirection = GUARD_UPLEFT; break; + case daPlayerActBase_c::ATTACK_DIRECTION_UPLEFT: mGuardDirection = GUARD_DOWNLEFT; break; + case daPlayerActBase_c::ATTACK_DIRECTION_RIGHT: mGuardDirection = GUARD_RIGHT; break; + case daPlayerActBase_c::ATTACK_DIRECTION_DOWNRIGHT: mGuardDirection = GUARD_UPRIGHT; break; + case daPlayerActBase_c::ATTACK_DIRECTION_UPRIGHT: mGuardDirection = GUARD_DOWNRIGHT; break; + case daPlayerActBase_c::ATTACK_DIRECTION_UP: mGuardDirection = GUARD_DOWN; break; + default: mGuardDirection = GUARD_CENTER; break; + } + setAnm(sGuardNames[mGuardDirection], 3.0); + } + } + + mCc1.SetTgFlag_0xA(sGuardFlags[mGuardDirection]); + checkForRangeAttack(); +} +void dAcBlastboss_c::finalizeState_Guard() {} + +void dAcBlastboss_c::initializeState_GuardBreak() { + s32 side; + s32 attackDir = dAcPy_c::GetLinkM()->getSpecificAttackDirection(); + if (attackDir == daPlayerActBase_c::ATTACK_DIRECTION_LEFT || + attackDir == daPlayerActBase_c::ATTACK_DIRECTION_DOWNLEFT || + attackDir == daPlayerActBase_c::ATTACK_DIRECTION_UPLEFT) { + side = 0; + } else if (attackDir == daPlayerActBase_c::ATTACK_DIRECTION_RIGHT || + attackDir == daPlayerActBase_c::ATTACK_DIRECTION_DOWNRIGHT || + attackDir == daPlayerActBase_c::ATTACK_DIRECTION_UPRIGHT) { + side = 1; + } else { + side = (s32)cM::rndF(1.99f); + } + + if (side == 0) { + setAnm("GuardBreak", 5.0f); + } else { + setAnm("GuardBreakB", 5.0f); + } + mSubState = 0; + mTimers[TIMER_0] = 3; +} +void dAcBlastboss_c::executeState_GuardBreak() { + if (mMdl.getAnm().isStop()) { + mStateMgr.changeState(StateID_Fight); + mTimers[TIMER_4] = 15; + } + + if (mTimers[TIMER_0] == 1) { + mSpeed = -30.0f; + } + sLib::addCalcScaled(&mSpeed, 1.0f, 4.0f); + mCc1.SetTgFlag_0xA(0x1FF); + checkForCounter(); +} +void dAcBlastboss_c::finalizeState_GuardBreak() {} + +void dAcBlastboss_c::initializeState_Damage() { + forceSetAnm("Damage", 5.0f); + mSubState = SUB_STATE_0; + mSpeed = -20.0f; + mChanceAttackCounter++; + field_0x1142 = 5; + startSound(SE_BLasBos_VO_DamageNormal); +} +void dAcBlastboss_c::executeState_Damage() { + dAcPy_c *link = dAcPy_c::GetLinkM(); + sLib::addCalcScaled(&mSpeed, 1.0f, 2.0f); + if (mMdl.getAnm().isStop()) { + mStateMgr.changeState(StateID_Fight); + mTimers[TIMER_4] = 15; + mTimers[TIMER_2] = 0; + } + field_0x113E = 0; + if (mIsPhaseTwo == 0 && !link->isAttackingSpin()) { + mCc1.SetTgFlag_0xA(0x1FF); + } + checkForCounter(); +} void dAcBlastboss_c::finalizeState_Damage() {} -void dAcBlastboss_c::initializeState_SitDamage() {} -void dAcBlastboss_c::executeState_SitDamage() {} + +void dAcBlastboss_c::initializeState_SitDamage() { + setAnm("Chance", 5.0f); + mSubState = 0; + mSpeed = -20.0f; + mChanceAttackCounter = 0; + mTimers[TIMER_0] = 80; + field_0x1142 = 5; + mChanceCounter++; +} +void dAcBlastboss_c::executeState_SitDamage() { + sLib::addCalcScaled(&mSpeed, 1.0f, 2.0f); + switch (mSubState) { + case SUB_STATE_0: { + if (mMdl.getAnm().isStop()) { + setAnm("ChanceLoop", 0.0f); + mSubState = SUB_STATE_1; + } + break; + } + case SUB_STATE_1: { + if (mTimers[TIMER_0] == 0 || mChanceAttackCounter >= 5) { + setAnm("ChanceReverse", 5.0f); + mSubState = SUB_STATE_2; + // fall-through + } else { + break; + } + } + case SUB_STATE_2: { + if (mMdl.getAnm().isStop()) { + mStateMgr.changeState(StateID_Fight); + mTimers[TIMER_4] = 15; + } + checkForCounter(); + mCc1.SetTgFlag_0xA(0x1FF); + return; + } + case SUB_STATE_5: { + if (field_0x1137 == 0) { + forceSetAnm("ChanceDamageU", 2.0f); + } else if (field_0x1137 == 1) { + forceSetAnm("ChanceDamageR", 2.0f); + } else if (field_0x1137 == 2) { + forceSetAnm("ChanceDamageL", 2.0f); + } else { + forceSetAnm("ChanceDamageD", 2.0f); + } + mSubState = SUB_STATE_6; + break; + } + case SUB_STATE_6: { + if (mTimers[TIMER_0] == 0 || mChanceAttackCounter >= 5) { + setAnm("ChanceReverse", 5.0f); + mSubState = SUB_STATE_2; + // fall-through + } else if (mMdl.getAnm().isStop()) { + setAnm("ChanceLoop", 0.0f); + mSubState = SUB_STATE_1; + } + } + } + mCc1.SetTgFlag_0xA(0); +} void dAcBlastboss_c::finalizeState_SitDamage() {} -void dAcBlastboss_c::initializeState_Down() {} -void dAcBlastboss_c::executeState_Down() {} + +void dAcBlastboss_c::initializeState_Down() { + setAnm("DownBStart", 5.0f); + mSubState = SUB_STATE_0; + mSpeed = -20.0f; + mAcceleration = -5.0f; + mVelocity.y = 60.0f; + mIsSwordEmpowered = false; + mCc1.ClrTg_0x8000000(); + mSwordMdl.fn_8006B800(0); +} +void dAcBlastboss_c::executeState_Down() { + mVec3_c v; + mMtx_c mtx; + + mIsDown = true; + field_0x1142 = 5; + bool b = false; + setLightningTimerMaybe(30); + mGuardDirection = -1; + + // TODO: Are all these fall-throughs intentional?????? + switch (mSubState) { + case SUB_STATE_0: { + if (mMdl.getAnm().isStop()) { + mSubState = SUB_STATE_1; + setAnm("DownBLoop", 0.0f); + field_0x11C0 = 20.0f; + } + // fall-through + } + case SUB_STATE_1: { + sLib::addCalcAngle(mAngle.x.ref(), -0x4000, 2, 0x300); + if (field_0x11BC <= -10.0f && field_0x1140) { + mSubState = SUB_STATE_2; + b = true; + setAnm("DownBEnd", 2.0f); + mVelocity.y = 30.0f; + } else { + field_0x11A4 = -30.0f; + break; + } + // fall-through + } + case SUB_STATE_2: { + if (mVelocity.y < 0.0f) { + field_0x11C0 = -35.0f; + } + sLib::addCalcAngle(mAngle.x.ref(), -0x4000, 2, 0x300); + if (field_0x11BC <= -10.0f && field_0x1140) { + b = true; + } + if (mMdl.getAnm().isStop()) { + setAnm("DownLoop", 0.0f); + mSubState = SUB_STATE_3; + if (field_0x113B >= 3 || mLightingStrikeState != LIGHTNING_STRIKE_STATE_NONE) { + mTimers[TIMER_0] = 70; + } else if (field_0x113B == 2) { + mTimers[TIMER_0] = 40; + } else { + mTimers[TIMER_0] = 25; + } + field_0x113B++; + } else { + sLib::addCalcScaled(&mSpeed, 1.0f, 1.0f); + if (mSpeed < 1.0f) { + mFinalBlowPosition.set(mChestTranslation.x, mChestTranslation.y, mChestTranslation.z); + setInteractionFlags(INTERACT_0x1); + } + break; + } + // fall-through + } + case SUB_STATE_3: { + mFinalBlowPosition.set(mChestTranslation.x, mChestTranslation.y, mChestTranslation.z); + sLib::addCalcScaled(&mSpeed, 1.0f, 1.0f); + if (checkInteractionFlags(INTERACT_0x1000)) { + setAnm("End", 3.0f); + mSubState = SUB_STATE_50; + mLightingStrikeState = LIGHTNING_STRIKE_TRIGGER_END; + startSound(SE_BLasBos_LastHit); + mIsDead = true; + resetInteractionFlags(INTERACT_0x1000); + resetInteractionFlags(INTERACT_0x1); + } else if (mTimers[TIMER_0] == 0) { + if (cM::rnd() < 0.5f || mLightingStrikeState != LIGHTNING_STRIKE_STATE_NONE) { + setAnm("DownEscapeR", 10.0f); + } else { + setAnm("DownEscapeL", 10.0f); + } + setAnmRate(0.65f); + mSubState = SUB_STATE_5; + field_0x11C8 = 0.0f; + resetInteractionFlags(INTERACT_0x1); + if (mLightingStrikeState != LIGHTNING_STRIKE_STATE_NONE) { + mLightingStrikeState = LIGHTNING_STRIKE_WAIT; + field_0x2D00 = 0.0f; + dLightEnv_c::GetPInstance()->setField_0x38DC(1); + } + } + break; + } + case SUB_STATE_4: { + if (mMdl.getAnm().getFrame() >= 52.0f) { + mIsDown = false; + sLib::addCalcAngle(mAngle.x.ref(), 0, 1, 910); + } + if (mMdl.getAnm().getFrame() >= 170.0f) { + field_0x1131 = 2; + } + if (mMdl.getAnm().isStop()) { + mStateMgr.changeState(StateID_Fight); + mTimers[TIMER_4] = 15; + } + break; + } + case SUB_STATE_5: { + sLib::addCalcAngle(mAngle.x.ref(), 0, 1, 0x400); + if ((int)mMdl.getAnm().getFrame() <= 14) { + sLib::addCalcScaledDiff(&field_0x11C8, 15.0f, 1.0f, 5.0f); + field_0x11A4 = 20.0f; + } else { + mIsDown = false; + sLib::addCalcAngle(mAngle.y.ref(), mYAngleToLink, 2, 0x800); + sLib::addCalcScaled(&field_0x11C8, 1.0f, 5.0f); + } + mtx.YrotS(mRotation.y); + if (mpCurrentAnm == "DownEscapeR") { + v.set(-field_0x11C8, 0.0f, 0.0f); + } else { + v.set(field_0x11C8, 0.0f, 0.0f); + } + MTXMultVec(mtx, v, v); + mPosition.x += v.x; + mPosition.z += v.z; + + if (mMdl.getAnm().isStop()) { + if (mLightingStrikeState != LIGHTNING_STRIKE_STATE_NONE) { + setAnm("ThunderDemo", 10.0f); + mSubState = SUB_STATE_20; + } else { + if (field_0x113B >= 3 && mXZDistanceToLink < 500.0f) { + mStateMgr.changeState(StateID_Attack); + mMdl.setFrame(10.0f); + } else { + mStateMgr.changeState(StateID_Fight); + mTimers[TIMER_4] = 15; + } + } + } + break; + } + case SUB_STATE_10: { + // TODO: Is this state ever set? + if (mMdl.getAnm().isStop()) { + setAnm("DownGetUp", 10.0f); + mSubState = SUB_STATE_4; + } + break; + } + case SUB_STATE_20: { + mIsDown = 0; + if (mMdl.getAnm().isStop()) { + mSubState = SUB_STATE_21; + setAnm("CatchThunderLoop", 0.0f); + } + break; + } + case SUB_STATE_21: { + mIsDown = false; + if (mMdl.getAnm().isStop()) { + mStateMgr.changeState(StateID_Fight); + mTimers[TIMER_4] = 15; + mLightingStrikeState = LIGHTNING_STRIKE_FINISH; + } + break; + } + } + + if (b) { + v.set(0.0f, 0.0f, -100.0f); + mtx.YrotS(mRotation.y); + MTXMultVec(mtx, v, v); + v.x += mBackbone1Translation.x; + v.z += mBackbone1Translation.z; + v.y = 10.0f; + + static mVec3_c sScale(3.0f, 3.0f, 3.0f); + dJEffManager_c::spawnEffect(PARTICLE_RESOURCE_ID_MAPPING_91_, v, nullptr, &sScale, nullptr, nullptr, 0, 0); + } +} void dAcBlastboss_c::finalizeState_Down() {} -void dAcBlastboss_c::initializeState_Stun() {} -void dAcBlastboss_c::executeState_Stun() {} + +void dAcBlastboss_c::initializeState_Stun() { + setAnm("Stan", 3.0f); + mSubState = SUB_STATE_0; + mChanceAttackCounter = 0; + mInvulnerabilityTimerMaybe = 10; + mStunCounter++; + mIsSwordEmpowered = false; + mCc1.ClrTg_0x8000000(); + mSwordMdl.fn_8006B800(0); + startSound(SE_BLasBos_HitThunderBeam); +} +void dAcBlastboss_c::executeState_Stun() { + setLightningTimerMaybe(40); + mStunState = 1; + int frame = mMdl.getAnm().getFrame(); + switch (mSubState) { + case SUB_STATE_0: { + if (mMdl.getAnm().isStop()) { + mSubState = SUB_STATE_1; + setAnm("StanLoop", 0.0f); + mTimers[TIMER_0] = 100; + } + break; + } + case SUB_STATE_1: { + if (mTimers[TIMER_0] == 0) { + mSubState = SUB_STATE_2; + setAnm("StanReverse", 10.0f); + } + break; + } + case SUB_STATE_2: { + if (frame <= 58) { + if (frame == 58) { + mStunState = 2; + } + } else { + mStunState = 0; + if (frame <= 61) { + field_0x11A4 = 25.0f; + } + } + if (mMdl.getAnm().isStop()) { + mStateMgr.changeState(StateID_Fight); + } + break; + } + } + + sLib::addCalcScaled(&mSpeed, 1.0f, 10.0f); + if (mChanceAttackCounter >= 7) { + mCc1.SetTgFlag_0xA(0x1FF); + checkForCounter(); + } else { + if (mInvulnerabilityTimerMaybe != 0) { + mCc1.SetTgFlag_0xA(0x1FF); + } else { + mCc1.SetTgFlag_0xA(0); + } + } +} void dAcBlastboss_c::finalizeState_Stun() {} -void dAcBlastboss_c::initializeState_ThunderWait() {} -void dAcBlastboss_c::executeState_ThunderWait() {} + +void dAcBlastboss_c::initializeState_ThunderWait() { + setAnm("CatchThunderStart", 10.0f); + mSubState = SUB_STATE_0; + mGuardDirection = -1; + mTimers[TIMER_0] = 30; +} +void dAcBlastboss_c::executeState_ThunderWait() { + dAcPy_c *link = dAcPy_c::GetLinkM(); + mCc1.SetTgFlag_0xA(0); + + switch (mSubState) { + case SUB_STATE_0: { + if (mMdl.getAnm().isStop()) { + mSubState = SUB_STATE_1; + setAnm("CatchThunderLoop", 0.0f); + } + // fall-through + } + case SUB_STATE_1: { + if (link->checkSwordAndMoreStates(0x400000)) { + mStateMgr.changeState(StateID_Fight); + } else if (mTimers[TIMER_0] == 0) { + dLightEnv_c::GetPInstance()->setField_0x38DC(7); + mSubState = SUB_STATE_5; + setAnm("CatchThunderEnd", 5.0f); + mVec3_c vEff; + vEff.x = mSwordPosition.x; + vEff.y = mSwordPosition.y + 110.0f; + vEff.z = mSwordPosition.z; + dJEffManager_c::spawnEffect( + PARTICLE_RESOURCE_ID_MAPPING_624_, vEff, nullptr, nullptr, nullptr, nullptr, 0, 0 + ); + mTimers[TIMER_3] = cM::rndF(100.0f) + 900.0f; + mIsSwordEmpowered = true; + mSwordMdl.fn_8006B800(4); + mCc1.OnTg_0x8000000(); + mLightingFallSwordTimer = 10; + startSound(SE_BLasBos_ThunderFallSword); + } + break; + } + case SUB_STATE_5: { + if (mMdl.getAnm().getFrame() >= 20.0f) { + mCc1.SetTgFlag_0xA(0x1FF); + checkForCounter(); + } + if (mMdl.getAnm().isStop()) { + mStateMgr.changeState(StateID_Fight); + } + break; + } + } + sLib::addCalcScaled(&mSpeed, 1.0f, 4.0f); +} void dAcBlastboss_c::finalizeState_ThunderWait() {} + +bool dAcBlastboss_c::checkDamage() { + mVec3_c v; + mVec3_c v2; + mMtx_c mtx; + + mHealth = 400; + // TODO: typing crime + cCcD_Obj *atHit = mSwordMdl.mCcList.find((dColliderLinkedList::ccPtmf)&dCcD_Check::ChkAtHit); + if (atHit != nullptr && atHit->GetAtFlag0x8()) { + field_0x113E = 20; + } + + if (sLib::calcTimer(&field_0x1134) == 0) { + // TODO: regswap between unk and link. + // Making this a u16 or s16 fixes regalloc but breaks instructions... + s32 unk = someEnemyDamageCollisionStuffMaybe(mCcList, nullptr); + + // TODO: typing crime + cCcD_Obj *tgHit = mCcList.find((dColliderLinkedList::ccPtmf)&dCcD_Check::ChkTgHit); + if (tgHit == nullptr) { + return false; + } + + dAcPy_c *link = dAcPy_c::GetLinkM(); + s32 mLastAttackDirection = link->getSpecificAttackDirection(); + + // TODO: enum? + switch (unk) { + case 0: { + break; + } + case 6: { + startSound(SE_BLasBos_SwordBySword); + // TODO inline? + if (tgHit->GetTgDamageFlags() & 0x4) { + v.x = 0.0f; + v.y = 0.0f; + v.z = 20.0f; + mtx.YrotS(link->mRotation.y); + MTXMultVec(mtx, v, v2); + mAttackKnockbackX = v2.x; + mAttackKnockbackZ = v2.z; + mStateMgr.changeState(StateID_Stun); + break; + } + + if (tgHit->ChkTgAtHitType(AT_TYPE_0x800000)) { + mGuardDirection = GUARD_UP; + mStateMgr.changeState(StateID_Guard); + break; + } + mMdlCallback.field_0x04.set(7); + if (field_0x113F != 0) { + mSubState = SUB_STATE_1; + mStateMgr.changeState(StateID_CounterAttack); + break; + } else if (mGuardDirection == GUARD_BT) { + if (classifyAttackDirection(mLastAttackDirection) == classifyAttackDirection(mLastAttackDir)) { + mNumConsecutiveOppositeDirectionAttacks++; + } else { + mNumConsecutiveSameDirectionAttacks++; + } + if (mNumConsecutiveSameDirectionAttacks >= 2) { + mSubState = SUB_STATE_1; + mStateMgr.changeState(StateID_CounterAttack); + break; + } + + if (classifyAttackDirection(mLastAttackDirection) == 0) { + // Left + mMdlCallback.field_0x30 += 3.0f; + mMdlCallback.field_0x18 += 0x7D0; + } else if (classifyAttackDirection(mLastAttackDirection) == 1) { + // Right + mMdlCallback.field_0x30 -= 3.0f; + mMdlCallback.field_0x18 -= 0x7D0; + } + if (mNumConsecutiveOppositeDirectionAttacks >= 1) { + mStateMgr.changeState(StateID_GuardBreak); + } + } else if (mLastAttackDir >= 0) { + if (classifyAttackDirection(mLastAttackDirection) == classifyAttackDirection(mLastAttackDir)) { + mNumConsecutiveSameDirectionAttacks++; + } else { + mNumConsecutiveOppositeDirectionAttacks++; + } + s8 x = 3; + if (classifyAttackDirection(mLastAttackDirection) == classifyAttackDirection(mLastAttackDir)) { + x = 1; + } + if (mNumConsecutiveSameDirectionAttacks >= x || + (mSecondLastAttackDirection >= 0 && (classifyAttackDirection(mSecondLastAttackDirection) & 2) == + (classifyAttackDirection(mLastAttackDirection) & 2))) { + mSubState = SUB_STATE_0; + mStateMgr.changeState(StateID_CounterAttack); + } else { + if (mNumConsecutiveOppositeDirectionAttacks >= 1) { + field_0x113E = 25; + mNumConsecutiveOppositeDirectionAttacks = 1; + field_0x1182 = 20; + } + } + } + v.x = 0.0f; + v.y = 0.0f; + v.z = -5.0f; + mtx.YrotS(mYAngleToLink); + MTXMultVec(mtx, v, v2); + mAttackKnockbackX = v2.x; + mAttackKnockbackZ = v2.z; + mLastAttackDir = mLastAttackDirection; + break; + } + case 7: { + break; + } + default: { + if (tgHit != nullptr && + (tgHit->ChkTgAtHitType(AT_TYPE_SLINGSHOT) || tgHit->ChkTgAtHitType(AT_TYPE_CLAWSHOT) || + tgHit->ChkTgAtHitType(AT_TYPE_BOMB) || tgHit->ChkTgAtHitType(AT_TYPE_ARROW) || + tgHit->ChkTgAtHitType(AT_TYPE_WHIP) || tgHit->ChkTgAtHitType(AT_TYPE_0x40))) { + mGuardDirection = GUARD_UP; + mStateMgr.changeState(StateID_Guard); + + if (tgHit->ChkTgAtHitType(AT_TYPE_BOMB)) { + field_0x11A4 = 30.0f; + field_0x11B8 = 15.0f; + v.x = 0.0f; + v.y = 0.0f; + v.z = -10.0f; + mtx.YrotS(mRotation.y); + MTXMultVec(mtx, v, v2); + mAttackKnockbackX = v2.x; + mAttackKnockbackZ = v2.z; + } + + break; + } + + // TODO inline? + if (tgHit->GetTgDamageFlags() & 4) { + v.x = 0.0f; + v.y = 0.0f; + v.z = 20.0f; + mtx.YrotS(link->mRotation.y); + MTXMultVec(mtx, v, v2); + mAttackKnockbackX = v2.x; + mAttackKnockbackZ = v2.z; + mStateMgr.changeState(StateID_Stun); + break; + } + + field_0x1152++; + if (field_0x1152 == 15) { + dSndBgmMgr_c::GetInstance()->fn_80372D70(3); + } + + if (mIsPhaseTwo >= 0) { + if (field_0x1152 == 30) { + dStageMgr_c::GetInstance()->fn_80199B60(4); + mStateMgr.changeState(StateID_Down); + mLightingStrikeState = LIGHTNING_STRIKE_START_DEMO; + startSound(SE_BLasBos_DownHit); + break; + } + } else { + if (field_0x1152 == 50) { + mStateMgr.changeState(StateID_Down); + field_0x1152 = 45; + break; + } + } + + if ((!field_0x113E && (mStateMgr.isState(StateID_Attack) || mStateMgr.isState(StateID_SmallAttack) || + mStateMgr.isState(StateID_CounterAttack))) || + mStateMgr.isState(StateID_ThunderWait)) { + field_0x1188 = 10; + break; + } + + if (field_0x113E != 0 && mIsPhaseTwo != 0) { + field_0x1188 = 10; + break; + } + + if (mStateMgr.isState(StateID_Stun)) { + mNumConsecutiveSameDirectionAttacks = 0; + mSecondLastAttackDirection = mLastAttackDirection; + mChanceAttackCounter++; + + v.x = 0.0f; + v.y = 0.0f; + v.z = -20.0f; + mtx.YrotS(mYAngleToLink); + MTXMultVec(mtx, v, v2); + mAttackKnockbackX = v2.x; + mAttackKnockbackZ = v2.z; + field_0x1138 = 10; + field_0x11B8 = 5.0f; + field_0x11A4 = 7.0f; + if (mLastAttackDirection == daPlayerActBase_c::ATTACK_DIRECTION_LEFT || + mLastAttackDirection == daPlayerActBase_c::ATTACK_DIRECTION_DOWNLEFT || + mLastAttackDirection == daPlayerActBase_c::ATTACK_DIRECTION_UPLEFT) { + field_0x1137 = 1; + } else if (mLastAttackDirection == daPlayerActBase_c::ATTACK_DIRECTION_RIGHT || + mLastAttackDirection == daPlayerActBase_c::ATTACK_DIRECTION_DOWNRIGHT || + mLastAttackDirection == daPlayerActBase_c::ATTACK_DIRECTION_UPRIGHT) { + field_0x1137 = 2; + } else if (mLastAttackDirection == daPlayerActBase_c::ATTACK_DIRECTION_STAB) { + field_0x1137 = 3; + } else { + field_0x1137 = 0; + } + startSound(SE_BLasBos_VO_DamageChance); + break; + } + + if (mStateMgr.isState(StateID_SitDamage)) { + mNumConsecutiveSameDirectionAttacks = 0; + mSecondLastAttackDirection = mLastAttackDirection; + mChanceAttackCounter++; + + if (mChanceAttackCounter >= 5 && mChanceCounter >= 3) { + if (mIsPhaseTwo >= 0) { + mChanceAttackCounter = 0; + field_0x1152 = 30; + dStageMgr_c::GetInstance()->fn_80199B60(4); + mStateMgr.changeState(StateID_Down); + mLightingStrikeState = LIGHTNING_STRIKE_START_DEMO; + startSound(SE_BLasBos_DownHit); + break; + } + mStateMgr.changeState(StateID_Down); + field_0x1152 = 45; + break; + } + + v.x = 0.0f; + v.y = 0.0f; + v.z = -20.0f; + mtx.YrotS(mYAngleToLink); + MTXMultVec(mtx, v, v2); + mAttackKnockbackX = v2.x; + mAttackKnockbackZ = v2.z; + field_0x11B8 = 5.0f; + field_0x11A4 = 7.0f; + if (mLastAttackDirection == daPlayerActBase_c::ATTACK_DIRECTION_LEFT || + mLastAttackDirection == daPlayerActBase_c::ATTACK_DIRECTION_DOWNLEFT || + mLastAttackDirection == daPlayerActBase_c::ATTACK_DIRECTION_UPLEFT) { + field_0x1137 = 1; + } else if (mLastAttackDirection == daPlayerActBase_c::ATTACK_DIRECTION_RIGHT || + mLastAttackDirection == daPlayerActBase_c::ATTACK_DIRECTION_DOWNRIGHT || + mLastAttackDirection == daPlayerActBase_c::ATTACK_DIRECTION_UPRIGHT) { + field_0x1137 = 2; + } else if (mLastAttackDirection == daPlayerActBase_c::ATTACK_DIRECTION_DOWN) { + field_0x1137 = 3; + } else { + field_0x1137 = 0; + } + mSubState = SUB_STATE_5; + startSound(SE_BLasBos_VO_DamageChance); + break; + } + + if (mChanceAttackCounter >= 3) { + mStateMgr.changeState(StateID_SitDamage); + mChanceAttackCounter = 0; + } else { + mStateMgr.changeState(StateID_Damage); + } + + mNumConsecutiveSameDirectionAttacks = -1; + mSecondLastAttackDirection = mLastAttackDirection; + v.x = 0.0f; + v.y = 0.0f; + v.z = -20.0f; + mtx.YrotS(mYAngleToLink); + MTXMultVec(mtx, v, v2); + mAttackKnockbackX = v2.x; + mAttackKnockbackZ = v2.z; + field_0x1138 = 10; + field_0x11B8 = 5.0f; + field_0x11A4 = 7.0f; + if (mLastAttackDirection == daPlayerActBase_c::ATTACK_DIRECTION_LEFT || + mLastAttackDirection == daPlayerActBase_c::ATTACK_DIRECTION_DOWNLEFT || + mLastAttackDirection == daPlayerActBase_c::ATTACK_DIRECTION_UPLEFT) { + field_0x1137 = 1; + } else if (mLastAttackDirection == daPlayerActBase_c::ATTACK_DIRECTION_RIGHT || + mLastAttackDirection == daPlayerActBase_c::ATTACK_DIRECTION_DOWNRIGHT || + mLastAttackDirection == daPlayerActBase_c::ATTACK_DIRECTION_UPRIGHT) { + field_0x1137 = 2; + } else if (mLastAttackDirection == daPlayerActBase_c::ATTACK_DIRECTION_STAB) { + field_0x1137 = 3; + } else { + field_0x1137 = 0; + } + break; + } + } + } + + return true; +} + +void dAcBlastboss_c::setAnm(const char *name, f32 blend) { + if (mpCurrentAnm != name) { + mMdl.setAnm(name, m3d::PLAY_MODE_4, blend); + mpCurrentAnm = name; + } +} + +void dAcBlastboss_c::forceSetAnm(const char *name, f32 blend) { + mMdl.setAnm(name, m3d::PLAY_MODE_4, blend); + mpCurrentAnm = name; +} + +void dAcBlastboss_c::setAnmRate(f32 rate) { + mMdl.setRate(rate); +} + +int dAcBlastboss_c::draw() { + drawModelType1(&mMdl.getModel()); + mSwordMdl.entry(this, nullptr, nullptr); + if (field_0x114C) { + drawModelType1(&mThunderMdl); + } + return SUCCEEDED; +} + +bool dAcBlastboss_c::checkForCloseRangeAttack() { + dAcPy_c *link = dAcPy_c::GetLinkM(); + + bool ret = false; + if (mXZDistanceToLink < 500.0f) { + if (mIsPhaseTwo != 0) { + if (mTimers[TIMER_2] == 0) { + mStateMgr.changeState(StateID_Attack); + ret = true; + } + } else { + if (link->isUsingShield()) { + mLinkCloseRangeShieldTime++; + } else { + mLinkCloseRangeShieldTime = 0; + } + if (mLinkCloseRangeShieldTime > 40) { + mStateMgr.changeState(StateID_PunchAttack); + ret = true; + } else if (mTimers[TIMER_2] == 0) { + if (checkForLinkSwordBySwordHit() && cM::rnd() < 0.35f) { + mStateMgr.changeState(StateID_SmallAttack); + ret = true; + } else { + mStateMgr.changeState(StateID_Attack); + ret = true; + } + mLinkCloseRangeShieldTime = 0; + } + } + + } else { + mLinkCloseRangeShieldTime = 0; + } + + return ret; +} + +bool dAcBlastboss_c::checkForRangeAttack() { + dAcPy_c *link = dAcPy_c::GetLinkM(); + + bool ret = false; + + if (mIsPhaseTwo != 0 && !link->isRecovering() && mStunCounter != 0 && link->getSwordPos().y > 270.0f) { + field_0x1162++; + } else { + field_0x1162 = 0; + } + + if (mIsPhaseTwo != 0) { + if (field_0x1162 >= 20) { + mStateMgr.changeState(StateID_DashAttack); + return true; + } else if (mIsSwordEmpowered) { + if ((link->checkSwordAndMoreStates(0x400000) && mStunCounter != 0) || + (mXZDistanceToLink < 1500.0f && mTimers[TIMER_3] == 0)) { + mStateMgr.changeState(StateID_ThunderAttack); + ret = true; + } + } else { + if (link->checkSwordAndMoreStates(0x400000)) { + if ((mCounter & 0x7) == 0 && mStunCounter != 0) { + mStateMgr.changeState(StateID_DashAttack); + ret = true; + } + } else { + if (mXZDistanceToLink < 1500.0f && dLightEnv_c::GetPInstance()->getField_0x38DC() == 6) { + if (field_0x1162 > 10) { + mStateMgr.changeState(StateID_DashAttack); + ret = true; + } else { + mStateMgr.changeState(StateID_ThunderWait); + ret = true; + } + } + } + } + } + + return ret; +} + +bool dAcBlastboss_c::checkForCounter() { + bool ret = false; + + if (field_0x113E != 0) { + return false; + } + + f32 attackRange = 450.0f; + if (dAcPy_c::GetLinkM()->isAttackingJumpSlash()) { + attackRange = 750.0f; + } + + if (mXZDistanceToLink < attackRange) { + dAcPy_c *link = dAcPy_c::GetLinkM(); + if (link->checkFlags0x354(0x04)) { + if (link->isAttackingSpin()) { + field_0x11A4 = 15.0f; + } else if (link->isAttacking()) { + field_0x11A4 = 7.0f; + } + + s32 attackDir = link->getSpecificAttackDirection(); + + if (mStateMgr.isState(StateID_Attack)) { + if (mpCurrentAnm == "AttackR" && + (attackDir == dAcPy_c::ATTACK_DIRECTION_RIGHT || attackDir == dAcPy_c::ATTACK_DIRECTION_UPRIGHT || + attackDir == dAcPy_c::ATTACK_DIRECTION_DOWNRIGHT)) { + mGuardDirection = GUARD_RIGHT; + } else if (mpCurrentAnm == "AttackL" && (attackDir == dAcPy_c::ATTACK_DIRECTION_LEFT || + attackDir == dAcPy_c::ATTACK_DIRECTION_UPLEFT || + attackDir == dAcPy_c::ATTACK_DIRECTION_DOWNLEFT)) { + mGuardDirection = GUARD_LEFT; + } else if (mpCurrentAnm == "AttackU" && attackDir == daPlayerActBase_c::ATTACK_DIRECTION_DOWN) { + mGuardDirection = GUARD_UP; + } else { + return false; + } + + mStateMgr.changeState(StateID_Guard); + mSubState = SUB_STATE_10; + } else { + if ((mIsPhaseTwo > 0 || mXZDistanceToLink < 200.0f) && mNumConsecutiveOppositeDirectionAttacks < 1) { + mNumConsecutiveOppositeDirectionAttacks = 1; + } + + switch (attackDir) { + case daPlayerActBase_c::ATTACK_DIRECTION_DOWN: mGuardDirection = GUARD_UP; break; + case daPlayerActBase_c::ATTACK_DIRECTION_LEFT: mGuardDirection = GUARD_LEFT; break; + case daPlayerActBase_c::ATTACK_DIRECTION_DOWNLEFT: mGuardDirection = GUARD_UPLEFT; break; + case daPlayerActBase_c::ATTACK_DIRECTION_UPLEFT: mGuardDirection = GUARD_DOWNLEFT; break; + case daPlayerActBase_c::ATTACK_DIRECTION_RIGHT: mGuardDirection = GUARD_RIGHT; break; + case daPlayerActBase_c::ATTACK_DIRECTION_DOWNRIGHT: mGuardDirection = GUARD_UPRIGHT; break; + case daPlayerActBase_c::ATTACK_DIRECTION_UPRIGHT: mGuardDirection = GUARD_DOWNRIGHT; break; + case daPlayerActBase_c::ATTACK_DIRECTION_UP: mGuardDirection = GUARD_DOWN; break; + default: mGuardDirection = GUARD_CENTER; break; + } + if (!mStateMgr.isState(StateID_Guard)) { + mStateMgr.changeState(StateID_Guard); + } + + mSubState = SUB_STATE_0; + } + ret = true; + } + } + return ret; +} + +void dAcBlastboss_c::updateMainNodeTransforms() { + if (field_0x1131 != 0) { + s16 ang = 0x800; + if (field_0x1131 == 2) { + ang = 0x300; + } + dAcPy_c *link = dAcPy_c::GetLinkM(); + mVec3_c attentionTarget = link->getPosition(); + attentionTarget.y += 250.0f; + if (link->isUsingBugnet() && mXZDistanceToLink < 400.0f) { + field_0x117C = 5; + mBugNetPos = link->getBugNetPos(); + } + + s16 diff; + if (field_0x117C != 0) { + attentionTarget = mBugNetPos; + mAng targetAngle = cLib::targetAngleY(mPosition, attentionTarget); + diff = targetAngle - mRotation.y; + } else { + diff = mYAngleToLink - mRotation.y; + } + if (diff > 0x1800) { + diff = 0x1800; + } else if (diff < -0x1800) { + diff = -0x1800; + } + sLib::addCalcAngle(mMdlCallback.field_0x06.ref(), -diff, 2, ang); + + s16 diff2 = cLib::targetAngleX(attentionTarget, mPositionCopy2); + if (diff2 > 0x1000) { + diff2 = 0x1000; + } else if (diff2 < -0x1000) { + diff2 = -0x1000; + } + sLib::addCalcAngle(mMdlCallback.field_0x0A.ref(), diff2, 2, ang); + + if ((mCounter & 0xF) == 0 && cM::rnd() < 0.5f) { + field_0x1170 = cM::rndFX(2000.0f); + } + sLib::addCalcAngle(mMdlCallback.field_0x0C.ref(), field_0x1170, 8, 0x200); + } else { + mMdlCallback.field_0x06 = mMdlCallback.field_0x0A = mMdlCallback.field_0x0C = 0; + if (mLightingStrikeState == LIGHTNING_STRIKE_ENDING) { + mMdlCallback.field_0x0A = 2000; + } + } + + if (field_0x1178 != 0) { + field_0x1178--; + s16 target = mAng(field_0x1178 * 0xE00).sin() * 1500.0f; + sLib::addCalcAngle(mMdlCallback.field_0x08.ref(), target, 2, 200); + } else { + sLib::addCalcAngle(mMdlCallback.field_0x08.ref(), 0, 2, 100); + } + + s16 t3 = 0; + if (field_0x1182 != 0) { + field_0x1182--; + t3 = 4000; + } + sLib::addCalcAngle(mMdlCallback.field_0x12.ref(), t3, 4, 200); + sLib::addCalcAngle(mMdlCallback.field_0x14.ref(), field_0x1172, 2, 0x200); + sLib::addCalcAngle(mMdlCallback.field_0x16.ref(), field_0x1174, 2, 0x200); + + field_0x1172 = 0; + field_0x1174 = 0; + + if (field_0x1138 != 0) { + field_0x1138--; + + field_0x117A = 2000; + s16 t4 = 0, t5 = 0; + if (field_0x1137 == 0) { + field_0x117A = 3000; + t5 = 5000; + } else if (field_0x1137 == 1) { + t5 = 3000; + t4 = 3000; + } else if (field_0x1137 == 2) { + t5 = 3000; + t4 = -3000; + } else if (field_0x1137 == 3) { + field_0x117A = 3000; + t5 = -5000; + } + + sLib::addCalcAngle(mMdlCallback.field_0x0E.ref(), t4, 2, field_0x117A); + sLib::addCalcAngle(mMdlCallback.field_0x10.ref(), t5, 2, field_0x117A); + } else if (field_0x1188 != 0) { + field_0x1188--; + s16 target = mAng(mCounter * 0x6510).sin() * 300.0f; + mMdlCallback.field_0x2E = target; + } else { + sLib::addCalcAngle(mMdlCallback.field_0x0E.ref(), 0, 4, field_0x117A / 4); + sLib::addCalcAngle(mMdlCallback.field_0x10.ref(), 0, 4, field_0x117A / 4); + } + + if (field_0x1133 == 0) { + sLib::addCalcScaled(&mMdlCallback.field_0x30, 0.5f, 0.5f); + sLib::addCalcAngle(mMdlCallback.field_0x18.ref(), 0, 4, 400); + sLib::addCalcAngle(mMdlCallback.field_0x1A.ref(), 0, 4, 400); + } +} + +void dAcBlastboss_c::updateSkirtHairTransforms() { + static const u16 sNodeIds[] = { + B_LAST_BOSS_NODE_skirtAU1, B_LAST_BOSS_NODE_skirtBU1, B_LAST_BOSS_NODE_skirtCU1, B_LAST_BOSS_NODE_skirtDU1, + B_LAST_BOSS_NODE_skirtEU1, B_LAST_BOSS_NODE_skirtFU1, B_LAST_BOSS_NODE_skirtGU1, B_LAST_BOSS_NODE_skirtHU1, + }; + + static const s16 sAngs[] = { + 0x2000, 0x2000, 0x4000, 0x6000, 0x8000, 0xA000, 0xC000, 0xE000, + }; + + f32 f = 80.0f; + + if (mpCurrentAnm == "AttackU") { + if (mMdl.getAnm().getFrame() >= 18.0f && mMdl.getAnm().getFrame() <= 40.0f) { + f = 150.0f; + } + } else if (mpCurrentAnm == "Counter") { + if (mMdl.getAnm().getFrame() >= 17.0f && mMdl.getAnm().getFrame() <= 68.0f) { + f = 120.0f; + } + } else if (mpCurrentAnm == "TurnR") { + if (mMdl.getAnm().getFrame() >= 19.0f && mMdl.getAnm().getFrame() <= 30.0f) { + f = 100.0f; + } + } else if (mpCurrentAnm == "AttackJumpEnd") { + if (mMdl.getAnm().getFrame() <= 18.0f) { + f = 120.0f; + } + } else if (mpCurrentAnm == "AttackJumpStart" || mpCurrentAnm == "AttackJumpLoop") { + f = 120.0f; + } else if (mpCurrentAnm == "DownGetUp") { + // same value + f = 80.0f; + } + sLib::addCalcScaledDiff(&field_0x11B4, f, 0.5f, 20.0f); + + mMtx_c mtx; + mVec3_c v; + mVec3_c t(0.0f, 0.0f, 12.0f); + for (int i = 0; i < (int)ARRAY_LENGTH(field_0x1268); i++) { + field_0x1268[i].field_0x002++; + field_0x1268[i].field_0x004 = sAngs[i] + mRotation.y; + mMdl.getModel().getNodeWorldMtx(sNodeIds[i], mtx); + mtx.getTranslation(v); + mtx.YrotS(field_0x1268[i].field_0x004); + MTXMultVec(mtx, t, field_0x1268[i].field_0x014[0]); + field_0x1268[i].field_0x014[0] += v; + if (nw4r::math::FAbs(field_0x1268[i].field_0x010) < 1.0f) { + // TODO - regswaps between tmp and abs result + f32 tmp = field_0x1268[(i + 1) & 7].field_0x010; + if (nw4r::math::FAbs(tmp) > 1.0f) { + field_0x1268[i].field_0x010 = tmp * 0.5f; + } + tmp = field_0x1268[(i - 1) & 7].field_0x010; + if (nw4r::math::FAbs(tmp) > 1.0f) { + field_0x1268[i].field_0x010 = tmp * 0.5f; + } + } + + f32 f4 = field_0x1268[i].field_0x010 + field_0x11A4; + if (nw4r::math::FAbs(f4) > 0.1f) { + if (field_0x11A4 > 0.1f) { + field_0x1268[i].field_0x006 = mRotation.y + 0x8000 + moreAngs[i]; + } else if (field_0x11A4 < -0.1f) { + field_0x1268[i].field_0x006 = mRotation.y + 0x8000 - moreAngs[i]; + } + + if (nw4r::math::FAbs(field_0x11A4) > 25.0f) { + field_0x1268[i].field_0x00A = 8000; + } else { + field_0x1268[i].field_0x00A = 5000; + } + + if (i >= 2 && i <= 6) { + field_0x1268[i].field_0x00C = f4; + } else { + field_0x1268[i].field_0x00C = 0.75f * f4; + } + field_0x11B0 = 0.0f; + } else { + sLib::addCalcScaled(&field_0x1268[i].field_0x00C, 0.05f, 2.0f); + sLib::addCalcAngle(&field_0x1268[i].field_0x00A, 1000, 4, 200); + } + field_0x1268[i].field_0x008 += field_0x1268[i].field_0x00A; + updateSkirtTransform(i); + } + + mMdl.getModel().getNodeWorldMtx(B_LAST_BOSS_NODE_head, mtx); + mtx.fn_802F1C40(0, 1); + mAng3_c ang; + mtx.toRot(ang); + ang.y += 0x4000; + ang.x += 0; + ang.z += 6500; + t.set(-20.0f, -20.0f, 0.0f); + for (int i = 0; i < 1; i++) { + field_0x2948[i].field_0x002 = ang.y; + field_0x2948[i].field_0x004 = -ang.z; + field_0x2948[i].field_0x006 = -ang.x; + mMdl.getModel().getNodeWorldMtx(B_LAST_BOSS_NODE_head, mtx); + MTXMultVec(mtx, t, field_0x2948[i].field_0x008[0]); + updateHairTransform(i); + } + + if (!mIsDown) { + for (int i = 0; i < 9; i++) { + f32 f = (i % 3) * 3 + 1; + if (i < 3) { + mMdlCallback.field_0x1C[i] = (s16)(f * 500.0f * mAng(mCounter * 0x2600 - (i * 24000)).sin()); + } else if (i < 6) { + mMdlCallback.field_0x1C[i] = -(s16)(f * 500.0f * mAng(mCounter * 0x2800 - (i * 25000)).sin()); + } else { + mMdlCallback.field_0x1C[i] = -(s16)(f * 500.0f * mAng(mCounter * 0x2A00 - (i * 26000)).sin()); + } + } + } + + if (field_0x114E != 0) { + holdSound(SE_BLasBos_SkirtAir); + } +} + +void dAcBlastboss_c::updateSkirtTransform(s32 level) { + // NONMATCHING but probably equivalent + + UnkLastBossCcSph2 &cc = field_0x1268[level]; + mVec3_c *v1 = &cc.field_0x014[1]; + mVec3_c *v2 = &cc.field_0x08C[0]; + mVec3_c *v3 = &cc.field_0x104[1]; + + mVec3_c t1(0.0f, 0.0f, 33.25f); + + s32 offset1 = 0; + + mVec3_c d1; + + d1 = mToeTranslation[0] - mBackbone1Translation; + + mMtx_c mtx; + mtx.YrotS(-mRotation.y); + MTXMultVec(mtx, d1, d1); + if (d1.z > 0.0f) { + offset1 = -1; + } + + d1 = mToeTranslation[1] - mBackbone1Translation; + MTXMultVec(mtx, d1, d1); + if (d1.z > 20.0f) { + offset1 = 1; + } + + // hmm yes + mVec3_c p3; + mVec3_c v4; + mVec3_c p2; + mVec3_c v5; + mVec3_c p1; + + p1.set(0.0f, 0.0f, 0.0f); + p2.set(0.0f, 0.0f, 0.0f); + bool isAttackJumpStart = false; + if (mpCurrentAnm == "AttackJumpStart") { + isAttackJumpStart = true; + } + f32 f; + if (level == 7 && offset1 > 0) { + f = 10.0f; + } else if (level >= 0 && level <= 1 && offset1 < 0) { + f = 50.0f; + } else { + f = -3.0f; + } + if (level >= 0 && level < 2 && isAttackJumpStart) { + p1.y = 500.0f; + f = 50.0f; + } + + sLib::addCalcScaledDiff(&field_0x11D0, f, 1.0f, 2.0f); + p1.z = field_0x11D0; + + p3.set(0.0f, 0.0f, 2.0f); + mtx.YrotS(cc.field_0x004); + MTXMultVec(mtx, p3, v4); + MTXMultVec(mtx, p1, v5); + mtx.YrotS(mRotation.y); + MTXMultVec(mtx, p2, p2); + + f32 fAdd = -15.0f; + f32 f1 = cc.field_0x00C; + sLib::addCalcScaledDiff(&field_0x11AC, field_0x11B0, 1.0f, 0.02f); + + s32 offset2 = 0; + if (offset1 < 0 && (level == 0) || level == 1 || level == 2 || level == 7) { + offset2 = 1; + } + + f32 f2 = field_0x11B4; + u32 u12 = (cc.field_0x002 & 1) + 1; + if (level >= 2 && level <= 6) { + u12 += 2; + cc.mCc.SetR(30.0f); + } else { + cc.mCc.SetR(50.0f); + } + + if (mIsDown) { + offset2 = 0; + v4.set(0.0f, 0.0f, 0.0f); + p2.set(0.0f, 0.0f, 0.0f); + } + + f1 *= 0.75f; + + static const f32 sFloats[] = { + 15.0f, 15.0f, 15.0f, 15.0f, 13.0f, 11.0f, 9.0f, 7.0f, 5.0f, + }; + + s32 actual = offset2 - 1; + + for (u32 i = 1; i < 10; i++, v1++, v2++, v3++) { + mtx.YrotS(cc.field_0x006); + d1.x = 0.0f; + d1.y = mAng(cc.field_0x008 - i * 8000).sin() * f1; + d1.z = f1; + mVec3_c v6; + MTXMultVec(mtx, d1, v6); + s32 zero = 0; + f1 = f1 * (zero * 0.01f + 1.1f); + + f32 fY = fAdd + v1[0].y + v4.y + v3[0].y + v6.y + v5.y; + if (i >= 1) { + v5.y = 0.0f; + } else { + // @bug unreachable + v5.y *= 0.5f; + } + + f32 f4; + if (mIsDown) { + f4 = 5.0f; + } else { + f4 = sFloats[i - 1]; + } + + if (fY <= f4) { + fY = f4; + } + + f32 fX = v1[0].x + v4.x + p2.x + v3[0].x + v6.x + v5.x; + f32 fZ = v1[0].z + v4.z + p2.z + v3[0].z + v6.z + v5.z; + if (offset2 != 0) { + f32 dX = fX - field_0x1250[actual].x; + f32 dZ = fZ - field_0x1250[actual].z; + f32 f11 = nw4r::math::FSqrt(dX * dX + dZ * dZ); + if (f11 < f2) { + mtx.YrotS(cM::atan2s(dX, dZ)); + d1.set(0.0f, 0.0f, f2); + MTXMultVec(mtx, d1, d1); + fX = d1.x + field_0x1250[actual].x; + fZ = d1.z + field_0x1250[actual].z; + } + } + + fX -= v1[-1].x; + fY -= v1[-1].y; + fZ -= v1[-1].z; + v5.x *= 0.4f; + v5.z *= 0.4f; + v2[0].x = -cM::atan2s(fY, fZ); + f32 f8 = nw4r::math::FSqrt(fY * fY + fZ * fZ); + + v2[0].y = cM::atan2s(fX, f8); + v2[0].z = mRotation.y; + + mtx.XrotS(v2[0].x); + mtx.YrotM(v2[0].y); + MTXMultVec(mtx, t1, d1); + v3[0] = v1[0]; + v1[0] = v1[-1] + d1; + v3[0] = (v1[0] - v3[0]) * field_0x11AC; + if (i == u12) { + cc.field_0x010 = 0.0f; + cc.mCc.SetC(v1[0]); + if (cc.mCc.ChkTgHit()) { + cc.field_0x006 = moreAngs[level] + dAcPy_c::GetLinkM()->mRotation.y; + cc.field_0x010 = 25.0f; + field_0x114E = 1; + } + } + } +} + +void dAcBlastboss_c::updateHairTransform(s32 level) { + // NONMATCHING but probably equivalent + + UnkLastBossCcSph1 &cc = field_0x2948[level]; + mVec3_c *v1 = &cc.field_0x008[1]; + mVec3_c *v2 = &cc.field_0x044[0]; + mVec3_c *v3 = &cc.field_0x080[1]; + + mMtx_c mtx2; + mMtx_c mtx; + mVec3_c t1(0.0f, 0.0f, 47.5f); + mVec3_c v; + mVec3_c t2(0.0f, 0.0f, -10.0f); + + mtx.YrotS(cc.field_0x002); + mtx.XrotM(cc.field_0x004); + MTXMultVec(mtx, t2, t2); + + f32 f1 = field_0x11B8; + f32 f2 = -field_0x11B8; + f32 f4 = 0.9f; + f32 fAdd = -5.0f; + f32 fScale = 1.0f; + + for (u32 i = 1; i < 5; i++, v1++, v2++, v3++) { + v.x = f1 * mAng(mCounter * 12000 - (i * 20000)).sin(); + v.y = f1 * mAng(mCounter * 10000 - (i * 20000)).sin(); + v.z = f2; + v.x += mAng(mCounter * 10000 - (i * 20000)).sin() * fScale; + v.y += mAng(mCounter * 12000 - (i * 20000)).sin() * fScale; + MTXMultVec(mtx, v, v); + + f1 *= 1.6f; + + f32 f13; + if (field_0x113D != 0) { + f13 = fAdd + v1[0].y + t2.y + v3[0].y + v.y; + if (f13 < mPositionCopy2.y) { + f13 = mPositionCopy2.y; + } + f13 = f13 - v1[-1].y; + } else if (mIsDown) { + f13 = fAdd + v1[0].y + v3[0].y; + if (f13 <= 0.0f) { + f13 = 0.0f; + } + f13 = f13 - v1[-1].y; + v.set(0.0f, 0.0f, 0.0f); + } else { + f13 = fAdd + (v1[0].y - v1[-1].y) + t2.y + v3[0].y + v.y; + } + + f32 fX2 = (v1[0].x - v1[-1].x) + t2.x + v3[0].x + v.x; + f32 fZ2 = (v1[0].z - v1[-1].z) + t2.z + v3[0].z + v.z; + + t2.x *= 0.6f; + t2.y *= 0.6f; + t2.z *= 0.6f; + v2[0].y = cM::atan2s(fX2, fZ2); + f32 f8 = nw4r::math::FSqrt(fX2 * fX2 + fZ2 * fZ2); + v2[0].x = -cM::atan2s(f13, f8); + v2[0].z = cc.field_0x006; + + mtx2.YrotS(v2[0].y); + mtx2.XrotM(v2[0].x); + MTXMultVec(mtx2, t1, v); + + v3[0] = v1[0]; + v1[0] = v1[-1] + v; + v3[0] = (v1[0] - v3[0]) * f4; + } + + f32 target = 0.0f; + cc.mCc.SetC(mPositionCopy2); + cc.mCc.SetR(30.0f); + if (cc.mCc.ChkTgHit()) { + target = 7.0f; + holdSound(SE_BLasBos_HairAir); + if (field_0x1178 == 0) { + field_0x1178 = 18; + } + } + sLib::addCalcScaledDiff(&field_0x11B8, target, 0.2f, 0.7f); +} + +bool dAcBlastboss_c::checkForLinkSwordBySwordHit() { + dAcPy_c *link = dAcPy_c::GetLinkM(); + + bool ret = !link->isUsingShield(); + if (ret) { + ret = link->isUsingSword(); + } + if (ret) { + ret = link->getSwordPos().y > 100.0f; + } + if (ret) { + ret = link->getSwordPos().y < 230.0f; + } + if (ret) { + ret = (mPosition - link->getSwordPos()).absXZ() < 260.0f; + } + + return ret; +} + +u8 dAcBlastboss_c::classifyAttackDirection(s32 attackDir) { + switch (attackDir) { + case daPlayerActBase_c::ATTACK_DIRECTION_LEFT: + case daPlayerActBase_c::ATTACK_DIRECTION_DOWNLEFT: + case daPlayerActBase_c::ATTACK_DIRECTION_UPLEFT: return 0; + + case daPlayerActBase_c::ATTACK_DIRECTION_RIGHT: + case daPlayerActBase_c::ATTACK_DIRECTION_DOWNRIGHT: + case daPlayerActBase_c::ATTACK_DIRECTION_UPRIGHT: return 1; + + case daPlayerActBase_c::ATTACK_DIRECTION_DOWN: return 2; + case daPlayerActBase_c::ATTACK_DIRECTION_UP: return 3; + + case daPlayerActBase_c::ATTACK_DIRECTION_STAB: return 4; + + default: return -1; + } +} + +void dAcBlastboss_c::executeLightningStrike() { + dCamera_c *cam = dScGame_c::getCamera(); + dAcPy_c *link = dAcPy_c::GetLinkM(); + + mMtx_c mtx; + mMtx_c mtx1; + mVec3_c v; + mVec3_c effPos; + + bool b1 = false; + bool b2 = false; + bool spawnEffect = false; + dLightEnv_c &lightEnv = dLightEnv_c::GetInstance(); + + switch (mLightingStrikeState) { + case LIGHTNING_STRIKE_START_DEMO: { + { + // this works but I don't like it + static volatile u32 FLAGS_1 = 0x00000001; + static u32 FLAGS_2 = 0x00100001; + u32 f1 = FLAGS_1; + u32 f2 = FLAGS_2; + Event e = Event("BLS_demo2", 100, f2 & ~f1, nullptr, nullptr); + EventManager::alsoSetAsCurrentEvent(this, &e, nullptr); + } + if (EventManager::isInEvent(this, "BLS_demo2")) { + field_0x2CEE = 0; + field_0x2D00 = 0.0f; + field_0x2CFC = 60.0f; + mLightingStrikeState = LIGHTNING_STRIKE_DEMO; + // huh + field_0x2D10.x = cam->getField_0x78().x; + field_0x2D10.y = cam->getField_0x78().y; + field_0x2D10.z = cam->getField_0x78().z; + field_0x2D04.x = cam->getPositionMaybe().x; + field_0x2D04.y = cam->getPositionMaybe().y; + field_0x2D04.z = cam->getPositionMaybe().z; + mIsPhaseTwo = -1; + // fall-through + } else { + break; + } + } + case LIGHTNING_STRIKE_DEMO: { + if (field_0x2CEE < 30) { + b2 = true; + } + mtx.YrotS((s16)field_0x2CF4 + mRotation.y); + v.set(0.0f, 100.0f, 400.0f); + MTXMultVec(mtx, v, v); + v += mPosition; + cLib::addCalcPos2(&field_0x2D04, v, 0.1f, 30.0f); + if (field_0x2CEE > 5) { + sLib::addCalcScaledDiff(&field_0x2D00, 1.0f, 1.0f, 0.1f); + sLib::addCalcScaledDiff(&field_0x2CF4, 6000.0f, 0.05f, field_0x2D00 * 100.0f); + } + // fall-through + } + case LIGHTNING_STRIKE_WAIT: { + b1 = true; + if (field_0x2CEE > 205) { + sLib::addCalcScaledDiff(&field_0x2D00, 1.0f, 1.0f, 0.1f); + if (field_0x2CEE >= 290) { + if (field_0x2CEE == 290) { + field_0x2D00 = 0.0f; + } + sLib::addCalcScaledDiff(&field_0x2CFC, 50.0f, 0.05f, field_0x2D00); + sLib::addCalcScaledDiff(&field_0x2D10.y, 290.0f, 0.1f, field_0x2D00 * 5.0f); + } else { + sLib::addCalcScaledDiff(&field_0x2CFC, 70.0f, 0.05f, field_0x2D00); + sLib::addCalcScaledDiff(&field_0x2D10.y, 420.0f, 0.1f, field_0x2D00 * 100.0f); + if (field_0x2CEE == 0xFA) { + dLightEnv_c::GetPInstance()->setField_0x38DC(7); + setAnm("CatchThunderEnd", 5.0f); + spawnEffect = true; + effPos.set(mSwordPosition.x, mSwordPosition.y + 110.0f, mSwordPosition.z); + mIsSwordEmpowered = true; + mSwordMdl.fn_8006B800(4); + mCc1.OnTg_0x8000000(); + startSound(SE_BLasBos_ThunderFallSword); + mSubState = SUB_STATE_21; + mTimers[TIMER_3] = cM::rndF(30.0f) + 200.0f; + dRumble_c::start(dRumble_c::sRumblePreset4, dRumble_c::FLAG_ACTIVE | dRumble_c::FLAG_SLOT0); + field_0x2CF0 = 15; + } + if (field_0x2CEE >= 200 && field_0x2CEE <= 250) { + b2 = true; + } + } + } else { + cLib::addCalcPos2(&field_0x2D10, mChestTranslation, 0.1f, 50.0f); + } + break; + } + case LIGHTNING_STRIKE_TRIGGER_END: { + { + // this works but I don't like it + static volatile u32 FLAGS_1 = 0x00000001; + static u32 FLAGS_2 = 0x00100001; + u32 f1 = FLAGS_1; + u32 f2 = FLAGS_2; + Event e = Event("BLS_end", 100, f2 & ~f1, nullptr, nullptr); + EventManager::alsoSetAsCurrentEvent(this, &e, nullptr); + } + if (EventManager::isInEvent(this, "BLS_end")) { + field_0x2CEE = 0; + field_0x2D00 = 0.0f; + field_0x2CFC = 50.0f; + mLightingStrikeState = LIGHTNING_STRIKE_ENDING; + link->onFlags_0x360(0x200); + if (mpSwordBattleGame != nullptr) { + mpSwordBattleGame->notifyBossDeath(false); + } + StoryflagManager::sInstance->setFlagOrCounterToValue(STORYFLAG_692, 0); + dStage_c::GetInstance()->getRoom(0)->someLastBossThing(false); + // fall-through + } else { + break; + } + } + case LIGHTNING_STRIKE_ENDING: { + b1 = true; + if (field_0x2CEE < 30) { + b2 = true; + } + mtx.YrotS(mRotation.y - 0x4000); + v.set(0.0f, 100.0f, 1500.0f); + MTXMultVec(mtx, v, v); + field_0x2D04 = mBackbone1Translation + v; + field_0x2D10.x = mBackbone1Translation.x; + field_0x2D10.y = 400.0f; + field_0x2D10.z = mBackbone1Translation.z; + sLib::addCalcScaledDiff(&field_0x2CFC, 60.0f, 0.035f, 0.1f); + if (field_0x2CEE == 160) { + field_0x114C = 1; + } + + if (field_0x2CEE >= 159) { + if (field_0x2CEE < 170) { + sLib::addCalcScaledDiff(&field_0x11C4, cM::rndF(0.3f) + 0.7f, 1.0f, 0.4f); + } else { + sLib::addCalcScaled(&field_0x11C4, 1.0f, 0.02f); + } + } else { + if (field_0x2CEE < 10) { + sLib::addCalcScaledDiff(&field_0x11C4, 0.7f, 1.0f, 0.35f); + } else { + sLib::addCalcScaled(&field_0x11C4, 1.0f, 0.035f); + } + } + + if (field_0x2CEE == 230) { + link->offFlags_0x360(0x200); + } + + if (field_0x2CEE == 270 && mpSwordBattleGame != nullptr) { + mLightingStrikeState = LIGHTNING_STRIKE_FINISH; + } else { + lightEnv.setField_0x5D48(field_0x11C4); + if (field_0x2CEE == 360) { + dScGame_c::GetInstance()->triggerExit(mRoomID, 1); + } + } + break; + } + case LIGHTNING_STRIKE_TRIGGER_START: { + { + // this works but I don't like it + static volatile u32 FLAGS_1 = 0x00000001; + static u32 FLAGS_2 = 0x00100001; + u32 f1 = FLAGS_1; + u32 f2 = FLAGS_2; + Event e = Event("BLS_start", 100, f2 & ~f1, nullptr, nullptr); + EventManager::alsoSetAsCurrentEvent(this, &e, nullptr); + } + if (EventManager::isInEvent(this, "BLS_start")) { + field_0x2CEE = 0; + field_0x2D00 = 0.0f; + field_0x2CFC = 60.0f; + mLightingStrikeState = LIGHTNING_STRIKE_START; + field_0x2D10.set(0.0f, 200.0f, -587.0f); + field_0x2D04.set(0.0f, 197.0f, -207.0f); + dAcPy_c::GetLinkM()->vt_0x2AC(); + dLytBossCaption_c::GetInstance()->show("BOSS_11_caption", 0); + // fall-through + } else { + break; + } + } + case LIGHTNING_STRIKE_START: { + b1 = true; + sLib::addCalcScaledDiff(&field_0x2D00, 1.0f, 1.0f, 0.05f); + cLib::addCalcPos2(&field_0x2D10, mVec3_c(-2.6f, 118.0f, 298.0f), 0.1f, field_0x2D00 * 80.0f); + cLib::addCalcPos2(&field_0x2D04, mVec3_c(-132.0f, 89.0f, 654.0f), 0.1f, field_0x2D00 * 80.0f); + + if (field_0x2CEE >= 20) { + sLib::addCalcScaledDiff(&field_0x2CFC, 40.0f, 0.05f, 0.1f); + } + + if (field_0x2CEE == 40) { + dAcPy_c::GetLinkM()->triggerMoveEventMaybe(4, 0, 0, nullptr, 0, 1, 0); + } + + if (field_0x2CEE == 110) { + dLytBossCaption_c::GetInstance()->unk_inline(); + } + + if (field_0x2CEE >= 140) { + EventManager::finishEvent(this, nullptr); + dScGame_c::getCamera()->fn_8019EA70(true); + mLightingStrikeState = LIGHTNING_STRIKE_STATE_NONE; + unsetActorProperty(AC_PROP_0x4); + } + break; + } + case LIGHTNING_STRIKE_FINISH: { + EventManager::finishEvent(this, nullptr); + dScGame_c::getCamera()->fn_8019EA70(true); + mLightingStrikeState = LIGHTNING_STRIKE_STATE_NONE; + break; + } + } + + if (spawnEffect) { + dJEffManager_c::spawnEffect( + PARTICLE_RESOURCE_ID_MAPPING_624_, effPos, nullptr, nullptr, nullptr, nullptr, 0, 0 + ); + mLightingFallSwordTimer = 10; + } + + if (b1) { + field_0x2CEE++; + mVec3_c tmp1 = field_0x2D10; + if (field_0x2CF0 != 0) { + field_0x2CF0--; + s16 val = field_0x2CF0; + f32 fac = val * 3.0f; + tmp1.y += mAng(val * 0x1C20).cos() * fac; + } + cam->fn_8019EA00(tmp1, field_0x2D04, field_0x2CFC, 0.0f); + if (b2) { + mtx1.transS(0.5f, 0.5f, 0.0f); + // REGSWAP + s32 scale = 95; + mtx1.scaleM(scale / 100.0f, scale / 100.0f, 0.0f); + mtx1.transM(-0.5f, -0.5f, 0.0f); + dStageMgr_c::GetInstance()->procfn_800192F0(0x96, mtx1, 0x32); + } + } + + if (field_0x114C != 0) { + mtx.YrotS(cam->fn_8019E3B0()); + v.set(0.0f, 10.0f, 10000.0f); + MTXMultVec(mtx, v, v); + v.x += cam->getPositionMaybe().x; + v.z += cam->getPositionMaybe().z; + mtx.transS(v); + v.set(0.7f, 0.7f, 0.7f); + mThunderMdl.setScale(v); + mThunderMdl.setLocalMtx(mtx); + mThunderAnmMatClr.play(); + } +} + +void dAcBlastboss_c::setLightningTimerMaybe(s32 arg) { + f32 f = arg + cM::rndF(arg * 0.5f); + + if (mStunCounter >= 2) { + f *= 0.5f; + } else if (mStunCounter == 1) { + f *= 0.75f; + } + + mLightningTimerMaybe = f; +} diff --git a/src/REL/d/a/d_a_kanban.cpp b/src/REL/d/a/d_a_kanban.cpp index 8364d6c3..c0adcc0d 100644 --- a/src/REL/d/a/d_a_kanban.cpp +++ b/src/REL/d/a/d_a_kanban.cpp @@ -6,7 +6,7 @@ STATE_DEFINE(dAcKanban_c, Wait); STATE_DEFINE(dAcKanban_c, Message); STATE_DEFINE(dAcKanban_c, PullOut); -dAcKanban_c::dAcKanban_c() : mStateMgr(*this, sStateID::null) {} +dAcKanban_c::dAcKanban_c() : mStateMgr(*this) {} dAcKanban_c::~dAcKanban_c() {} void dAcKanban_c::initializeState_Wait() {} diff --git a/src/REL/d/a/e/d_a_e_sm.cpp b/src/REL/d/a/e/d_a_e_sm.cpp index 7616f56e..01fb52ae 100644 --- a/src/REL/d/a/e/d_a_e_sm.cpp +++ b/src/REL/d/a/e/d_a_e_sm.cpp @@ -265,7 +265,7 @@ int dAcEsm_c::actorCreate() { mAnmTexPat.setFrame(anim_frame, 0); - setInteractionFlags(0x40); + setInteractionFlags(INTERACT_0x40); fn_187_44C0(); @@ -369,7 +369,7 @@ int dAcEsm_c::actorExecute() { if (timeCheck != 0) { if (field_0xBBF == 3) { - if (checkInteractionFlags(4)) { + if (checkInteractionFlags(INTERACT_0x4)) { fn_800306d0(); } return SUCCEEDED; @@ -400,7 +400,7 @@ int dAcEsm_c::actorExecute() { } if (field_0xBBF == 3 && mTimeArea.isNearZero()) { - if (checkInteractionFlags(4)) { + if (checkInteractionFlags(INTERACT_0x4)) { fn_800306d0(); } return SUCCEEDED; @@ -1430,7 +1430,7 @@ void dAcEsm_c::fn_187_6C20(bool param0) { mSph.SetAtFlagsUpper(0); sTimer = 0; - setInteractionFlags(4); + setInteractionFlags(INTERACT_0x4); fn_187_44C0(); field_0xBAC = 60; diff --git a/src/REL/d/a/obj/d_a_obj_bamboo.cpp b/src/REL/d/a/obj/d_a_obj_bamboo.cpp index 59b8402f..5f6ea989 100644 --- a/src/REL/d/a/obj/d_a_obj_bamboo.cpp +++ b/src/REL/d/a/obj/d_a_obj_bamboo.cpp @@ -6,7 +6,7 @@ STATE_DEFINE(dAcObamboo_c, Wait); STATE_DEFINE(dAcObamboo_c, Fall); STATE_DEFINE(dAcObamboo_c, CutMark); -dAcObamboo_c::dAcObamboo_c() : mStateMgr(*this, sStateID::null) {} +dAcObamboo_c::dAcObamboo_c() : mStateMgr(*this) {} dAcObamboo_c::~dAcObamboo_c() {} void dAcObamboo_c::initializeState_Wait() {} diff --git a/src/REL/d/a/obj/d_a_obj_cannon_cover.cpp b/src/REL/d/a/obj/d_a_obj_cannon_cover.cpp index f29207ff..319b871c 100644 --- a/src/REL/d/a/obj/d_a_obj_cannon_cover.cpp +++ b/src/REL/d/a/obj/d_a_obj_cannon_cover.cpp @@ -8,7 +8,7 @@ STATE_DEFINE(dAcOcannonCover_c, Shake); STATE_DEFINE(dAcOcannonCover_c, Close); STATE_DEFINE(dAcOcannonCover_c, Play); -dAcOcannonCover_c::dAcOcannonCover_c() : mStateMgr(*this, sStateID::null) {} +dAcOcannonCover_c::dAcOcannonCover_c() : mStateMgr(*this) {} dAcOcannonCover_c::~dAcOcannonCover_c() {} void dAcOcannonCover_c::initializeState_Wait() {} diff --git a/src/REL/d/a/obj/d_a_obj_clef.cpp b/src/REL/d/a/obj/d_a_obj_clef.cpp index b2cfb03f..68cb60af 100644 --- a/src/REL/d/a/obj/d_a_obj_clef.cpp +++ b/src/REL/d/a/obj/d_a_obj_clef.cpp @@ -10,7 +10,7 @@ STATE_DEFINE(dAcOClef_c, PathMove); STATE_DEFINE(dAcOClef_c, Gravitate); STATE_DEFINE(dAcOClef_c, Die); -dAcOClef_c::dAcOClef_c() : mStateMgr(*this, sStateID::null) {} +dAcOClef_c::dAcOClef_c() : mStateMgr(*this) {} dAcOClef_c::~dAcOClef_c() {} void dAcOClef_c::initializeState_WaitPhantom() {} diff --git a/src/REL/d/a/obj/d_a_obj_fence.cpp b/src/REL/d/a/obj/d_a_obj_fence.cpp index b9079439..8bd7087d 100644 --- a/src/REL/d/a/obj/d_a_obj_fence.cpp +++ b/src/REL/d/a/obj/d_a_obj_fence.cpp @@ -12,7 +12,7 @@ STATE_DEFINE(dAcOFence_c, WaitClose); STATE_DEFINE(dAcOFence_c, Close); STATE_DEFINE(dAcOFence_c, RequestConfineEvent); -dAcOFence_c::dAcOFence_c() : mStateMgr(*this, sStateID::null) {} +dAcOFence_c::dAcOFence_c() : mStateMgr(*this) {} dAcOFence_c::~dAcOFence_c() {} void dAcOFence_c::initializeState_WaitOpen() {} diff --git a/src/REL/d/a/obj/d_a_obj_fortune_ring.cpp b/src/REL/d/a/obj/d_a_obj_fortune_ring.cpp index 86f45b11..cd5e937e 100644 --- a/src/REL/d/a/obj/d_a_obj_fortune_ring.cpp +++ b/src/REL/d/a/obj/d_a_obj_fortune_ring.cpp @@ -5,7 +5,7 @@ SPECIAL_ACTOR_PROFILE(OBJ_FORTUNE_RING, dAcOfortuneRing_c, fProfile::OBJ_FORTUNE STATE_DEFINE(dAcOfortuneRing_c, Wait); STATE_DEFINE(dAcOfortuneRing_c, Play); -dAcOfortuneRing_c::dAcOfortuneRing_c() : mStateMgr(*this, sStateID::null) {} +dAcOfortuneRing_c::dAcOfortuneRing_c() : mStateMgr(*this) {} dAcOfortuneRing_c::~dAcOfortuneRing_c() {} void dAcOfortuneRing_c::initializeState_Wait() {} diff --git a/src/REL/d/a/obj/d_a_obj_ground_cover.cpp b/src/REL/d/a/obj/d_a_obj_ground_cover.cpp index d60ef0df..16a810af 100644 --- a/src/REL/d/a/obj/d_a_obj_ground_cover.cpp +++ b/src/REL/d/a/obj/d_a_obj_ground_cover.cpp @@ -10,7 +10,7 @@ STATE_DEFINE(dAcOgroundCover_c, AppearClose); STATE_DEFINE(dAcOgroundCover_c, Fight); STATE_DEFINE(dAcOgroundCover_c, Sealed); -dAcOgroundCover_c::dAcOgroundCover_c() : mStateMgr(*this, sStateID::null) {} +dAcOgroundCover_c::dAcOgroundCover_c() : mStateMgr(*this) {} dAcOgroundCover_c::~dAcOgroundCover_c() {} void dAcOgroundCover_c::initializeState_Wait() {} diff --git a/src/REL/d/a/obj/d_a_obj_item_heart_container.cpp b/src/REL/d/a/obj/d_a_obj_item_heart_container.cpp index ba6e9803..9c915bd7 100644 --- a/src/REL/d/a/obj/d_a_obj_item_heart_container.cpp +++ b/src/REL/d/a/obj/d_a_obj_item_heart_container.cpp @@ -13,7 +13,7 @@ STATE_DEFINE(dAcOItemHeartContainer_c, Fall); STATE_DEFINE(dAcOItemHeartContainer_c, WaitGet); STATE_DEFINE(dAcOItemHeartContainer_c, WaitGetQuake); -dAcOItemHeartContainer_c::dAcOItemHeartContainer_c() : mStateMgr(*this, sStateID::null) {} +dAcOItemHeartContainer_c::dAcOItemHeartContainer_c() : mStateMgr(*this) {} dAcOItemHeartContainer_c::~dAcOItemHeartContainer_c() {} void dAcOItemHeartContainer_c::initializeState_Hide() {} diff --git a/src/REL/d/a/obj/d_a_obj_roulette_island_c.cpp b/src/REL/d/a/obj/d_a_obj_roulette_island_c.cpp index ec2412c0..9986a221 100644 --- a/src/REL/d/a/obj/d_a_obj_roulette_island_c.cpp +++ b/src/REL/d/a/obj/d_a_obj_roulette_island_c.cpp @@ -5,7 +5,7 @@ SPECIAL_ACTOR_PROFILE(OBJ_ROULETTE_ISLAND_C, dAcOrouletteIslandC_c, fProfile::OB STATE_DEFINE(dAcOrouletteIslandC_c, Wait); STATE_DEFINE(dAcOrouletteIslandC_c, Play); -dAcOrouletteIslandC_c::dAcOrouletteIslandC_c() : mStateMgr(*this, sStateID::null) {} +dAcOrouletteIslandC_c::dAcOrouletteIslandC_c() : mStateMgr(*this) {} dAcOrouletteIslandC_c::~dAcOrouletteIslandC_c() {} void dAcOrouletteIslandC_c::initializeState_Wait() {} diff --git a/src/REL/d/a/obj/d_a_obj_roulette_island_r.cpp b/src/REL/d/a/obj/d_a_obj_roulette_island_r.cpp index c95691ab..a1842877 100644 --- a/src/REL/d/a/obj/d_a_obj_roulette_island_r.cpp +++ b/src/REL/d/a/obj/d_a_obj_roulette_island_r.cpp @@ -7,7 +7,7 @@ STATE_DEFINE(dAcOrouletteIslandR_c, Move); STATE_DEFINE(dAcOrouletteIslandR_c, Reduce); STATE_DEFINE(dAcOrouletteIslandR_c, End); -dAcOrouletteIslandR_c::dAcOrouletteIslandR_c() : mStateMgr(*this, sStateID::null) {} +dAcOrouletteIslandR_c::dAcOrouletteIslandR_c() : mStateMgr(*this) {} dAcOrouletteIslandR_c::~dAcOrouletteIslandR_c() {} void dAcOrouletteIslandR_c::initializeState_Wait() {} diff --git a/src/REL/d/a/obj/d_a_obj_save.cpp b/src/REL/d/a/obj/d_a_obj_save.cpp index 2b0787cd..47812709 100644 --- a/src/REL/d/a/obj/d_a_obj_save.cpp +++ b/src/REL/d/a/obj/d_a_obj_save.cpp @@ -9,7 +9,7 @@ STATE_DEFINE(dAcOSave_c, Query); STATE_DEFINE(dAcOSave_c, LightShaft); STATE_DEFINE(dAcOSave_c, Escape); -dAcOSave_c::dAcOSave_c() : mStateMgr(*this, sStateID::null) {} +dAcOSave_c::dAcOSave_c() : mStateMgr(*this) {} dAcOSave_c::~dAcOSave_c() {} void dAcOSave_c::initializeState_Moss() {} diff --git a/src/REL/d/a/obj/d_a_obj_swrd_prj.cpp b/src/REL/d/a/obj/d_a_obj_swrd_prj.cpp index 0ddb4bf7..69bf9005 100644 --- a/src/REL/d/a/obj/d_a_obj_swrd_prj.cpp +++ b/src/REL/d/a/obj/d_a_obj_swrd_prj.cpp @@ -13,7 +13,7 @@ STATE_DEFINE(dAcOSwrdPrj, SWWaitCross); STATE_DEFINE(dAcOSwrdPrj, SWChkTri); STATE_DEFINE(dAcOSwrdPrj, SWEnd); -dAcOSwrdPrj::dAcOSwrdPrj() : mStateMgr(*this, sStateID::null) {} +dAcOSwrdPrj::dAcOSwrdPrj() : mStateMgr(*this) {} dAcOSwrdPrj::~dAcOSwrdPrj() {} void dAcOSwrdPrj::initializeState_WaitHarp() {} diff --git a/src/REL/d/a/obj/d_a_obj_truck_rail_col.cpp b/src/REL/d/a/obj/d_a_obj_truck_rail_col.cpp index c9415cf7..95abdc9f 100644 --- a/src/REL/d/a/obj/d_a_obj_truck_rail_col.cpp +++ b/src/REL/d/a/obj/d_a_obj_truck_rail_col.cpp @@ -4,7 +4,7 @@ SPECIAL_ACTOR_PROFILE(OBJ_TRUCK_RAIL_COL, dAcOTruckRailCol_c, fProfile::OBJ_TRUC STATE_DEFINE(dAcOTruckRailCol_c, Wait); -dAcOTruckRailCol_c::dAcOTruckRailCol_c() : mStateMgr(*this, sStateID::null) {} +dAcOTruckRailCol_c::dAcOTruckRailCol_c() : mStateMgr(*this) {} dAcOTruckRailCol_c::~dAcOTruckRailCol_c() {} void dAcOTruckRailCol_c::initializeState_Wait() {} diff --git a/src/REL/d/a/obj/d_a_obj_warp_hole.cpp b/src/REL/d/a/obj/d_a_obj_warp_hole.cpp index 73228b42..d0ee7416 100644 --- a/src/REL/d/a/obj/d_a_obj_warp_hole.cpp +++ b/src/REL/d/a/obj/d_a_obj_warp_hole.cpp @@ -86,7 +86,7 @@ int dAcOwarpHole_c::actorExecuteInEvent() { if (EventManager::isCurrentEvent("BeforeLastBossBattleChicken")) { dAcPy_c* player = dAcPy_c::GetLinkM(); player->vt_0x2AC(); - player->triggerMoveEventMaybe(2, 0, 0, mLinkPos, 0, 0, 0); + player->triggerMoveEventMaybe(2, 0, 0, &mLinkPos, 0, 0, 0); } } if (dAcPy_c::GetLinkM()->mPosition.absXZTo(mLinkPos) < 10.0f) { diff --git a/src/REL/d/d_lyt_seeker_stone.cpp b/src/REL/d/d_lyt_seeker_stone.cpp index 4fac6bce..f9c06758 100644 --- a/src/REL/d/d_lyt_seeker_stone.cpp +++ b/src/REL/d/d_lyt_seeker_stone.cpp @@ -15,7 +15,7 @@ STATE_DEFINE(dLytSeekerStone_c, MovieFadeOut); STATE_DEFINE(dLytSeekerStone_c, MovieFadeIn); STATE_DEFINE(dLytSeekerStone_c, Out); -dLytSeekerStone_c::dLytSeekerStone_c() : mStateMgr(*this, sStateID::null) {} +dLytSeekerStone_c::dLytSeekerStone_c() : mStateMgr(*this) {} dLytSeekerStone_c::~dLytSeekerStone_c() {} void dLytSeekerStone_c::initializeState_None() {} diff --git a/src/REL/d/d_s_boot.cpp b/src/REL/d/d_s_boot.cpp index e4189c29..af3ac489 100644 --- a/src/REL/d/d_s_boot.cpp +++ b/src/REL/d/d_s_boot.cpp @@ -415,7 +415,7 @@ void dScBoot_c::strap_c::init() { field_0x4F0 = 0; } -dScBoot_c::dScBoot_c() : mStateMgr(*this, sStateID::null), mPhases(this, sCallbacks), mpDvdCallback(nullptr) { +dScBoot_c::dScBoot_c() : mStateMgr(*this), mPhases(this, sCallbacks), mpDvdCallback(nullptr) { mObjectDataLoaded = false; sInstance = this; mStrapScreenVisible = false; diff --git a/src/REL/d/d_title_manager.cpp b/src/REL/d/d_title_manager.cpp index e811ac4b..5dce0b26 100644 --- a/src/REL/d/d_title_manager.cpp +++ b/src/REL/d/d_title_manager.cpp @@ -9,7 +9,7 @@ STATE_DEFINE(dTitleMgr_c, Title); STATE_DEFINE(dTitleMgr_c, FileSelect); STATE_DEFINE(dTitleMgr_c, Input); -dTitleMgr_c::dTitleMgr_c() : mStateMgr(*this, sStateID::null) {} +dTitleMgr_c::dTitleMgr_c() : mStateMgr(*this) {} dTitleMgr_c::~dTitleMgr_c() {} void dTitleMgr_c::initializeState_Init() {} diff --git a/src/d/a/d_a_item.cpp b/src/d/a/d_a_item.cpp index af82b85d..1d4bcee5 100644 --- a/src/d/a/d_a_item.cpp +++ b/src/d/a/d_a_item.cpp @@ -320,7 +320,7 @@ STATE_DEFINE(dAcItem_c, WaitTurnOff); STATE_DEFINE(dAcItem_c, WaitSacredDewGetEffect); dAcItem_c::dAcItem_c() - : mStateMgr(*this, sStateID::null), + : mStateMgr(*this), mEff_0x8F4(this), mEff_0x928(this), mEff_0x95C(this), diff --git a/src/d/a/npc/d_a_npc.cpp b/src/d/a/npc/d_a_npc.cpp index bab54cd3..efba2f9f 100644 --- a/src/d/a/npc/d_a_npc.cpp +++ b/src/d/a/npc/d_a_npc.cpp @@ -144,7 +144,7 @@ SizedString<128> sNpcStr2; SizedString<128> sNpcStr3; SizedString<128> sNpcStr4; -dAcNpc_c::dAcNpc_c() : mFlow(this), mStateMgr(*this, sStateID::null), mActorListEntry(this) {} +dAcNpc_c::dAcNpc_c() : mFlow(this), mStateMgr(*this), mActorListEntry(this) {} dAcNpc_c::~dAcNpc_c() { // TODO diff --git a/src/d/a/obj/d_a_obj_tbox.cpp b/src/d/a/obj/d_a_obj_tbox.cpp index 70c55a61..07264a7d 100644 --- a/src/d/a/obj/d_a_obj_tbox.cpp +++ b/src/d/a/obj/d_a_obj_tbox.cpp @@ -813,7 +813,7 @@ bool dAcTbox_c::isBelowGroundAtPos(f32 height, const mVec3_c &pos) { } dAcTbox_c::dAcTbox_c() - : mStateMgr(*this, sStateID::null), + : mStateMgr(*this), mScnCallback(this), mEvent(*this, nullptr), mTboxListNode(this), diff --git a/src/d/col/c/c_m3d_g_cps.cpp b/src/d/col/c/c_m3d_g_cps.cpp index 4457e2fb..6fbcfc3d 100644 --- a/src/d/col/c/c_m3d_g_cps.cpp +++ b/src/d/col/c/c_m3d_g_cps.cpp @@ -16,7 +16,7 @@ void cM3dGCps::SetR(f32 r) { r = 0.0f; } mRadius = r; - field_0x1C = (double)r; // huh + field_0x1C = mRadius; } void cM3dGCps::Set_0x1C(f32 f) { diff --git a/src/d/d_stage_mgr.cpp b/src/d/d_stage_mgr.cpp index d2f2ce01..2760a45e 100644 --- a/src/d/d_stage_mgr.cpp +++ b/src/d/d_stage_mgr.cpp @@ -33,7 +33,7 @@ STATE_DEFINE(dStageMgr_c, SceneChangeSave); STATE_DEFINE(dStageMgr_c, RestartSceneWait); STATE_DEFINE(dStageMgr_c, RestartScene); -dStageMgr_c::dStageMgr_c() : mStateMgr(*this, sStateID::null), mPhase(this, sCallbacks) { +dStageMgr_c::dStageMgr_c() : mStateMgr(*this), mPhase(this, sCallbacks) { sInstance = this; } diff --git a/src/d/lyt/d_lyt_common_arrow.cpp b/src/d/lyt/d_lyt_common_arrow.cpp index b65815a2..884d1c5c 100644 --- a/src/d/lyt/d_lyt_common_arrow.cpp +++ b/src/d/lyt/d_lyt_common_arrow.cpp @@ -40,7 +40,7 @@ static const d2d::LytBrlanMapping brlanMap[] = { #define NUM_ANIMS 9 -dLytCommonArrow_c::dLytCommonArrow_c() : mStateMgr(*this, sStateID::null) {} +dLytCommonArrow_c::dLytCommonArrow_c() : mStateMgr(*this) {} bool dLytCommonArrow_c::build() { void *data = LayoutArcManager::GetInstance()->getLoadedData("CommonArrow"); diff --git a/src/d/lyt/d_lyt_pause_disp_01.cpp b/src/d/lyt/d_lyt_pause_disp_01.cpp index f63b7250..02f40d9a 100644 --- a/src/d/lyt/d_lyt_pause_disp_01.cpp +++ b/src/d/lyt/d_lyt_pause_disp_01.cpp @@ -96,7 +96,7 @@ static const char *sPaneNames[] = { #define PAUSE_DISP_01_NUM_COMBINED_PANES (PAUSE_DISP_01_NUM_MY_PANES + PAUSE_DISP_01_NUM_SUBPANES) #define PAUSE_DISP_01_OFFSET_MY_PANES PAUSE_DISP_01_NUM_SUBPANES -dLytPauseDisp01_c::dLytPauseDisp01_c() : mStateMgr(*this, sStateID::null) {} +dLytPauseDisp01_c::dLytPauseDisp01_c() : mStateMgr(*this) {} bool dLytPauseDisp01_c::build() { dLytPauseMgr_c *pauseMgr = dLytPauseMgr_c::GetInstance(); diff --git a/src/d/lyt/d_lyt_save_msg_window.cpp b/src/d/lyt/d_lyt_save_msg_window.cpp index 7d493b82..61c8d4fc 100644 --- a/src/d/lyt/d_lyt_save_msg_window.cpp +++ b/src/d/lyt/d_lyt_save_msg_window.cpp @@ -13,7 +13,7 @@ STATE_DEFINE(dLytSaveMsgWindow_c, In); STATE_DEFINE(dLytSaveMsgWindow_c, Wait); STATE_DEFINE(dLytSaveMsgWindow_c, Out); -dLytSaveMsgWindow_c::dLytSaveMsgWindow_c() : mStateMgr(*this, sStateID::null) { +dLytSaveMsgWindow_c::dLytSaveMsgWindow_c() : mStateMgr(*this) { resetProperties(); } diff --git a/src/d/lyt/d_lyt_sky_gauge.cpp b/src/d/lyt/d_lyt_sky_gauge.cpp index f2eb60ef..9185fe7f 100644 --- a/src/d/lyt/d_lyt_sky_gauge.cpp +++ b/src/d/lyt/d_lyt_sky_gauge.cpp @@ -59,7 +59,7 @@ void dLytSkyGaugeMain_c::executeState_ModeOut() { } void dLytSkyGaugeMain_c::finalizeState_ModeOut() {} -dLytSkyGaugeMain_c::dLytSkyGaugeMain_c() : mStateMgr(*this, sStateID::null) {} +dLytSkyGaugeMain_c::dLytSkyGaugeMain_c() : mStateMgr(*this) {} bool dLytSkyGaugeMain_c::build(d2d::ResAccIf_c *resAcc) { mLyt.setResAcc(resAcc); diff --git a/src/d/lyt/d_lyt_wipe.cpp b/src/d/lyt/d_lyt_wipe.cpp index 5571e1a8..767c6892 100644 --- a/src/d/lyt/d_lyt_wipe.cpp +++ b/src/d/lyt/d_lyt_wipe.cpp @@ -49,7 +49,7 @@ void dLytWipeMain_c::executeState_ModeOut() { } void dLytWipeMain_c::finalizeState_ModeOut() {} -dLytWipeMain_c::dLytWipeMain_c() : mStateMgr(*this, sStateID::null) {} +dLytWipeMain_c::dLytWipeMain_c() : mStateMgr(*this) {} static const d2d::LytBrlanMapping brlanMap[] = { {"wipe_00_inOut.brlan", "G_inOut_00"}, diff --git a/src/d/lyt/meter/d_lyt_meter_item_select.cpp b/src/d/lyt/meter/d_lyt_meter_item_select.cpp index 7ee9987d..02bd0ca1 100644 --- a/src/d/lyt/meter/d_lyt_meter_item_select.cpp +++ b/src/d/lyt/meter/d_lyt_meter_item_select.cpp @@ -489,7 +489,7 @@ static const char *sWindowNames[] = { static const char *sGroupName = "G_ref_00"; -dLytMeterItemSelect_c::dLytMeterItemSelect_c() : mStateMgr(*this, sStateID::null) { +dLytMeterItemSelect_c::dLytMeterItemSelect_c() : mStateMgr(*this) { field_0x574C = I_INVALID; field_0x5750 = I_INVALID; field_0x5754 = 0; diff --git a/src/d/snd/d_snd_source.cpp b/src/d/snd/d_snd_source.cpp index f71dfb3a..00ddbbee 100644 --- a/src/d/snd/d_snd_source.cpp +++ b/src/d/snd/d_snd_source.cpp @@ -472,8 +472,7 @@ bool dSoundSource_c::startBgHitSound( return startBgHitSound(soundLabelToSoundId(label), polyAttr0, polyAttr1, position); } -// exact copy of startSoundAtPosition - used only for when the hookshot -// hits the water level +// exact copy of startSoundAtPosition bool dSoundSource_c::startSoundAtPosition2(u32 soundId, const nw4r::math::VEC3 *position) { if (!d_s_vt_0x1AC(soundId)) { return false; diff --git a/src/toBeSorted/d_enemy_sword_mdl.cpp b/src/toBeSorted/d_enemy_sword_mdl.cpp new file mode 100644 index 00000000..0c030dcd --- /dev/null +++ b/src/toBeSorted/d_enemy_sword_mdl.cpp @@ -0,0 +1,131 @@ +#include "toBeSorted/d_enemy_sword_mdl.h" + +#include "common.h" +#include "d/col/cc/d_cc_s.h" +#include "d/d_sc_game.h" +#include "m/m3d/m_shadow.h" +#include "m/m_vec.h" +#include "nw4r/g3d/res/g3d_resfile.h" +#include "nw4r/g3d/res/g3d_resmdl.h" + +dCcD_SrcCps sCcSrc = { + { + {AT_TYPE_DAMAGE, 0x8D, {1, 0, 0}, 1, 0, 0, 0, 0, 0}, + {0, 0, {0, 0, 0x407}, 0, 0}, + {0}, + }, + {30.0f}, +}; + +// Yeah these two functions do the same thing. Could've made one call the other... + +bool dEnemySwordMdl_c::create( + mAllocator_c *alloc, void *pData, const char *mdlName, u32 bufferOption, const mVec3_c &v1, const mVec3_c &v2, + cCcD_Stts &stts, EGG::ResTIMG *pImg, int nView, u32 *pSize +) { + nw4r::g3d::ResMdl mdl = nw4r::g3d::ResFile(pData).GetResMdl(mdlName); + if (!mMdl.create(mdl, alloc, bufferOption, nView, pSize)) { + return false; + } + + if (!mProc.create(100, alloc, pImg, 0.015f)) { + mMdl.remove(); + return false; + } + + field_0x074.set(v1.x, v1.y, v1.z); + field_0x080.set(v2.x, v2.y, v2.z); + + for (int i = 0; i < 3; i++) { + mCcList.addCc(mCcs[i], sCcSrc); + } + mCcList.SetStts(stts); + mCcList.ClrAt(); + return true; +} + +bool dEnemySwordMdl_c::create( + mAllocator_c *alloc, nw4r::g3d::ResFile resFile, const char *mdlName, u32 bufferOption, const mVec3_c &v1, + const mVec3_c &v2, cCcD_Stts &stts, EGG::ResTIMG *pImg, int nView, u32 *pSize +) { + nw4r::g3d::ResMdl mdl = resFile.GetResMdl(mdlName); + if (!mMdl.create(mdl, alloc, bufferOption, nView, pSize)) { + return false; + } + + if (!mProc.create(100, alloc, pImg, 0.015f)) { + mMdl.remove(); + return false; + } + + field_0x074.set(v1.x, v1.y, v1.z); + field_0x080.set(v2.x, v2.y, v2.z); + + for (int i = 0; i < 3; i++) { + mCcList.addCc(mCcs[i], sCcSrc); + } + mCcList.SetStts(stts); + mCcList.ClrAt(); + return true; +} + +void dEnemySwordMdl_c::enableAttack() { + mCcs[0].OnAtSet(); + mIsActive = true; + mFirstFramePassed = false; +} + +// TODO - ... + +void dEnemySwordMdl_c::calc(const mMtx_c &mtx, const mVec3_c &v1, bool mass) { + mMdl.setLocalMtx(mtx); + mMdl.calc(false); + MTXMultVec(mtx, field_0x074, field_0x08C); + MTXMultVec(mtx, field_0x080, field_0x098); + + if (mIsActive) { + mVec3_c v = field_0x098 - field_0x08C; + v.normalize(); + + mVec3_c hi = field_0x098 + v * field_0x0A8; + + mCcs[1].Set(mCcs[0].mEnd, hi); + mCcs[2].Set(mCcs[0].mStart, hi); + mCcs[0].Set(field_0x08C - v * field_0x0A4, hi); + + mCcs[0].SetAtVec(v1); + mCcs[1].SetAtVec(v1); + mCcs[2].SetAtVec(v1); + + if (mFirstFramePassed && !mCcs[1].ChkAtSet()) { + mCcs[1].OnAtSet(); + mCcs[2].OnAtSet(); + } else { + mFirstFramePassed = true; + } + + mCcList.registerColliders(); + if (mass) { + dCcS::GetInstance()->GetMassMng().SetObj(&mCcs[0], 2); + } + } else { + mFirstFramePassed = false; + if (mCcs[0].ChkAtSet()) { + mCcList.ClrAt(); + } + } + mProc.calc(field_0x098, field_0x08C); +} + +bool dEnemySwordMdl_c::entry(dAcObjBase_c *obj, dShadowCircle_c *shadow, mQuat_c *quat) { + if (dScGame_c::currentSpawnInfo.getTrial() == SpawnInfo::TRIAL) { + obj->fn_8002ECD0(&mMdl, 7); + } else { + obj->drawModelType1(&mMdl); + } + mProc.entry(); + if (shadow != nullptr && quat != nullptr) { + m3d::mShadow_c::GetInstance()->addMdlToCircle(shadow, mMdl, *quat); + } + return true; +} diff --git a/src/toBeSorted/d_sword_swing_effect.cpp b/src/toBeSorted/d_sword_swing_effect.cpp new file mode 100644 index 00000000..20d8b97f --- /dev/null +++ b/src/toBeSorted/d_sword_swing_effect.cpp @@ -0,0 +1,218 @@ +#include "toBeSorted/d_sword_swing_effect.h" + +#include "d/d_stage_mgr.h" +#include "egg/gfx/eggDrawGX.h" +#include "m/m3d/m3d.h" +#include "m/m3d/m_proc.h" +#include "m/m3d/m_scnleaf.h" +#include "nw4r/g3d/g3d_scnobj.h" +#include "nw4r/math/math_types.h" + +void dSwordSwingEffectProcBase_c::remove() { + if (mpEntries != nullptr) { + delete[] mpEntries; + mpEntries = nullptr; + } + m3d::scnLeaf_c::remove(); +} + +void dSwordSwingEffectProcBase_c::drawXlu() { + m3d::resetMaterial(); + GXSetNumChans(1); + GXSetChanCtrl(GX_COLOR0A0, GX_FALSE, GX_SRC_REG, GX_SRC_VTX, GX_LIGHT_NULL, GX_DF_NONE, GX_AF_NONE); + GXSetNumTexGens(0); + GXSetNumTevStages(1); + GXSetNumIndStages(0); + GXSetTevSwapMode(GX_TEVSTAGE0, GX_TEV_SWAP0, GX_TEV_SWAP0); + GXSetTevOrder(GX_TEVSTAGE0, GX_TEXCOORD_NULL, GX_TEXMAP_NULL, GX_COLOR0A0); + GXSetTevColorIn(GX_TEVSTAGE0, GX_CC_ZERO, GX_CC_ZERO, GX_CC_ZERO, GX_CC_RASC); + GXSetTevColorOp(GX_TEVSTAGE0, GX_TEV_ADD, GX_TB_ZERO, GX_CS_SCALE_1, 1, GX_TEVPREV); + GXSetTevAlphaIn(GX_TEVSTAGE0, GX_CA_ZERO, GX_CA_ZERO, GX_CA_ZERO, GX_CA_RASA); + GXSetTevAlphaOp(GX_TEVSTAGE0, GX_TEV_ADD, GX_TB_ZERO, GX_CS_SCALE_1, GX_TRUE, GX_TEVPREV); + GXSetZCompLoc(1); + GXSetBlendMode(GX_BM_BLEND, GX_BL_SRCALPHA, GX_BL_INVSRCALPHA, GX_LO_OR); + GXSetZMode(GX_TRUE, GX_LEQUAL, GX_FALSE); + GXSetAlphaCompare(GX_GREATER, 0, GX_AOP_OR, GX_GREATER, 0); + GXSetFog(GX_FOG_NONE, mColor(0), 0.0, 0.0, 0.0, 0.0); + GXSetFogRangeAdj(0, 0, 0); + GXSetCullMode(GX_CULL_NONE); + nw4r::math::MTX34 mtx; + nw4r::g3d::Camera cam = m3d::getCurrentCamera(); + cam.GetCameraMtx(&mtx); + GXLoadPosMtxImm(mtx, 0); + GXSetCurrentMtx(0); + GXClearVtxDesc(); + GXSetVtxDesc(GX_VA_POS, GX_DIRECT); + GXSetVtxDesc(GX_VA_CLR0, GX_DIRECT); + GXSetVtxAttrFmt(GX_VTXFMT0, GX_VA_POS, GX_POS_XYZ, GX_F32, 0); + GXSetVtxAttrFmt(GX_VTXFMT0, GX_VA_CLR0, GX_CLR_RGBA, GX_RGBA8, 0); + GXBegin(GX_TRIANGLESTRIP, GX_VTXFMT0, mCount * 2); + + swing_entry *entry = &mpEntries[mHead]; + for (u16 i = 0; i < mCount; i++) { + if (entry == &mpEntries[0]) { + entry = &mpEntries[mNum]; + } + entry--; + + GXPosition3f32(entry->mv1.x, entry->mv1.y, entry->mv1.z); + GXColor4u8(entry->mc1.r, entry->mc1.g, entry->mc1.b, entry->mc1.a * entry->mLifetime); + GXPosition3f32(entry->mv2.x, entry->mv2.y, entry->mv2.z); + GXColor4u8(entry->mc2.r, entry->mc2.g, entry->mc2.b, entry->mc2.a * entry->mLifetime); + } + + GXEnd(); +} + +bool dSwordSwingEffectProcBase_c::hasSwings() const { + return mCount != 0; +} + +int dSwordSwingEffectProcBase_c::entry() { + if (hasSwings()) { + return m3d::pushBack(mpScnLeaf); + } + return 0; +} + +bool dSwordSwingEffectProcBase_c::create(s32 num, mAllocator_c *alloc) { + if (!m3d::proc_c::create(alloc, nullptr)) { + return false; + } + + mpEntries = new (alloc->getHeap()) swing_entry[num](); + if (mpEntries == nullptr) { + remove(); + return false; + } + + mNum = num; + setOption(nw4r::g3d::ScnObj::OPTION_DISABLE_DRAW_OPA, true); + return true; +} + +void dSwordSwingEffectProcBase_c::addSwing( + const mVec3_c &pos1, mColor c1, const mVec3_c &pos2, mColor c2 +) { + mpEntries[mHead].set(pos1, c1, pos2, c2); + mHead++; + if (mHead >= mNum) { + mHead = 0; + } + if (mCount < mNum) { + mCount++; + } +} + +void dSwordSwingEffectProcBase_c::calc(f32 f) { + s32 count = mCount; + if (count == 0) { + return; + } + + swing_entry *entry = &mpEntries[mHead]; + for (u16 i = 0; i < mCount; i++) { + if (entry == &mpEntries[0]) { + entry = &mpEntries[mNum]; + } + entry--; + entry->mLifetime -= f; + if (entry->mLifetime <= 0.0f) { + entry->mLifetime = 0.0f; + count--; + } + } + if (mCount != 0 && count == 0) { + mHead = 0; + } + mCount = count; +} + +void dSwordSwingEffectProc_c::drawXlu() { + if (mpImg == nullptr) { + dSwordSwingEffectProcBase_c::drawXlu(); + } else { + EGG::DrawGX::LoadTexture(mpImg, GX_TEXMAP0); + GXSetNumChans(1); + GXSetChanCtrl(GX_COLOR0A0, false, GX_SRC_REG, GX_SRC_VTX, GX_LIGHT_NULL, GX_DF_NONE, GX_AF_NONE); + GXSetNumTexGens(1); + GXSetTexCoordGen2(GX_TEXCOORD0, GX_TG_MTX2x4, GX_TG_TEX0, 0x3c, 0, 0x7d); + GXSetNumTevStages(1); + GXSetNumIndStages(0); + GXSetTevSwapMode(GX_TEVSTAGE0, GX_TEV_SWAP0, GX_TEV_SWAP0); + GXSetTevOrder(GX_TEVSTAGE0, GX_TEXCOORD0, GX_TEXMAP0, GX_COLOR0A0); + GXSetTevColorIn(GX_TEVSTAGE0, GX_CC_ZERO, GX_CC_RASC, GX_CC_TEXC, GX_CC_ZERO); + GXSetTevColorOp(GX_TEVSTAGE0, GX_TEV_ADD, GX_TB_ZERO, GX_CS_SCALE_1, 1, GX_TEVPREV); + GXSetTevAlphaIn(GX_TEVSTAGE0, GX_CA_ZERO, GX_CA_RASA, GX_CA_TEXA, GX_CA_ZERO); + GXSetTevAlphaOp(GX_TEVSTAGE0, GX_TEV_ADD, GX_TB_ZERO, GX_CS_SCALE_1, true, GX_TEVPREV); + GXSetZCompLoc(0); + GXSetBlendMode(GX_BM_BLEND, GX_BL_SRCALPHA, GX_BL_INVSRCALPHA, GX_LO_OR); + GXSetZMode(true, GX_LEQUAL, false); + GXSetAlphaCompare(GX_GREATER, 0, GX_AOP_OR, GX_GREATER, 0); + GXSetFog(GX_FOG_NONE, mColor(0), 0.0, 0.0, 0.0, 0.0); + GXSetFogRangeAdj(0, 0, 0); + GXSetCullMode(GX_CULL_NONE); + nw4r::math::MTX34 mtx; + nw4r::g3d::Camera cam = m3d::getCurrentCamera(); + cam.GetCameraMtx(&mtx); + GXLoadPosMtxImm(mtx, 0); + GXSetCurrentMtx(0); + GXClearVtxDesc(); + GXSetVtxDesc(GX_VA_POS, GX_DIRECT); + GXSetVtxDesc(GX_VA_CLR0, GX_DIRECT); + GXSetVtxDesc(GX_VA_TEX0, GX_DIRECT); + GXSetVtxAttrFmt(GX_VTXFMT0, GX_VA_POS, GX_POS_XYZ, GX_F32, 0); + GXSetVtxAttrFmt(GX_VTXFMT0, GX_VA_CLR0, GX_CLR_RGBA, GX_RGBA8, 0); + GXSetVtxAttrFmt(GX_VTXFMT0, GX_VA_TEX0, GX_TEX_ST, GX_F32, 0); + GXBegin(GX_TRIANGLESTRIP, GX_VTXFMT0, mCount * 2); + + u8 alpha = dStageMgr_c::GetInstance()->getGlobalAlpha(); + f32 fAlpha = alpha * (1.0f / 255.0f); + + s32 idx = mHead - mCount; + if (idx < 0) { + idx += mNum; + } + + f32 texCoordOffset = mTexScale * idx; + + swing_entry *entry = &mpEntries[idx]; + swing_entry *last = &mpEntries[mNum]; + + for (u16 i = 0; i < mCount; i++) { + GXPosition3f32(entry->mv1.x, entry->mv1.y, entry->mv1.z); + GXColor4u8(entry->mc1.r, entry->mc1.g, entry->mc1.b, entry->mc1.a * entry->mLifetime * fAlpha); + GXTexCoord2f32(texCoordOffset, 0.0f); + + GXPosition3f32(entry->mv2.x, entry->mv2.y, entry->mv2.z); + GXColor4u8(entry->mc2.r, entry->mc2.g, entry->mc2.b, entry->mc2.a * entry->mLifetime * fAlpha); + GXTexCoord2f32(texCoordOffset, 1.0f); + + texCoordOffset += mTexScale; + entry++; + if (entry == last) { + entry = &mpEntries[0]; + } + } + } +} + +bool dSwordSwingEffectProc_c::create(s32 num, mAllocator_c *alloc, EGG::ResTIMG *pImg, f32 scale) { + if (!dSwordSwingEffectProcBase_c::create(num, alloc)) { + return false; + } + + mpImg = pImg; + mTexScale = scale; + return true; +} + +void dSwordSwingEffectProcBase_c::swing_entry::set( + const mVec3_c &pos1, const mColor &c1, const mVec3_c &pos2, const mColor &c2 +) { + mLifetime = 1.0f; + mv1 = pos1; + mv2 = pos2; + mc1 = c1; + mc2 = c2; +} diff --git a/src/toBeSorted/d_sword_swing_effect_mgr.cpp b/src/toBeSorted/d_sword_swing_effect_mgr.cpp new file mode 100644 index 00000000..1d0339c3 --- /dev/null +++ b/src/toBeSorted/d_sword_swing_effect_mgr.cpp @@ -0,0 +1,196 @@ +#include "toBeSorted/d_sword_swing_effect_mgr.h" + +#include "c/c_math.h" +#include "egg/math/eggMatrix.h" +#include "m/m_vec.h" + +// TODO: can't use EGG::Vector3f::cross because the Vector3f -> mVec3_c conversion +// forces additional stack stores. An open-coded cross function works too in this +// file but maybe pattern comes up in more files and then we can move it to d_vec? +inline void cross(mVec3_c &result, const mVec3_c &left, const mVec3_c &right) { + result.set( + (left.y * right.z) - (left.z * right.y), (left.z * right.x) - (left.x * right.z), + (left.x * right.y) - (left.y * right.x) + ); +} + +static bool fn_8006A8D0(const mVec2_c &v1, const mVec2_c &v2, const mVec2_c &v3, const mVec2_c &v4, mVec2_c &result) { + mVec2_c t1 = v2 - v1; + mVec2_c t2 = v4 - v3; + + if (cM::isZero(t1.x)) { + if (cM::isZero(t2.x)) { + return false; + } else { + result.x = v1.x; + result.y = v3.y + (t2.y / t2.x) * (v1.x - v3.x); + } + } else { + if (cM::isZero(t2.x)) { + result.x = v3.x; + } else { + f32 tmp = t1.y / t1.x - t2.y / t2.x; + if (cM::isZero(tmp)) { + return false; + } + result.x = (v3.x + (((t1.y / t1.x) * v1.x - v1.y) - (t2.y / t2.x) * v3.x)) / tmp; + } + result.y = v1.y + (t1.y / t1.x) * (result.x - v1.x); + } + + mVec2_c diff = result - v1; + if (diff.x * t1.x + diff.y * t1.y >= 0.0f) { + return false; + } + + diff = result - v3; + if (diff.x * t2.x + diff.y * t2.y >= 0.0f) { + return false; + } + + return true; +} + +void dSwordSwingEffectProcMgr_c::createSwingEntries(const mVec3_c &v1, const mVec3_c &v2) { + mVec3_c lastDiff = field_0x44 - field_0x38; + mVec3_c diff = v1 - v2; + + mVec3_c cross_; + cross(cross_, lastDiff, diff); + + f32 diffMag = diff.mag(); + + lastDiff.normalize(); + + diff /= diffMag; + + cross_.normalize(); + + // Same code as in dowsing_target... + f32 dot = lastDiff.dot(diff); + dot = cM::minMaxLimit(dot, -1.0f, 1.0f); + f32 a = 1.0f - dot * dot <= 0.0f ? 0.0f : nw4r::math::FrSqrt(1.0f - dot * dot) * (1.0f - dot * dot); + EGG::Matrix34f mat; + mat.setAxisRotation(cross_, cM::atan2f(a, dot) * 0.1f); + + mVec2_c p1, p2, p3, p4; + mVec2_c res1, res2, res3; + + p1.set(field_0x38.x, field_0x38.y); + p2.set(field_0x44.x, field_0x44.y); + p3.set(v2.x, v2.y); + p4.set(v1.x, v1.y); + bool b1 = fn_8006A8D0(p1, p2, p3, p4, res1); + + p1.set(field_0x38.y, field_0x38.z); + p2.set(field_0x44.y, field_0x44.z); + p3.set(v2.y, v2.z); + p4.set(v1.y, v1.z); + bool b2 = fn_8006A8D0(p1, p2, p3, p4, res2); + + p1.set(field_0x38.z, field_0x38.x); + p2.set(field_0x44.z, field_0x44.x); + p3.set(v2.z, v2.x); + p4.set(v1.z, v1.x); + bool b3 = fn_8006A8D0(p1, p2, p3, p4, res3); + + bool b; + mVec3_c local_124 = (v2 + field_0x38) * 0.5f; + mVec3_c diff1; + mVec3_c v; + f32 f_29; + f32 f_28; + EGG::Matrix34f mat2; + int i = 0; + if (!b1) { + i += 1; + } + if (!b2) { + i += 1; + } + + if (!b3) { + i += 1; + } + + if (i >= 2) { + v = (v2 - field_0x38) * 0.1f; + b = false; + } else { + if (b1 && b3) { + local_124.x = (res1.x + res3.y) * 0.5f; + } else if (b1) { + local_124.x = res1.x; + } else if (b3) { + local_124.x = res3.y; + } + + if (b2 && b1) { + local_124.y = (res2.x + res1.y) * 0.5f; + } else if (b2) { + local_124.y = res2.x; + } else if (b1) { + local_124.y = res1.y; + } + + if (b3 && b2) { + local_124.z = (res3.x + res2.y) * 0.5f; + } else if (b3) { + local_124.z = res3.x; + } else if (b2) { + local_124.z = res2.y; + } + + diff1 = field_0x38 - local_124; + mVec3_c diff2 = v2 - local_124; + + f_29 = diff1.mag(); + f_28 = (diff2.mag() - f_29) * 0.1f; + + diff2.normalize(); + diff1.normalize(); + + cross(cross_, diff1, diff2); + cross_.normalize(); + + // Same code as in dowsing_target... + f32 dot = diff1.dot(diff2); + dot = cM::minMaxLimit(dot, -1.0f, 1.0f); + f32 a = 1.0f - dot * dot <= 0.0f ? 0.0f : nw4r::math::FrSqrt(1.0f - dot * dot) * (1.0f - dot * dot); + mat2.setAxisRotation(cross_, cM::atan2f(a, dot) * 0.1f); + + b = true; + } + + f32 blub = 0.1f; + for (int i = 1; i <= 10; i++) { + mVec3_c a; + mVec3_c t; + if (b) { + MTXMultVecSR(mat2.m, diff1, diff1); + t = local_124 + (diff1 * (f_29 + (f_28 * i))); + } else { + t = field_0x38 + v * i; + } + + MTXMultVecSR(mat.m, lastDiff, lastDiff); + a = t + lastDiff * diffMag; + + mProc.addSwing(a, mC1, t, mC2); + // Unused + blub += 0.1f; + } +} + +void dSwordSwingEffectProcMgr_c::calc(const mVec3_c &v1, const mVec3_c &v2) { + mProc.calc(0.1f); + if (mIsActive) { + createSwingEntries(v1, v2); + } + field_0x44 = v1; + field_0x38 = v2; +} + +void dSwordSwingEffectProcMgr_c::entry() { + mProc.entry(); +} diff --git a/src/toBeSorted/dowsing_target.cpp b/src/toBeSorted/dowsing_target.cpp index 5969bf73..35311efb 100644 --- a/src/toBeSorted/dowsing_target.cpp +++ b/src/toBeSorted/dowsing_target.cpp @@ -174,6 +174,7 @@ DowsingTarget *DowsingTarget::getDowsingInfo( targetDir.normalize(); + // Same code as in d_sword_swing_effect_mgr... f32 dot = dwsDir.dot(targetDir); dot = cM::minMaxLimit(dot, -1.0f, 1.0f); f32 a = 1.0f - dot * dot <= 0.0f ? 0.0f : nw4r::math::FrSqrt(1.0f - dot * dot) * (1.0f - dot * dot); diff --git a/tools/custom/file_setup.py b/tools/custom/file_setup.py index 9cd6acfe..00a8ab0e 100644 --- a/tools/custom/file_setup.py +++ b/tools/custom/file_setup.py @@ -521,7 +521,6 @@ def process_file(file_name, data_blocks: List[DataObj], fns: List[Function], sym includes = [include] if uses_state_system: includes.append("s/s_State.hpp") - includes.append("s/s_StateMgr.hpp") state_names = find_state_names(strings) # Since find_state_candidates uses ptmfs for state funcs, a hint may need to be applied. # This is done by finding the vtable, since most of the time (?) the funcs appear after the vtable. @@ -579,7 +578,7 @@ def process_file(file_name, data_blocks: List[DataObj], fns: List[Function], sym if has_inline_ctor: f.write(f"\t{name}()") if uses_state_system: - f.write(" : mStateMgr(*this, sStateID::null)") + f.write(" : mStateMgr(*this)") f.write(" {}\n") f.write(f"\tvirtual ~{name}() {{}}\n\n") else: @@ -612,7 +611,7 @@ def process_file(file_name, data_blocks: List[DataObj], fns: List[Function], sym if not has_inline_ctor: f.write(f"{name}::{name}()") if uses_state_system: - f.write(" : mStateMgr(*this, sStateID::null)") + f.write(" : mStateMgr(*this)") f.write(" {}\n") f.write(f"{name}::~{name}() {{}}\n\n") diff --git a/tools/custom/rel_setup.py b/tools/custom/rel_setup.py index 87c1b4bf..f3492b28 100644 --- a/tools/custom/rel_setup.py +++ b/tools/custom/rel_setup.py @@ -368,7 +368,6 @@ def process_file(file_name, data_blocks: List[DataObj], fns: List[Function]): includes = [include] if uses_state_system: includes.append("s/s_State.hpp") - includes.append("s/s_StateMgr.hpp") state_names = find_state_names(strings) state_candidates = find_state_candidates(data_blocks, len(state_names)) if state_candidates: @@ -414,7 +413,7 @@ def process_file(file_name, data_blocks: List[DataObj], fns: List[Function]): if has_inline_ctor: f.write(f"\t{name}()") if uses_state_system: - f.write(" : mStateMgr(*this, sStateID::null)") + f.write(" : mStateMgr(*this)") f.write(" {}\n") f.write(f"\tvirtual ~{name}() {{}}\n\n") else: @@ -447,7 +446,7 @@ def process_file(file_name, data_blocks: List[DataObj], fns: List[Function]): if not has_inline_ctor: f.write(f"{name}::{name}()") if uses_state_system: - f.write(" : mStateMgr(*this, sStateID::null)") + f.write(" : mStateMgr(*this)") f.write(" {}\n") f.write(f"{name}::~{name}() {{}}\n\n")