Merge branch 'main' into main

include/game/board/basic_space.h

@@ -3,8 +3,8 @@
 
 #include "dolphin.h"
 
-void BoardEventLandBlue(s32, s16);
-void BoardEventLandRed(s32, s16);
+void BoardEventLandBlue(s32, s32);
+void BoardEventLandRed(s32, s32);
 s8 BoardCoinChgCreate(Vec*, s8);
 s32 BoardCoinChgExist(s32);
 void BoardCoinChgHide(s32);

include/game/board/main.h

@@ -58,8 +58,7 @@ static inline s32 BoardCurrGet()
 
 static inline s32 BoardPartyFlagGet()
 {
-	s32 value = GWSystem.party;
-	return value;
+	return GWSystem.party;
 }
 
 extern BoardCameraData boardCamera;
@@ -73,17 +72,27 @@ typedef void (*BoardFunc)(void);
 typedef void (*BoardLightHook)(void);
 typedef void (*BoardCameraPosCalcFunc)(BoardCameraData *camera);
 
+typedef void (*BoardTurnStartHook)(s32 player, s32 space);
+
+extern BoardTurnStartHook boardTurnStartFunc;
+extern BoardFunc boardTurnFunc;
+extern BoardLightHook boardLightResetHook;
+extern BoardLightHook boardLightSetHook;
+
 void BoardCommonInit(BoardFunc create, BoardFunc destroy);
 void BoardKill(void);
 s32 BoardIsKill(void);
-void BoardPauseEnableSet(s32 value);
-s32 BoardPauseEnableGet();
+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);
-BOOL BoardTurnNext(void);
+s32 BoardTurnNext(void);
 void BoardNextOvlSet(OverlayID overlay);
 s32 BoardStartCheck(void);
+void BoardLightHookSet(BoardLightHook set, BoardLightHook reset);
+void BoardLightSetExec(void);
+void BoardLightResetExec(void);
 void BoardCameraBackup(void);
 void BoardCameraRestore(void);
 void BoardCameraScissorSet(s32 x, s32 y, s32 w, s32 h);
@@ -117,6 +126,14 @@ s32 BoardCameraCullCheck(Vec *point, float radius);
 s32 BoardCameraMotionIsDone(void);
 void BoardCameraMotionWait(void);
 void BoardCameraInit(void);
+void BoardMGDoneFlagSet(s32 flag);
+s32 BoardMGDoneFlagGet();
+void BoardMGExit(void);
+void BoardMGCreate(s32 arg0);
+void BoardEventFlagSet(void);
+void BoardEventFlagReset(void);
+s32 BoardEventFlagGet(void);
+void BoardMTXCalcLookAt(Mtx dest, Vec *eye, Vec *up, Vec *target);
 float BoardArcSin(float value);
 float BoardArcCos(float value);
 void BoardRandInit(void);
@@ -125,7 +142,21 @@ u32 BoardRandMod(u32 value);
 float BoardRandFloat(void);
 float BoardVecDistXZCalc(Vec *vec1, Vec *vec2);
 s32 BoardVecMaxDistXZCheck(Vec *vec1, Vec *vec2, float max_dist);
+void BoardDAngleCalcVec(Vec *vec1);
+float BoardDAngleCalc(float value);
+s32 BoardDAngleCalcRange(float *value, float min, float range);
 s32 BoardVecMinDistCheck(Vec *vec1, Vec *vec2, float min_dist);
+void BoardFilterFadeOut(s16 len);
+void BoardFilterFadeInit(s16 len, u8 max_alpha);
+s32 BoardFilterFadePauseCheck(void);
+s32 BoardFilterFadeCheck(void);
+void BoardConfettiCreate(Vec *pos, s16 count, float range);
+void BoardConfettiKill(void);
+void BoardConfettiStop(void);
+void BoardLast5GfxInit(void);
+void BoardLast5GfxShowSet(s32 show);
+void BoardTauntInit(void);
+void BoardTauntKill(void);
 s32 BoardDataDirReadAsync(s32 data_num);
 void BoardDataAsyncWait(s32 status);
 

include/game/board/model.h

@@ -0,0 +1,58 @@
+#ifndef _BOARD_WARP_H
+#define _BOARD_WARP_H
+
+#include "game/hsfman.h"
+#include "game/data.h"
+
+typedef struct board_model_param {
+	s32 data_num;
+	struct {
+		u8 field04_bit0 : 2;
+		u8 visible : 1;
+		u8 link : 1;
+		u8 start_mot : 1;
+		u8 pause : 1;
+	};
+	s16 unk6;
+} BoardModelParam;
+
+void BoardModelInit(void);
+void BoardModelKillAll(void);
+void BoardModelDummyUpdate(void);
+void BoardModelVisibilityUpdate(void);
+void BoardModelHideSetAll(s32 flag);
+void BoardModelAmbSetAll(float r, float g, float b);
+void BoardModelCameraSetAll(u16 camera);
+s16 BoardModelCreate(s32 data_num, s32 *mot_list, s32 link);
+s16 BoardModelCreateCharacter(s32 character, s32 data_num, s32 *mot_list, s32 link);
+s16 BoardModelCreateParam(BoardModelParam *param, Vec *pos, Vec *rot);
+void BoardModelKill(s16 model);
+s16 BoardModelIDGet(s16 model);
+s32 fn_8006DC1C(s16 model, s32 arg1);
+s32 BoardModelPassSet(s16 model, s32 pass);
+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 BoardModelMotionStart(s16 model, s32 slot, u32 attr);
+s32 BoardModelMotionSpeedSet(s16 model, float speed);
+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);
+s32 BoardModelRotSetV(s16 model, Vec *rot);
+s32 BoardModelScaleSet(s16 model, float x, float y, float z);
+s32 BoardModelScaleSetV(s16 model, Vec *scale);
+s32 BoardModelPosGet(s16 model, Vec *dst);
+s32 BoardModelRotGet(s16 model, Vec *dst);
+s32 BoardModelScaleGet(s16 model, Vec *dst);
+s32 BoardModelVisibilitySet(s16 model, s32 flag);
+s32 BoardModelVisibilityGet(s16 model);
+s32 BoardModelCameraSet(s16 model, u16 camera);
+s32 BoardModelLayerSet(s16 model, u8 layer);
+s32 BoardModelLayerGet(s16 model);
+void BoardModelLayerSetAll(s32 layer);
+s32 BoardModelHookSet(s16 model, char *name, s16 hook);
+s32 BoardModelHookReset(s16 model);
+s32 BoardModelHookObjReset(s16 model, char *name);
+
+#endif

