From 59dd5c13b63467409a7ca08afa7dae0b8ca4a2ef Mon Sep 17 00:00:00 2001 From: kabiskac Date: Sun, 19 May 2024 03:36:59 +0200 Subject: [PATCH] Fix bss alignment in m404Dll --- config/GMPE01_00/rels/m404Dll/symbols.txt | 3 ++- src/REL/m404Dll/main.c | 29 ++++++++++++----------- 2 files changed, 17 insertions(+), 15 deletions(-) diff --git a/config/GMPE01_00/rels/m404Dll/symbols.txt b/config/GMPE01_00/rels/m404Dll/symbols.txt index 70a77577..2f84190a 100644 --- a/config/GMPE01_00/rels/m404Dll/symbols.txt +++ b/config/GMPE01_00/rels/m404Dll/symbols.txt @@ -141,7 +141,8 @@ lbl_1_data_9AC = .data:0x000009AC; // type:object size:0x30 data:4byte lbl_1_data_9DC = .data:0x000009DC; // type:object size:0x18 data:4byte lbl_1_data_9F4 = .data:0x000009F4; // type:object size:0x18 data:4byte lbl_1_bss_0 = .bss:0x00000000; // type:object size:0x4 data:4byte -lbl_1_bss_4 = .bss:0x00000004; // type:object size:0x8 data:float +lbl_1_bss_4 = .bss:0x00000004; // type:object size:0x4 data:float +lbl_1_bss_8 = .bss:0x00000008; // type:object size:0x4 data:4byte lbl_1_bss_C = .bss:0x0000000C; // type:object size:0x2 data:2byte lbl_1_bss_10 = .bss:0x00000010; // type:object size:0xC data:float lbl_1_bss_1C = .bss:0x0000001C; // type:object size:0x4 data:4byte diff --git a/src/REL/m404Dll/main.c b/src/REL/m404Dll/main.c index e5d8f8ba..a7b4ea23 100644 --- a/src/REL/m404Dll/main.c +++ b/src/REL/m404Dll/main.c @@ -76,20 +76,21 @@ typedef struct UnkM404Struct3 { s32 unk78[91]; } UnkM404Struct3; // size 0x1E4 -s32 lbl_1_bss_0; -float lbl_1_bss_4; -s16 lbl_1_bss_C; -Vec lbl_1_bss_10; -s32 lbl_1_bss_1C; -s32 lbl_1_bss_20; -s32 lbl_1_bss_24; -s32 lbl_1_bss_28[4]; -s32 lbl_1_bss_38[4]; -s32 lbl_1_bss_48; -omObjData *lbl_1_bss_4C; -omObjData *lbl_1_bss_50; -omObjData *lbl_1_bss_54; omObjData *lbl_1_bss_58; +omObjData *lbl_1_bss_54; +omObjData *lbl_1_bss_50; +omObjData *lbl_1_bss_4C; +s32 lbl_1_bss_48; +s32 lbl_1_bss_38[4]; +s32 lbl_1_bss_28[4]; +s32 lbl_1_bss_24; +s32 lbl_1_bss_20; +s32 lbl_1_bss_1C; +Vec lbl_1_bss_10; +s16 lbl_1_bss_C; +s32 lbl_1_bss_8; +float lbl_1_bss_4; +s32 lbl_1_bss_0; float lbl_1_data_0[][2] = { { -0.00026f, 0.51953f }, @@ -859,7 +860,7 @@ float fn_1_2EBC(float arg0[], float arg8) var_f22 = var_f27 * (fn_1_1DF8(arg0, var_f31) + fn_1_1DF8(arg0, arg8)) / 2; for (var_r30 = 1; var_r30 <= var_r29; var_r30 *= 2) { - for (var_f23 = 0.0f, var_r31 = 1; var_r31 <= var_r30; var_r31 += 1) { + for (var_f23 = 0.0f, var_r31 = 1; var_r31 <= var_r30; var_r31++) { var_f23 += fn_1_1DF8(arg0, var_f31 + var_f27 * (var_r31 - 0.5f)); } var_f23 *= var_f27;