From ee608ceaac464790f596935b2b0266777431f9fc Mon Sep 17 00:00:00 2001 From: hatal175 Date: Wed, 6 Aug 2025 04:10:43 +0300 Subject: [PATCH] d_a_obj_fallobj OK (#2568) * d_a_obj_fallobj OK * J3DMatBlock equivalent --- .../GZ2E01/rels/d_a_obj_fallobj/symbols.txt | 14 +- .../GZ2J01/rels/d_a_obj_fallobj/symbols.txt | 14 +- .../GZ2P01/rels/d_a_obj_fallobj/symbols.txt | 14 +- .../rels/d_a_obj_fallobj/symbols.txt | 14 +- .../ShieldD/rels/d_a_obj_fallobjD/symbols.txt | 18 +- configure.py | 4 +- include/JSystem/J3DGraphBase/J3DMatBlock.h | 31 +- include/Z2AudioLib/Z2SoundObject.h | 2 +- include/d/actor/d_a_obj_fallobj.h | 54 +- src/JSystem/J3DGraphBase/J3DMatBlock.cpp | 69 +- src/Z2AudioLib/Z2SoundObject.cpp | 6 +- src/d/actor/d_a_obj_fallobj.cpp | 655 ++++++++++-------- 12 files changed, 477 insertions(+), 418 deletions(-) diff --git a/config/GZ2E01/rels/d_a_obj_fallobj/symbols.txt b/config/GZ2E01/rels/d_a_obj_fallobj/symbols.txt index 2ecd71c5657..483d53b359a 100644 --- a/config/GZ2E01/rels/d_a_obj_fallobj/symbols.txt +++ b/config/GZ2E01/rels/d_a_obj_fallobj/symbols.txt @@ -20,10 +20,10 @@ checkHang__14daObjFallObj_cFv = .text:0x00000DC0; // type:function size:0xA0 sco checkHang2__14daObjFallObj_cFv = .text:0x00000E60; // type:function size:0x104 scope:global Draw__14daObjFallObj_cFv = .text:0x00000F64; // type:function size:0xA4 scope:global Delete__14daObjFallObj_cFv = .text:0x00001008; // type:function size:0x48 scope:global -daObjFallObj_create1st__FP14daObjFallObj_c = .text:0x00001050; // type:function size:0x74 scope:global -daObjFallObj_MoveBGDelete__FP14daObjFallObj_c = .text:0x000010C4; // type:function size:0x20 scope:global -daObjFallObj_MoveBGExecute__FP14daObjFallObj_c = .text:0x000010E4; // type:function size:0x20 scope:global -daObjFallObj_MoveBGDraw__FP14daObjFallObj_c = .text:0x00001104; // type:function size:0x2C scope:global +daObjFallObj_create1st__FP14daObjFallObj_c = .text:0x00001050; // type:function size:0x74 scope:local +daObjFallObj_MoveBGDelete__FP14daObjFallObj_c = .text:0x000010C4; // type:function size:0x20 scope:local +daObjFallObj_MoveBGExecute__FP14daObjFallObj_c = .text:0x000010E4; // type:function size:0x20 scope:local +daObjFallObj_MoveBGDraw__FP14daObjFallObj_c = .text:0x00001104; // type:function size:0x2C scope:local cLib_calcTimer__FPs = .text:0x00001130; // type:function size:0x1C scope:global cLib_calcTimer__FPUc = .text:0x0000114C; // type:function size:0x1C scope:global _ctors = .ctors:0x00000000; // type:label scope:global @@ -49,8 +49,8 @@ _dtors = .dtors:0x00000000; // type:label scope:global @3990 = .rodata:0x0000005C; // type:object size:0x4 scope:local @3991 = .rodata:0x00000060; // type:object size:0x4 scope:local @stringBase0 = .rodata:0x00000064; // type:object size:0xA scope:local data:string_table -l_arcName = .data:0x00000000; // type:object size:0x4 scope:global -l_cull_box = .data:0x00000004; // type:object size:0x18 scope:global align:4 data:float -daObjFallObj_METHODS = .data:0x0000001C; // type:object size:0x20 scope:global +l_arcName = .data:0x00000000; // type:object size:0x4 scope:local +l_cull_box = .data:0x00000004; // type:object size:0x18 scope:local align:4 data:float +daObjFallObj_METHODS = .data:0x0000001C; // type:object size:0x20 scope:local g_profile_Obj_FallObj = .data:0x0000003C; // type:object size:0x30 scope:global __vt__14daObjFallObj_c = .data:0x0000006C; // type:object size:0x28 scope:global diff --git a/config/GZ2J01/rels/d_a_obj_fallobj/symbols.txt b/config/GZ2J01/rels/d_a_obj_fallobj/symbols.txt index 2ecd71c5657..483d53b359a 100644 --- a/config/GZ2J01/rels/d_a_obj_fallobj/symbols.txt +++ b/config/GZ2J01/rels/d_a_obj_fallobj/symbols.txt @@ -20,10 +20,10 @@ checkHang__14daObjFallObj_cFv = .text:0x00000DC0; // type:function size:0xA0 sco checkHang2__14daObjFallObj_cFv = .text:0x00000E60; // type:function size:0x104 scope:global Draw__14daObjFallObj_cFv = .text:0x00000F64; // type:function size:0xA4 scope:global Delete__14daObjFallObj_cFv = .text:0x00001008; // type:function size:0x48 scope:global -daObjFallObj_create1st__FP14daObjFallObj_c = .text:0x00001050; // type:function size:0x74 scope:global -daObjFallObj_MoveBGDelete__FP14daObjFallObj_c = .text:0x000010C4; // type:function size:0x20 scope:global -daObjFallObj_MoveBGExecute__FP14daObjFallObj_c = .text:0x000010E4; // type:function size:0x20 scope:global -daObjFallObj_MoveBGDraw__FP14daObjFallObj_c = .text:0x00001104; // type:function size:0x2C scope:global +daObjFallObj_create1st__FP14daObjFallObj_c = .text:0x00001050; // type:function size:0x74 scope:local +daObjFallObj_MoveBGDelete__FP14daObjFallObj_c = .text:0x000010C4; // type:function size:0x20 scope:local +daObjFallObj_MoveBGExecute__FP14daObjFallObj_c = .text:0x000010E4; // type:function size:0x20 scope:local +daObjFallObj_MoveBGDraw__FP14daObjFallObj_c = .text:0x00001104; // type:function size:0x2C scope:local cLib_calcTimer__FPs = .text:0x00001130; // type:function size:0x1C scope:global cLib_calcTimer__FPUc = .text:0x0000114C; // type:function size:0x1C scope:global _ctors = .ctors:0x00000000; // type:label scope:global @@ -49,8 +49,8 @@ _dtors = .dtors:0x00000000; // type:label scope:global @3990 = .rodata:0x0000005C; // type:object size:0x4 scope:local @3991 = .rodata:0x00000060; // type:object size:0x4 scope:local @stringBase0 = .rodata:0x00000064; // type:object size:0xA scope:local data:string_table -l_arcName = .data:0x00000000; // type:object size:0x4 scope:global -l_cull_box = .data:0x00000004; // type:object size:0x18 scope:global align:4 data:float -daObjFallObj_METHODS = .data:0x0000001C; // type:object size:0x20 scope:global +l_arcName = .data:0x00000000; // type:object size:0x4 scope:local +l_cull_box = .data:0x00000004; // type:object size:0x18 scope:local align:4 data:float +daObjFallObj_METHODS = .data:0x0000001C; // type:object size:0x20 scope:local g_profile_Obj_FallObj = .data:0x0000003C; // type:object size:0x30 scope:global __vt__14daObjFallObj_c = .data:0x0000006C; // type:object size:0x28 scope:global diff --git a/config/GZ2P01/rels/d_a_obj_fallobj/symbols.txt b/config/GZ2P01/rels/d_a_obj_fallobj/symbols.txt index 2ecd71c5657..483d53b359a 100644 --- a/config/GZ2P01/rels/d_a_obj_fallobj/symbols.txt +++ b/config/GZ2P01/rels/d_a_obj_fallobj/symbols.txt @@ -20,10 +20,10 @@ checkHang__14daObjFallObj_cFv = .text:0x00000DC0; // type:function size:0xA0 sco checkHang2__14daObjFallObj_cFv = .text:0x00000E60; // type:function size:0x104 scope:global Draw__14daObjFallObj_cFv = .text:0x00000F64; // type:function size:0xA4 scope:global Delete__14daObjFallObj_cFv = .text:0x00001008; // type:function size:0x48 scope:global -daObjFallObj_create1st__FP14daObjFallObj_c = .text:0x00001050; // type:function size:0x74 scope:global -daObjFallObj_MoveBGDelete__FP14daObjFallObj_c = .text:0x000010C4; // type:function size:0x20 scope:global -daObjFallObj_MoveBGExecute__FP14daObjFallObj_c = .text:0x000010E4; // type:function size:0x20 scope:global -daObjFallObj_MoveBGDraw__FP14daObjFallObj_c = .text:0x00001104; // type:function size:0x2C scope:global +daObjFallObj_create1st__FP14daObjFallObj_c = .text:0x00001050; // type:function size:0x74 scope:local +daObjFallObj_MoveBGDelete__FP14daObjFallObj_c = .text:0x000010C4; // type:function size:0x20 scope:local +daObjFallObj_MoveBGExecute__FP14daObjFallObj_c = .text:0x000010E4; // type:function size:0x20 scope:local +daObjFallObj_MoveBGDraw__FP14daObjFallObj_c = .text:0x00001104; // type:function size:0x2C scope:local cLib_calcTimer__FPs = .text:0x00001130; // type:function size:0x1C scope:global cLib_calcTimer__FPUc = .text:0x0000114C; // type:function size:0x1C scope:global _ctors = .ctors:0x00000000; // type:label scope:global @@ -49,8 +49,8 @@ _dtors = .dtors:0x00000000; // type:label scope:global @3990 = .rodata:0x0000005C; // type:object size:0x4 scope:local @3991 = .rodata:0x00000060; // type:object size:0x4 scope:local @stringBase0 = .rodata:0x00000064; // type:object size:0xA scope:local data:string_table -l_arcName = .data:0x00000000; // type:object size:0x4 scope:global -l_cull_box = .data:0x00000004; // type:object size:0x18 scope:global align:4 data:float -daObjFallObj_METHODS = .data:0x0000001C; // type:object size:0x20 scope:global +l_arcName = .data:0x00000000; // type:object size:0x4 scope:local +l_cull_box = .data:0x00000004; // type:object size:0x18 scope:local align:4 data:float +daObjFallObj_METHODS = .data:0x0000001C; // type:object size:0x20 scope:local g_profile_Obj_FallObj = .data:0x0000003C; // type:object size:0x30 scope:global __vt__14daObjFallObj_c = .data:0x0000006C; // type:object size:0x28 scope:global diff --git a/config/RZDE01_00/rels/d_a_obj_fallobj/symbols.txt b/config/RZDE01_00/rels/d_a_obj_fallobj/symbols.txt index 5eb86afc413..cd3cd44ac50 100644 --- a/config/RZDE01_00/rels/d_a_obj_fallobj/symbols.txt +++ b/config/RZDE01_00/rels/d_a_obj_fallobj/symbols.txt @@ -19,10 +19,10 @@ checkHang__14daObjFallObj_cFv = .text:0x00000BB0; // type:function size:0x9C sco checkHang2__14daObjFallObj_cFv = .text:0x00000C4C; // type:function size:0xF0 scope:global Draw__14daObjFallObj_cFv = .text:0x00000D3C; // type:function size:0x98 scope:global Delete__14daObjFallObj_cFv = .text:0x00000DD4; // type:function size:0x44 scope:global -daObjFallObj_create1st__FP14daObjFallObj_c = .text:0x00000E18; // type:function size:0x68 scope:global -daObjFallObj_MoveBGDelete__FP14daObjFallObj_c = .text:0x00000E80; // type:function size:0x4 scope:global -daObjFallObj_MoveBGExecute__FP14daObjFallObj_c = .text:0x00000E84; // type:function size:0x4 scope:global -daObjFallObj_MoveBGDraw__FP14daObjFallObj_c = .text:0x00000E88; // type:function size:0x10 scope:global +daObjFallObj_create1st__FP14daObjFallObj_c = .text:0x00000E18; // type:function size:0x68 scope:local +daObjFallObj_MoveBGDelete__FP14daObjFallObj_c = .text:0x00000E80; // type:function size:0x4 scope:local +daObjFallObj_MoveBGExecute__FP14daObjFallObj_c = .text:0x00000E84; // type:function size:0x4 scope:local +daObjFallObj_MoveBGDraw__FP14daObjFallObj_c = .text:0x00000E88; // type:function size:0x10 scope:local _ctors = .ctors:0x00000000; // type:label scope:global _dtors = .dtors:0x00000000; // type:label scope:global ...rodata.0 = .rodata:0x00000000; // type:label scope:local @@ -43,9 +43,9 @@ _dtors = .dtors:0x00000000; // type:label scope:global @93259 = .rodata:0x00000044; // type:object size:0x4 scope:local @93260 = .rodata:0x00000048; // type:object size:0x4 scope:local lbl_442_data_0 = .data:0x00000000; // type:object size:0xC -l_arcName = .data:0x0000000C; // type:object size:0x4 scope:global data:4byte -l_cull_box = .data:0x00000010; // type:object size:0x18 scope:global align:4 data:float -daObjFallObj_METHODS = .data:0x00000028; // type:object size:0x20 scope:global +l_arcName = .data:0x0000000C; // type:object size:0x4 scope:local data:4byte +l_cull_box = .data:0x00000010; // type:object size:0x18 scope:local align:4 data:float +daObjFallObj_METHODS = .data:0x00000028; // type:object size:0x20 scope:local g_profile_Obj_FallObj = .data:0x00000048; // type:object size:0x30 scope:global __vt__14daObjFallObj_c = .data:0x00000078; // type:object size:0x28 scope:global lbl_442_data_A0 = .data:0x000000A0; // type:object size:0x10 diff --git a/config/ShieldD/rels/d_a_obj_fallobjD/symbols.txt b/config/ShieldD/rels/d_a_obj_fallobjD/symbols.txt index 36a738976c8..2d5a44ffc0d 100644 --- a/config/ShieldD/rels/d_a_obj_fallobjD/symbols.txt +++ b/config/ShieldD/rels/d_a_obj_fallobjD/symbols.txt @@ -30,11 +30,11 @@ checkHang2__14daObjFallObj_cFv = .text:0x000012D0; // type:function size:0x100 s Draw__14daObjFallObj_cFv = .text:0x000013D0; // type:function size:0x118 scope:global dDbVw_drawCircleXlu__FR4cXyzfRC8_GXColorUcUc = .text:0x000014F0; // type:function size:0x4C scope:global Delete__14daObjFallObj_cFv = .text:0x00001540; // type:function size:0x50 scope:global -daObjFallObj_create1st__FP14daObjFallObj_c = .text:0x00001590; // type:function size:0x7C scope:global +daObjFallObj_create1st__FP14daObjFallObj_c = .text:0x00001590; // type:function size:0x7C scope:local __ct__14daObjFallObj_cFv = .text:0x00001610; // type:function size:0x48 scope:global -daObjFallObj_MoveBGDelete__FP14daObjFallObj_c = .text:0x00001660; // type:function size:0x28 scope:global -daObjFallObj_MoveBGExecute__FP14daObjFallObj_c = .text:0x00001690; // type:function size:0x28 scope:global -daObjFallObj_MoveBGDraw__FP14daObjFallObj_c = .text:0x000016C0; // type:function size:0x28 scope:global +daObjFallObj_MoveBGDelete__FP14daObjFallObj_c = .text:0x00001660; // type:function size:0x28 scope:local +daObjFallObj_MoveBGExecute__FP14daObjFallObj_c = .text:0x00001690; // type:function size:0x28 scope:local +daObjFallObj_MoveBGDraw__FP14daObjFallObj_c = .text:0x000016C0; // type:function size:0x28 scope:local __dt__18daObjFallObj_HIO_cFv = .text:0x000016F0; // type:function size:0x5C scope:global __sinit_\d_a_obj_fallobj_cpp = .text:0x00001750; // type:function size:0x44 scope:local _ctors = .ctors:0x00000000; // type:label scope:global @@ -60,12 +60,12 @@ _dtors = .dtors:0x00000000; // type:label scope:global @117175 = .rodata:0x0000004C; // type:object size:0x4 scope:local @117179 = .rodata:0x00000050; // type:object size:0x4 scope:local @117180 = .rodata:0x00000054; // type:object size:0x4 scope:local -cNullVec__6Z2Calc = .rodata:0x00000058; // type:object size:0xC scope:global +cNullVec__6Z2Calc = .rodata:0x00000058; // type:object size:0xC scope:local @46916 = .rodata:0x00000064; // type:object size:0x4 scope:local lbl_430_rodata_68 = .rodata:0x00000068; // type:object size:0x14 @116786 = .data:0x00000000; // type:object size:0xA scope:local data:string -l_arcName = .data:0x0000000C; // type:object size:0x4 scope:global data:4byte -l_cull_box = .data:0x00000010; // type:object size:0x18 scope:global align:4 data:float +l_arcName = .data:0x0000000C; // type:object size:0x4 scope:local data:4byte +l_cull_box = .data:0x00000010; // type:object size:0x18 scope:local align:4 data:float @116808 = .data:0x00000028; // type:object size:0xB scope:local @116809 = .data:0x00000034; // type:object size:0xB scope:local @116810 = .data:0x00000040; // type:object size:0xB scope:local @@ -77,7 +77,7 @@ l_cull_box = .data:0x00000010; // type:object size:0x18 scope:global align:4 dat @116990 = .data:0x00000094; // type:object size:0xC scope:local @117035 = .data:0x000000A0; // type:object size:0x14 scope:local @117036 = .data:0x000000B4; // type:object size:0xC scope:local -daObjFallObj_METHODS = .data:0x000000C0; // type:object size:0x20 scope:global +daObjFallObj_METHODS = .data:0x000000C0; // type:object size:0x20 scope:local g_profile_Obj_FallObj = .data:0x000000E0; // type:object size:0x30 scope:global __vt__18daObjFallObj_HIO_c = .data:0x00000110; // type:object size:0x20 scope:global @117263 = .data:0x00000130; // type:object size:0x13 scope:local data:string @@ -98,4 +98,4 @@ __RTTI__14daObjFallObj_c = .data:0x000001B8; // type:object size:0x8 scope:globa lbl_430_data_269 = .data:0x00000269; // type:object size:0x7F __global_destructor_chain = .bss:0x00000000; // type:object size:0x4 scope:global @116795 = .bss:0x00000008; // type:object size:0xC scope:local -l_HIO = .bss:0x00000018; // type:object size:0x10 scope:global data:byte +l_HIO = .bss:0x00000018; // type:object size:0x10 scope:local data:byte diff --git a/configure.py b/configure.py index 65876a55b8d..475a38627c8 100755 --- a/configure.py +++ b/configure.py @@ -1085,7 +1085,7 @@ config.libs = [ Object(NonMatching, "JSystem/J3DGraphBase/J3DShapeDraw.cpp"), Object(MatchingFor("GZ2E01", "GZ2J01"), "JSystem/J3DGraphBase/J3DShape.cpp"), Object(MatchingFor("GZ2E01", "GZ2J01"), "JSystem/J3DGraphBase/J3DMaterial.cpp", extra_cflags=['-pragma "nosyminline off"']), - Object(NonMatching, "JSystem/J3DGraphBase/J3DMatBlock.cpp"), + Object(Equivalent, "JSystem/J3DGraphBase/J3DMatBlock.cpp"), Object(MatchingFor("GZ2E01", "GZ2J01"), "JSystem/J3DGraphBase/J3DTevs.cpp"), Object(MatchingFor("GZ2E01", "GZ2J01"), "JSystem/J3DGraphBase/J3DDrawBuffer.cpp"), Object(MatchingFor("GZ2E01", "GZ2J01"), "JSystem/J3DGraphBase/J3DStruct.cpp"), @@ -1919,7 +1919,7 @@ config.libs = [ ActorRel(NonMatching, "d_a_obj_drop"), ActorRel(NonMatching, "d_a_obj_dust"), ActorRel(MatchingFor("GZ2E01"), "d_a_obj_enemy_create"), - ActorRel(NonMatching, "d_a_obj_fallobj"), + ActorRel(MatchingFor("GZ2E01"), "d_a_obj_fallobj"), ActorRel(MatchingFor("GZ2E01"), "d_a_obj_fan"), ActorRel(Equivalent, "d_a_obj_fchain"), # weak func order ActorRel(MatchingFor("GZ2E01"), "d_a_obj_fireWood"), diff --git a/include/JSystem/J3DGraphBase/J3DMatBlock.h b/include/JSystem/J3DGraphBase/J3DMatBlock.h index 9d255870421..79f309e0036 100644 --- a/include/JSystem/J3DGraphBase/J3DMatBlock.h +++ b/include/JSystem/J3DGraphBase/J3DMatBlock.h @@ -1000,8 +1000,8 @@ struct J3DIndTexCoordScale : public J3DIndTexCoordScaleInfo { /* 8000E0E4 */ J3DIndTexCoordScale() : J3DIndTexCoordScaleInfo(j3dDefaultIndTexCoordScaleInfo) {} J3DIndTexCoordScale(J3DIndTexCoordScaleInfo const& info) : J3DIndTexCoordScaleInfo(info) {} /* 8000E024 */ ~J3DIndTexCoordScale() {} - GXIndTexScale getScaleS() { return (GXIndTexScale)mScaleS; } - GXIndTexScale getScaleT() { return (GXIndTexScale)mScaleT; } + u8 getScaleS() { return mScaleS; } + u8 getScaleT() { return mScaleT; } J3DIndTexCoordScale& operator=(const J3DIndTexCoordScale& other) { //__memcpy(this, &other, sizeof(J3DIndTexCoordScaleInfo)); @@ -1020,8 +1020,8 @@ struct J3DIndTexMtx : public J3DIndTexMtxInfo { /* 8000E0F0 */ J3DIndTexMtx() { *(J3DIndTexMtxInfo*)this = j3dDefaultIndTexMtxInfo; } J3DIndTexMtx(J3DIndTexMtxInfo const& info) { *(J3DIndTexMtxInfo*)this = info; } /* 8000E064 */ ~J3DIndTexMtx() {} - void load(u32 param_1) { - J3DGDSetIndTexMtx((GXIndTexMtxID)(param_1 + 1), field_0x0, field_0x18); + void load(u32 param_1) const { + J3DGDSetIndTexMtx((GXIndTexMtxID)(param_1 + 1), (Mtx3P)field_0x0, field_0x18); } }; // Size: 0x1C @@ -1045,8 +1045,8 @@ extern const J3DIndTexOrderInfo j3dDefaultIndTexOrderNull; struct J3DIndTexOrder : public J3DIndTexOrderInfo { /* 8000E128 */ J3DIndTexOrder() : J3DIndTexOrderInfo(j3dDefaultIndTexOrderNull) {} J3DIndTexOrder(J3DIndTexOrderInfo const& info) : J3DIndTexOrderInfo(info) {} - GXTexMapID getMap() { return (GXTexMapID)mMap; } - GXTexCoordID getCoord() { return (GXTexCoordID)mCoord; } + u8 getMap() const { return (GXTexMapID)mMap; } + u8 getCoord() const { return (GXTexCoordID)mCoord; } J3DIndTexOrder& operator=(const J3DIndTexOrder& other) { //__memcpy(this, &other, sizeof(J3DIndTexOrderInfo)); @@ -1195,23 +1195,22 @@ struct J3DColorChan { mColorChanID = calcColorChanID(info.mEnable, info.mMatSrc, info.mLightMask, info.mDiffuseFn, info.mAttnFn, ambSrc); } - u8 getLightMask() { return ((mColorChanID >> 2) & 0xf) | ((mColorChanID >> 11) & 0xf) << 4; } + u8 getLightMask() const { return ((mColorChanID >> 2) & 0xf) | ((mColorChanID >> 11) & 0xf) << 4; } void setLightMask(u8 param_1) { mColorChanID = (mColorChanID & ~0x3c) | ((param_1 & 0xf) << 2); mColorChanID = (mColorChanID & ~0x7800) | ((param_1 & 0xf0) << 7); } - u8 getEnable() { return (mColorChanID >> 1) & 1; } - GXColorSrc getAmbSrc() { return (GXColorSrc)((mColorChanID >> 6) & 1); } - GXColorSrc getMatSrc() { return (GXColorSrc)(mColorChanID & 1); } - GXDiffuseFn getDiffuseFn() { return (GXDiffuseFn) ((mColorChanID >> 7) & 3); } + u8 getEnable() const { return (mColorChanID >> 1) & 1; } + u8 getAmbSrc() const { return (GXColorSrc)((mColorChanID >> 6) & 1); } + u8 getMatSrc() const { return (GXColorSrc)(mColorChanID & 1); } + u8 getDiffuseFn() const { return ((mColorChanID >> 7) & 3); } // This function has to appear in J3DMatBlock.cpp because it generates extra data in .sdata2 - inline GXAttnFn getAttnFn(); + inline u8 getAttnFn() const; - // NONMATCHING regalloc - void load() { - J3DGDWrite_u32(setChanCtrlMacro(getEnable(), getAmbSrc(), getMatSrc(), getLightMask(), - getDiffuseFn(), getAttnFn())); + void load() const { + J3DGDWrite_u32(setChanCtrlMacro(getEnable(), (GXColorSrc)getAmbSrc(), (GXColorSrc)getMatSrc(), getLightMask(), + (GXDiffuseFn)getDiffuseFn(), (GXAttnFn)getAttnFn())); } /* 0x0 */ u16 mColorChanID; diff --git a/include/Z2AudioLib/Z2SoundObject.h b/include/Z2AudioLib/Z2SoundObject.h index cfb2f66c500..30c71573445 100644 --- a/include/Z2AudioLib/Z2SoundObject.h +++ b/include/Z2AudioLib/Z2SoundObject.h @@ -17,7 +17,7 @@ public: bool isAlive() const { return mIsInitialized; } void setSoundStarter(Z2SoundStarter* i_soundStarter) { mSoundStarter = i_soundStarter; } - virtual void framework(u32, s8); + virtual void framework(u32, s8 reverb); virtual void dispose(); virtual bool stopOK(Z2SoundHandlePool& pool); virtual void init(Vec* pSoundPos, u8 pNumHandles); diff --git a/include/d/actor/d_a_obj_fallobj.h b/include/d/actor/d_a_obj_fallobj.h index cddb5da81d5..bc55cfd584e 100644 --- a/include/d/actor/d_a_obj_fallobj.h +++ b/include/d/actor/d_a_obj_fallobj.h @@ -15,50 +15,72 @@ */ class daObjFallObj_c : public dBgS_MoveBgActor { public: -public: + enum Action { + ACTION_WAIT, + ACTION_COUNTDOWN, + ACTION_FALL, + ACTION_FALL_START, + ACTION_END, + ACTION_FOLLOW_FALL, + }; + /* 80BE39B8 */ void initBaseMtx(); /* 80BE3A24 */ void setBaseMtx(); /* 80BE3A88 */ int Create(); - /* 80BE3BA8 */ void getFallTime(); - /* 80BE3BD4 */ void getFallHeight(); + /* 80BE3BA8 */ s16 getFallTime(); + /* 80BE3BD4 */ f32 getFallHeight(); /* 80BE3C28 */ int CreateHeap(); /* 80BE3C98 */ int create1st(); /* 80BE3D24 */ int Execute(Mtx**); /* 80BE4138 */ void action(); - /* 80BE4228 */ void action_wait(bool); - /* 80BE42C0 */ void action_fallStart(); + /* 80BE4228 */ bool action_wait(bool); + /* 80BE42C0 */ bool action_fallStart(); /* 80BE43E4 */ void action_countdown(); /* 80BE45F4 */ void action_fall(); /* 80BE466C */ void action_end(); /* 80BE4670 */ void action_follow_fall(); - /* 80BE4700 */ void checkHang(); - /* 80BE47A0 */ void checkHang2(); + /* 80BE4700 */ bool checkHang(); + /* 80BE47A0 */ bool checkHang2(); /* 80BE48A4 */ int Draw(); /* 80BE4948 */ int Delete(); u32 getTime() { return fopAcM_GetParamBit(this, 8, 8); } u32 getPos() { return fopAcM_GetParamBit(this, 0x14, 8); } - BOOL checkFallStart() { return fopAcM_SearchByID(parentActorID)->speed.y != 0.0f; } + static BOOL checkFallStart(fopAc_ac_c* actor) { return actor->speed.y != 0.0f; } private: /* 0x5A0 */ request_of_phase_process_class mPhaseReq; /* 0x5A8 */ Mtx mMtx; /* 0x5D8 */ u8 field_0x5d8; - /* 0x5D9 */ u8 field_0x5d9; - /* 0x5DA */ s16 field_0x5da; + /* 0x5D9 */ u8 mTimer; + /* 0x5DA */ s16 mFallTime; /* 0x5DC */ s16 field_0x5dc; /* 0x5DE */ s16 field_0x5de; - /* 0x5E0 */ s32 field_0x5e0; - /* 0x5E4 */ u8 field_0x5e4; - /* 0x5E5 */ u8 field_0x5e5; + /* 0x5E0 */ int field_0x5e0; + /* 0x5E4 */ bool field_0x5e4; + /* 0x5E5 */ bool field_0x5e5; /* 0x5E8 */ J3DModel* mpModel; - /* 0x5EC */ s32 field_0x5ec; - /* 0x5F0 */ u8 field_0x5f0; - /* 0x5F1 */ u8 field_0x5f1; + /* 0x5EC */ fpc_ProcID mChildId; + /* 0x5F0 */ u8 mAction; + /* 0x5F1 */ bool mVibrationOn; /* 0x5F4 */ Z2SoundObjSimple mSoundObj; }; STATIC_ASSERT(sizeof(daObjFallObj_c) == 0x614); +#ifdef DEBUG +class daObjFallObj_HIO_c : public mDoHIO_entry_c { +public: + daObjFallObj_HIO_c(); + void genMessage(JORMContext* ctx); + + /* 0x6 */ s8 mId; + /* 0x8 */ s16 mMovementShake; + /* 0xA */ s16 mStaticShake; + /* 0xC */ u8 mNoFall; + /* 0xD */ u8 mCheckDisplay; +}; +#endif + #endif /* D_A_OBJ_FALLOBJ_H */ diff --git a/src/JSystem/J3DGraphBase/J3DMatBlock.cpp b/src/JSystem/J3DGraphBase/J3DMatBlock.cpp index 4c0bfc8a43c..fd6832381cd 100644 --- a/src/JSystem/J3DGraphBase/J3DMatBlock.cpp +++ b/src/JSystem/J3DGraphBase/J3DMatBlock.cpp @@ -344,13 +344,12 @@ static u32 SizeOfLoadColorChans = 21; /* 804515D8-804515DC 000AD8 0004+00 2/2 0/0 0/0 .sbss SizeOfJ3DColorBlockLightOffLoad */ static u32 SizeOfJ3DColorBlockLightOffLoad = SizeOfLoadMatColors + SizeOfLoadColorChans; -GXAttnFn J3DColorChan::getAttnFn() { +u8 J3DColorChan::getAttnFn() const { u8 AttnArr[] = {2,0,2,1}; - return (GXAttnFn)AttnArr[(mColorChanID >> 9) & 3]; + return AttnArr[(mColorChanID >> 9) & 3]; } /* 80317C0C-8031816C 31254C 0560+00 1/0 0/0 0/0 .text load__21J3DColorBlockLightOffFv */ -// NONMATCHING Issues with mColorChanID void J3DColorBlockLightOff::load() { GDOverflowCheck(SizeOfJ3DColorBlockLightOffLoad); mMatColorOffset = GDGetCurrOffset(); @@ -1488,35 +1487,34 @@ void J3DTevBlock::indexToPtr_private(u32 offs) { } /* 8031E12C-8031E328 318A6C 01FC+00 1/0 0/0 0/0 .text load__15J3DIndBlockFullFv */ -// NONMATCHING regalloc void J3DIndBlockFull::load() { - u8 indTexStageNum = mIndTexStageNum; + int indTexStageNum = mIndTexStageNum; for (u32 i = 0; i < indTexStageNum; i++) { mIndTexMtx[i].load(i); } for (u32 i = 0; i < indTexStageNum; i += 2) { J3DGDSetIndTexCoordScale( GXIndTexStageID(i), - mIndTexCoordScale[i].getScaleS(), - mIndTexCoordScale[i].getScaleT(), - mIndTexCoordScale[i + 1].getScaleS(), - mIndTexCoordScale[i + 1].getScaleT() + (GXIndTexScale)mIndTexCoordScale[i].getScaleS(), + (GXIndTexScale)mIndTexCoordScale[i].getScaleT(), + (GXIndTexScale)mIndTexCoordScale[i + 1].getScaleS(), + (GXIndTexScale)mIndTexCoordScale[i + 1].getScaleT() ); } - loadTexCoordScale(mIndTexOrder[0].getCoord(), J3DSys::sTexCoordScaleTable[mIndTexOrder[0].getMap() & 7]); - loadTexCoordScale(mIndTexOrder[1].getCoord(), J3DSys::sTexCoordScaleTable[mIndTexOrder[1].getMap() & 7]); - loadTexCoordScale(mIndTexOrder[2].getCoord(), J3DSys::sTexCoordScaleTable[mIndTexOrder[2].getMap() & 7]); - loadTexCoordScale(mIndTexOrder[3].getCoord(), J3DSys::sTexCoordScaleTable[mIndTexOrder[3].getMap() & 7]); + loadTexCoordScale((GXTexCoordID)mIndTexOrder[0].getCoord(), J3DSys::sTexCoordScaleTable[mIndTexOrder[0].getMap() & 7]); + loadTexCoordScale((GXTexCoordID)mIndTexOrder[1].getCoord(), J3DSys::sTexCoordScaleTable[mIndTexOrder[1].getMap() & 7]); + loadTexCoordScale((GXTexCoordID)mIndTexOrder[2].getCoord(), J3DSys::sTexCoordScaleTable[mIndTexOrder[2].getMap() & 7]); + loadTexCoordScale((GXTexCoordID)mIndTexOrder[3].getCoord(), J3DSys::sTexCoordScaleTable[mIndTexOrder[3].getMap() & 7]); J3DGDSetIndTexOrder( indTexStageNum, - mIndTexOrder[0].getCoord(), - mIndTexOrder[0].getMap(), - mIndTexOrder[1].getCoord(), - mIndTexOrder[1].getMap(), - mIndTexOrder[2].getCoord(), - mIndTexOrder[2].getMap(), - mIndTexOrder[3].getCoord(), - mIndTexOrder[3].getMap() + (GXTexCoordID)mIndTexOrder[0].getCoord(), + (GXTexMapID)mIndTexOrder[0].getMap(), + (GXTexCoordID)mIndTexOrder[1].getCoord(), + (GXTexMapID)mIndTexOrder[1].getMap(), + (GXTexCoordID)mIndTexOrder[2].getCoord(), + (GXTexMapID)mIndTexOrder[2].getMap(), + (GXTexCoordID)mIndTexOrder[3].getCoord(), + (GXTexMapID)mIndTexOrder[3].getMap() ); } @@ -1529,22 +1527,22 @@ void J3DIndBlockFull::diff(u32 flag) { mIndTexMtx[0].load(0); J3DGDSetIndTexCoordScale( GX_INDTEXSTAGE0, - mIndTexCoordScale[0].getScaleS(), - mIndTexCoordScale[0].getScaleT(), - mIndTexCoordScale[1].getScaleS(), - mIndTexCoordScale[1].getScaleT() + (GXIndTexScale)mIndTexCoordScale[0].getScaleS(), + (GXIndTexScale)mIndTexCoordScale[0].getScaleT(), + (GXIndTexScale)mIndTexCoordScale[1].getScaleS(), + (GXIndTexScale)mIndTexCoordScale[1].getScaleT() ); - loadTexCoordScale(mIndTexOrder[0].getCoord(), J3DSys::sTexCoordScaleTable[mIndTexOrder[0].getMap() & 7]); + loadTexCoordScale((GXTexCoordID)mIndTexOrder[0].getCoord(), J3DSys::sTexCoordScaleTable[mIndTexOrder[0].getMap() & 7]); J3DGDSetIndTexOrder( indTexStageNum, - mIndTexOrder[0].getCoord(), - mIndTexOrder[0].getMap(), - mIndTexOrder[1].getCoord(), - mIndTexOrder[1].getMap(), - mIndTexOrder[2].getCoord(), - mIndTexOrder[2].getMap(), - mIndTexOrder[3].getCoord(), - mIndTexOrder[3].getMap() + (GXTexCoordID)mIndTexOrder[0].getCoord(), + (GXTexMapID)mIndTexOrder[0].getMap(), + (GXTexCoordID)mIndTexOrder[1].getCoord(), + (GXTexMapID)mIndTexOrder[1].getMap(), + (GXTexCoordID)mIndTexOrder[2].getCoord(), + (GXTexMapID)mIndTexOrder[2].getMap(), + (GXTexCoordID)mIndTexOrder[3].getCoord(), + (GXTexMapID)mIndTexOrder[3].getMap() ); } @@ -2066,11 +2064,10 @@ void J3DTexGenBlockPatched::calcPostTexMtx(const Mtx modelMtx) { /* 8032181C-80321938 31C15C 011C+00 4/0 0/0 0/0 .text * calcPostTexMtxWithoutViewMtx__21J3DTexGenBlockPatchedFPA4_Cf */ -// NONMATCHING regalloc void J3DTexGenBlockPatched::calcPostTexMtxWithoutViewMtx(f32 const (*param_0)[4]) { for (int i = 0; i < 8; i++) { if (mTexMtx[i] != NULL) { - u8 texMtxMode = mTexMtx[i]->getTexMtxInfo().mInfo & 0x3f; + int texMtxMode = mTexMtx[i]->getTexMtxInfo().mInfo & 0x3f; mTexCoord[i].resetTexMtxReg(); switch (texMtxMode) { case J3DTexMtxMode_EnvmapBasic: diff --git a/src/Z2AudioLib/Z2SoundObject.cpp b/src/Z2AudioLib/Z2SoundObject.cpp index 81e07a20d83..58b1c8ce9d3 100644 --- a/src/Z2AudioLib/Z2SoundObject.cpp +++ b/src/Z2AudioLib/Z2SoundObject.cpp @@ -39,10 +39,10 @@ void Z2SoundObjBase::deleteObject() { deleteHandlesPool(); } -void Z2SoundObjBase::framework(u32 p1, s8 p2) { +void Z2SoundObjBase::framework(u32 p1, s8 reverb) { if (mIsInitialized) { field_0x1c = p1; - field_0x1e = p2; + field_0x1e = reverb; setPos(*mSoundPos); } } @@ -531,4 +531,4 @@ bool Z2SoundObjAnime::playsSound(JAUSoundAnimationSound const* i_sound, } return true; -} \ No newline at end of file +} diff --git a/src/d/actor/d_a_obj_fallobj.cpp b/src/d/actor/d_a_obj_fallobj.cpp index a4ccd0696a7..42ea65f1b0e 100644 --- a/src/d/actor/d_a_obj_fallobj.cpp +++ b/src/d/actor/d_a_obj_fallobj.cpp @@ -4,126 +4,54 @@ */ #include "d/actor/d_a_obj_fallobj.h" +#include "d/actor/d_a_player.h" +#include "d/d_bg_w.h" +#include "d/d_debug_viewer.h" #include "d/d_procname.h" -#include "dol2asm.h" +#ifdef DEBUG -// -// Forward References: -// +daObjFallObj_HIO_c::daObjFallObj_HIO_c() { + mMovementShake = 0; + mStaticShake = 0; + mNoFall = 0; + mCheckDisplay = 0; +} -extern "C" void initBaseMtx__14daObjFallObj_cFv(); -extern "C" void setBaseMtx__14daObjFallObj_cFv(); -extern "C" void Create__14daObjFallObj_cFv(); -extern "C" void getFallTime__14daObjFallObj_cFv(); -extern "C" void getFallHeight__14daObjFallObj_cFv(); -extern "C" void CreateHeap__14daObjFallObj_cFv(); -extern "C" void create1st__14daObjFallObj_cFv(); -extern "C" void Execute__14daObjFallObj_cFPPA3_A4_f(); -extern "C" void action__14daObjFallObj_cFv(); -extern "C" void action_wait__14daObjFallObj_cFb(); -extern "C" void action_fallStart__14daObjFallObj_cFv(); -extern "C" void action_countdown__14daObjFallObj_cFv(); -extern "C" void action_fall__14daObjFallObj_cFv(); -extern "C" void action_end__14daObjFallObj_cFv(); -extern "C" void action_follow_fall__14daObjFallObj_cFv(); -extern "C" void checkHang__14daObjFallObj_cFv(); -extern "C" void checkHang2__14daObjFallObj_cFv(); -extern "C" void Draw__14daObjFallObj_cFv(); -extern "C" void Delete__14daObjFallObj_cFv(); -extern "C" static void daObjFallObj_create1st__FP14daObjFallObj_c(); -extern "C" static void daObjFallObj_MoveBGDelete__FP14daObjFallObj_c(); -extern "C" static void daObjFallObj_MoveBGExecute__FP14daObjFallObj_c(); -extern "C" static void daObjFallObj_MoveBGDraw__FP14daObjFallObj_c(); -extern "C" void func_80BE4A70(void* _this, s16*); -extern "C" void func_80BE4A8C(void* _this, u8*); -extern "C" extern char const* const d_a_obj_fallobj__stringBase0; +void daObjFallObj_HIO_c::genMessage(JORMContext* ctx) { + // Falling Object + ctx->genLabel("落下ＯＢＪ", 0, 0, NULL, 0xffff, 0xffff, 0x200, 0x18); + // Movement Shake + ctx->genSlider("移動時揺れ", &mMovementShake, 0, 1000, 0, NULL, 0xffff, 0xffff, 0x200, 0x18); + // Static Shake + ctx->genSlider("静止時揺れ", &mStaticShake, 0, 1000, 0, NULL, 0xffff, 0xffff, 0x200, 0x18); + // No Fall + ctx->genCheckBox("落下しない", &mNoFall, 1, 0, NULL, 0xffff, 0xffff, 0x200, 0x18); + // Check Display + ctx->genCheckBox("チェック表示", &mCheckDisplay, 1, 0, NULL, 0xffff, 0xffff, 0x200, 0x18); +} -// -// External References: -// +static daObjFallObj_HIO_c l_HIO; -extern "C" void mDoMtx_YrotM__FPA4_fs(); -extern "C" void transS__14mDoMtx_stack_cFRC4cXyz(); -extern "C" void ZXYrotM__14mDoMtx_stack_cFRC5csXyz(); -extern "C" void mDoExt_modelUpdateDL__FP8J3DModel(); -extern "C" void mDoExt_J3DModel__create__FP12J3DModelDataUlUl(); -extern "C" void fopAcIt_Judge__FPFPvPv_PvPv(); -extern "C" void fopAcM_delete__FP10fopAc_ac_c(); -extern "C" void fopAcM_createChildFromOffset__FsUiUlPC4cXyziPC5csXyzPC4cXyzScPFPv_i(); -extern "C" void fopAcM_setCullSizeBox__FP10fopAc_ac_cffffff(); -extern "C" void fopAcM_searchActorDistanceXZ__FPC10fopAc_ac_cPC10fopAc_ac_c(); -extern "C" void fpcSch_JudgeByID__FPvPv(); -extern "C" void dComIfG_resLoad__FP30request_of_phase_process_classPCc(); -extern "C" void dComIfG_resDelete__FP30request_of_phase_process_classPCc(); -extern "C" void dComIfGp_getReverb__Fi(); -extern "C" void getRes__14dRes_control_cFPCclP11dRes_info_ci(); -extern "C" void StartShock__12dVibration_cFii4cXyz(); -extern "C" void StartQuake__12dVibration_cFii4cXyz(); -extern "C" void StopQuake__12dVibration_cFi(); -extern "C" void LineCross__4cBgSFP11cBgS_LinChk(); -extern "C" void dBgS_MoveBGProc_Typical__FP4dBgWPvRC13cBgS_PolyInfobP4cXyzP5csXyzP5csXyz(); -extern "C" void __ct__11dBgS_LinChkFv(); -extern "C" void __dt__11dBgS_LinChkFv(); -extern "C" void Set__11dBgS_LinChkFPC4cXyzPC4cXyzPC10fopAc_ac_c(); -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 settingTevStruct__18dScnKy_env_light_cFiP4cXyzP12dKy_tevstr_c(); -extern "C" void setLightTevColorType_MAJI__18dScnKy_env_light_cFP12J3DModelDataP12dKy_tevstr_c(); -extern "C" void cLib_chaseS__FPsss(); -extern "C" void deleteObject__14Z2SoundObjBaseFv(); -extern "C" void __ct__16Z2SoundObjSimpleFv(); -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" u8 sincosTable___5JMath[65536]; - -// -// Declarations: -// +#endif /* 80BE39B8-80BE3A24 000078 006C+00 1/1 0/0 0/0 .text initBaseMtx__14daObjFallObj_cFv */ void daObjFallObj_c::initBaseMtx() { - // NONMATCHING + mDoMtx_stack_c::transS(current.pos); + mDoMtx_stack_c::ZXYrotM(shape_angle); + MTXCopy(mDoMtx_stack_c::get(), mMtx); + mpModel->setBaseScale(scale); + setBaseMtx(); } /* 80BE3A24-80BE3A88 0000E4 0064+00 2/2 0/0 0/0 .text setBaseMtx__14daObjFallObj_cFv */ void daObjFallObj_c::setBaseMtx() { - // NONMATCHING + mDoMtx_stack_c::transS(current.pos); + mDoMtx_stack_c::YrotM(shape_angle.y); + mpModel->setBaseTRMtx(mDoMtx_stack_c::get()); + MTXCopy(mDoMtx_stack_c::get(), mBgMtx); } -/* ############################################################################################## */ -/* 80BE4AB0-80BE4AB4 000000 0004+00 7/7 0/0 0/0 .rodata @3677 */ -SECTION_RODATA static u8 const lit_3677[4] = { - 0x00, - 0x00, - 0x00, - 0x00, -}; -COMPILER_STRIP_GATE(0x80BE4AB0, &lit_3677); - -/* 80BE4AB4-80BE4AB8 000004 0004+00 0/1 0/0 0/0 .rodata @3678 */ -#pragma push -#pragma force_active on -SECTION_RODATA static f32 const lit_3678 = -300.0f; -COMPILER_STRIP_GATE(0x80BE4AB4, &lit_3678); -#pragma pop - -/* 80BE4AB8-80BE4ABC 000008 0004+00 0/1 0/0 0/0 .rodata @3679 */ -#pragma push -#pragma force_active on -SECTION_RODATA static f32 const lit_3679 = -6.0f; -COMPILER_STRIP_GATE(0x80BE4AB8, &lit_3679); -#pragma pop - /* 80BE4B20-80BE4B24 -00001 0004+00 3/3 0/0 0/0 .data l_arcName */ static char* l_arcName = "K_drock00"; @@ -135,222 +63,383 @@ static Vec l_cull_box[2] = { /* 80BE3A88-80BE3BA8 000148 0120+00 1/0 0/0 0/0 .text Create__14daObjFallObj_cFv */ int daObjFallObj_c::Create() { - // NONMATCHING + u8 uVar1 = field_0x5d8 - 1; + if (uVar1 != 0) { + cXyz acStack_30(0.0f, -300.0f, 0.0f); + u32 params = uVar1 | (getTime() << 8); + mChildId = fopAcM_createChildFromOffset( + PROC_Obj_FallObj, fopAcM_GetID(this), params, &acStack_30, fopAcM_GetRoomNo(this), &shape_angle, + &scale, -1, 0); + } else { + mChildId = fpcM_ERROR_PROCESS_ID_e; + } + + mFallTime = getFallTime(); + initBaseMtx(); + fopAcM_SetMtx(this, mMtx); + fopAcM_setCullSizeBox(this, l_cull_box[0].x, l_cull_box[0].y, l_cull_box[0].z, l_cull_box[1].x, + l_cull_box[1].y, l_cull_box[1].z); + fopAcM_SetGravity(this, -6.0f); + mSoundObj.init(¤t.pos, 1); + return 1; } /* 80BE3BA8-80BE3BD4 000268 002C+00 2/2 0/0 0/0 .text getFallTime__14daObjFallObj_cFv */ -void daObjFallObj_c::getFallTime() { - // NONMATCHING +s16 daObjFallObj_c::getFallTime() { + u32 time = getTime(); + if (time == 0) { + return 1; + } + + if (time == 0xff) { + return 150; + } + + return time * 15; } -/* ############################################################################################## */ -/* 80BE4ABC-80BE4AC0 00000C 0004+00 0/1 0/0 0/0 .rodata @3705 */ -#pragma push -#pragma force_active on -SECTION_RODATA static f32 const lit_3705 = 450.0f; -COMPILER_STRIP_GATE(0x80BE4ABC, &lit_3705); -#pragma pop - -/* 80BE4AC0-80BE4AC4 000010 0004+00 0/2 0/0 0/0 .rodata @3706 */ -#pragma push -#pragma force_active on -SECTION_RODATA static f32 const lit_3706 = 300.0f; -COMPILER_STRIP_GATE(0x80BE4AC0, &lit_3706); -#pragma pop - -/* 80BE4AC4-80BE4AC8 000014 0004+00 1/2 0/0 0/0 .rodata @3707 */ -SECTION_RODATA static f32 const lit_3707 = 50.0f; -COMPILER_STRIP_GATE(0x80BE4AC4, &lit_3707); - -/* 80BE4AC8-80BE4AD0 000018 0008+00 0/1 0/0 0/0 .rodata @3709 */ -#pragma push -#pragma force_active on -SECTION_RODATA static u8 const lit_3709[8] = { - 0x43, 0x30, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, -}; -COMPILER_STRIP_GATE(0x80BE4AC8, &lit_3709); -#pragma pop - /* 80BE3BD4-80BE3C28 000294 0054+00 1/1 0/0 0/0 .text getFallHeight__14daObjFallObj_cFv */ -void daObjFallObj_c::getFallHeight() { - // NONMATCHING +f32 daObjFallObj_c::getFallHeight() { + u32 pos = getPos(); + if (pos == 0xff) { + return 450.0f; + } + + return pos * 50.0f + 300.0f; } /* 80BE3C28-80BE3C98 0002E8 0070+00 1/0 0/0 0/0 .text CreateHeap__14daObjFallObj_cFv */ int daObjFallObj_c::CreateHeap() { - // NONMATCHING + J3DModelData* modelData = (J3DModelData*)dComIfG_getObjectRes(l_arcName, 4); + JUT_ASSERT(260, modelData != 0); + mpModel = mDoExt_J3DModel__create(modelData, 0x80000, 0x11000084); + return mpModel != NULL ? TRUE : FALSE; } /* 80BE3C98-80BE3D24 000358 008C+00 1/1 0/0 0/0 .text create1st__14daObjFallObj_cFv */ int daObjFallObj_c::create1st() { - // NONMATCHING + field_0x5d8 = 1; + int phase = dComIfG_resLoad(&mPhaseReq, l_arcName); + if (phase == cPhs_COMPLEATE_e) { + phase = + MoveBGCreate(l_arcName, 7, dBgS_MoveBGProc_Typical, 0x2700, NULL); + if (phase == cPhs_ERROR_e) { + return phase; + } + + #ifdef DEBUG + // Falling obj + l_HIO.entryHIO("落下ＯＢＪ"); + #endif + } + return phase; } -/* ############################################################################################## */ -/* 80BE4AD0-80BE4AD4 000020 0004+00 0/1 0/0 0/0 .rodata @3818 */ -#pragma push -#pragma force_active on -SECTION_RODATA static f32 const lit_3818 = 150.0f; -COMPILER_STRIP_GATE(0x80BE4AD0, &lit_3818); -#pragma pop - -/* 80BE4AD4-80BE4AD8 000024 0004+00 0/1 0/0 0/0 .rodata @3819 */ -#pragma push -#pragma force_active on -SECTION_RODATA static f32 const lit_3819 = 160.0f; -COMPILER_STRIP_GATE(0x80BE4AD4, &lit_3819); -#pragma pop - -/* 80BE4AD8-80BE4AE0 000028 0008+00 0/1 0/0 0/0 .rodata @3820 */ -#pragma push -#pragma force_active on -SECTION_RODATA static u8 const lit_3820[8] = { - 0x3F, 0xE0, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, -}; -COMPILER_STRIP_GATE(0x80BE4AD8, &lit_3820); -#pragma pop - -/* 80BE4AE0-80BE4AE8 000030 0008+00 0/1 0/0 0/0 .rodata @3821 */ -#pragma push -#pragma force_active on -SECTION_RODATA static u8 const lit_3821[8] = { - 0x40, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, -}; -COMPILER_STRIP_GATE(0x80BE4AE0, &lit_3821); -#pragma pop - -/* 80BE4AE8-80BE4AF0 000038 0008+00 0/1 0/0 0/0 .rodata @3822 */ -#pragma push -#pragma force_active on -SECTION_RODATA static u8 const lit_3822[8] = { - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, -}; -COMPILER_STRIP_GATE(0x80BE4AE8, &lit_3822); -#pragma pop - -/* 80BE4AF0-80BE4AF4 000040 0004+00 0/1 0/0 0/0 .rodata @3823 */ -#pragma push -#pragma force_active on -SECTION_RODATA static f32 const lit_3823 = 2150.0f; -COMPILER_STRIP_GATE(0x80BE4AF0, &lit_3823); -#pragma pop - /* 80BE3D24-80BE4138 0003E4 0414+00 1/0 0/0 0/0 .text Execute__14daObjFallObj_cFPPA3_A4_f */ int daObjFallObj_c::Execute(Mtx** i_mtx) { - // NONMATCHING + cXyz cStack_d8(0.0f, 150.0f, 160.0f); + + mDoMtx_stack_c::transS(current.pos); + mDoMtx_stack_c::ZXYrotM(shape_angle); + mDoMtx_stack_c::multVec(&cStack_d8, &cStack_d8); + + attention_info.position = cStack_d8; + eyePos = cStack_d8; + + daPy_py_c* player = daPy_getPlayerActorClass(); + + f32 dVar12 = fabsf(player->current.pos.y - cStack_d8.y); + f32 dVar13 = cStack_d8.absXZ(player->current.pos); + f32 dVar14 = player->current.pos.abs(cStack_d8); + + dBgS_LinChk linChk; + linChk.Set(&player->eyePos, &attention_info.position, this); + + bool bVar1 = false; + if (!dComIfG_Bgsp().LineCross(&linChk) && !checkHang2() && dVar12 < dVar13 && dVar14 < 2150.0f && mAction == ACTION_WAIT) { + bVar1 = true; + } + + if (bVar1) { + attention_info.distances[fopAc_attn_BATTLE_e] = 0x22; + attention_info.flags |= 4; + } else { + attention_info.distances[fopAc_attn_BATTLE_e] = 0x0; + attention_info.flags &= ~4; + } + + field_0x5e0 += 1; + action(); + *i_mtx = &mBgMtx; + setBaseMtx(); + mSoundObj.framework(0, dComIfGp_getReverb(fopAcM_GetRoomNo(this))); + return 1; } /* 80BE4138-80BE4228 0007F8 00F0+00 1/1 0/0 0/0 .text action__14daObjFallObj_cFv */ void daObjFallObj_c::action() { - // NONMATCHING + bool isHang = checkHang(); + + switch (mAction) { + case ACTION_WAIT: + action_wait(isHang); + break; + case ACTION_COUNTDOWN: + action_countdown(); + break; + case ACTION_FALL: + action_fall(); + break; + case ACTION_FALL_START: + action_fallStart(); + break; + case ACTION_END: + action_end(); + break; + case ACTION_FOLLOW_FALL: + action_follow_fall(); + break; + } + + if (mVibrationOn && !field_0x5e4) { + dComIfGp_getVibration().StopQuake(0x1f); + mVibrationOn = false; + // Shaking Stop! + OS_REPORT("揺れ停止！\n"); + } + field_0x5e5 = field_0x5e4; + field_0x5e4 = false; } /* 80BE4228-80BE42C0 0008E8 0098+00 1/1 0/0 0/0 .text action_wait__14daObjFallObj_cFb */ -void daObjFallObj_c::action_wait(bool param_0) { - // NONMATCHING +bool daObjFallObj_c::action_wait(bool param_1) { + if (param_1) { + mTimer = 10; + mAction = ACTION_FALL_START; + } + + if (parentActorID != fpcM_ERROR_PROCESS_ID_e) { + fopAc_ac_c* parent = fopAcM_SearchByID(parentActorID); + if (parent != NULL && checkFallStart(parent)) { + mAction = ACTION_FOLLOW_FALL; + } + } + return param_1; } -/* ############################################################################################## */ -/* 80BE4AF4-80BE4AF8 000044 0004+00 0/1 0/0 0/0 .rodata @3882 */ -#pragma push -#pragma force_active on -SECTION_RODATA static f32 const lit_3882 = -25.0f; -COMPILER_STRIP_GATE(0x80BE4AF4, &lit_3882); -#pragma pop - -/* 80BE4AF8-80BE4B00 000048 0004+04 0/1 0/0 0/0 .rodata @3883 */ -#pragma push -#pragma force_active on -SECTION_RODATA static f32 const lit_3883[1 + 1 /* padding */] = { - 1.0f, - /* padding */ - 0.0f, -}; -COMPILER_STRIP_GATE(0x80BE4AF8, &lit_3883); -#pragma pop - /* 80BE42C0-80BE43E4 000980 0124+00 1/1 0/0 0/0 .text action_fallStart__14daObjFallObj_cFv */ -void daObjFallObj_c::action_fallStart() { - // NONMATCHING -} +bool daObjFallObj_c::action_fallStart() { + cLib_calcTimer(&mTimer); + if (mTimer >= 8) { + speed.y = -25.0f; + current.pos.y += speed.y; + if (mTimer == 9) { + mSoundObj.startSound(Z2SE_OBJ_POLE_FALL_START, 0, -1); + } + } else { + if (mTimer == 7) { + dComIfGp_getVibration().StartShock(8, 0x1f, cXyz(0.0f, 1.0f, 0.0f)); + // Start vibration failed + OS_REPORT("落下スタート振動！\n"); + } else if (mTimer == 0) { + dComIfGp_getVibration().StartQuake(4, 0x1e, cXyz(0.0f, 1.0f, 0.0f)); + // Shaking started + OS_REPORT("揺れ開始！\n"); + mVibrationOn = true; + mAction = ACTION_COUNTDOWN; + } + } -/* ############################################################################################## */ -/* 80BE4B00-80BE4B08 000050 0008+00 1/1 0/0 0/0 .rodata @3930 */ -SECTION_RODATA static u8 const lit_3930[8] = { - 0x43, 0x30, 0x00, 0x00, 0x80, 0x00, 0x00, 0x00, -}; -COMPILER_STRIP_GATE(0x80BE4B00, &lit_3930); + return false; +} /* 80BE43E4-80BE45F4 000AA4 0210+00 1/1 0/0 0/0 .text action_countdown__14daObjFallObj_cFv */ void daObjFallObj_c::action_countdown() { - // NONMATCHING -} + bool bVar1 = true; + daPy_py_c* player = daPy_getPlayerActorClass(); + if (bVar1) { + speed.y = -(getFallHeight() - 50.0f) / getFallTime(); + current.pos.y += speed.y; + mSoundObj.startLevelSound(Z2SE_OBJ_POLE_FALLING, 0, -1); + if (cLib_calcTimer(&mFallTime) == 0) { + mpBgW->OffPushPullOk(); + speed.y = 0; + mAction = ACTION_FALL; + } + } -/* ############################################################################################## */ -/* 80BE4B08-80BE4B0C 000058 0004+00 2/2 0/0 0/0 .rodata @3949 */ -SECTION_RODATA static f32 const lit_3949 = 10000.0f; -COMPILER_STRIP_GATE(0x80BE4B08, &lit_3949); + if (player->getSpeedF() != 0.0f) { + field_0x5de = 0; + } else { + field_0x5de = 0; + } + + cLib_chaseS(&field_0x5dc, field_0x5de, 0x32); + shape_angle.x = field_0x5dc * cM_scos(field_0x5e0 * 1500); + shape_angle.z = field_0x5dc * cM_ssin(field_0x5e0 * 2000); + if (parentActorID != fpcM_ERROR_PROCESS_ID_e) { + fopAc_ac_c* parent = fopAcM_SearchByID(parentActorID); + if (parent != NULL && checkFallStart(parent)) { + mAction = ACTION_FOLLOW_FALL; + } + } +} /* 80BE45F4-80BE466C 000CB4 0078+00 1/1 0/0 0/0 .text action_fall__14daObjFallObj_cFv */ void daObjFallObj_c::action_fall() { - // NONMATCHING + speed.y += gravity; + if (speed.y < fopAcM_GetMaxFallSpeed(this)) { + speed.y = fopAcM_GetMaxFallSpeed(this); + } + + current.pos.y += speed.y; + if (fabsf(home.pos.y - current.pos.y) > 10000.0f) { + fopAcM_delete(this); + } } /* 80BE466C-80BE4670 000D2C 0004+00 1/1 0/0 0/0 .text action_end__14daObjFallObj_cFv */ -void daObjFallObj_c::action_end() { - /* empty function */ -} +void daObjFallObj_c::action_end() {} /* 80BE4670-80BE4700 000D30 0090+00 1/1 0/0 0/0 .text action_follow_fall__14daObjFallObj_cFv */ void daObjFallObj_c::action_follow_fall() { - // NONMATCHING + if (parentActorID != fpcM_ERROR_PROCESS_ID_e) { + fopAc_ac_c* parent = fopAcM_SearchByID(parentActorID); + if (parent != NULL) { + current.pos.y += parent->speed.y; + } + + if (fabsf(home.pos.y - current.pos.y) > 10000.0f) { + fopAcM_delete(this); + } + } } -/* ############################################################################################## */ -/* 80BE4B0C-80BE4B10 00005C 0004+00 0/1 0/0 0/0 .rodata @3990 */ -#pragma push -#pragma force_active on -SECTION_RODATA static f32 const lit_3990 = 250.0f; -COMPILER_STRIP_GATE(0x80BE4B0C, &lit_3990); -#pragma pop - -/* 80BE4B10-80BE4B14 000060 0004+00 0/1 0/0 0/0 .rodata @3991 */ -#pragma push -#pragma force_active on -SECTION_RODATA static f32 const lit_3991 = 100.0f; -COMPILER_STRIP_GATE(0x80BE4B10, &lit_3991); -#pragma pop - /* 80BE4700-80BE47A0 000DC0 00A0+00 2/2 0/0 0/0 .text checkHang__14daObjFallObj_cFv */ -void daObjFallObj_c::checkHang() { - // NONMATCHING +bool daObjFallObj_c::checkHang() { + bool rv = false; + daPy_py_c* player = daPy_getPlayerActorClass(); + if (dComIfGp_checkPlayerStatus1(0, 0x2000000) && fopAcM_searchPlayerDistanceXZ(this) < 250.0f && + player->current.pos.y > current.pos.y - 100.0f && + player->current.pos.y < current.pos.y + 300.0f) + { + rv = true; + field_0x5e4 = true; + } + return rv; } /* 80BE47A0-80BE48A4 000E60 0104+00 1/1 0/0 0/0 .text checkHang2__14daObjFallObj_cFv */ -void daObjFallObj_c::checkHang2() { - // NONMATCHING +bool daObjFallObj_c::checkHang2() { + fpc_ProcID procId; + if (parentActorID == fpcM_ERROR_PROCESS_ID_e) { + procId = fopAcM_GetID(this); + } else { + fpc_ProcID currentProcId = fopAcM_GetID(this); + procId = parentActorID; + while (true) { + fopAc_ac_c* parentActor = fopAcM_SearchByID(procId); + if (parentActor != NULL) { + currentProcId = procId; + procId = parentActor->parentActorID; + } else { + procId = currentProcId; + break; + } + + if (procId == fpcM_ERROR_PROCESS_ID_e) { + procId = currentProcId; + break; + } + } + } + + fpc_ProcID currentProcId = procId; + while (true) { + daObjFallObj_c* fallObj = (daObjFallObj_c*)fopAcM_SearchByID(currentProcId); + if (fallObj == NULL) { + return false; + } + if (fallObj->checkHang()) { + return true; + } + + currentProcId = fallObj->mChildId; + if (currentProcId == fpcM_ERROR_PROCESS_ID_e) { + return false; + } + } + + return false; } /* 80BE48A4-80BE4948 000F64 00A4+00 1/0 0/0 0/0 .text Draw__14daObjFallObj_cFv */ int daObjFallObj_c::Draw() { - // NONMATCHING + g_env_light.settingTevStruct(0x10, ¤t.pos, &tevStr); + g_env_light.setLightTevColorType_MAJI(mpModel, &tevStr); + dComIfGd_setListBG(); + mDoExt_modelUpdateDL(mpModel); + dComIfGd_setList(); + + #ifdef DEBUG + if (l_HIO.mCheckDisplay) { + mpBgW->CalcPlane(); + daPy_py_c* player = daPy_getPlayerActorClass(); + GXColor color = (GXColor){0xff, 0, 0, 0xff}; + cXyz cStack_1c(attention_info.position); + cStack_1c.y = player->current.pos.y + 10.0f; + dDbVw_drawCircleXlu(cStack_1c, 2000.0f, color, 1, 0xc); + } + #endif + + return 1; } /* 80BE4948-80BE4990 001008 0048+00 1/0 0/0 0/0 .text Delete__14daObjFallObj_cFv */ int daObjFallObj_c::Delete() { - // NONMATCHING + mSoundObj.deleteObject(); + dComIfG_resDelete(&mPhaseReq, l_arcName); + + #ifdef DEBUG + l_HIO.removeHIO(); + #endif + return 1; +} + +/* 80BE4990-80BE4A04 001050 0074+00 1/0 0/0 0/0 .text daObjFallObj_create1st__FP14daObjFallObj_c + */ +static int daObjFallObj_create1st(daObjFallObj_c* i_this) { + fopAcM_SetupActor(i_this, daObjFallObj_c); + return i_this->create1st(); +} + +/* 80BE4A04-80BE4A24 0010C4 0020+00 1/0 0/0 0/0 .text + * daObjFallObj_MoveBGDelete__FP14daObjFallObj_c */ +static int daObjFallObj_MoveBGDelete(daObjFallObj_c* i_this) { + return i_this->MoveBGDelete(); +} + +/* 80BE4A24-80BE4A44 0010E4 0020+00 1/0 0/0 0/0 .text + * daObjFallObj_MoveBGExecute__FP14daObjFallObj_c */ +static int daObjFallObj_MoveBGExecute(daObjFallObj_c* i_this) { + return i_this->MoveBGExecute(); +} + +/* 80BE4A44-80BE4A70 001104 002C+00 1/0 0/0 0/0 .text daObjFallObj_MoveBGDraw__FP14daObjFallObj_c + */ +static int daObjFallObj_MoveBGDraw(daObjFallObj_c* i_this) { + return i_this->Draw(); } -/* ############################################################################################## */ /* 80BE4B3C-80BE4B5C -00001 0020+00 1/0 0/0 0/0 .data daObjFallObj_METHODS */ static actor_method_class daObjFallObj_METHODS = { - (process_method_func)daObjFallObj_create1st__FP14daObjFallObj_c, - (process_method_func)daObjFallObj_MoveBGDelete__FP14daObjFallObj_c, - (process_method_func)daObjFallObj_MoveBGExecute__FP14daObjFallObj_c, - 0, - (process_method_func)daObjFallObj_MoveBGDraw__FP14daObjFallObj_c, + (process_method_func)daObjFallObj_create1st, + (process_method_func)daObjFallObj_MoveBGDelete, + (process_method_func)daObjFallObj_MoveBGExecute, + NULL, + (process_method_func)daObjFallObj_MoveBGDraw, }; /* 80BE4B5C-80BE4B8C -00001 0030+00 0/0 0/0 1/0 .data g_profile_Obj_FallObj */ @@ -371,52 +460,4 @@ extern actor_process_profile_definition g_profile_Obj_FallObj = { fopAc_CULLBOX_CUSTOM_e, // cullType }; -/* 80BE4B8C-80BE4BB4 00006C 0028+00 1/1 0/0 0/0 .data __vt__14daObjFallObj_c */ -SECTION_DATA extern void* __vt__14daObjFallObj_c[10] = { - (void*)NULL /* RTTI */, - (void*)NULL, - (void*)CreateHeap__14daObjFallObj_cFv, - (void*)Create__14daObjFallObj_cFv, - (void*)Execute__14daObjFallObj_cFPPA3_A4_f, - (void*)Draw__14daObjFallObj_cFv, - (void*)Delete__14daObjFallObj_cFv, - (void*)IsDelete__16dBgS_MoveBgActorFv, - (void*)ToFore__16dBgS_MoveBgActorFv, - (void*)ToBack__16dBgS_MoveBgActorFv, -}; - -/* 80BE4990-80BE4A04 001050 0074+00 1/0 0/0 0/0 .text daObjFallObj_create1st__FP14daObjFallObj_c - */ -static void daObjFallObj_create1st(daObjFallObj_c* i_this) { - // NONMATCHING -} - -/* 80BE4A04-80BE4A24 0010C4 0020+00 1/0 0/0 0/0 .text - * daObjFallObj_MoveBGDelete__FP14daObjFallObj_c */ -static void daObjFallObj_MoveBGDelete(daObjFallObj_c* i_this) { - // NONMATCHING -} - -/* 80BE4A24-80BE4A44 0010E4 0020+00 1/0 0/0 0/0 .text - * daObjFallObj_MoveBGExecute__FP14daObjFallObj_c */ -static void daObjFallObj_MoveBGExecute(daObjFallObj_c* i_this) { - // NONMATCHING -} - -/* 80BE4A44-80BE4A70 001104 002C+00 1/0 0/0 0/0 .text daObjFallObj_MoveBGDraw__FP14daObjFallObj_c - */ -static void daObjFallObj_MoveBGDraw(daObjFallObj_c* i_this) { - // NONMATCHING -} - -/* 80BE4A70-80BE4A8C 001130 001C+00 1/1 0/0 0/0 .text cLib_calcTimer__FPs */ -extern "C" void func_80BE4A70(void* _this, s16* param_0) { - // NONMATCHING -} - -/* 80BE4A8C-80BE4AA8 00114C 001C+00 1/1 0/0 0/0 .text cLib_calcTimer__FPUc */ -extern "C" void func_80BE4A8C(void* _this, u8* param_0) { - // NONMATCHING -} - /* 80BE4B14-80BE4B14 000064 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */