Skip to content

Commit ee608ce

Browse files
hatal175hatal175
authored
d_a_obj_fallobj OK (#2568)
* d_a_obj_fallobj OK * J3DMatBlock equivalent
1 parent d629cc3 commit ee608ce

File tree

12 files changed

+482
-423
lines changed

12 files changed

+482
-423
lines changed

‎config/GZ2E01/rels/d_a_obj_fallobj/symbols.txt‎

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -20,10 +20,10 @@ checkHang__14daObjFallObj_cFv = .text:0x00000DC0; // type:function size:0xA0 sco
2020
checkHang2__14daObjFallObj_cFv = .text:0x00000E60; // type:function size:0x104 scope:global
2121
Draw__14daObjFallObj_cFv = .text:0x00000F64; // type:function size:0xA4 scope:global
2222
Delete__14daObjFallObj_cFv = .text:0x00001008; // type:function size:0x48 scope:global
23-
daObjFallObj_create1st__FP14daObjFallObj_c = .text:0x00001050; // type:function size:0x74 scope:global
24-
daObjFallObj_MoveBGDelete__FP14daObjFallObj_c = .text:0x000010C4; // type:function size:0x20 scope:global
25-
daObjFallObj_MoveBGExecute__FP14daObjFallObj_c = .text:0x000010E4; // type:function size:0x20 scope:global
26-
daObjFallObj_MoveBGDraw__FP14daObjFallObj_c = .text:0x00001104; // type:function size:0x2C scope:global
23+
daObjFallObj_create1st__FP14daObjFallObj_c = .text:0x00001050; // type:function size:0x74 scope:local
24+
daObjFallObj_MoveBGDelete__FP14daObjFallObj_c = .text:0x000010C4; // type:function size:0x20 scope:local
25+
daObjFallObj_MoveBGExecute__FP14daObjFallObj_c = .text:0x000010E4; // type:function size:0x20 scope:local
26+
daObjFallObj_MoveBGDraw__FP14daObjFallObj_c = .text:0x00001104; // type:function size:0x2C scope:local
2727
cLib_calcTimer<s>__FPs = .text:0x00001130; // type:function size:0x1C scope:global
2828
cLib_calcTimer<Uc>__FPUc = .text:0x0000114C; // type:function size:0x1C scope:global
2929
_ctors = .ctors:0x00000000; // type:label scope:global
@@ -49,8 +49,8 @@ _dtors = .dtors:0x00000000; // type:label scope:global
4949
@3990 = .rodata:0x0000005C; // type:object size:0x4 scope:local
5050
@3991 = .rodata:0x00000060; // type:object size:0x4 scope:local
5151
@stringBase0 = .rodata:0x00000064; // type:object size:0xA scope:local data:string_table
52-
l_arcName = .data:0x00000000; // type:object size:0x4 scope:global
53-
l_cull_box = .data:0x00000004; // type:object size:0x18 scope:global align:4 data:float
54-
daObjFallObj_METHODS = .data:0x0000001C; // type:object size:0x20 scope:global
52+
l_arcName = .data:0x00000000; // type:object size:0x4 scope:local
53+
l_cull_box = .data:0x00000004; // type:object size:0x18 scope:local align:4 data:float
54+
daObjFallObj_METHODS = .data:0x0000001C; // type:object size:0x20 scope:local
5555
g_profile_Obj_FallObj = .data:0x0000003C; // type:object size:0x30 scope:global
5656
__vt__14daObjFallObj_c = .data:0x0000006C; // type:object size:0x28 scope:global

‎config/GZ2J01/rels/d_a_obj_fallobj/symbols.txt‎

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -20,10 +20,10 @@ checkHang__14daObjFallObj_cFv = .text:0x00000DC0; // type:function size:0xA0 sco
2020
checkHang2__14daObjFallObj_cFv = .text:0x00000E60; // type:function size:0x104 scope:global
2121
Draw__14daObjFallObj_cFv = .text:0x00000F64; // type:function size:0xA4 scope:global
2222
Delete__14daObjFallObj_cFv = .text:0x00001008; // type:function size:0x48 scope:global
23-
daObjFallObj_create1st__FP14daObjFallObj_c = .text:0x00001050; // type:function size:0x74 scope:global
24-
daObjFallObj_MoveBGDelete__FP14daObjFallObj_c = .text:0x000010C4; // type:function size:0x20 scope:global
25-
daObjFallObj_MoveBGExecute__FP14daObjFallObj_c = .text:0x000010E4; // type:function size:0x20 scope:global
26-
daObjFallObj_MoveBGDraw__FP14daObjFallObj_c = .text:0x00001104; // type:function size:0x2C scope:global
23+
daObjFallObj_create1st__FP14daObjFallObj_c = .text:0x00001050; // type:function size:0x74 scope:local
24+
daObjFallObj_MoveBGDelete__FP14daObjFallObj_c = .text:0x000010C4; // type:function size:0x20 scope:local
25+
daObjFallObj_MoveBGExecute__FP14daObjFallObj_c = .text:0x000010E4; // type:function size:0x20 scope:local
26+
daObjFallObj_MoveBGDraw__FP14daObjFallObj_c = .text:0x00001104; // type:function size:0x2C scope:local
2727
cLib_calcTimer<s>__FPs = .text:0x00001130; // type:function size:0x1C scope:global
2828
cLib_calcTimer<Uc>__FPUc = .text:0x0000114C; // type:function size:0x1C scope:global
2929
_ctors = .ctors:0x00000000; // type:label scope:global
@@ -49,8 +49,8 @@ _dtors = .dtors:0x00000000; // type:label scope:global
4949
@3990 = .rodata:0x0000005C; // type:object size:0x4 scope:local
5050
@3991 = .rodata:0x00000060; // type:object size:0x4 scope:local
5151
@stringBase0 = .rodata:0x00000064; // type:object size:0xA scope:local data:string_table
52-
l_arcName = .data:0x00000000; // type:object size:0x4 scope:global
53-
l_cull_box = .data:0x00000004; // type:object size:0x18 scope:global align:4 data:float
54-
daObjFallObj_METHODS = .data:0x0000001C; // type:object size:0x20 scope:global
52+
l_arcName = .data:0x00000000; // type:object size:0x4 scope:local
53+
l_cull_box = .data:0x00000004; // type:object size:0x18 scope:local align:4 data:float
54+
daObjFallObj_METHODS = .data:0x0000001C; // type:object size:0x20 scope:local
5555
g_profile_Obj_FallObj = .data:0x0000003C; // type:object size:0x30 scope:global
5656
__vt__14daObjFallObj_c = .data:0x0000006C; // type:object size:0x28 scope:global

‎config/GZ2P01/rels/d_a_obj_fallobj/symbols.txt‎

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -20,10 +20,10 @@ checkHang__14daObjFallObj_cFv = .text:0x00000DC0; // type:function size:0xA0 sco
2020
checkHang2__14daObjFallObj_cFv = .text:0x00000E60; // type:function size:0x104 scope:global
2121
Draw__14daObjFallObj_cFv = .text:0x00000F64; // type:function size:0xA4 scope:global
2222
Delete__14daObjFallObj_cFv = .text:0x00001008; // type:function size:0x48 scope:global
23-
daObjFallObj_create1st__FP14daObjFallObj_c = .text:0x00001050; // type:function size:0x74 scope:global
24-
daObjFallObj_MoveBGDelete__FP14daObjFallObj_c = .text:0x000010C4; // type:function size:0x20 scope:global
25-
daObjFallObj_MoveBGExecute__FP14daObjFallObj_c = .text:0x000010E4; // type:function size:0x20 scope:global
26-
daObjFallObj_MoveBGDraw__FP14daObjFallObj_c = .text:0x00001104; // type:function size:0x2C scope:global
23+
daObjFallObj_create1st__FP14daObjFallObj_c = .text:0x00001050; // type:function size:0x74 scope:local
24+
daObjFallObj_MoveBGDelete__FP14daObjFallObj_c = .text:0x000010C4; // type:function size:0x20 scope:local
25+
daObjFallObj_MoveBGExecute__FP14daObjFallObj_c = .text:0x000010E4; // type:function size:0x20 scope:local
26+
daObjFallObj_MoveBGDraw__FP14daObjFallObj_c = .text:0x00001104; // type:function size:0x2C scope:local
2727
cLib_calcTimer<s>__FPs = .text:0x00001130; // type:function size:0x1C scope:global
2828
cLib_calcTimer<Uc>__FPUc = .text:0x0000114C; // type:function size:0x1C scope:global
2929
_ctors = .ctors:0x00000000; // type:label scope:global
@@ -49,8 +49,8 @@ _dtors = .dtors:0x00000000; // type:label scope:global
4949
@3990 = .rodata:0x0000005C; // type:object size:0x4 scope:local
5050
@3991 = .rodata:0x00000060; // type:object size:0x4 scope:local
5151
@stringBase0 = .rodata:0x00000064; // type:object size:0xA scope:local data:string_table
52-
l_arcName = .data:0x00000000; // type:object size:0x4 scope:global
53-
l_cull_box = .data:0x00000004; // type:object size:0x18 scope:global align:4 data:float
54-
daObjFallObj_METHODS = .data:0x0000001C; // type:object size:0x20 scope:global
52+
l_arcName = .data:0x00000000; // type:object size:0x4 scope:local
53+
l_cull_box = .data:0x00000004; // type:object size:0x18 scope:local align:4 data:float
54+
daObjFallObj_METHODS = .data:0x0000001C; // type:object size:0x20 scope:local
5555
g_profile_Obj_FallObj = .data:0x0000003C; // type:object size:0x30 scope:global
5656
__vt__14daObjFallObj_c = .data:0x0000006C; // type:object size:0x28 scope:global

‎config/RZDE01_00/rels/d_a_obj_fallobj/symbols.txt‎

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -19,10 +19,10 @@ checkHang__14daObjFallObj_cFv = .text:0x00000BB0; // type:function size:0x9C sco
1919
checkHang2__14daObjFallObj_cFv = .text:0x00000C4C; // type:function size:0xF0 scope:global
2020
Draw__14daObjFallObj_cFv = .text:0x00000D3C; // type:function size:0x98 scope:global
2121
Delete__14daObjFallObj_cFv = .text:0x00000DD4; // type:function size:0x44 scope:global
22-
daObjFallObj_create1st__FP14daObjFallObj_c = .text:0x00000E18; // type:function size:0x68 scope:global
23-
daObjFallObj_MoveBGDelete__FP14daObjFallObj_c = .text:0x00000E80; // type:function size:0x4 scope:global
24-
daObjFallObj_MoveBGExecute__FP14daObjFallObj_c = .text:0x00000E84; // type:function size:0x4 scope:global
25-
daObjFallObj_MoveBGDraw__FP14daObjFallObj_c = .text:0x00000E88; // type:function size:0x10 scope:global
22+
daObjFallObj_create1st__FP14daObjFallObj_c = .text:0x00000E18; // type:function size:0x68 scope:local
23+
daObjFallObj_MoveBGDelete__FP14daObjFallObj_c = .text:0x00000E80; // type:function size:0x4 scope:local
24+
daObjFallObj_MoveBGExecute__FP14daObjFallObj_c = .text:0x00000E84; // type:function size:0x4 scope:local
25+
daObjFallObj_MoveBGDraw__FP14daObjFallObj_c = .text:0x00000E88; // type:function size:0x10 scope:local
2626
_ctors = .ctors:0x00000000; // type:label scope:global
2727
_dtors = .dtors:0x00000000; // type:label scope:global
2828
...rodata.0 = .rodata:0x00000000; // type:label scope:local
@@ -43,9 +43,9 @@ _dtors = .dtors:0x00000000; // type:label scope:global
4343
@93259 = .rodata:0x00000044; // type:object size:0x4 scope:local
4444
@93260 = .rodata:0x00000048; // type:object size:0x4 scope:local
4545
lbl_442_data_0 = .data:0x00000000; // type:object size:0xC
46-
l_arcName = .data:0x0000000C; // type:object size:0x4 scope:global data:4byte
47-
l_cull_box = .data:0x00000010; // type:object size:0x18 scope:global align:4 data:float
48-
daObjFallObj_METHODS = .data:0x00000028; // type:object size:0x20 scope:global
46+
l_arcName = .data:0x0000000C; // type:object size:0x4 scope:local data:4byte
47+
l_cull_box = .data:0x00000010; // type:object size:0x18 scope:local align:4 data:float
48+
daObjFallObj_METHODS = .data:0x00000028; // type:object size:0x20 scope:local
4949
g_profile_Obj_FallObj = .data:0x00000048; // type:object size:0x30 scope:global
5050
__vt__14daObjFallObj_c = .data:0x00000078; // type:object size:0x28 scope:global
5151
lbl_442_data_A0 = .data:0x000000A0; // type:object size:0x10

‎config/ShieldD/rels/d_a_obj_fallobjD/symbols.txt‎

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -30,11 +30,11 @@ checkHang2__14daObjFallObj_cFv = .text:0x000012D0; // type:function size:0x100 s
3030
Draw__14daObjFallObj_cFv = .text:0x000013D0; // type:function size:0x118 scope:global
3131
dDbVw_drawCircleXlu__FR4cXyzfRC8_GXColorUcUc = .text:0x000014F0; // type:function size:0x4C scope:global
3232
Delete__14daObjFallObj_cFv = .text:0x00001540; // type:function size:0x50 scope:global
33-
daObjFallObj_create1st__FP14daObjFallObj_c = .text:0x00001590; // type:function size:0x7C scope:global
33+
daObjFallObj_create1st__FP14daObjFallObj_c = .text:0x00001590; // type:function size:0x7C scope:local
3434
__ct__14daObjFallObj_cFv = .text:0x00001610; // type:function size:0x48 scope:global
35-
daObjFallObj_MoveBGDelete__FP14daObjFallObj_c = .text:0x00001660; // type:function size:0x28 scope:global
36-
daObjFallObj_MoveBGExecute__FP14daObjFallObj_c = .text:0x00001690; // type:function size:0x28 scope:global
37-
daObjFallObj_MoveBGDraw__FP14daObjFallObj_c = .text:0x000016C0; // type:function size:0x28 scope:global
35+
daObjFallObj_MoveBGDelete__FP14daObjFallObj_c = .text:0x00001660; // type:function size:0x28 scope:local
36+
daObjFallObj_MoveBGExecute__FP14daObjFallObj_c = .text:0x00001690; // type:function size:0x28 scope:local
37+
daObjFallObj_MoveBGDraw__FP14daObjFallObj_c = .text:0x000016C0; // type:function size:0x28 scope:local
3838
__dt__18daObjFallObj_HIO_cFv = .text:0x000016F0; // type:function size:0x5C scope:global
3939
__sinit_\d_a_obj_fallobj_cpp = .text:0x00001750; // type:function size:0x44 scope:local
4040
_ctors = .ctors:0x00000000; // type:label scope:global
@@ -60,12 +60,12 @@ _dtors = .dtors:0x00000000; // type:label scope:global
6060
@117175 = .rodata:0x0000004C; // type:object size:0x4 scope:local
6161
@117179 = .rodata:0x00000050; // type:object size:0x4 scope:local
6262
@117180 = .rodata:0x00000054; // type:object size:0x4 scope:local
63-
cNullVec__6Z2Calc = .rodata:0x00000058; // type:object size:0xC scope:global
63+
cNullVec__6Z2Calc = .rodata:0x00000058; // type:object size:0xC scope:local
6464
@46916 = .rodata:0x00000064; // type:object size:0x4 scope:local
6565
lbl_430_rodata_68 = .rodata:0x00000068; // type:object size:0x14
6666
@116786 = .data:0x00000000; // type:object size:0xA scope:local data:string
67-
l_arcName = .data:0x0000000C; // type:object size:0x4 scope:global data:4byte
68-
l_cull_box = .data:0x00000010; // type:object size:0x18 scope:global align:4 data:float
67+
l_arcName = .data:0x0000000C; // type:object size:0x4 scope:local data:4byte
68+
l_cull_box = .data:0x00000010; // type:object size:0x18 scope:local align:4 data:float
6969
@116808 = .data:0x00000028; // type:object size:0xB scope:local
7070
@116809 = .data:0x00000034; // type:object size:0xB scope:local
7171
@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
7777
@116990 = .data:0x00000094; // type:object size:0xC scope:local
7878
@117035 = .data:0x000000A0; // type:object size:0x14 scope:local
7979
@117036 = .data:0x000000B4; // type:object size:0xC scope:local
80-
daObjFallObj_METHODS = .data:0x000000C0; // type:object size:0x20 scope:global
80+
daObjFallObj_METHODS = .data:0x000000C0; // type:object size:0x20 scope:local
8181
g_profile_Obj_FallObj = .data:0x000000E0; // type:object size:0x30 scope:global
8282
__vt__18daObjFallObj_HIO_c = .data:0x00000110; // type:object size:0x20 scope:global
8383
@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
9898
lbl_430_data_269 = .data:0x00000269; // type:object size:0x7F
9999
__global_destructor_chain = .bss:0x00000000; // type:object size:0x4 scope:global
100100
@116795 = .bss:0x00000008; // type:object size:0xC scope:local
101-
l_HIO = .bss:0x00000018; // type:object size:0x10 scope:global data:byte
101+
l_HIO = .bss:0x00000018; // type:object size:0x10 scope:local data:byte

‎configure.py‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1085,7 +1085,7 @@ def MatchingFor(*versions) -> bool:
10851085
Object(NonMatching, "JSystem/J3DGraphBase/J3DShapeDraw.cpp"),
10861086
Object(MatchingFor("GZ2E01", "GZ2J01"), "JSystem/J3DGraphBase/J3DShape.cpp"),
10871087
Object(MatchingFor("GZ2E01", "GZ2J01"), "JSystem/J3DGraphBase/J3DMaterial.cpp", extra_cflags=['-pragma "nosyminline off"']),
1088-
Object(NonMatching, "JSystem/J3DGraphBase/J3DMatBlock.cpp"),
1088+
Object(Equivalent, "JSystem/J3DGraphBase/J3DMatBlock.cpp"),
10891089
Object(MatchingFor("GZ2E01", "GZ2J01"), "JSystem/J3DGraphBase/J3DTevs.cpp"),
10901090
Object(MatchingFor("GZ2E01", "GZ2J01"), "JSystem/J3DGraphBase/J3DDrawBuffer.cpp"),
10911091
Object(MatchingFor("GZ2E01", "GZ2J01"), "JSystem/J3DGraphBase/J3DStruct.cpp"),
@@ -1919,7 +1919,7 @@ def MatchingFor(*versions) -> bool:
19191919
ActorRel(NonMatching, "d_a_obj_drop"),
19201920
ActorRel(NonMatching, "d_a_obj_dust"),
19211921
ActorRel(MatchingFor("GZ2E01"), "d_a_obj_enemy_create"),
1922-
ActorRel(NonMatching, "d_a_obj_fallobj"),
1922+
ActorRel(MatchingFor("GZ2E01"), "d_a_obj_fallobj"),
19231923
ActorRel(MatchingFor("GZ2E01"), "d_a_obj_fan"),
19241924
ActorRel(Equivalent, "d_a_obj_fchain"), # weak func order
19251925
ActorRel(MatchingFor("GZ2E01"), "d_a_obj_fireWood"),

‎include/JSystem/J3DGraphBase/J3DMatBlock.h‎

Lines changed: 15 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -1000,8 +1000,8 @@ struct J3DIndTexCoordScale : public J3DIndTexCoordScaleInfo {
10001000
/* 8000E0E4 */ J3DIndTexCoordScale() : J3DIndTexCoordScaleInfo(j3dDefaultIndTexCoordScaleInfo) {}
10011001
J3DIndTexCoordScale(J3DIndTexCoordScaleInfo const& info) : J3DIndTexCoordScaleInfo(info) {}
10021002
/* 8000E024 */ ~J3DIndTexCoordScale() {}
1003-
GXIndTexScale getScaleS() { return (GXIndTexScale)mScaleS; }
1004-
GXIndTexScale getScaleT() { return (GXIndTexScale)mScaleT; }
1003+
u8 getScaleS() { return mScaleS; }
1004+
u8 getScaleT() { return mScaleT; }
10051005

10061006
J3DIndTexCoordScale& operator=(const J3DIndTexCoordScale& other) {
10071007
//__memcpy(this, &other, sizeof(J3DIndTexCoordScaleInfo));
@@ -1020,8 +1020,8 @@ struct J3DIndTexMtx : public J3DIndTexMtxInfo {
10201020
/* 8000E0F0 */ J3DIndTexMtx() { *(J3DIndTexMtxInfo*)this = j3dDefaultIndTexMtxInfo; }
10211021
J3DIndTexMtx(J3DIndTexMtxInfo const& info) { *(J3DIndTexMtxInfo*)this = info; }
10221022
/* 8000E064 */ ~J3DIndTexMtx() {}
1023-
void load(u32 param_1) {
1024-
J3DGDSetIndTexMtx((GXIndTexMtxID)(param_1 + 1), field_0x0, field_0x18);
1023+
void load(u32 param_1) const {
1024+
J3DGDSetIndTexMtx((GXIndTexMtxID)(param_1 + 1), (Mtx3P)field_0x0, field_0x18);
10251025
}
10261026
}; // Size: 0x1C
10271027

@@ -1045,8 +1045,8 @@ extern const J3DIndTexOrderInfo j3dDefaultIndTexOrderNull;
10451045
struct J3DIndTexOrder : public J3DIndTexOrderInfo {
10461046
/* 8000E128 */ J3DIndTexOrder() : J3DIndTexOrderInfo(j3dDefaultIndTexOrderNull) {}
10471047
J3DIndTexOrder(J3DIndTexOrderInfo const& info) : J3DIndTexOrderInfo(info) {}
1048-
GXTexMapID getMap() { return (GXTexMapID)mMap; }
1049-
GXTexCoordID getCoord() { return (GXTexCoordID)mCoord; }
1048+
u8 getMap() const { return (GXTexMapID)mMap; }
1049+
u8 getCoord() const { return (GXTexCoordID)mCoord; }
10501050

10511051
J3DIndTexOrder& operator=(const J3DIndTexOrder& other) {
10521052
//__memcpy(this, &other, sizeof(J3DIndTexOrderInfo));
@@ -1195,23 +1195,22 @@ struct J3DColorChan {
11951195
mColorChanID = calcColorChanID(info.mEnable, info.mMatSrc, info.mLightMask,
11961196
info.mDiffuseFn, info.mAttnFn, ambSrc);
11971197
}
1198-
u8 getLightMask() { return ((mColorChanID >> 2) & 0xf) | ((mColorChanID >> 11) & 0xf) << 4; }
1198+
u8 getLightMask() const { return ((mColorChanID >> 2) & 0xf) | ((mColorChanID >> 11) & 0xf) << 4; }
11991199
void setLightMask(u8 param_1) {
12001200
mColorChanID = (mColorChanID & ~0x3c) | ((param_1 & 0xf) << 2);
12011201
mColorChanID = (mColorChanID & ~0x7800) | ((param_1 & 0xf0) << 7);
12021202
}
12031203

1204-
u8 getEnable() { return (mColorChanID >> 1) & 1; }
1205-
GXColorSrc getAmbSrc() { return (GXColorSrc)((mColorChanID >> 6) & 1); }
1206-
GXColorSrc getMatSrc() { return (GXColorSrc)(mColorChanID & 1); }
1207-
GXDiffuseFn getDiffuseFn() { return (GXDiffuseFn) ((mColorChanID >> 7) & 3); }
1204+
u8 getEnable() const { return (mColorChanID >> 1) & 1; }
1205+
u8 getAmbSrc() const { return (GXColorSrc)((mColorChanID >> 6) & 1); }
1206+
u8 getMatSrc() const { return (GXColorSrc)(mColorChanID & 1); }
1207+
u8 getDiffuseFn() const { return ((mColorChanID >> 7) & 3); }
12081208
// This function has to appear in J3DMatBlock.cpp because it generates extra data in .sdata2
1209-
inline GXAttnFn getAttnFn();
1209+
inline u8 getAttnFn() const;
12101210

1211-
// NONMATCHING regalloc
1212-
void load() {
1213-
J3DGDWrite_u32(setChanCtrlMacro(getEnable(), getAmbSrc(), getMatSrc(), getLightMask(),
1214-
getDiffuseFn(), getAttnFn()));
1211+
void load() const {
1212+
J3DGDWrite_u32(setChanCtrlMacro(getEnable(), (GXColorSrc)getAmbSrc(), (GXColorSrc)getMatSrc(), getLightMask(),
1213+
(GXDiffuseFn)getDiffuseFn(), (GXAttnFn)getAttnFn()));
12151214
}
12161215

12171216
/* 0x0 */ u16 mColorChanID;

‎include/Z2AudioLib/Z2SoundObject.h‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ class Z2SoundObjBase : public Z2SoundHandles {
1717
bool isAlive() const { return mIsInitialized; }
1818
void setSoundStarter(Z2SoundStarter* i_soundStarter) { mSoundStarter = i_soundStarter; }
1919

20-
virtual void framework(u32, s8);
20+
virtual void framework(u32, s8 reverb);
2121
virtual void dispose();
2222
virtual bool stopOK(Z2SoundHandlePool& pool);
2323
virtual void init(Vec* pSoundPos, u8 pNumHandles);

0 commit comments

Comments
 (0)