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

Merge branch 'main' of https://github.com/abnormalhare/mp4-dtk

Browse source
This commit is contained in:
CreateSource 2024-04-05 17:43:14 -04:00
commit 157df727d4
20 changed files with 2523 additions and 639 deletions
Download patch file Download diff file Expand all files Collapse all files

41
include/REL/resultdll.h Normal file
View file

@ -0,0 +1,41 @@
#ifndef RESULTDLL_H
#define RESULTDLL_H
#include "game/data.h"
#include "game/hsfman.h"
#include "game/hsfmotion.h"
#include "game/sprite.h"
typedef struct datalist_model {
s32 datanum;
u32 attr;
s16 type;
s16 link;
s16 mot_link;
Vec pos;
Vec rot;
Vec scale;
} DataListModel;
typedef struct datalist_sprite {
u32 datanum;
s16 attr;
s16 prio;
float x;
float y;
GXColor color;
} DataListSprite;
void fn_1_6490(void);
void fn_1_8FF8(DataListModel *model_list);
void fn_1_927C(DataListSprite *sprite_list);
void fn_1_93B4(void);
extern s16 lbl_1_bss_1A9C[32];
extern s16 lbl_1_bss_1A5C[32];
extern s16 lbl_1_bss_1A1A[33];
extern s16 lbl_1_bss_1A18;
#endif

13
include/REL/w06Dll.h
View file

@ -7,6 +7,16 @@ enum {
MAPOBJ_MAX = 6
};
typedef struct {
struct {
u8 unk00_field0 : 1;
u8 unk00_field1 : 1;
u8 unk00_field2 : 1;
};
s8 unk01;
s8 unk02;
} UnkW06BoardData;
extern void fn_1_D70(void);
extern void fn_1_F6C(void);
extern void fn_1_1054(void); // return s32?
@ -19,6 +29,7 @@ extern void fn_1_6EF0(void); // return s32?
extern void fn_1_7BB0(void);
extern void fn_1_7F3C(void);
extern void fn_1_7FA4(void);
extern void fn_1_8264(s32 arg0, s16 arg1);
extern void fn_1_8F20(void);
@ -31,6 +42,6 @@ extern void fn_1_CC90(void);
extern void fn_1_CD0C(void);
extern s16 lbl_1_bss_C[MAPOBJ_MAX];
extern void *lbl_1_bss_0;
extern UnkW06BoardData *lbl_1_bss_0;
#endif

4
include/game/audio.h
View file

@ -58,8 +58,8 @@ void HuAudSndCommonGrpSet(s16 arg0, s32 arg1);
void HuAudAUXSet(s32 arg0, s32 arg1);
void HuAudAUXVolSet(s8 arg0, s8 arg1);
void HuAudVoiceInit(s16 ovl);
void HuAudPlayerVoicePlay(s16 arg0, s16 arg1);
void HuAudPlayerVoicePlayPos(s16 arg0, s16 arg1, Vec *arg2);
s32 HuAudPlayerVoicePlay(s16 arg0, s16 arg1);
s32 HuAudPlayerVoicePlayPos(s16 arg0, s16 arg1, Vec *arg2);
void HuAudPlayerVoicePlayEntry(s16 arg0, s16 arg1);
s32 HuAudCharVoicePlay(s16 arg0, s16 arg1);
s32 HuAudCharVoicePlayPos(s16 arg0, s16 arg1, Vec *arg2);

5
include/game/gamework_data.h
View file

@ -234,6 +234,11 @@ static inline void GWLuckyValueSet(s32 value)
GWSystem.lucky_value = value;
}
static inline s16 GWPlayerCoinBattleGet(s32 player)
{
return GWPlayer[player].coins_battle;
}
static inline s16 GWPlayerCoinCollectGet(s32 player)
{
return GWPlayer[player].coin_collect;

13
include/game/saveload.h
View file

@ -15,8 +15,8 @@ typedef struct save_buf_data {
GameStat stat;
SystemState system;
PlayerState player[4];
SystemState systemBackup;
PlayerState playerBackup[4];
SystemState systemStory;
PlayerState playerStory[4];
} SaveBufData;
typedef union save_buf_all {
@ -24,7 +24,12 @@ typedef union save_buf_all {
u8 ATTRIBUTE_ALIGN(32) buf[SAVE_BUF_SIZE];
} SaveBufAll;
extern CARDFileInfo curFileInfo;
extern SaveBufAll saveBuf;
extern u64 SLSerialNo;
extern s32 saveExecF;
extern u8 curBoxNo;
extern s16 curSlotNo;
s32 SLFileOpen(char *fileName);
s32 SLFileCreate(char *fileName, u32 size, void *addr);
@ -39,12 +44,12 @@ void SLSaveDataMake(s32 erase, OSTime *time);
void SLSaveDataInfoSet(OSTime *time);
void SLCommonSet(void);
void SLSaveBoard(void);
void SLSaveBoardBackup(void);
void SLSaveBoardStory(void);
s32 SLSave(void);
s32 SLLoad(void);
void SLLoadGameStat(void);
void SLLoadBoard(void);
void SLLoadBoardBackup(void);
void SLLoadBoardStory(void);
void SLSerialNoGet(void);
BOOL SLSerialNoCheck(void);
BOOL SLCheckSumCheck(void);