d_t_sword_battle_game OK - function order issue

2 files changed, 20 insertions, 0 deletions

diff --git a/include/toBeSorted/minigame_mgr.h b/include/toBeSorted/minigame_mgr.h
index f473974b..779e50c0 100644
--- a/include/toBeSorted/minigame_mgr.h
+++ b/include/toBeSorted/minigame_mgr.h
@@ -19,8 +19,11 @@ public:
         HARP_PLAYING,
     };
     static bool isInMinigameState(Minigame game);
+
     static bool isInAnyMinigame();
 
+    static bool endMinigame(Minigame game);
+
     static void create();
     static void destroy();
     static void execute();
diff --git a/include/toBeSorted/timekeeper.h b/include/toBeSorted/timekeeper.h
index 1bf6d842..d297bb76 100644
--- a/include/toBeSorted/timekeeper.h
+++ b/include/toBeSorted/timekeeper.h
@@ -3,9 +3,26 @@
 
 #include "common.h"
 
+#define TIME_CONVERT(min, sec, msec) ((min * 60 * 1000) + (sec * 1000) + (msec * 10))
+
 class Timekeeper {
 public:
+    Timekeeper();
+    virtual ~Timekeeper();
+
+    virtual s32 vt_0x0C(); ///< Init
+    virtual s32 vt_0x10(); ///< Delete
+    virtual s32 vt_0x14();
+    virtual s32 doCount();
+    virtual s32 vt_0x1C();
+
     s32 getTime() const;
+    void initUpCounter();
+
+    /* 0x08 */ s64 mTime;
+    /* 0x10 */ u32 mCountingUp;
+    /* 0x14 */ u32 mCountingDown;
+    /* 0x1C */ bool field_0x1C;
 };
 
 #endif