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

Merge branch 'main' of https://github.com/abnormalhare/marioparty4

Browse source
This commit is contained in:
CreateSource 2025-01-02 17:29:55 -05:00
commit 82aa86843e
1 changed files with 26 additions and 0 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -79,6 +79,7 @@ typedef struct _M424DllBallStruct3 {
M424DllBallStruct2* unk8; M424DllBallStruct2* unk8;
} M424DllBallStruct3; } M424DllBallStruct3;
<<<<<<< HEAD
typedef struct _M424BallStruct4 { typedef struct _M424BallStruct4 {
f32 unk0; f32 unk0;
f32 unk4; f32 unk4;
@ -97,6 +98,13 @@ omObjData* lbl_1_bss_5AC[4];
omObjData* lbl_1_bss_594[6]; omObjData* lbl_1_bss_594[6];
M424DllBallStruct2 lbl_1_bss_60[9]; M424DllBallStruct2 lbl_1_bss_60[9];
s32 lbl_1_bss_5C; s32 lbl_1_bss_5C;
=======
// BSS
omObjData* lbl_1_bss_5AC[4];
omObjData* lbl_1_bss_594[6];
M424DllBallStruct2 lbl_1_bss_60[9];
s32 lbl_1_data_5C;
>>>>>>> b61bac75d85236b00f2e8086742748460146baaa
u8 lbl_1_bss_58; u8 lbl_1_bss_58;
// PROTO // PROTO
@ -113,7 +121,11 @@ void fn_1_6038(void);
void* fn_1_6078(s32); void* fn_1_6078(s32);
void fn_1_61AC(void); void fn_1_61AC(void);
s32 fn_1_627C(void); s32 fn_1_627C(void);
<<<<<<< HEAD
void fn_1_6230(s16, Mtx); void fn_1_6230(s16, Mtx);
=======
void fn_1_6230(s16, f32*);
>>>>>>> b61bac75d85236b00f2e8086742748460146baaa
void fn_1_62D0(s32, u32*); void fn_1_62D0(s32, u32*);
f32 fn_1_640C(f32, f32, f32); f32 fn_1_640C(f32, f32, f32);
f32 fn_1_6D10(Vec, Vec, f32, Vec, Vec, f32); f32 fn_1_6D10(Vec, Vec, f32, Vec, Vec, f32);
@ -122,10 +134,15 @@ f32 fn_1_7420(Vec, Vec, f32, f32);
void fn_1_77C4(Vec, Vec, Vec, f32, Vec*, Vec*); void fn_1_77C4(Vec, Vec, Vec, f32, Vec*, Vec*);
void fn_1_79FC(Vec*, Vec*, f32, Vec*, Vec*, f32, f32); void fn_1_79FC(Vec*, Vec*, f32, Vec*, Vec*, f32, f32);
void fn_1_7CA0(Vec, Vec, f32, Vec*); void fn_1_7CA0(Vec, Vec, f32, Vec*);
<<<<<<< HEAD
void fn_1_8924(u8, u8); void fn_1_8924(u8, u8);
void fn_1_8AA8(s32, s32); void fn_1_8AA8(s32, s32);
s32 fn_1_8C78(s32, s32); s32 fn_1_8C78(s32, s32);
s32 fn_1_907C(Vec*, Vec*); s32 fn_1_907C(Vec*, Vec*);
=======
void fn_1_8924(u8, s32);
void fn_1_8AA8(s32, s32);
>>>>>>> b61bac75d85236b00f2e8086742748460146baaa
void fn_1_2720(Process* arg0) { void fn_1_2720(Process* arg0) {
@ -171,6 +188,7 @@ u32 lbl_1_data_150[11] = {
9, 20, 22, 23, 24, 9, 20, 22, 23, 24,
0x370021 0x370021
}; };
Vec lbl_1_data_17C[4] = { Vec lbl_1_data_17C[4] = {
{ -100.0f, 200.0f, -100.0f }, { -100.0f, 200.0f, -100.0f },
{ 300.0f, 200.0f, -100.0f }, { 300.0f, 200.0f, -100.0f },
@ -797,8 +815,13 @@ void fn_1_4A90(s16 arg0) {
PSMTXCopy(sp20, sp50); PSMTXCopy(sp20, sp50);
} }
PSMTXConcat(sp50, var_r31->unkC, var_r31->unkC); PSMTXConcat(sp50, var_r31->unkC, var_r31->unkC);
<<<<<<< HEAD
fn_1_6230(var_r31->unk8, var_r31->unkC); fn_1_6230(var_r31->unk8, var_r31->unkC);
fn_1_6230(var_r31->unkA, 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) { if (var_r31->unk3C.y < 250.0f) {
var_r31->unk3C.y = 250.0f; var_r31->unk3C.y = 250.0f;
@ -1044,6 +1067,7 @@ void fn_1_5018(void) {
var_r31->unk3C.z = var_r31->unk60.z + (var_r31->unk6C.z * var_f29); var_r31->unk3C.z = var_r31->unk60.z + (var_r31->unk6C.z * var_f29);
} }
} }
<<<<<<< HEAD
void fn_1_6038(void) { void fn_1_6038(void) {
s32 var_r31; s32 var_r31;
@ -1732,3 +1756,5 @@ s32 fn_1_907C(Vec* arg0, Vec* arg1) {
} }
return (s32)arg0; return (s32)arg0;
} }
=======
>>>>>>> b61bac75d85236b00f2e8086742748460146baaa