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

Revert "complete m424/ball"

Browse source 
This reverts commit acbc3196c5.
This commit is contained in:
CreateSource 2025-01-02 17:34:16 -05:00
parent 11bef98066
commit ca615ab76d
5 changed files with 23 additions and 13 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -308,8 +308,7 @@ lbl_1_bss_48 = .bss:0x00000048; // type:object size:0x4 data:4byte
lbl_1_bss_4C = .bss:0x0000004C; // type:object size:0x4 data:4byte
lbl_1_bss_50 = .bss:0x00000050; // type:object size:0x4 data:4byte
lbl_1_bss_54 = .bss:0x00000054; // type:object size:0x4 data:4byte
lbl_1_bss_58 = .bss:0x00000058; // type:object size:0x1 data:byte
lbl_1_bss_5C = .bss:0x0000005C; // type:object size:0x4 data:4byte
lbl_1_bss_58 = .bss:0x00000058; // type:object size:0x8 data:byte
lbl_1_bss_60 = .bss:0x00000060; // type:object size:0x534 data:4byte
lbl_1_bss_594 = .bss:0x00000594; // type:object size:0x18
lbl_1_bss_5AC = .bss:0x000005AC; // type:object size:0x10 data:4byte

2
configure.py
View file

@ -1045,7 +1045,7 @@ config.libs = [
objects={
Object(MatchingFor("GMPE01_00", "GMPE01_01"), "REL/m424Dll/main.c"),
Object(MatchingFor("GMPE01_00", "GMPE01_01"), "REL/m424Dll/map.c"),
Object(MatchingFor("GMPE01_00", "GMPE01_01"), "REL/m424Dll/ball.c"),
Object(NonMatching, "REL/m424Dll/ball.c"),
Object(NonMatching, "REL/m424Dll/claw.c"),
},
),

1
include/REL/m424Dll.h
View file

@ -20,4 +20,3 @@ s32 fn_1_B804(void);
s32 fn_1_B888(void);
s32 fn_1_B8AC(void);
s32 fn_1_B924(void);
void fn_1_C2E0(s32);

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

@ -171,7 +171,6 @@ u32 lbl_1_data_150[11] = {
9, 20, 22, 23, 24,
0x370021
};
Vec lbl_1_data_17C[4] = {
{ -100.0f, 200.0f, -100.0f },
{ 300.0f, 200.0f, -100.0f },
@ -798,13 +797,8 @@ void fn_1_4A90(s16 arg0) {
PSMTXCopy(sp20, sp50);
}
PSMTXConcat(sp50, var_r31->unkC, var_r31->unkC);
<<<<<<< HEAD
fn_1_6230(var_r31->unk8, var_r31->unkC);
fn_1_6230(var_r31->unkA, var_r31->unkC);
=======
fn_1_6230(var_r31->unk8, var_r31->unkC[0]);
fn_1_6230(var_r31->unkA, var_r31->unkC[0]);
>>>>>>> b61bac75d85236b00f2e8086742748460146baaa
}
if (var_r31->unk3C.y < 250.0f) {
var_r31->unk3C.y = 250.0f;
@ -1050,7 +1044,6 @@ void fn_1_5018(void) {
var_r31->unk3C.z = var_r31->unk60.z + (var_r31->unk6C.z * var_f29);
}
}
<<<<<<< HEAD
void fn_1_6038(void) {
s32 var_r31;
@ -1739,5 +1732,3 @@ s32 fn_1_907C(Vec* arg0, Vec* arg1) {
}
return (s32)arg0;
}
=======
>>>>>>> b61bac75d85236b00f2e8086742748460146baaa

21
src/REL/m438Dll/main.c
View file

@ -2772,7 +2772,28 @@ f32 fn_1_9960(Vec* arg0, Vec* arg1, Vec* arg2) {
}
f32 fn_1_9C9C(Vec* arg0, Vec* arg1, Vec* arg2, Vec* arg3, Vec* arg4) {
f32 sp44;
f32 sp40;
f32 sp3C;
f32 sp38;
f32 sp34;
f32 sp30;
f32 sp2C;
f32 sp28;
f32 sp24;
Vec sp18;
f32 sp14;
f32 sp10;
f32 spC;
f32 sp8;
f32 temp_f25;
f32 temp_f26;
f32 temp_f28;
f32 var_f24;
f32 var_f27;
f64 temp_f31;
f64 temp_f31_2;
f64 temp_f31_3;
if (0.0f == ((arg2->z * arg2->z) + ((arg2->x * arg2->x) + (arg2->y * arg2->y)))) {
return ((arg0->z - arg1->z) * (arg0->z - arg1->z)) + (((arg0->x - arg1->x) * (arg0->x - arg1->x)) + ((arg0->y - arg1->y) * (arg0->y - arg1->y)));