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

Matched game/board/lottery + some unsplit cleanup

Browse source
This commit is contained in:
mrshigure 2024-02-28 06:16:45 -08:00
parent 1da8985530
commit 08e6ce1a45
25 changed files with 2080 additions and 95 deletions
Download patch file Download diff file Expand all files Collapse all files

18
include/board_unsplit.h
View file

@ -14,26 +14,12 @@ typedef void (*BoardLightHook)(void);
s32 BoardSpacePosGet(s32, s32, Vec*);
void BoardShopTutorialExec(s32);
void BoardLotteryTutorialExec(void);
void BoardMGSetupTutorialExec(void);
void BoardBooHouseTutorialExec(void);
void BoardCharWheelSetTarget(s32);
void BoardSpaceStarSetIndex(s32);
s32 BoardModelRotYSet(s16, f32);
f32 BoardModelRotYGet(s16);
s32 BoardModelLayerSet(s16, u8);
s16 BoardModelIDGet(s16);
s32 BoardModelScaleSetV(s16, Vec*);
void BoardLightHookSet(BoardLightHook set, BoardLightHook reset);
s16 BoardModelCreate(s32, s32*, s32);
void BoardModelKill(s16);
s32 fn_8006DDE8(s16, f32);
s32 BoardModelMotionStart(s16, s32, u32);
s32 BoardModelMotionSpeedSet(s16, f32);
s32 BoardModelPosSetV(s16, Vec*);
s32 BoardModelPosSet(s16, f32, f32, f32);
s32 BoardModelRotSetV(s16 arg0, Vec* arg1);
s32 BoardModelVisibilitySet(s16, s32);
void BoardSpaceWalkEventFuncSet(BoardSpaceEventFunc func);
void BoardSpaceWalkMiniEventFuncSet(BoardSpaceEventFunc func);
void BoardSpaceLandEventFuncSet(BoardSpaceEventFunc func);
@ -41,13 +27,9 @@ s32 BoardSpaceFlagSearch(s32, u32);
void BoardSpaceInit(s32);
void BoardSpaceDestroy(void);
void BoardShopHostSet(s16);
void BoardLotteryHostSet(s16);
void BoardBooHouseHostSet(s16);
s32 BoardCameraRotGet(Vec*);
s32 BoardModelScaleSet(s16, f32, f32, f32);
s32 BoardIsKill(void);
void BoardModelMtxSet(s16, Mtx*);
s32 BoardModelRotSet(s16, f32, f32, f32);
void BoardBowserExec(s32 player, s32 space);
void BoardBattleExec(s32 player, s32 space);

2
include/game/audio.h
View file

@ -20,7 +20,7 @@ void HuAudFXFadeOut(s32 arg0, s32 arg1);
void HuAudFXPanning(s32 arg0, s16 arg1);
void HuAudFXListnerSet(Vec* arg0, Vec* arg1, float arg2, float arg3);
void HuAudFXListnerSetEX(Vec* arg0, Vec* arg1, float sndDist, float sndSpeed, float arg4, float arg5, float arg6);
void HuAudFXListnerUpdate(s32 arg0, s32 arg1);
void HuAudFXListnerUpdate(Vec *arg0, Vec *arg1);
s32 HuAudFXEmiterPlay(s32 arg0, Vec *arg1);
void HuAudFXEmiterUpDate(s32 arg0, Vec *arg1);
void HuAudFXListnerKill(void);

13
include/game/board/lottery.h Executable file
View file

@ -0,0 +1,13 @@
#ifndef _BOARD_LOTTERY_H
#define _BOARD_LOTTERY_H
#include "dolphin/types.h"
void BoardLotteryHostSet(s16 arg0);
s16 BoardLotteryHostGet(void);
void BoardLotteryExec(void);
void BoardLotteryInit(void);
void BoardLotteryKill(void);
void BoardLotteryTutorialExec(void);
#endif

7
include/game/board/model.h
View file

@ -1,5 +1,5 @@
#ifndef _BOARD_WARP_H
#define _BOARD_WARP_H
#ifndef _BOARD_MODEL_H
#define _BOARD_MODEL_H
#include "game/hsfman.h"
#include "game/data.h"
@ -40,13 +40,16 @@ s32 BoardModelMotionStartEndSet(s16 model, s16 start, s16 end);
s32 BoardModelMotionStart(s16 model, s32 slot, u32 attr);
s32 BoardModelMotionShiftSet(s16 model, s32 motion, float time, float shift_time, u32 attr);
s32 BoardModelAttrSet(s16 model, u32 attr);
s32 BoardModelAttrReset(s16 model, u32 attr);
s32 BoardModelMotionTimeSet(s16 model, float time);
float BoardModelMotionTimeGet(s16 model);
float BoardModelMotionMaxTimeGet(s16 model);
s32 BoardModelMotionSpeedSet(s16 model, float speed);
s32 BoardModelMotionEndCheck(s16 model);
s32 BoardModelAlphaSet(s16 model, u8 alpha);
s32 BoardModelMtxSet(s16 model, Mtx *src);
s32 BoardModelRotYSet(s16 model, float rot);
float BoardModelRotYGet(s16 model);
s32 BoardModelPosSet(s16 model, float x, float y, float z);
s32 BoardModelPosSetV(s16 model, Vec *pos);
s32 BoardModelRotSet(s16 model, float x, float y, float z);

1
include/game/gamework_data.h
View file

@ -58,6 +58,7 @@ typedef struct player_state {
u16 character : 4;
u16 auto_size : 2;
u16 field00_bit9 : 1;
u16 field00_bitA : 6;
};
/* 0x02 */ struct {
u8 team : 1;

2
include/game/msm.h
View file

@ -69,7 +69,7 @@ void msmMusStopAll(s32 arg0, s32 arg1);
void msmMusStop(s32 arg0, s32 arg1);
s32 msmMusPlay(s32 arg0, UnkMsmStruct_03 *arg1);
void msmSeDelListener(void);
void msmSeUpdataListener(s32 arg0, s32 arg1);
void msmSeUpdataListener(Vec *arg0, Vec *arg1);
void msmSeSetListener(Vec* arg0, Vec* arg1, float arg2, float arg3, UnkMsmStruct_02 *arg4);
s32 msmSeGetEntryID(s32 arg0, void *arg1);
s32 msmSeGetNumPlay(s32 arg0);