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

Merge branch 'mariopartyrd:main' into main

Browse source
This commit is contained in:
CreateSource 2024-12-29 14:32:56 -05:00 • committed by GitHub
commit 5206436632
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
82 changed files with 15979 additions and 6067 deletions
Download patch file Download diff file Expand all files Collapse all files

18
include/REL/m435Dll.h
View file

@ -17,12 +17,12 @@ typedef struct {
/* 0x0C */ StructData3A0* unk0C;
/* 0x10 */ void (*unk10)(void);
/* 0x14 */ s32 (*unk14)(void);
} StructBss84; // Size unknown
} StructBss84; // Size 0x18
typedef struct {
/* 0x00 */ void (*unk00)(void); // inferred
/* 0x04 */ void (*unk04)(void); // inferred
/* 0x08 */ char unk08[4];
/* 0x00 */ char unk00[4];
/* 0x04 */ void (*unk04)(void);
/* 0x08 */ void (*unk08)(void);
/* 0x0C */ float unk0C;
/* 0x10 */ float unk10;
/* 0x14 */ float unk14;
@ -38,7 +38,9 @@ typedef struct {
/* 0x3C */ float unk3C;
/* 0x40 */ float unk40;
/* 0x44 */ float unk44;
} StructBssE08; // Size unknown
/* 0x48 */ s32 unk48[7];
/* 0x64 */ float unk64[7];
} StructBssE08; // Size 0x80
typedef struct {
/* 0x000 */ omObjData* unk00;
@ -55,7 +57,7 @@ typedef struct {
/* 0x474 */ float unk474;
/* 0x478 */ float unk478;
/* 0x47C */ float unk47C;
} StructFn19894; // Size unknown
} StructFn19894; // Size 0x480
float fn_1_1526C(float arg0, float arg1, float arg2, float arg3);
float fn_1_15294(float arg0, float arg1, float arg2);
@ -75,10 +77,10 @@ void fn_1_17804(StructBssE08* arg0, StructBssE08* arg1, float arg2, float arg3,
void fn_1_188E0(StructBssE08* arg0, StructBssE08* arg1, float arg2, float arg3, float arg4);
void fn_1_19530(omObjData* arg0, s32 arg1, Vec* arg2, Vec* arg3, s32 arg4, s32 arg5, s32 arg6);
void fn_1_195F4(omObjData* arg0, s32 arg1, Vec* arg2, Vec* arg3, s32 arg4, s32 arg5, s32 arg6);
void fn_1_19658(omObjData* arg0, s32 arg1, s32 arg2, float arg3);
void fn_1_19658(omObjData* arg0, s32 arg1, float arg2, s32 arg3);
void fn_1_19894(StructFn19894* arg0, s32 arg1);
void fn_1_198F8(StructFn19894* arg0, s32 arg1);
void fn_1_19960(StructFn19894* arg0, s32 arg1);
void fn_1_19968(StructFn19894* arg0);
void fn_1_19968(StructFn19894* arg0, s32 arg1);
void fn_1_19974(StructFn19894* arg0, s32 arg1);
void fn_1_1A33C(Process* arg0, StructFn19894* arg1, s32 arg2, char* arg3, s32 arg4, s32 arg5);

2
include/REL/m456Dll.h
View file

@ -8,5 +8,7 @@ void fn_1_2F3C(void);
s32 fn_1_61C8(Vec *arg0, float arg1, float arg2, s32 arg3);
float fn_1_63AC(void);
s32 fn_1_67E0(Vec *arg0, float arg1);
s32 fn_1_74F8(Vec *pos, float scale);
void fn_1_7F78(void);
#endif

1
include/ext_math.h
View file

@ -19,6 +19,7 @@ typedef struct vec2f {
#define VECDistanceZY(a, b) sqrtf((((a)->z-(b)->z)*((a)->z-(b)->z))+(((a)->y-(b)->y)*((a)->y-(b)->y)))
#define VECSumXZ(a, b) sqrtf((((a)->x+(b)->x)*((a)->x+(b)->x))+(((a)->z+(b)->z)*((a)->z+(b)->z)))
#define VECMagXYZ(a) sqrtf(((a)->x*(a)->x)+((a)->y*(a)->y)+((a)->z*(a)->z))
#define VECMagXZ(a) sqrtf(((a)->x*(a)->x)+((a)->z*(a)->z))
#define VECMagXY(a) sqrtf(((a)->x*(a)->x)+((a)->y*(a)->y))

2
include/ovl_table.h
View file

@ -71,7 +71,7 @@ OVL_DEFINE(OVL_M461, "dll/m461dll.rel")
OVL_DEFINE(OVL_M462, "dll/m462dll.rel")
OVL_DEFINE(OVL_M463, "dll/m463dll.rel")
OVL_DEFINE(OVL_MENT, "dll/mentdll.rel")
#if VERSION_JPN
#if VERSION_JP
OVL_DEFINE(OVL_MGMODE, "dll/mgmodedll.rel")
OVL_DEFINE(OVL_MODELTEST, "dll/modeltestdll.rel")
OVL_DEFINE(OVL_MODESEL, "dll/modeseldll.rel")

6
include/version.h
View file

@ -5,14 +5,14 @@
#define VERSION_NO_ENG1 1
#define VERSION_NO_PAL0 2
#define VERSION_NO_PAL2 3
#define VERSION_NO_JAP 4
#define VERSION_NO_JP 4
#define VERSION_ENG (VERSION == VERSION_NO_ENG0 || VERSION == VERSION_NO_ENG1)
#define VERSION_PAL (VERSION == VERSION_NO_PAL0 || VERSION == VERSION_NO_PAL2)
#define VERSION_JPN (VERSION == VERSION_NO_JAP)
#define VERSION_JP (VERSION == VERSION_NO_JP)
#define VERSION_NTSC (!VERSION_PAL)
#define VERSION_REV0 (VERSION == VERSION_NO_ENG0 || VERSION == VERSION_NO_PAL0 || VERSION == VERSION_NO_JAP)
#define VERSION_REV0 (VERSION == VERSION_NO_ENG0 || VERSION == VERSION_NO_PAL0 || VERSION == VERSION_NO_JP)
#define VERSION_REV1 (!VERSION_REV0)
#if VERSION_PAL