Merge pull request #151 from Darxoon/main

Add objsub.c and objsub.h

configure.py

@@ -355,7 +355,7 @@ config.libs = [
             Object(Matching, "game/THPSimple.c"),
             Object(Matching, "game/THPDraw.c"),
             Object(Matching, "game/thpmain.c"),
-            Object(NonMatching, "game/objsub.c"),
+            Object(Matching, "game/objsub.c"),
             Object(Matching, "game/flag.c"),
             Object(Matching, "game/saveload.c"),
             Object(NonMatching, "game/sreset.c"),

include/game/objsub.h

@@ -0,0 +1,30 @@
+#ifndef _GAME_OBJSUB_H
+#define _GAME_OBJSUB_H
+
+#include "dolphin.h"
+#include "game/process.h"
+
+typedef struct mg_info {
+    u16 ovl;
+    u8 type;
+    u8 flag;
+    u16 unk_4;
+    u16 unk_6;
+    u32 name_mess;
+    u32 data_dir;
+    u32 inst_pic;
+    u32 unk_14;
+    u32 unk_18;
+    u32 mg_pic;
+    u32 unk_20;
+    u32 unk_24;
+    u32 rules_mess;
+    u32 control_mess[2];
+    u32 advice_mess;
+} MgInfo;
+
+s16 omGetMGIndex(s16 overlay);
+void omGameSysInit(Process* process);
+void omVibrate(s16 player_cfg_index, s16 duration, s16 off, s16 on);
+
+#endif

src/REL/m401Dll/m401Dll.h

@@ -1,6 +1,7 @@
 #include "common.h"
 #include "REL/executor.h"
 #include <dolphin/mtx.h>
+#include "game/objsub.h"
 
 // global data //
 typedef struct unkStruct18FC10 {
@@ -94,7 +95,6 @@ extern void espBankSet(s16, s16);
 extern void espDrawNoSet(s16, s16);
 extern void WipeCreate(s16, s16, s16);
 extern u8 WipeStatGet(void);
-extern void omGameSysInit(omObjData*);
 extern f32 PSVECNormalize(Vec3f*, Vec3f*);
 
 // local data //

src/REL/w03Dll/mg_item.c

@@ -6,6 +6,7 @@
 #include "REL/w03Dll.h"
 #include "game/board/space.h"
 #include "game/object.h"
+#include "game/objsub.h"
 #include "game/board/player.h"
 #include "math.h"
 #include "board_unsplit.h"
@@ -67,7 +68,6 @@ s32 BoardVecDAngleCalcRange(float *value, float min, float range);
 void BoardCameraQuakeSet(s32 duration, float strength);
 s16 MGSeqCreate(s32, ...);
 u8 MGSeqStatGet(s16);
-void omVibrate(s16, s16, s16, s16);
 f32 BoardPlayerRotYGet(s32);
 f32 BoardModelMotionTimeGet(s16);
 s32 BoardVecMinDistCheck(Vec *vec1, Vec *vec2, float min_dist);

src/REL/w03Dll/statue.c

@@ -10,6 +10,7 @@
 #include "board_unsplit.h"
 #include "game/hsfman.h"
 #include "game/board/main.h"
+#include "game/objsub.h"
 
 void fn_1_1358(void);
 void fn_1_152C(void);
@@ -29,7 +30,6 @@ s32 BoardPlayerMotBlendCheck(s32);
 f32 BoardPlayerRotYGet(s32);
 void BoardConfettiCreate(Point3d*, s16, f32);
 double atan2(double y, double x);
-void omVibrate(s16, s16, s16, s16);
 f32 BoardModelMotionTimeGet(s16);
 
 //DATA

src/game/board/basic_space.c

@@ -4,6 +4,7 @@
 #include "game/data.h"
 #include "game/flag.h"
 #include "game/object.h"
+#include "game/objsub.h"
 #include "game/gamework_data.h"
 #include "board_unsplit.h"
 #include "math.h"
@@ -35,7 +36,6 @@ static void CoinChgDisappear(omObjData*, coinChg*);
 
 extern void BoardTutorialHookExec(s16, s32);
 extern void BoardCameraViewSet(s32);
-extern void omVibrate(s16, s16, s16, s16);
 extern void BoardPlayerPosGet(s32, Vec*);
 extern void BoardModelPosGet(s16, Vec*);
 extern void BoardPlayerMotionEndWait(s32);

src/game/board/player.c

@@ -1,7 +1,5 @@
 #include "game/board/player.h"
-
-//// #include "game/objsub.h"
-extern void omVibrate(s16, s16, s16, s16);
+#include "game/objsub.h"
 //// #include "game/board/ui.h"
 extern void BoardStatusHammerShowSet(s32, s32);
 extern void BoardYourTurnExec(s32);

src/game/board/space.c

@@ -6,12 +6,11 @@
 #include "game/hsfman.h"
 #include "game/data.h"
 #include "game/sprite.h"
+#include "game/objsub.h"
 
 #include "math.h"
 #include "string.h"
 
-extern void omVibrate(s16, s16, s16, s16);
-
 
 extern s16 BoardStarHostMdlGet(void);
 extern void BoardModelPosSetV(s16 model, Vec *pos);

src/game/board/warp.c

@@ -4,6 +4,7 @@
 #include "game/wipe.h"
 #include "game/gamework_data.h"
 #include "game/hsfex.h"
+#include "game/objsub.h"
 #include "board_unsplit.h"
 #include "math.h"
 
@@ -14,7 +15,6 @@ static void WarpFall(s32);
 static void WarpImpact(s32);
 
 
-extern void omVibrate(s16, s16, s16, s16);
 extern void BoardCharWheelInit(s32, s32);
 extern void BoardCharWheelSpeedSet(f32);
 extern void BoardCharWheelWait(void);