kobayashi90/marioparty4
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

fix up ball, start claw

Browse source
This commit is contained in:
CreateSource 2025-01-02 22:35:04 -05:00
parent ca615ab76d
commit 3ce220d838
3 changed files with 9 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

2
config/GMPE01_00/rels/m424Dll/symbols.txt
View file

@ -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

10
src/REL/m424Dll/ball.c
View file

@ -153,7 +153,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];
@ -460,12 +460,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;
}
@ -689,7 +689,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;
@ -856,7 +856,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) {

3
src/REL/m424Dll/claw.c Normal file
View file

@ -0,0 +1,3 @@
#include "m424Dll.h"
s32 lbl_1_bss_6C0;