diff options
| -rw-r--r-- | config/SOUE01/symbols.txt | 22 | ||||
| -rw-r--r-- | include/d/lyt/d_lyt_boss_gauge.h | 3 | ||||
| -rw-r--r-- | src/d/lyt/d_lyt_boss_gauge.cpp | 29 |
3 files changed, 27 insertions, 27 deletions
diff --git a/config/SOUE01/symbols.txt b/config/SOUE01/symbols.txt index 9a80ce1d..926378a2 100644 --- a/config/SOUE01/symbols.txt +++ b/config/SOUE01/symbols.txt @@ -8706,17 +8706,17 @@ getName__22dLytDepositBoxCursor_cCFv = .text:0x80158260; // type:function size:0 getLyt__22dLytDepositBoxCursor_cFv = .text:0x80158270; // type:function size:0x8 scope:weak getPane__22dLytDepositBoxCursor_cFv = .text:0x80158280; // type:function size:0x8 scope:weak initializeState_None__15dLytBossGauge_cFv = .text:0x80158290; // type:function size:0x4 -fn_801582A0__15dLytBossGauge_cFv = .text:0x801582A0; // type:function size:0x134 -executeState_None__15dLytBossGauge_cFv = .text:0x801583E0; // type:function size:0x4 -finalizeState_None__15dLytBossGauge_cFv = .text:0x801583F0; // type:function size:0x4 -initializeState_In__15dLytBossGauge_cFv = .text:0x80158400; // type:function size:0x78 -executeState_In__15dLytBossGauge_cFv = .text:0x80158480; // type:function size:0x4 -finalizeState_In__15dLytBossGauge_cFv = .text:0x80158490; // type:function size:0x4 -initializeState_Move__15dLytBossGauge_cFv = .text:0x801584A0; // type:function size:0x78 -executeState_Move__15dLytBossGauge_cFv = .text:0x80158520; // type:function size:0x4 -finalizeState_Move__15dLytBossGauge_cFv = .text:0x80158530; // type:function size:0x4 -initializeState_Out__15dLytBossGauge_cFv = .text:0x80158540; // type:function size:0x80 -executeState_Out__15dLytBossGauge_cFv = .text:0x801585C0; // type:function size:0x4 +executeState_None__15dLytBossGauge_cFv = .text:0x801582A0; // type:function size:0x134 +finalizeState_None__15dLytBossGauge_cFv = .text:0x801583E0; // type:function size:0x4 +initializeState_In__15dLytBossGauge_cFv = .text:0x801583F0; // type:function size:0x4 +executeState_In__15dLytBossGauge_cFv = .text:0x80158400; // type:function size:0x78 +finalizeState_In__15dLytBossGauge_cFv = .text:0x80158480; // type:function size:0x4 +initializeState_Move__15dLytBossGauge_cFv = .text:0x80158490; // type:function size:0x4 +executeState_Move__15dLytBossGauge_cFv = .text:0x801584A0; // type:function size:0x78 +finalizeState_Move__15dLytBossGauge_cFv = .text:0x80158520; // type:function size:0x4 +initializeState_Out__15dLytBossGauge_cFv = .text:0x80158530; // type:function size:0x4 +executeState_Out__15dLytBossGauge_cFv = .text:0x80158540; // type:function size:0x80 +finalizeState_Out__15dLytBossGauge_cFv = .text:0x801585C0; // type:function size:0x4 build__15dLytBossGauge_cFv = .text:0x801585D0; // type:function size:0x188 execute__15dLytBossGauge_cFv = .text:0x80158760; // type:function size:0x100 draw__15dLytBossGauge_cFv = .text:0x80158860; // type:function size:0x68 diff --git a/include/d/lyt/d_lyt_boss_gauge.h b/include/d/lyt/d_lyt_boss_gauge.h index ca263d58..1b3f8ffc 100644 --- a/include/d/lyt/d_lyt_boss_gauge.h +++ b/include/d/lyt/d_lyt_boss_gauge.h @@ -3,8 +3,6 @@ #include "d/lyt/d2d.h" #include "s/s_State.hpp" -#include "sized_string.h" -#include "toBeSorted/arc_managers/layout_arc_manager.h" class dLytBossGauge_c { public: @@ -26,7 +24,6 @@ public: field_0x546 = value; } - void fn_801582A0(); void fn_80158940(f32); private: diff --git a/src/d/lyt/d_lyt_boss_gauge.cpp b/src/d/lyt/d_lyt_boss_gauge.cpp index f14809bd..79448b9b 100644 --- a/src/d/lyt/d_lyt_boss_gauge.cpp +++ b/src/d/lyt/d_lyt_boss_gauge.cpp @@ -1,5 +1,9 @@ #include "d/lyt/d_lyt_boss_gauge.h" +#include "common.h" +#include "toBeSorted/arc_managers/layout_arc_manager.h" +#include "sized_string.h" + STATE_DEFINE(dLytBossGauge_c, None); STATE_DEFINE(dLytBossGauge_c, In); STATE_DEFINE(dLytBossGauge_c, Move); @@ -13,11 +17,10 @@ STATE_DEFINE(dLytBossGauge_c, Out); dLytBossGauge_c *dLytBossGauge_c::sInstance; void dLytBossGauge_c::initializeState_None() { - 0.0f; return; } -void dLytBossGauge_c::fn_801582A0() { +void dLytBossGauge_c::executeState_None() { if (field_0x544) { mAnmGroups[BOSS_GAUGE_ANIM_IN].setAnimEnable(true); mAnmGroups[BOSS_GAUGE_ANIM_IN].setFrame(0.0f); @@ -48,14 +51,14 @@ void dLytBossGauge_c::fn_801582A0() { } } -void dLytBossGauge_c::executeState_None() { +void dLytBossGauge_c::finalizeState_None() { return; } -void dLytBossGauge_c::finalizeState_None() { +void dLytBossGauge_c::initializeState_In() { return; } -void dLytBossGauge_c::initializeState_In() { +void dLytBossGauge_c::executeState_In() { if (mAnmGroups[BOSS_GAUGE_ANIM_IN].isEndReached()) { mAnmGroups[BOSS_GAUGE_ANIM_IN].setAnimEnable(false); mStateMgr.changeState(dLytBossGauge_c::StateID_Move); @@ -63,15 +66,15 @@ void dLytBossGauge_c::initializeState_In() { return; } -void dLytBossGauge_c::executeState_In() { +void dLytBossGauge_c::finalizeState_In() { return; } -void dLytBossGauge_c::finalizeState_In() { +void dLytBossGauge_c::initializeState_Move() { return; } -void dLytBossGauge_c::initializeState_Move() { +void dLytBossGauge_c::executeState_Move() { if (field_0x545) { mAnmGroups[BOSS_GAUGE_ANIM_OUT].setAnimEnable(true); mAnmGroups[BOSS_GAUGE_ANIM_OUT].setFrame(0.0f); @@ -81,14 +84,14 @@ void dLytBossGauge_c::initializeState_Move() { return; } -void dLytBossGauge_c::executeState_Move() { +void dLytBossGauge_c::finalizeState_Move() { return; } -void dLytBossGauge_c::finalizeState_Move() { +void dLytBossGauge_c::initializeState_Out() { return; } -void dLytBossGauge_c::initializeState_Out() { +void dLytBossGauge_c::executeState_Out() { if (mAnmGroups[BOSS_GAUGE_ANIM_OUT].isEndReached()) { mAnmGroups[BOSS_GAUGE_ANIM_OUT].setAnimEnable(false); field_0x546 = true; @@ -96,7 +99,7 @@ void dLytBossGauge_c::initializeState_Out() { } } -void dLytBossGauge_c::executeState_Out() { +void dLytBossGauge_c::finalizeState_Out() { return; } @@ -113,7 +116,7 @@ bool dLytBossGauge_c::build() { void *data = LayoutArcManager::GetInstance()->getLoadedData("BossGauge"); - mResAcc.attach(data, "arc"); + mResAcc.attach(data, ""); mLyt.setResAcc(&mResAcc); mLyt.build("bossGauge_00.brlyt", nullptr); |