Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

match most of m412 #382

Merged
merged 4 commits into from
Aug 2, 2024
Merged

match most of m412 #382

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
88aa365
2/3rds m412, fix previous headers
abnormalhare Aug 1, 2024
b548fe0
Merge branch 'main' of https://github.com/abnormalhare/marioparty4
abnormalhare Aug 1, 2024
25910aa
match most of m412
abnormalhare Aug 2, 2024
e3a27ca
Merge branch 'Rainchus:main' into main
abnormalhare Aug 2, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
241 changes: 121 additions & 120 deletions config/GMPE01_00/rels/m412Dll/symbols.txt
View file
Open in desktop

Large diffs are not rendered by default.

4 changes: 2 additions & 2 deletions configure.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -762,8 +762,8 @@ def Rel(lib_name, objects):
"cflags": cflags_libhu,
"host": False,
"objects": [
Object(NonMatching, "libhu/setvf.c"),
Object(NonMatching, "libhu/subvf.c"),
Object(Matching, "libhu/setvf.c"),
Object(Matching, "libhu/subvf.c"),
],
},
{
Expand Down
270 changes: 110 additions & 160 deletions include/REL/m409Dll.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -248,168 +248,118 @@ typedef struct _unkStruct12 {
} unkStruct12;

// bss
// player.c
extern omObjData* lbl_1_bss_3A0[4];
extern omObjData* lbl_1_bss_39C;
extern s32 lbl_1_bss_38C[4];
extern unkStruct10 lbl_1_bss_10C[8];
extern s16 lbl_1_bss_108;
extern s16 lbl_1_bss_106;
extern s16 lbl_1_bss_104;
extern unkStruct9 lbl_1_bss_F0;
// main.c
extern Process* lbl_1_bss_E8;
extern s16 lbl_1_bss_E4;
extern omObjData* lbl_1_bss_E0;
extern omObjData* lbl_1_bss_DC;
extern Vec lbl_1_bss_D0;
extern unkStruct4 lbl_1_bss_40[4];
extern s32 lbl_1_bss_3C;
extern unkStruct3 lbl_1_bss_24;
extern s8 lbl_1_bss_21;
extern u8 lbl_1_bss_20;
extern f32 lbl_1_bss_1C;
extern f32 lbl_1_bss_18;
extern s16 lbl_1_bss_16;
extern s8 lbl_1_bss_14;
extern f32 lbl_1_bss_10;
extern f32 lbl_1_bss_C;
extern s8 lbl_1_bss_A;
extern s16 lbl_1_bss_8;
extern s8 lbl_1_bss_6;
extern s16 lbl_1_bss_4;
extern s16 lbl_1_bss_2;
extern s8 lbl_1_bss_0;

// data
// main.c
extern Vec lbl_1_data_0;
extern Vec lbl_1_data_C;
extern unkStruct2 lbl_1_data_18;
extern Vec lbl_1_data_28;
extern Vec lbl_1_data_34;
extern Vec lbl_1_data_40;
extern unkStruct lbl_1_data_4C[4];
extern u32 lbl_1_data_BC;
extern s32 lbl_1_data_C0;
// player.c
extern u32 lbl_1_data_138; // unk
extern s32 lbl_1_data_13C[7];
extern GXColor lbl_1_data_158[8];
extern HsfVector2f lbl_1_data_178[4];
extern GXColor lbl_1_data_198[8];
extern u32 lbl_1_data_1EC;

// prototypes
extern void ModuleProlog(void);
extern void fn_1_434(omObjData* object);
extern void fn_1_4DC(omObjData* object);
extern s8 fn_1_524(void);
extern s8 fn_1_B80(void);
extern void fn_1_DDC(omObjData* object);
extern void fn_1_F70(omObjData* object);
extern s8 fn_1_10E8(omObjData* object);
extern s8 fn_1_1B74(omObjData* object);
extern void fn_1_2098(omObjData* object);
extern void fn_1_23EC(s16);
extern void fn_1_2414(u16, u16);
extern u16 fn_1_2454(u16);
extern void fn_1_2484(omObjData* object);
extern void fn_1_2DCC(omObjData* object);
extern void fn_1_3840(void);
extern void fn_1_3988(unkStruct4*, s16, s16);
extern s32 fn_1_3AD8(s32, f32, f32, f32, f32, f32, f32);
extern void fn_1_40A4(Mtx, Mtx);
extern f32 fn_1_4120(f32, f32, f32, f32);
extern void fn_1_417C(void);
extern void fn_1_44F0(s16, f32, f32, f32, s8, s16);
extern void fn_1_4FFC(s16, f32, f32, f32, s16);
extern void fn_1_5408(ModelData*, unkStruct6*, Mtx);
extern void fn_1_55E0(ModelData*, unkStruct6*, Mtx);
extern void fn_1_57DC(ModelData*, unkStruct6*, Mtx);
extern unkStruct5* fn_1_58E0(s16, Vec*, Vec*, f32, GXColor*);
extern s16 fn_1_5A18(AnimData*, s16, f32, s16, s16);
extern void fn_1_5F5C(s16);
extern void fn_1_5FBC(s16, m409Func6);
extern void fn_1_5FF4(s16, u8);
extern void fn_1_602C(ModelData*, Mtx);
extern void fn_1_6608(HsfVector2f*, s16, s16, f32, f32);
extern void fn_1_66D4(HsfVector2f*, HsfVector2f*, s16, f32, f32);
extern void fn_1_6778(Vec*, Vec*, Vec*, s16);
void ObjectSetup(void);
void fn_1_434(omObjData* object);
void fn_1_4DC(omObjData* object);
s8 fn_1_524(void);
s8 fn_1_B80(void);
void fn_1_DDC(omObjData* object);
void fn_1_F70(omObjData* object);
s8 fn_1_10E8(omObjData* object);
s8 fn_1_1B74(omObjData* object);
void fn_1_2098(omObjData* object);
void fn_1_23EC(s16);
void fn_1_2414(u16, u16);
u16 fn_1_2454(u16);
void fn_1_2484(omObjData* object);
void fn_1_2DCC(omObjData* object);
void fn_1_3840(void);
void fn_1_3988(unkStruct4*, s16, s16);
s32 fn_1_3AD8(s32, f32, f32, f32, f32, f32, f32);
void fn_1_40A4(Mtx, Mtx);
f32 fn_1_4120(f32, f32, f32, f32);
void fn_1_417C(void);
void fn_1_44F0(s16, f32, f32, f32, s8, s16);
void fn_1_4FFC(s16, f32, f32, f32, s16);
void fn_1_5408(ModelData*, unkStruct6*, Mtx);
void fn_1_55E0(ModelData*, unkStruct6*, Mtx);
void fn_1_57DC(ModelData*, unkStruct6*, Mtx);
unkStruct5* fn_1_58E0(s16, Vec*, Vec*, f32, GXColor*);
s16 fn_1_5A18(AnimData*, s16, f32, s16, s16);
void fn_1_5F5C(s16);
void fn_1_5FBC(s16, m409Func6);
void fn_1_5FF4(s16, u8);
void fn_1_602C(ModelData*, Mtx);
void fn_1_6608(HsfVector2f*, s16, s16, f32, f32);
void fn_1_66D4(HsfVector2f*, HsfVector2f*, s16, f32, f32);
void fn_1_6778(Vec*, Vec*, Vec*, s16);
// player.c
extern void fn_1_67E0(Process*);
extern void fn_1_6900(void);
extern void fn_1_6928(omObjData*);
extern void fn_1_7344(omObjData*);
extern void fn_1_7FE8(omObjData*);
extern void fn_1_8838(unkStruct8*);
extern s8 fn_1_8D08(u8);
extern void fn_1_8D6C(unkStruct8*);
extern void fn_1_91C0(omObjData*);
extern void fn_1_962C(omObjData*);
extern s32 fn_1_A584(unkStruct10*);
extern s8 fn_1_A9C0(Vec*, f32*);
extern s32 fn_1_ABB4(void);
extern void fn_1_AC08(s32*, s32);
extern f32 fn_1_AD40(f32, f32, f32);
extern f32 fn_1_AE94(f32, f32, f32, f32);
extern void fn_1_AF0C(f32*, f32*, f32*, f32*, f32);
extern f32 fn_1_B028(f32, f32, f32, f32);
extern void fn_1_B0A0(f32*, f32*, f32*, f32*, f32);
extern f32 fn_1_B378(Vec*);
extern f32 fn_1_B6A4(Vec*, Vec*, Vec*);
extern f32 fn_1_B9E0(Vec*, Vec*, Vec*, Vec*, Vec*);
extern f32 fn_1_BF38(s16);
void fn_1_67E0(Process*);
void fn_1_6900(void);
void fn_1_6928(omObjData*);
void fn_1_7344(omObjData*);
void fn_1_7FE8(omObjData*);
void fn_1_8838(unkStruct8*);
s8 fn_1_8D08(u8);
void fn_1_8D6C(unkStruct8*);
void fn_1_91C0(omObjData*);
void fn_1_962C(omObjData*);
s32 fn_1_A584(unkStruct10*);
s8 fn_1_A9C0(Vec*, f32*);
s32 fn_1_ABB4(void);
void fn_1_AC08(s32*, s32);
f32 fn_1_AD40(f32, f32, f32);
f32 fn_1_AE94(f32, f32, f32, f32);
void fn_1_AF0C(f32*, f32*, f32*, f32*, f32);
f32 fn_1_B028(f32, f32, f32, f32);
void fn_1_B0A0(f32*, f32*, f32*, f32*, f32);
f32 fn_1_B378(Vec*);
f32 fn_1_B6A4(Vec*, Vec*, Vec*);
f32 fn_1_B9E0(Vec*, Vec*, Vec*, Vec*, Vec*);
f32 fn_1_BF38(s16);
// cursor.c
extern void fn_1_BF88(s16, s16);
extern void fn_1_C0C0(void);
extern void fn_1_C164(unkStruct8*);
extern void fn_1_CB98(ModelData* model, Mtx matrix);
extern unkStruct8* fn_1_CCB0(s16 idx);
extern unkStruct8Sub* fn_1_CCCC(s16, s16);
extern void fn_1_CCF8(unkStruct11**, s16, f32, f32);
extern void fn_1_CE7C(Vec**, s16, Vec*);
extern void fn_1_CF1C(GXColor**, s16, GXColor*);
extern void fn_1_CFC4(Vec**, s16, Vec*);
extern void fn_1_D050(HsfVector2f**, s16, HsfVector2f*);
extern void fn_1_D0E8(unkStruct8Sub*);
extern void fn_1_D430(unkStruct8*);
extern s16 fn_1_DA48(u8, u8);
extern void fn_1_DDB8(s16);
extern void fn_1_DEF4(s16, s16, u8);
extern s16 fn_1_DF20(u32, s16, s16);
extern void fn_1_E228(s16);
extern s32 fn_1_E2A8(s16, u8, u32, s16, s16);
extern s32 fn_1_E7C8(s16, u8, u32);
extern void fn_1_E818(s16, f32, f32, f32);
extern void fn_1_E85C(s16, s16, f32, f32, f32);
extern void fn_1_E8CC(s16, f32, f32, f32);
extern void fn_1_E940(s16, f32, f32, f32);
extern void fn_1_E99C(s16, s16, f32, f32, f32);
extern void fn_1_E940(s16, f32, f32, f32);
extern void fn_1_EA24(s16, f32, f32, f32);
extern void fn_1_EAB0(s16, f32, f32, f32);
extern void fn_1_EAF4(s16, s16, f32, f32, f32);
extern void fn_1_EB64(s16, f32, f32, f32);
extern void fn_1_EBD8(s16, f32, f32, f32);
extern void fn_1_EC1C(s16, s16, f32, f32, f32);
extern void fn_1_EC8C(s16, f32, f32, f32);
extern void fn_1_ED00(s16, s32);
extern void fn_1_ED44(s16, s16, s32);
extern void fn_1_EDB4(s16, s32);
extern void fn_1_EE24(s16, u32);
extern void fn_1_EE68(s16, s16, u32);
extern void fn_1_EED8(s16, u32);
extern s32 fn_1_EF48(s16, s32);
extern s32 fn_1_EFA4(s16, s16, s32);
extern void fn_1_F024(s16, s16, u8, u8, u8, u8);
extern void fn_1_F098(s16, u8, u8, u8, u8);
extern void fn_1_F110(s16, s16, u8);
extern void fn_1_F17C(s16, s16, u8, u8);
extern void fn_1_F1F4(s16, u8);
extern void fn_1_F28C(s16, s16, f32);
extern void fn_1_F2F8(s16, s16, u8, f32);
extern void fn_1_F370(s16, f32);
extern void fn_1_F408(s16, s16, u8);
extern void fn_1_F478(s16, s16, u8, u8);
extern void fn_1_F4F0(s16, u8);
void fn_1_BF88(s16, s16);
void fn_1_C0C0(void);
void fn_1_C164(unkStruct8*);
void fn_1_CB98(ModelData* model, Mtx matrix);
unkStruct8* fn_1_CCB0(s16 idx);
unkStruct8Sub* fn_1_CCCC(s16, s16);
void fn_1_CCF8(unkStruct11**, s16, f32, f32);
void fn_1_CE7C(Vec**, s16, Vec*);
void fn_1_CF1C(GXColor**, s16, GXColor*);
void fn_1_CFC4(Vec**, s16, Vec*);
void fn_1_D050(HsfVector2f**, s16, HsfVector2f*);
void fn_1_D0E8(unkStruct8Sub*);
void fn_1_D430(unkStruct8*);
s16 fn_1_DA48(u8, u8);
void fn_1_DDB8(s16);
void fn_1_DEF4(s16, s16, u8);
s16 fn_1_DF20(u32, s16, s16);
void fn_1_E228(s16);
s32 fn_1_E2A8(s16, u8, u32, s16, s16);
s32 fn_1_E7C8(s16, u8, u32);
void fn_1_E818(s16, f32, f32, f32);
void fn_1_E85C(s16, s16, f32, f32, f32);
void fn_1_E8CC(s16, f32, f32, f32);
void fn_1_E940(s16, f32, f32, f32);
void fn_1_E99C(s16, s16, f32, f32, f32);
void fn_1_E940(s16, f32, f32, f32);
void fn_1_EA24(s16, f32, f32, f32);
void fn_1_EAB0(s16, f32, f32, f32);
void fn_1_EAF4(s16, s16, f32, f32, f32);
void fn_1_EB64(s16, f32, f32, f32);
void fn_1_EBD8(s16, f32, f32, f32);
void fn_1_EC1C(s16, s16, f32, f32, f32);
void fn_1_EC8C(s16, f32, f32, f32);
void fn_1_ED00(s16, s32);
void fn_1_ED44(s16, s16, s32);
void fn_1_EDB4(s16, s32);
void fn_1_EE24(s16, u32);
void fn_1_EE68(s16, s16, u32);
void fn_1_EED8(s16, u32);
s32 fn_1_EF48(s16, s32);
s32 fn_1_EFA4(s16, s16, s32);
void fn_1_F024(s16, s16, u8, u8, u8, u8);
void fn_1_F098(s16, u8, u8, u8, u8);
void fn_1_F110(s16, s16, u8);
void fn_1_F17C(s16, s16, u8, u8);
void fn_1_F1F4(s16, u8);
void fn_1_F28C(s16, s16, f32);
void fn_1_F2F8(s16, s16, u8, f32);
void fn_1_F370(s16, f32);
void fn_1_F408(s16, s16, u8);
void fn_1_F478(s16, s16, u8, u8);
void fn_1_F4F0(s16, u8);
Loading
Loading