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

Merge branch 'main' into main

Browse source
This commit is contained in:
CreateSource 2025-03-05 20:44:20 -05:00 • committed by GitHub
commit e486d2c27b
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
47 changed files with 3413 additions and 2932 deletions
Download patch file Download diff file Expand all files Collapse all files

3
include/PowerPC_EABI_Support/MetroTRK/trk.h
View file

@ -254,6 +254,9 @@ typedef struct ProcessorRestoreFlags_PPC {
void TRKSaveExtended1Block();
void SetUseSerialIO(u8);
u8 GetUseSerialIO(void);
#define SPR_XER 1
#define SPR_LR 8
#define SPR_CTR 9

2
include/REL/instDll.h
View file

@ -3,6 +3,6 @@
#include "game/minigame_seq.h"
s32 fn_1_5EA4(SeqWork *work, char *mess, s16 jp_flag);
s32 FontCreate(SeqWork *work, char *mess, s16 jp_flag);
#endif

34
include/REL/resultdll.h
View file

@ -7,7 +7,7 @@
#include "game/sprite.h"
typedef struct datalist_model {
typedef struct StageModel_s {
s32 datanum;
u32 attr;
s16 type;
@ -16,33 +16,33 @@ typedef struct datalist_model {
Vec pos;
Vec rot;
Vec scale;
} DataListModel;
} StageModel;
typedef struct datalist_sprite {
typedef struct StageSprite_s {
u32 datanum;
s16 attr;
s16 prio;
float x;
float y;
GXColor color;
} DataListSprite;
} StageSprite;
void fn_1_3FD8(void);
void fn_1_40DC(void);
void fn_1_423C(s16 *data);
void ResultBoardDataRead(void);
void ResultCoinAdd(void);
void ResultCoinNumGet(s16 *coinNum);
void fn_1_6490(void);
void ResultBattleMain(void);
void fn_1_8FF8(DataListModel *model_list);
void fn_1_927C(DataListSprite *sprite_list);
void fn_1_93B4(void);
void StageModelCreate(StageModel *model_list);
void StageSpriteCreate(StageSprite *sprite_list);
void StageSpriteKill(void);
extern s16 lbl_1_bss_1A9C[32];
extern s16 lbl_1_bss_1A5C[32];
extern s16 lbl_1_bss_1A1A[33];
extern s16 stageMdlId[32];
extern s16 stageMotId[32];
extern s16 stageSprId[33];
extern s16 lbl_1_bss_1A18;
extern s32 lbl_1_bss_178;
extern s32 lbl_1_bss_174;
extern s16 lbl_1_bss_172;
extern s32 resultReadEndF;
extern s32 resultFastF;
extern s16 resultBonusPlayer;
#endif

2
include/TRK_MINNOW_DOLPHIN/MetroTRK/Portable/msg.h
View file

@ -8,7 +8,7 @@ typedef struct _TRK_Msg {
u8 _00[8];
u32 m_msgLength;
u32 _0C;
u32 m_msg;
u8 m_msg[4]; // TODO: unknown array length
} TRK_Msg;
#ifdef __cplusplus

2
include/TRK_MINNOW_DOLPHIN/MetroTRK/Portable/msgbuf.h
View file

@ -12,7 +12,7 @@ DSError TRKInitializeMessageBuffers(void);
DSError TRKSetBufferPosition(TRKBuffer* msg, u32 pos);
void* TRKGetBuffer(int);
void TRKResetBuffer(TRKBuffer* msg, BOOL keepData);
void TRKResetBuffer(TRKBuffer* msg, u8 keepData);
void* TRKGetBuffer(int idx);
void TRKReleaseBuffer(int idx);
DSError TRKGetFreeBuffer(int* msgID, TRKBuffer** outMsg);

8
include/TRK_MINNOW_DOLPHIN/MetroTRK/Portable/support.h
View file

@ -15,12 +15,12 @@ DSError TRKRequestSend(TRKBuffer* msgBuf, int* bufferId, u32 p1, u32 p2,
int p3);
DSError HandleOpenFileSupportRequest(const char* path, u8 replyError,
u32* param_3, DSIOResult* ioResult);
u32* param_3, u8* ioResult);
DSError HandleCloseFileSupportRequest(int replyError, DSIOResult* ioResult);
DSError HandleCloseFileSupportRequest(int replyError, u8* ioResult);
DSError HandlePositionFileSupportRequest(DSReplyError replyErr, u32* param_2,
u8 param_3, DSIOResult* ioResult);
DSError HandlePositionFileSupportRequest(u32 replyErr, u32* param_2,
u8 param_3, u8* ioResult);
#ifdef __cplusplus
}

2
include/TRK_MINNOW_DOLPHIN/ppc/Generic/mpc_7xx_603e.h
View file

@ -7,7 +7,7 @@
extern "C" {
#endif
u32 TRKTargetCPUMinorType(void);
u8 TRKTargetCPUMinorType(void);
#ifdef __cplusplus
}

24
include/game/gamework_data.h
View file

@ -40,8 +40,8 @@ typedef struct system_state {
};
/* 0x09 */ s8 last5_effect;
/* 0x0A */ s8 player_curr;
/* 0x0B */ u8 unk0B;
/* 0x0C */ s8 unk0C;
/* 0x0B */ u8 storyCharBit;
/* 0x0C */ s8 storyChar;
/* 0x0E */ s16 block_pos;
/* 0x10 */ u8 ATTRIBUTE_ALIGN(4) board_data[32];
/* 0x30 */ u8 mess_delay;
@ -137,9 +137,9 @@ typedef struct game_stat {
u8 story_continue : 1;
u8 party_continue : 1;
u8 open_w06 : 1;
u8 field10E_bit4 : 1;
u8 field10E_bit5 : 1;
u8 field10E_bit6 : 1;
u8 veryHardUnlock : 1;
u8 customPackEnable : 1;
u8 musicAllF : 1;
};
/* 0x10F */ PauseBackupConfig story_pause;
/* 0x110 */ PauseBackupConfig party_pause;
@ -300,11 +300,6 @@ static inline s32 GWSaveModeGet(void)
return GWSystem.save_mode;
}
static inline s32 GWTurnGet(void)
{
return GWSystem.turn;
}
static inline s32 GWBoardGet(void)
{
return GWSystem.board;
@ -315,9 +310,14 @@ static inline s32 GWPlayerCurrGet(void)
return GWSystem.player_curr;
}
static inline s32 GWUnkB1Get(void)
static inline s32 GWStoryCharGet(void)
{
return GWSystem.unk0C;
return GWSystem.storyChar;
}
static inline void GWStoryCharSet(s32 storyChar)
{
GWSystem.storyChar = storyChar;
}
static inline s32 GWPlayerTeamGet(s32 player)