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

Move int to s32

Browse source
This commit is contained in:
gamemasterplc 2024-05-10 20:41:02 -05:00
parent ec5f686ffb
commit 2f41ab51e7
8 changed files with 67 additions and 61 deletions
Download patch file Download diff file Expand all files Collapse all files

4
include/game/board/window.h
View file

@ -10,7 +10,7 @@ void BoardWinUnusedArraySet(f32*);
void BoardWinKillAll(void); void BoardWinKillAll(void);
void BoardWinDestroy(void); void BoardWinDestroy(void);
void BoardWinProc(void); void BoardWinProc(void);
int BoardWinChoiceGet(void); s32 BoardWinChoiceGet(void);
void BoardWinPause(void); void BoardWinPause(void);
void BoardWinCreateChoice(s32 pos, u32 mess, s32 portrait, s32 choice); void BoardWinCreateChoice(s32 pos, u32 mess, s32 portrait, s32 choice);
void BoardWinCreate(s32 pos, u32 mess, s32 portrait); void BoardWinCreate(s32 pos, u32 mess, s32 portrait);
@ -21,7 +21,7 @@ void BoardWinAttrSet(s32 attr);
void BoardWinAttrReset(s32 attr); void BoardWinAttrReset(s32 attr);
void BoardWinChoiceDisable(s32 choice); void BoardWinChoiceDisable(s32 choice);
void BoardWinKeyWait(void); void BoardWinKeyWait(void);
int BoardWinSpeedGet(void); s32 BoardWinSpeedGet(void);
void BoardWinSpeedSet(s32 value); void BoardWinSpeedSet(s32 value);
s16 BoardWinChoiceNowGet(void); s16 BoardWinChoiceNowGet(void);
void BoardWinPriSet(s16 prio); void BoardWinPriSet(s16 prio);

6
include/game/gamework_data.h
View file

