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

Merge pull request #361 from abnormalhare/main

Browse source 
Match m440Dll
This commit is contained in:
Liam Coleman 2024-06-25 12:34:42 -05:00 • committed by GitHub
commit d18f381e22
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
4 changed files with 1191 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

2
configure.py
View file

@ -1142,7 +1142,7 @@ config.libs = [
objects={
Object(Matching, "REL/executor.c"),
Object(Matching, "REL/m440Dll/main.c"),
Object(NonMatching, "REL/m440Dll/object.c"),
Object(Matching, "REL/m440Dll/object.c"),
},
),
Rel(

64
include/REL/m440Dll.h
View file

@ -202,10 +202,52 @@ typedef struct _unkStruct15 {
void* unk1C;
} unkStruct15;
// object.c
typedef struct _unkObjStruct {
s32 unk0;
s16 unk4;
s16 unk6;
s16 unk8;
s16 unkA;
s16 unkC;
s16 unkE;
s16 unk10;
s16 unk12;
s16 unk14;
s16 unk16;
Vec unk18;
Vec unk24;
Vec unk30;
Vec unk3C;
u8 unk48;
s16 unk4A;
f32 unk4C;
s16 unk50;
s16 unk52;
s16 unk54;
s16 unk56;
s16 unk58;
s16 unk5A;
f32 unk5C;
s16 unk60;
s16 unk62;
char unk64[0x4];
f32 unk68;
f32 unk6C;
f32 unk70;
} unkObjStruct;
////// BSS //////
// object.c
extern omObjData* lbl_1_bss_C0[4];
extern s16 lbl_1_bss_B8[4];
extern Vec lbl_1_bss_88[4];
extern f32 lbl_1_bss_84;
extern Vec lbl_1_bss_78;
extern s16 lbl_1_bss_74;
extern u8 lbl_1_bss_72;
extern s16 lbl_1_bss_70;
// main.c
extern omObjData* lbl_1_bss_6C;
extern omObjData* lbl_1_bss_68;
@ -248,6 +290,10 @@ extern s16 lbl_1_data_104[2];
extern s16 lbl_1_data_108[2];
// object.c
extern s16 lbl_1_data_1D8;
extern s16 lbl_1_data_1DA;
extern u32 lbl_1_data_1DC[8][2];
extern f32 lbl_1_data_21C[4];
extern f32 lbl_1_data_250;
////// FUNCTIONS //////
// main.c
@ -268,7 +314,7 @@ extern s16 fn_1_17F4(void);
extern void fn_1_181C(void);
extern u8 fn_1_1890(void);
extern void fn_1_18E0(void);
extern s32 fn_1_1954(void);
extern u8 fn_1_1954(void);
extern void fn_1_19B0(void);
extern void fn_1_1CAC(void);
extern void fn_1_2240(ModelData* data, unkStruct5*, Mtx);
@ -326,9 +372,25 @@ void fn_1_A390(ModelData*, Mtx);
extern void fn_1_AA94(void);
// object.c
extern void fn_1_AE08(Process*);
extern void fn_1_AEE4(omObjData*);
extern void fn_1_B17C(omObjData*);
extern void fn_1_B180(omObjData*);
extern void fn_1_B3A4(omObjData*);
extern void fn_1_B884(omObjData*, unkObjStruct*);
extern void fn_1_C1D4(omObjData*, unkObjStruct*);
extern void fn_1_C944(omObjData*, unkObjStruct*);
extern s16 fn_1_CFAC(unkObjStruct*, u8);
extern void fn_1_D24C(unkObjStruct*, f32, f32);
extern void fn_1_D34C(omObjData*, unkObjStruct*);
extern void fn_1_D7F8(omObjData*, unkObjStruct*);
extern void fn_1_E034(omObjData*, unkObjStruct*);
extern u8 fn_1_E8AC(omObjData*, unkObjStruct*);
extern s32 fn_1_ED88(omObjData*, s16, u32);
extern void fn_1_EE78(void);
extern void fn_1_EF50(void);
extern s16 fn_1_F0FC(void);
extern void fn_1_F168(void);
extern void fn_1_F228(void);
extern u16 fn_1_F4C0(unkObjStruct*, u16);
extern void fn_1_F4D4(unkObjStruct*, u16, u16);
extern s32 fn_1_F4FC(s32);

2
src/REL/m440Dll/main.c
View file

@ -430,7 +430,7 @@ void fn_1_18E0(void) {
HuAudSeqFadeOut(temp_r31->unkC, 0x64);
}
s32 fn_1_1954(void) {
u8 fn_1_1954(void) {
unkStruct2* sp8;
sp8 = (unkStruct2*)lbl_1_bss_6C->data;

1128
src/REL/m440Dll/object.c
View file

File diff suppressed because it is too large Load diff