Merge branch 'Rainchus:main' into main

include/game/board/audio.h

@@ -0,0 +1,19 @@
+#ifndef _BOARD_AUDIO_H
+#define _BOARD_AUDIO_H
+
+#include "dolphin/types.h"
+
+void BoardMusStartBoard(void);
+void BoardMusStart(s32 arg0, s32 arg1, s8 arg2, u16 arg3);
+void BoardAudSeqFadeOutFast(s32 arg0);
+void BoardAudSeqFadeOut(s32 arg0, u16 arg1);
+void BoardMusLoudSet(s32 arg0, s32 arg1);
+void BoardMusVolPanSet(s32 arg0, s8 arg1, u16 arg2);
+void BoardAudSeqPause(s32 arg0, s32 arg1, u16 arg2);
+s32 BoardMusStatusGet(s32 arg0);
+void BoardAudSeqClear(void);
+void BoardAudSeqFadeOutAll(void);
+void BoardAudFXPlay(void);
+void BoardAudFXStop(void);
+
+#endif

include/game/board/boo.h

@@ -0,0 +1,18 @@
+#ifndef _BOARD_BOO_H
+#define _BOARD_BOO_H
+
+#include "dolphin.h"
+#include "game/object.h"
+
+s16 BoardBooCreate(s32 arg0, Vec *arg1);
+void BoardBooKill(void);
+s32 BoardBooStealTypeSet(s32 arg0);
+s32 BoardBooStealMain(void);
+BOOL CheckBallCoinDone(void);
+void TakeBallStar(void);
+void ExecTakeBallStar(omObjData *arg0);
+BOOL CheckTakeBallStarDone(void);
+s32 BoardBooStealValueGet(s16 *arg0, s16 *arg1);
+BOOL BoardBooStealLightCheck(void);
+
+#endif

include/game/board/com.h

@@ -0,0 +1,19 @@
+#ifndef _BOARD_COM_H
+#define _BOARD_COM_H
+
+#include "dolphin.h"
+
+void BoardComKeySetLeft(void);
+void BoardComKeySetRight(void);
+void BoardComKeySetUp(void);
+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 BoardComUseItemSet(s32 arg0, s32 arg1);
+BOOL BoardComUseItemCheck(s32 arg0);
+s32 BoardComJunctionInputGet(s32 arg0, Vec *arg1, s32 arg2, float *arg3);
+s32 BoardComBestPlayerFind(void);
+
+#endif

include/game/board/com_path.h

@@ -0,0 +1,11 @@
+#ifndef _BOARD_COM_PATH_H
+#define _BOARD_COM_PATH_H
+
+#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);
+
+#endif

include/game/board/item.h

@@ -0,0 +1,11 @@
+#ifndef _BOARD_ITEM_H
+#define _BOARD_ITEM_H
+
+#include "dolphin/types.h"
+
+void BoardItemStart(s32 arg0, s32 arg1);
+BOOL BoardItemDoneCheck(void);
+void BoardItemPlayerRestore(s32 arg0, s32 arg1);
+void BoardItemBagItemSet(s16 *arg0);
+
+#endif

include/game/board/main.h

@@ -77,6 +77,8 @@ typedef void (*BoardCameraPosCalcFunc)(BoardCameraData *camera);
 typedef void (*BoardTurnStartHook)(s32 player, s32 space);
 
 extern BoardTurnStartHook boardTurnStartFunc;
+extern void (*boardStarShowNextHook)(void);
+extern void (*boardStarGiveHook)(void);
 extern BoardFunc boardTurnFunc;
 extern BoardLightHook boardLightResetHook;
 extern BoardLightHook boardLightSetHook;
@@ -87,8 +89,8 @@ s32 BoardIsKill(void);
 void BoardPauseDisableSet(s32 value);
 s32 BoardPauseDisableGet();
 void BoardSaveInit(s32 board);
-void BoardStoryConfigSet(s32 mg_type, s32 diff_story);
-void BoardPartyConfigSet(s32 team, s32 bonus_star, s32 mg_type, s32 max_turn, s32 p1_handicap, s32 p2_handicap, s32 p3_handicap, s32 p4_handicap);
+void BoardStoryConfigSet(s32 mg_list, s32 diff_story);
+void BoardPartyConfigSet(s32 team, s32 bonus_star, s32 mg_list, s32 max_turn, s32 p1_handicap, s32 p2_handicap, s32 p3_handicap, s32 p4_handicap);
 s32 BoardTurnNext(void);
 void BoardNextOvlSet(OverlayID overlay);
 s32 BoardStartCheck(void);

include/game/board/model.h

@@ -34,8 +34,19 @@ s32 BoardModelAmbSet(s16 model, float r, float g, float b);
 s32 BoardModelExistCheck(s16 model, s32 arg1);
 s32 BoardModelExistDupe(s16 model, s32 arg1);
 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 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 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 BoardModelRotYSet(s16 model, float rot);
 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/pause.h

@@ -0,0 +1,10 @@
+#ifndef _BOARD_PAUSE_H
+#define _BOARD_PAUSE_H
+
+#include "dolphin/types.h"
+
+void BoardPauseStart(void);
+BOOL BoardPauseActiveCheck(void);
+BOOL BoardPauseReqCheck(void);
+
+#endif

