Matched game/board/lottery + some unsplit cleanup

config/GMPE01_00/symbols.txt

@@ -5212,9 +5212,9 @@ lbl_80139DA8 = .data:0x80139DA8; // type:object size:0xA data:string
 itemPrioTbl = .data:0x80139DB2; // type:object size:0x8C scope:local
 rankItemGroupTbl = .data:0x80139E3E; // type:object size:0x18 scope:local
 cursorPosTbl = .data:0x80139E58; // type:object size:0x30 scope:local data:float
-comInputDraw1 = .data:0x80139E88; // type:object size:0xEE scope:local
+comInputDraw1 = .data:0x80139E88; // type:object size:0xEE scope:local data:2byte
-comInputDraw2 = .data:0x80139F76; // type:object size:0xBA scope:local
+comInputDraw2 = .data:0x80139F76; // type:object size:0xBA scope:local data:2byte
-comInputBall = .data:0x8013A030; // type:object size:0xCE scope:local
+comInputBall = .data:0x8013A030; // type:object size:0xCE scope:local data:2byte
 lbl_8013A0FE = .data:0x8013A0FE; // type:object size:0xC data:string
 lbl_8013A10A = .data:0x8013A10A; // type:object size:0xA data:string
 lbl_8013A114 = .data:0x8013A114; // type:object size:0x9 data:string
@@ -5903,7 +5903,7 @@ lotterySpr = .sdata:0x801D3732; // type:object size:0x2 scope:local data:2byte
 lotteryInstWin = .sdata:0x801D3734; // type:object size:0x2 scope:local data:2byte
 gripMdl = .sdata:0x801D3736; // type:object size:0x4 scope:local data:2byte
 turnMot = .sdata:0x801D373A; // type:object size:0x2 scope:local data:2byte
-ballMdl = .sdata:0x801D373C; // type:object size:0x8 scope:local
+ballMdl = .sdata:0x801D373C; // type:object size:0x8 scope:local data:2byte
 loseMot = .sdata:0x801D3744; // type:object size:0x2 scope:local data:2byte
 ticketSprGrp = .sdata:0x801D3746; // type:object size:0x2 scope:local data:2byte
 warpSpringMdl = .sdata:0x801D3748; // type:object size:0x2 scope:local data:2byte

configure.py

