Tons of warning/error fixes

dol.def

@@ -1,13 +1,29 @@
 EXPORTS
     game_main
+    frand
+    frandf
+    rand8
+    print8
+    C_MTXConcat
     C_MTXCopy
+    C_MTXLightPerspective
+    C_MTXLookAt
+    C_MTXMultVec
+    C_MTXPerspective
+    C_MTXRotRad
     C_MTXScale
+    C_MTXTrans
+    C_MTXInverse
+    C_MTXInvXpose
+    C_MTXIdentity
     C_VECAdd
+    C_VECCrossProduct
+    C_VECDotProduct
+    C_VECMag
+    C_VECNormalize
     C_VECScale
     C_VECSubtract
-    C_VECNormalize
+    mtxRot
-    C_VECMag
-    C_VECCrossProduct
     mtxRotCat
     byteswap_u32
     byteswap_s32
@@ -400,16 +416,28 @@ EXPORTS
     espSpeedSet
     espTPLvlSet
     espZRotSet
+    HuAudAllStop
     HuAudFXPlay
+    HuAudFXListnerKill
+    HuAudFXEmiterPlay
+    HuAudFXEmiterUpDate
+    HuAudFXListnerSetEX
+    HuAudFXListnerUpdate
+    HuAudPlayerVoicePlay
+    HuAudAUXVolSet
+    HuAudCharVoicePlay
     HuAudFXStop
-    HuAudSeqPlay
     HuAudSeqAllFadeOut
+    HuAudSeqFadeOut
+    HuAudSeqPlay
     HuAudSStreamAllFadeOut
     HuAudSStreamPlay
     HuAudSndGrpSetSet
     HuMemDirectMalloc
     HuMemDirectMallocNum
     HuMemDirectFree
+    HuMemHeapPtrGet
+    HuMemHeapDump
     HuDataInit
     HuDataDirRead
     HuDataRead
@@ -644,6 +672,8 @@ EXPORTS
     HuPrcMemAlloc
     HuPrcMemFree
     HuSetVecF
+    HuSprAnimKill
+    HuSprAnimLock
     HuSprAnimRead
     HuSprBankSet
     HuSprCreate
@@ -790,17 +820,34 @@ EXPORTS
     CharModelItemHookCreate
     CharModelEffectCreate
     CharModelCoinEffectCreate
+    CharModelVoiceEnableSet
+    CharModelStepTypeSet
     MGSeqInit
+    MGSeqSprKill
     MGSeqCreate
     MGSeqPosSet
+    MGSeqStatGet
+    MGSeqKill
+    MGSeqKillAll
+    MGSeqDoneCheck
+    MGSeqParamSet
     omAddObjEx
+    omDelObjEx
+    omInitObjMan
     omGameSysInit
+    omGetGroupMemberListEx
+    omMakeGroupEx
     omOvlCallEx
     omOvlGotoEx
     omOvlHisChg
     omOvlHisGet
     omOvlReturnEx
-    omInitObjMan
+    omOutView
+    omSetStatBit
+    omSetTra
+    omSetRot
+    omSetSca
+    omVibrate
     OSGetTick
     OSGetTime
     OSTicksToCalendarTime
@@ -811,3 +858,38 @@ EXPORTS
     WipeInit
     WipeStatGet
     GWGameStatReset
+    frandmod
+    GXDestroyTexObj
+    GXSetVtxDesc
+    GXClearVtxDesc
+    GXSetVtxAttrFmt
+    GXSetNumTexGens
+    GXBegin
+    GXSetTexCoordGen2
+    GXSetNumChans
+    GXSetChanCtrl
+    GXSetBlendMode
+    GXSetZMode
+    GXSetTevColorIn
+    GXSetTevAlphaIn
+    GXSetTevColorOp
+    GXSetTevAlphaOp
+    GXSetTevOrder
+    GXSetNumTevStages
+    GXInitTexObj
+    GXInitTexObjLOD
+    GXLoadTexObj
+    GXLoadPosMtxImm
+    GXLoadNrmMtxImm
+    GXLoadTexMtxImm
+    GXPosition3f32
+    GXColor3u8
+    GXEnd
+    HuDataGetAsyncStat
+    omSysPauseEnable
+    HuSprGrpDrawNoSet
+    HuSprPriSet
+    HuSprTexLoad
+    HuSysVWaitSet
+    MessData_MesPtrGet
+    GWMGAvailSet

include/dolphin/gx/GXBump.h

@@ -20,9 +20,10 @@ void GXSetTevIndirect(GXTevStageID tev_stage, GXIndTexStageID ind_stage, GXIndTe
                       GXIndTexWrap wrap_t, GXBool add_prev, GXBool ind_lod,
                       GXIndTexAlphaSel alpha_sel);
 //Must be implicit to match m455dll
