From 29298c574ef3e2f641e8c4b19bea86160b90ac2f Mon Sep 17 00:00:00 2001 From: CreateSource Date: Thu, 2 Jan 2025 22:35:04 -0500 Subject: [PATCH] fix up ball, start claw --- config/GMPE01_00/rels/m424Dll/symbols.txt | 2 +- src/REL/m424Dll/ball.c | 10 +++++----- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/config/GMPE01_00/rels/m424Dll/symbols.txt b/config/GMPE01_00/rels/m424Dll/symbols.txt index ffdf249f..491fb79c 100644 --- a/config/GMPE01_00/rels/m424Dll/symbols.txt +++ b/config/GMPE01_00/rels/m424Dll/symbols.txt @@ -266,7 +266,7 @@ jumptable_1_data_B8 = .data:0x000000B8; // type:object size:0x28 scope:local lbl_1_data_E0 = .data:0x000000E0; // type:object size:0xC lbl_1_data_EC = .data:0x000000EC; // type:object size:0xC lbl_1_data_F8 = .data:0x000000F8; // type:object size:0xC -lbl_1_data_104 = .data:0x00000104; // type:object size:0x7 data:string +lbl_1_data_104 = .data:0x00000104; // type:object size:0x7 scope:local data:string lbl_1_data_10C = .data:0x0000010C; // type:object size:0x1C lbl_1_data_128 = .data:0x00000128; // type:object size:0x4 data:byte lbl_1_data_12C = .data:0x0000012C; // type:object size:0x1C diff --git a/src/REL/m424Dll/ball.c b/src/REL/m424Dll/ball.c index 344eaa28..800f1775 100644 --- a/src/REL/m424Dll/ball.c +++ b/src/REL/m424Dll/ball.c @@ -134,7 +134,7 @@ void fn_1_2720(Process* arg0) { } for (var_r31 = 0; var_r31 < 6; var_r29++, var_r31++) { - var_r30 = omAddObjEx(arg0, 0x3F, 2U, 5U, 0, fn_1_4220); + var_r30 = omAddObjEx(arg0, 0x3F, 2, 5, 0, fn_1_4220); lbl_1_bss_594[var_r31] = var_r30; var_r30->work[0] = var_r31; var_r30->work[1] = sp8[var_r29]; @@ -441,12 +441,12 @@ void fn_1_37FC(omObjData* object) { if (temp_r31->unkC != 0) { if (temp_r31->unkD != 0) { temp_r31->unk4C.y = 0.0f; - temp_r31->unkD = 0U; + temp_r31->unkD = 0; var_r28 = 5; var_r27 = 0; } else { temp_r31->unk4C.y *= -0.1f; - temp_r31->unkC = 0U; + temp_r31->unkC = 0; var_r28 = 4; var_r27 = 0; } @@ -670,7 +670,7 @@ u8 fn_1_48D0(omObjData* object, u8 arg1, u8 arg2) { temp_r31->unk8 = var_r30; Hu3DModelLayerSet(var_r30, 2); Hu3DModelShadowMapSet(var_r30); - Hu3DModelAttrSet(var_r30, 0x20000U); + Hu3DModelAttrSet(var_r30, 0x20000); Hu3DModelHiliteMapSet(var_r30, HuSprAnimRead(HuDataReadNum(0x370016, 0x10000000))); var_r30 = Hu3DModelCreate(HuDataSelHeapReadNum((arg1 * 2) + 0x370001, 0x10000000, HEAP_DATA)); temp_r31->unkA = var_r30; @@ -837,7 +837,7 @@ void fn_1_5018(void) { var_f30 = var_f29; var_r31 = &lbl_1_bss_60[0]; for (var_r28 = 0; var_r28 < lbl_1_bss_58; var_r28++, var_r31++) { - if ((var_r31->unk90 != 0) && (var_r31->unk4 < 4U)) { + if ((var_r31->unk90 != 0) && (var_r31->unk4 < 4)) { var_r31->unk90 = 0; if (var_r31->unk4 < 3) { if (var_r31->unk6C.y < 0.0f) {