diff --git a/config/GZ2E01/rels/d_a_obj_twGate/symbols.txt b/config/GZ2E01/rels/d_a_obj_twGate/symbols.txt index e03e02dbcb9..5fdaf159b9a 100644 --- a/config/GZ2E01/rels/d_a_obj_twGate/symbols.txt +++ b/config/GZ2E01/rels/d_a_obj_twGate/symbols.txt @@ -14,10 +14,10 @@ __dt__12J3DFrameCtrlFv = .text:0x0000059C; // type:function size:0x48 scope:glob Execute__10daTwGate_cFPPA3_A4_f = .text:0x000005E4; // type:function size:0x110 scope:global Draw__10daTwGate_cFv = .text:0x000006F4; // type:function size:0xCC scope:global Delete__10daTwGate_cFv = .text:0x000007C0; // type:function size:0x40 scope:global -daTwGate_Draw__FP10daTwGate_c = .text:0x00000800; // type:function size:0x2C scope:global -daTwGate_Execute__FP10daTwGate_c = .text:0x0000082C; // type:function size:0x20 scope:global -daTwGate_Delete__FP10daTwGate_c = .text:0x0000084C; // type:function size:0x20 scope:global -daTwGate_Create__FP10fopAc_ac_c = .text:0x0000086C; // type:function size:0x20 scope:global +daTwGate_Draw__FP10daTwGate_c = .text:0x00000800; // type:function size:0x2C scope:local +daTwGate_Execute__FP10daTwGate_c = .text:0x0000082C; // type:function size:0x20 scope:local +daTwGate_Delete__FP10daTwGate_c = .text:0x0000084C; // type:function size:0x20 scope:local +daTwGate_Create__FP10fopAc_ac_c = .text:0x0000086C; // type:function size:0x20 scope:local __dt__14daTwGate_HIO_cFv = .text:0x0000088C; // type:function size:0x6C scope:global __sinit_d_a_obj_twGate_cpp = .text:0x000008F8; // type:function size:0x3C scope:local _ctors = .ctors:0x00000000; // type:label scope:global @@ -25,19 +25,19 @@ __destroy_global_chain_reference = .dtors:0x00000000; // type:object size:0x4 sc _dtors = .dtors:0x00000000; // type:label scope:global ...rodata.0 = .rodata:0x00000000; // type:label scope:local @3638 = .rodata:0x00000000; // type:object size:0x4 scope:local -l_bmdIdx = .rodata:0x00000004; // type:object size:0x34 scope:global -l_dzbIdx = .rodata:0x00000038; // type:object size:0x34 scope:global -l_btkIdx = .rodata:0x0000006C; // type:object size:0x34 scope:global -l_brkIdx = .rodata:0x000000A0; // type:object size:0x34 scope:global -l_twFlagIdx = .rodata:0x000000D4; // type:object size:0x34 scope:global -l_cheeckPos0 = .rodata:0x00000108; // type:object size:0x9C scope:global -l_cheeckPos1 = .rodata:0x000001A4; // type:object size:0x9C scope:global +l_bmdIdx = .rodata:0x00000004; // type:object size:0x34 scope:local +l_dzbIdx = .rodata:0x00000038; // type:object size:0x34 scope:local +l_btkIdx = .rodata:0x0000006C; // type:object size:0x34 scope:local +l_brkIdx = .rodata:0x000000A0; // type:object size:0x34 scope:local +l_twFlagIdx = .rodata:0x000000D4; // type:object size:0x34 scope:local +l_cheeckPos0 = .rodata:0x00000108; // type:object size:0x9C scope:local +l_cheeckPos1 = .rodata:0x000001A4; // type:object size:0x9C scope:local @3693 = .rodata:0x00000240; // type:object size:0x4 scope:local @3769 = .rodata:0x00000244; // type:object size:0x4 scope:local @3837 = .rodata:0x00000248; // type:object size:0x4 scope:local @stringBase0 = .rodata:0x0000024C; // type:object size:0x59 scope:local data:string_table -l_resNameIdx = .data:0x00000000; // type:object size:0x34 scope:global -l_daTwGate_Method = .data:0x00000034; // type:object size:0x20 scope:global +l_resNameIdx = .data:0x00000000; // type:object size:0x34 scope:local +l_daTwGate_Method = .data:0x00000034; // type:object size:0x20 scope:local g_profile_Obj_TwGate = .data:0x00000054; // type:object size:0x30 scope:global __vt__8cM3dGLin = .data:0x00000084; // type:object size:0xC scope:global __vt__12J3DFrameCtrl = .data:0x00000090; // type:object size:0xC scope:global @@ -47,4 +47,4 @@ __vt__18fOpAcm_HIO_entry_c = .data:0x000000D0; // type:object size:0xC scope:glo __vt__14mDoHIO_entry_c = .data:0x000000DC; // type:object size:0xC scope:global __global_destructor_chain = .bss:0x00000000; // type:object size:0x4 scope:global @3630 = .bss:0x00000008; // type:object size:0xC scope:local -l_HIO = .bss:0x00000014; // type:object size:0x8 scope:global align:4 data:float +l_HIO = .bss:0x00000014; // type:object size:0x8 scope:local align:4 data:float diff --git a/config/GZ2J01/rels/d_a_obj_twGate/symbols.txt b/config/GZ2J01/rels/d_a_obj_twGate/symbols.txt index e03e02dbcb9..5fdaf159b9a 100644 --- a/config/GZ2J01/rels/d_a_obj_twGate/symbols.txt +++ b/config/GZ2J01/rels/d_a_obj_twGate/symbols.txt @@ -14,10 +14,10 @@ __dt__12J3DFrameCtrlFv = .text:0x0000059C; // type:function size:0x48 scope:glob Execute__10daTwGate_cFPPA3_A4_f = .text:0x000005E4; // type:function size:0x110 scope:global Draw__10daTwGate_cFv = .text:0x000006F4; // type:function size:0xCC scope:global Delete__10daTwGate_cFv = .text:0x000007C0; // type:function size:0x40 scope:global -daTwGate_Draw__FP10daTwGate_c = .text:0x00000800; // type:function size:0x2C scope:global -daTwGate_Execute__FP10daTwGate_c = .text:0x0000082C; // type:function size:0x20 scope:global -daTwGate_Delete__FP10daTwGate_c = .text:0x0000084C; // type:function size:0x20 scope:global -daTwGate_Create__FP10fopAc_ac_c = .text:0x0000086C; // type:function size:0x20 scope:global +daTwGate_Draw__FP10daTwGate_c = .text:0x00000800; // type:function size:0x2C scope:local +daTwGate_Execute__FP10daTwGate_c = .text:0x0000082C; // type:function size:0x20 scope:local +daTwGate_Delete__FP10daTwGate_c = .text:0x0000084C; // type:function size:0x20 scope:local +daTwGate_Create__FP10fopAc_ac_c = .text:0x0000086C; // type:function size:0x20 scope:local __dt__14daTwGate_HIO_cFv = .text:0x0000088C; // type:function size:0x6C scope:global __sinit_d_a_obj_twGate_cpp = .text:0x000008F8; // type:function size:0x3C scope:local _ctors = .ctors:0x00000000; // type:label scope:global @@ -25,19 +25,19 @@ __destroy_global_chain_reference = .dtors:0x00000000; // type:object size:0x4 sc _dtors = .dtors:0x00000000; // type:label scope:global ...rodata.0 = .rodata:0x00000000; // type:label scope:local @3638 = .rodata:0x00000000; // type:object size:0x4 scope:local -l_bmdIdx = .rodata:0x00000004; // type:object size:0x34 scope:global -l_dzbIdx = .rodata:0x00000038; // type:object size:0x34 scope:global -l_btkIdx = .rodata:0x0000006C; // type:object size:0x34 scope:global -l_brkIdx = .rodata:0x000000A0; // type:object size:0x34 scope:global -l_twFlagIdx = .rodata:0x000000D4; // type:object size:0x34 scope:global -l_cheeckPos0 = .rodata:0x00000108; // type:object size:0x9C scope:global -l_cheeckPos1 = .rodata:0x000001A4; // type:object size:0x9C scope:global +l_bmdIdx = .rodata:0x00000004; // type:object size:0x34 scope:local +l_dzbIdx = .rodata:0x00000038; // type:object size:0x34 scope:local +l_btkIdx = .rodata:0x0000006C; // type:object size:0x34 scope:local +l_brkIdx = .rodata:0x000000A0; // type:object size:0x34 scope:local +l_twFlagIdx = .rodata:0x000000D4; // type:object size:0x34 scope:local +l_cheeckPos0 = .rodata:0x00000108; // type:object size:0x9C scope:local +l_cheeckPos1 = .rodata:0x000001A4; // type:object size:0x9C scope:local @3693 = .rodata:0x00000240; // type:object size:0x4 scope:local @3769 = .rodata:0x00000244; // type:object size:0x4 scope:local @3837 = .rodata:0x00000248; // type:object size:0x4 scope:local @stringBase0 = .rodata:0x0000024C; // type:object size:0x59 scope:local data:string_table -l_resNameIdx = .data:0x00000000; // type:object size:0x34 scope:global -l_daTwGate_Method = .data:0x00000034; // type:object size:0x20 scope:global +l_resNameIdx = .data:0x00000000; // type:object size:0x34 scope:local +l_daTwGate_Method = .data:0x00000034; // type:object size:0x20 scope:local g_profile_Obj_TwGate = .data:0x00000054; // type:object size:0x30 scope:global __vt__8cM3dGLin = .data:0x00000084; // type:object size:0xC scope:global __vt__12J3DFrameCtrl = .data:0x00000090; // type:object size:0xC scope:global @@ -47,4 +47,4 @@ __vt__18fOpAcm_HIO_entry_c = .data:0x000000D0; // type:object size:0xC scope:glo __vt__14mDoHIO_entry_c = .data:0x000000DC; // type:object size:0xC scope:global __global_destructor_chain = .bss:0x00000000; // type:object size:0x4 scope:global @3630 = .bss:0x00000008; // type:object size:0xC scope:local -l_HIO = .bss:0x00000014; // type:object size:0x8 scope:global align:4 data:float +l_HIO = .bss:0x00000014; // type:object size:0x8 scope:local align:4 data:float diff --git a/config/GZ2P01/rels/d_a_obj_twGate/symbols.txt b/config/GZ2P01/rels/d_a_obj_twGate/symbols.txt index e03e02dbcb9..5fdaf159b9a 100644 --- a/config/GZ2P01/rels/d_a_obj_twGate/symbols.txt +++ b/config/GZ2P01/rels/d_a_obj_twGate/symbols.txt @@ -14,10 +14,10 @@ __dt__12J3DFrameCtrlFv = .text:0x0000059C; // type:function size:0x48 scope:glob Execute__10daTwGate_cFPPA3_A4_f = .text:0x000005E4; // type:function size:0x110 scope:global Draw__10daTwGate_cFv = .text:0x000006F4; // type:function size:0xCC scope:global Delete__10daTwGate_cFv = .text:0x000007C0; // type:function size:0x40 scope:global -daTwGate_Draw__FP10daTwGate_c = .text:0x00000800; // type:function size:0x2C scope:global -daTwGate_Execute__FP10daTwGate_c = .text:0x0000082C; // type:function size:0x20 scope:global -daTwGate_Delete__FP10daTwGate_c = .text:0x0000084C; // type:function size:0x20 scope:global -daTwGate_Create__FP10fopAc_ac_c = .text:0x0000086C; // type:function size:0x20 scope:global +daTwGate_Draw__FP10daTwGate_c = .text:0x00000800; // type:function size:0x2C scope:local +daTwGate_Execute__FP10daTwGate_c = .text:0x0000082C; // type:function size:0x20 scope:local +daTwGate_Delete__FP10daTwGate_c = .text:0x0000084C; // type:function size:0x20 scope:local +daTwGate_Create__FP10fopAc_ac_c = .text:0x0000086C; // type:function size:0x20 scope:local __dt__14daTwGate_HIO_cFv = .text:0x0000088C; // type:function size:0x6C scope:global __sinit_d_a_obj_twGate_cpp = .text:0x000008F8; // type:function size:0x3C scope:local _ctors = .ctors:0x00000000; // type:label scope:global @@ -25,19 +25,19 @@ __destroy_global_chain_reference = .dtors:0x00000000; // type:object size:0x4 sc _dtors = .dtors:0x00000000; // type:label scope:global ...rodata.0 = .rodata:0x00000000; // type:label scope:local @3638 = .rodata:0x00000000; // type:object size:0x4 scope:local -l_bmdIdx = .rodata:0x00000004; // type:object size:0x34 scope:global -l_dzbIdx = .rodata:0x00000038; // type:object size:0x34 scope:global -l_btkIdx = .rodata:0x0000006C; // type:object size:0x34 scope:global -l_brkIdx = .rodata:0x000000A0; // type:object size:0x34 scope:global -l_twFlagIdx = .rodata:0x000000D4; // type:object size:0x34 scope:global -l_cheeckPos0 = .rodata:0x00000108; // type:object size:0x9C scope:global -l_cheeckPos1 = .rodata:0x000001A4; // type:object size:0x9C scope:global +l_bmdIdx = .rodata:0x00000004; // type:object size:0x34 scope:local +l_dzbIdx = .rodata:0x00000038; // type:object size:0x34 scope:local +l_btkIdx = .rodata:0x0000006C; // type:object size:0x34 scope:local +l_brkIdx = .rodata:0x000000A0; // type:object size:0x34 scope:local +l_twFlagIdx = .rodata:0x000000D4; // type:object size:0x34 scope:local +l_cheeckPos0 = .rodata:0x00000108; // type:object size:0x9C scope:local +l_cheeckPos1 = .rodata:0x000001A4; // type:object size:0x9C scope:local @3693 = .rodata:0x00000240; // type:object size:0x4 scope:local @3769 = .rodata:0x00000244; // type:object size:0x4 scope:local @3837 = .rodata:0x00000248; // type:object size:0x4 scope:local @stringBase0 = .rodata:0x0000024C; // type:object size:0x59 scope:local data:string_table -l_resNameIdx = .data:0x00000000; // type:object size:0x34 scope:global -l_daTwGate_Method = .data:0x00000034; // type:object size:0x20 scope:global +l_resNameIdx = .data:0x00000000; // type:object size:0x34 scope:local +l_daTwGate_Method = .data:0x00000034; // type:object size:0x20 scope:local g_profile_Obj_TwGate = .data:0x00000054; // type:object size:0x30 scope:global __vt__8cM3dGLin = .data:0x00000084; // type:object size:0xC scope:global __vt__12J3DFrameCtrl = .data:0x00000090; // type:object size:0xC scope:global @@ -47,4 +47,4 @@ __vt__18fOpAcm_HIO_entry_c = .data:0x000000D0; // type:object size:0xC scope:glo __vt__14mDoHIO_entry_c = .data:0x000000DC; // type:object size:0xC scope:global __global_destructor_chain = .bss:0x00000000; // type:object size:0x4 scope:global @3630 = .bss:0x00000008; // type:object size:0xC scope:local -l_HIO = .bss:0x00000014; // type:object size:0x8 scope:global align:4 data:float +l_HIO = .bss:0x00000014; // type:object size:0x8 scope:local align:4 data:float diff --git a/config/RZDE01_00/rels/d_a_obj_twGate/symbols.txt b/config/RZDE01_00/rels/d_a_obj_twGate/symbols.txt index f4e8e9b13c0..6123f2e93a9 100644 --- a/config/RZDE01_00/rels/d_a_obj_twGate/symbols.txt +++ b/config/RZDE01_00/rels/d_a_obj_twGate/symbols.txt @@ -10,10 +10,10 @@ create__10daTwGate_cFv = .text:0x00000298; // type:function size:0x198 scope:glo Execute__10daTwGate_cFPPA3_A4_f = .text:0x00000430; // type:function size:0x110 scope:global Draw__10daTwGate_cFv = .text:0x00000540; // type:function size:0xC0 scope:global Delete__10daTwGate_cFv = .text:0x00000600; // type:function size:0x3C scope:global -daTwGate_Draw__FP10daTwGate_c = .text:0x0000063C; // type:function size:0x10 scope:global -daTwGate_Execute__FP10daTwGate_c = .text:0x0000064C; // type:function size:0x4 scope:global -daTwGate_Delete__FP10daTwGate_c = .text:0x00000650; // type:function size:0x4 scope:global -daTwGate_Create__FP10fopAc_ac_c = .text:0x00000654; // type:function size:0x4 scope:global +daTwGate_Draw__FP10daTwGate_c = .text:0x0000063C; // type:function size:0x10 scope:local +daTwGate_Execute__FP10daTwGate_c = .text:0x0000064C; // type:function size:0x4 scope:local +daTwGate_Delete__FP10daTwGate_c = .text:0x00000650; // type:function size:0x4 scope:local +daTwGate_Create__FP10fopAc_ac_c = .text:0x00000654; // type:function size:0x4 scope:local __dt__14daTwGate_HIO_cFv = .text:0x00000658; // type:function size:0x40 scope:global __sinit_d_a_obj_twGate_cpp = .text:0x00000698; // type:function size:0x48 scope:local _ctors = .ctors:0x00000000; // type:label scope:global @@ -21,13 +21,13 @@ __destroy_global_chain_reference = .dtors:0x00000000; // type:object size:0x4 sc _dtors = .dtors:0x00000000; // type:label scope:global ...rodata.0 = .rodata:0x00000000; // type:label scope:local @89924 = .rodata:0x00000000; // type:object size:0x4 scope:local -l_bmdIdx = .rodata:0x00000004; // type:object size:0x34 scope:global -l_dzbIdx = .rodata:0x00000038; // type:object size:0x34 scope:global -l_btkIdx = .rodata:0x0000006C; // type:object size:0x34 scope:global -l_brkIdx = .rodata:0x000000A0; // type:object size:0x34 scope:global -l_twFlagIdx = .rodata:0x000000D4; // type:object size:0x34 scope:global -l_cheeckPos0 = .rodata:0x00000108; // type:object size:0x9C scope:global -l_cheeckPos1 = .rodata:0x000001A4; // type:object size:0x9C scope:global +l_bmdIdx = .rodata:0x00000004; // type:object size:0x34 scope:local +l_dzbIdx = .rodata:0x00000038; // type:object size:0x34 scope:local +l_btkIdx = .rodata:0x0000006C; // type:object size:0x34 scope:local +l_brkIdx = .rodata:0x000000A0; // type:object size:0x34 scope:local +l_twFlagIdx = .rodata:0x000000D4; // type:object size:0x34 scope:local +l_cheeckPos0 = .rodata:0x00000108; // type:object size:0x9C scope:local +l_cheeckPos1 = .rodata:0x000001A4; // type:object size:0x9C scope:local @89977 = .rodata:0x00000240; // type:object size:0x4 scope:local @90028 = .rodata:0x00000244; // type:object size:0x4 scope:local @90091 = .rodata:0x00000248; // type:object size:0x4 scope:local @@ -41,8 +41,8 @@ lbl_672_data_31 = .data:0x00000031; // type:object size:0xA data:string lbl_672_data_3B = .data:0x0000003B; // type:object size:0xA data:string lbl_672_data_45 = .data:0x00000045; // type:object size:0xA data:string lbl_672_data_4F = .data:0x0000004F; // type:object size:0xD -l_resNameIdx = .data:0x0000005C; // type:object size:0x34 scope:global -l_daTwGate_Method = .data:0x00000090; // type:object size:0x20 scope:global +l_resNameIdx = .data:0x0000005C; // type:object size:0x34 scope:local +l_daTwGate_Method = .data:0x00000090; // type:object size:0x20 scope:local g_profile_Obj_TwGate = .data:0x000000B0; // type:object size:0x30 scope:global __vt__14daTwGate_HIO_c = .data:0x000000E0; // type:object size:0xC scope:global lbl_672_data_EC = .data:0x000000EC; // type:object size:0x10 @@ -54,4 +54,4 @@ lbl_672_data_148 = .data:0x00000148; // type:object size:0xC __RTTI__10daTwGate_c = .data:0x00000168; // type:object size:0x8 scope:global __global_destructor_chain = .bss:0x00000000; // type:object size:0x4 scope:global @88985 = .bss:0x00000008; // type:object size:0xC scope:local -l_HIO = .bss:0x00000014; // type:object size:0x8 scope:global align:4 data:float +l_HIO = .bss:0x00000014; // type:object size:0x8 scope:local align:4 data:float diff --git a/config/ShieldD/rels/d_a_obj_twGateD/symbols.txt b/config/ShieldD/rels/d_a_obj_twGateD/symbols.txt index c3ecede37e3..bc25a2170b9 100644 --- a/config/ShieldD/rels/d_a_obj_twGateD/symbols.txt +++ b/config/ShieldD/rels/d_a_obj_twGateD/symbols.txt @@ -13,10 +13,10 @@ __ct__10daTwGate_cFv = .text:0x00000630; // type:function size:0x58 scope:global Execute__10daTwGate_cFPPA3_A4_f = .text:0x00000690; // type:function size:0x140 scope:global Draw__10daTwGate_cFv = .text:0x000007D0; // type:function size:0x94 scope:global Delete__10daTwGate_cFv = .text:0x00000870; // type:function size:0x58 scope:global -daTwGate_Draw__FP10daTwGate_c = .text:0x000008D0; // type:function size:0x28 scope:global -daTwGate_Execute__FP10daTwGate_c = .text:0x00000900; // type:function size:0x28 scope:global -daTwGate_Delete__FP10daTwGate_c = .text:0x00000930; // type:function size:0x44 scope:global -daTwGate_Create__FP10fopAc_ac_c = .text:0x00000980; // type:function size:0x50 scope:global +daTwGate_Draw__FP10daTwGate_c = .text:0x000008D0; // type:function size:0x28 scope:local +daTwGate_Execute__FP10daTwGate_c = .text:0x00000900; // type:function size:0x28 scope:local +daTwGate_Delete__FP10daTwGate_c = .text:0x00000930; // type:function size:0x44 scope:local +daTwGate_Create__FP10fopAc_ac_c = .text:0x00000980; // type:function size:0x50 scope:local __dt__14daTwGate_HIO_cFv = .text:0x000009D0; // type:function size:0x5C scope:global __sinit_\d_a_obj_twGate_cpp = .text:0x00000A30; // type:function size:0x44 scope:local _ctors = .ctors:0x00000000; // type:label scope:global @@ -26,13 +26,13 @@ _dtors = .dtors:0x00000000; // type:label scope:global @114197 = .rodata:0x00000000; // type:object size:0x4 scope:local @114211 = .rodata:0x00000004; // type:object size:0x4 scope:local align:4 data:float @114212 = .rodata:0x00000008; // type:object size:0x4 scope:local align:4 data:float -l_bmdIdx = .rodata:0x0000000C; // type:object size:0x34 scope:global -l_dzbIdx = .rodata:0x00000040; // type:object size:0x34 scope:global -l_btkIdx = .rodata:0x00000074; // type:object size:0x34 scope:global -l_brkIdx = .rodata:0x000000A8; // type:object size:0x34 scope:global -l_twFlagIdx = .rodata:0x000000DC; // type:object size:0x34 scope:global -l_cheeckPos0 = .rodata:0x00000110; // type:object size:0x9C scope:global -l_cheeckPos1 = .rodata:0x000001AC; // type:object size:0x9C scope:global +l_bmdIdx = .rodata:0x0000000C; // type:object size:0x34 scope:local +l_dzbIdx = .rodata:0x00000040; // type:object size:0x34 scope:local +l_btkIdx = .rodata:0x00000074; // type:object size:0x34 scope:local +l_brkIdx = .rodata:0x000000A8; // type:object size:0x34 scope:local +l_twFlagIdx = .rodata:0x000000DC; // type:object size:0x34 scope:local +l_cheeckPos0 = .rodata:0x00000110; // type:object size:0x9C scope:local +l_cheeckPos1 = .rodata:0x000001AC; // type:object size:0x9C scope:local @114255 = .rodata:0x00000248; // type:object size:0x4 scope:local @114294 = .rodata:0x0000024C; // type:object size:0x4 scope:local cNullVec__6Z2Calc = .rodata:0x00000250; // type:object size:0xC scope:global @@ -49,7 +49,7 @@ lbl_662_rodata_260 = .rodata:0x00000260; // type:object size:0x14 @114222 = .data:0x00000054; // type:object size:0xA scope:local data:string @114223 = .data:0x00000060; // type:object size:0xA scope:local data:string @114224 = .data:0x0000006C; // type:object size:0xA scope:local data:string -l_resNameIdx = .data:0x00000078; // type:object size:0x34 scope:global +l_resNameIdx = .data:0x00000078; // type:object size:0x34 scope:local @114252 = .data:0x000000AC; // type:object size:0x13 scope:local data:string @114253 = .data:0x000000C0; // type:object size:0xF scope:local data:string @114254 = .data:0x000000D0; // type:object size:0x5 scope:local data:string @@ -58,7 +58,7 @@ l_resNameIdx = .data:0x00000078; // type:object size:0x34 scope:global @114295 = .data:0x00000118; // type:object size:0x13 scope:local @114442 = .data:0x0000012C; // type:object size:0x1B scope:local data:string @114458 = .data:0x00000148; // type:object size:0x1B scope:local data:string -l_daTwGate_Method = .data:0x00000168; // type:object size:0x20 scope:global +l_daTwGate_Method = .data:0x00000168; // type:object size:0x20 scope:local g_profile_Obj_TwGate = .data:0x00000188; // type:object size:0x30 scope:global __vt__14daTwGate_HIO_c = .data:0x000001B8; // type:object size:0x20 scope:global @114460 = .data:0x000001D8; // type:object size:0xF scope:local data:string @@ -83,4 +83,4 @@ __RTTI__10daTwGate_c = .data:0x00000260; // type:object size:0x8 scope:global lbl_662_data_3B1 = .data:0x000003B1; // type:object size:0x7F __global_destructor_chain = .bss:0x00000000; // type:object size:0x4 scope:global @114190 = .bss:0x00000008; // type:object size:0xC scope:local -l_HIO = .bss:0x00000014; // type:object size:0xC scope:global align:4 data:float +l_HIO = .bss:0x00000014; // type:object size:0xC scope:local align:4 data:float diff --git a/configure.py b/configure.py index 9b1e31d7776..606423cacd0 100755 --- a/configure.py +++ b/configure.py @@ -2148,7 +2148,7 @@ config.libs = [ ActorRel(MatchingFor("GZ2E01"), "d_a_obj_tornado2"), ActorRel(MatchingFor("GZ2E01"), "d_a_obj_tp"), ActorRel(MatchingFor("GZ2E01"), "d_a_obj_treesh"), - ActorRel(NonMatching, "d_a_obj_twGate"), + ActorRel(MatchingFor("GZ2E01"), "d_a_obj_twGate"), ActorRel(MatchingFor("GZ2E01"), "d_a_obj_udoor"), ActorRel(MatchingFor("GZ2E01"), "d_a_obj_usaku"), ActorRel(MatchingFor("GZ2E01"), "d_a_obj_vground"), diff --git a/include/d/actor/d_a_e_bu.h b/include/d/actor/d_a_e_bu.h index 8ec8f9a9a5d..639ab6c7a98 100644 --- a/include/d/actor/d_a_e_bu.h +++ b/include/d/actor/d_a_e_bu.h @@ -67,11 +67,13 @@ public: STATIC_ASSERT(sizeof(e_bu_class) == 0xaa4); -class daE_BU_HIO_c { +class daE_BU_HIO_c : public JORReflexible { public: /* 806911AC */ daE_BU_HIO_c(); /* 806941D4 */ virtual ~daE_BU_HIO_c() {} + void genMessage(JORMContext* ctx); + /* 0x04 */ s8 id; /* 0x08 */ f32 base_size; /* 0x0C */ f32 fly_speed; diff --git a/include/d/actor/d_a_e_zh.h b/include/d/actor/d_a_e_zh.h index 6bcbb6524ab..9ddb99f3906 100644 --- a/include/d/actor/d_a_e_zh.h +++ b/include/d/actor/d_a_e_zh.h @@ -118,6 +118,8 @@ public: /* 8082902C */ daE_ZH_HIO_c(); /* 8082F160 */ virtual ~daE_ZH_HIO_c() {} + void genMessage(JORMContext* ctx); + // ボールマスター (Ball Master) /* 0x04 */ s8 field_0x4; /* 0x08 */ f32 model_size; // モデルサイズ (Model Size) diff --git a/include/d/actor/d_a_obj_twGate.h b/include/d/actor/d_a_obj_twGate.h index 36a79741a1a..56ad4504663 100644 --- a/include/d/actor/d_a_obj_twGate.h +++ b/include/d/actor/d_a_obj_twGate.h @@ -2,6 +2,7 @@ #define D_A_OBJ_TWGATE_H #include "f_op/f_op_actor_mng.h" +#include "d/d_bg_s_movebg_actor.h" /** * @ingroup actors-objects @@ -11,24 +12,36 @@ * @details * */ -class daTwGate_c : public fopAc_ac_c { +class daTwGate_c : public dBgS_MoveBgActor { public: /* 80D1FB84 */ void setBaseMtx(); - /* 80D1FC0C */ void CreateHeap(); - /* 80D1FD44 */ void create(); - /* 80D1FFA4 */ void Execute(f32 (**)[3][4]); - /* 80D200B4 */ void Draw(); - /* 80D20180 */ void Delete(); + /* 80D1FC0C */ int CreateHeap(); + /* 80D1FD44 */ int create(); + /* 80D1FFA4 */ int Execute(Mtx**); + /* 80D200B4 */ int Draw(); + /* 80D20180 */ int Delete(); + + int getGateType() { return fopAcM_GetParamBit(this, 4, 8); } + private: - /* 0x568 */ u8 field_0x568[0x5fc - 0x568]; + /* 0x5A0 */ request_of_phase_process_class mPhase; + /* 0x5A8 */ J3DModel* mModel; + /* 0x5AC */ mDoExt_btkAnm mBtk; + /* 0x5C4 */ mDoExt_brkAnm mBrk; + /* 0x5DC */ u8 mGateType; + /* 0x5E0 */ cM3dGLin mLine; }; STATIC_ASSERT(sizeof(daTwGate_c) == 0x5fc); -class daTwGate_HIO_c { +class daTwGate_HIO_c : public fOpAcm_HIO_entry_c { public: /* 80D1FAAC */ daTwGate_HIO_c(); - /* 80D2024C */ ~daTwGate_HIO_c(); + /* 80D2024C */ ~daTwGate_HIO_c() {} + + void genMessage(JORMContext* ctx); + + /* 0x4 */ f32 mRange; }; #endif /* D_A_OBJ_TWGATE_H */ diff --git a/include/f_op/f_op_actor_mng.h b/include/f_op/f_op_actor_mng.h index ea2854dee65..89954309691 100644 --- a/include/f_op/f_op_actor_mng.h +++ b/include/f_op/f_op_actor_mng.h @@ -88,6 +88,18 @@ struct fopAcM_search_prm { struct fOpAcm_HIO_entry_c : public mDoHIO_entry_c { virtual ~fOpAcm_HIO_entry_c() {} + + #ifdef DEBUG + void removeHIO(const fopAc_ac_c* i_this) { removeHIO(*i_this); } + void removeHIO(const fopAc_ac_c& i_this) { removeHIO(static_cast(i_this)); } + void removeHIO(const leafdraw_class& i_this) { removeHIO(i_this.base); } + void removeHIO(const base_process_class& i_this) { removeHIO(i_this.state); } + void removeHIO(const state_class& state) { + if (state.create_phase == cPhs_NEXT_e) { + mDoHIO_entry_c::removeHIO(); + } + } + #endif }; class l_HIO { diff --git a/include/f_pc/f_pc_base.h b/include/f_pc/f_pc_base.h index 10f90417839..896e7a9c9d5 100644 --- a/include/f_pc/f_pc_base.h +++ b/include/f_pc/f_pc_base.h @@ -14,14 +14,18 @@ typedef struct process_method_class process_method_class; typedef struct process_profile_definition process_profile_definition; typedef struct profile_method_class profile_method_class; +typedef struct state_class { + /* 0x00 */ s8 init_state; // maybe inaccurate name + /* 0x01 */ u8 create_phase; +} state_class; + typedef struct base_process_class { /* 0x00 */ int type; /* 0x04 */ fpc_ProcID id; /* 0x08 */ s16 name; /* 0x0A */ s8 unk_0xA; /* 0x0B */ u8 pause_flag; - /* 0x0C */ s8 init_state; // maybe inaccurate name - /* 0x0D */ u8 create_phase; + /* 0x0C */ state_class state; /* 0x0E */ s16 profname; /* 0x10 */ process_profile_definition* profile; /* 0x14 */ struct create_request* create_req; diff --git a/include/f_pc/f_pc_manager.h b/include/f_pc/f_pc_manager.h index a9ac53dff61..21505588275 100644 --- a/include/f_pc/f_pc_manager.h +++ b/include/f_pc/f_pc_manager.h @@ -54,7 +54,7 @@ inline BOOL fpcM_IsJustType(int i_typeA, int i_typeB) { } inline bool fpcM_IsFirstCreating(void* i_process) { - return ((base_process_class*)i_process)->init_state == 0; + return ((base_process_class*)i_process)->state.init_state == 0; } inline process_profile_definition* fpcM_GetProfile(void* i_process) { diff --git a/src/d/actor/d_a_e_zh.cpp b/src/d/actor/d_a_e_zh.cpp index 3bbd0249cef..7536a0e1e11 100644 --- a/src/d/actor/d_a_e_zh.cpp +++ b/src/d/actor/d_a_e_zh.cpp @@ -1201,7 +1201,7 @@ void daE_ZH_c::executeBgHitSHMove() { if (NREG_S(0) != 0) { OS_REPORT("mRetrunStartLine.x %f\n", mRetrunStartLine.x); - OS_REPORT("mRetrunEndLine.x %f\n". mRetrunEndLine.x); + OS_REPORT("mRetrunEndLine.x %f\n", mRetrunEndLine.x); OS_REPORT("mRetrunStartLine.z %f\n", mRetrunStartLine.z); OS_REPORT("mRetrunEndLine.z %f\n", mRetrunEndLine.z); OS_REPORT("\n"); diff --git a/src/d/actor/d_a_obj_amiShutter.cpp b/src/d/actor/d_a_obj_amiShutter.cpp index 260ac60e7b8..9e7dc7a1a82 100644 --- a/src/d/actor/d_a_obj_amiShutter.cpp +++ b/src/d/actor/d_a_obj_amiShutter.cpp @@ -8,12 +8,6 @@ #include "c/c_damagereaction.h" #include "d/d_bg_w.h" -// -// Declarations: -// - -/* ############################################################################################## */ - UNK_REL_DATA /* 80BA14CC-80BA1514 0000EC 0048+00 1/1 0/0 0/0 .text __ct__18daAmiShutter_HIO_cFv */ diff --git a/src/d/actor/d_a_obj_lv6bemos.cpp b/src/d/actor/d_a_obj_lv6bemos.cpp index 37d25ae2773..7a08fb9956e 100644 --- a/src/d/actor/d_a_obj_lv6bemos.cpp +++ b/src/d/actor/d_a_obj_lv6bemos.cpp @@ -194,7 +194,7 @@ int daObjL6Bm_c::CreateHeap() { } #ifdef DEBUG - pbtk = (J3DAnmTextureSRTKey*)dComIfG_getObjectRes(l_arcName, BTK_EF_BIMOBEAM_0FF); + pbtk = (J3DAnmTextureSRTKey*)dComIfG_getObjectRes(l_arcName, BTK_EF_BIMOBEAM_OFF); JUT_ASSERT(660, pbtk != 0); #endif diff --git a/src/d/actor/d_a_obj_togeTrap.cpp b/src/d/actor/d_a_obj_togeTrap.cpp index cae00fa615c..546864d89e3 100644 --- a/src/d/actor/d_a_obj_togeTrap.cpp +++ b/src/d/actor/d_a_obj_togeTrap.cpp @@ -295,7 +295,7 @@ int daTogeTrap_c::Delete() { dComIfG_resDelete(&mPhase, "P_Toge"); #ifdef DEBUG - l_HIO.removeHIO(); + l_HIO.removeHIO(this); #endif return 1; diff --git a/src/d/actor/d_a_obj_twGate.cpp b/src/d/actor/d_a_obj_twGate.cpp index a3742dd8982..52cd9f8318f 100644 --- a/src/d/actor/d_a_obj_twGate.cpp +++ b/src/d/actor/d_a_obj_twGate.cpp @@ -4,124 +4,239 @@ */ #include "d/actor/d_a_obj_twGate.h" -#include "dol2asm.h" - - - - -// -// Forward References: -// - -extern "C" void __ct__14daTwGate_HIO_cFv(); -extern "C" void __dt__18fOpAcm_HIO_entry_cFv(); -extern "C" void __dt__14mDoHIO_entry_cFv(); -extern "C" void setBaseMtx__10daTwGate_cFv(); -extern "C" void CreateHeap__10daTwGate_cFv(); -extern "C" void create__10daTwGate_cFv(); -extern "C" void __dt__8cM3dGLinFv(); -extern "C" void __dt__12J3DFrameCtrlFv(); -extern "C" void Execute__10daTwGate_cFPPA3_A4_f(); -extern "C" void Draw__10daTwGate_cFv(); -extern "C" void Delete__10daTwGate_cFv(); -extern "C" static void daTwGate_Draw__FP10daTwGate_c(); -extern "C" static void daTwGate_Execute__FP10daTwGate_c(); -extern "C" static void daTwGate_Delete__FP10daTwGate_c(); -extern "C" static void daTwGate_Create__FP10fopAc_ac_c(); -extern "C" void __dt__14daTwGate_HIO_cFv(); -extern "C" void __sinit_d_a_obj_twGate_cpp(); -extern "C" extern char const* const d_a_obj_twGate__stringBase0; - -// -// External References: -// - -extern "C" void mDoMtx_ZXYrotM__FPA4_fsss(); -extern "C" void play__14mDoExt_baseAnmFv(); -extern "C" void init__13mDoExt_btkAnmFP16J3DMaterialTableP19J3DAnmTextureSRTKeyiifss(); -extern "C" void entry__13mDoExt_btkAnmFP16J3DMaterialTablef(); -extern "C" void init__13mDoExt_brkAnmFP16J3DMaterialTableP15J3DAnmTevRegKeyiifss(); -extern "C" void entry__13mDoExt_brkAnmFP16J3DMaterialTablef(); -extern "C" void mDoExt_modelUpdateDL__FP8J3DModel(); -extern "C" void mDoExt_J3DModel__create__FP12J3DModelDataUlUl(); -extern "C" void fopAcM_delete__FP10fopAc_ac_c(); -extern "C" void fopAcM_setCullSizeBox2__FP10fopAc_ac_cP12J3DModelData(); -extern "C" void dComIfG_resLoad__FP30request_of_phase_process_classPCc(); -extern "C" void dComIfG_resDelete__FP30request_of_phase_process_classPCc(); -extern "C" void isDarkClearLV__21dSv_player_status_b_cCFi(); -extern "C" void getRes__14dRes_control_cFPCclP11dRes_info_ci(); -extern "C" void dBgS_MoveBGProc_TypicalRotY__FP4dBgWPvRC13cBgS_PolyInfobP4cXyzP5csXyzP5csXyz(); -extern "C" void __ct__16dBgS_MoveBgActorFv(); -extern "C" bool Create__16dBgS_MoveBgActorFv(); -extern "C" bool IsDelete__16dBgS_MoveBgActorFv(); -extern "C" bool ToFore__16dBgS_MoveBgActorFv(); -extern "C" bool ToBack__16dBgS_MoveBgActorFv(); -extern "C" void -MoveBGCreate__16dBgS_MoveBgActorFPCciPFP4dBgWPvRC13cBgS_PolyInfobP4cXyzP5csXyzP5csXyz_vUlPA3_A4_f(); -extern "C" void MoveBGDelete__16dBgS_MoveBgActorFv(); -extern "C" void MoveBGExecute__16dBgS_MoveBgActorFv(); -extern "C" void settingTevStruct__18dScnKy_env_light_cFiP4cXyzP12dKy_tevstr_c(); -extern "C" void setLightTevColorType_MAJI__18dScnKy_env_light_cFP12J3DModelDataP12dKy_tevstr_c(); -extern "C" void cM3d_Len3dSqPntAndSegLine__FPC8cM3dGLinPC3VecP3VecPf(); -extern "C" void SetStartEnd__8cM3dGLinFRC3VecRC3Vec(); -extern "C" void __dl__FPv(); -extern "C" void init__12J3DFrameCtrlFs(); -extern "C" void _savegpr_28(); -extern "C" void _savegpr_29(); -extern "C" void _restgpr_28(); -extern "C" void _restgpr_29(); -extern "C" u8 now__14mDoMtx_stack_c[48]; -extern "C" extern u8 g_dComIfG_gameInfo[122384]; -extern "C" void __register_global_object(); - -// -// Declarations: -// - -/* ############################################################################################## */ -/* 80D20308-80D2030C 000000 0004+00 4/4 0/0 0/0 .rodata @3638 */ -SECTION_RODATA static f32 const lit_3638 = 1900.0f; -COMPILER_STRIP_GATE(0x80D20308, &lit_3638); - -/* 80D20554-80D20554 00024C 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ -#pragma push -#pragma force_active on -SECTION_DEAD static char const* const stringBase_80D20554 = "twGtFiro"; -SECTION_DEAD static char const* const stringBase_80D2055D = "twGtK0102"; -SECTION_DEAD static char const* const stringBase_80D20567 = "twGtK0709"; -SECTION_DEAD static char const* const stringBase_80D20571 = ""; -SECTION_DEAD static char const* const stringBase_80D20572 = "twGnFiro"; -SECTION_DEAD static char const* const stringBase_80D2057B = "twGnK0102"; -SECTION_DEAD static char const* const stringBase_80D20585 = "twGnK0709"; -SECTION_DEAD static char const* const stringBase_80D2058F = "twGnK079b"; -SECTION_DEAD static char const* const stringBase_80D20599 = "twGnK1415"; -SECTION_DEAD static char const* const stringBase_80D205A3 = "twGnK0616"; -#pragma pop +#include "d/d_com_inf_game.h" /* 80D205B0-80D205E4 -00001 0034+00 3/3 0/0 0/0 .data l_resNameIdx */ -SECTION_DATA static void* l_resNameIdx[13] = { - (void*)&d_a_obj_twGate__stringBase0, - (void*)(((char*)&d_a_obj_twGate__stringBase0) + 0x9), - (void*)(((char*)&d_a_obj_twGate__stringBase0) + 0x13), - (void*)(((char*)&d_a_obj_twGate__stringBase0) + 0x1D), - (void*)(((char*)&d_a_obj_twGate__stringBase0) + 0x1D), - (void*)(((char*)&d_a_obj_twGate__stringBase0) + 0x1D), - (void*)(((char*)&d_a_obj_twGate__stringBase0) + 0x1E), - (void*)(((char*)&d_a_obj_twGate__stringBase0) + 0x27), - (void*)(((char*)&d_a_obj_twGate__stringBase0) + 0x31), - (void*)(((char*)&d_a_obj_twGate__stringBase0) + 0x3B), - (void*)(((char*)&d_a_obj_twGate__stringBase0) + 0x45), - (void*)(((char*)&d_a_obj_twGate__stringBase0) + 0x4F), - (void*)(((char*)&d_a_obj_twGate__stringBase0) + 0x1D), +static char* l_resNameIdx[13] = { + "twGtFiro", + "twGtK0102", + "twGtK0709", + "", + "", + "", + "twGnFiro", + "twGnK0102", + "twGnK0709", + "twGnK079b", + "twGnK1415", + "twGnK0616", + "", }; +/* 80D1FAAC-80D1FAE0 0000EC 0034+00 1/1 0/0 0/0 .text __ct__14daTwGate_HIO_cFv */ +daTwGate_HIO_c::daTwGate_HIO_c() { + mRange = 1900.0f; +} + +#ifdef DEBUG +void daTwGate_HIO_c::genMessage(JORMContext* ctx) { + // Range + ctx->genSlider("範囲", &mRange, 0.0f, 500000.0f, 0, NULL, 0xffff, 0xffff, 0x200, 0x18); +} +#endif + +/* 80D1FB84-80D1FC0C 0001C4 0088+00 2/2 0/0 0/0 .text setBaseMtx__10daTwGate_cFv */ +void daTwGate_c::setBaseMtx() { + mDoMtx_stack_c::transS(current.pos.x, current.pos.y, current.pos.z); + mDoMtx_stack_c::ZXYrotM(current.angle.x, current.angle.y, current.angle.z); + mModel->setBaseScale(scale); + mModel->setBaseTRMtx(mDoMtx_stack_c::get()); +} + +/* ############################################################################################## */ +/* 80D2030C-80D20340 000004 0034+00 0/2 0/0 0/0 .rodata l_bmdIdx */ +static int const l_bmdIdx[13] = { + 6, 6, 6, -1, -1, -1, 6, 6, 6, 6, 6, 6, -1, +}; + +/* 80D20340-80D20374 000038 0034+00 0/1 0/0 0/0 .rodata l_dzbIdx */ +static u32 const l_dzbIdx[13] = { + 15, 15, 15, -1, -1, -1, 15, 15, 15, 15, 15, 15, -1, +}; + +/* 80D20374-80D203A8 00006C 0034+00 0/1 0/0 0/0 .rodata l_btkIdx */ +static u32 const l_btkIdx[13] = { + 12, 12, 12, -1, -1, -1, 12, 12, 12, 12, 12, 12, -1, +}; + +/* 80D203A8-80D203DC 0000A0 0034+00 0/1 0/0 0/0 .rodata l_brkIdx */ +static u32 const l_brkIdx[13] = { + 9, 9, 9, -1, -1, -1, 9, 9, 9, 9, 9, 9, -1, +}; + +/* 80D203DC-80D20410 0000D4 0034+00 0/2 0/0 0/0 .rodata l_twFlagIdx */ +static u32 const l_twFlagIdx[13] = { + 0, 1, 2, 4, -1, -1, 0, 1, 1, 2, 2, 4, 4, +}; + +/* 80D20410-80D204AC 000108 009C+00 0/1 0/0 0/0 .rodata l_cheeckPos0 */ +static Vec const l_cheeckPos0[13] = { + {-572.6072f, 314.9037f, -20792.293f}, + {-24536.904f, -7234.991f, 73427.242f}, + {3821.4783f, 4674.5557f, -59714.414f}, + {0.0f, 0.0f, 0.0f}, + {0.0f, 0.0f, 0.0f}, + {0.0f, 0.0f, 0.0f}, + {0.0f, 0.0f, 0.0f}, + {-23484.578f, -7201.7114f, 73893.843f}, + {2943.5786f, 4804.4688f, -60534.016f}, + {0.0f, 0.0f, 0.0f}, + {0.0f, 0.0f, 0.0f}, + {0.0f, 0.0f, 0.0f}, + {0.0f, 0.0f, 0.0f}, +}; + +/* 80D204AC-80D20548 0001A4 009C+00 0/1 0/0 0/0 .rodata l_cheeckPos1 */ +static Vec const l_cheeckPos1[13] = { + {-178.19418f, 308.69842f, -20657.326f}, + {-23610.3066f, -7234.9912f, 74043.75f}, + {2953.5532f, 4674.5556f, -60520.844f}, + {0.0f, 0.0f, 0.0f}, + {0.0f, 0.0f, 0.0f}, + {0.0f, 0.0f, 0.0f}, + {0.0f, 0.0f, 0.0f}, + {-24473.582, -7201.7114f, 73296.75f}, + {3821.1848f, 4804.4687f, -59707.8515f}, + {0.0f, 0.0f, 0.0f}, + {0.0f, 0.0f, 0.0f}, + {0.0f, 0.0f, 0.0f}, + {0.0f, 0.0f, 0.0f}, +}; + +/* 80D1FC0C-80D1FD44 00024C 0138+00 1/0 0/0 0/0 .text CreateHeap__10daTwGate_cFv */ +int daTwGate_c::CreateHeap() { + J3DModelData* modelData = + (J3DModelData*)dComIfG_getObjectRes(l_resNameIdx[mGateType], l_bmdIdx[mGateType]); + JUT_ASSERT(292, modelData != 0); + mModel = mDoExt_J3DModel__create(modelData, 0x80000, 0x11000284); + if (mModel == NULL) { + return 0; + } + ; + int res = mBtk.init(modelData, (J3DAnmTextureSRTKey*)dComIfG_getObjectRes(l_resNameIdx[mGateType], l_btkIdx[mGateType]), 1, 2, 1.0f, 0, -1); + JUT_ASSERT(309, res == 1); + + res = mBrk.init(modelData, (J3DAnmTevRegKey*)dComIfG_getObjectRes(l_resNameIdx[mGateType], l_brkIdx[mGateType]), 1, 0, 1.0f, 0, -1); + JUT_ASSERT(317, res == 1); + return 1; +} + +/* 80D206AC-80D206B4 000014 0008+00 2/2 0/0 0/0 .bss l_HIO */ +static daTwGate_HIO_c l_HIO; + +/* 80D1FD44-80D1FF14 000384 01D0+00 1/1 0/0 0/0 .text create__10daTwGate_cFv */ +int daTwGate_c::create() { + fopAcM_SetupActor(this, daTwGate_c); + mGateType = getGateType(); + if (l_bmdIdx[mGateType] == -1) { + // Twilight gate: Invalid argument. + OS_REPORT("=== トワイライトゲート:無効な引数です (%d) ===\n", mGateType); + return cPhs_ERROR_e; + } + + if (dComIfGs_isDarkClearLV(l_twFlagIdx[mGateType]) == TRUE) { + return cPhs_ERROR_e; + } + + int rv = dComIfG_resLoad(&mPhase, l_resNameIdx[mGateType]); + if (rv == cPhs_COMPLEATE_e) { + if (MoveBGCreate(l_resNameIdx[mGateType], l_dzbIdx[mGateType], + dBgS_MoveBGProc_TypicalRotY, 0x22a0, NULL) == cPhs_ERROR_e) { + return cPhs_ERROR_e; + } + + setBaseMtx(); + fopAcM_SetMtx(this, mModel->getBaseTRMtx()); + fopAcM_setCullSizeBox2(this, mModel->getModelData()); + mLine.SetStartEnd(l_cheeckPos0[mGateType], l_cheeckPos1[mGateType]); + mBrk.setPlaySpeed(-1.0f); + + #ifdef DEBUG + // Twilight Gate + l_HIO.entryHIO("トワイライトゲート"); + #endif + } + return rv; +} + +/* 80D1FFA4-80D200B4 0005E4 0110+00 1/0 0/0 0/0 .text Execute__10daTwGate_cFPPA3_A4_f */ +int daTwGate_c::Execute(Mtx** i_mtx) { + if (dComIfGs_isDarkClearLV(l_twFlagIdx[mGateType]) == TRUE) { + fopAcM_delete(this); + } + cXyz cStack_34; + f32 local_38; + bool res = cM3d_Len3dSqPntAndSegLine(&mLine, &dComIfGp_getPlayer(0)->current.pos, &cStack_34, &local_38); + f32 fVar1 = JMAFastSqrt(local_38); + if (fVar1 <= l_HIO.mRange) { + if (mBrk.getPlaySpeed() != 1.0f) { + mBrk.setPlaySpeed(1.0f); + } + } else { + if (mBrk.getPlaySpeed() != -1.0f) { + mBrk.setPlaySpeed(-1.0f); + } + } + mBtk.play(); + mBrk.play(); + *i_mtx = &mModel->getBaseTRMtx(); + setBaseMtx(); + return 1; +} + +/* 80D200B4-80D20180 0006F4 00CC+00 1/0 0/0 0/0 .text Draw__10daTwGate_cFv */ +int daTwGate_c::Draw() { + g_env_light.settingTevStruct(0x10, ¤t.pos, &tevStr); + g_env_light.setLightTevColorType_MAJI(mModel, &tevStr); + dComIfGd_setListDarkBG(); + mDoExt_modelUpdateDL(mModel); + dComIfGd_setList(); + J3DModelData* modelData = mModel->getModelData(); + mBtk.entry(modelData); + mBrk.entry(modelData); + return 1; +} + +/* 80D20180-80D201C0 0007C0 0040+00 1/0 0/0 0/0 .text Delete__10daTwGate_cFv */ +int daTwGate_c::Delete() { + dComIfG_resDelete(&mPhase, l_resNameIdx[mGateType]); + + #ifdef DEBUG + l_HIO.removeHIO(this); + #endif + + return 1; +} + +/* 80D201C0-80D201EC 000800 002C+00 1/0 0/0 0/0 .text daTwGate_Draw__FP10daTwGate_c */ +static int daTwGate_Draw(daTwGate_c* i_this) { + return i_this->MoveBGDraw(); +} + +/* 80D201EC-80D2020C 00082C 0020+00 1/0 0/0 0/0 .text daTwGate_Execute__FP10daTwGate_c */ +static int daTwGate_Execute(daTwGate_c* i_this) { + return i_this->MoveBGExecute(); +} + +/* 80D2020C-80D2022C 00084C 0020+00 1/0 0/0 0/0 .text daTwGate_Delete__FP10daTwGate_c */ +static int daTwGate_Delete(daTwGate_c* i_this) { + fopAcM_RegisterDeleteID(i_this, "daTwGate"); + return i_this->MoveBGDelete(); +} + +/* 80D2022C-80D2024C 00086C 0020+00 1/0 0/0 0/0 .text daTwGate_Create__FP10fopAc_ac_c */ +static int daTwGate_Create(fopAc_ac_c* i_this) { + fopAcM_RegisterCreateID(daTwGate_c, i_this, "daTwGate"); + return a_this->create(); +} + /* 80D205E4-80D20604 -00001 0020+00 1/0 0/0 0/0 .data l_daTwGate_Method */ static actor_method_class l_daTwGate_Method = { - (process_method_func)daTwGate_Create__FP10fopAc_ac_c, - (process_method_func)daTwGate_Delete__FP10daTwGate_c, - (process_method_func)daTwGate_Execute__FP10daTwGate_c, - 0, - (process_method_func)daTwGate_Draw__FP10daTwGate_c, + (process_method_func)daTwGate_Create, + (process_method_func)daTwGate_Delete, + (process_method_func)daTwGate_Execute, + NULL, + (process_method_func)daTwGate_Draw, }; /* 80D20604-80D20634 -00001 0030+00 0/0 0/0 1/0 .data g_profile_Obj_TwGate */ @@ -142,278 +257,4 @@ extern actor_process_profile_definition g_profile_Obj_TwGate = { fopAc_CULLBOX_CUSTOM_e, // cullType }; -/* 80D20634-80D20640 000084 000C+00 2/2 0/0 0/0 .data __vt__8cM3dGLin */ -SECTION_DATA extern void* __vt__8cM3dGLin[3] = { - (void*)NULL /* RTTI */, - (void*)NULL, - (void*)__dt__8cM3dGLinFv, -}; - -/* 80D20640-80D2064C 000090 000C+00 2/2 0/0 0/0 .data __vt__12J3DFrameCtrl */ -SECTION_DATA extern void* __vt__12J3DFrameCtrl[3] = { - (void*)NULL /* RTTI */, - (void*)NULL, - (void*)__dt__12J3DFrameCtrlFv, -}; - -/* 80D2064C-80D20674 00009C 0028+00 1/1 0/0 0/0 .data __vt__10daTwGate_c */ -SECTION_DATA extern void* __vt__10daTwGate_c[10] = { - (void*)NULL /* RTTI */, - (void*)NULL, - (void*)CreateHeap__10daTwGate_cFv, - (void*)Create__16dBgS_MoveBgActorFv, - (void*)Execute__10daTwGate_cFPPA3_A4_f, - (void*)Draw__10daTwGate_cFv, - (void*)Delete__10daTwGate_cFv, - (void*)IsDelete__16dBgS_MoveBgActorFv, - (void*)ToFore__16dBgS_MoveBgActorFv, - (void*)ToBack__16dBgS_MoveBgActorFv, -}; - -/* 80D20674-80D20680 0000C4 000C+00 2/2 0/0 0/0 .data __vt__14daTwGate_HIO_c */ -SECTION_DATA extern void* __vt__14daTwGate_HIO_c[3] = { - (void*)NULL /* RTTI */, - (void*)NULL, - (void*)__dt__14daTwGate_HIO_cFv, -}; - -/* 80D20680-80D2068C 0000D0 000C+00 3/3 0/0 0/0 .data __vt__18fOpAcm_HIO_entry_c */ -SECTION_DATA extern void* __vt__18fOpAcm_HIO_entry_c[3] = { - (void*)NULL /* RTTI */, - (void*)NULL, - (void*)__dt__18fOpAcm_HIO_entry_cFv, -}; - -/* 80D2068C-80D20698 0000DC 000C+00 4/4 0/0 0/0 .data __vt__14mDoHIO_entry_c */ -SECTION_DATA extern void* __vt__14mDoHIO_entry_c[3] = { - (void*)NULL /* RTTI */, - (void*)NULL, - (void*)__dt__14mDoHIO_entry_cFv, -}; - -/* 80D1FAAC-80D1FAE0 0000EC 0034+00 1/1 0/0 0/0 .text __ct__14daTwGate_HIO_cFv */ -daTwGate_HIO_c::daTwGate_HIO_c() { - // NONMATCHING -} - -/* 80D1FAE0-80D1FB3C 000120 005C+00 1/0 0/0 0/0 .text __dt__18fOpAcm_HIO_entry_cFv */ -// fOpAcm_HIO_entry_c::~fOpAcm_HIO_entry_c() { -extern "C" void __dt__18fOpAcm_HIO_entry_cFv() { - // NONMATCHING -} - -/* 80D1FB3C-80D1FB84 00017C 0048+00 1/0 0/0 0/0 .text __dt__14mDoHIO_entry_cFv */ -// mDoHIO_entry_c::~mDoHIO_entry_c() { -extern "C" void __dt__14mDoHIO_entry_cFv() { - // NONMATCHING -} - -/* 80D1FB84-80D1FC0C 0001C4 0088+00 2/2 0/0 0/0 .text setBaseMtx__10daTwGate_cFv */ -void daTwGate_c::setBaseMtx() { - // NONMATCHING -} - -/* ############################################################################################## */ -/* 80D2030C-80D20340 000004 0034+00 0/2 0/0 0/0 .rodata l_bmdIdx */ -#pragma push -#pragma force_active on -SECTION_RODATA static u8 const l_bmdIdx[52] = { - 0x00, 0x00, 0x00, 0x06, 0x00, 0x00, 0x00, 0x06, 0x00, 0x00, 0x00, 0x06, 0xFF, - 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0x00, 0x00, - 0x00, 0x06, 0x00, 0x00, 0x00, 0x06, 0x00, 0x00, 0x00, 0x06, 0x00, 0x00, 0x00, - 0x06, 0x00, 0x00, 0x00, 0x06, 0x00, 0x00, 0x00, 0x06, 0xFF, 0xFF, 0xFF, 0xFF, -}; -COMPILER_STRIP_GATE(0x80D2030C, &l_bmdIdx); -#pragma pop - -/* 80D20340-80D20374 000038 0034+00 0/1 0/0 0/0 .rodata l_dzbIdx */ -#pragma push -#pragma force_active on -SECTION_RODATA static u8 const l_dzbIdx[52] = { - 0x00, 0x00, 0x00, 0x0F, 0x00, 0x00, 0x00, 0x0F, 0x00, 0x00, 0x00, 0x0F, 0xFF, - 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0x00, 0x00, - 0x00, 0x0F, 0x00, 0x00, 0x00, 0x0F, 0x00, 0x00, 0x00, 0x0F, 0x00, 0x00, 0x00, - 0x0F, 0x00, 0x00, 0x00, 0x0F, 0x00, 0x00, 0x00, 0x0F, 0xFF, 0xFF, 0xFF, 0xFF, -}; -COMPILER_STRIP_GATE(0x80D20340, &l_dzbIdx); -#pragma pop - -/* 80D20374-80D203A8 00006C 0034+00 0/1 0/0 0/0 .rodata l_btkIdx */ -#pragma push -#pragma force_active on -SECTION_RODATA static u8 const l_btkIdx[52] = { - 0x00, 0x00, 0x00, 0x0C, 0x00, 0x00, 0x00, 0x0C, 0x00, 0x00, 0x00, 0x0C, 0xFF, - 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0x00, 0x00, - 0x00, 0x0C, 0x00, 0x00, 0x00, 0x0C, 0x00, 0x00, 0x00, 0x0C, 0x00, 0x00, 0x00, - 0x0C, 0x00, 0x00, 0x00, 0x0C, 0x00, 0x00, 0x00, 0x0C, 0xFF, 0xFF, 0xFF, 0xFF, -}; -COMPILER_STRIP_GATE(0x80D20374, &l_btkIdx); -#pragma pop - -/* 80D203A8-80D203DC 0000A0 0034+00 0/1 0/0 0/0 .rodata l_brkIdx */ -#pragma push -#pragma force_active on -SECTION_RODATA static u8 const l_brkIdx[52] = { - 0x00, 0x00, 0x00, 0x09, 0x00, 0x00, 0x00, 0x09, 0x00, 0x00, 0x00, 0x09, 0xFF, - 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0x00, 0x00, - 0x00, 0x09, 0x00, 0x00, 0x00, 0x09, 0x00, 0x00, 0x00, 0x09, 0x00, 0x00, 0x00, - 0x09, 0x00, 0x00, 0x00, 0x09, 0x00, 0x00, 0x00, 0x09, 0xFF, 0xFF, 0xFF, 0xFF, -}; -COMPILER_STRIP_GATE(0x80D203A8, &l_brkIdx); -#pragma pop - -/* 80D203DC-80D20410 0000D4 0034+00 0/2 0/0 0/0 .rodata l_twFlagIdx */ -#pragma push -#pragma force_active on -SECTION_RODATA static u8 const l_twFlagIdx[52] = { - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 0x02, 0x00, - 0x00, 0x00, 0x04, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, - 0x02, 0x00, 0x00, 0x00, 0x02, 0x00, 0x00, 0x00, 0x04, 0x00, 0x00, 0x00, 0x04, -}; -COMPILER_STRIP_GATE(0x80D203DC, &l_twFlagIdx); -#pragma pop - -/* 80D20410-80D204AC 000108 009C+00 0/1 0/0 0/0 .rodata l_cheeckPos0 */ -#pragma push -#pragma force_active on -SECTION_RODATA static u8 const l_cheeckPos0[156] = { - 0xC4, 0x0F, 0x26, 0xDC, 0x43, 0x9D, 0x73, 0xAC, 0xC6, 0xA2, 0x70, 0x96, 0xC6, 0xBF, 0xB1, 0xCF, - 0xC5, 0xE2, 0x17, 0xEE, 0x47, 0x8F, 0x69, 0x9F, 0x45, 0x6E, 0xD7, 0xA7, 0x45, 0x92, 0x14, 0x72, - 0xC7, 0x69, 0x42, 0x6A, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0xC6, 0xB7, 0x79, 0x28, 0xC5, 0xE1, 0x0D, 0xB1, 0x47, 0x90, 0x52, 0xEC, - 0x45, 0x37, 0xF9, 0x42, 0x45, 0x96, 0x23, 0xC0, 0xC7, 0x6C, 0x76, 0x04, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, -}; -COMPILER_STRIP_GATE(0x80D20410, &l_cheeckPos0); -#pragma pop - -/* 80D204AC-80D20548 0001A4 009C+00 0/1 0/0 0/0 .rodata l_cheeckPos1 */ -#pragma push -#pragma force_active on -SECTION_RODATA static u8 const l_cheeckPos1[156] = { - 0xC3, 0x32, 0x31, 0xB6, 0x43, 0x9A, 0x59, 0x66, 0xC6, 0xA1, 0x62, 0xA7, 0xC6, 0xB8, 0x74, 0x9D, - 0xC5, 0xE2, 0x17, 0xEE, 0x47, 0x90, 0x9D, 0xE0, 0x45, 0x38, 0x98, 0xDA, 0x45, 0x92, 0x14, 0x72, - 0xC7, 0x6C, 0x68, 0xD8, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0xC6, 0xBF, 0x33, 0x2A, 0xC5, 0xE1, 0x0D, 0xB1, 0x47, 0x8F, 0x28, 0x60, - 0x45, 0x6E, 0xD2, 0xF5, 0x45, 0x96, 0x23, 0xC0, 0xC7, 0x69, 0x3B, 0xDA, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, -}; -COMPILER_STRIP_GATE(0x80D204AC, &l_cheeckPos1); -#pragma pop - -/* 80D20548-80D2054C 000240 0004+00 0/2 0/0 0/0 .rodata @3693 */ -#pragma push -#pragma force_active on -SECTION_RODATA static f32 const lit_3693 = 1.0f; -COMPILER_STRIP_GATE(0x80D20548, &lit_3693); -#pragma pop - -/* 80D1FC0C-80D1FD44 00024C 0138+00 1/0 0/0 0/0 .text CreateHeap__10daTwGate_cFv */ -void daTwGate_c::CreateHeap() { - // NONMATCHING -} - -/* ############################################################################################## */ -/* 80D2054C-80D20550 000244 0004+00 0/2 0/0 0/0 .rodata @3769 */ -#pragma push -#pragma force_active on -SECTION_RODATA static f32 const lit_3769 = -1.0f; -COMPILER_STRIP_GATE(0x80D2054C, &lit_3769); -#pragma pop - -/* 80D1FD44-80D1FF14 000384 01D0+00 1/1 0/0 0/0 .text create__10daTwGate_cFv */ -void daTwGate_c::create() { - // NONMATCHING -} - -/* 80D1FF14-80D1FF5C 000554 0048+00 1/0 0/0 0/0 .text __dt__8cM3dGLinFv */ -// cM3dGLin::~cM3dGLin() { -extern "C" void __dt__8cM3dGLinFv() { - // NONMATCHING -} - -/* 80D1FF5C-80D1FFA4 00059C 0048+00 1/0 0/0 0/0 .text __dt__12J3DFrameCtrlFv */ -// J3DFrameCtrl::~J3DFrameCtrl() { -extern "C" void __dt__12J3DFrameCtrlFv() { - // NONMATCHING -} - -/* ############################################################################################## */ -/* 80D20550-80D20554 000248 0004+00 0/1 0/0 0/0 .rodata @3837 */ -#pragma push -#pragma force_active on -SECTION_RODATA static u8 const lit_3837[4] = { - 0x00, - 0x00, - 0x00, - 0x00, -}; -COMPILER_STRIP_GATE(0x80D20550, &lit_3837); -#pragma pop - -/* 80D206A0-80D206AC 000008 000C+00 1/1 0/0 0/0 .bss @3630 */ -static u8 lit_3630[12]; - -/* 80D206AC-80D206B4 000014 0008+00 2/2 0/0 0/0 .bss l_HIO */ -static u8 l_HIO[8]; - -/* 80D1FFA4-80D200B4 0005E4 0110+00 1/0 0/0 0/0 .text Execute__10daTwGate_cFPPA3_A4_f */ -void daTwGate_c::Execute(f32 (**param_0)[3][4]) { - // NONMATCHING -} - -/* 80D200B4-80D20180 0006F4 00CC+00 1/0 0/0 0/0 .text Draw__10daTwGate_cFv */ -void daTwGate_c::Draw() { - // NONMATCHING -} - -/* 80D20180-80D201C0 0007C0 0040+00 1/0 0/0 0/0 .text Delete__10daTwGate_cFv */ -void daTwGate_c::Delete() { - // NONMATCHING -} - -/* 80D201C0-80D201EC 000800 002C+00 1/0 0/0 0/0 .text daTwGate_Draw__FP10daTwGate_c */ -static void daTwGate_Draw(daTwGate_c* param_0) { - // NONMATCHING -} - -/* 80D201EC-80D2020C 00082C 0020+00 1/0 0/0 0/0 .text daTwGate_Execute__FP10daTwGate_c */ -static void daTwGate_Execute(daTwGate_c* param_0) { - // NONMATCHING -} - -/* 80D2020C-80D2022C 00084C 0020+00 1/0 0/0 0/0 .text daTwGate_Delete__FP10daTwGate_c */ -static void daTwGate_Delete(daTwGate_c* param_0) { - // NONMATCHING -} - -/* 80D2022C-80D2024C 00086C 0020+00 1/0 0/0 0/0 .text daTwGate_Create__FP10fopAc_ac_c */ -static void daTwGate_Create(fopAc_ac_c* param_0) { - // NONMATCHING -} - -/* 80D2024C-80D202B8 00088C 006C+00 2/1 0/0 0/0 .text __dt__14daTwGate_HIO_cFv */ -daTwGate_HIO_c::~daTwGate_HIO_c() { - // NONMATCHING -} - -/* 80D202B8-80D202F4 0008F8 003C+00 0/0 1/0 0/0 .text __sinit_d_a_obj_twGate_cpp */ -void __sinit_d_a_obj_twGate_cpp() { - // NONMATCHING -} - -#pragma push -#pragma force_active on -REGISTER_CTORS(0x80D202B8, __sinit_d_a_obj_twGate_cpp); -#pragma pop - /* 80D20554-80D20554 00024C 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ diff --git a/src/d/actor/d_a_obj_wood_statue.cpp b/src/d/actor/d_a_obj_wood_statue.cpp index 5d9c2c8062b..d57a51f1fa2 100644 --- a/src/d/actor/d_a_obj_wood_statue.cpp +++ b/src/d/actor/d_a_obj_wood_statue.cpp @@ -477,7 +477,7 @@ int daObjWStatue_c::_delete() { DeleteBase(dItem_data::getFieldArc(m_itemNo)); #ifdef DEBUG - l_HIO.removeHIO(); + l_HIO.removeHIO(this); #endif return 1; diff --git a/src/f_pc/f_pc_base.cpp b/src/f_pc/f_pc_base.cpp index a422bea1a21..f9f73276aac 100644 --- a/src/f_pc/f_pc_base.cpp +++ b/src/f_pc/f_pc_base.cpp @@ -145,7 +145,7 @@ base_process_class* fpcBs_Create(s16 i_profname, fpc_ProcID i_procID, void* i_ap fpcPi_Init(&pprocess->priority, pprocess, pprofile->layer_id, pprofile->list_id, pprofile->list_priority); - pprocess->init_state = 0; + pprocess->state.init_state = 0; pprocess->unk_0xA = 0; pprocess->id = i_procID; pprocess->profname = i_profname; @@ -164,19 +164,19 @@ int fpcBs_SubCreate(base_process_class* i_proc) { case cPhs_NEXT_e: case cPhs_COMPLEATE_e: fpcBs_DeleteAppend(i_proc); - i_proc->create_phase = cPhs_NEXT_e; + i_proc->state.create_phase = cPhs_NEXT_e; return cPhs_NEXT_e; case cPhs_INIT_e: - case cPhs_LOADING_e: - i_proc->init_state = 1; - i_proc->create_phase = cPhs_INIT_e; +case cPhs_LOADING_e: + i_proc->state.init_state = 1; + i_proc->state.create_phase = cPhs_INIT_e; return cPhs_INIT_e; case cPhs_UNK3_e: - i_proc->create_phase = cPhs_UNK3_e; + i_proc->state.create_phase = cPhs_UNK3_e; return cPhs_UNK3_e; case cPhs_ERROR_e: default: - i_proc->create_phase = cPhs_ERROR_e; + i_proc->state.create_phase = cPhs_ERROR_e; return cPhs_ERROR_e; } } diff --git a/src/f_pc/f_pc_deletor.cpp b/src/f_pc/f_pc_deletor.cpp index e365371927c..8a2dff317cc 100644 --- a/src/f_pc/f_pc_deletor.cpp +++ b/src/f_pc/f_pc_deletor.cpp @@ -100,7 +100,7 @@ s32 fpcDt_ToDeleteQ(base_process_class* i_proc) { } } - i_proc->init_state = 3; + i_proc->state.init_state = 3; return 1; } @@ -124,7 +124,7 @@ s32 fpcDt_Delete(void* i_proc) { if (fpcCt_IsDoing(proc) == TRUE) return 0; - if (proc->init_state == 3) + if (proc->state.init_state == 3) return 0; int ret = fpcDt_ToDeleteQ(proc); diff --git a/src/f_pc/f_pc_executor.cpp b/src/f_pc/f_pc_executor.cpp index bf23306ac1e..f6a981ba068 100644 --- a/src/f_pc/f_pc_executor.cpp +++ b/src/f_pc/f_pc_executor.cpp @@ -33,7 +33,7 @@ BOOL fpcEx_IsExist(fpc_ProcID i_id) { /* 800213C4-80021418 0054+00 s=0 e=1 z=0 None .text fpcEx_Execute__FP18base_process_class */ s32 fpcEx_Execute(base_process_class* i_proc) { - if (i_proc->init_state != 2 || fpcPause_IsEnable(i_proc, 1) == TRUE) + if (i_proc->state.init_state != 2 || fpcPause_IsEnable(i_proc, 1) == TRUE) return 0; return fpcBs_Execute(i_proc); @@ -56,7 +56,7 @@ s32 fpcEx_ToLineQ(base_process_class* i_proc) { } #endif - i_proc->init_state = 2; + i_proc->state.init_state = 2; if (fpcBs_Is_JustOfType(g_fpcNd_type, i_proc->subtype)) { fpcLyIt_OnlyHere(&((process_node_class*)i_proc)->layer, (fpcLyIt_OnlyHereFunc)fpcEx_ToLineQ, i_proc); } @@ -71,7 +71,7 @@ s32 fpcEx_ToLineQ(base_process_class* i_proc) { */ s32 fpcEx_ExecuteQTo(base_process_class* i_proc) { if (fpcLyTg_QueueTo(&i_proc->layer_tag) == 1) { - i_proc->init_state = 3; + i_proc->state.init_state = 3; return 1; } diff --git a/src/f_pc/f_pc_leaf.cpp b/src/f_pc/f_pc_leaf.cpp index b1906bf7336..bb343afd348 100644 --- a/src/f_pc/f_pc_leaf.cpp +++ b/src/f_pc/f_pc_leaf.cpp @@ -57,7 +57,7 @@ int g_fpcLf_type; /* 80021B14-80021B88 0074+00 s=1 e=0 z=0 None .text fpcLf_Create__FP14leafdraw_class */ s32 fpcLf_Create(leafdraw_class* i_leaf) { - if (i_leaf->base.init_state == 0) { + if (i_leaf->base.state.init_state == 0) { leaf_process_profile_definition* pprofile = (leaf_process_profile_definition*)i_leaf->base.profile; i_leaf->leaf_methods = pprofile->sub_method; i_leaf->base.subtype = fpcBs_MakeOfType(&g_fpcLf_type); diff --git a/src/f_pc/f_pc_node.cpp b/src/f_pc/f_pc_node.cpp index 72828c79682..f5c326d20eb 100644 --- a/src/f_pc/f_pc_node.cpp +++ b/src/f_pc/f_pc_node.cpp @@ -105,7 +105,7 @@ s32 fpcNd_Create(process_node_class* i_procNode) { layer_class* save_layer; s32 ret; - if (procnode->base.init_state == 0) { + if (procnode->base.state.init_state == 0) { node_process_profile_definition* pprofile = (node_process_profile_definition*)procnode->base.profile; procnode->base.subtype = fpcBs_MakeOfType(&g_fpcNd_type); procnode->nodedraw_method = (nodedraw_method_class*)pprofile->sub_methods; diff --git a/src/f_pc/f_pc_priority.cpp b/src/f_pc/f_pc_priority.cpp index 8d7a4b3a63a..896a28b0289 100644 --- a/src/f_pc/f_pc_priority.cpp +++ b/src/f_pc/f_pc_priority.cpp @@ -85,7 +85,7 @@ s32 fpcPi_Change(process_priority_class* i_procPriority, fpc_ProcID i_layerID, u base_process_class* process = (base_process_class*)i_procPriority->base.mpTagData; BOOL changed = FALSE; - if (process->init_state == 3) + if (process->state.init_state == 3) return 0; if (!fpcPi_IsNormal(i_layerID, i_listID, i_priority)) @@ -108,7 +108,7 @@ s32 fpcPi_Change(process_priority_class* i_procPriority, fpc_ProcID i_layerID, u changed = TRUE; } - if (process->init_state == 0 || process->init_state == 1) { + if (process->state.init_state == 0 || process->state.init_state == 1) { i_procPriority->current_info = i_procPriority->queue_info; return 1; }