From f71f3d712388bc4101f9ec735e8c30efeb24a9e2 Mon Sep 17 00:00:00 2001 From: compugab Date: Thu, 18 Jun 2026 19:34:50 -0400 Subject: [PATCH] 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. --- configure.py | 2 +- include/d/lyt/d_lyt_boss_gauge.h | 16 +--- src/d/lyt/d_lyt_boss_gauge.cpp | 126 ++++++++++++++++--------------- 3 files changed, 68 insertions(+), 76 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,60 +10,12 @@ 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() { - return; -} -void dLytBossGauge_c::fn_801583F0() { - return; -} - -void dLytBossGauge_c::fn_80158400() { - if (mAnmGroups[BOSS_GAUGE_ANIM_IN].isEndReached()) { - mAnmGroups[BOSS_GAUGE_ANIM_IN].setAnimEnable(false); - mStateMgr.changeState(dLytBossGauge_c::StateID_Move); - } - return; -} - -void dLytBossGauge_c::fn_80158480() { - return; -} -void dLytBossGauge_c::fn_80158490() { - return; -} - -void dLytBossGauge_c::fn_801584A0() { - if (field_0x545) { - mAnmGroups[BOSS_GAUGE_ANIM_OUT].setAnimEnable(true); - mAnmGroups[BOSS_GAUGE_ANIM_OUT].setFrame(0.0f); - mStateMgr.changeState(dLytBossGauge_c::StateID_Out); - field_0x545 = false; - } - return; -} - -void dLytBossGauge_c::fn_80158520() { - return; -} -void dLytBossGauge_c::fn_80158530() { - return; -} - -void dLytBossGauge_c::fn_80158540() { - if (mAnmGroups[BOSS_GAUGE_ANIM_OUT].isEndReached()) { - mAnmGroups[BOSS_GAUGE_ANIM_OUT].setAnimEnable(false); - field_0x546 = true; - mStateMgr.changeState(dLytBossGauge_c::StateID_None); - } -} - -void dLytBossGauge_c::fn_801585C0() { - return; -} void dLytBossGauge_c::fn_801582A0() { if (field_0x544) { @@ -96,6 +48,58 @@ void dLytBossGauge_c::fn_801582A0() { } } +void dLytBossGauge_c::executeState_None() { + return; +} +void dLytBossGauge_c::finalizeState_None() { + return; +} + +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); + } + return; +} + +void dLytBossGauge_c::executeState_In() { + return; +} + +void dLytBossGauge_c::finalizeState_In() { + return; +} + +void dLytBossGauge_c::initializeState_Move() { + if (field_0x545) { + mAnmGroups[BOSS_GAUGE_ANIM_OUT].setAnimEnable(true); + mAnmGroups[BOSS_GAUGE_ANIM_OUT].setFrame(0.0f); + mStateMgr.changeState(dLytBossGauge_c::StateID_Out); + field_0x545 = false; + } + return; +} + +void dLytBossGauge_c::executeState_Move() { + return; +} +void dLytBossGauge_c::finalizeState_Move() { + return; +} + +void dLytBossGauge_c::initializeState_Out() { + if (mAnmGroups[BOSS_GAUGE_ANIM_OUT].isEndReached()) { + mAnmGroups[BOSS_GAUGE_ANIM_OUT].setAnimEnable(false); + field_0x546 = true; + mStateMgr.changeState(dLytBossGauge_c::StateID_None); + } +} + +void dLytBossGauge_c::executeState_Out() { + return; +} + 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;