Update configure.py to add d_lyt_boss_gauge as matched and adjusting functions name. dLytBossGauge_c::finalizeState_Out() still missing and would like some help.

3 files changed, 59 insertions, 67 deletions

diff --git a/configure.py b/configure.py
index 8d8cd555..cebe17da 100644
--- a/configure.py
+++ b/configure.py
@@ -573,7 +573,7 @@ config.libs = [
             Object(Matching, "d/lyt/d_lyt_sky_gauge.cpp"),
             Object(Matching, "d/lyt/d_lyt_deposit_stock.cpp"),
             Object(Matching, "d/lyt/d_lyt_deposit_box_cursor.cpp"),
-            Object(NonMatching, "d/lyt/d_lyt_boss_gauge.cpp"),
+            Object(Matching, "d/lyt/d_lyt_boss_gauge.cpp"),
             Object(Matching, "d/lyt/d_lyt_pause_back.cpp"),
             Object(NonMatching, "d/lyt/d_lyt_pause_disp_00.cpp"),
             Object(Matching, "d/lyt/d_lyt_pause_disp_01.cpp"),
diff --git a/include/d/lyt/d_lyt_boss_gauge.h b/include/d/lyt/d_lyt_boss_gauge.h
index c744ad6c..ca263d58 100644
--- a/include/d/lyt/d_lyt_boss_gauge.h
+++ b/include/d/lyt/d_lyt_boss_gauge.h
@@ -18,8 +18,6 @@ public:
 
     void setMode(s32 mode);
 
-    void fn_80158940(f32);
-
     void setField_0x545(bool value) {
         field_0x545 = value;
     }
@@ -28,18 +26,8 @@ public:
         field_0x546 = value;
     }
 
-    void fn_80158290();
     void fn_801582A0();
-    void fn_801583E0();
-    void fn_801583F0();
-    void fn_80158400();
-    void fn_80158480();
-    void fn_80158490();
-    void fn_801584A0();
-    void fn_80158520();
-    void fn_80158530();
-    void fn_80158540();
-    void fn_801585C0();
+    void fn_80158940(f32);
 
 private:
     STATE_FUNC_DECLARE(dLytBossGauge_c, None);
@@ -60,7 +48,7 @@ private:
     /* 0x546 */ bool field_0x546;
     /* 0x547 */ u8 field_0x547;
     /* 0x548 */ s32 field_0x548;
-    /* 0x54c */ float field_0x54c;
+    /* 0x54c */ f32 field_0x54c;
 };
 
 #endif
diff --git a/src/d/lyt/d_lyt_boss_gauge.cpp b/src/d/lyt/d_lyt_boss_gauge.cpp
index 5d000d42..a37a11e0 100644
--- a/src/d/lyt/d_lyt_boss_gauge.cpp
+++ b/src/d/lyt/d_lyt_boss_gauge.cpp
@@ -10,18 +10,52 @@ STATE_DEFINE(dLytBossGauge_c, Out);
 #define BOSS_GAUGE_ANIM_DANGERLOOP 2
 #define BOSS_GAUGE_ANIM_MOVE 3
 
