Merge pull request #182 from mrshigure/pause

Matched board/pause

configure.py

@@ -386,7 +386,7 @@ config.libs = [
             Object(NonMatching, "game/board/boo_house.c"),
             Object(NonMatching, "game/board/start.c"),
             Object(NonMatching, "game/board/last5.c"),
-            Object(NonMatching, "game/board/pause.c"),
+            Object(Matching, "game/board/pause.c"),
             Object(Matching, "game/board/com_path.c"),
             Object(Matching, "game/board/tutorial.c"),
             Object(NonMatching, "game/kerent.c"),

include/game/board/pause.h

@@ -0,0 +1,10 @@
+#ifndef _BOARD_PAUSE_H
+#define _BOARD_PAUSE_H
+
+#include "dolphin/types.h"
+
+void BoardPauseStart(void);
+BOOL BoardPauseActiveCheck(void);
+BOOL BoardPauseReqCheck(void);
+
+#endif

include/game/gamework_data.h

@@ -152,11 +152,31 @@ static inline s32 GWTeamGet(void)
     return GWSystem.team;
 }
 
+static inline s32 GWPartyGet(void)
+{
+    return GWSystem.party;
+}
+
 static inline s32 GWLanguageGet(void)
 {
     return GWGameStat.language;
 }
 
+static inline s32 GWRumbleGet(void)
+{
+    return GWGameStat.rumble;
+}
+
+static inline s32 GWMGExplainGet(void)
+{
+    return GWSystem.explain_mg;
+}
+
+static inline s32 GWMGShowComGet(void)
+{
+    return GWSystem.show_com_mg;
+}
+
 static inline s32 GWMGListGet(void)
 {
     return GWSystem.mg_list;
@@ -167,6 +187,11 @@ static inline s32 GWMessSpeedGet(void)
     return GWSystem.mess_speed;
 }
 
+static inline s32 GWTurnGet(void)
+{
+    return GWSystem.turn;
+}
+
 static inline s32 GWBoardGet(void)
 {
     return GWSystem.board;

include/game/window.h

@@ -95,7 +95,7 @@ void HuWinScissorSet(s16 window, s16 x, s16 y, s16 w, s16 h);
 void HuWinPriSet(s16 window, s16 prio);
 void HuWinAttrSet(s16 window, u32 attr);
 void HuWinAttrReset(s16 window, u32 attr);
-u8 HuWinStatGet(s16 window);
+s16 HuWinStatGet(s16 window);
 void HuWinMesColSet(s16 window, u8 color);
 void HuWinMesPalSet(s16 window, u8 index, u8 r, u8 g, u8 b);
 void HuWinBGTPLvlSet(s16 window, float tp_level);

src/game/board/main.c

@@ -9,6 +9,7 @@
 #include "game/hsfman.h"
 #include "game/hsfdraw.h"
 #include "game/board/main.h"
+#include "game/board/pause.h"
 #include "game/board/player.h"
 #include "game/board/tutorial.h"
 #include "game/pad.h"

src/game/board/roll.c

@@ -8,6 +8,7 @@
 #include "game/window.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"
 
@@ -39,7 +40,6 @@ typedef struct {
 } DiceDigitWork;
 
 s32 BoardRollResizeCheck(void);
-s32 BoardPauseActiveCheck(void);
 
 static void RollMain(void);
 static void DiceCreate(s32 arg0);

src/game/window.c

@@ -1202,7 +1202,7 @@ void HuWinAttrReset(s16 window, u32 attr) {
     window_ptr->attr &= ~attr;
 }
 
-u8 HuWinStatGet(s16 window) {
+s16 HuWinStatGet(s16 window) {
     WindowData *window_ptr = &winData[window];
 
     return window_ptr->stat;