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

Merge branch 'main' of https://github.com/abnormalhare/marioparty4

Browse source
This commit is contained in:
CreateSource 2024-07-16 23:00:52 -04:00
commit a733d96000
62 changed files with 778 additions and 615 deletions
Download patch file Download diff file Expand all files Collapse all files

10
include/game/board/main.h
View file

@ -6,6 +6,16 @@
#include "game/data.h"
#include "dolphin.h"
#define BOARD_ID_MAIN1 0 //TOADS_MIDWAY_MADNESS
#define BOARD_ID_MAIN2 1 //GOOMBAS_GREEDY_GALA
#define BOARD_ID_MAIN3 2 //SHY_GUYS_JUNGLE_JAM
#define BOARD_ID_MAIN4 3 //BOOS_HAUNTED_BASH
#define BOARD_ID_MAIN5 4 //KOOPAS_SEASIDE_SOIREE
#define BOARD_ID_MAIN6 5 //BOWSERS_GNARLY_PARTY
#define BOARD_ID_TUTORIAL 6 //TUTORIAL_BOARD
#define BOARD_ID_EXTRA1 7 //MEGA_BOARD_MAYHEM
#define BOARD_ID_EXTRA2 8 //MINI_BOARD_MAD_DASH
#define BOARD_FABS(value) ((value < 0) ? -(value) : (value))
typedef struct board_focus_data {

2
include/game/chrman.h
View file

@ -44,4 +44,6 @@ s32 CharModelEffectNpcInit(s16 arg0, s16 arg1, s16 arg2, s16 arg3);
s32 CharModelEffectNpcInitSilent(s16 arg0, s16 arg1, s16 arg2);
void CharModelStepTypeSet(s16 character, s32 arg1);
#define GW_CHARACTER_MAX 8
#endif

2
include/game/data.h
View file

@ -12,7 +12,7 @@
#define DATA_DECODE_FSLIDE 4
#define DATA_DECODE_RLE 5
#define DATA_NUM_LISTEND -1
#define DATA_NUM_LISTEND -1U
#include "dolphin/types.h"

2
include/game/gamework.h
View file

@ -3,6 +3,8 @@
#include "dolphin.h"
#define GW_PLAYER_MAX 4
void GWInit(void);
void GWGameStatReset(void);
s32 GWMessSpeedGet(void);

2
include/game/gamework_data.h
View file

@ -311,7 +311,7 @@ static inline s16 GWPlayerCoinWinGet(s32 player)
static inline void GWPlayerCoinWinSet(s32 player, s16 value)
{
if (_CheckFlag(0x1000C) == 0) {
if (_CheckFlag(FLAG_ID_MAKE(1, 12)) == 0) {
GWPlayer[player].coin_win = value;
}
}