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-03 21:00:02 -05:00 • committed by GitHub
commit 13a6b310be
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
137 changed files with 26570 additions and 1112 deletions
Download patch file Download diff file Expand all files Collapse all files

26
include/REL/m421Dll.h
View file

@ -25,18 +25,38 @@ typedef struct M421DllCameraStruct {
s32 unk_3C;
float unk_40;
UnkM421DllStruct unk_44;
char unk54[0x30];
float unk_54;
float unk_58;
float unk_5C;
float unk_60;
float unk_64;
float unk_68;
char unk6C[0x18];
float unk_84;
char unk88[0x4];
float unk_8C;
float unk_90;
s32 unk_94;
u32 unk_94;
char unk98[0xC];
} M421DllCameraStruct; /* size = 0xA4 */ // same as M443DllCameraStruct and M460
M421DllCameraStruct *fn_1_3C14(s32 arg0);
u32 fn_1_3E34(void);
u32 fn_1_3E4C(void);
u32 fn_1_3E64(void);
s32 fn_1_3E7C(s32 arg0);
s32 fn_1_3EF8(s32 arg0);
void fn_1_3F28(s32 arg0, s32 arg1, s32 arg2);
void fn_1_3F68(s32 arg0);
void fn_1_3F98(s32 arg0);
void fn_1_3FC8(s32 arg0);
s32 fn_1_3FF8(void);
float fn_1_4478(float arg8, float arg9, float argA);
void fn_1_4648(Process *process);
void fn_1_48B0(void);
void fn_1_B15C(Process *process, omObjData *object);
void fn_1_B15C(Process *process);
void fn_1_B1BC(void);
void fn_1_B39C(void);
#endif

9
include/game/hsfdraw.h
View file

@ -44,10 +44,19 @@ typedef struct hsf_const_data {
AnimData *hiliteMap;
} HsfConstData;
typedef struct hsf_draw_object {
/* 0x00 */ ModelData *model;
/* 0x04 */ HsfObject *object;
/* 0x08 */ float z;
/* 0x0C */ Mtx matrix;
/* 0x3C */ Vec scale;
} HsfDrawObject;
void Hu3DDrawPreInit(void);
void Hu3DDraw(ModelData *arg0, Mtx arg1, Vec *arg2);
s32 ObjCullCheck(HsfData *arg0, HsfObject *arg1, Mtx arg2);
void FaceDraw(HsfDrawObject *arg0, HsfFace *arg1);
void Hu3DDrawPost(void);
void MakeDisplayList(s16 arg0, u32 arg1);
HsfConstData *ObjConstantMake(HsfObject *arg0, u32 arg1);

26
include/game/minigame_seq.h
View file

@ -91,6 +91,32 @@ void MGSeqPauseEnableCtrl(s32 flag);
void MGSeqPracticeInit(void);
void MGSeqPracticeExitCheck(omObjData *object);
s32 MGSeqInitTimer(SeqWork *work, va_list params);
s32 MGSeqUpdateTimer(SeqWork *work);
s32 MGSeqInitType2(SeqWork *work, va_list params);
s32 MGSeqUpdateType2(SeqWork *work);
s32 MGSeqUpdateMGBattle(SeqWork *work);
s32 MGSeqInitMGBasic(SeqWork *work, va_list params);
s32 MGSeqUpdateMGBasic(SeqWork *work);
s32 MGSeqInitMGCommon(SeqWork *work, va_list params);
s32 MGSeqUpdateMG1vs3(SeqWork *work);
s32 MGSeqUpdateMGStory(SeqWork *work);
s32 MGSeqUpdateMG2vs2(SeqWork *work);
s32 MGSeqUpdateMGBowser(SeqWork *work);
s32 MGSeqInitWin(SeqWork *work, va_list params);
s32 MGSeqUpdateWin(SeqWork *work);
s32 MGSeqInitDraw(SeqWork *work, va_list params);
s32 MGSeqUpdateDraw(SeqWork *work);
s32 MGSeqInitRecord(SeqWork *work, va_list params);
s32 MGSeqUpdateRecord(SeqWork *work);
s32 MGSeqInitFlip(SeqWork *work, va_list params);
s32 MGSeqUpdateFlip(SeqWork *work);
extern OverlayID mgSeqOvlPrev;
#endif

11
include/ovl_table.h
View file

@ -1,3 +1,5 @@
#include "version.h"
OVL_DEFINE(OVL__MINI, "dll/_minigameDLL.rel")
OVL_DEFINE(OVL_BOOT, "dll/bootdll.rel")
OVL_DEFINE(OVL_E3SETUP, "dll/e3setupDLL.rel")
@ -69,10 +71,17 @@ 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
OVL_DEFINE(OVL_MGMODE, "dll/mgmodedll.rel")
OVL_DEFINE(OVL_MODELTEST, "dll/modeltestdll.rel")
OVL_DEFINE(OVL_MODESEL, "dll/modeseldll.rel")
OVL_DEFINE(OVL_MOVIE, "dll/moviedll.rel")
#else
OVL_DEFINE(OVL_MESS, "dll/messdll.rel")
OVL_DEFINE(OVL_MGMODE, "dll/mgmodedll.rel")
OVL_DEFINE(OVL_MODELTEST, "dll/modeltestdll.rel")
OVL_DEFINE(OVL_MODESEL, "dll/modeseldll.rel")
#endif
OVL_DEFINE(OVL_MPEX, "dll/mpexdll.rel")
OVL_DEFINE(OVL_MSETUP, "dll/msetupdll.rel")
OVL_DEFINE(OVL_MSTORY2, "dll/mstory2dll.rel")
@ -96,4 +105,4 @@ OVL_DEFINE(OVL_W06, "dll/w06dll.rel")
OVL_DEFINE(OVL_W10, "dll/w10dll.rel")
OVL_DEFINE(OVL_W20, "dll/w20dll.rel")
OVL_DEFINE(OVL_W21, "dll/w21dll.rel")
OVL_DEFINE(OVL_ZTAR, "dll/ztardll.rel")
OVL_DEFINE(OVL_ZTAR, "dll/ztardll.rel")

2
include/version.h
View file

@ -9,7 +9,7 @@
#define VERSION_ENG (VERSION == VERSION_NO_ENG0 || VERSION == VERSION_NO_ENG1)
#define VERSION_PAL (VERSION == VERSION_NO_PAL0 || VERSION == VERSION_NO_PAL2)
#define VERSION_JAP (VERSION == VERSION_NO_JAP)
#define VERSION_JPN (VERSION == VERSION_NO_JAP)
#define VERSION_NTSC (!VERSION_PAL)
#define VERSION_REV0 (VERSION == VERSION_NO_ENG0 || VERSION == VERSION_NO_PAL0 || VERSION == VERSION_NO_JAP)