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

Match m424Dll (#510)

Browse source 
* get halfway through m424/ball

* get halfway through m424/ball

* get halfway through m424/ball

* complete m424/ball

* fix merge errors

* Revert "complete m424/ball"

This reverts commit acbc3196c5.

* fix up ball, start claw

* get halfway through m424/ball

* complete m424/ball

* Revert "complete m424/ball"

This reverts commit acbc3196c5.

* fix up ball, start claw

* complete m424Dll
This commit is contained in:
CreateSource 2025-01-05 18:40:35 -05:00 • committed by GitHub
parent 05a2e87763
commit 47e4b48254
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
5 changed files with 1396 additions and 29 deletions
Download patch file Download diff file Expand all files Collapse all files

5
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
@ -317,6 +317,7 @@ lbl_1_bss_640 = .bss:0x00000640; // type:object size:0x80 data:4byte
lbl_1_bss_6C0 = .bss:0x000006C0; // type:object size:0x4 data:4byte
lbl_1_bss_6C4 = .bss:0x000006C4; // type:object size:0x4 data:4byte
lbl_1_bss_6C8 = .bss:0x000006C8; // type:object size:0x4 data:4byte
lbl_1_bss_6CC = .bss:0x000006CC; // type:object size:0xC data:4byte
lbl_1_bss_6CC = .bss:0x000006CC; // type:object size:0x4 data:4byte
lbl_1_bss_6D0 = .bss:0x000006D0; // type:object size:0x8 data:4byte
lbl_1_bss_6D8 = .bss:0x000006D8; // type:object size:0x4 data:4byte
lbl_1_bss_6DC = .bss:0x000006DC; // type:object size:0x4 data:4byte

4
configure.py
View file

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

30
include/REL/m424Dll.h
View file

@ -8,13 +8,41 @@ typedef struct _M424DllMainStruct {
f32 zoom;
} M424DllMainStruct; // sizeof 1C
typedef struct _M424DllBallStruct2 {
omObjData* unk0;
u8 unk4;
u8 unk5;
u8 unk6;
u16 unk8;
u16 unkA;
Mtx unkC;
Vec unk3C;
Vec unk48;
Vec unk54;
Vec unk60;
Vec unk6C;
Vec unk78;
Vec unk84;
u8 unk90;
u8 unk91;
} M424DllBallStruct2; // sizeof 0x94
extern M424DllBallStruct2 lbl_1_bss_60[9];
extern u8 lbl_1_bss_58;
extern s16 lbl_1_bss_24[4];
f32 fn_1_1358(f32, f32);
f32 fn_1_1470(f32, f32, f32);
omObjData* fn_1_1AB8(Process*);
void fn_1_1B8C(void);
f32 fn_1_213C(void);
void fn_1_252C(f32, s32);
void fn_1_2670(s32, s32);
void fn_1_2720(Process*);
void fn_1_2880(void);
Vec* fn_1_8A00(u8);
s32 fn_1_8A2C(void);
void fn_1_93F0(Process*);
omObjData* fn_1_93F0(Process*);
void fn_1_94A4(void);
s32 fn_1_B804(void);
s32 fn_1_B888(void);

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

@ -54,25 +54,6 @@ typedef struct _M424DllBallStruct {
s32 unkEC;
} M424DllBallStruct; // sizeof 0xF0
typedef struct _M424DllBallStruct2 {
omObjData* unk0;
u8 unk4;
u8 unk5;
u8 unk6;
u16 unk8;
u16 unkA;
Mtx unkC;
Vec unk3C;
Vec unk48;
Vec unk54;
Vec unk60;
Vec unk6C;
Vec unk78;
Vec unk84;
u8 unk90;
u8 unk91;
} M424DllBallStruct2; // sizeof 0x94
typedef struct _M424DllBallStruct3 {
u8 unk0;
M424DllBallStruct2* unk4;
@ -153,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];
@ -460,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;
}
@ -689,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;
@ -856,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) {

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

File diff suppressed because it is too large Load diff