From 58a6d8d7931e982a4d00fe14d30f2bf325ac4e84 Mon Sep 17 00:00:00 2001 From: hatal175 Date: Tue, 12 Aug 2025 03:18:42 +0300 Subject: [PATCH] d_a_obj_gomikabe OK (#2580) * d_a_obj_gomikabe OK * Remove unneeded include --- .../GZ2E01/rels/d_a_obj_gomikabe/symbols.txt | 18 +- .../GZ2J01/rels/d_a_obj_gomikabe/symbols.txt | 16 +- .../GZ2P01/rels/d_a_obj_gomikabe/symbols.txt | 18 +- .../rels/d_a_obj_gomikabe/symbols.txt | 18 +- .../rels/d_a_obj_gomikabeD/symbols.txt | 16 +- configure.py | 2 +- include/JSystem/JMath/JMATrigonometric.h | 4 +- include/d/actor/d_a_obj_gomikabe.h | 57 +- include/d/d_bg_s_acch.h | 4 +- src/d/actor/d_a_obj_gomikabe.cpp | 1114 ++++++----------- 10 files changed, 507 insertions(+), 760 deletions(-) diff --git a/config/GZ2E01/rels/d_a_obj_gomikabe/symbols.txt b/config/GZ2E01/rels/d_a_obj_gomikabe/symbols.txt index 9b36f910538..c63329fe7af 100644 --- a/config/GZ2E01/rels/d_a_obj_gomikabe/symbols.txt +++ b/config/GZ2E01/rels/d_a_obj_gomikabe/symbols.txt @@ -7,8 +7,8 @@ __ct__19daObjGOMIKABE_HIO_cFv = .text:0x000000EC; // type:function size:0x18 sco initCcCylinder__15daObjGOMIKABE_cFv = .text:0x00000104; // type:function size:0x88 scope:global SetCcCyl__15daObjGOMIKABE_cFv = .text:0x0000018C; // type:function size:0x130 scope:global __dt__4cXyzFv = .text:0x000002BC; // type:function size:0x3C scope:global -daObjGOMIKABE_Create__FP10fopAc_ac_c = .text:0x000002F8; // type:function size:0x20 scope:global -daObjGOMIKABE_Delete__FP15daObjGOMIKABE_c = .text:0x00000318; // type:function size:0x24 scope:global +daObjGOMIKABE_Create__FP10fopAc_ac_c = .text:0x000002F8; // type:function size:0x20 scope:local +daObjGOMIKABE_Delete__FP15daObjGOMIKABE_c = .text:0x00000318; // type:function size:0x24 scope:local WaitAction__15daObjGOMIKABE_cFv = .text:0x0000033C; // type:function size:0x48 scope:global BreakChk__15daObjGOMIKABE_cFv = .text:0x00000384; // type:function size:0x68 scope:global BreakSet__15daObjGOMIKABE_cFv = .text:0x000003EC; // type:function size:0x4F8 scope:global @@ -21,8 +21,8 @@ checkViewArea__15daObjGOMIKABE_cF4cXyz = .text:0x00000CE4; // type:function size Action__15daObjGOMIKABE_cFv = .text:0x00000D68; // type:function size:0x78 scope:global setBaseMtx__15daObjGOMIKABE_cFv = .text:0x00000DE0; // type:function size:0x64 scope:global setBaseMtx2__15daObjGOMIKABE_cFv = .text:0x00000E44; // type:function size:0x94 scope:global -daObjGOMIKABE_Draw__FP15daObjGOMIKABE_c = .text:0x00000ED8; // type:function size:0x2C scope:global -daObjGOMIKABE_Execute__FP15daObjGOMIKABE_c = .text:0x00000F04; // type:function size:0x20 scope:global +daObjGOMIKABE_Draw__FP15daObjGOMIKABE_c = .text:0x00000ED8; // type:function size:0x2C scope:local +daObjGOMIKABE_Execute__FP15daObjGOMIKABE_c = .text:0x00000F04; // type:function size:0x20 scope:local CreateHeap__15daObjGOMIKABE_cFv = .text:0x00000F24; // type:function size:0x100 scope:global create__15daObjGOMIKABE_cFv = .text:0x00001024; // type:function size:0x450 scope:global __dt__8dCcD_SphFv = .text:0x00001474; // type:function size:0xCC scope:global @@ -34,7 +34,7 @@ __ct__12dBgS_ObjAcchFv = .text:0x000016C4; // type:function size:0x54 scope:glob __dt__12dBgS_AcchCirFv = .text:0x00001718; // type:function size:0x70 scope:global __ct__5csXyzFv = .text:0x00001788; // type:function size:0x4 scope:global __ct__4cXyzFv = .text:0x0000178C; // type:function size:0x4 scope:global -daObjGOMIKABE_IsDelete__FP15daObjGOMIKABE_c = .text:0x00001790; // type:function size:0x8 scope:global +daObjGOMIKABE_IsDelete__FP15daObjGOMIKABE_c = .text:0x00001790; // type:function size:0x8 scope:local Create__15daObjGOMIKABE_cFv = .text:0x00001798; // type:function size:0x60 scope:global Execute__15daObjGOMIKABE_cFPPA3_A4_f = .text:0x000017F8; // type:function size:0xC8 scope:global Draw__15daObjGOMIKABE_cFv = .text:0x000018C0; // type:function size:0x11C scope:global @@ -81,8 +81,8 @@ ccSphSrc$3769 = .rodata:0x00000000; // type:object size:0x40 scope:local @4607 = .rodata:0x000000D0; // type:object size:0x4 scope:local @4620 = .rodata:0x000000D4; // type:object size:0x4 scope:local align:4 data:float @stringBase0 = .rodata:0x000000D8; // type:object size:0x3C scope:local data:string_table -l_arcName = .data:0x00000000; // type:object size:0x4 scope:global -l_daObjGOMIKABE_Method = .data:0x00000004; // type:object size:0x20 scope:global +l_arcName = .data:0x00000000; // type:object size:0x4 scope:local +l_daObjGOMIKABE_Method = .data:0x00000004; // type:object size:0x20 scope:local g_profile_Obj_GOMIKABE = .data:0x00000024; // type:object size:0x30 scope:global __vt__12dBgS_AcchCir = .data:0x00000054; // type:object size:0xC scope:global __vt__12dBgS_ObjAcch = .data:0x00000060; // type:object size:0x24 scope:global @@ -91,6 +91,6 @@ __vt__8cM3dGSph = .data:0x00000090; // type:object size:0xC scope:global __vt__15daObjGOMIKABE_c = .data:0x0000009C; // type:object size:0x28 scope:global __vt__19daObjGOMIKABE_HIO_c = .data:0x000000C4; // type:object size:0xC scope:global __global_destructor_chain = .bss:0x00000000; // type:object size:0x4 scope:global -lbl_462_bss_8 = .bss:0x00000008; // type:object size:0x1 data:byte +l_HIOInit = .bss:0x00000008; // type:object size:0x1 scope:local data:byte @3761 = .bss:0x0000000C; // type:object size:0xC scope:local -l_HIO = .bss:0x00000018; // type:object size:0x8 scope:global data:byte +l_HIO = .bss:0x00000018; // type:object size:0x8 scope:local data:byte diff --git a/config/GZ2J01/rels/d_a_obj_gomikabe/symbols.txt b/config/GZ2J01/rels/d_a_obj_gomikabe/symbols.txt index 9b36f910538..98b2076bbe0 100644 --- a/config/GZ2J01/rels/d_a_obj_gomikabe/symbols.txt +++ b/config/GZ2J01/rels/d_a_obj_gomikabe/symbols.txt @@ -7,8 +7,8 @@ __ct__19daObjGOMIKABE_HIO_cFv = .text:0x000000EC; // type:function size:0x18 sco initCcCylinder__15daObjGOMIKABE_cFv = .text:0x00000104; // type:function size:0x88 scope:global SetCcCyl__15daObjGOMIKABE_cFv = .text:0x0000018C; // type:function size:0x130 scope:global __dt__4cXyzFv = .text:0x000002BC; // type:function size:0x3C scope:global -daObjGOMIKABE_Create__FP10fopAc_ac_c = .text:0x000002F8; // type:function size:0x20 scope:global -daObjGOMIKABE_Delete__FP15daObjGOMIKABE_c = .text:0x00000318; // type:function size:0x24 scope:global +daObjGOMIKABE_Create__FP10fopAc_ac_c = .text:0x000002F8; // type:function size:0x20 scope:local +daObjGOMIKABE_Delete__FP15daObjGOMIKABE_c = .text:0x00000318; // type:function size:0x24 scope:local WaitAction__15daObjGOMIKABE_cFv = .text:0x0000033C; // type:function size:0x48 scope:global BreakChk__15daObjGOMIKABE_cFv = .text:0x00000384; // type:function size:0x68 scope:global BreakSet__15daObjGOMIKABE_cFv = .text:0x000003EC; // type:function size:0x4F8 scope:global @@ -21,8 +21,8 @@ checkViewArea__15daObjGOMIKABE_cF4cXyz = .text:0x00000CE4; // type:function size Action__15daObjGOMIKABE_cFv = .text:0x00000D68; // type:function size:0x78 scope:global setBaseMtx__15daObjGOMIKABE_cFv = .text:0x00000DE0; // type:function size:0x64 scope:global setBaseMtx2__15daObjGOMIKABE_cFv = .text:0x00000E44; // type:function size:0x94 scope:global -daObjGOMIKABE_Draw__FP15daObjGOMIKABE_c = .text:0x00000ED8; // type:function size:0x2C scope:global -daObjGOMIKABE_Execute__FP15daObjGOMIKABE_c = .text:0x00000F04; // type:function size:0x20 scope:global +daObjGOMIKABE_Draw__FP15daObjGOMIKABE_c = .text:0x00000ED8; // type:function size:0x2C scope:local +daObjGOMIKABE_Execute__FP15daObjGOMIKABE_c = .text:0x00000F04; // type:function size:0x20 scope:local CreateHeap__15daObjGOMIKABE_cFv = .text:0x00000F24; // type:function size:0x100 scope:global create__15daObjGOMIKABE_cFv = .text:0x00001024; // type:function size:0x450 scope:global __dt__8dCcD_SphFv = .text:0x00001474; // type:function size:0xCC scope:global @@ -34,7 +34,7 @@ __ct__12dBgS_ObjAcchFv = .text:0x000016C4; // type:function size:0x54 scope:glob __dt__12dBgS_AcchCirFv = .text:0x00001718; // type:function size:0x70 scope:global __ct__5csXyzFv = .text:0x00001788; // type:function size:0x4 scope:global __ct__4cXyzFv = .text:0x0000178C; // type:function size:0x4 scope:global -daObjGOMIKABE_IsDelete__FP15daObjGOMIKABE_c = .text:0x00001790; // type:function size:0x8 scope:global +daObjGOMIKABE_IsDelete__FP15daObjGOMIKABE_c = .text:0x00001790; // type:function size:0x8 scope:local Create__15daObjGOMIKABE_cFv = .text:0x00001798; // type:function size:0x60 scope:global Execute__15daObjGOMIKABE_cFPPA3_A4_f = .text:0x000017F8; // type:function size:0xC8 scope:global Draw__15daObjGOMIKABE_cFv = .text:0x000018C0; // type:function size:0x11C scope:global @@ -81,7 +81,7 @@ ccSphSrc$3769 = .rodata:0x00000000; // type:object size:0x40 scope:local @4607 = .rodata:0x000000D0; // type:object size:0x4 scope:local @4620 = .rodata:0x000000D4; // type:object size:0x4 scope:local align:4 data:float @stringBase0 = .rodata:0x000000D8; // type:object size:0x3C scope:local data:string_table -l_arcName = .data:0x00000000; // type:object size:0x4 scope:global +l_arcName = .data:0x00000000; // type:object size:0x4 scope:local l_daObjGOMIKABE_Method = .data:0x00000004; // type:object size:0x20 scope:global g_profile_Obj_GOMIKABE = .data:0x00000024; // type:object size:0x30 scope:global __vt__12dBgS_AcchCir = .data:0x00000054; // type:object size:0xC scope:global @@ -91,6 +91,6 @@ __vt__8cM3dGSph = .data:0x00000090; // type:object size:0xC scope:global __vt__15daObjGOMIKABE_c = .data:0x0000009C; // type:object size:0x28 scope:global __vt__19daObjGOMIKABE_HIO_c = .data:0x000000C4; // type:object size:0xC scope:global __global_destructor_chain = .bss:0x00000000; // type:object size:0x4 scope:global -lbl_462_bss_8 = .bss:0x00000008; // type:object size:0x1 data:byte +l_HIOInit = .bss:0x00000008; // type:object size:0x1 data:byte scope:local @3761 = .bss:0x0000000C; // type:object size:0xC scope:local -l_HIO = .bss:0x00000018; // type:object size:0x8 scope:global data:byte +l_HIO = .bss:0x00000018; // type:object size:0x8 scope:local data:byte diff --git a/config/GZ2P01/rels/d_a_obj_gomikabe/symbols.txt b/config/GZ2P01/rels/d_a_obj_gomikabe/symbols.txt index 9b36f910538..b4b6b266415 100644 --- a/config/GZ2P01/rels/d_a_obj_gomikabe/symbols.txt +++ b/config/GZ2P01/rels/d_a_obj_gomikabe/symbols.txt @@ -7,8 +7,8 @@ __ct__19daObjGOMIKABE_HIO_cFv = .text:0x000000EC; // type:function size:0x18 sco initCcCylinder__15daObjGOMIKABE_cFv = .text:0x00000104; // type:function size:0x88 scope:global SetCcCyl__15daObjGOMIKABE_cFv = .text:0x0000018C; // type:function size:0x130 scope:global __dt__4cXyzFv = .text:0x000002BC; // type:function size:0x3C scope:global -daObjGOMIKABE_Create__FP10fopAc_ac_c = .text:0x000002F8; // type:function size:0x20 scope:global -daObjGOMIKABE_Delete__FP15daObjGOMIKABE_c = .text:0x00000318; // type:function size:0x24 scope:global +daObjGOMIKABE_Create__FP10fopAc_ac_c = .text:0x000002F8; // type:function size:0x20 scope:local +daObjGOMIKABE_Delete__FP15daObjGOMIKABE_c = .text:0x00000318; // type:function size:0x24 scope:local WaitAction__15daObjGOMIKABE_cFv = .text:0x0000033C; // type:function size:0x48 scope:global BreakChk__15daObjGOMIKABE_cFv = .text:0x00000384; // type:function size:0x68 scope:global BreakSet__15daObjGOMIKABE_cFv = .text:0x000003EC; // type:function size:0x4F8 scope:global @@ -21,8 +21,8 @@ checkViewArea__15daObjGOMIKABE_cF4cXyz = .text:0x00000CE4; // type:function size Action__15daObjGOMIKABE_cFv = .text:0x00000D68; // type:function size:0x78 scope:global setBaseMtx__15daObjGOMIKABE_cFv = .text:0x00000DE0; // type:function size:0x64 scope:global setBaseMtx2__15daObjGOMIKABE_cFv = .text:0x00000E44; // type:function size:0x94 scope:global -daObjGOMIKABE_Draw__FP15daObjGOMIKABE_c = .text:0x00000ED8; // type:function size:0x2C scope:global -daObjGOMIKABE_Execute__FP15daObjGOMIKABE_c = .text:0x00000F04; // type:function size:0x20 scope:global +daObjGOMIKABE_Draw__FP15daObjGOMIKABE_c = .text:0x00000ED8; // type:function size:0x2C scope:local +daObjGOMIKABE_Execute__FP15daObjGOMIKABE_c = .text:0x00000F04; // type:function size:0x20 scope:local CreateHeap__15daObjGOMIKABE_cFv = .text:0x00000F24; // type:function size:0x100 scope:global create__15daObjGOMIKABE_cFv = .text:0x00001024; // type:function size:0x450 scope:global __dt__8dCcD_SphFv = .text:0x00001474; // type:function size:0xCC scope:global @@ -34,7 +34,7 @@ __ct__12dBgS_ObjAcchFv = .text:0x000016C4; // type:function size:0x54 scope:glob __dt__12dBgS_AcchCirFv = .text:0x00001718; // type:function size:0x70 scope:global __ct__5csXyzFv = .text:0x00001788; // type:function size:0x4 scope:global __ct__4cXyzFv = .text:0x0000178C; // type:function size:0x4 scope:global -daObjGOMIKABE_IsDelete__FP15daObjGOMIKABE_c = .text:0x00001790; // type:function size:0x8 scope:global +daObjGOMIKABE_IsDelete__FP15daObjGOMIKABE_c = .text:0x00001790; // type:function size:0x8 scope:local Create__15daObjGOMIKABE_cFv = .text:0x00001798; // type:function size:0x60 scope:global Execute__15daObjGOMIKABE_cFPPA3_A4_f = .text:0x000017F8; // type:function size:0xC8 scope:global Draw__15daObjGOMIKABE_cFv = .text:0x000018C0; // type:function size:0x11C scope:global @@ -81,8 +81,8 @@ ccSphSrc$3769 = .rodata:0x00000000; // type:object size:0x40 scope:local @4607 = .rodata:0x000000D0; // type:object size:0x4 scope:local @4620 = .rodata:0x000000D4; // type:object size:0x4 scope:local align:4 data:float @stringBase0 = .rodata:0x000000D8; // type:object size:0x3C scope:local data:string_table -l_arcName = .data:0x00000000; // type:object size:0x4 scope:global -l_daObjGOMIKABE_Method = .data:0x00000004; // type:object size:0x20 scope:global +l_arcName = .data:0x00000000; // type:object size:0x4 scope:local +l_daObjGOMIKABE_Method = .data:0x00000004; // type:object size:0x20 scope:local g_profile_Obj_GOMIKABE = .data:0x00000024; // type:object size:0x30 scope:global __vt__12dBgS_AcchCir = .data:0x00000054; // type:object size:0xC scope:global __vt__12dBgS_ObjAcch = .data:0x00000060; // type:object size:0x24 scope:global @@ -91,6 +91,6 @@ __vt__8cM3dGSph = .data:0x00000090; // type:object size:0xC scope:global __vt__15daObjGOMIKABE_c = .data:0x0000009C; // type:object size:0x28 scope:global __vt__19daObjGOMIKABE_HIO_c = .data:0x000000C4; // type:object size:0xC scope:global __global_destructor_chain = .bss:0x00000000; // type:object size:0x4 scope:global -lbl_462_bss_8 = .bss:0x00000008; // type:object size:0x1 data:byte +l_HIOInit = .bss:0x00000008; // type:object size:0x1 data:byte scope:local @3761 = .bss:0x0000000C; // type:object size:0xC scope:local -l_HIO = .bss:0x00000018; // type:object size:0x8 scope:global data:byte +l_HIO = .bss:0x00000018; // type:object size:0x8 scope:local data:byte diff --git a/config/RZDE01_00/rels/d_a_obj_gomikabe/symbols.txt b/config/RZDE01_00/rels/d_a_obj_gomikabe/symbols.txt index 8d697259cd9..a9e63e5534c 100644 --- a/config/RZDE01_00/rels/d_a_obj_gomikabe/symbols.txt +++ b/config/RZDE01_00/rels/d_a_obj_gomikabe/symbols.txt @@ -6,8 +6,8 @@ __destroy_global_chain = .text:0x00000078; // type:function size:0x54 scope:glob __ct__19daObjGOMIKABE_HIO_cFv = .text:0x000000CC; // type:function size:0x18 scope:global initCcCylinder__15daObjGOMIKABE_cFv = .text:0x000000E4; // type:function size:0x88 scope:global SetCcCyl__15daObjGOMIKABE_cFv = .text:0x0000016C; // type:function size:0x140 scope:global -daObjGOMIKABE_Create__FP10fopAc_ac_c = .text:0x000002AC; // type:function size:0x3F8 scope:global -daObjGOMIKABE_Delete__FP15daObjGOMIKABE_c = .text:0x000006A4; // type:function size:0x24 scope:global +daObjGOMIKABE_Create__FP10fopAc_ac_c = .text:0x000002AC; // type:function size:0x3F8 scope:local +daObjGOMIKABE_Delete__FP15daObjGOMIKABE_c = .text:0x000006A4; // type:function size:0x24 scope:local WaitAction__15daObjGOMIKABE_cFv = .text:0x000006C8; // type:function size:0x4C scope:global BreakChk__15daObjGOMIKABE_cFv = .text:0x00000714; // type:function size:0x68 scope:global BreakSet__15daObjGOMIKABE_cFv = .text:0x0000077C; // type:function size:0x508 scope:global @@ -18,10 +18,10 @@ checkViewArea__15daObjGOMIKABE_cF4cXyz = .text:0x00001038; // type:function size Action__15daObjGOMIKABE_cFv = .text:0x000010BC; // type:function size:0x78 scope:global setBaseMtx__15daObjGOMIKABE_cFv = .text:0x00001134; // type:function size:0x68 scope:global setBaseMtx2__15daObjGOMIKABE_cFv = .text:0x0000119C; // type:function size:0x90 scope:global -daObjGOMIKABE_Draw__FP15daObjGOMIKABE_c = .text:0x0000122C; // type:function size:0x10 scope:global -daObjGOMIKABE_Execute__FP15daObjGOMIKABE_c = .text:0x0000123C; // type:function size:0x4 scope:global +daObjGOMIKABE_Draw__FP15daObjGOMIKABE_c = .text:0x0000122C; // type:function size:0x10 scope:local +daObjGOMIKABE_Execute__FP15daObjGOMIKABE_c = .text:0x0000123C; // type:function size:0x4 scope:local CreateHeap__15daObjGOMIKABE_cFv = .text:0x00001240; // type:function size:0xE0 scope:global -daObjGOMIKABE_IsDelete__FP15daObjGOMIKABE_c = .text:0x00001320; // type:function size:0x8 scope:global +daObjGOMIKABE_IsDelete__FP15daObjGOMIKABE_c = .text:0x00001320; // type:function size:0x8 scope:local __dt__19daObjGOMIKABE_HIO_cFv = .text:0x00001328; // type:function size:0x40 scope:global Delete__15daObjGOMIKABE_cFv = .text:0x00001368; // type:function size:0x54 scope:global Draw__15daObjGOMIKABE_cFv = .text:0x000013BC; // type:function size:0xDC scope:global @@ -64,8 +64,8 @@ ccSphSrc$93417 = .rodata:0x00000000; // type:object size:0x40 scope:local @95814 = .rodata:0x000000BC; // type:object size:0x4 scope:local align:4 data:float @95818 = .rodata:0x000000C0; // type:object size:0x4 scope:local lbl_462_data_0 = .data:0x00000000; // type:object size:0xC -l_arcName = .data:0x0000000C; // type:object size:0x4 scope:global data:4byte -l_daObjGOMIKABE_Method = .data:0x00000010; // type:object size:0x20 scope:global +l_arcName = .data:0x0000000C; // type:object size:0x4 scope:local data:4byte +l_daObjGOMIKABE_Method = .data:0x00000010; // type:object size:0x20 scope:local g_profile_Obj_GOMIKABE = .data:0x00000030; // type:object size:0x30 scope:global __vt__19daObjGOMIKABE_HIO_c = .data:0x00000060; // type:object size:0xC scope:global lbl_462_data_6C = .data:0x0000006C; // type:object size:0x14 data:string @@ -79,6 +79,6 @@ lbl_462_data_E8 = .data:0x000000E8; // type:object size:0xF data:string lbl_462_data_F7 = .data:0x000000F7; // type:object size:0x15 data:string lbl_462_data_10C = .data:0x0000010C; // type:object size:0x10 __global_destructor_chain = .bss:0x00000000; // type:object size:0x4 scope:global -lbl_462_bss_8 = .bss:0x00000008; // type:object size:0x1 data:byte +l_HIOInit = .bss:0x00000008; // type:object size:0x1 data:byte scope:local @93404 = .bss:0x0000000C; // type:object size:0xC scope:local -l_HIO = .bss:0x00000018; // type:object size:0x8 scope:global data:byte +l_HIO = .bss:0x00000018; // type:object size:0x8 scope:local data:byte diff --git a/config/ShieldD/rels/d_a_obj_gomikabeD/symbols.txt b/config/ShieldD/rels/d_a_obj_gomikabeD/symbols.txt index 5048a4a683c..cd823dd932d 100644 --- a/config/ShieldD/rels/d_a_obj_gomikabeD/symbols.txt +++ b/config/ShieldD/rels/d_a_obj_gomikabeD/symbols.txt @@ -6,8 +6,8 @@ __ct__19daObjGOMIKABE_HIO_cFv = .text:0x000000D0; // type:function size:0x48 sco genMessage__19daObjGOMIKABE_HIO_cFP11JORMContext = .text:0x00000120; // type:function size:0x6C scope:global initCcCylinder__15daObjGOMIKABE_cFv = .text:0x00000190; // type:function size:0xAC scope:global SetCcCyl__15daObjGOMIKABE_cFv = .text:0x00000240; // type:function size:0x11C scope:global -daObjGOMIKABE_Create__FP10fopAc_ac_c = .text:0x00000360; // type:function size:0x50 scope:global -daObjGOMIKABE_Delete__FP15daObjGOMIKABE_c = .text:0x000003B0; // type:function size:0x48 scope:global +daObjGOMIKABE_Create__FP10fopAc_ac_c = .text:0x00000360; // type:function size:0x50 scope:local +daObjGOMIKABE_Delete__FP15daObjGOMIKABE_c = .text:0x000003B0; // type:function size:0x48 scope:local WaitAction__15daObjGOMIKABE_cFv = .text:0x00000400; // type:function size:0x78 scope:global BreakChk__15daObjGOMIKABE_cFv = .text:0x00000480; // type:function size:0x7C scope:global BreakSet__15daObjGOMIKABE_cFv = .text:0x00000500; // type:function size:0x53C scope:global @@ -19,13 +19,13 @@ checkViewArea__15daObjGOMIKABE_cF4cXyz = .text:0x00000F50; // type:function size Action__15daObjGOMIKABE_cFv = .text:0x00001020; // type:function size:0x80 scope:global setBaseMtx__15daObjGOMIKABE_cFv = .text:0x000010A0; // type:function size:0x5C scope:global setBaseMtx2__15daObjGOMIKABE_cFv = .text:0x00001100; // type:function size:0x98 scope:global -daObjGOMIKABE_Draw__FP15daObjGOMIKABE_c = .text:0x000011A0; // type:function size:0x28 scope:global -daObjGOMIKABE_Execute__FP15daObjGOMIKABE_c = .text:0x000011D0; // type:function size:0x28 scope:global +daObjGOMIKABE_Draw__FP15daObjGOMIKABE_c = .text:0x000011A0; // type:function size:0x28 scope:local +daObjGOMIKABE_Execute__FP15daObjGOMIKABE_c = .text:0x000011D0; // type:function size:0x28 scope:local CreateHeap__15daObjGOMIKABE_cFv = .text:0x00001200; // type:function size:0x184 scope:global create__15daObjGOMIKABE_cFv = .text:0x00001390; // type:function size:0x3B0 scope:global __ct__15daObjGOMIKABE_cFv = .text:0x00001740; // type:function size:0x1A0 scope:global __ct__11dCcU_AtInfoFv = .text:0x000018E0; // type:function size:0x34 scope:global -daObjGOMIKABE_IsDelete__FP15daObjGOMIKABE_c = .text:0x00001920; // type:function size:0x8 scope:global +daObjGOMIKABE_IsDelete__FP15daObjGOMIKABE_c = .text:0x00001920; // type:function size:0x8 scope:local Create__15daObjGOMIKABE_cFv = .text:0x00001930; // type:function size:0x8C scope:global Execute__15daObjGOMIKABE_cFPPA3_A4_f = .text:0x000019C0; // type:function size:0xD8 scope:global Draw__15daObjGOMIKABE_cFv = .text:0x00001AA0; // type:function size:0xF4 scope:global @@ -69,8 +69,8 @@ cNullVec__6Z2Calc = .rodata:0x000000C0; // type:object size:0xC scope:global lbl_450_rodata_D0 = .rodata:0x000000D0; // type:object size:0x14 @118406 = .data:0x00000000; // type:object size:0x9 scope:local @118407 = .data:0x0000000C; // type:object size:0x9 scope:local data:string -l_arcName = .data:0x00000018; // type:object size:0x4 scope:global data:4byte -l_daObjGOMIKABE_Method = .data:0x00000020; // type:object size:0x20 scope:global +l_arcName = .data:0x00000018; // type:object size:0x4 scope:local data:4byte +l_daObjGOMIKABE_Method = .data:0x00000020; // type:object size:0x20 scope:local g_profile_Obj_GOMIKABE = .data:0x00000040; // type:object size:0x30 scope:global __vt__19daObjGOMIKABE_HIO_c = .data:0x00000070; // type:object size:0x20 scope:global @119037 = .data:0x00000090; // type:object size:0x14 scope:local data:string @@ -98,4 +98,4 @@ __RTTI__15daObjGOMIKABE_c = .data:0x00000110; // type:object size:0x8 scope:glob @STRING@CreateHeap__15daObjGOMIKABE_cFv@0 = .data:0x00000230; // type:object size:0x15 scope:local data:string @STRING@CreateHeap__15daObjGOMIKABE_cFv = .data:0x00000248; // type:object size:0xF scope:local data:string lbl_450_bss_0 = .bss:0x00000000; // type:object size:0x1 data:byte -l_HIO = .bss:0x00000008; // type:object size:0x8 scope:global data:byte +l_HIO = .bss:0x00000008; // type:object size:0x8 scope:local data:byte diff --git a/configure.py b/configure.py index 047080338d7..b3b713b3085 100755 --- a/configure.py +++ b/configure.py @@ -1939,7 +1939,7 @@ config.libs = [ ActorRel(MatchingFor("GZ2E01"), "d_a_obj_glowSphere"), ActorRel(NonMatching, "d_a_obj_gm"), ActorRel(MatchingFor("GZ2E01"), "d_a_obj_goGate"), - ActorRel(NonMatching, "d_a_obj_gomikabe"), + ActorRel(MatchingFor("GZ2E01"), "d_a_obj_gomikabe"), ActorRel(Equivalent, "d_a_obj_gra2"), # weak function order ActorRel(MatchingFor("GZ2E01"), "d_a_obj_graWall"), ActorRel(MatchingFor("GZ2E01"), "d_a_obj_gra_rock"), diff --git a/include/JSystem/JMath/JMATrigonometric.h b/include/JSystem/JMath/JMATrigonometric.h index fdbab33a1a7..1b88975794c 100644 --- a/include/JSystem/JMath/JMATrigonometric.h +++ b/include/JSystem/JMath/JMATrigonometric.h @@ -103,7 +103,7 @@ inline f32 acosDegree(f32 x) { } }; // namespace JMath -inline f32 JMASCosShort(s16 v) { +inline f32 JMACosShort(s16 v) { return JMath::sincosTable_.cosShort(v); } inline f32 JMASinShort(s16 v) { @@ -111,7 +111,7 @@ inline f32 JMASinShort(s16 v) { } inline f32 JMASCos(s16 v) { - return JMASCosShort(v); + return JMACosShort(v); } inline f32 JMASSin(s16 v) { return JMASinShort(v); diff --git a/include/d/actor/d_a_obj_gomikabe.h b/include/d/actor/d_a_obj_gomikabe.h index 06b891eb631..730e1c56c1c 100644 --- a/include/d/actor/d_a_obj_gomikabe.h +++ b/include/d/actor/d_a_obj_gomikabe.h @@ -1,6 +1,9 @@ #ifndef D_A_OBJ_GOMIKABE_H #define D_A_OBJ_GOMIKABE_H +#include "d/d_bg_s_acch.h" +#include "d/d_bg_s_movebg_actor.h" +#include "d/d_cc_d.h" #include "f_op/f_op_actor_mng.h" /** @@ -11,8 +14,13 @@ * @details * */ -class daObjGOMIKABE_c : public fopAc_ac_c { +class daObjGOMIKABE_c : public dBgS_MoveBgActor { public: + enum Action { + ACTION_WAIT, + ACTION_BREAK, + }; + /* 80BFE244 */ void initCcCylinder(); /* 80BFE2CC */ void SetCcCyl(); /* 80BFE47C */ void WaitAction(); @@ -22,27 +30,54 @@ public: /* 80BFEB90 */ void SpeedSet(); /* 80BFED54 */ void BreakAction(); /* 80BFED74 */ void CheckCull(); - /* 80BFEE24 */ void checkViewArea(cXyz); + /* 80BFEE24 */ bool checkViewArea(cXyz); /* 80BFEEA8 */ void Action(); /* 80BFEF20 */ void setBaseMtx(); /* 80BFEF84 */ void setBaseMtx2(); - /* 80BFF064 */ void CreateHeap(); - /* 80BFF164 */ void create(); - /* 80BFF8D8 */ void Create(); - /* 80BFF938 */ void Execute(f32 (**)[3][4]); - /* 80BFFA00 */ void Draw(); - /* 80BFFB1C */ void Delete(); + /* 80BFF064 */ int CreateHeap(); + /* 80BFF164 */ int create(); + /* 80BFF8D8 */ int Create(); + /* 80BFF938 */ int Execute(Mtx**); + /* 80BFFA00 */ int Draw(); + /* 80BFFB1C */ int Delete(); private: - /* 0x568 */ u8 field_0x568[0x13c4 - 0x568]; + /* 0x05A0 */ u8 mSwBit; + /* 0x05A1 */ u8 mAction; + /* 0x05A2 */ u8 field_0x5a2; + /* 0x05A4 */ cXyz mBaseScale; + /* 0x05B0 */ cXyz mBreakPositions[4]; + /* 0x05B0 */ cXyz mBreakOldPositions[4]; + /* 0x0610 */ csXyz mBreakAngles[4]; + /* 0x0628 */ cXyz field_0x628[4]; + /* 0x0658 */ cXyz mBreakSpeeds[4]; + /* 0x0688 */ csXyz mBreakRotationSpeeds[4]; + /* 0x06A0 */ cXyz field_0x6a0[4]; + /* 0x06D0 */ u8 field_0x6d0[4]; + /* 0x06D4 */ f32 mStreamScales[4]; + /* 0x06E4 */ int field_0x6e4; + /* 0x06E8 */ dBgS_GndChk mGndChk; + /* 0x073C */ dBgS_AcchCir mAcchCirs[4]; + /* 0x083C */ dBgS_ObjAcch mAcchs[4]; + /* 0x0F9C */ J3DModel* mModel; + /* 0x0FA0 */ J3DModel* mBreakModels[4]; + /* 0x0FB0 */ request_of_phase_process_class mPhase; + /* 0x0FB8 */ dCcD_Stts mStts; + /* 0x0FF4 */ dCcD_Sph mSphs[3]; + /* 0x139C */ u8 field_0x139c[0x13c0 - 0x139c]; + /* 0x13C0 */ bool mIsHIOOwner; }; STATIC_ASSERT(sizeof(daObjGOMIKABE_c) == 0x13c4); -class daObjGOMIKABE_HIO_c { +class daObjGOMIKABE_HIO_c : public JORReflexible { public: /* 80BFE22C */ daObjGOMIKABE_HIO_c(); - /* 80BFFB74 */ ~daObjGOMIKABE_HIO_c(); + /* 80BFFB74 */ virtual ~daObjGOMIKABE_HIO_c() {} + + void genMessage(JORMContext* ctx); + + /* 0x04 */ s8 mId; }; diff --git a/include/d/d_bg_s_acch.h b/include/d/d_bg_s_acch.h index 04b92d41f99..1cb9afb1413 100644 --- a/include/d/d_bg_s_acch.h +++ b/include/d/d_bg_s_acch.h @@ -250,7 +250,9 @@ public: } /* 80BB336C */ virtual ~dBgS_ObjAcch() {} -}; +}; // Size: 0x1D8 + +STATIC_ASSERT(sizeof(dBgS_ObjAcch) == 0x1D8); class dBgS_StatueAcch : public dBgS_Acch { public: diff --git a/src/d/actor/d_a_obj_gomikabe.cpp b/src/d/actor/d_a_obj_gomikabe.cpp index 80d9751eae3..d8447930d57 100644 --- a/src/d/actor/d_a_obj_gomikabe.cpp +++ b/src/d/actor/d_a_obj_gomikabe.cpp @@ -4,167 +4,424 @@ */ #include "d/actor/d_a_obj_gomikabe.h" +#include "SSystem/SComponent/c_lib.h" +#include "d/d_bg_w.h" #include "d/d_cc_d.h" -#include "dol2asm.h" - - - -// -// Forward References: -// - -extern "C" void __ct__19daObjGOMIKABE_HIO_cFv(); -extern "C" void initCcCylinder__15daObjGOMIKABE_cFv(); -extern "C" void SetCcCyl__15daObjGOMIKABE_cFv(); -extern "C" void __dt__4cXyzFv(); -extern "C" static void daObjGOMIKABE_Create__FP10fopAc_ac_c(); -extern "C" static void daObjGOMIKABE_Delete__FP15daObjGOMIKABE_c(); -extern "C" void WaitAction__15daObjGOMIKABE_cFv(); -extern "C" void BreakChk__15daObjGOMIKABE_cFv(); -extern "C" void BreakSet__15daObjGOMIKABE_cFv(); -extern "C" void __dt__5csXyzFv(); -extern "C" void getWaterStream__15daObjGOMIKABE_cFR4cXyzR4cXyzf(); -extern "C" void SpeedSet__15daObjGOMIKABE_cFv(); -extern "C" void BreakAction__15daObjGOMIKABE_cFv(); -extern "C" void CheckCull__15daObjGOMIKABE_cFv(); -extern "C" void checkViewArea__15daObjGOMIKABE_cF4cXyz(); -extern "C" void Action__15daObjGOMIKABE_cFv(); -extern "C" void setBaseMtx__15daObjGOMIKABE_cFv(); -extern "C" void setBaseMtx2__15daObjGOMIKABE_cFv(); -extern "C" static void daObjGOMIKABE_Draw__FP15daObjGOMIKABE_c(); -extern "C" static void daObjGOMIKABE_Execute__FP15daObjGOMIKABE_c(); -extern "C" void CreateHeap__15daObjGOMIKABE_cFv(); -extern "C" void create__15daObjGOMIKABE_cFv(); -extern "C" void __dt__8dCcD_SphFv(); -extern "C" void __ct__8dCcD_SphFv(); -extern "C" void __dt__8cM3dGSphFv(); -extern "C" void __dt__8cM3dGAabFv(); -extern "C" void __dt__12dBgS_ObjAcchFv(); -extern "C" void __ct__12dBgS_ObjAcchFv(); -extern "C" void __dt__12dBgS_AcchCirFv(); -extern "C" void __ct__5csXyzFv(); -extern "C" void __ct__4cXyzFv(); -extern "C" static bool daObjGOMIKABE_IsDelete__FP15daObjGOMIKABE_c(); -extern "C" void Create__15daObjGOMIKABE_cFv(); -extern "C" void Execute__15daObjGOMIKABE_cFPPA3_A4_f(); -extern "C" void Draw__15daObjGOMIKABE_cFv(); -extern "C" void Delete__15daObjGOMIKABE_cFv(); -extern "C" void __dt__19daObjGOMIKABE_HIO_cFv(); -extern "C" void __sinit_d_a_obj_gomikabe_cpp(); -extern "C" static void func_80BFFBF8(); -extern "C" static void func_80BFFC00(); -extern "C" extern char const* const d_a_obj_gomikabe__stringBase0; - -// -// External References: -// - -extern "C" void mDoMtx_YrotS__FPA4_fs(); -extern "C" void transS__14mDoMtx_stack_cFRC4cXyz(); -extern "C" void scaleM__14mDoMtx_stack_cFRC4cXyz(); -extern "C" void ZXYrotM__14mDoMtx_stack_cFRC5csXyz(); -extern "C" void mDoExt_modelUpdateDL__FP8J3DModel(); -extern "C" void mDoExt_setupStageTexture__FP12J3DModelData(); -extern "C" void mDoExt_J3DModel__create__FP12J3DModelDataUlUl(); -extern "C" void mDoLib_project__FP3VecP3Vec(); -extern "C" void fopAcM_delete__FP10fopAc_ac_c(); -extern "C" void fopAcM_setCullSizeBox__FP10fopAc_ac_cffffff(); -extern "C" void fopAcM_searchActorDistance__FPC10fopAc_ac_cPC10fopAc_ac_c(); -extern "C" void fopAcM_getWaterStream__FPC4cXyzRC13cBgS_PolyInfoP4cXyzPii(); -extern "C" void waterCheck__11fopAcM_wt_cFPC4cXyz(); -extern "C" void dComIfG_resLoad__FP30request_of_phase_process_classPCc(); -extern "C" void dComIfG_resDelete__FP30request_of_phase_process_classPCc(); -extern "C" void isSwitch__10dSv_info_cCFii(); -extern "C" void getRes__14dRes_control_cFPCcPCcP11dRes_info_ci(); -extern "C" void getObjectResName2Index__14dRes_control_cFPCcPCc(); -extern "C" void Release__4cBgSFP9dBgW_Base(); -extern "C" void dBgS_MoveBGProc_TypicalRotY__FP4dBgWPvRC13cBgS_PolyInfobP4cXyzP5csXyzP5csXyz(); -extern "C" void __ct__12dBgS_AcchCirFv(); -extern "C" void SetWall__12dBgS_AcchCirFff(); -extern "C" void __dt__9dBgS_AcchFv(); -extern "C" void __ct__9dBgS_AcchFv(); -extern "C" void Set__9dBgS_AcchFP4cXyzP4cXyzP10fopAc_ac_ciP12dBgS_AcchCirP4cXyzP5csXyzP5csXyz(); -extern "C" void CrrPos__9dBgS_AcchFR4dBgS(); -extern "C" void __ct__11dBgS_GndChkFv(); -extern "C" void __ct__16dBgS_MoveBgActorFv(); -extern "C" bool IsDelete__16dBgS_MoveBgActorFv(); -extern "C" bool ToFore__16dBgS_MoveBgActorFv(); -extern "C" bool ToBack__16dBgS_MoveBgActorFv(); -extern "C" void -MoveBGCreate__16dBgS_MoveBgActorFPCciPFP4dBgWPvRC13cBgS_PolyInfobP4cXyzP5csXyzP5csXyz_vUlPA3_A4_f(); -extern "C" void MoveBGDelete__16dBgS_MoveBgActorFv(); -extern "C" void MoveBGExecute__16dBgS_MoveBgActorFv(); -extern "C" void SetObj__16dBgS_PolyPassChkFv(); -extern "C" void __ct__10dCcD_GSttsFv(); -extern "C" void Init__9dCcD_SttsFiiP10fopAc_ac_c(); -extern "C" void __ct__12dCcD_GObjInfFv(); -extern "C" void __dt__12dCcD_GObjInfFv(); -extern "C" void ChkTgHit__12dCcD_GObjInfFv(); -extern "C" void Set__8dCcD_SphFRC11dCcD_SrcSph(); -extern "C" void settingTevStruct__18dScnKy_env_light_cFiP4cXyzP12dKy_tevstr_c(); -extern "C" void setLightTevColorType_MAJI__18dScnKy_env_light_cFP12J3DModelDataP12dKy_tevstr_c(); -extern "C" void Set__4cCcSFP8cCcD_Obj(); -extern "C" void __ct__5csXyzFsss(); -extern "C" void __apl__5csXyzFR5csXyz(); -extern "C" void cM_rndF__Ff(); -extern "C" void cM_rndFX__Ff(); -extern "C" void SetPos__11cBgS_GndChkFPC4cXyz(); -extern "C" void __dt__13cBgS_PolyInfoFv(); -extern "C" void ChkUsed__9cBgW_BgIdCFv(); -extern "C" void __dt__8cM3dGCirFv(); -extern "C" void SetC__8cM3dGSphFRC4cXyz(); -extern "C" void SetR__8cM3dGSphFf(); -extern "C" void cLib_addCalc2__FPffff(); -extern "C" void cLib_offsetPos__FP4cXyzPC4cXyzsPC4cXyz(); -extern "C" void seStart__7Z2SeMgrF10JAISoundIDPC3VecUlScffffUc(); -extern "C" void __dl__FPv(); -extern "C" void __construct_array(); -extern "C" void _savegpr_19(); -extern "C" void _savegpr_23(); -extern "C" void _savegpr_24(); -extern "C" void _savegpr_26(); -extern "C" void _savegpr_27(); -extern "C" void _savegpr_28(); -extern "C" void _savegpr_29(); -extern "C" void _restgpr_19(); -extern "C" void _restgpr_23(); -extern "C" void _restgpr_24(); -extern "C" void _restgpr_26(); -extern "C" void _restgpr_27(); -extern "C" void _restgpr_28(); -extern "C" void _restgpr_29(); -extern "C" extern void* __vt__8dCcD_Sph[36]; -extern "C" extern void* __vt__9dCcD_Stts[11]; -extern "C" extern void* __vt__12cCcD_SphAttr[25]; -extern "C" extern void* __vt__14cCcD_ShapeAttr[22]; -extern "C" extern void* __vt__9cCcD_Stts[8]; -extern "C" u8 now__14mDoMtx_stack_c[48]; -extern "C" extern u8 g_dComIfG_gameInfo[122384]; -extern "C" f32 mWaterY__11fopAcM_wt_c[1 + 1 /* padding */]; -extern "C" u8 mAudioMgrPtr__10Z2AudioMgr[4 + 4 /* padding */]; -extern "C" void __register_global_object(); - -// -// Declarations: -// - -/* ############################################################################################## */ -/* 80BFFCF4-80BFFCF4 0000D8 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ -#pragma push -#pragma force_active on -SECTION_DEAD static char const* const stringBase_80BFFCF4 = "GomiKabe"; -#pragma pop +#include "d/d_com_inf_game.h" +#include "m_Do/m_Do_lib.h" /* 80BFFD30-80BFFD34 -00001 0004+00 3/3 0/0 0/0 .data l_arcName */ -SECTION_DATA static void* l_arcName = (void*)&d_a_obj_gomikabe__stringBase0; +static char* l_arcName = "GomiKabe"; + +/* 80BFE22C-80BFE244 0000EC 0018+00 1/1 0/0 0/0 .text __ct__19daObjGOMIKABE_HIO_cFv */ +daObjGOMIKABE_HIO_c::daObjGOMIKABE_HIO_c() { + mId = -1; +} + +#ifdef DEBUG +void daObjGOMIKABE_HIO_c::genMessage(JORMContext* ctx) { + // Zora Rock + ctx->genLabel("ゾーラ岩", 0x80000001, 0, NULL, 0xffff, 0xffff, 0x200, 0x18); +} +#endif + +/* 80BFE244-80BFE2CC 000104 0088+00 1/1 0/0 0/0 .text initCcCylinder__15daObjGOMIKABE_cFv + */ +void daObjGOMIKABE_c::initCcCylinder() { + const static dCcD_SrcSph ccSphSrc = { + { + {0x0, {{0x0, 0x0, 0x0}, {0x2020, 0x11}, 0x78}}, // mObj + {dCcD_SE_NONE, 0x0, 0x0, 0x0, 0x0}, // mGObjAt + {dCcD_SE_NONE, 0x0, 0x0, 0x0, 0x0}, // mGObjTg + {0x0}, // mGObjCo + }, // mObjInf + { + {{0.0f, 0.0f, 0.0f}, 200.0f} // mSph + } // mSphAttr + }; + + mStts.Init(0xff, 0xff, this); + for (int i = 0; i < 3; i++) { + mSphs[i].Set(ccSphSrc); + mSphs[i].SetStts(&mStts); + mSphs[i].SetC(current.pos); + } +} + +/* 80BFE2CC-80BFE3FC 00018C 0130+00 1/1 0/0 0/0 .text SetCcCyl__15daObjGOMIKABE_cFv */ +void daObjGOMIKABE_c::SetCcCyl() { + cXyz offset(-200.0f, 0.0f, 0.0f); + cXyz sphCenter(0.0f, 0.0f, 0.0f); + for (int i = 0; i < 3; i++) { + offset.set(i * 200.0f + -200.0f, 0.0f, 0.0f); + cLib_offsetPos(&sphCenter, ¤t.pos, shape_angle.y, &offset); + mSphs[i].SetC(sphCenter); + mSphs[i].SetR(200.0f); + dComIfG_Ccsp()->Set(&mSphs[i]); + } +} + +/* 80BFE438-80BFE458 0002F8 0020+00 1/0 0/0 0/0 .text daObjGOMIKABE_Create__FP10fopAc_ac_c */ +static int daObjGOMIKABE_Create(fopAc_ac_c* i_this) { + return ((daObjGOMIKABE_c*)i_this)->create(); +} + +/* 80BFE458-80BFE47C 000318 0024+00 1/0 0/0 0/0 .text daObjGOMIKABE_Delete__FP15daObjGOMIKABE_c */ +static int daObjGOMIKABE_Delete(daObjGOMIKABE_c* i_this) { + i_this->MoveBGDelete(); + return 1; +} + +/* 80BFE47C-80BFE4C4 00033C 0048+00 1/1 0/0 0/0 .text WaitAction__15daObjGOMIKABE_cFv */ +void daObjGOMIKABE_c::WaitAction() { + cXyz cStack_28(current.pos.x, current.pos.y + 300.0f, current.pos.z); + f32 height = current.pos.y; + if (fopAcM_wt_c::waterCheck(&cStack_28)) { + height = fopAcM_wt_c::getWaterY(); + } +} + +/* 80BFE4C4-80BFE52C 000384 0068+00 1/1 0/0 0/0 .text BreakChk__15daObjGOMIKABE_cFv */ +void daObjGOMIKABE_c::BreakChk() { + for (int i = 0; i < 3; i++) { + if (mSphs[i].ChkTgHit()) { + BreakSet(); + break; + } + } +} + +/* 80BFE52C-80BFEA24 0003EC 04F8+00 1/1 0/0 1/1 .text BreakSet__15daObjGOMIKABE_cFv */ +void daObjGOMIKABE_c::BreakSet() { + cXyz local_78(0.0f, 0.0f, 0.0f); + cXyz cStack_84; + int local_98 = 2; + int i = 0; + for (; i < local_98; i++) { + cStack_84.set((50 / local_98) * i + 50.0f, 50.0f, 0.0f); + mBreakSpeeds[i].set(cM_rndF(10.0f), cM_rndF(15.0f) + 15.0f, cM_rndF(15.0f) + 15.0f); + mDoMtx_stack_c::YrotS(shape_angle.y); + mDoMtx_stack_c::multVec(&mBreakSpeeds[i], &mBreakSpeeds[i]); + mDoMtx_stack_c::multVec(&cStack_84, &local_78); + mBreakRotationSpeeds[i].set(cM_rndFX(1000.0f), cM_rndFX(1000.0f), cM_rndFX(1000.0f)); + mBreakPositions[i].set(current.pos.x + local_78.x, current.pos.y + local_78.y, + current.pos.z + local_78.z); + mBreakAngles[i] = csXyz(cM_rndFX(32000.0f), 0, 0); + } + + for (int i = local_98; i < 4; i++) { + local_78.set(-50.0f - (50 / local_98) * i, 50.0f, 0.0f); + mBreakSpeeds[i].set(-cM_rndF(10.0f), cM_rndF(15.0f) + 15.0f, cM_rndF(15.0f) + 15.0f); + mDoMtx_stack_c::YrotS(shape_angle.y); + mDoMtx_stack_c::multVec(&mBreakSpeeds[i], &mBreakSpeeds[i]); + mDoMtx_stack_c::multVec(&local_78, &local_78); + mBreakRotationSpeeds[i].set(cM_rndFX(1000.0f), cM_rndFX(1000.0f), cM_rndFX(1000.0f)); + mBreakPositions[i].set(current.pos.x + local_78.x, current.pos.y + local_78.y, + current.pos.z + local_78.z); + mBreakAngles[i] = csXyz(cM_rndFX(32000.0f), 0, 0); + } + + for (i = 0; i < 4; i++) { + mBreakOldPositions[i] = mBreakPositions[i]; + mAcchs[i].Set(&mBreakPositions[i], &mBreakOldPositions[i], this, 1, &mAcchCirs[i], &mBreakSpeeds[i], + NULL, NULL); + mAcchs[i].CrrPos(dComIfG_Bgsp()); + mStreamScales[i] = cM_rndF(10.0f) + 5.0f; + } + field_0x5a2++; + mAction++; + Z2GetAudioMgr()->seStart(Z2SE_OBJ_G_KABE_BRK, ¤t.pos, 0, 0, 1.0f, 1.0f, -1.0f, -1.0f, 0); + fopAcM_OffStatus(this, fopAcM_STATUS_UNK_000100); + if (mpBgW != NULL && mpBgW->ChkUsed()) { + dComIfG_Bgsp().Release(mpBgW); + } +} + +/* 80BFEA60-80BFEB90 000920 0130+00 1/1 0/0 0/0 .text + * getWaterStream__15daObjGOMIKABE_cFR4cXyzR4cXyzf */ +void daObjGOMIKABE_c::getWaterStream(cXyz& param_1, cXyz& param_2, f32 i_scale) { + mGndChk.SetPos(¶m_1); + cXyz local_48; + int local_58 = 0; + s32 res = fopAcM_getWaterStream(¶m_1, mGndChk, &local_48, &local_58, 0); + cXyz local_54(local_58 * local_48.x, local_58 * local_48.y, local_58 * local_48.z); + + if (res != 0) { + cLib_addCalc2(¶m_2.x, local_54.x * 0.7f, 0.5f, i_scale); + cLib_addCalc2(¶m_2.z, local_54.z * 0.7f, 0.5f, i_scale); + param_2.y = local_54.y; + } +} + +static f64 dummyLiteral1() { return 0.5; } +static f64 dummyLiteral2() { return 3.0; } +static f64 dummyLiteral3() { return 0.0; } +static f32 dummyLiteral4() { return 2.0f; } +static f32 dummyLiteral5() { return 3000.0f; } + +/* 80BFEB90-80BFED54 000A50 01C4+00 1/1 0/0 0/0 .text SpeedSet__15daObjGOMIKABE_cFv */ +void daObjGOMIKABE_c::SpeedSet() { + cXyz acStack_28; + cXyz cStack_34; + + for (int i = 0; i < 4; i++) { + cXyz cStack_34 = mBreakPositions[i]; + acStack_28.set(mBreakPositions[i].x, mBreakPositions[i].y + 300.0f, mBreakPositions[i].z); + if (fopAcM_wt_c::waterCheck(&acStack_28)) { + if (mBreakPositions[i].y <= fopAcM_wt_c::getWaterY() - 100.0f) { + mBreakPositions[i].y = fopAcM_wt_c::getWaterY() - 100.0f; + gravity = 0; + getWaterStream(mBreakPositions[i], mBreakSpeeds[i], mStreamScales[i]); + field_0x6d0[i] = 1; + } else if (field_0x6d0[i] == 0) { + mBreakSpeeds[i].y += gravity; + mBreakPositions[i].y += mBreakSpeeds[i].y; + } else { + mBreakPositions[i].y = fopAcM_wt_c::getWaterY() - 100.0f; + gravity = 0.0f; + getWaterStream(mBreakPositions[i], mBreakSpeeds[i], mStreamScales[i]); + field_0x6d0[i] = 1; + } + } else { + mBreakSpeeds[i].y += gravity; + mBreakPositions[i].y += mBreakSpeeds[i].y; + } + mBreakPositions[i].x += mBreakSpeeds[i].x; + mBreakPositions[i].z += mBreakSpeeds[i].z; + mBreakAngles[i] += mBreakRotationSpeeds[i]; + } +} + +/* 80BFED54-80BFED74 000C14 0020+00 1/1 0/0 0/0 .text BreakAction__15daObjGOMIKABE_cFv */ +void daObjGOMIKABE_c::BreakAction() { + SpeedSet(); +} + +/* 80BFED74-80BFEE24 000C34 00B0+00 1/1 0/0 0/0 .text CheckCull__15daObjGOMIKABE_cFv */ +void daObjGOMIKABE_c::CheckCull() { + if (fopAcM_searchPlayerDistance(this) > 7000.0f) { + int notInViewNum = 0; + for (int i = 0; i < 4; i++) { + if (!checkViewArea(mBreakPositions[i])) { + notInViewNum++; + if (notInViewNum >= 4) { + fopAcM_delete(this); + } + } + } + } +} + +/* 80BFEE24-80BFEEA8 000CE4 0084+00 1/1 0/0 0/0 .text checkViewArea__15daObjGOMIKABE_cF4cXyz */ +bool daObjGOMIKABE_c::checkViewArea(cXyz param_1) { + Vec local_24; + mDoLib_project(¶m_1, &local_24); + bool rv = false; + if (local_24.x >= 0.0f && local_24.x <= 608.0f && local_24.y >= 0.0f && local_24.y <= 448.0f) { + rv = true; + } + + return rv; +} + +/* 80BFEEA8-80BFEF20 000D68 0078+00 1/1 0/0 0/0 .text Action__15daObjGOMIKABE_cFv */ +void daObjGOMIKABE_c::Action() { + switch (mAction) { + case ACTION_WAIT: + WaitAction(); + BreakChk(); + SetCcCyl(); + setBaseMtx(); + break; + case ACTION_BREAK: + BreakAction(); + setBaseMtx2(); + CheckCull(); + break; + } +} + +/* 80BFEF20-80BFEF84 000DE0 0064+00 1/1 0/0 0/0 .text setBaseMtx__15daObjGOMIKABE_cFv */ +void daObjGOMIKABE_c::setBaseMtx() { + mDoMtx_stack_c::transS(current.pos); + mDoMtx_stack_c::ZXYrotM(shape_angle); + mDoMtx_stack_c::scaleM(mBaseScale); + mModel->setBaseTRMtx(mDoMtx_stack_c::get()); + cMtx_copy(mDoMtx_stack_c::get(), mBgMtx); +} + +/* 80BFEF84-80BFF018 000E44 0094+00 2/2 0/0 0/0 .text setBaseMtx2__15daObjGOMIKABE_cFv */ +void daObjGOMIKABE_c::setBaseMtx2() { + for (int i = 0; i < 4; i++) { + mDoMtx_stack_c::transS(mBreakPositions[i]); + mDoMtx_stack_c::ZXYrotM(mBreakAngles[i]); + mDoMtx_stack_c::scaleM(mBaseScale); + mBreakModels[i]->setBaseTRMtx(mDoMtx_stack_c::get()); + } +} + +/* 80BFF018-80BFF044 000ED8 002C+00 1/0 0/0 0/0 .text daObjGOMIKABE_Draw__FP15daObjGOMIKABE_c */ +static int daObjGOMIKABE_Draw(daObjGOMIKABE_c* i_this) { + return i_this->MoveBGDraw(); +} + +/* 80BFF044-80BFF064 000F04 0020+00 2/1 0/0 0/0 .text daObjGOMIKABE_Execute__FP15daObjGOMIKABE_c + */ +static int daObjGOMIKABE_Execute(daObjGOMIKABE_c* i_this) { + return i_this->MoveBGExecute(); +} + +/* 80BFF064-80BFF164 000F24 0100+00 1/0 0/0 0/0 .text CreateHeap__15daObjGOMIKABE_cFv */ +int daObjGOMIKABE_c::CreateHeap() { + J3DModelData* modelData = (J3DModelData*)dComIfG_getObjectRes(l_arcName, "M_Gomikabe.bmd"); + JUT_ASSERT(250, modelData != 0); + mModel = mDoExt_J3DModel__create(modelData, 0x80000, 0x11000084); + if (mModel == NULL) { + return 0; + } + + modelData = (J3DModelData*)dComIfG_getObjectRes(l_arcName, "M_Gomikabe_Hahen.bmd"); + JUT_ASSERT(259, modelData != 0); + + for (int i = 0; i < 4; i++) { + mBreakModels[i] = mDoExt_J3DModel__create(modelData, 0x80000, 0x11000084); + if (mBreakModels[i] == NULL) { + return 0; + } + } + + return 1; +} + +/* 80BFFE08-80BFFE0C 000008 0004+00 2/2 0/0 0/0 .bss None */ +static bool l_HIOInit; + +/* 80BFFE18-80BFFE20 000018 0008+00 2/2 0/0 0/0 .bss l_HIO */ +static daObjGOMIKABE_HIO_c l_HIO; + +/* 80BFF164-80BFF5B4 001024 0450+00 1/1 0/0 0/0 .text create__15daObjGOMIKABE_cFv */ +int daObjGOMIKABE_c::create() { + fopAcM_SetupActor(this, daObjGOMIKABE_c); + + int rv = dComIfG_resLoad(&mPhase, l_arcName); + if (rv == cPhs_COMPLEATE_e) { + s32 dzb_id = dComIfG_getObjctResName2Index(l_arcName, "M_Gomikabe.dzb"); + if (dzb_id == -1) { + // dzb data not found! + OS_REPORT("dzbデータが見つかりませんでした!<%s>\n\n", l_arcName); + JUT_ASSERT(969, dzb_id != -1); + } + mSwBit = (fopAcM_GetParam(this) & 0xff0000) >> 16; + if (mSwBit != 0xff) { + if (dComIfGs_isSwitch(mSwBit, fopAcM_GetRoomNo(this))) { + return cPhs_ERROR_e; + } + } + + rv = MoveBGCreate(l_arcName, dzb_id, dBgS_MoveBGProc_TypicalRotY, 0x2c40, NULL); + if (rv == cPhs_ERROR_e) { + return rv; + } + + mDoExt_setupStageTexture(mModel->getModelData()); + + if (fopAcM_GetParam(this) != 0xffffffff) { + mBaseScale.x = (fopAcM_GetParam(this) & 0xff) * 0.05f + 1.0f; + mBaseScale.z = (fopAcM_GetParam(this) & 0xff) * 0.05f + 1.0f; + mBaseScale.y = ((fopAcM_GetParam(this) & 0xff00) >> 8) * 0.05f + 1.0f; + } else { + mBaseScale.set(1.0f, 1.0f, 1.0f); + } + + if (!l_HIOInit) { + l_HIOInit = true; + mIsHIOOwner = 1; + // Garbage Wall + l_HIO.mId = mDoHIO_CREATE_CHILD("ごみ壁", &l_HIO); + } + + fopAcM_SetMtx(this, mModel->getBaseTRMtx()); + cXyz cStack_50(current.pos.x, current.pos.y + 1000.0f, current.pos.z); + for (int i = 0; i < 4; i++) { + mAcchCirs[i].SetWall(30.0f, 100.0f); + mAcchs[i].Set(&mBreakPositions[i], &mBreakOldPositions[i], this, 1, &mAcchCirs[i], &mBreakSpeeds[i], + NULL, NULL); + } + initCcCylinder(); + fopAcM_setCullSizeBox(this, -1000.0f, -500.0f, -1000.0f, 1000.0f, 1000.0f, 1000.0f); + daObjGOMIKABE_Execute(this); + setBaseMtx2(); + } + return rv; +} + +/* 80BFF8D0-80BFF8D8 001790 0008+00 1/0 0/0 0/0 .text daObjGOMIKABE_IsDelete__FP15daObjGOMIKABE_c + */ +static int daObjGOMIKABE_IsDelete(daObjGOMIKABE_c* i_this) { + return 1; +} + +/* 80BFF8D8-80BFF938 001798 0060+00 1/0 0/0 0/0 .text Create__15daObjGOMIKABE_cFv */ +int daObjGOMIKABE_c::Create() { + fopAcM_setCullSizeBox(this, mBaseScale.x * -1000.0f, mBaseScale.y * -500.0f, + mBaseScale.z * -1000.0f, mBaseScale.x * 1000.0f, mBaseScale.y * 500.0f, + mBaseScale.z * 1000.0f); + return cPhs_COMPLEATE_e; +} + +/* 80BFF938-80BFFA00 0017F8 00C8+00 1/0 0/0 0/0 .text Execute__15daObjGOMIKABE_cFPPA3_A4_f */ +int daObjGOMIKABE_c::Execute(Mtx** i_mtx) { + for (int i = 0; i < 4; i++) { + mBreakOldPositions[i] = mBreakPositions[i]; + } + + gravity = -5.0f; + Action(); + if (mAction == ACTION_WAIT) { + *i_mtx = &mBgMtx; + } else { + for (int i = 0; i < 4; i++) { + mAcchs[i].CrrPos(dComIfG_Bgsp()); + } + } + return 1; +} + +/* 80BFFA00-80BFFB1C 0018C0 011C+00 1/0 0/0 0/0 .text Draw__15daObjGOMIKABE_cFv */ +int daObjGOMIKABE_c::Draw() { + if (mAction == ACTION_WAIT) { + g_env_light.settingTevStruct(0x10, ¤t.pos, &tevStr); + g_env_light.setLightTevColorType_MAJI(mModel, &tevStr); + dComIfGd_setListBG(); + mDoExt_modelUpdateDL(mModel); + } else { + for (int i = 0; i < 4; i++) { + g_env_light.settingTevStruct(0x10, &mBreakPositions[i], &tevStr); + g_env_light.setLightTevColorType_MAJI(mBreakModels[i], &tevStr); + dComIfGd_setListBG(); + mDoExt_modelUpdateDL(mBreakModels[i]); + } + } + return 1; +} + +/* 80BFFB1C-80BFFB74 0019DC 0058+00 1/0 0/0 0/0 .text Delete__15daObjGOMIKABE_cFv */ +int daObjGOMIKABE_c::Delete() { + dComIfG_resDelete(&mPhase, l_arcName); + if (mIsHIOOwner) { + l_HIOInit = false; + mDoHIO_DELETE_CHILD(l_HIO.mId); + } + return 1; +} /* 80BFFD34-80BFFD54 -00001 0020+00 1/0 0/0 0/0 .data l_daObjGOMIKABE_Method */ static actor_method_class l_daObjGOMIKABE_Method = { - (process_method_func)daObjGOMIKABE_Create__FP10fopAc_ac_c, - (process_method_func)daObjGOMIKABE_Delete__FP15daObjGOMIKABE_c, - (process_method_func)daObjGOMIKABE_Execute__FP15daObjGOMIKABE_c, - (process_method_func)daObjGOMIKABE_IsDelete__FP15daObjGOMIKABE_c, - (process_method_func)daObjGOMIKABE_Draw__FP15daObjGOMIKABE_c, + (process_method_func)daObjGOMIKABE_Create, + (process_method_func)daObjGOMIKABE_Delete, + (process_method_func)daObjGOMIKABE_Execute, + (process_method_func)daObjGOMIKABE_IsDelete, + (process_method_func)daObjGOMIKABE_Draw, }; /* 80BFFD54-80BFFD84 -00001 0030+00 0/0 0/0 1/0 .data g_profile_Obj_GOMIKABE */ @@ -185,551 +442,4 @@ extern actor_process_profile_definition g_profile_Obj_GOMIKABE = { fopAc_CULLBOX_CUSTOM_e, // cullType }; -/* 80BFFD84-80BFFD90 000054 000C+00 1/1 0/0 0/0 .data __vt__12dBgS_AcchCir */ -SECTION_DATA extern void* __vt__12dBgS_AcchCir[3] = { - (void*)NULL /* RTTI */, - (void*)NULL, - (void*)__dt__12dBgS_AcchCirFv, -}; - -/* 80BFFD90-80BFFDB4 000060 0024+00 2/2 0/0 0/0 .data __vt__12dBgS_ObjAcch */ -SECTION_DATA extern void* __vt__12dBgS_ObjAcch[9] = { - (void*)NULL /* RTTI */, - (void*)NULL, - (void*)__dt__12dBgS_ObjAcchFv, - (void*)NULL, - (void*)NULL, - (void*)func_80BFFC00, - (void*)NULL, - (void*)NULL, - (void*)func_80BFFBF8, -}; - -/* 80BFFDB4-80BFFDC0 000084 000C+00 3/3 0/0 0/0 .data __vt__8cM3dGAab */ -SECTION_DATA extern void* __vt__8cM3dGAab[3] = { - (void*)NULL /* RTTI */, - (void*)NULL, - (void*)__dt__8cM3dGAabFv, -}; - -/* 80BFFDC0-80BFFDCC 000090 000C+00 3/3 0/0 0/0 .data __vt__8cM3dGSph */ -SECTION_DATA extern void* __vt__8cM3dGSph[3] = { - (void*)NULL /* RTTI */, - (void*)NULL, - (void*)__dt__8cM3dGSphFv, -}; - -/* 80BFFDCC-80BFFDF4 00009C 0028+00 1/1 0/0 0/0 .data __vt__15daObjGOMIKABE_c */ -SECTION_DATA extern void* __vt__15daObjGOMIKABE_c[10] = { - (void*)NULL /* RTTI */, - (void*)NULL, - (void*)CreateHeap__15daObjGOMIKABE_cFv, - (void*)Create__15daObjGOMIKABE_cFv, - (void*)Execute__15daObjGOMIKABE_cFPPA3_A4_f, - (void*)Draw__15daObjGOMIKABE_cFv, - (void*)Delete__15daObjGOMIKABE_cFv, - (void*)IsDelete__16dBgS_MoveBgActorFv, - (void*)ToFore__16dBgS_MoveBgActorFv, - (void*)ToBack__16dBgS_MoveBgActorFv, -}; - -/* 80BFFDF4-80BFFE00 0000C4 000C+00 2/2 0/0 0/0 .data __vt__19daObjGOMIKABE_HIO_c */ -SECTION_DATA extern void* __vt__19daObjGOMIKABE_HIO_c[3] = { - (void*)NULL /* RTTI */, - (void*)NULL, - (void*)__dt__19daObjGOMIKABE_HIO_cFv, -}; - -/* 80BFE22C-80BFE244 0000EC 0018+00 1/1 0/0 0/0 .text __ct__19daObjGOMIKABE_HIO_cFv */ -daObjGOMIKABE_HIO_c::daObjGOMIKABE_HIO_c() { - // NONMATCHING -} - -/* ############################################################################################## */ -/* 80BFFC1C-80BFFC5C 000000 0040+00 7/7 0/0 0/0 .rodata ccSphSrc$3769 */ -const static dCcD_SrcSph ccSphSrc = { - { - {0x0, {{0x0, 0x0, 0x0}, {0x2020, 0x11}, 0x78}}, // mObj - {dCcD_SE_NONE, 0x0, 0x0, 0x0, 0x0}, // mGObjAt - {dCcD_SE_NONE, 0x0, 0x0, 0x0, 0x0}, // mGObjTg - {0x0}, // mGObjCo - }, // mObjInf - { - {{0.0f, 0.0f, 0.0f}, 200.0f} // mSph - } // mSphAttr -}; - -/* 80BFE244-80BFE2CC 000104 0088+00 1/1 0/0 0/0 .text initCcCylinder__15daObjGOMIKABE_cFv - */ -void daObjGOMIKABE_c::initCcCylinder() { - // NONMATCHING -} - -/* ############################################################################################## */ -/* 80BFFC5C-80BFFC60 000040 0004+00 0/1 0/0 0/0 .rodata @3801 */ -#pragma push -#pragma force_active on -SECTION_RODATA static f32 const lit_3801 = -200.0f; -COMPILER_STRIP_GATE(0x80BFFC5C, &lit_3801); -#pragma pop - -/* 80BFFC60-80BFFC64 000044 0004+00 0/4 0/0 0/0 .rodata @3802 */ -#pragma push -#pragma force_active on -SECTION_RODATA static u8 const lit_3802[4] = { - 0x00, - 0x00, - 0x00, - 0x00, -}; -COMPILER_STRIP_GATE(0x80BFFC60, &lit_3802); -#pragma pop - -/* 80BFFC64-80BFFC6C 000048 0004+04 0/1 0/0 0/0 .rodata @3803 */ -#pragma push -#pragma force_active on -SECTION_RODATA static f32 const lit_3803[1 + 1 /* padding */] = { - 200.0f, - /* padding */ - 0.0f, -}; -COMPILER_STRIP_GATE(0x80BFFC64, &lit_3803); -#pragma pop - -/* 80BFFC6C-80BFFC74 000050 0008+00 1/3 0/0 0/0 .rodata @3805 */ -SECTION_RODATA static u8 const lit_3805[8] = { - 0x43, 0x30, 0x00, 0x00, 0x80, 0x00, 0x00, 0x00, -}; -COMPILER_STRIP_GATE(0x80BFFC6C, &lit_3805); - -/* 80BFE2CC-80BFE3FC 00018C 0130+00 1/1 0/0 0/0 .text SetCcCyl__15daObjGOMIKABE_cFv */ -void daObjGOMIKABE_c::SetCcCyl() { - // NONMATCHING -} - -/* 80BFE3FC-80BFE438 0002BC 003C+00 1/1 0/0 0/0 .text __dt__4cXyzFv */ -// cXyz::~cXyz() { -extern "C" void __dt__4cXyzFv() { - // NONMATCHING -} - -/* 80BFE438-80BFE458 0002F8 0020+00 1/0 0/0 0/0 .text daObjGOMIKABE_Create__FP10fopAc_ac_c */ -static void daObjGOMIKABE_Create(fopAc_ac_c* param_0) { - // NONMATCHING -} - -/* 80BFE458-80BFE47C 000318 0024+00 1/0 0/0 0/0 .text daObjGOMIKABE_Delete__FP15daObjGOMIKABE_c */ -static void daObjGOMIKABE_Delete(daObjGOMIKABE_c* param_0) { - // NONMATCHING -} - -/* ############################################################################################## */ -/* 80BFFC74-80BFFC78 000058 0004+00 1/2 0/0 0/0 .rodata @3842 */ -SECTION_RODATA static f32 const lit_3842 = 300.0f; -COMPILER_STRIP_GATE(0x80BFFC74, &lit_3842); - -/* 80BFE47C-80BFE4C4 00033C 0048+00 1/1 0/0 0/0 .text WaitAction__15daObjGOMIKABE_cFv */ -void daObjGOMIKABE_c::WaitAction() { - // NONMATCHING -} - -/* 80BFE4C4-80BFE52C 000384 0068+00 1/1 0/0 0/0 .text BreakChk__15daObjGOMIKABE_cFv */ -void daObjGOMIKABE_c::BreakChk() { - // NONMATCHING -} - -/* ############################################################################################## */ -/* 80BFFC78-80BFFC7C 00005C 0004+00 0/1 0/0 0/0 .rodata @3977 */ -#pragma push -#pragma force_active on -SECTION_RODATA static f32 const lit_3977 = 50.0f; -COMPILER_STRIP_GATE(0x80BFFC78, &lit_3977); -#pragma pop - -/* 80BFFC7C-80BFFC80 000060 0004+00 0/1 0/0 0/0 .rodata @3978 */ -#pragma push -#pragma force_active on -SECTION_RODATA static f32 const lit_3978 = 15.0f; -COMPILER_STRIP_GATE(0x80BFFC7C, &lit_3978); -#pragma pop - -/* 80BFFC80-80BFFC84 000064 0004+00 0/1 0/0 0/0 .rodata @3979 */ -#pragma push -#pragma force_active on -SECTION_RODATA static f32 const lit_3979 = 10.0f; -COMPILER_STRIP_GATE(0x80BFFC80, &lit_3979); -#pragma pop - -/* 80BFFC84-80BFFC88 000068 0004+00 0/3 0/0 0/0 .rodata @3980 */ -#pragma push -#pragma force_active on -SECTION_RODATA static f32 const lit_3980 = 1000.0f; -COMPILER_STRIP_GATE(0x80BFFC84, &lit_3980); -#pragma pop - -/* 80BFFC88-80BFFC8C 00006C 0004+00 0/1 0/0 0/0 .rodata @3981 */ -#pragma push -#pragma force_active on -SECTION_RODATA static f32 const lit_3981 = 32000.0f; -COMPILER_STRIP_GATE(0x80BFFC88, &lit_3981); -#pragma pop - -/* 80BFFC8C-80BFFC90 000070 0004+00 0/1 0/0 0/0 .rodata @3982 */ -#pragma push -#pragma force_active on -SECTION_RODATA static f32 const lit_3982 = -50.0f; -COMPILER_STRIP_GATE(0x80BFFC8C, &lit_3982); -#pragma pop - -/* 80BFFC90-80BFFC94 000074 0004+00 0/1 0/0 0/0 .rodata @3983 */ -#pragma push -#pragma force_active on -SECTION_RODATA static f32 const lit_3983 = 5.0f; -COMPILER_STRIP_GATE(0x80BFFC90, &lit_3983); -#pragma pop - -/* 80BFFC94-80BFFC98 000078 0004+00 0/2 0/0 0/0 .rodata @3984 */ -#pragma push -#pragma force_active on -SECTION_RODATA static f32 const lit_3984 = 1.0f; -COMPILER_STRIP_GATE(0x80BFFC94, &lit_3984); -#pragma pop - -/* 80BFFC98-80BFFC9C 00007C 0004+00 0/1 0/0 0/0 .rodata @3985 */ -#pragma push -#pragma force_active on -SECTION_RODATA static f32 const lit_3985 = -1.0f; -COMPILER_STRIP_GATE(0x80BFFC98, &lit_3985); -#pragma pop - -/* 80BFE52C-80BFEA24 0003EC 04F8+00 1/1 0/0 1/1 .text BreakSet__15daObjGOMIKABE_cFv */ -void daObjGOMIKABE_c::BreakSet() { - // NONMATCHING -} - -/* 80BFEA24-80BFEA60 0008E4 003C+00 1/1 0/0 0/0 .text __dt__5csXyzFv */ -// csXyz::~csXyz() { -extern "C" void __dt__5csXyzFv() { - // NONMATCHING -} - -/* ############################################################################################## */ -/* 80BFFC9C-80BFFCA0 000080 0004+00 1/1 0/0 0/0 .rodata @4011 */ -SECTION_RODATA static f32 const lit_4011 = 7.0f / 10.0f; -COMPILER_STRIP_GATE(0x80BFFC9C, &lit_4011); - -/* 80BFFCA0-80BFFCA4 000084 0004+00 1/1 0/0 0/0 .rodata @4012 */ -SECTION_RODATA static f32 const lit_4012 = 0.5f; -COMPILER_STRIP_GATE(0x80BFFCA0, &lit_4012); - -/* 80BFEA60-80BFEB90 000920 0130+00 1/1 0/0 0/0 .text - * getWaterStream__15daObjGOMIKABE_cFR4cXyzR4cXyzf */ -void daObjGOMIKABE_c::getWaterStream(cXyz& param_0, cXyz& param_1, f32 param_2) { - // NONMATCHING -} - -/* ############################################################################################## */ -/* 80BFFCA4-80BFFCAC 000088 0008+00 0/0 0/0 0/0 .rodata @4156 */ -#pragma push -#pragma force_active on -SECTION_RODATA static u8 const lit_4156[8] = { - 0x3F, 0xE0, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, -}; -COMPILER_STRIP_GATE(0x80BFFCA4, &lit_4156); -#pragma pop - -/* 80BFFCAC-80BFFCB4 000090 0008+00 0/0 0/0 0/0 .rodata @4157 */ -#pragma push -#pragma force_active on -SECTION_RODATA static u8 const lit_4157[8] = { - 0x40, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, -}; -COMPILER_STRIP_GATE(0x80BFFCAC, &lit_4157); -#pragma pop - -/* 80BFFCB4-80BFFCBC 000098 0008+00 0/0 0/0 0/0 .rodata @4158 */ -#pragma push -#pragma force_active on -SECTION_RODATA static u8 const lit_4158[8] = { - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, -}; -COMPILER_STRIP_GATE(0x80BFFCB4, &lit_4158); -#pragma pop - -/* 80BFFCBC-80BFFCC0 0000A0 0004+00 0/0 0/0 0/0 .rodata @4159 */ -#pragma push -#pragma force_active on -SECTION_RODATA static f32 const lit_4159 = 2.0f; -COMPILER_STRIP_GATE(0x80BFFCBC, &lit_4159); -#pragma pop - -/* 80BFFCC0-80BFFCC4 0000A4 0004+00 0/0 0/0 0/0 .rodata @4160 */ -#pragma push -#pragma force_active on -SECTION_RODATA static f32 const lit_4160 = 3000.0f; -COMPILER_STRIP_GATE(0x80BFFCC0, &lit_4160); -#pragma pop - -/* 80BFFCC4-80BFFCC8 0000A8 0004+00 0/2 0/0 0/0 .rodata @4278 */ -#pragma push -#pragma force_active on -SECTION_RODATA static f32 const lit_4278 = 100.0f; -COMPILER_STRIP_GATE(0x80BFFCC4, &lit_4278); -#pragma pop - -/* 80BFEB90-80BFED54 000A50 01C4+00 1/1 0/0 0/0 .text SpeedSet__15daObjGOMIKABE_cFv */ -void daObjGOMIKABE_c::SpeedSet() { - // NONMATCHING -} - -/* 80BFED54-80BFED74 000C14 0020+00 1/1 0/0 0/0 .text BreakAction__15daObjGOMIKABE_cFv */ -void daObjGOMIKABE_c::BreakAction() { - // NONMATCHING -} - -/* ############################################################################################## */ -/* 80BFFCC8-80BFFCCC 0000AC 0004+00 1/1 0/0 0/0 .rodata @4308 */ -SECTION_RODATA static f32 const lit_4308 = 7000.0f; -COMPILER_STRIP_GATE(0x80BFFCC8, &lit_4308); - -/* 80BFED74-80BFEE24 000C34 00B0+00 1/1 0/0 0/0 .text CheckCull__15daObjGOMIKABE_cFv */ -void daObjGOMIKABE_c::CheckCull() { - // NONMATCHING -} - -/* ############################################################################################## */ -/* 80BFFCCC-80BFFCD0 0000B0 0004+00 0/1 0/0 0/0 .rodata @4321 */ -#pragma push -#pragma force_active on -SECTION_RODATA static f32 const lit_4321 = 608.0f; -COMPILER_STRIP_GATE(0x80BFFCCC, &lit_4321); -#pragma pop - -/* 80BFFCD0-80BFFCD4 0000B4 0004+00 0/1 0/0 0/0 .rodata @4322 */ -#pragma push -#pragma force_active on -SECTION_RODATA static f32 const lit_4322 = 448.0f; -COMPILER_STRIP_GATE(0x80BFFCD0, &lit_4322); -#pragma pop - -/* 80BFEE24-80BFEEA8 000CE4 0084+00 1/1 0/0 0/0 .text checkViewArea__15daObjGOMIKABE_cF4cXyz */ -void daObjGOMIKABE_c::checkViewArea(cXyz param_0) { - // NONMATCHING -} - -/* 80BFEEA8-80BFEF20 000D68 0078+00 1/1 0/0 0/0 .text Action__15daObjGOMIKABE_cFv */ -void daObjGOMIKABE_c::Action() { - // NONMATCHING -} - -/* 80BFEF20-80BFEF84 000DE0 0064+00 1/1 0/0 0/0 .text setBaseMtx__15daObjGOMIKABE_cFv */ -void daObjGOMIKABE_c::setBaseMtx() { - // NONMATCHING -} - -/* 80BFEF84-80BFF018 000E44 0094+00 2/2 0/0 0/0 .text setBaseMtx2__15daObjGOMIKABE_cFv */ -void daObjGOMIKABE_c::setBaseMtx2() { - // NONMATCHING -} - -/* 80BFF018-80BFF044 000ED8 002C+00 1/0 0/0 0/0 .text daObjGOMIKABE_Draw__FP15daObjGOMIKABE_c */ -static void daObjGOMIKABE_Draw(daObjGOMIKABE_c* param_0) { - // NONMATCHING -} - -/* 80BFF044-80BFF064 000F04 0020+00 2/1 0/0 0/0 .text daObjGOMIKABE_Execute__FP15daObjGOMIKABE_c - */ -static void daObjGOMIKABE_Execute(daObjGOMIKABE_c* param_0) { - // NONMATCHING -} - -/* ############################################################################################## */ -/* 80BFFCF4-80BFFCF4 0000D8 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ -#pragma push -#pragma force_active on -SECTION_DEAD static char const* const stringBase_80BFFCFD = "M_Gomikabe.bmd"; -SECTION_DEAD static char const* const stringBase_80BFFD0C = "M_Gomikabe_Hahen.bmd"; -#pragma pop - -/* 80BFF064-80BFF164 000F24 0100+00 1/0 0/0 0/0 .text CreateHeap__15daObjGOMIKABE_cFv */ -void daObjGOMIKABE_c::CreateHeap() { - // NONMATCHING -} - -/* ############################################################################################## */ -/* 80BFFCD4-80BFFCD8 0000B8 0004+00 0/1 0/0 0/0 .rodata @4498 */ -#pragma push -#pragma force_active on -SECTION_RODATA static f32 const lit_4498 = 1.0f / 20.0f; -COMPILER_STRIP_GATE(0x80BFFCD4, &lit_4498); -#pragma pop - -/* 80BFFCD8-80BFFCDC 0000BC 0004+00 0/1 0/0 0/0 .rodata @4499 */ -#pragma push -#pragma force_active on -SECTION_RODATA static f32 const lit_4499 = 30.0f; -COMPILER_STRIP_GATE(0x80BFFCD8, &lit_4499); -#pragma pop - -/* 80BFFCDC-80BFFCE0 0000C0 0004+00 0/2 0/0 0/0 .rodata @4500 */ -#pragma push -#pragma force_active on -SECTION_RODATA static f32 const lit_4500 = -1000.0f; -COMPILER_STRIP_GATE(0x80BFFCDC, &lit_4500); -#pragma pop - -/* 80BFFCE0-80BFFCE4 0000C4 0004+00 0/2 0/0 0/0 .rodata @4501 */ -#pragma push -#pragma force_active on -SECTION_RODATA static f32 const lit_4501 = -500.0f; -COMPILER_STRIP_GATE(0x80BFFCE0, &lit_4501); -#pragma pop - -/* 80BFFCE4-80BFFCEC 0000C8 0008+00 0/1 0/0 0/0 .rodata @4503 */ -#pragma push -#pragma force_active on -SECTION_RODATA static u8 const lit_4503[8] = { - 0x43, 0x30, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, -}; -COMPILER_STRIP_GATE(0x80BFFCE4, &lit_4503); -#pragma pop - -/* 80BFFCF4-80BFFCF4 0000D8 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ -#pragma push -#pragma force_active on -SECTION_DEAD static char const* const stringBase_80BFFD21 = "M_Gomikabe.dzb"; -#pragma pop - -/* 80BFFE08-80BFFE0C 000008 0004+00 2/2 0/0 0/0 .bss None */ -static u8 data_80BFFE08[4]; - -/* 80BFFE0C-80BFFE18 00000C 000C+00 1/1 0/0 0/0 .bss @3761 */ -static u8 lit_3761[12]; - -/* 80BFFE18-80BFFE20 000018 0008+00 2/2 0/0 0/0 .bss l_HIO */ -static u8 l_HIO[8]; - -/* 80BFF164-80BFF5B4 001024 0450+00 1/1 0/0 0/0 .text create__15daObjGOMIKABE_cFv */ -void daObjGOMIKABE_c::create() { - // NONMATCHING -} - -/* 80BFF5B4-80BFF680 001474 00CC+00 1/1 0/0 0/0 .text __dt__8dCcD_SphFv */ -// dCcD_Sph::~dCcD_Sph() { -extern "C" void __dt__8dCcD_SphFv() { - // NONMATCHING -} - -/* 80BFF680-80BFF704 001540 0084+00 1/1 0/0 0/0 .text __ct__8dCcD_SphFv */ -// dCcD_Sph::dCcD_Sph() { -extern "C" void __ct__8dCcD_SphFv() { - // NONMATCHING -} - -/* 80BFF704-80BFF74C 0015C4 0048+00 1/0 0/0 0/0 .text __dt__8cM3dGSphFv */ -// cM3dGSph::~cM3dGSph() { -extern "C" void __dt__8cM3dGSphFv() { - // NONMATCHING -} - -/* 80BFF74C-80BFF794 00160C 0048+00 1/0 0/0 0/0 .text __dt__8cM3dGAabFv */ -// cM3dGAab::~cM3dGAab() { -extern "C" void __dt__8cM3dGAabFv() { - // NONMATCHING -} - -/* 80BFF794-80BFF804 001654 0070+00 4/3 0/0 0/0 .text __dt__12dBgS_ObjAcchFv */ -// dBgS_ObjAcch::~dBgS_ObjAcch() { -extern "C" void __dt__12dBgS_ObjAcchFv() { - // NONMATCHING -} - -/* 80BFF804-80BFF858 0016C4 0054+00 1/1 0/0 0/0 .text __ct__12dBgS_ObjAcchFv */ -// dBgS_ObjAcch::dBgS_ObjAcch() { -extern "C" void __ct__12dBgS_ObjAcchFv() { - // NONMATCHING -} - -/* 80BFF858-80BFF8C8 001718 0070+00 2/1 0/0 0/0 .text __dt__12dBgS_AcchCirFv */ -// dBgS_AcchCir::~dBgS_AcchCir() { -extern "C" void __dt__12dBgS_AcchCirFv() { - // NONMATCHING -} - -/* 80BFF8C8-80BFF8CC 001788 0004+00 1/1 0/0 0/0 .text __ct__5csXyzFv */ -// csXyz::csXyz() { -extern "C" void __ct__5csXyzFv() { - /* empty function */ -} - -/* 80BFF8CC-80BFF8D0 00178C 0004+00 1/1 0/0 0/0 .text __ct__4cXyzFv */ -// cXyz::cXyz() { -extern "C" void __ct__4cXyzFv() { - /* empty function */ -} - -/* 80BFF8D0-80BFF8D8 001790 0008+00 1/0 0/0 0/0 .text daObjGOMIKABE_IsDelete__FP15daObjGOMIKABE_c - */ -static bool daObjGOMIKABE_IsDelete(daObjGOMIKABE_c* param_0) { - return true; -} - -/* ############################################################################################## */ -/* 80BFFCEC-80BFFCF0 0000D0 0004+00 0/1 0/0 0/0 .rodata @4607 */ -#pragma push -#pragma force_active on -SECTION_RODATA static f32 const lit_4607 = 500.0f; -COMPILER_STRIP_GATE(0x80BFFCEC, &lit_4607); -#pragma pop - -/* 80BFF8D8-80BFF938 001798 0060+00 1/0 0/0 0/0 .text Create__15daObjGOMIKABE_cFv */ -void daObjGOMIKABE_c::Create() { - // NONMATCHING -} - -/* ############################################################################################## */ -/* 80BFFCF0-80BFFCF4 0000D4 0004+00 1/1 0/0 0/0 .rodata @4620 */ -SECTION_RODATA static f32 const lit_4620 = -5.0f; -COMPILER_STRIP_GATE(0x80BFFCF0, &lit_4620); - -/* 80BFF938-80BFFA00 0017F8 00C8+00 1/0 0/0 0/0 .text Execute__15daObjGOMIKABE_cFPPA3_A4_f */ -void daObjGOMIKABE_c::Execute(f32 (**param_0)[3][4]) { - // NONMATCHING -} - -/* 80BFFA00-80BFFB1C 0018C0 011C+00 1/0 0/0 0/0 .text Draw__15daObjGOMIKABE_cFv */ -void daObjGOMIKABE_c::Draw() { - // NONMATCHING -} - -/* 80BFFB1C-80BFFB74 0019DC 0058+00 1/0 0/0 0/0 .text Delete__15daObjGOMIKABE_cFv */ -void daObjGOMIKABE_c::Delete() { - // NONMATCHING -} - -/* 80BFFB74-80BFFBBC 001A34 0048+00 2/1 0/0 0/0 .text __dt__19daObjGOMIKABE_HIO_cFv */ -daObjGOMIKABE_HIO_c::~daObjGOMIKABE_HIO_c() { - // NONMATCHING -} - -/* 80BFFBBC-80BFFBF8 001A7C 003C+00 0/0 1/0 0/0 .text __sinit_d_a_obj_gomikabe_cpp */ -void __sinit_d_a_obj_gomikabe_cpp() { - // NONMATCHING -} - -#pragma push -#pragma force_active on -REGISTER_CTORS(0x80BFFBBC, __sinit_d_a_obj_gomikabe_cpp); -#pragma pop - -/* 80BFFBF8-80BFFC00 001AB8 0008+00 1/0 0/0 0/0 .text @36@__dt__12dBgS_ObjAcchFv */ -static void func_80BFFBF8() { - // NONMATCHING -} - -/* 80BFFC00-80BFFC08 001AC0 0008+00 1/0 0/0 0/0 .text @20@__dt__12dBgS_ObjAcchFv */ -static void func_80BFFC00() { - // NONMATCHING -} - /* 80BFFCF4-80BFFCF4 0000D8 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */