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

Merge branch 'Rainchus:main' into main

Browse source
This commit is contained in:
CreateSource 2024-03-08 19:27:23 -05:00 • committed by GitHub
commit fe2ac08e57
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
20 changed files with 1964 additions and 773 deletions
Download patch file Download diff file Expand all files Collapse all files

8
include/game/board/battle.h Executable file
View file

@ -0,0 +1,8 @@
#ifndef _BOARD_BATTLE_H
#define _BOARD_BATTLE_H
#include "dolphin/types.h"
void BoardBattleExec(s32 player, s32 space);
#endif

2
include/game/board/com.h
View file

@ -10,7 +10,7 @@ void BoardComKeySetDown(void);
s8 BoardComPreferItemGet(s32 arg0, s8 *arg1, s8 arg2);
s8 BoardComPreferItemCheck(s32 arg0, s8 arg1, s8 arg2, s8 arg3);
s32 BoardComItemWeightGet(s32 arg0, s32 arg1);
s32 BoardComTutorialItemGet(s32 arg0);
s32 BoardComUseItemSlotGet(s32 arg0);
s32 BoardComUseItemSet(s32 arg0, s32 arg1);
BOOL BoardComUseItemCheck(s32 arg0);
s32 BoardComJunctionInputGet(s32 arg0, Vec *arg1, s32 arg2, float *arg3);

8
include/game/board/com_path.h
View file

@ -3,9 +3,9 @@
#include "dolphin/types.h"
s16 BoardComPathReachCheck(s16 arg0, u32 arg1, s32 arg2);
s16 BoardComPathBestGet(s16 arg0);
s16 BoardComPathLenGet(s16 arg0, s16 arg1);
s16 BoardComPathW20BestGet(s16 arg0, u32 arg1, s16 arg2);
s16 BoardComPathShortcutLenGet(s16 space, u32 type, s32 block_pipe);
s16 BoardComPathBestGet(s16 space);
s16 BoardComPathLenGet(s16 space, s16 space_other);
s16 BoardComPathBestGetFlag(s16 space, u32 flag, s16 len);
#endif

14
include/game/gamework_data.h
View file

@ -180,14 +180,28 @@ static inline s32 GWMGShowComGet(void)
static inline s32 GWMGListGet(void)
{
if (GWSystem.mg_list == 3) {
GWSystem.mg_list = 0;
}
return GWSystem.mg_list;
}
static inline s32 GWMessSpeedGet(void)
{
if (GWSystem.mess_speed == 3) {
GWSystem.mess_speed = 1;
}
return GWSystem.mess_speed;
}
static inline s32 GWSaveModeGet(void)
{
if (GWSystem.save_mode == 3) {
GWSystem.save_mode = 1;
}
return GWSystem.save_mode;
}
static inline s32 GWTurnGet(void)
{
return GWSystem.turn;