@@ -368,7 +368,7 @@ config.libs = [
             Object(Matching, "game/board/view.c"),
             Object(NonMatching, "game/board/space.c"),
             Object(NonMatching, "game/board/shop.c"),
-            Object(NonMatching, "game/board/lottery.c"),
+            Object(Matching, "game/board/lottery.c"),
             Object(Matching, "game/board/basic_space.c"),
             Object(Matching, "game/board/warp.c"),
             Object(NonMatching, "game/board/char_wheel.c"),

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
+#ifndef _BOARD_MODEL_H
-#define _BOARD_WARP_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);

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

src/REL/w03Dll/main.c

@@ -1,9 +1,13 @@
 #include "dolphin.h"
 #include "REL/executor.h"
-#include "game/process.h"
+#include "game/audio.h"
 #include "game/data.h"
 #include "game/gamework_data.h"
+#include "game/process.h"
+#include "game/wipe.h"
 #include "REL/w03Dll.h"
+#include "game/board/lottery.h"
+#include "game/board/model.h"
 #include "game/board/space.h"
 #include "game/board/star.h"
 #include "game/object.h"
@@ -12,9 +16,6 @@
 #include "board_unsplit.h"
 #include "game/hsfman.h"
 
-s32 BoardModelPosSet(s16, f32, f32, f32);
-s32 BoardModelMotionStart(s16, s32, u32);
-
 void fn_8005B150(void*, void*);
 void fn_1_740(void);
 void fn_1_E0(void);
@@ -35,14 +36,6 @@ extern const VoidFunc _ctors[];
 extern const VoidFunc _dtors[];
 
 
-f32 BoardModelMotionTimeGet(s16);
-s16 BoardModelCreate(s32, s32*, s32);
-void BoardModelKill(s16);
-void BoardModelMotionStartEndSet(s16, s32, s32);
-void Hu3DFogSet(f32, f32, u8, u8, u8);
-void HuAudFXListnerSetEX(Vec* arg0, Vec* arg1, float sndDist, float sndSpeed, float arg4, float arg5, float arg6);
-u8 WipeStatGet(void);
-
 //DATA
 w03StructUnk0 lbl_1_data_0[] = {
 {{0.0f, 0.0f, 0.0f}, {0.0f, 0.0f, 0.0f}, {1.0f, 1.0f, 1.0f}, DATA_MAKE_NUM(DATADIR_W03, 0x0004)},
@@ -328,7 +321,7 @@ void fn_1_B5C(s32 arg0) {
     }
     BoardModelAttrSet(lbl_1_bss_C[0], 0x40000001);
     BoardModelMotionTimeSet(lbl_1_bss_C[0], var_f31);
-    BoardModelMotionStartEndSet(lbl_1_bss_C[0], (s32) var_f31, (s32) var_f28);
+    BoardModelMotionStartEndSet(lbl_1_bss_C[0], var_f31, var_f28);
 }
 
 void fn_1_CF4(void) {

src/REL/w03Dll/mg_coin.c

@@ -4,6 +4,7 @@
 #include "REL/w03Dll.h"
 #include "board_unsplit.h"
 #include "game/board/main.h"
+#include "game/board/model.h"
 #include "game/board/player.h"
 
 extern u16 HuPadBtnDown[4];
@@ -67,9 +68,6 @@ double cos(double x);
 double atan2(double y, double x);
 extern s16 MGSeqCreate(s32, ...);
 u8 MGSeqStatGet(s16);
-float BoardModelMotionTimeGet(s16 model);
-float BoardModelMotionMaxTimeGet(s16 model);
-s32 BoardModelMotionShiftSet(s16 model, s32 motion, float time, float shift_time, u32 attr);
 void Hu3DModelObjPosGet(s16 arg0, char *arg1, Vec *arg2);
 
 //DATA
@@ -206,7 +204,7 @@ s32 fn_1_7D18(s32 arg0) {
     BoardSpacePosGet(0, temp_r28, &sp38);
     PSVECSubtract(&sp38, &sp2C, &sp20);
     PSVECNormalize(&sp20, &sp20);
-    BoardPlayerRotYSet(arg0, 180.0 * (atan2(-sp20.x, -sp20.z) / 3.141592653589793));
+    BoardPlayerRotYSet(arg0, 180.0 * (atan2(-sp20.x, -sp20.z) / M_PI));
     HuPrcSleep(0x1E);
     model = BoardModelIDGet(lbl_1_bss_C[7]);
     Hu3DModelObjPosGet(model, phei_str, &sp38);
@@ -215,15 +213,15 @@ s32 fn_1_7D18(s32 arg0) {
     } else {
         var_f31 = 39.0f;
     }
-    sp38.x = sp38.x + (var_f31 * sin((3.141592653589793 * (180.0f + BoardModelRotYGet(lbl_1_data_456))) / 180.0));
+    sp38.x = sp38.x + (var_f31 * sin((M_PI * (180.0f + BoardModelRotYGet(lbl_1_data_456))) / 180.0));
-    sp38.z = sp38.z + (var_f31 * cos((3.141592653589793 * (180.0f + BoardModelRotYGet(lbl_1_data_456))) / 180.0));
+    sp38.z = sp38.z + (var_f31 * cos((M_PI * (180.0f + BoardModelRotYGet(lbl_1_data_456))) / 180.0));
     BoardPlayerPosGet(arg0, &sp2C);
     BoardPlayerPosLerpStart(arg0, &sp2C, &sp38, 0x14);
     while (GWPlayer[arg0].moving != 0) {
         BoardModelPosGet(lbl_1_bss_C[10], &sp2C);
         BoardPlayerPosGet(arg0, &sp38);
         PSVECSubtract(&sp38, &sp2C, &sp20);
-        arctan = atan2(sp20.x, sp20.z) / 3.141592653589793 * 180.0;
+        arctan = atan2(sp20.x, sp20.z) / M_PI * 180.0;
         BoardModelRotYSet(lbl_1_bss_C[10], arctan);
         HuPrcVSleep();
     }
@@ -482,7 +480,7 @@ void fn_1_8C08(omObjData* arg0, someBits3* arg1) {
         BoardPlayerMotionSpeedSet(arg1->unk00_bit5, 0.0f);
         BoardModelAttrSet(lbl_1_bss_C[7], 0x40000002);
         BoardModelAttrSet(lbl_1_data_456, 0x40000002);
-        arg1->unk00_bit1  = 2;
+        arg1->unk00_bit1 = 2;
         arg1->unk1 = 0x3C;
         arg1->unk2 = 0;
     }
@@ -549,7 +547,7 @@ void fn_1_9044(omObjData* arg0, someBits3* arg1) {
             }
         }
     }
-    sp8.z = arg0->trans.x * sin((3.141592653589793 *  arg0->trans.y) / 180.0);
+    sp8.z = arg0->trans.x * sin((M_PI * arg0->trans.y) / 180.0);
     BoardModelRotSetV(lbl_1_data_456, &sp8);
 }
 
