d_a_mgameboard_static

configure.py

@@ -351,7 +351,7 @@ config.libs = [
             Object(Matching,    "d/d_a_boko_static.cpp"),
             Object(Matching,    "d/d_a_bomb_static.cpp"),
             Object(Matching,    "d/d_a_branch_static.cpp"),
-            Object(NonMatching, "d/d_a_mgameboard_static.cpp"),
+            Object(Matching,    "d/d_a_mgameboard_static.cpp"),
             Object(Matching,    "d/d_a_itembase_static.cpp"),
             Object(Matching,    "d/d_a_item_static.cpp"),
             Object(Matching,    "d/d_a_shop_item_static.cpp"),

include/d/actor/d_a_mgameboard.h

@@ -17,10 +17,10 @@ public:
     void reqClearGame() {}
     void set_mtx() {}
 
-    void checkClearGame();
-    void getScore();
+    bool checkClearGame();
+    u8 getScore();
     void reqStartGame();
-    void checkEndGame();
+    bool checkEndGame();
     void setGInfoDraw();
     void clrGInfoDraw();
     void CreateHeap();

include/d/d_seafightgame.h

@@ -27,6 +27,7 @@ public:
     /* 0x7D */ u8 mBulletNum;
     /* 0x7E */ u8 mScore;
     /* 0x80 */ int mDeadShipNum;
+    /* 0x84 */ u32 field_0x84[31];
 };
 
 #endif /* D_SEAFIGHTGAME_H */

src/d/d_a_mgameboard_static.cpp

@@ -3,36 +3,35 @@
 // Translation Unit: d_a_mgameboard_static.cpp
 //
 
-#include "d/actor/d_a_mgameboard_static.h"
-#include "dolphin/types.h"
+#include "d/actor/d_a_mgameboard.h"
 
 /* 800685F8-80068608       .text checkClearGame__11daMgBoard_cFv */
-void daMgBoard_c::checkClearGame() {
-    /* Nonmatching */
+bool daMgBoard_c::checkClearGame() {
+    return mSeaFightGame.mAliveShipNum == 0;
 }
 
 /* 80068608-80068610       .text getScore__11daMgBoard_cFv */
-void daMgBoard_c::getScore() {
-    /* Nonmatching */
+u8 daMgBoard_c::getScore() {
+    return mSeaFightGame.mScore;
 }
 
 /* 80068610-80068624       .text reqStartGame__11daMgBoard_cFv */
 void daMgBoard_c::reqStartGame() {
-    /* Nonmatching */
+    mbEndGame = false;
+    mbStartGame = true;
 }
 
 /* 80068624-80068638       .text checkEndGame__11daMgBoard_cFv */
-void daMgBoard_c::checkEndGame() {
-    /* Nonmatching */
+bool daMgBoard_c::checkEndGame() {
+    return mbEndGame;
 }
 
 /* 80068638-80068644       .text setGInfoDraw__11daMgBoard_cFv */
 void daMgBoard_c::setGInfoDraw() {
-    /* Nonmatching */
+    mbDraw = true;
 }
 
 /* 80068644-80068650       .text clrGInfoDraw__11daMgBoard_cFv */
 void daMgBoard_c::clrGInfoDraw() {
-    /* Nonmatching */
+    mbDraw = false;
 }
-