mirror
/
marioparty4
mirror of https://github.com/mariopartyrd/marioparty4
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Finish m427Dll (#558)

This commit is contained in:
dbalatoni13 2025-02-05 03:08:50 +01:00 committed by GitHub
parent d340ccf061
commit 312f8471c8
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
6 changed files with 2495 additions and 219 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
config/GMPE01_00/rels/m427Dll/symbols.txt
View File

@ -271,11 +271,11 @@ lbl_1_rodata_328 = .rodata:0x00000328; // type:object size:0x8 scope:local data:
lbl_1_rodata_330 = .rodata:0x00000330; // type:object size:0x4 scope:local data:float
lbl_1_rodata_334 = .rodata:0x00000334; // type:object size:0x4 scope:local data:float
lbl_1_rodata_338 = .rodata:0x00000338; // type:object size:0x4 scope:local data:float
lbl_1_rodata_33C = .rodata:0x0000033C; // type:object size:0xC scope:local data:4byte
lbl_1_rodata_33C = .rodata:0x0000033C; // type:object size:0xC scope:local data:float
lbl_1_rodata_348 = .rodata:0x00000348; // type:object size:0x4 scope:local data:float
lbl_1_rodata_34C = .rodata:0x0000034C; // type:object size:0x4 scope:local data:float
lbl_1_rodata_350 = .rodata:0x00000350; // type:object size:0x4 scope:local data:float
lbl_1_rodata_354 = .rodata:0x00000354; // type:object size:0x1 scope:local data:byte
lbl_1_rodata_354 = .rodata:0x00000354; // type:object size:0x4 scope:local data:byte
lbl_1_rodata_358 = .rodata:0x00000358; // type:object size:0x4 scope:local data:float
lbl_1_rodata_35C = .rodata:0x0000035C; // type:object size:0x4 scope:local data:float
lbl_1_rodata_360 = .rodata:0x00000360; // type:object size:0x4 scope:local data:float
@ -353,8 +353,8 @@ lbl_1_data_D0 = .data:0x000000D0; // type:object size:0x8
lbl_1_data_D8 = .data:0x000000D8; // type:object size:0x4
lbl_1_data_DC = .data:0x000000DC; // type:object size:0x4
lbl_1_data_E0 = .data:0x000000E0; // type:object size:0x4 data:2byte
lbl_1_data_E8 = .data:0x000000E8; // type:object size:0x4 data:2byte
lbl_1_data_EC = .data:0x000000EC; // type:object size:0x5 data:string
lbl_1_data_E8 = .data:0x000000E8; // type:object size:0x4 data:byte
lbl_1_data_EC = .data:0x000000EC; // type:object size:0x5 scope:local data:string
lbl_1_data_F4 = .data:0x000000F4; // type:object size:0x4 data:float
lbl_1_data_F8 = .data:0x000000F8; // type:object size:0x4 data:float
lbl_1_data_FC = .data:0x000000FC; // type:object size:0x30
@ -365,10 +365,10 @@ lbl_1_data_1D4 = .data:0x000001D4; // type:object size:0x8
lbl_1_data_1DC = .data:0x000001DC; // type:object size:0x8
lbl_1_data_1E4 = .data:0x000001E4; // type:object size:0x8
lbl_1_data_1EC = .data:0x000001EC; // type:object size:0x4
lbl_1_data_1F0 = .data:0x000001F0; // type:object size:0x13 data:string
lbl_1_data_203 = .data:0x00000203; // type:object size:0x10 data:string
lbl_1_data_213 = .data:0x00000213; // type:object size:0x26 data:string
lbl_1_data_239 = .data:0x00000239; // type:object size:0x25
lbl_1_data_1F0 = .data:0x000001F0; // type:object size:0x13 scope:local data:string
lbl_1_data_203 = .data:0x00000203; // type:object size:0x10 scope:local data:string
lbl_1_data_213 = .data:0x00000213; // type:object size:0x26 scope:local data:string
lbl_1_data_239 = .data:0x00000239; // type:object size:0x24 scope:local data:string
lbl_1_data_260 = .data:0x00000260; // type:object size:0x15C
lbl_1_data_3BC = .data:0x000003BC; // type:object size:0x15C
lbl_1_data_518 = .data:0x00000518; // type:object size:0x1C

2
configure.py
View File

@ -1084,7 +1084,7 @@ config.libs = [
"m427Dll", # Right Oar Left?
objects={
Object(MatchingFor("GMPE01_00", "GMPE01_01"), "REL/m427Dll/main.c"),
Object(NonMatching, "REL/m427Dll/map.c"),
Object(MatchingFor("GMPE01_00", "GMPE01_01"), "REL/m427Dll/map.c"),
Object(MatchingFor("GMPE01_00", "GMPE01_01"), "REL/m427Dll/player.c"),
},
),

36
include/REL/m427Dll.h
View File

@ -1,21 +1,35 @@
#include "dolphin.h"
#include "game/object.h"
s32 fn_1_1788(void);
void fn_1_1798(s32 arg0, float arg8);
s32 fn_1_1884(void);
s32 fn_1_32EC(void);
typedef struct M427DllStruct {
s32 unk0;
s32 unk4;
} M427DllStruct;
void fn_1_32F4(Process* arg0);
void fn_1_3B20(s8 arg0, s16 arg1);
s32 fn_1_1788(void);
void fn_1_1798(s32 arg0, float arg8);
s32 fn_1_1884(void);
s32 fn_1_32EC(void);
void fn_1_32F4(Process *arg0);
void fn_1_3B20(s8 arg0, s16 arg1);
void fn_1_3A88(void);
void fn_1_91E0(s16 arg0, float arg8, float arg9, float argA, float argB);
float fn_1_AE78(s16 arg0, float arg8, float arg9);
void fn_1_E98C(Process*);
void fn_1_91E0(s16 arg0, float arg8, float arg9, float argA, float argB);
float fn_1_AE78(s16 arg0, float arg8, float arg9);
void fn_1_E98C(Process *);
void fn_1_EC54(void);
s32 fn_1_10FE8(s32 arg0, s32 *arg1);
void fn_1_110E8(s32, s32*);
void fn_1_111C0(s32, s32*);
void fn_1_110E8(s32, s32 *);
void fn_1_111C0(s32, s32 *);
void fn_1_11298(f32);
s32 fn_1_113F0(s32);
f32 fn_1_168FC(f32, f32, f32);
s32 fn_1_15F10(Vec arg0, Vec arg1, s32 arg2, s32 arg3, s32 arg4);
s32 fn_1_15FD0(Vec arg0, float arg8, s32 arg1, s32 arg2, s32 arg3);
extern s32 lbl_1_bss_580;
extern Vec *lbl_1_bss_558;
extern Vec *lbl_1_bss_554;
extern Vec *lbl_1_bss_550;
extern M427DllStruct lbl_1_bss_0[8];

5
src/REL/m427Dll/main.c
View File

@ -10,11 +10,6 @@
#include "game/objsub.h"
#include "game/wipe.h"
typedef struct M427DllStruct {
s32 unk0;
s32 unk4;
} M427DllStruct;
typedef struct M427DllStruct2 {
s32 unk0[3];
s32 unkC;

2645
src/REL/m427Dll/map.c
View File

File diff suppressed because it is too large Load Diff

10
src/REL/m427Dll/player.c
View File

@ -1967,7 +1967,7 @@ block_18:
return 0;
}
s32 fn_1_15F10(Vec *arg0, Vec *arg1, s32 arg2, s32 arg3, s32 arg4)
s32 fn_1_15F10(Vec arg0, Vec arg1, s32 arg2, s32 arg3, s32 arg4)
{
M427DllBss57CStruct *var_r31;
s32 var_r30;
@ -1986,12 +1986,12 @@ s32 fn_1_15F10(Vec *arg0, Vec *arg1, s32 arg2, s32 arg3, s32 arg4)
var_r31->unk_10 = arg4;
var_r31->unk_18 = arg3;
var_r31->unk_14 = 0;
var_r31->unk_1C = *arg0;
var_r31->unk_28 = *arg1;
var_r31->unk_1C = arg0;
var_r31->unk_28 = arg1;
return var_r30;
}
s32 fn_1_15FD0(Vec *arg0, s32 arg1, s32 arg2, s32 arg3, float arg8)
s32 fn_1_15FD0(Vec arg0, float arg8, s32 arg1, s32 arg2, s32 arg3)
{
M427DllBss57CStruct *var_r31;
s32 var_r30;
@ -2010,7 +2010,7 @@ s32 fn_1_15FD0(Vec *arg0, s32 arg1, s32 arg2, s32 arg3, float arg8)
var_r31->unk_10 = arg3;
var_r31->unk_18 = arg2;
var_r31->unk_14 = 0;
var_r31->unk_1C = *arg0;
var_r31->unk_1C = arg0;
var_r31->unk_34 = arg8;
return var_r30;
}