@@ -580,7 +578,7 @@ void fn_1_9230(s32 arg0) {
         BoardModelPosGet(lbl_1_bss_C[10], &sp20);
         BoardPlayerPosGet(arg0, &sp14);
         PSVECSubtract(&sp14, &sp20, &sp8);
-        rotY = atan2(sp8.x, sp8.z) / 3.141592653589793 * 180.0;
+        rotY = atan2(sp8.x, sp8.z) / M_PI * 180.0;
         BoardModelRotYSet(lbl_1_bss_C[10], rotY);
         HuPrcVSleep();
     }
@@ -712,8 +710,8 @@ void fn_1_97F8(s32 arg0) {
         }
         temp_r31 = &temp_r30->unk_0C[i];
         temp_r31->unk0 = 1;
-        temp_r31->unk8.x = sp8.x + (50.0f * sin((3.141592653589793 * var_f31) / 180.0));
+        temp_r31->unk8.x = sp8.x + (50.0f * sin((M_PI * var_f31) / 180.0));
-        temp_r31->unk8.z = sp8.z + (50.0f * cos((3.141592653589793 * var_f31) / 180.0));
+        temp_r31->unk8.z = sp8.z + (50.0f * cos((M_PI * var_f31) / 180.0));
         temp_r31->unk8.y = 600.0f + sp8.y + (500.0f * BoardRandFloat());
         temp_r31->unk1 = 0;
         temp_r31->unk4 = BoardRandFloat() * 360.0f;

src/REL/w03Dll/mg_item.c

@@ -5,6 +5,7 @@
 #include "game/gamework_data.h"
 #include "REL/w03Dll.h"
 #include "game/board/main.h"
+#include "game/board/model.h"
 #include "game/board/space.h"
 #include "game/object.h"
 #include "game/objsub.h"
@@ -54,7 +55,7 @@ typedef struct w03UnkMG {
     /* 0x10 */ s16 unk_10;
     /* 0x12 */ s16 unk_12;
     /* 0x14 */ s16 unk_14;
-    /* 0x16  */ s16 unk_16;
+    /* 0x16 */ s16 unk_16;
 } w03UnkMG;
 
 //external symbols
@@ -64,23 +65,13 @@ extern Process *boardObjMan;
 extern u16 HuPadBtnDown[4];
 
 //function signatures