include/game/board/player.h

@@ -113,10 +113,15 @@ void BoardDiceDigit2DUpdateEnable(s32);
 void BoardPlayerMoveTo(s32, s16);
 void BoardPlayerZoomRestore(s32);
 void BoardRotateDiceNumbers(s32);
-s32 DoDebugMove(s32, s16*);
 s32 DoSparkSpace(s32, s16*);
-s32 ExecJunction(s32, s16*);
 s32 MegaPlayerPassFunc(s32, s16);
 s32 BoardPlayerAnimBlendCheck(s32);
+void BoardPlayerCoinsSet(s32 player, s32 value);
+s32 BoardPlayerSizeGet(s32 player);
+void BoardPlayerAutoSizeSet(s32 player, s32 value);
+void BoardPlayerMotionStart(s32, s32, s32);
+void BoardPlayerMotionShiftSet(s32 player, s32 arg1, float start, float end, u32 attr);
+void BoardPlayerRotYSet(s32 player, float rot_y);
+void BoardPlayerZoomRestore(s32 player);
 
 #endif

include/game/board/space.h

@@ -5,7 +5,10 @@
 
 #define BOARD_SPACE_LINKMAX 4
 
+#ifndef _BOARD_SPACE_EVENT_FUNC
+#define _BOARD_SPACE_EVENT_FUNC
 typedef s32 (*BoardSpaceEventFunc)(void);
+#endif
 
 typedef struct board_space {
 	Vec pos;
@@ -22,8 +25,7 @@ void BoardSpaceWalkMiniEventFuncSet(BoardSpaceEventFunc func);
 void BoardSpaceLandEventFuncSet(BoardSpaceEventFunc func);
 s32 BoardSpaceWalkEventExec(void);
 s32 BoardSpaceWalkMiniEventExec(void);
-s16 BoardSpaceCountGet(s32 layer);
-s16 BoardSpaceCountGet(s32 layer);
+s32 BoardSpaceCountGet(s32 layer);
 BoardSpace *BoardSpaceGet(s32 layer, s32 index);
 void BoardSpaceAttrSet(s32 layer, u32 attr);
 void BoardSpaceAttrReset(s32 layer, u32 attr);
@@ -32,6 +34,7 @@ s32 BoardSpaceTypeGet(s32 layer, s32 index);
 void BoardSpaceTypeSet(s32 layer, s32 index, s32 type);
 s32 BoardSpacePosGet(s32 layer, s32 index, Vec *pos);
 void BoardSpaceCornerPosGet(s32 index, s32 corner, Vec *pos);
+s32 BoardSpaceRotGet(s32 layer, s32 index, Vec *rot);
 s32 BoardSpaceFlagSearch(s32 layer, u32 flag);
 s32 BoardSpaceFlagPosGet(s32 layer, u32 flag, Vec *pos);
 s32 BoardSpaceLinkFlagSearch(s32 layer, s32 index, u32 flag);
@@ -39,7 +42,7 @@ s32 BoardSpaceLinkTypeListGet(s32 layer, s32 index, s32 type, s16 *list);
 s32 BoardSpaceLinkTargetListGet(s32 layer, s32 target, s16 *list);
 s32 BoardSpaceLinkTypeSearch(s32 layer, s32 target, u16 type);
 s32 BoardSpaceLinkTransformGet(s32 flag, Vec *pos, Vec *rot, Vec *scale);
-void BoardSpaceStarSet(s32 space);
+void BoardSpaceHostSet(s32 space);
 void BoardSpaceStarSetIndex(s32 index);
 s32 BoardSpaceStarGetNext(void);
 s32 BoardSpaceStarGetRandom(s32 excl_pos);
@@ -48,5 +51,6 @@ s32 BoardSpaceStarGet(s32 index);
 s32 BoardSpaceStarGetCurr(void);
 s32 BoardSpaceStarCheck(s32 index);
 void BoardSpaceLandExec(s32 player, s32 space);
+void BoardSpaceBlockPosSet(void);
 
 #endif

include/game/board/warp.h

@@ -4,6 +4,6 @@
 #include "game/process.h"
 #include "game/wipe.h"
 
-void BoardWarpExec(s32 player, s16 space);
+void BoardWarpExec(s32 player, s32 space);
 
 #endif

include/game/board/window.h

@@ -17,8 +17,8 @@ void BoardWinCreate(s32 pos, u32 mess, s32 portrait);
 void BoardWinInsertMesSet(u32 value, s32 index);
 void BoardWinWait(void);
 void BoardWinKill(void);
-void BoardWinSetAttr(s32 attr);
-void BoardWinResetAttr(s32 attr);
+void BoardWinAttrSet(s32 attr);
+void BoardWinAttrReset(s32 attr);
 void BoardWinChoiceDisable(s32 choice);
 void BoardWinKeyWait(void);
 int BoardWinSpeedGet(void);