Merge branch 'Rainchus:main' into main

include/board_unsplit.h

@@ -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);

include/game/audio.h

@@ -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);

include/game/board/lottery.h

@@ -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

include/game/board/model.h

@@ -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"
@@ -37,16 +37,21 @@ s32 fn_8006DDE8(s16 model, float arg1);
 s32 BoardModelMotionCreate(s16 model, s32 data_num);
 s32 BoardModelMotionKill(s16 model, s32 motion);
 s32 BoardModelMotionStartEndSet(s16 model, s16 start, s16 end);
+s32 BoardModelMotionUpdateSet(s16 model, s32 flag);
+s32 BoardModelVoiceEnableSet(s16 model, s32 motion, s32 flag);
 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);

include/game/board/player.h

@@ -82,7 +82,7 @@ void BoardPlayerScaleSetV(s32, Vec*);
 void BoardPlayerScaleSet(s32, f32, f32, f32);
 s16 BoardPlayerCurrMotionGet(s32);
 s32 BoardPlayerMotionCreate(s32, s32);
-void BoardPlayerMotionKill(s32, s32);
+s32 BoardPlayerMotionKill(s32, s32);
 s32 BoardPlayerMotionEndCheck(s32);
 void BoardPlayerMotionEndWait(s32);
 void BoardPlayerMotionStart(s32, s32, s32);
@@ -114,6 +114,7 @@ void BoardPlayerZoomRestore(s32);
 void BoardJunctionMaskSet(s32);
 void BoardJunctionMaskReset(s32);
 void BoardJunctionMaskZero(void);
+void BoardPlayerVoiceEnableSet(s32, s32, s32);
 void InitJunction(s32, s32, f32);
 static void UpdateJunctionGfx(omObjData*);
 static void StopJunctionPlayer(s32);

include/game/board/star.h

@@ -7,8 +7,10 @@
 
 void BoardStarHostSet(s16 arg0);
 s16 BoardStarHostMdlGet(void);
-void BoardStarExec(s32 arg0, BoardSpace *arg1);
+void BoardStarExec(s32 arg0, s32 arg1);
 void BoardStarGive(s32 arg0, Vec *arg1);
 void BoardStarShowNext(s32 arg0);
 
+extern s32 boardStarSndTbl[];
+
 #endif

include/game/gamework_data.h

@@ -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;

include/game/msm.h

@@ -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);