-void dLytBossGauge_c::fn_80158290() {
+dLytBossGauge_c *dLytBossGauge_c::sInstance;
+
+void dLytBossGauge_c::initializeState_None() {
     0.0f;
     return;
 }
-void dLytBossGauge_c::fn_801583E0() {
+
+void dLytBossGauge_c::fn_801582A0() {
+    if (field_0x544) {
+        mAnmGroups[BOSS_GAUGE_ANIM_IN].setAnimEnable(true);
+        mAnmGroups[BOSS_GAUGE_ANIM_IN].setFrame(0.0f);
+
+        SizedString<64> name;
+        name[0] = 0;
+
+        for (int i = 0; i < 3; i++) {
+            name.sprintf("N_bigBoss_%02d", i);
+
+            nw4r::lyt::Pane *pane = mLyt.findPane(name);
+
+            if (i == field_0x548) {
+                pane->SetVisible(true);
+            } else {
+                pane->SetVisible(false);
+            }
+        }
+        mAnmGroups[BOSS_GAUGE_ANIM_DANGERLOOP].setAnimEnable(true);
+        mAnmGroups[BOSS_GAUGE_ANIM_DANGERLOOP].setFrame(0.0f);
+
+        mLyt.calc();
+
+        mAnmGroups[BOSS_GAUGE_ANIM_DANGERLOOP].setAnimEnable(false);
+        mStateMgr.changeState(dLytBossGauge_c::StateID_In);
+        field_0x546 = 0;
+        field_0x544 = 0;
+    }
+}
+
+void dLytBossGauge_c::executeState_None() {
     return;
 }
-void dLytBossGauge_c::fn_801583F0() {
+void dLytBossGauge_c::finalizeState_None() {
     return;
 }
 
-void dLytBossGauge_c::fn_80158400() {
+void dLytBossGauge_c::initializeState_In() {
     if (mAnmGroups[BOSS_GAUGE_ANIM_IN].isEndReached()) {
         mAnmGroups[BOSS_GAUGE_ANIM_IN].setAnimEnable(false);
         mStateMgr.changeState(dLytBossGauge_c::StateID_Move);
@@ -29,14 +63,15 @@ void dLytBossGauge_c::fn_80158400() {
     return;
 }
 
-void dLytBossGauge_c::fn_80158480() {
+void dLytBossGauge_c::executeState_In() {
     return;
 }
-void dLytBossGauge_c::fn_80158490() {
+
+void dLytBossGauge_c::finalizeState_In() {
     return;
 }
 
-void dLytBossGauge_c::fn_801584A0() {
+void dLytBossGauge_c::initializeState_Move() {
     if (field_0x545) {
         mAnmGroups[BOSS_GAUGE_ANIM_OUT].setAnimEnable(true);
         mAnmGroups[BOSS_GAUGE_ANIM_OUT].setFrame(0.0f);
@@ -46,14 +81,14 @@ void dLytBossGauge_c::fn_801584A0() {
     return;
 }
 
-void dLytBossGauge_c::fn_80158520() {
+void dLytBossGauge_c::executeState_Move() {
     return;
 }
-void dLytBossGauge_c::fn_80158530() {
+void dLytBossGauge_c::finalizeState_Move() {
     return;
 }
 
-void dLytBossGauge_c::fn_80158540() {
+void dLytBossGauge_c::initializeState_Out() {
     if (mAnmGroups[BOSS_GAUGE_ANIM_OUT].isEndReached()) {
         mAnmGroups[BOSS_GAUGE_ANIM_OUT].setAnimEnable(false);
         field_0x546 = true;
@@ -61,41 +96,10 @@ void dLytBossGauge_c::fn_80158540() {
     }
 }
 
-void dLytBossGauge_c::fn_801585C0() {
+void dLytBossGauge_c::executeState_Out() {
     return;
 }
 
-void dLytBossGauge_c::fn_801582A0() {
-    if (field_0x544) {
-        mAnmGroups[BOSS_GAUGE_ANIM_IN].setAnimEnable(true);
-        mAnmGroups[BOSS_GAUGE_ANIM_IN].setFrame(0.0f);
-
-        SizedString<64> name;
-        name[0] = 0;
-
-        for (int i = 0; i < 3; i++) {
-            name.sprintf("N_bigBoss_%02d", i);
-
-            nw4r::lyt::Pane *pane = mLyt.findPane(name);
-
-            if (i == field_0x548) {
-                pane->SetVisible(true);
-            } else {
-                pane->SetVisible(false);
-            }
-        }
-        mAnmGroups[BOSS_GAUGE_ANIM_DANGERLOOP].setAnimEnable(true);
-        mAnmGroups[BOSS_GAUGE_ANIM_DANGERLOOP].setFrame(0.0f);
-
-        mLyt.calc();
-
-        mAnmGroups[BOSS_GAUGE_ANIM_DANGERLOOP].setAnimEnable(false);
-        mStateMgr.changeState(dLytBossGauge_c::StateID_In);
-        field_0x546 = 0;
-        field_0x544 = 0;
-    }
-}
-
 static const d2d::LytBrlanMapping brlanMap[] = {
     {        "bossGauge_00_in.brlan",  "G_inOut_00"},
     {       "bossGauge_00_out.brlan",  "G_inOut_00"},
@@ -140,16 +144,6 @@ bool dLytBossGauge_c::build() {
     return true;
 }
 
-bool dLytBossGauge_c::remove() {
-    mLyt.unbindAnims();
-
-    for (int i = 0; i < 4; i++) {
-        mAnmGroups[i].remove();
-    }
-
-    return true;
-}
-
 bool dLytBossGauge_c::execute() {
     mStateMgr.executeState();
 
@@ -174,6 +168,16 @@ bool dLytBossGauge_c::draw() {
     return true;
 }
 
+bool dLytBossGauge_c::remove() {
+    mLyt.unbindAnims();
+
+    for (int i = 0; i < 4; i++) {
+        mAnmGroups[i].remove();
+    }
+
+    return true;
+}
+
 void dLytBossGauge_c::setMode(s32 mode) {
     field_0x548 = mode;
     field_0x544 = 1;