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

Change int to s32

Browse source
This commit is contained in:
gamemasterplc 2024-05-10 20:33:37 -05:00
parent 206fb7d931
commit ec5f686ffb
20 changed files with 172 additions and 175 deletions
Download patch file Download diff file Expand all files Collapse all files

4
include/REL/board_executor.h
View file

@ -5,7 +5,9 @@
extern "C" {
#endif
extern int _prolog();
#include "dolphin/types.h"
extern s32 _prolog();
extern void _epilog();
typedef void (*VoidFunc)(void);

4
include/REL/executor.h
View file

@ -5,7 +5,9 @@
extern "C" {
#endif
extern int _prolog();
#include "dolphin/types.h"
extern s32 _prolog();
extern void _epilog();
typedef void (*VoidFunc)(void);

4
include/game/data.h
View file

@ -30,7 +30,7 @@ typedef struct data_read_stat {
} DataReadStat;
void HuDataInit(void);
int HuDataReadChk(s32 data_num);
s32 HuDataReadChk(s32 data_num);
DataReadStat *HuDataGetStatus(void *dir_ptr);
void *HuDataGetDirPtr(s32 data_num);
DataReadStat *HuDataDirRead(s32 data_num);
@ -52,7 +52,7 @@ void HuDataDirClose(s32 data_id);
void HuDataDirCloseNum(s32 num);
void *HuDataReadNumHeapShortForce(s32 data_id, s32 num, HeapID heap);
void HuDecodeData(void *src, void *dst, u32 size, int decode_type);
void HuDecodeData(void *src, void *dst, u32 size, s32 decode_type);
extern u32 DirDataSize;

48
include/game/gamework.h
View file

@ -7,30 +7,30 @@ void GWInit(void);
void GWGameStatReset(void);
s32 GWMessSpeedGet(void);
s32 GWMessDelayGet(void);
void GWMGRecordSet(int index, s32 value);
s32 GWMGRecordGet(int index);
void GWCharColorGet(int character, GXColor *color);
void GWBoardPlayCountSet(int board, u8 value);
void GWBoardPlayCountAdd(int board, u8 value);
u8 GWBoardPlayCountGet(int board);
void GWBoardMaxStarsSet(int board, int value);
u16 GWBoardMaxStarsGet(int board);
void GWBoardMaxCoinsSet(int board, int value);
u16 GWBoardMaxCoinsGet(int board);
int GWBoardWinCountInc(int character, int board);
int GWBoardWinCountGet(int character, int board);
void GWBoardWinCountSet(int character, int board, int value);
int GWMGAvailGet(int id);
int GWMGAvailSet(int id);
int GWMGCustomGet(int id);
int GWMGCustomSet(int id);
int GWMGCustomReset(int id);
s16 GWCoinsGet(int player);
void GWCoinsSet(int player, s16 value);
void GWCoinsAdd(int player, s16 amount);
void GWStarsSet(int player, s16 value);
void GWStarsAdd(int player, s16 amount);
s32 GWStarsGet(int player);
void GWMGRecordSet(s32 index, s32 value);
s32 GWMGRecordGet(s32 index);
void GWCharColorGet(s32 character, GXColor *color);
void GWBoardPlayCountSet(s32 board, u8 value);
void GWBoardPlayCountAdd(s32 board, u8 value);
u8 GWBoardPlayCountGet(s32 board);
void GWBoardMaxStarsSet(s32 board, s32 value);
u16 GWBoardMaxStarsGet(s32 board);
void GWBoardMaxCoinsSet(s32 board, s32 value);
u16 GWBoardMaxCoinsGet(s32 board);
s32 GWBoardWinCountInc(s32 character, s32 board);
s32 GWBoardWinCountGet(s32 character, s32 board);
void GWBoardWinCountSet(s32 character, s32 board, s32 value);
s32 GWMGAvailGet(s32 id);
s32 GWMGAvailSet(s32 id);
s32 GWMGCustomGet(s32 id);
s32 GWMGCustomSet(s32 id);
s32 GWMGCustomReset(s32 id);
s16 GWCoinsGet(s32 player);
void GWCoinsSet(s32 player, s16 value);
void GWCoinsAdd(s32 player, s16 amount);
void GWStarsSet(s32 player, s16 value);
void GWStarsAdd(s32 player, s16 amount);
s32 GWStarsGet(s32 player);
void GWTotalStarsSet(s16 value);
void GWTotalStarsAdd(s16 amount);
u16 GWTotalStarsGet(void);

4
include/game/jmp.h
View file

@ -13,7 +13,7 @@ typedef struct jump_buf {
double flt_regs[19];
} jmp_buf;
int gcsetjmp(jmp_buf *jump);
int gclongjmp(jmp_buf *jump, int status);
s32 gcsetjmp(jmp_buf *jump);
s32 gclongjmp(jmp_buf *jump, s32 status);
#endif

26
include/game/object.h
View file

@ -32,8 +32,8 @@ typedef void (*omObjFunc)(struct om_obj_data *);
typedef struct om_ovl_his_data {
OverlayID overlay;
int event;
int stat;
s32 event;
s32 stat;
} omOvlHisData;
typedef struct om_obj_data {
@ -65,14 +65,14 @@ typedef struct om_dll_data {
s32 ret;
} omDllData;
void omMasterInit(int prio, FileListEntry *ovl_list, int ovl_count, OverlayID start_ovl);
void omOvlCallEx(OverlayID overlay, s16 arg2, int event, int stat);
void omOvlGotoEx(OverlayID overlay, s16 arg2, int event, int stat);
void omMasterInit(s32 prio, FileListEntry *ovl_list, s32 ovl_count, OverlayID start_ovl);
void omOvlCallEx(OverlayID overlay, s16 arg2, s32 event, s32 stat);
void omOvlGotoEx(OverlayID overlay, s16 arg2, s32 event, s32 stat);
void omOvlReturnEx(s16 level, s16 arg2);
void omOvlKill(s16 arg);
void omOvlHisChg(s32 level, OverlayID overlay, int event, int stat);
void omOvlHisChg(s32 level, OverlayID overlay, s32 event, s32 stat);
omOvlHisData *omOvlHisGet(s32 level);
Process *omInitObjMan(s16 max_objs, int prio);
Process *omInitObjMan(s16 max_objs, s32 prio);
void omDestroyObjMan(void);
omObjData *omAddObjEx(Process *objman_process, s16 prio, u16 mdlcnt, u16 mtncnt, s16 group, omObjFunc func);
void omAddMember(Process *objman_process, u16 group, omObjData *object);
@ -93,7 +93,7 @@ OverlayID omCurrentOvlGet(void);
void omDLLDBGOut(void);
void omDLLInit(FileListEntry *ovl_list);
int omDLLStart(s16 overlay, s16 flag);
s32 omDLLStart(s16 overlay, s16 flag);
void omDLLNumEnd(s16 overlay, s16 flag);
void omDLLEnd(s16 dllno, s16 flag);
omDllData *omDLLLink(omDllData **dll_ptr, s16 overlay, s16 flag);
@ -113,11 +113,11 @@ extern omObjData *omDBGSysKeyObj;
extern Process *omwatchproc;
extern OverlayID omnextovl;
extern OverlayID omcurovl;
extern int omcurdll;
extern int omovlhisidx;
extern int omovlevtno;
extern int omnextovlevtno;
extern int omovlstat;
extern s32 omcurdll;
extern s32 omovlhisidx;
extern s32 omovlevtno;
extern s32 omnextovlevtno;
extern s32 omovlstat;
extern char omUPauseFlag;
extern s16 omSysExitReq;
extern s16 omdispinfo;

12
include/game/process.h
View file

@ -20,7 +20,7 @@ typedef struct process {
u16 exec;
u16 stat;
u16 prio;
int sleep_time;
s32 sleep_time;
u32 base_sp;
jmp_buf jump;
void (*dtor)(void);
@ -35,19 +35,19 @@ void HuPrcChildUnlink(Process *process);
Process *HuPrcChildCreate(void (*func)(void), u16 prio, u32 stack_size, s32 extra_size, Process *parent);
void HuPrcChildWatch(void);
Process *HuPrcCurrentGet(void);
int HuPrcKill(Process *process);
s32 HuPrcKill(Process *process);
void HuPrcChildKill(Process *process);
void HuPrcSleep(int time);
void HuPrcSleep(s32 time);
void HuPrcVSleep();
void HuPrcWakeup(Process *process);
void HuPrcDestructorSet2(Process *process, void (*func)(void));
void HuPrcDestructorSet(void (*func)(void));
void HuPrcCall(int tick);
void HuPrcCall(s32 tick);
void *HuPrcMemAlloc(s32 size);
void HuPrcMemFree(void *ptr);
void HuPrcSetStat(Process *process, u16 value);
void HuPrcResetStat(Process *process, u16 value);
void HuPrcAllPause(int flag);
void HuPrcAllUPause(int flag);
void HuPrcAllPause(s32 flag);
void HuPrcAllUPause(s32 flag);
#endif