-//void GXSetTevIndWarp(GXTevStageID tev_stage, GXIndTexStageID ind_stage, GXBool signed_offsets,
+#ifndef __MWERKS__
-//                     GXBool replace_mode, GXIndTexMtxID matrix_sel);
+void GXSetTevIndWarp(GXTevStageID tev_stage, GXIndTexStageID ind_stage, GXBool signed_offsets,
-                     
+                     GXBool replace_mode, GXIndTexMtxID matrix_sel);
+#endif
 void GXSetTevIndTile (GXTevStageID tev_stage, GXIndTexStageID ind_stage,
 			     u16 tilesize_s, u16 tilesize_t, 
 			     u16 tilespacing_s, u16 tilespacing_t, 

include/dolphin/mtx.h

@@ -39,6 +39,7 @@ typedef struct {
 #define MTXRadToDeg(a) ((a)*57.29577951f)
 #define MTXRowCol(m, r, c) ((m)[(r)][(c)])
 
+
 void C_MTXIdentity(Mtx m);
 void C_MTXCopy(const Mtx src, Mtx dst);
 void C_MTXConcat(const Mtx a, const Mtx b, Mtx ab);
@@ -46,6 +47,8 @@ void C_MTXConcatArray(const Mtx a, const Mtx* srcBase, Mtx* dstBase, u32 count);
 void C_MTXTranspose(const Mtx src, Mtx xPose);
 u32 C_MTXInverse(const Mtx src, Mtx inv);
 u32 C_MTXInvXpose(const Mtx src, Mtx invX);
+void C_MTXReorder(const Mtx src, ROMtx dest);
+void C_MTXROMultVecArray(const ROMtx m, const Vec *srcBase, Vec *dstBase, u32 count);
 
 #ifdef GEKKO
 void PSMTXIdentity(Mtx m);

include/game/audio.h

@@ -2,6 +2,7 @@
 #define _GAME_AUDIO_H
 
 #include "dolphin.h"
+#include "version.h"
 
 typedef struct sndGrpTbl_s {
     s16 ovl;
@@ -74,6 +75,6 @@ extern float Snd3DDistOffset;
 extern s32 musicOffF;
 extern u8 fadeStat;
 
-extern SNDGRPTBL sndGrpTable[];
+SHARED_SYM extern SNDGRPTBL sndGrpTable[];
 
 #endif

include/game/board/basic_space.h

@@ -3,6 +3,8 @@
 
 #include "dolphin.h"
 
+void BoardLandBlueExec(s32 player, s32 space);
+void BoardLandRedExec(s32 player, s32 space);
 void BoardEventLandBlue(s32, s32);
 void BoardEventLandRed(s32, s32);
 s8 BoardCoinChgCreate(Vec*, s8);

include/game/board/boo_house.h

@@ -8,6 +8,7 @@ void BoardBooHouseHostSet(s16);
 s16 BoardBooHouseHostGet(void);
 void BoardBooHouseCreate(void);
 void BoardBooHouseExec(s32);
+void BoardBooHouseKill(void);
 
 s32 BoardBooComUseCheck(s32);
 void BoardBooHouseTutorialExec(void);

include/game/board/bowser.h

@@ -0,0 +1,8 @@
+#ifndef _BOARD_BOWSER_H
+#define _BOARD_BOWSER_H
+
+#include "game/process.h"
+
+void BoardBowserExec(s32 player, s32 space);
+
+#endif

include/game/board/fortune.h

@@ -0,0 +1,8 @@
+#ifndef _BOARD_FORTUNE_H
+#define _BOARD_FORTUNE_H
+
+#include "game/process.h"
+
+void BoardFortuneExec(s32 player, s32 space);
+
+#endif

include/game/board/item.h

@@ -6,5 +6,8 @@
 void BoardItemStart(s32 arg0, s32 arg1);
 BOOL BoardItemDoneCheck(void);
 void BoardItemBagItemSet(s16 *arg0);
+#ifndef __MWERKS__
+void BoardItemPlayerRestore(s32 arg0, s32 arg1);
+#endif
 
 #endif

include/game/board/main.h

@@ -120,6 +120,9 @@ void BoardCameraTargetSpaceSet(s32 space);
 void BoardCameraQuakeSet(s32 duration, float strength);
 void BoardCameraQuakeReset();
 void BoardCameraTargetSet(float x, float y, float z);
+#ifndef __MWERKS__
+void BoardCameraPosCalcFuncSet(BoardCameraPosCalcFunc func);
+#endif
 void BoardCameraPosSet(float x, float y, float z);
 void BoardCameraXRotZoomSet(float zoom, float x_rot);
 void BoardCameraZoomSet(float zoom);

include/game/board/model.h

@@ -41,6 +41,7 @@ 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 BoardModelMotionShiftIDGet(s16 model);
 s32 BoardModelAttrSet(s16 model, u32 attr);
 s32 BoardModelAttrReset(s16 model, u32 attr);
 s32 BoardModelMotionTimeSet(s16 model, float time);

include/game/board/player.h

@@ -97,6 +97,9 @@ void BoardJunctionMaskReset(s32);
 void BoardJunctionMaskZero(void);
 void BoardPlayerVoiceEnableSet(s32, s32, s32);
 
+#ifndef __MWERKS__
+void BoardPlayerMoveBetween(s32 arg0, s32 arg1, s32 arg2);
+#endif
 
 void BoardPlayerMoveTo(s32, s32);
 void BoardPlayerMoveToAsync(s32, s32);

include/game/board/space.h

@@ -17,6 +17,7 @@ typedef struct board_space {
 	u16 link[BOARD_SPACE_LINKMAX+1];
 } BoardSpace;
 
+s32 BoardSpaceWalkExec(s32 player, s32 space);
 void BoardSpaceWalkEventFuncSet(BoardSpaceEventFunc func);
 void BoardSpaceWalkMiniEventFuncSet(BoardSpaceEventFunc func);
 void BoardSpaceLandEventFuncSet(BoardSpaceEventFunc func);
@@ -27,6 +28,7 @@ BoardSpace *BoardSpaceGet(s32 layer, s32 index);
 void BoardSpaceAttrSet(s32 layer, u32 attr);
 void BoardSpaceAttrReset(s32 layer, u32 attr);
 u32 BoardSpaceFlagGet(s32 layer, s32 index);
+void BoardSpaceTypeForce(u16 from, u16 to);
 s32 BoardSpaceTypeGet(s32 layer, s32 index);
 void BoardSpaceTypeSet(s32 layer, s32 index, s32 type);
 s32 BoardSpacePosGet(s32 layer, s32 index, Vec *pos);
@@ -40,6 +42,7 @@ 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 BoardSpaceHostSet(s32 space);
+void BoardSpaceHide(s32 value);
 void BoardSpaceStarSetIndex(s32 index);
 s32 BoardSpaceStarGetNext(void);
 s32 BoardSpaceStarGetRandom(s32 excl_pos);
@@ -49,6 +52,7 @@ s32 BoardSpaceStarGetCurr(void);
 s32 BoardSpaceStarCheck(s32 index);
 void BoardSpaceLandExec(s32 player, s32 space);
 void BoardSpaceCameraSet(u16 mask);
+s32 BoardSpaceBlockExec(s32 player, s32 space);
 void BoardSpaceBlockPosSet(void);
 void BoardSpaceInit(s32 data_num);
 void BoardSpaceDestroy(void);

include/game/hsfman.h

@@ -299,14 +299,14 @@ void Hu3DProjectionTPLvlSet(s16, float);
 void Hu3DMipMapSet(char *, s16, s32, float);
 
 SHARED_SYM extern ModelData Hu3DData[0x200];
-extern CameraData Hu3DCamera[0x10];
+SHARED_SYM extern CameraData Hu3DCamera[0x10];
 extern AnimData *reflectAnim[5];
-extern AnimData *hiliteAnim[4];
+SHARED_SYM extern AnimData *hiliteAnim[4];
 extern ThreeDProjectionStruct Hu3DProjection[4];
-extern ShadowData Hu3DShadowData;
+SHARED_SYM extern ShadowData Hu3DShadowData;
-extern Mtx Hu3DCameraMtx;
+SHARED_SYM extern Mtx Hu3DCameraMtx;
-extern Mtx Hu3DCameraMtxXPose;
+SHARED_SYM extern Mtx Hu3DCameraMtxXPose;
-extern LightData Hu3DGlobalLight[0x8];
+SHARED_SYM extern LightData Hu3DGlobalLight[0x8];
 extern s16 reflectMapNo;
 extern AnimData *toonAnim;
 extern s16 Hu3DShadowCamBit;

include/game/hsfmotion.h

@@ -3,6 +3,7 @@
 
 #include "dolphin.h"
 #include "game/hsfformat.h"
+#include "version.h"
 
 #define Hu3DMotionCreateFile(data_id) (Hu3DMotionCreate(HuDataSelHeapReadNum((data_id), MEMORY_DEFAULT_NUM, HEAP_DATA)))
 
@@ -76,6 +77,6 @@ s16 Hu3DJointMotion(s16 arg0, void *arg1);
 void JointModel_Motion(s16 arg0, s16 arg1);
 void Hu3DMotionCalc(s16 arg0);
 
-extern MotionData Hu3DMotion[256];
+SHARED_SYM extern MotionData Hu3DMotion[256];
 
 #endif

include/game/init.h

@@ -2,6 +2,7 @@
 #define _GAME_INIT_H
 
 #include "dolphin.h"
+#include "version.h"
 
 extern GXRenderModeObj *RenderMode;
 extern OSHeapHandle currentHeapHandle;
@@ -11,7 +12,7 @@ extern void *DemoFrameBuffer2;
 extern void *DemoCurrentBuffer;
 extern u32 minimumVcount;
 extern float minimumVcountf;
-extern u32 worstVcount;
+SHARED_SYM extern u32 worstVcount;
 
 void HuSysInit(GXRenderModeObj *mode);
 void HuSysBeforeRender();

include/game/objsub.h

@@ -30,13 +30,13 @@ extern u8 lbl_801D3E94;
 extern u32 mgRecordExtra;
 SHARED_SYM extern s32 mgQuitExtraF;
 SHARED_SYM extern s32 mgPracticeEnableF;
-extern s32 mgInstExitEnableF;
+SHARED_SYM extern s32 mgInstExitEnableF;
 SHARED_SYM extern u8 mgBoardHostEnableF;
 
 extern s16 mgTicTacToeGrid[3][3];
 extern u8 mgIndexList[256];
 extern GameStat mgGameStatBackup;
 
-extern MgInfo mgInfoTbl[];
+SHARED_SYM extern MgInfo mgInfoTbl[];
 
 #endif

include/game/printfunc.h

@@ -2,6 +2,7 @@
 #define _GAME_PRINTFUNC_H
 
 #include "dolphin.h"
+#include "version.h"
 
 #define FONT_COLOR_BLACK 0
 #define FONT_COLOR_DARK_BLUE 1
@@ -29,7 +30,7 @@ void pfDrawFonts(void);
 extern BOOL saftyFrameF;
 extern u16 strlinecnt;
 extern u16 empstrline;
-extern int fontcolor;
+SHARED_SYM extern int fontcolor;
 extern u32 procfunc;
 
 #endif

src/REL/m401Dll/main.c

@@ -17,6 +17,10 @@
 #include "ext_math.h"
 #include "math.h"
 
+#ifndef __MWERKS__
+#include "game/audio.h"
+#endif
+
 float lbl_2_data_0 = -7.1875f;
 
 s16 lbl_2_data_4[] = { 0, 1, 2, 3, 4, 5, 6, 7 };

src/REL/m401Dll/main_ex.c

@@ -11,6 +11,10 @@
 
 #include "REL/m401Dll.h"
 
+#ifndef __MWERKS__
+extern s32 rand8(void);
+#endif
+
 struct Bss13EData {
     s16 unk0;
     s16 unk2[3];
@@ -319,7 +323,6 @@ void fn_2_113AC(omObjData *object)
     M401WorkPlayer *temp_r28;
     omObjData *temp_r27;
     ParticleData *temp_r25;
-    s16 temp_r24;
     temp_r30 = object->data;
     temp_r30->unk0.z += (lbl_2_bss_50 * 0.5f);
     object->trans.x = temp_r30->unk0.x;
@@ -564,7 +567,6 @@ void fn_2_123F8(ModelData *model, ParticleData *particle, Mtx matrix)
     HsfanimStruct01 *temp_r31;
     s32 temp_r29;
     s32 temp_r28;
-    UnkWork10A88 *temp_r27;
     if (!particle->unk_02) {
         particle->unk_02 = 1;
         temp_r31 = particle->unk_48;

src/REL/m402Dll/main.c

@@ -682,7 +682,9 @@ static void fn_1_1FC4(Vec *arg0, float *arg1, s32 arg2, s32 arg3)
     VECAdd((Vec *)&arg0, &sp18, (Vec *)&arg0);
 }
 
+#ifdef __MWERKS__
 #include "src/REL/executor.c"
+#endif
 
 static void fn_1_2454(void)
 {

src/REL/m405Dll/main.c

@@ -8,6 +8,7 @@
 #include "game/gamework_data.h"
 #include "game/hsfanim.h"
 #include "game/hsfdraw.h"
+#include <game/hsfex.h>
 #include "game/hsfman.h"
 #include "game/hsfmotion.h"
 #include "game/memory.h"
@@ -23,6 +24,11 @@
 #include "dolphin.h"
 #include "ext_math.h"
 
+
+#ifndef __MWERKS__
+#include "game/audio.h"
+#endif
+
 #undef ABS
 #define ABS(x) ((0 > (x)) ? -(x) : (x))
 
@@ -1277,7 +1283,9 @@ float fn_1_5664(Vec *arg0)
     return lbl_1_bss_5AC.unk04[fn_1_23B4(arg0)].y;
 }
 
+#ifdef __MWERKS__
 #include "src/REL/executor.c"
+#endif
 
 Vec lbl_1_data_100 = { 0.0f, 1.0f, 0.0f };
 Vec lbl_1_data_10C = { 450.0f, 300.0f, 500.0f };

src/REL/m406Dll/map.c

@@ -455,7 +455,7 @@ UnkM406Struct5 lbl_1_bss_48;
 Vec lbl_1_bss_3C;
 s32 lbl_1_bss_30[3];
 
-extern LightData Hu3DLocalLight[0x20];
+SHARED_SYM extern LightData Hu3DLocalLight[0x20];
 
 omObjData *fn_1_2308(Process *arg0)
 {

src/REL/m407dll/whomp.c

@@ -74,7 +74,6 @@ ObjFuncs lbl_1_data_258[] = {
 
 void fn_1_2354(Process *arg0)
 {
-    Process *sp8;
     u32 i;
     u32 j;
 
@@ -123,7 +122,7 @@ void fn_1_2564(void)
 
 void fn_1_25C0(void)
 {
-    u32 i, j;
+    u32 i;
 
     lbl_1_bss_38 = 0;
 

src/REL/m409Dll/cursor.c

@@ -6,8 +6,7 @@
 
 void fn_1_BF88(s16 arg0, s16 arg1)
 {
-    s32 var_r31;
+    s32 i;
-    s32 var_r31_2;
     unkStruct8 *var_r29;
     unkStruct9Sub *var_r30;
 
@@ -20,11 +19,11 @@ void fn_1_BF88(s16 arg0, s16 arg1)
     var_r30 = HuMemDirectMallocNum(HEAP_SYSTEM, arg1 * sizeof(unkStruct9Sub), MEMORY_DEFAULT_NUM);
     lbl_1_bss_F0.unkC = var_r30;
 
-    for (var_r31 = 0; var_r31 < arg0; var_r31++, var_r29++) {
+    for (i = 0; i < arg0; i++, var_r29++) {
         var_r29->unk8 = 0;
     }
 
-    for (var_r31 = 0; var_r31 < arg1; var_r31++, var_r30++) {
+    for (i = 0; i < arg1; i++, var_r30++) {
         var_r30->unk6 = 0;
         var_r30->unk8 = 0;
     }

src/REL/m409Dll/main.c

@@ -212,12 +212,7 @@ void fn_1_DDC(omObjData *object)
 
 void fn_1_F70(omObjData *object)
 {
-    s16 *sp8;
+    s16 *sp8 = (s16 *)object->data;
-    s16 temp_r3;
-    s16 temp_r3_2;
-    s32 var_r31;
-
-    sp8 = (s16 *)object->data;
     switch (fn_1_2454(7)) {
         case 1:
             if (lbl_1_bss_6 == 0) {
@@ -225,10 +220,11 @@ void fn_1_F70(omObjData *object)
                 WipeCreate(WIPE_MODE_IN, WIPE_TYPE_NORMAL, 0x3C);
             }
             if (WipeStatGet() == 0) {
+                s32 i;
                 fn_1_2414(7, 2);
 
-                for (var_r31 = 0; var_r31 < 4; var_r31++) {
+                for (i = 0; i < 4; i++) {
-                    omVibrate(var_r31, 0xC8, 6, 6);
+                    omVibrate(i, 0xC8, 6, 6);
                 }
             }
             break;
@@ -382,13 +378,7 @@ s8 fn_1_10E8(omObjData *object)
 
 s8 fn_1_1B74(omObjData *object)
 {
-    f32 temp_f30;
+    unkStruct4 *temp_r30 = object->data;
-    f32 temp_f31;
-    s16 temp_r27;
-    s32 temp_r28;
-    unkStruct4 *temp_r30;
-
-    temp_r30 = (unkStruct4 *)object->data;
     switch (lbl_1_bss_8) {
         case 0:
             temp_r30->unk2 = MGSeqCreate(3, 1);
@@ -440,14 +430,12 @@ s8 fn_1_1B74(omObjData *object)
 
 void fn_1_2098(omObjData *object)
 {
-    ModelData *temp_r31;
     f32 var_f28;
     f32 var_f29;
     f32 var_f31;
     f32 var_f30;
-    s32 var_r30;
 
-    temp_r31 = &Hu3DData[lbl_1_bss_DC->model[4]];
+    ModelData *temp_r31 = &Hu3DData[lbl_1_bss_DC->model[4]];
     if (fn_1_2454(0x18) != 0x18) {
         lbl_1_bss_18 += 0.008f;
         if (lbl_1_bss_18 >= 1.0f) {
@@ -584,10 +572,6 @@ void fn_1_2484(omObjData *object)
 
 void fn_1_2DCC(omObjData *object)
 {
-    u16 spE;
-    u16 spC;
-    u16 spA;
-    u16 sp8;
     ModelData *temp_r30;
     f32 temp_f29;
     f32 var_f31;
@@ -597,8 +581,6 @@ void fn_1_2DCC(omObjData *object)
     s16 var_r28;
     s16 var_r27;
     s16 var_r29;
-    s32 temp_r16;
-    s16 var_r18;
     unkStruct4 *var_r31;
 
     if ((lbl_1_bss_24.unk0 == 0) || (fn_1_2454(0x18) == 0x18)) {
@@ -991,7 +973,6 @@ void fn_1_4FFC(s16 arg0, f32 arg1, f32 arg2, f32 arg3, s16 arg4)
     Vec sp2C;
     Vec sp20;
     GXColor sp1A;
-    s16 sp18;
     f32 temp_f31;
     s16 var_r30;
     unkStruct5 *temp_r31;
@@ -1179,7 +1160,6 @@ unkStruct5 *fn_1_58E0(s16 arg0, Vec *arg1, Vec *arg2, f32 arg3, GXColor *arg4)
 s16 fn_1_5A18(AnimData *arg0, s16 arg1, f32 arg8, s16 arg2, s16 arg3)
 {
     ModelData *temp_r28;
-    f32 temp_f0;
     s16 var_r21;
     s16 var_r22;
     s16 var_r30;

src/REL/m409Dll/player.c

@@ -174,17 +174,11 @@ void fn_1_7344(omObjData *arg0)
     f32 temp_f28;
     f32 temp_f29;
     f32 temp_f30;
-    f32 var_f25;
-    f32 var_f26;
-    f32 var_f27;
     f32 var_f31;
-    s16 temp_r0;
     s32 temp_r19;
     s16 temp_r22;
     s16 temp_r26;
     s16 temp_r25;
-    s16 var_r20;
-    s16 var_r21;
     s16 var_r27;
     s16 var_r28;
     s32 var_r24;
@@ -379,23 +373,15 @@ void fn_1_7FE8(omObjData *arg0)
 {
     Vec sp20;
     Vec sp14;
-    s32 sp10;
-    f32 spC;
-    s16 sp8;
     unkStruct10 *var_r30;
     unkStruct8Sub *temp_r29;
-    f32 temp_f0;
-    f32 temp_f0_2;
-    f32 temp_f1;
     f32 temp_f29;
     f32 temp_f30;
-    f32 var_f28;
     s32 var_r28;
-    unkStruct7 *temp_r31;
 
-    temp_r31 = (unkStruct7 *)arg0->data;
+    unkStruct7 *temp_r31 = (unkStruct7 *)arg0->data;
-    sp10 = arg0->model[0];
+    s32 sp10 = arg0->model[0];
-    sp8 = temp_r31->unk1C;
+    s16 sp8 = temp_r31->unk1C;
     temp_r31->unkE = temp_r31->unk10 = 0;
     temp_r29 = fn_1_CCCC(temp_r31->unk57, 0);
     sp20.x = sp20.y = sp20.z = 0.0f;
@@ -1023,10 +1009,8 @@ s32 fn_1_A584(unkStruct10 *arg0)
 
 s8 fn_1_A9C0(Vec *arg0, f32 *arg1)
 {
-    f32 sp8;
     f32 temp_f29;
     f32 var_f30;
-    f32 var_f28;
     s32 var_r27;
     s32 var_r29;
     unkStruct10 *var_r31;
@@ -1080,8 +1064,6 @@ void fn_1_AC08(s32 *arg0, s32 arg1)
 f32 fn_1_AD40(f32 arg0, f32 arg1, f32 arg2)
 {
     f32 var_f31;
-    f32 var_f30;
-    f32 var_f29;
 
     var_f31 = fmodf(arg1 - arg0, 360.0);
     if (var_f31 < 0.0f) {

src/REL/m410Dll/game.c

@@ -535,7 +535,6 @@ float fn_1_4FEC(Vec arg0, Vec arg1, float arg8, Vec arg2, Vec arg3, float arg9,
     float sp2C;
 
     float var_f28;
-    float var_f26;
     float var_f25;
     float var_f24;
     float var_f23;
@@ -777,19 +776,6 @@ void fn_1_61DC(UnkM410Struct2 *arg0, UnkM410Struct2 *arg1)
     Vec sp68;
     Vec sp5C;
     Vec sp50;
-    Vec sp44;
-    Vec sp38;
-    Vec sp2C;
-    Vec sp20;
-    Vec sp14;
-    Vec sp8;
-
-    Vec *var_r29;
-    Vec *var_r28;
-    Vec *var_r27;
-    Vec *var_r26;
-    Vec *var_r25;
-    Vec *var_r24;
 
     if (arg0->unk_00_field1 || arg1->unk_00_field1) {
         if (arg0->unk_00_field1) {

src/REL/m410Dll/main.c

@@ -8,6 +8,8 @@
 
 #include "REL/m410Dll.h"
 
+#include <game/audio.h>
+
 Process *lbl_1_bss_28;
 omObjData *lbl_1_bss_24;
 omObjData *lbl_1_bss_20;
@@ -223,11 +225,7 @@ void fn_1_DEC(omObjData *object)
 
 void fn_1_FF0(omObjData *object)
 {
-    void *var_r31;
+    UnkM410Struct *var_r29 = object->data;
-    UnkM410Struct *var_r29;
-    void *var_r28;
-
-    var_r29 = object->data;
 
     fn_1_5A8(object);
     switch (var_r29->unk_14) {
@@ -265,11 +263,8 @@ void fn_1_FF0(omObjData *object)
 
 void fn_1_139C(omObjData *object)
 {
-    UnkM410Struct *var_r29;
+    UnkM410Struct *var_r29 = object->data;
-    s32 var_r27;
+    s32 var_r27 = 0;
-
-    var_r29 = object->data;
-    var_r27 = 0;
     fn_1_5A8(object);
 
     if (!--var_r29->unk_20) {
@@ -470,9 +465,6 @@ s32 fn_1_28DC(void)
 void fn_1_2914(Vec *arg0, Vec *arg1)
 {
     Vec sp10;
-    float var_f29;
-    float var_f28;
-    float var_f27;
 
     sp10.x = arg1->x - arg0->x;
     sp10.y = arg1->y - arg0->y;

src/REL/m410Dll/player.c

@@ -259,14 +259,8 @@ void fn_1_8414(omObjData *object)
 
 void fn_1_8678(omObjData *object)
 {
-    float var_f31;
+    UnkM410Struct5 *var_r31 = object->data;
-    float var_f30;
+    s32 var_r29 = 0;
-    float var_f29;
-    UnkM410Struct5 *var_r31;
-    s32 var_r29;
-
-    var_r31 = object->data;
-    var_r29 = 0;
     var_r31->unk_10 = 0;
     if (fn_1_281C() == 2) {
         var_r31->unk_10 = HuPadBtnDown[GWPlayerCfg[object->work[0]].pad_idx];
@@ -465,8 +459,6 @@ void fn_1_9040(omObjData *object)
     Mtx sp38;
     Vec sp2C;
     Vec sp20;
-    Vec sp14;
-    Vec sp8;
 
     float var_f31;
     float var_f30;
@@ -475,18 +467,11 @@ void fn_1_9040(omObjData *object)
     float var_f27;
     float var_f26;
     float var_f25;
-    float var_f24;
-    float var_f23;
-    float var_f22;
-    double var_f21;
-    double var_f20;
 
     UnkM410Struct5 *var_r31;
     s32 var_r29;
     s32 var_r28;
     s16 var_r27;
-    Vec *var_r26;
-    Vec *var_r25;
 
     var_r31 = object->data;
     fn_1_79F8(object->model[0], lbl_1_data_16C[var_r31->unk_08], sp38);

src/REL/m412Dll/main.c

@@ -569,8 +569,6 @@ void fn_1_2064(void)
     Vec sp28;
     Vec sp1C;
     Vec sp10;
-    f32 spC;
-    f32 sp8;
     Process *temp_r26;
     s32 var_r30;
     unkStruct *temp_r28;
@@ -701,10 +699,6 @@ s32 fn_1_2708(void)
 f32 fn_1_27C4(s32 arg0, f32 arg8, f32 arg9)
 {
     f32 temp_f31;
-    f32 var_f25;
-    f32 var_f26;
-    f32 var_f27;
-    f32 var_f28;
     f32 var_f29;
 
     temp_f31 = arg8 - fn_1_1D08(arg9);
@@ -922,18 +916,11 @@ void fn_1_3950(void)
     f32 sp5C;
     volatile f32 sp58;
     f32 sp54;
-    f32 temp_f27;
     f32 var_f29;
     f32 temp_f31;
     f32 temp_f30;
     f32 var_f18;
-    f32 var_f19;
-    f32 var_f20;
-    f32 var_f21;
-    f32 var_f22;
-    f32 var_f23;
     f32 var_f24;
-    s32 var_r28;
     s32 var_r24;
     s32 var_r25;
     s32 var_r29;
@@ -1269,9 +1256,6 @@ void fn_1_5838(unkStruct3 *arg0)
     Vec spA8;
     Vec sp9C;
     Vec sp90;
-    Vec sp84;
-    Vec sp78;
-    Vec sp6C;
     s32 sp68;
     f32 sp64;
     f32 sp60;
@@ -1593,13 +1577,6 @@ void fn_1_6814(unkStruct3 *arg0)
 void fn_1_7C60(void)
 {
     Vec sp1A0;
-    Vec sp188;
-    Vec sp17C;
-    Vec sp170;
-    Vec sp164;
-    Vec sp158;
-    Vec sp14C;
-    Vec sp140;
     f32 sp13C;
     f32 sp138;
     f32 sp134;
@@ -2020,8 +1997,6 @@ void fn_1_AA88(ModelData *model, ParticleData *particle, f32 (*matrix)[4])
 
 void fn_1_ADC8(void)
 {
-    Vec sp14;
-    Vec sp8;
     f32 var_f31;
     void *temp_r28;
     Process *var_r29;

src/REL/m413Dll/main.c

@@ -19,7 +19,7 @@
 #include "game/hsfex.h"
 #endif
 
-s32 rand8(void);
+extern s32 rand8(void);
 
 typedef struct struct_bss_2A6C StructBss2A6C;
 

src/REL/m425Dll/thwomp.c

@@ -27,7 +27,7 @@
 #include "REL/m425Dll.h"
 
 extern u32 GlobalCounter;
-extern LightData Hu3DLocalLight[0x20];
+SHARED_SYM extern LightData Hu3DLocalLight[0x20];
 
 typedef struct M425DllUnkStruct4 {
     s16 unk_00;

src/REL/m427Dll/map.c

@@ -18,7 +18,7 @@
 #include "string.h"
 
 extern s32 rand8(void);
-extern LightData Hu3DLocalLight[0x20];
+SHARED_SYM extern LightData Hu3DLocalLight[0x20];
 
 #define FABS(value) ((value < 0) ? -(value) : (value))
 

src/REL/m449Dll/main.c

@@ -26,7 +26,7 @@
 #include "game/hsfex.h"
 #endif
 
-s32 rand8(void);
+extern s32 rand8(void);
 
 typedef struct UnkCameraStruct {
     /* 0x00 */ float unk_00;

src/REL/m457Dll/main.c

@@ -21,7 +21,7 @@
 #include "ext_math.h"
 #include "version.h"
 
-s32 rand8(void);
+extern s32 rand8(void);
 
 #define MSM_SE_BOWSER_LAUGH 0x3A
 #define MSM_SE_BOWSER_HOWL 0x3E

src/REL/mpexDll/mpex.c

@@ -44,7 +44,7 @@ typedef struct MpexDllUnkStruct4 {
     /* 0x2C */ char unk2C[0x1C];
 } MpexDllUnkStruct4; /* size = 0x48 */
 
-s32 rand8(void);
+extern s32 rand8(void);
 float fn_1_1B52C(float arg8, float arg9, float argA, float argB);
 float fn_1_1B574(float arg0, float arg1, float arg2, float arg3);
 float fn_1_1B64C(float arg0, float arg1, float arg2, float arg3);

src/game/board/basic_space.c

@@ -1,3 +1,4 @@
+#include "game/audio.h"
 #include "game/board/basic_space.h"
 #include "game/board/main.h"
 #include "game/board/model.h"
@@ -236,10 +237,10 @@ static void CreateCoinChg(coinChg *coin_chg, Vec *pos) {
     BoardModelMotionSpeedSet(coin_chg->sign_model, 0.0f);
     BoardModelMotionSpeedSet(coin_chg->tens_model, 0.0f);
     BoardModelMotionSpeedSet(coin_chg->ones_model, 0.0f);
-    BoardModelScaleSet(coin_chg->sign_model, 0.001, 0.001, 0.001);
+    BoardModelScaleSet(coin_chg->sign_model, 0.001f, 0.001f, 0.001f);
-    BoardModelScaleSet(coin_chg->tens_model, 0.001, 0.001, 0.001);
+    BoardModelScaleSet(coin_chg->tens_model, 0.001f, 0.001f, 0.001f);
-    BoardModelScaleSet(coin_chg->ones_model, 0.001, 0.001, 0.001);
+    BoardModelScaleSet(coin_chg->ones_model, 0.001f, 0.001f, 0.001f);
-    BoardModelScaleSet(coin_chg->coin_model, 0.001, 0.001, 0.001);
+    BoardModelScaleSet(coin_chg->coin_model, 0.001f, 0.001f, 0.001f);
     BoardModelLayerSet(coin_chg->sign_model, 1);
     BoardModelLayerSet(coin_chg->tens_model, 1);
     BoardModelLayerSet(coin_chg->ones_model, 1);

src/game/board/battle.c

@@ -19,6 +19,8 @@
 
 #include "ext_math.h"
 
+#include <game/hsfex.h>
+
 typedef struct {
     struct {
         u8 unk00_field0 : 1;

src/game/board/block.c

@@ -1,4 +1,5 @@
 #include "ext_math.h"
+#include "game/audio.h"
 #include "game/board/main.h"
 #include "game/board/model.h"
 #include "game/board/player.h"
@@ -8,6 +9,8 @@
 #include "game/objsub.h"
 #include "game/process.h"
 
+#include <game/board/audio.h>
+#include <game/board/tutorial.h>
 
 #define BLOCK_SPAWN 0
 #define BLOCK_HIT 2

src/game/board/boo_house.c

@@ -1,5 +1,5 @@
+#include "game/audio.h"
 #include "game/board/boo_house.h"
-
 #include "game/board/audio.h"
 #include "game/board/boo.h"
 #include "game/board/com.h"
@@ -16,6 +16,9 @@
 
 #include "ext_math.h"
 
+#include <game/board/tutorial.h>
+#include <game/hsfex.h>
+
 // bss
 static s16 houseMdl[6];
 

src/game/board/bowser.c

@@ -15,6 +15,10 @@
 #include "ext_math.h"
 #include "string.h"
 
+#include <game/board/tutorial.h>
+#include <game/chrman.h>
+#include <game/hsfex.h>
+
 typedef struct bowser_event_data {
     s16 sprite[3];
     s16 delay[3];
@@ -1215,7 +1219,6 @@ static void ConfigBowserEvent(void)
     for(coins=i=0; i<4; i++) {
         coins += BoardPlayerCoinsGet(i);
     }
-    retry:
     while(1) {
         chance = BoardRandMod(100);
         if(chance >= 95) {

src/game/board/com.c

@@ -12,6 +12,8 @@
 
 #include "ext_math.h"
 
+#include <game/board/boo_house.h>
+
 typedef BOOL (*UseCheckFunc)(s32 player, s32 item);
 
 static void ExecComKeyLeft(void);

src/game/board/fortune.c

@@ -8,6 +8,10 @@
 
 #include "game/wipe.h"
 
+#include <game/audio.h>
+#include <game/board/window.h>
+#include <game/objsub.h>
+
 static Vec camTargetFortune;
 static Vec camPosFortune;
 
@@ -197,7 +201,6 @@ static void FortunePostMG(void)
 
 static void CreateFortunePlatform(void)
 {
-	PlayerState *player;
 	Vec pos, rot;
 	PlatformWork *work;
 	fortunePlatformObj = omAddObjEx(boardObjMan, 257, 0, 0, -1, ExecFortunePlatform);

src/game/board/item.c

@@ -28,6 +28,13 @@
 
 #include "ext_math.h"
 
+#include <game/msm.h>
+
+#ifndef __MWERKS__
+#include <game/hsfex.h>
+extern s32 rand8(void);
+#endif
+
 typedef struct {
     /* 0x00 */ s16 unk00;
     /* 0x02 */ s16 unk02;

src/game/board/last5.c

@@ -340,7 +340,7 @@ static void SetTeamResultTarget(s32 team, Vec *pos);
 static void KillTeamResult(void);
 static void UpdateTeamResult(omObjData *object);
 
-void BoardLast5Exec()
+void BoardLast5Exec(void)
 {
 	GWSystem.player_curr = -1;
 	last5Proc = HuPrcChildCreate(ExecLast5, 8200, 14336, 0, boardMainProc);
@@ -703,10 +703,10 @@ static void Last5Main(void)
 	temp_r20 = GetLast5RouletteResult();
 	GWSystem.last5_effect = temp_r20;
 	if(GWSystem.last5_effect == 2) {
-		BoardSpaceTypeForce(2, 3);
+            BoardSpaceTypeForce(2, 3);
 	}
 	if(GWSystem.last5_effect == 3) {
-		BoardSpaceTypeForce(2, 7);
+	    BoardSpaceTypeForce(2, 7);
 	}
 	temp_r24 = 18+messBase+temp_r20;
 	BoardWinCreate(2, temp_r24, BoardWinPortraitGetStar());

src/game/board/lottery.c

@@ -24,6 +24,10 @@
 #include "ext_math.h"
 #include "stdlib.h"
 
+#ifndef __MWERKS__
+#include <game/board/shop.h>
+#endif
+
 typedef struct {
     struct {
         u8 unk00_field0 : 1;

src/game/board/main.c

@@ -1,15 +1,7 @@
-#include "game/gamework_data.h"
+#include "game/board/main.h"
 #include "ext_math.h"
-#include "game/object.h"
-#include "game/flag.h"
-#include "game/data.h"
-#include "game/wipe.h"
-#include "string.h"
-#include "game/hsfman.h"
-#include "game/hsfdraw.h"
 #include "game/board/battle.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"
@@ -18,9 +10,30 @@
 #include "game/board/start.h"
 #include "game/board/tutorial.h"
 #include "game/board/ui.h"
-#include "game/pad.h"
+#include "game/data.h"
 #include "game/disp.h"
+#include "game/flag.h"
+#include "game/gamework_data.h"
+#include "game/hsfdraw.h"
+#include "game/hsfman.h"
 #include "game/msm.h"
+#include "game/object.h"
+#include "game/pad.h"
+#include "game/wipe.h"
+#include "string.h"
+
+#include <game/armem.h>
+#include <game/audio.h>
+#include <game/board/audio.h>
+#include <game/board/boo_house.h>
+#include <game/board/bowser.h>
+#include <game/board/fortune.h>
+#include <game/board/mg_setup.h>
+#include <game/board/roll.h>
+#include <game/board/window.h>
+#include <game/chrman.h>
+
+extern void BoardLast5Exec(void);
 
 typedef struct camera_view {
     s16 x_rot;
@@ -297,7 +310,6 @@ void BoardSaveInit(s32 board)
     GWSystem.block_pos = 0;
     memset(GWSystem.board_data, 0, sizeof(GWSystem.board_data));
     for(i=0; i<4; i++) {
-        s32 party_flag;
         BoardPlayerAutoSizeSet(i, 0);
         GWPlayer[i].draw_ticket = 0;
         GWPlayer[i].color = 0;

src/game/board/mushroom.c

@@ -9,8 +9,13 @@
 
 #include "game/objsub.h"
 
-#include "math.h"
 #include "ext_math.h"
+#include "math.h"
+
+#include <game/audio.h>
+#include <game/board/tutorial.h>
+#include <game/board/window.h>
+#include <game/hsfex.h>
 
 extern s32 boardTutorialData[4];
 
@@ -70,9 +75,6 @@ static void WaitItemGive(void);
 static void MushroomMain(void) {
     Vec sp14[2];
     Vec sp8;
-    s32 temp_r0;
-    s32 temp_r0_2;
-    s32 var_r30;
     s32 curPlayer;
     s8 var_r29;
     boxObjWork* box;
@@ -236,7 +238,6 @@ static void ShowBox(ItemGiveWork2*, omObjData*);
 
 
 static void BoxMain(omObjData* arg0) {
-    s32 temp_r0;
     ItemGiveWork2* temp_r30;
 
     temp_r30 = OM_GET_WORK_PTR(arg0, ItemGiveWork2);

src/game/board/pause.c

@@ -18,6 +18,9 @@
 #include "game/window.h"
 #include "game/wipe.h"
 
+#include <game/board/audio.h>
+#include <game/hsfex.h>
+
 typedef struct {
     struct {
         u8 unk00_field0 : 1;

src/game/board/player.c

@@ -21,6 +21,8 @@
 #include "ext_math.h"
 #include "stdlib.h"
 
+#include <game/audio.h>
+
 static void InitJunction(s32, s32, f32);
 static void UpdateJunctionGfx(omObjData *);
 static void StopJunctionPlayer(s32);
@@ -266,7 +268,6 @@ void BoardPlayerModelInit(void)
     s32 temp_r25;
     s32 temp_r24;
     s16 temp_r3;
-    s32 temp_r4;
     PlayerState *temp_r27;
 
     s32 ro0[8] = { DATA_MAKE_NUM(DATADIR_MARIOMDL1, 0x00), DATA_MAKE_NUM(DATADIR_LUIGIMDL1, 0x00), DATA_MAKE_NUM(DATADIR_PEACHMDL1, 0x00),
@@ -337,7 +338,6 @@ void BoardPlayerModelKill(void)
 {
     s32 var_r31;
     PlayerState *temp_r30;
-    PlayerState *temp_r29;
 
     for (var_r31 = 0; var_r31 < 4; var_r31++) {
         temp_r30 = BoardPlayerGet(var_r31);
@@ -689,7 +689,6 @@ s32 BoardPlayerCoinsGet(s32 arg0)
 void BoardPlayerCoinsAdd(s32 arg0, s32 arg1)
 {
     PlayerState *player;
-    s16 coins;
 
     player = BoardPlayerGet(arg0);
     if ((arg1 > 0) && (player->coins_total < 0x3E7)) {
@@ -833,7 +832,6 @@ void BoardPlayerTurnExec(s32 arg0)
 
 void BoardPlayerTurnRollExec(s32 arg0)
 {
-    s32 temp_r28;
     s32 temp_r30;
 
     GWPlayer[arg0].roll = 0;
@@ -876,8 +874,6 @@ void BoardPlayerTurnMoveExec(s32 arg0)
     s32 temp_r30;
     s32 var_r29;
     s32 var_r28;
-    s32 temp_r0;
-    s32 temp_r1;
 
     BoardPauseDisableSet(1);
     var_r28 = 0;
@@ -977,7 +973,6 @@ void BoardPlayerTurnMoveExec(s32 arg0)
         GWSystem.bowser_event = 0xF;
     }
     BoardPlayerZoomRestore(arg0);
-    return;
 }
 
 void BoardPlayerPostTurnHookExec(s32 arg0)
@@ -1067,9 +1062,6 @@ static inline GetLinkCount(s32 playerIdx, s32 boardIdx)
     s32 linkCount;
     BoardSpace *boardSpaceLink;
     BoardSpace *boardSpaceFlag;
-    PlayerState *player;
-    s32 color;
-    s32 temp;
 
     linkCount = 0;
     boardSpaceLink = BoardSpaceGet(0, boardIdx);
@@ -1325,7 +1317,6 @@ static s32 DoDebugMove(s32 arg0, s16 *arg1)
     s32 var_r21;
     s32 var_r20;
     s32 var_r18;
-    bitcopy *var_r17;
 
     var_r18 = -1;
 
@@ -1653,7 +1644,6 @@ void BoardPlayerMoveTo(s32 arg0, s32 arg1)
 {
     Vec sp18;
     Vec spC;
-    PlayerState *player;
 
     BoardModelPosGet(BoardPlayerModelGet(arg0), &sp18);
     BoardSpacePosGet(0, arg1, &spC);
@@ -1667,8 +1657,6 @@ void BoardPlayerMoveBetween(s32 arg0, s32 arg1, s32 arg2)
 {
     Vec sp1C;
     Vec sp10;
-    s32 spC;
-    s32 sp8;
 
     BoardSpacePosGet(0, arg1, &sp1C);
     BoardSpacePosGet(0, arg2, &sp10);
@@ -1682,7 +1670,6 @@ void BoardPlayerMoveToAsync(s32 arg0, s32 arg1)
 {
     Vec sp18;
     Vec spC;
-    s32 sp8;
 
     BoardModelPosGet(BoardPlayerModelGet(arg0), &sp18);
     BoardSpacePosGet(0, arg1, &spC);
@@ -1868,11 +1855,8 @@ static void DiceJumpFunc(omObjData *arg0)
 {
     Vec sp38;
     f32 temp_f31;
-    PlayerState *var_r30;
     bitcopy2 *temp_r31;
     s16 var_r28;
-    s32 var_r23;
-    s32 var_r17;
 
     temp_r31 = OM_GET_WORK_PTR(arg0, bitcopy2);
     if ((temp_r31->field00_bit0 != 0) || (BoardIsKill() != 0)) {
@@ -1938,7 +1922,6 @@ void BoardPlayerMotBlendSet(s32 arg0, s16 arg1, s16 arg2)
     f32 var_f27;
     f32 var_f22;
     f32 var_f21;
-    f32 var_f19;
     omObjData *temp_r3;
     s32 var_r22;
     s32 var_r20;
@@ -2212,11 +2195,7 @@ static void UpdateRoll(omObjData *arg0)
 
 void BoardPlayerBtnDownWait(s32 arg0, u32 arg1)
 {
-    s32 spC;
+    s32 temp_r31 = GWPlayer[arg0].port;
-    s32 sp8;
-    s32 temp_r31;
-
-    temp_r31 = GWPlayer[arg0].port;
     while (1) {
         if ((HuPadBtnDown[temp_r31] & arg1) != 0)
             return;
@@ -2226,9 +2205,7 @@ void BoardPlayerBtnDownWait(s32 arg0, u32 arg1)
 
 void BoardPlayerAutoSizeSet(s32 player, s32 value)
 {
-    PlayerState *temp_r28;
+    PlayerState *temp_r28 = BoardPlayerGet(player);
-
-    temp_r28 = BoardPlayerGet(player);
     if ((temp_r28->auto_size != 0) || (value == 0)) {
         BoardStatusHammerKill(player);
     }
@@ -2360,8 +2337,6 @@ void BoardBowserSuitInit(s32 arg0)
 
 void BoardBowserSuitKill(s32 arg0)
 {
-    bitcopy3 *temp;
-
     if (bowserSuitObj != 0) {
         OM_GET_WORK_PTR(bowserSuitObj, bitcopy3)->field00_bit0 = 1;
     }

src/game/board/shop.c

@@ -24,6 +24,8 @@
 #include "dolphin.h"
 #include "ext_math.h"
 
+#include <game/hsfex.h>
+
 typedef struct {
     struct {
         u8 unk00_field0 : 1;
@@ -981,7 +983,6 @@ static void CreateShopItemChoice(s32 arg0, s32 arg1)
     omObjData *temp_r30;
     ItemChoiceWork *var_r31;
     s16 spC;
-    s16 i;
 #if VERSION_PAL
     for (i = 0; i < 6; i++) {
         cursorPosTbl[i][0] = 190;

src/game/board/space.c

@@ -17,6 +17,17 @@
 #include "ext_math.h"
 #include "string.h"
 
+#include <game/audio.h>
+#include <game/board/basic_space.h>
+#include <game/board/bowser.h>
+#include <game/board/fortune.h>
+#include <game/board/warp.h>
+
+s32 BoardBlockExec(s32 player, s32 space); // wrong
+extern void BoardMushroomExec(s32 player, s32 space); // wrong
+extern void BoardBooHouseExec(s32 player, s32 space); // wrong
+extern void BoardBlockHouseExec(s32 player, s32 space); // wrong
+
 static BoardSpace spaceData[2][256];
 s16 boardSpaceStarTbl[8];
 static GXTexObj spaceHiliteTex;
@@ -300,7 +311,6 @@ void BoardSpaceHostSet(s32 space)
 {
     s16 host_space;
     Vec pos;
-    BoardSpace *space_plat;
     BoardSpaceTypeSet(0, space, 8);
     host_space = BoardSpaceLinkFlagSearch(0, space, 0x04000000);
     BoardSpacePosGet(0, host_space, &pos);
@@ -1079,14 +1089,11 @@ void BoardSpaceInit(s32 data_num)
         if (_CheckFlag(FLAG_ID_MAKE(1, 1))) {
             Vec pos;
             Vec rot;
-            s16 space;
             BoardModelVisibilitySet(starPlatMdl, 1);
             GWSystem.star_flag |= (u8)(1 << GWSystem.star_pos);
             BoardSpaceTypeSet(0, boardSpaceStarTbl[GWSystem.star_pos], 8);
             {
-                int space;
+                int space = BoardSpaceLinkFlagSearch(0, BoardSpaceStarGetCurr(), 0x04000000);
-                BoardSpace *space_plat;
-                space = BoardSpaceLinkFlagSearch(0, BoardSpaceStarGetCurr(), 0x04000000);
                 BoardSpacePosGet(0, space, &pos);
                 BoardModelPosSetV(StarPlatGetMdl(), &pos);
                 BoardSpaceRotGet(0, space, &rot);

src/game/board/star.c

@@ -21,9 +21,14 @@
 #include "game/objsub.h"
 #include "game/window.h"
 #include "game/wipe.h"
+#include "game/hsfex.h"
 
 #include "ext_math.h"
 
+#ifndef __MWERKS__
+#include <game/board/view.h>
+#endif
+
 typedef struct {
     struct {
         u8 unk00_field0 : 1;

src/game/board/tutorial.c

@@ -1,9 +1,11 @@
 #include "game/board/tutorial.h"
+#include "game/board/main.h"
+#include "game/board/model.h"
 #include "game/flag.h"
 #include "game/gamework_data.h"
 #include "game/process.h"
-#include "game/board/main.h"
+
-#include "game/board/model.h"
+#include <game/board/space.h>
 
 s32 boardTutorialData[4]; // maybe a single s32 + padding?
 static void (*tutorialHook)(s16, s32);

src/game/board/view.c

@@ -127,8 +127,6 @@ static inline void BoardViewInlineFunc00(Vec *arg0, Vec *arg1, u16 arg2)
 
 void BoardViewFocusSet(Vec *arg0, u16 arg1)
 {
-    u16 var_r31;
-
     if (BoardPauseDisableGet() == 0) {
         BoardPauseDisableSet(1);
         pauseDisableF = 1;
@@ -143,8 +141,6 @@ void BoardViewFocusSet(Vec *arg0, u16 arg1)
 
 void BoardViewMoveStart(Vec *arg0, Vec *arg1, u16 arg2)
 {
-    u16 var_r31;
-
     if (BoardPauseDisableGet() == 0) {
         BoardPauseDisableSet(1);
         pauseDisableF = 1;

src/game/hsfman.c

@@ -23,18 +23,18 @@
 #define SHADOW_HEAP_SIZE 0x9000
 
 SHARED_SYM ModelData Hu3DData[HU3D_MODEL_MAX];
-CameraData Hu3DCamera[HU3D_CAM_MAX];
+SHARED_SYM CameraData Hu3DCamera[HU3D_CAM_MAX];
 static s16 layerNum[8];
 static void (*layerHook[8])(s16);
 AnimData *reflectAnim[5];
-AnimData *hiliteAnim[4];
+SHARED_SYM AnimData *hiliteAnim[4];
 ThreeDProjectionStruct Hu3DProjection[4];
-ShadowData Hu3DShadowData;
+SHARED_SYM ShadowData Hu3DShadowData;
 HsfScene FogData;
-Mtx Hu3DCameraMtx;
+SHARED_SYM Mtx Hu3DCameraMtx;
-Mtx Hu3DCameraMtxXPose;
+SHARED_SYM Mtx Hu3DCameraMtxXPose;
-LightData Hu3DGlobalLight[0x8];
+SHARED_SYM LightData Hu3DGlobalLight[0x8];
-LightData Hu3DLocalLight[0x20];
+SHARED_SYM LightData Hu3DLocalLight[0x20];
 Mtx lbl_8018D39C;
 
 GXColor BGColor;

src/game/hsfmotion.c

@@ -18,7 +18,7 @@
 static s32 SearchObjectIndex(HsfData *arg0, u32 arg1);
 static s32 SearchAttributeIndex(HsfData *arg0, u32 arg1);
 
-MotionData Hu3DMotion[HU3D_MOTION_MAX];
+SHARED_SYM MotionData Hu3DMotion[HU3D_MOTION_MAX];
 
 static HsfBitmap *bitMapPtr;
 

src/game/init.c

@@ -31,7 +31,7 @@ void *DemoFrameBuffer2;
 void *DemoCurrentBuffer;
 u32 minimumVcount;
 float minimumVcountf;
-u32 worstVcount;
+SHARED_SYM u32 worstVcount;
 static BOOL DemoStatEnable;
 
 

src/game/objsub.c

@@ -6,7 +6,7 @@
 #include "game/window.h"
 
 
-MgInfo mgInfoTbl[] = {
+SHARED_SYM MgInfo mgInfoTbl[] = {
     {
         OVL_M401, // ovl
         0, // type
@@ -1170,7 +1170,7 @@ u8 lbl_801D3E94;
 u32 mgRecordExtra;
 SHARED_SYM s32 mgQuitExtraF;
 SHARED_SYM s32 mgPracticeEnableF;
-s32 mgInstExitEnableF;
+SHARED_SYM s32 mgInstExitEnableF;
 SHARED_SYM u8 mgBoardHostEnableF;
 
 s16 mgTicTacToeGrid[3][3];

src/game/printfunc.c

@@ -24,7 +24,7 @@ struct strline_data {
 static struct strline_data strline[256];
 static char pfStrBuf[256];
 
-int fontcolor;
+SHARED_SYM int fontcolor;
 u16 empstrline;
 u16 strlinecnt;
 BOOL saftyFrameF;

src/port/audio.c

@@ -352,7 +352,7 @@ s32 HuAudSStreamStatGet(s32 seNo) {
     // return msmStreamGetStatus(seNo);
 }
 
-SNDGRPTBL sndGrpTable[] = {
+SHARED_SYM SNDGRPTBL sndGrpTable[] = {
     { OVL_BOOT, -1, 0,  1, -1, -1 },
     { OVL_INST, -1, 0,  1, -1, -1 },
     { OVL_M401, 18, 0,  2, 64, 64 },