summaryrefslogtreecommitdiff
path: root/include/d/lyt
diff options
context:
space:
mode:
Diffstat (limited to 'include/d/lyt')
-rw-r--r--include/d/lyt/d_lyt_boss_gauge.h28
-rw-r--r--include/d/lyt/meter/d_lyt_meter.h2
2 files changed, 27 insertions, 3 deletions
diff --git a/include/d/lyt/d_lyt_boss_gauge.h b/include/d/lyt/d_lyt_boss_gauge.h
index 2beff090..fe358906 100644
--- a/include/d/lyt/d_lyt_boss_gauge.h
+++ b/include/d/lyt/d_lyt_boss_gauge.h
@@ -3,6 +3,8 @@
#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:
@@ -16,12 +18,29 @@ public:
void setMode(s32 mode);
- void fn_80158940();
+ void fn_80158940(f32);
void setField_0x545(bool value) {
field_0x545 = value;
}
+ void setField_0x546(bool value){
+ 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();
+
private:
STATE_FUNC_DECLARE(dLytBossGauge_c, None);
STATE_FUNC_DECLARE(dLytBossGauge_c, In);
@@ -30,13 +49,18 @@ private:
STATE_MGR_DEFINE_UTIL_CHANGESTATE(dLytBossGauge_c);
+ static dLytBossGauge_c *sInstance;
+
/* 0x004 */ UI_STATE_MGR_DECLARE(dLytBossGauge_c);
/* 0x040 */ d2d::ResAccIf_c mResAcc;
/* 0x3B0 */ d2d::dLytSub mLyt;
/* 0x444 */ d2d::AnmGroup_c mAnmGroups[4];
/* 0x544 */ u8 field_0x544;
/* 0x545 */ bool field_0x545;
- /* 0x546 */ u8 _0x546[0x550 - 0x546];
+ /* 0x546 */ bool field_0x546;
+ /* 0x547 */ u8 field_0x547;
+ /* 0x548 */ s32 field_0x548;
+ /* 0x54c */ float field_0x54c;
};
#endif
diff --git a/include/d/lyt/meter/d_lyt_meter.h b/include/d/lyt/meter/d_lyt_meter.h
index d5eebc37..26aa9668 100644
--- a/include/d/lyt/meter/d_lyt_meter.h
+++ b/include/d/lyt/meter/d_lyt_meter.h
@@ -99,7 +99,7 @@ public:
bool fn_800D5380(u8);
void executeMap();
bool fn_800D5590();
- void fn_800D5630();
+ void fn_800D5630(f32);
bool isInModeMap();
bool isInModePause();
bool shouldBeHiddenGeneral();