-s32 BoardModelMotionShiftSet(s16, s32, f32, f32, u32);
 s32 BoardVecDAngleCalcRange(float *value, float min, float range);
 void BoardCameraQuakeSet(s32 duration, float strength);
 s16 MGSeqCreate(s32, ...);
 u8 MGSeqStatGet(s16);
-f32 BoardPlayerRotYGet(s32);
-f32 BoardModelMotionTimeGet(s16);
 s32 BoardVecMinDistCheck(Vec *vec1, Vec *vec2, float min_dist);
-s32 BoardModelScaleGet(s16 model, Vec *dst);
-s32 BoardModelMotionTimeSet(s16 model, float time);
-s32 BoardDAngleCalcRange(float *value, float min, float range);
-u32 BoardRandMod(u32 value);
-void BoardModelMotionStartEndSet(s16, s32, s32);
 void Hu3DModelObjPosGet(s16 arg0, char *arg1, Vec *arg2);
-s32 BoardModelPosGet(s16 model, Vec *dst);
 s16 Hu3DMotionShiftIDGet(s16 arg0);
-f32 BoardPlayerMotionTimeGet(s32);
 s32 frand(void);
 
 void fn_1_BE30(s32 arg0, ParticleData* arg1);
@@ -654,7 +645,7 @@ void fn_1_B0A4(s32 arg0) {
     temp_r30->unk00_bit4 = arg0;
 
     for (i = 0; i < 3;) {
-        spC[i] =  BoardRandMod(14);
+        spC[i] = BoardRandMod(14);
         if ((spC[i] != 10) && (spC[i] != 13)) {
             for (j = 0; j < i; j++) {
                 if (spC[i] == spC[j]) {

src/REL/w03Dll/river.c

@@ -3,6 +3,7 @@
 #include "REL/w03Dll.h"
 #include "board_unsplit.h"
 #include "game/board/main.h"
+#include "game/board/model.h"
 #include "game/board/player.h"
 
 double sin(double x);
@@ -10,14 +11,8 @@ double cos(double x);
 double atan2(double y, double x);
 s16 BoardModelIDGet(s16 model);
 void Hu3DModelObjPosGet(s16 arg0, char *arg1, Vec *arg2);
-float BoardModelMotionTimeGet(s16 model);
-s32 BoardModelMotionShiftSet(s16 model, s32 motion, float time, float shift_time, u32 attr);
-void BoardPlayerPosSet(s32, f32, f32, f32);
-s32 BoardModelHookSet(s16 model, char *name, s16 hook);
 
 
-#define OM_GET_WORK_PTR(object, type) ((type *)(&((object)->work[0])))
-
 extern s16 lbl_1_bss_C[14];
 extern s16 boardPlayerMdl[4];
 
@@ -244,9 +239,7 @@ s32 fn_1_6898(s32 arg0) {
     return 1;
 }
 
-float BoardModelRotYGet(s16 model);
 s32 BoardDAngleCalcRange(float *value, float min, float range);
-float BoardModelRotYGet(s16 model);
 
 void fn_1_6B98(s32 arg0) {
     Vec sp30;

src/REL/w03Dll/smoke.c

@@ -3,6 +3,7 @@
 #include "REL/w03Dll.h"
 #include "board_unsplit.h"
 #include "game/board/main.h"
+#include "game/board/model.h"
 
 typedef struct w03UnkWorkStruct {
     s16 unk_00[5];
@@ -16,7 +17,6 @@ extern Process *boardObjMan;
 extern s16 lbl_1_data_1E0;
 
 void fn_1_79E0(omObjData* arg0);
-f32 BoardModelMotionMaxTimeGet(s16);
 
 char kemuri1[] = "kemuri1";
 char kemuri2[] = "kemuri2";

src/REL/w03Dll/statue.c

@@ -5,8 +5,9 @@
 #include "game/gamework_data.h"
 #include "REL/w03Dll.h"
 #include "game/audio.h"
-#include "game/board/space.h"
+#include "game/board/model.h"
 #include "game/board/player.h"
+#include "game/board/space.h"
 #include "game/board/ui.h"
 #include "board_unsplit.h"
 #include "game/hsfman.h"
@@ -26,12 +27,7 @@ void fn_1_2AC0(void);
 void fn_1_2818(void);
 void fn_1_2A40(void);
 void fn_1_2B44(void);
-s32 BoardDAngleCalcRange(f32*, f32, f32);
-s32 BoardPlayerMotBlendCheck(s32);
-f32 BoardPlayerRotYGet(s32);
-void BoardConfettiCreate(Point3d*, s16, f32);
 double atan2(double y, double x);
-f32 BoardModelMotionTimeGet(s16);
 
 //DATA
 s16 lbl_1_data_280 = -1;

src/REL/w10Dll/host.c

@@ -1,5 +1,6 @@
 #include "REL/w10Dll.h"
 #include "game/data.h"
+#include "game/board/model.h"
 #include "game/board/tutorial.h"
 #include "game/board/window.h"
 

src/REL/w10Dll/main.c

@@ -1,6 +1,8 @@
 #include "include/REL/w10Dll.h"
 #include "game/data.h"
 #include "game/hsfman.h"
+#include "game/board/lottery.h"
+#include "game/board/model.h"
 #include "game/board/star.h"
 #include "game/board/tutorial.h"
 

src/REL/w10Dll/scene.c

@@ -1,5 +1,7 @@
 #include "include/REL/w10Dll.h"
+#include "game/board/lottery.h"
 #include "game/board/main.h"
+#include "game/board/model.h"
 #include "game/board/star.h"
 #include "game/board/tutorial.h"
 #include "game/board/ui.h"
@@ -185,7 +187,7 @@ void fn_1_13A4(void) {
     fn_1_C10(0);
     fn_1_BA0(0x2E002B);
     sp8.x = -33.0f;
-    sp8.y =  sp8.z = 0.0f;
+    sp8.y = sp8.z = 0.0f;
     temp_r3_2 = BoardSpaceFlagSearch(0, 0x80000);
     BoardSpacePosGet(0, temp_r3_2, &sp14);
     BoardModelPosSetV(lbl_1_bss_0->unk8, &sp14);

src/game/audio.c

@@ -190,7 +190,7 @@ void HuAudFXListnerSetEX(Vec* arg0, Vec* arg1, float sndDist, float sndSpeed, fl
     }
 }
 
-void HuAudFXListnerUpdate(s32 arg0, s32 arg1) {
+void HuAudFXListnerUpdate(Vec *arg0, Vec *arg1) {
     if (omSysExitReq == 0) {
         msmSeUpdataListener(arg0, arg1);
     }

src/game/board/basic_space.c

@@ -1,5 +1,6 @@
 #include "game/board/basic_space.h"
 #include "game/board/main.h"
+#include "game/board/model.h"
 #include "game/board/player.h"
 #include "game/board/tutorial.h"
 #include "game/data.h"
@@ -37,7 +38,6 @@ static void CoinChgDisappear(omObjData*, coinChg*);
 
 extern void BoardCameraViewSet(s32);
 extern void BoardPlayerPosGet(s32, Vec*);
-extern void BoardModelPosGet(s16, Vec*);
 extern void BoardPlayerMotionEndWait(s32);
 extern void BoardPlayerCoinsAdd(s32, s32);
 extern void BoardRotateDiceNumbers(s32);

src/game/board/main.c

@@ -8,7 +8,9 @@
 #include "string.h"
 #include "game/hsfman.h"
 #include "game/hsfdraw.h"
+#include "game/board/lottery.h"
 #include "game/board/main.h"
+#include "game/board/model.h"
 #include "game/board/pause.h"
 #include "game/board/player.h"
 #include "game/board/tutorial.h"
@@ -58,7 +60,6 @@ static CameraView camViewTbl[] = {
 };
 
 
-extern void BoardModelPosGet(s16 model, Vec *pos);
 extern s32 BoardSpacePosGet(s32 layer, s32 space, Vec *pos);
 
 extern void BoardMGSetupPlayClear(void);

src/game/board/space.c

@@ -1,6 +1,8 @@
 #include "game/gamework_data.h"
 #include "game/flag.h"
+#include "game/board/lottery.h"
 #include "game/board/main.h"
+#include "game/board/model.h"
 #include "game/board/player.h"
 #include "game/board/space.h"
 #include "game/board/star.h"
@@ -14,9 +16,6 @@
 #include "string.h"
 
 
-extern s16 BoardModelCreate(s32 file, s32 *data, s32 arg3);
-extern s16 BoardModelIDGet(s16 model);
-
 static BoardSpace spaceData[2][256];
 s16 boardSpaceStarTbl[8];
 static GXTexObj spaceHiliteTex;
@@ -834,7 +833,7 @@ static void DrawSpaces(ModelData *model, Mtx matrix)
 					if(player_pos.y-space_curr->pos.y < 0.0f) {
 						y_dist = -(player_pos.y-space_curr->pos.y);
 					} else {
-						y_dist  = player_pos.y-space_curr->pos.y;
+						y_dist = player_pos.y-space_curr->pos.y;
 					}
 					if(y_dist < 10.0f) {
 						space_hilite = space_curr;

src/game/board/star.c

@@ -717,8 +717,8 @@ void BoardStarShowNext(s32 arg0) {
     Hu3D2Dto3D(&sp44, 1, &sp44);
     BoardModelPosSetV(BoardStarHostMdlGet(), &sp44);
     BoardCameraRotGet(&sp2C);
-    PSMTXRotRad(sp5C, 'y', 0.17453292f);
+    PSMTXRotRad(sp5C, 'y', MTXDegToRad(10.0f));
-    PSMTXRotRad(sp8C, 'x', 0.017453292f * sp2C.x);
+    PSMTXRotRad(sp8C, 'x', MTXDegToRad(sp2C.x));
     PSMTXConcat(sp8C, sp5C, spBC);
     BoardModelMtxSet(BoardStarHostMdlGet(), &spBC);
     BoardModelRotSet(BoardStarHostMdlGet(), 0.0f, 0.0f, 0.0f);

src/game/board/view.c

@@ -578,8 +578,8 @@ static void UpdateOverheadView(omObjData *arg0) {
     sp20.y = var_r29[1];
     sp20.z = 1000.0f;
     BoardCameraRotGet(&sp8);
-    PSMTXRotRad(sp5C, 0x78, sp8.x * 0.017453292f);
+    PSMTXRotRad(sp5C, 'x', MTXDegToRad(sp8.x));
-    PSMTXRotRad(sp2C, 0x79, sp8.y * 0.017453292f);
+    PSMTXRotRad(sp2C, 'y', MTXDegToRad(sp8.y));
     PSMTXConcat(sp2C, sp5C, sp2C);
     BoardModelMtxSet(temp_r31->unk04, &sp2C);
     Hu3D2Dto3D(&sp20, 1, &sp20);

src/game/board/warp.c

@@ -1,5 +1,6 @@
 #include "game/board/warp.h"
 #include "game/board/main.h"
+#include "game/board/model.h"
 #include "game/board/player.h"
 #include "game/board/tutorial.h"
 #include "game/wipe.h"
@@ -21,10 +22,6 @@ extern void BoardCharWheelInit(s32, s32);
 extern void BoardCharWheelSpeedSet(f32);
 extern void BoardCharWheelWait(void);
 extern s32 BoardCharWheelResultGet(void);
-extern f32 BoardModelMotionTimeGet(s16);
-extern void BoardModelHookReset(s16);
-extern s32 BoardModelHookSet(s16, char*, s16);
-extern s32 BoardModelMotionEndCheck(s16);
 
 static Vec warpPos;