@ -186,6 +186,12 @@ static inline void GWRumbleSet(s32 value)
} }
} }
static inline s32 GWBonusStarGet(void)
{
return GWSystem.bonus_star;
}
static inline s32 GWMGExplainGet(void) static inline s32 GWMGExplainGet(void)
{ {
return GWSystem.explain_mg; return GWSystem.explain_mg;

2
include/game/hsfload.h
View file

@ -7,6 +7,6 @@ HsfData *LoadHSF(void *data);
void ClusterAdjustObject(HsfData *model, HsfData *src_model); void ClusterAdjustObject(HsfData *model, HsfData *src_model);
char *SetName(u32 *str_ofs); char *SetName(u32 *str_ofs);
char *MakeObjectName(char *name); char *MakeObjectName(char *name);
int CmpObjectName(char *name1, char *name2); s32 CmpObjectName(char *name1, char *name2);
#endif #endif

4
include/game/minigame_seq.h
View file

@ -43,8 +43,8 @@
typedef struct seq_work SeqWork; typedef struct seq_work SeqWork;
typedef int (*SeqUpdateFunc)(SeqWork *work); typedef s32 (*SeqUpdateFunc)(SeqWork *work);
typedef int (*SeqInitFunc)(SeqWork *work, va_list params); typedef s32 (*SeqInitFunc)(SeqWork *work, va_list params);
typedef struct seq_work { typedef struct seq_work {
SeqUpdateFunc update; SeqUpdateFunc update;

2
src/game/board/space.c
View file

@ -677,7 +677,7 @@ s32 BoardSpaceBlockExec(s32 player, s32 space)
if(space == GWSystem.block_pos) { if(space == GWSystem.block_pos) {
event_exec = 1; event_exec = 1;
} }
if((int)GWSystem.bonus_star == 0 && GWPartyGet() == 1 && !_CheckFlag(FLAG_ID_MAKE(1, 11))) { if(!GWBonusStarGet() && GWPartyGet() == 1 && !_CheckFlag(FLAG_ID_MAKE(1, 11))) {
event_exec = 0; event_exec = 0;
} }
if(GWBoardGet() == 7 || GWBoardGet() == 8) { if(GWBoardGet() == 7 || GWBoardGet() == 8) {

4
src/game/board/window.c
View file

@ -172,7 +172,7 @@ static void ExecBoardWindow(void) {
HuPrcEnd(); HuPrcEnd();
} }
int BoardWinChoiceGet(void) { s32 BoardWinChoiceGet(void) {
return winChoice; return winChoice;
} }
@ -292,7 +292,7 @@ void BoardWinKeyWait(void) {
winWait = 1; winWait = 1;
} }
int BoardWinSpeedGet(void) { s32 BoardWinSpeedGet(void) {
return winSpeedTbl[GWMessSpeedGet()]; return winSpeedTbl[GWMessSpeedGet()];
} }

10
src/game/hsfload.c
View file

@ -981,7 +981,7 @@ static void PaletteLoad(void)
char *MakeObjectName(char *name) char *MakeObjectName(char *name)
{ {
static char buf[768]; static char buf[768];
int index, num_minus; s32 index, num_minus;
char *temp_name; char *temp_name;
num_minus = 0; num_minus = 0;
index = 0; index = 0;
@ -1009,9 +1009,9 @@ char *MakeObjectName(char *name)
return buf; return buf;
} }
int CmpObjectName(char *name1, char *name2) s32 CmpObjectName(char *name1, char *name2)
{ {
int temp = 0; s32 temp = 0;
return strcmp(name1, name2); return strcmp(name1, name2);
} }
@ -1054,7 +1054,7 @@ static inline s32 FindClusterName(char *name)
return -1; return -1;
} }
static inline int FindMotionClusterName(char *name) static inline s32 FindMotionClusterName(char *name)
{ {
s32 i; s32 i;
HsfCluster *cluster; HsfCluster *cluster;
@ -1085,7 +1085,7 @@ static inline s32 FindAttributeName(char *name)
return -1; return -1;
} }
static inline int FindMotionAttributeName(char *name) static inline s32 FindMotionAttributeName(char *name)
{ {
s32 i; s32 i;
HsfAttribute *attribute; HsfAttribute *attribute;

96
src/game/minigame_seq.c
View file

@ -31,30 +31,30 @@ typedef struct seq_info {
s32 time_max; s32 time_max;
} SeqInfo; } SeqInfo;
static int SeqInitTimer(SeqWork *work, va_list params); static s32 SeqInitTimer(SeqWork *work, va_list params);
static int SeqUpdateTimer(SeqWork *work); static s32 SeqUpdateTimer(SeqWork *work);
static int SeqInitType2(SeqWork *work, va_list params); static s32 SeqInitType2(SeqWork *work, va_list params);
static int SeqUpdateType2(SeqWork *work); static s32 SeqUpdateType2(SeqWork *work);
static int SeqInitMGBasic(SeqWork *work, va_list params); static s32 SeqInitMGBasic(SeqWork *work, va_list params);
static int SeqUpdateMGBasic(SeqWork *work); static s32 SeqUpdateMGBasic(SeqWork *work);
static int SeqInitMGCommon(SeqWork *work, va_list params); static s32 SeqInitMGCommon(SeqWork *work, va_list params);
static int SeqUpdateMG1vs3(SeqWork *work); static s32 SeqUpdateMG1vs3(SeqWork *work);
static int SeqUpdateMGBattle(SeqWork *work); static s32 SeqUpdateMGBattle(SeqWork *work);
static int SeqUpdateMGStory(SeqWork *work); static s32 SeqUpdateMGStory(SeqWork *work);
static int SeqUpdateMG2vs2(SeqWork *work); static s32 SeqUpdateMG2vs2(SeqWork *work);
static int SeqUpdateMGBowser(SeqWork *work); static s32 SeqUpdateMGBowser(SeqWork *work);
static int SeqInitWin(SeqWork *work, va_list params); static s32 SeqInitWin(SeqWork *work, va_list params);
static int SeqUpdateWin(SeqWork *work); static s32 SeqUpdateWin(SeqWork *work);
static int SeqInitDraw(SeqWork *work, va_list params); static s32 SeqInitDraw(SeqWork *work, va_list params);
static int SeqUpdateDraw(SeqWork *work); static s32 SeqUpdateDraw(SeqWork *work);
static int SeqInitRecord(SeqWork *work, va_list params); static s32 SeqInitRecord(SeqWork *work, va_list params);
static int SeqUpdateRecord(SeqWork *work); static s32 SeqUpdateRecord(SeqWork *work);
static int SeqInitFlip(SeqWork *work, va_list params); static s32 SeqInitFlip(SeqWork *work, va_list params);
static int SeqUpdateFlip(SeqWork *work); static s32 SeqUpdateFlip(SeqWork *work);
OverlayID mgSeqOvlPrev = OVL_INVALID; OverlayID mgSeqOvlPrev = OVL_INVALID;
@ -118,7 +118,7 @@ static u8 seqDoneF;
u8 lbl_801D3D94; u8 lbl_801D3D94;
static s16 seqSpeed; static s16 seqSpeed;
static s16 seqPauseF; static s16 seqPauseF;
static s32 seqRecordVal; static int seqRecordVal;
static s32 pauseWaitF; static s32 pauseWaitF;
static s32 pauseExitF; static s32 pauseExitF;
static s32 pauseActiveF; static s32 pauseActiveF;
@ -130,7 +130,7 @@ void fn_80036BC8(void);
void MGSeqInit(void) void MGSeqInit(void)
{ {
int i; s32 i;
SeqWork *work; SeqWork *work;
work = &seqWorkData[0]; work = &seqWorkData[0];
for(i=8; i!=0; i--, work++) { for(i=8; i!=0; i--, work++) {
@ -204,8 +204,8 @@ static s16 CreateSeq(s16 seq_no, va_list params)
{ {
SeqWork *work; SeqWork *work;
SeqInfo *info; SeqInfo *info;
int i; s32 i;
int temp; s32 temp;
work = seqWorkData; work = seqWorkData;
info = &seqInfoTbl[(u8)seq_no]; info = &seqInfoTbl[(u8)seq_no];
for(i=0; i<8; i++, work++) { for(i=0; i<8; i++, work++) {
@ -269,7 +269,7 @@ u8 MGSeqStatGet(s16 id)
SeqWork *work; SeqWork *work;
u8 ret = 0; u8 ret = 0;
if(id < 0) { if(id < 0) {
int i; s32 i;
work = seqWorkData; work = seqWorkData;
for(i=8; i != 0; i--, work++) { for(i=8; i != 0; i--, work++) {
ret |= work->stat; ret |= work->stat;
@ -334,7 +334,7 @@ void MGSeqStub(void)
void MGSeqSprKill(SeqWork *work) void MGSeqSprKill(SeqWork *work)
{ {
int i; s32 i;
for(i=0; i<16; i++) { for(i=0; i<16; i++) {
if(work->spr_grp[i] >= 0) { if(work->spr_grp[i] >= 0) {
HuSprGrpKill(work->spr_grp[i]); HuSprGrpKill(work->spr_grp[i]);
@ -350,7 +350,7 @@ static void *SeqReadFile(s32 file)
return HuAR_ARAMtoMRAMFileRead(file, MEMORY_DEFAULT_NUM, HEAP_DATA); return HuAR_ARAMtoMRAMFileRead(file, MEMORY_DEFAULT_NUM, HEAP_DATA);
} }
static int SeqInitTimer(SeqWork *work, va_list params) static s32 SeqInitTimer(SeqWork *work, va_list params)
{ {
AnimData *spr_anim; AnimData *spr_anim;
s16 sprite; s16 sprite;
@ -407,7 +407,7 @@ static int SeqInitTimer(SeqWork *work, va_list params)
return 1; return 1;
} }
static int SeqUpdateTimer(SeqWork *work) static s32 SeqUpdateTimer(SeqWork *work)
{ {
float scale; float scale;
float tp_lvl; float tp_lvl;
@ -563,7 +563,7 @@ static int SeqUpdateTimer(SeqWork *work)
} }
} }
static int SeqInitType2(SeqWork *work, va_list params) static s32 SeqInitType2(SeqWork *work, va_list params)
{ {
s16 spr_idx; s16 spr_idx;
s16 spr_grp; s16 spr_grp;
@ -662,7 +662,7 @@ static int SeqInitType2(SeqWork *work, va_list params)
return 1; return 1;
} }
static int SeqUpdateType2(SeqWork *work) static s32 SeqUpdateType2(SeqWork *work)
{ {
float tp_lvl; float tp_lvl;
s16 spr_grp; s16 spr_grp;
@ -920,7 +920,7 @@ static float ForceDefine480()
static void SeqPlayStartFX(void); static void SeqPlayStartFX(void);
static int SeqInitMGBasic(SeqWork *work, va_list params) static s32 SeqInitMGBasic(SeqWork *work, va_list params)
{ {
s16 i; s16 i;
s16 word_grp; s16 word_grp;
@ -967,7 +967,7 @@ static int SeqInitMGBasic(SeqWork *work, va_list params)
return 1; return 1;
} }
static int SeqUpdateMGBasic(SeqWork *work) static s32 SeqUpdateMGBasic(SeqWork *work)
{ {
s16 idx; s16 idx;
float scale; float scale;
@ -1130,7 +1130,7 @@ static int SeqUpdateMGBasic(SeqWork *work)
return 1; return 1;
} }
static int SeqInitMGCommon(SeqWork *work, va_list params) static s32 SeqInitMGCommon(SeqWork *work, va_list params)
{ {
s16 i; s16 i;
float tp_lvl; float tp_lvl;
@ -1204,7 +1204,7 @@ static int SeqInitMGCommon(SeqWork *work, va_list params)
return 1; return 1;
} }
static int SeqUpdateMGBattle(SeqWork *work) static s32 SeqUpdateMGBattle(SeqWork *work)
{ {
s16 idx; s16 idx;
float scale; float scale;
@ -1446,7 +1446,7 @@ static int SeqUpdateMGBattle(SeqWork *work)
return 1; return 1;
} }
static int SeqUpdateMG1vs3(SeqWork *work) static s32 SeqUpdateMG1vs3(SeqWork *work)
{ {
s16 idx; s16 idx;
float scale; float scale;
@ -1652,7 +1652,7 @@ static int SeqUpdateMG1vs3(SeqWork *work)
return 1; return 1;
} }
static int SeqUpdateMGStory(SeqWork *work) static s32 SeqUpdateMGStory(SeqWork *work)
{ {
s16 idx; s16 idx;
float scale; float scale;
@ -1859,7 +1859,7 @@ static int SeqUpdateMGStory(SeqWork *work)
return 1; return 1;
} }
static int SeqUpdateMG2vs2(SeqWork *work) static s32 SeqUpdateMG2vs2(SeqWork *work)
{ {
s16 idx; s16 idx;
float scale; float scale;
@ -2036,7 +2036,7 @@ static int SeqUpdateMG2vs2(SeqWork *work)
return 1; return 1;
} }
static int SeqInitFlip(SeqWork *work, va_list params) static s32 SeqInitFlip(SeqWork *work, va_list params)
{ {
s16 i; s16 i;
s16 word_grp; s16 word_grp;
@ -2117,7 +2117,7 @@ static int SeqInitFlip(SeqWork *work, va_list params)
return 1; return 1;
} }
static int SeqUpdateFlip(SeqWork *work) static s32 SeqUpdateFlip(SeqWork *work)
{ {
s16 idx; s16 idx;
float scale; float scale;
@ -2285,7 +2285,7 @@ static int SeqUpdateFlip(SeqWork *work)
return 1; return 1;
} }
static int SeqUpdateMGBowser(SeqWork *work) static s32 SeqUpdateMGBowser(SeqWork *work)
{ {
s16 idx; s16 idx;
float scale; float scale;
@ -2500,7 +2500,7 @@ static int SeqUpdateMGBowser(SeqWork *work)
return 1; return 1;
} }
static int SeqInitDraw(SeqWork *work, va_list params) static s32 SeqInitDraw(SeqWork *work, va_list params)
{ {
s16 word_grp; s16 word_grp;
work->state = 2; work->state = 2;
@ -2529,7 +2529,7 @@ static int SeqInitDraw(SeqWork *work, va_list params)
return 1; return 1;
} }
static int SeqUpdateDraw(SeqWork *work) static s32 SeqUpdateDraw(SeqWork *work)
{ {
s16 idx; s16 idx;
float scale; float scale;
@ -2700,9 +2700,9 @@ static s16 winnerNameW[8];
#define GET_WIN_KANAF() ((seqLanguage == 0) ? 1 : 0) #define GET_WIN_KANAF() ((seqLanguage == 0) ? 1 : 0)
static int SeqInitWin(SeqWork *work, va_list params) static s32 SeqInitWin(SeqWork *work, va_list params)
{ {
s32 win_type = va_arg(params, int); int win_type = va_arg(params, int);
s16 word_idx; s16 word_idx;
s16 word_grp; s16 word_grp;
s32 i; s32 i;
@ -2731,7 +2731,7 @@ static int SeqInitWin(SeqWork *work, va_list params)
num_winners = 0; num_winners = 0;
work->win_scale = 1.0f; work->win_scale = 1.0f;
for(j=0; j<4; j++) { for(j=0; j<4; j++) {
s32 winner = va_arg(params, int); int winner = va_arg(params, int);
if(winner < 0) { if(winner < 0) {
continue; continue;
} }
@ -2825,7 +2825,7 @@ static int SeqInitWin(SeqWork *work, va_list params)
} }
static int SeqUpdateWin(SeqWork *work) static s32 SeqUpdateWin(SeqWork *work)
{ {
s32 idx; s32 idx;
float tp_lvl; float tp_lvl;
@ -2948,7 +2948,7 @@ static int SeqUpdateWin(SeqWork *work)
return 1; return 1;
} }
static int SeqInitRecord(SeqWork *work, va_list params) static s32 SeqInitRecord(SeqWork *work, va_list params)
{ {
AnimData *spr_data; AnimData *spr_data;
s16 spr_grp; s16 spr_grp;
@ -3063,7 +3063,7 @@ static int SeqInitRecord(SeqWork *work, va_list params)
return 1; return 1;
} }
static int SeqUpdateRecord(SeqWork *work) static s32 SeqUpdateRecord(SeqWork *work)
{ {
s16 group; s16 group;
if(_CheckFlag(0x1000C)) { if(_CheckFlag(0x1000C)) {