Merge pull request #219 from gamemasterplc/main

Remove unsplit headers

config/GMPE01_00/rels/w03Dll/symbols.txt

@@ -345,7 +345,7 @@ lbl_1_data_282 = .data:0x00000282; // type:object size:0x2 data:2byte
 lbl_1_data_284 = .data:0x00000284; // type:object size:0x2 data:2byte
 lbl_1_data_286 = .data:0x00000286; // type:object size:0x2 data:2byte
 lbl_1_data_288 = .data:0x00000288; // type:object size:0x4 data:4byte
-lbl_1_data_28C = .data:0x0000028C; // type:object size:0x4
+lbl_1_data_28C = .data:0x0000028C; // type:object size:0x4 scope:local
 lbl_1_data_290 = .data:0x00000290; // type:object size:0x20
 lbl_1_data_2B0 = .data:0x000002B0; // type:object size:0x20
 lbl_1_data_2D0 = .data:0x000002D0; // type:object size:0x20

include/REL/w10Dll.h

@@ -3,8 +3,6 @@
 #include "REL/executor.h"
 #include "game/process.h"
 #include "game/window.h"
-#include "board_unsplit.h"
-#include "unsplit.h"
 
 #define ARRAY_COUNT(arr) (s32)(sizeof(arr) / sizeof(arr[0]))
 

include/board_unsplit.h

@@ -1,21 +0,0 @@
-#ifndef _UNSPLIT_BOARD_H
-#define _UNSPLIT_BOARD_H
-
-#include "dolphin.h"
-
-#ifndef _BOARD_MAIN_H
-typedef void (*BoardLightHook)(void);
-#endif
-
-void BoardMGSetupTutorialExec(void);
-void BoardBooHouseTutorialExec(void);
-void BoardLightHookSet(BoardLightHook set, BoardLightHook reset);
-s32 fn_8006DDE8(s16, f32);
-void BoardBooHouseHostSet(s16);
-s32 BoardCameraRotGet(Vec*);
-s32 BoardIsKill(void);
-
-s32 BoardBowserExec(s32 player, s32 space);
-void BoardFortuneExec(s32 player, s32 space);
-
-#endif

include/game/board/player.h

@@ -2,8 +2,7 @@
 #define _BOARD_PLAYER_H
 
 #include "math.h"
-#include "board_unsplit.h"
+#include "dolphin.h"
-#include "dolphin/os/OSFastCast.h"
 #include "game/gamework_data.h"
 #include "game/gamework.h"
 #include "game/window.h"

include/unsplit.h

@@ -1,12 +0,0 @@
-#ifndef _UNSPLIT_H
-#define _UNSPLIT_H
-
-#include "dolphin.h"
-
-void MGSeqKillAll(void);
-
-void MGSeqPracticeInit(void);
-void CharMotionClose(s16 character);
-void CharModelClose(s16 character);
-
-#endif

src/REL/modeltestDll/main.c

@@ -1,5 +1,4 @@
 #include "math.h"
-#include "unsplit.h"
 #include "game/chrman.h"
 #include "game/object.h"
 #include "game/wipe.h"

src/REL/modeltestDll/modeltest00.c

@@ -1,5 +1,4 @@
 #include "math.h"
-#include "unsplit.h"
 #include "game/chrman.h"
 #include "game/wipe.h"
 #include "game/pad.h"

src/REL/w03Dll/main.c

@@ -7,6 +7,8 @@
 #include "game/wipe.h"
 #include "REL/w03Dll.h"
 #include "game/board/lottery.h"
+#include "game/board/boo_house.h"
+
 #include "game/board/main.h"
 #include "game/board/model.h"
 #include "game/board/shop.h"
@@ -15,7 +17,6 @@
 #include "game/object.h"
 #include "game/board/player.h"
 #include "math.h"
-#include "board_unsplit.h"
 #include "game/hsfman.h"
 
 void fn_1_740(void);

src/REL/w03Dll/mg_coin.c

@@ -2,7 +2,6 @@
 #include "game/chrman.h"
 #include "game/object.h"
 #include "REL/w03Dll.h"
-#include "board_unsplit.h"
 #include "game/board/main.h"
 #include "game/board/model.h"
 #include "game/board/player.h"

src/REL/w03Dll/mg_item.c

@@ -11,7 +11,6 @@
 #include "game/objsub.h"
 #include "game/board/player.h"
 #include "math.h"
-#include "board_unsplit.h"
 #include "game/hsfman.h"
 #include "dolphin/os/OSFastCast.h"
 

src/REL/w03Dll/river.c

@@ -1,7 +1,6 @@
 #include "dolphin.h"
 #include "game/object.h"
 #include "REL/w03Dll.h"
-#include "board_unsplit.h"
 #include "game/board/main.h"
 #include "game/board/model.h"
 #include "game/board/player.h"

src/REL/w03Dll/smoke.c

@@ -1,7 +1,6 @@
 #include "dolphin.h"
 #include "game/object.h"
 #include "REL/w03Dll.h"
-#include "board_unsplit.h"
 #include "game/board/main.h"
 #include "game/board/model.h"
 

src/REL/w03Dll/statue.c

@@ -9,7 +9,6 @@
 #include "game/board/player.h"
 #include "game/board/space.h"
 #include "game/board/ui.h"
-#include "board_unsplit.h"
 #include "game/hsfman.h"
 #include "game/board/main.h"
 #include "game/objsub.h"

src/REL/w10Dll/main.c

@@ -8,6 +8,7 @@
 #include "game/board/star.h"
 #include "game/board/tutorial.h"
 #include "game/board/main.h"
+#include "game/board/boo_house.h"
 
 #include "math.h"
 

src/REL/w10Dll/scene.c

@@ -8,6 +8,8 @@
 #include "game/board/star.h"
 #include "game/board/tutorial.h"
 #include "game/board/ui.h"
+#include "game/board/boo_house.h"
+#include "game/board/mg_setup.h"
 
 void TutorialStartExec(void) {
     HostWinExec(0x2E0001);

src/game/board/basic_space.c

@@ -8,7 +8,6 @@
 #include "game/object.h"
 #include "game/objsub.h"
 #include "game/gamework_data.h"
-#include "board_unsplit.h"
 #include "math.h"
 
 typedef struct bit_copy {

src/game/board/main.c

@@ -1,4 +1,3 @@
-#include "board_unsplit.h"
 #include "game/gamework_data.h"
 #include "math.h"
 #include "game/object.h"

src/game/board/mg_setup.c

@@ -1,5 +1,4 @@
 #include "game/board/mg_setup.h"
-#include "unsplit.h"
 #include "game/audio.h"
 #include "game/objsub.h"
 #include "game/wipe.h"

src/game/board/model.c

@@ -5,7 +5,6 @@
 #include "game/hsfmotion.h"
 #include "game/memory.h"
 #include "game/object.h"
-#include "unsplit.h"
 
 #define BOARD_MODEL_MAX 256
 #define BOARD_MOT_MAX 32

src/game/board/ui.c

@@ -17,7 +17,6 @@
 #include "game/board/model.h"
 #include "game/board/player.h"
 #include "game/board/tutorial.h"
-#include "board_unsplit.h"
 
 #include "math.h"
 

src/game/board/warp.c

@@ -10,7 +10,6 @@
 #include "game/hsfdraw.h"
 #include "game/hsfex.h"
 #include "game/objsub.h"
-#include "board_unsplit.h"
 #include "math.h"
 
 static void WarpInit(s32);