include/game/board/player.h

@@ -139,6 +139,7 @@ void BoardPlayerAutoSizeSet(s32, s32);
 void BoardPlayerCopyMat(s32);
 void BoardBowserSuitKill(s32);
 void SetRollPlayerSize(s32);
+void BoardDiceDigit2DInit(s32, s32);
 void BoardDiceDigit2DUpdateEnable(s32);
 s32 DoSparkSpace(s32, s16*);
 s32 MegaPlayerPassFunc(s32, s16);

include/game/board/roll.h

@@ -0,0 +1,18 @@
+#ifndef _BOARD_ROLL_H
+#define _BOARD_ROLL_H
+
+#include "dolphin/types.h"
+
+s32 BoardRollExec(s32 arg0);
+void BoardRollKill(void);
+void BoardRollUPauseSet(s32 arg0);
+void BoardRollWinDispSet(s32 arg0);
+s16 BoardDiceEffectCreate(void);
+void BoardDicePauseAll(void);
+BOOL BoardDiceDoneCheck(void);
+void BoardDiceStop(s32 arg0);
+void BoardDiceVisibleSet(s32 arg0, s32 arg1);
+void BoardDiceValueSet(s32 arg0, s32 arg1);
+void BoardRollTutorialSet(s16 *arg0);
+
+#endif

include/game/board/space.h

@@ -53,4 +53,6 @@ s32 BoardSpaceStarCheck(s32 index);
 void BoardSpaceLandExec(s32 player, s32 space);
 void BoardSpaceBlockPosSet(void);
 
+extern s16 boardSpaceStarTbl[8];
+
 #endif

include/game/board/star.h

@@ -0,0 +1,14 @@
+#ifndef _BOARD_START_H
+#define _BOARD_START_H
+
+#include "game/board/space.h"
+
+#include "dolphin.h"
+
+void BoardStarHostSet(s16 arg0);
+s16 BoardStarHostMdlGet(void);
+void BoardStarExec(s32 arg0, BoardSpace *arg1);
+void BoardStarGive(s32 arg0, Vec *arg1);
+void BoardStarShowNext(s32 arg0);
+
+#endif

include/game/board/tutorial.h

@@ -0,0 +1,29 @@
+#ifndef _BOARD_TUTORIAL_H
+#define _BOARD_TUTORIAL_H
+
+#include "dolphin/types.h"
+
+void BoardTutorialInit(void);
+void BoardTutorialKill(void);
+void BoardTutorialHookSet(void *arg0);
+void BoardTutorialHookExec(s16 arg0, s32 arg1);
+void BoardTutorialPlayerInit(void);
+void BoardTutorialWorkSave(void);
+void BoardTutorialWorkRestore(void);
+void BoardTutorialDirInputSet(s8 arg0, s8 arg1, s16 arg2);
+void BoardTutorialBlockSetPos(s32 arg0, s8 arg1);
+void BoardTutorialItemSet(s8 arg0);
+void BoardTutorialHostSet(s16 arg0);
+void BoardTutorialHostHide(s8 arg0);
+
+extern s32 boardTutorialData[4];
+extern s8 boardTutorialDirInputX;
+extern s8 boardTutorialDirInputY;
+extern s16 boardTutorialDirInputTime;
+extern s32 boardTutorialBlockPos;
+extern s8 boardTutorialBlockItem;
+extern s8 boardTutorialBlockF;
+extern s8 boardTutorialUseItem;
+extern s8 boardTutorialF;
+
+#endif

include/game/board/ui.h

@@ -28,9 +28,12 @@ void BoardPickerBackFlagSet(s32 arg0);
 BOOL BoardPickerDoneCheck(void);
 s32 BoardPickerPosGet(Vec *arg0);
 s32 BoardPickerChoiceGet(void);
+void BoardYourTurnExec(s32 arg0);
 s32 BoardItemUseExec(s32 arg0);
 void BoardMakeRandomItem(void);
 void BoardItemGetDestPos(s32 arg0, Vec *arg1);
 void BoardItemStatusKill(s32 arg0);
 
+extern s8 boardItemUser;
+
 #endif

include/game/board/view.h

@@ -0,0 +1,15 @@
+#ifndef _BOARD_VIEW_H
+#define _BOARD_VIEW_H
+
+#include "dolphin.h"
+
+void BoardViewOverheadExec(s32 arg0);
+void BoardViewFocusGetPos(Vec *arg0);
+void BoardViewFocusSet(Vec *arg0, u16 arg1);
+void BoardViewMoveStart(Vec *arg0, Vec *arg1, u16 arg2);
+BOOL BoardViewMoveCheck(void);
+void BoardViewMoveEnd(void);
+void BoardViewWait(void);
+void BoardViewMapExec(s32 arg0);
+
+#endif

include/game/board/window.h

@@ -12,6 +12,7 @@ void BoardWinKillAll(void);
 void BoardWinDestroy(void);
 void BoardWinProc(void);
 int BoardWinChoiceGet(void);
+void BoardWinPause(void);
 void BoardWinCreateChoice(s32 pos, u32 mess, s32 portrait, s32 choice);
 void BoardWinCreate(s32 pos, u32 mess, s32 portrait);
 void BoardWinInsertMesSet(u32 value, s32 index);