From 04107e33bf46ca9d37802ef74183c94ee436272f Mon Sep 17 00:00:00 2001 From: kabiskac Date: Fri, 31 May 2024 20:10:11 +0200 Subject: [PATCH] Minor cleanups --- config/GMPE01_00/rels/E3setupDLL/symbols.txt | 2 +- config/GMPE01_00/rels/m414Dll/symbols.txt | 2 ++ src/REL/m410Dll/game.c | 4 ++-- src/game/hsfanim.c | 2 +- 4 files changed, 6 insertions(+), 4 deletions(-) diff --git a/config/GMPE01_00/rels/E3setupDLL/symbols.txt b/config/GMPE01_00/rels/E3setupDLL/symbols.txt index aabb4f0e..67dc878c 100644 --- a/config/GMPE01_00/rels/E3setupDLL/symbols.txt +++ b/config/GMPE01_00/rels/E3setupDLL/symbols.txt @@ -148,7 +148,7 @@ lbl_2_data_31E = .data:0x0000031E; // type:object size:0x8 playerCntMessTbl = .data:0x00000328; // type:object size:0x10 scope:local charPosTbl = .data:0x00000338; // type:object size:0x40 scope:local data:float charComSfxTbl = .data:0x00000378; // type:object size:0x20 scope:local -lbl_2_data_398 = .data:0x00000398; // type:object size:0xE scope:local data:string +lbl_2_data_398 = .data:0x00000398; // type:object size:0x10 scope:local data:string charSpriteTbl = .data:0x000003A8; // type:object size:0x20 scope:local cursorSpriteTbl = .data:0x000003C8; // type:object size:0x14 scope:local hiliteSprTbl = .data:0x000003DC; // type:object size:0x14 scope:local diff --git a/config/GMPE01_00/rels/m414Dll/symbols.txt b/config/GMPE01_00/rels/m414Dll/symbols.txt index c8a52db1..e65b7a95 100644 --- a/config/GMPE01_00/rels/m414Dll/symbols.txt +++ b/config/GMPE01_00/rels/m414Dll/symbols.txt @@ -49,6 +49,8 @@ fn_1_8A10 = .text:0x00008A10; // type:function size:0x60 fn_1_8A70 = .text:0x00008A70; // type:function size:0x458 _ctors = .ctors:0x00000000; // type:label scope:global data:4byte _dtors = .dtors:0x00000000; // type:label scope:global data:4byte +__fakeHalf = .rodata:0x00000000; // type:object size:0x8 data:double +__fakeThree = .rodata:0x00000008; // type:object size:0x8 data:double lbl_1_rodata_10 = .rodata:0x00000010; // type:object size:0x4 scope:local data:float lbl_1_rodata_14 = .rodata:0x00000014; // type:object size:0x4 scope:local data:float lbl_1_rodata_18 = .rodata:0x00000018; // type:object size:0x4 scope:local data:float diff --git a/src/REL/m410Dll/game.c b/src/REL/m410Dll/game.c index bc6eb040..04cd0c6b 100644 --- a/src/REL/m410Dll/game.c +++ b/src/REL/m410Dll/game.c @@ -1090,10 +1090,10 @@ void fn_1_7494(void) void fn_1_7520(Vec *arg0) { - ParticleData *var_r30; // no, custom struct + ParticleData *var_r30; HsfanimStruct01 *var_r31; - var_r30 = Hu3DData[lbl_1_bss_38].unk_120; // unk_120 is not ParticleData + var_r30 = Hu3DData[lbl_1_bss_38].unk_120; var_r31 = &var_r30->unk_48[var_r30->unk_02++]; var_r31->unk2C = 100.0f; var_r31->unk34.x = arg0->x; diff --git a/src/game/hsfanim.c b/src/game/hsfanim.c index bede6b2d..c005ec35 100755 --- a/src/game/hsfanim.c +++ b/src/game/hsfanim.c @@ -827,7 +827,7 @@ static void _Hu3DParticleAttrReset(ModelData *arg0, Mtx arg1) { GXSetArray(GX_VA_POS, temp_r31->unk_4C, 0xC); GXSetVtxDesc(GX_VA_CLR0, GX_INDEX16); GXSetVtxAttrFmt(GX_VTXFMT0, GX_VA_CLR0, GX_CLR_RGBA, GX_RGBA8, 0); - GXSetArray(GX_VA_CLR0, (u8*) temp_r31->unk_48 + 0x40, 0x44); + GXSetArray(GX_VA_CLR0, &temp_r31->unk_48->unk40, 0x44); GXSetVtxDesc(GX_VA_TEX0, GX_INDEX16); GXSetVtxAttrFmt(GX_VTXFMT0, GX_VA_TEX0, GX_TEX_ST, GX_RGBA6, 0); GXSetArray(GX_VA_TEX0, baseST, 8);