mirror of
https://github.com/encounter/tp.git
synced 2026-07-11 06:18:46 -07:00
d_a_obj_fallobj OK (#2568)
* d_a_obj_fallobj OK * J3DMatBlock equivalent
This commit is contained in:
hatal175
@@ -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<s>__FPs = .text:0x00001130; // type:function size:0x1C scope:global
|
||||
cLib_calcTimer<Uc>__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
|
||||
|
||||
@@ -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<s>__FPs = .text:0x00001130; // type:function size:0x1C scope:global
|
||||
cLib_calcTimer<Uc>__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
|
||||
|
||||
@@ -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<s>__FPs = .text:0x00001130; // type:function size:0x1C scope:global
|
||||
cLib_calcTimer<Uc>__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
|
||||
|
||||
@@ -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
|
||||
|
||||
@@ -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
|
||||
|
||||
+2
-2
@@ -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"),
|
||||
|
||||
@@ -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;
|
||||
|
||||
@@ -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);
|
||||
|
||||
@@ -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 */
|
||||
|
||||
@@ -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:
|
||||
|
||||
@@ -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;
|
||||
}
|
||||
}
|
||||
|
||||
+348
-307
File diff suppressed because it is too large
Load Diff
Reference in New Issue
Block a user