diff --git a/config/SOUE01/symbols.txt b/config/SOUE01/symbols.txt index bb702b83..5bb7ad62 100644 --- a/config/SOUE01/symbols.txt +++ b/config/SOUE01/symbols.txt @@ -4496,13 +4496,13 @@ finalizeState_Out__16dLytMeterParts_cFv = .text:0x800C9EC0; // type:function siz build__16dLytMeterParts_cFl = .text:0x800C9ED0; // type:function size:0x24 execute__16dLytMeterParts_cFv = .text:0x800C9F00; // type:function size:0x10 executeState__85sStateMgr_c<16dLytMeterParts_c,20sStateMethodUsr_FI_c,12sFStateFct_c,13sStateIDChk_c>Fv = .text:0x800C9F10; // type:function size:0x10 -isNotSilentRealmOrLoftwing__11dLytMeter_cFv = .text:0x800C9F20; // type:function size:0x44 -fn_800C9F70__11dLytMeter_cFv = .text:0x800C9F70; // type:function size:0x70 -fn_800C9FE0__11dLytMeter_cFv = .text:0x800C9FE0; // type:function size:0x60 -fn_800CA040__11dLytMeter_cFv = .text:0x800CA040; // type:function size:0x60 -setUiMode__11dLytMeter_cCFUs = .text:0x800CA0A0; // type:function size:0x1C -getUiMode__11dLytMeter_cFv = .text:0x800CA0C0; // type:function size:0x38 -__ct__11dLytMeter_cFv = .text:0x800CA100; // type:function size:0x1C0 +isNotSilentRealmOrLoftwing__15dLytMeterMain_cFv = .text:0x800C9F20; // type:function size:0x44 +fn_800C9F70__15dLytMeterMain_cFv = .text:0x800C9F70; // type:function size:0x70 +fn_800C9FE0__15dLytMeterMain_cFv = .text:0x800C9FE0; // type:function size:0x60 +fn_800CA040__15dLytMeterMain_cFv = .text:0x800CA040; // type:function size:0x60 +setUiMode__15dLytMeterMain_cCFUs = .text:0x800CA0A0; // type:function size:0x1C +getUiMode__15dLytMeterMain_cFv = .text:0x800CA0C0; // type:function size:0x38 +__ct__15dLytMeterMain_cFv = .text:0x800CA100; // type:function size:0x1C0 __ct__Q23d2d10ResAccIf_cFv = .text:0x800CA2C0; // type:function size:0x6C __ct__Q23d2d10AnmGroup_cFv = .text:0x800CA330; // type:function size:0x84 __ct__23dLytMeterGanbariGauge_cFv = .text:0x800CA3C0; // type:function size:0x110 @@ -4674,7 +4674,7 @@ __dt__32sFStateFct_c<16dLytMeterParts_c>Fv = .text:0x800D0E20; // type:function __dt__85sStateMgr_c<16dLytMeterParts_c,20sStateMethodUsr_FI_c,12sFStateFct_c,13sStateIDChk_c>Fv = .text:0x800D0E90; // type:function size:0xA0 __dt__55sFStateMgr_c<16dLytMeterParts_c,20sStateMethodUsr_FI_c>Fv = .text:0x800D0F30; // type:function size:0xA4 __dt__16dLytMeterParts_cFv = .text:0x800D0FE0; // type:function size:0xA8 -build__11dLytMeter_cFPQ23d2d10ResAccIf_c = .text:0x800D1090; // type:function size:0x1510 +build__15dLytMeterMain_cFPQ23d2d10ResAccIf_c = .text:0x800D1090; // type:function size:0x1510 __dt__31sFState_c<18dLytMeter1Button_c>Fv = .text:0x800D25A0; // type:function size:0x58 __dt__34sFStateFct_c<18dLytMeter1Button_c>Fv = .text:0x800D2600; // type:function size:0x6C __dt__87sStateMgr_c<18dLytMeter1Button_c,20sStateMethodUsr_FI_c,12sFStateFct_c,13sStateIDChk_c>Fv = .text:0x800D2670; // type:function size:0xA0 @@ -4731,7 +4731,7 @@ __dt__37sFStateFct_c<21dLytMeterDrinkParts_c>Fv = .text:0x800D41D0; // type:func __dt__90sStateMgr_c<21dLytMeterDrinkParts_c,20sStateMethodUsr_FI_c,12sFStateFct_c,13sStateIDChk_c>Fv = .text:0x800D4240; // type:function size:0xA0 __dt__60sFStateMgr_c<21dLytMeterDrinkParts_c,20sStateMethodUsr_FI_c>Fv = .text:0x800D42E0; // type:function size:0xA4 __dt__21dLytMeterDrinkParts_cFv = .text:0x800D4390; // type:function size:0xA8 -remove__11dLytMeter_cFv = .text:0x800D4440; // type:function size:0x654 +remove__15dLytMeterMain_cFv = .text:0x800D4440; // type:function size:0x654 __dt__18dLytMeter1Button_cFv = .text:0x800D4AA0; // type:function size:0xDC __dt__18dLytMeter2Button_cFv = .text:0x800D4B80; // type:function size:0xDC __dt__20LytMeterTimerPart1_cFv = .text:0x800D4C60; // type:function size:0xB4 @@ -4740,28 +4740,28 @@ __dt__16dLytMeterTimer_cFv = .text:0x800D4DE0; // type:function size:0xB4 __dt__14dLytSkyGauge_cFv = .text:0x800D4EA0; // type:function size:0x164 __dt__15dLytBirdGauge_cFv = .text:0x800D5010; // type:function size:0x164 __dt__15dLytBossGauge_cFv = .text:0x800D5180; // type:function size:0x108 -fn_800D5290__11dLytMeter_cFv = .text:0x800D5290; // type:function size:0xB4 -fn_800D5350__11dLytMeter_cFv = .text:0x800D5350; // type:function size:0x30 -fn_800D5380__11dLytMeter_cFUc = .text:0x800D5380; // type:function size:0x44 -fn_800D53D0__11dLytMeter_cFv = .text:0x800D53D0; // type:function size:0x50 -fn_800D5420__11dLytMeter_cFv = .text:0x800D5420; // type:function size:0x114 -isSilentRealm__11dLytMeter_cFv = .text:0x800D5540; // type:function size:0x4C -fn_800D5590__11dLytMeter_cFv = .text:0x800D5590; // type:function size:0x98 -fn_800D5630__11dLytMeter_cFv = .text:0x800D5630; // type:function size:0x18 -fn_800D5650__11dLytMeter_cFv = .text:0x800D5650; // type:function size:0x24 -fn_800D5680__11dLytMeter_cFv = .text:0x800D5680; // type:function size:0x28 -fn_800D56B0__11dLytMeter_cFv = .text:0x800D56B0; // type:function size:0xFC -checkPaneVisibility__11dLytMeter_cFv = .text:0x800D57B0; // type:function size:0x1A58 -execute__11dLytMeter_cFv = .text:0x800D7210; // type:function size:0x92C +fn_800D5290__15dLytMeterMain_cFv = .text:0x800D5290; // type:function size:0xB4 +fn_800D5350__15dLytMeterMain_cFv = .text:0x800D5350; // type:function size:0x30 +fn_800D5380__15dLytMeterMain_cFUc = .text:0x800D5380; // type:function size:0x44 +fn_800D53D0__15dLytMeterMain_cFv = .text:0x800D53D0; // type:function size:0x50 +fn_800D5420__15dLytMeterMain_cFv = .text:0x800D5420; // type:function size:0x114 +isSilentRealm__15dLytMeterMain_cFv = .text:0x800D5540; // type:function size:0x4C +fn_800D5590__15dLytMeterMain_cFv = .text:0x800D5590; // type:function size:0x98 +fn_800D5630__15dLytMeterMain_cFv = .text:0x800D5630; // type:function size:0x18 +fn_800D5650__15dLytMeterMain_cFv = .text:0x800D5650; // type:function size:0x24 +fn_800D5680__15dLytMeterMain_cFv = .text:0x800D5680; // type:function size:0x28 +fn_800D56B0__15dLytMeterMain_cFv = .text:0x800D56B0; // type:function size:0xFC +checkPaneVisibility__15dLytMeterMain_cFv = .text:0x800D57B0; // type:function size:0x1A58 +execute__15dLytMeterMain_cFv = .text:0x800D7210; // type:function size:0x92C fn_800D7B40__15dLytMsgWindow_cFv = .text:0x800D7B40; // type:function size:0xC -draw__11dLytMeter_cFv = .text:0x800D7B50; // type:function size:0x128 +draw__15dLytMeterMain_cFv = .text:0x800D7B50; // type:function size:0x128 getLyt__20LytMeterTimerPart1_cFv = .text:0x800D7C80; // type:function size:0x8 getLyt__20LytMeterTimerPart2_cFv = .text:0x800D7C90; // type:function size:0x8 getLyt__14dLytSkyGauge_cFv = .text:0x800D7CA0; // type:function size:0x8 getLyt__15dLytBirdGauge_cFv = .text:0x800D7CB0; // type:function size:0x8 -__ct__20dLytMeterContainer_cFv = .text:0x800D7CC0; // type:function size:0x84 -__dt__11dLytMeter_cFv = .text:0x800D7D50; // type:function size:0xB94 -build__20dLytMeterContainer_cFv = .text:0x800D88F0; // type:function size:0x324 +__ct__11dLytMeter_cFv = .text:0x800D7CC0; // type:function size:0x84 +__dt__15dLytMeterMain_cFv = .text:0x800D7D50; // type:function size:0xB94 +build__11dLytMeter_cFv = .text:0x800D88F0; // type:function size:0x324 __dt__33sFState_c<20dLytMeterEventSkip_c>Fv = .text:0x800D8C20; // type:function size:0x58 __dt__36sFStateFct_c<20dLytMeterEventSkip_c>Fv = .text:0x800D8C80; // type:function size:0x6C __dt__89sStateMgr_c<20dLytMeterEventSkip_c,20sStateMethodUsr_FI_c,12sFStateFct_c,13sStateIDChk_c>Fv = .text:0x800D8CF0; // type:function size:0xA0 @@ -4770,23 +4770,23 @@ __dt__27sFState_c<14dLytDobutton_c>Fv = .text:0x800D8E40; // type:function size: __dt__30sFStateFct_c<14dLytDobutton_c>Fv = .text:0x800D8EA0; // type:function size:0x6C __dt__83sStateMgr_c<14dLytDobutton_c,20sStateMethodUsr_FI_c,12sFStateFct_c,13sStateIDChk_c>Fv = .text:0x800D8F10; // type:function size:0xA0 __dt__53sFStateMgr_c<14dLytDobutton_c,20sStateMethodUsr_FI_c>Fv = .text:0x800D8FB0; // type:function size:0xA4 -remove__20dLytMeterContainer_cFv = .text:0x800D9060; // type:function size:0x16C +remove__11dLytMeter_cFv = .text:0x800D9060; // type:function size:0x16C __dt__14dLytDobutton_cFv = .text:0x800D91D0; // type:function size:0xE4 __dt__18LytDoButtonRelatedFv = .text:0x800D92C0; // type:function size:0x48 __dt__20dLytMeterEventSkip_cFv = .text:0x800D9310; // type:function size:0xD8 -execute__20dLytMeterContainer_cFv = .text:0x800D93F0; // type:function size:0x1F0 -draw__20dLytMeterContainer_cFv = .text:0x800D95E0; // type:function size:0x90 -fn_800D5670__20dLytMeterContainer_cFv = .text:0x800D9670; // type:function size:0x8 -setAreaCaptionOverrideVisibility__20dLytMeterContainer_cFb = .text:0x800D9680; // type:function size:0x64 -fn_800D56F0__20dLytMeterContainer_cFv = .text:0x800D96F0; // type:function size:0x20 -fn_800D9710__20dLytMeterContainer_cFv = .text:0x800D9710; // type:function size:0x10 -setStaminaWheelPercentInternal__20dLytMeterContainer_cFf = .text:0x800D9720; // type:function size:0x8 -fn_800D9730__20dLytMeterContainer_cFUc = .text:0x800D9730; // type:function size:0x4C -fn_800D9780__20dLytMeterContainer_cFb = .text:0x800D9780; // type:function size:0x18 -fn_800D97A0__20dLytMeterContainer_cFv = .text:0x800D97A0; // type:function size:0x20 -setStaminaWheelPercent__20dLytMeterContainer_cFf = .text:0x800D97C0; // type:function size:0x14 -fn_800D97E0__20dLytMeterContainer_cFUc = .text:0x800D97E0; // type:function size:0x1C -setVisible__20dLytMeterContainer_cFb = .text:0x800D9800; // type:function size:0x18 +execute__11dLytMeter_cFv = .text:0x800D93F0; // type:function size:0x1F0 +draw__11dLytMeter_cFv = .text:0x800D95E0; // type:function size:0x90 +fn_800D5670__11dLytMeter_cFv = .text:0x800D9670; // type:function size:0x8 +setAreaCaptionOverrideVisibility__11dLytMeter_cFb = .text:0x800D9680; // type:function size:0x64 +fn_800D56F0__11dLytMeter_cFv = .text:0x800D96F0; // type:function size:0x20 +fn_800D9710__11dLytMeter_cFv = .text:0x800D9710; // type:function size:0x10 +setStaminaWheelPercentInternal__11dLytMeter_cFf = .text:0x800D9720; // type:function size:0x8 +fn_800D9730__11dLytMeter_cFUc = .text:0x800D9730; // type:function size:0x4C +fn_800D9780__11dLytMeter_cFb = .text:0x800D9780; // type:function size:0x18 +fn_800D97A0__11dLytMeter_cFv = .text:0x800D97A0; // type:function size:0x20 +setStaminaWheelPercent__11dLytMeter_cFf = .text:0x800D97C0; // type:function size:0x14 +fn_800D97E0__11dLytMeter_cFUc = .text:0x800D97E0; // type:function size:0x1C +setVisible__11dLytMeter_cFb = .text:0x800D9800; // type:function size:0x18 changeState__83sStateMgr_c<14dLytSkyGauge_c,20sStateMethodUsr_FI_c,12sFStateFct_c,13sStateIDChk_c>FRC12sStateIDIf_c = .text:0x800D9820; // type:function size:0x10 changeState__84sStateMgr_c<15dLytBossGauge_c,20sStateMethodUsr_FI_c,12sFStateFct_c,13sStateIDChk_c>FRC12sStateIDIf_c = .text:0x800D9830; // type:function size:0x10 changeState__84sStateMgr_c<15dLytBirdGauge_c,20sStateMethodUsr_FI_c,12sFStateFct_c,13sStateIDChk_c>FRC12sStateIDIf_c = .text:0x800D9840; // type:function size:0x10 @@ -4803,7 +4803,7 @@ getName__18dLytMeterBossKey_cCFv = .text:0x800D98E0; // type:function size:0x8 getLyt__18dLytMeterBossKey_cFv = .text:0x800D98F0; // type:function size:0x8 changeState__87sStateMgr_c<18dLytMeterBossKey_c,20sStateMethodUsr_FI_c,12sFStateFct_c,13sStateIDChk_c>FRC12sStateIDIf_c = .text:0x800D9900; // type:function size:0x10 changeState__89sStateMgr_c<20dLytMeterKakeraKey_c,20sStateMethodUsr_FI_c,12sFStateFct_c,13sStateIDChk_c>FRC12sStateIDIf_c = .text:0x800D9910; // type:function size:0x10 -__dt__20dLytMeterContainer_cFv = .text:0x800D9920; // type:function size:0xBD0 +__dt__11dLytMeter_cFv = .text:0x800D9920; // type:function size:0xBD0 LytMeter0x30__Q23d2d8dSubPaneFUc = .text:0x800DA4F0; // type:function size:0x8 LytMeter0x2C__Q23d2d8dSubPaneCFv = .text:0x800DA500; // type:function size:0x8 getName__18dLytMeter2Button_cCFv = .text:0x800DA510; // type:function size:0x8 @@ -31134,8 +31134,8 @@ __vt__59sFStateMgr_c<20dLytMeterKakeraKey_c,20sStateMethodUsr_FI_c> = .data:0x80 __vt__89sStateMgr_c<20dLytMeterKakeraKey_c,20sStateMethodUsr_FI_c,12sFStateFct_c,13sStateIDChk_c> = .data:0x805125B0; // type:object size:0x30 __vt__36sFStateFct_c<20dLytMeterKakeraKey_c> = .data:0x805125E0; // type:object size:0x14 __vt__33sFState_c<20dLytMeterKakeraKey_c> = .data:0x805125F8; // type:object size:0x18 -__vt__20dLytMeterContainer_c = .data:0x80512610; // type:object size:0xC -__vt__11dLytMeter_c = .data:0x8051261C; // type:object size:0xC +__vt__11dLytMeter_c = .data:0x80512610; // type:object size:0xC +__vt__15dLytMeterMain_c = .data:0x8051261C; // type:object size:0xC __vt__55sFStateMgr_c<16dLytMeterParts_c,20sStateMethodUsr_FI_c> = .data:0x80512628; // type:object size:0x30 __vt__85sStateMgr_c<16dLytMeterParts_c,20sStateMethodUsr_FI_c,12sFStateFct_c,13sStateIDChk_c> = .data:0x80512658; // type:object size:0x30 __vt__32sFStateFct_c<16dLytMeterParts_c> = .data:0x80512688; // type:object size:0x14 @@ -40093,7 +40093,7 @@ lbl_80575428 = .sbss:0x80575428; // type:object size:0x8 data:byte lbl_80575430 = .sbss:0x80575430; // type:object size:0x8 data:4byte sInstance__18SpecialItemDropMgr = .sbss:0x80575438; // type:object size:0x4 data:4byte FOR_LOADED_PARTICLES = .sbss:0x80575440; // type:object size:0x8 data:4byte -sInstance__20dLytMeterContainer_c = .sbss:0x80575448; // type:object size:0x8 data:4byte +sInstance__11dLytMeter_c = .sbss:0x80575448; // type:object size:0x8 data:4byte sInstance__24dLytMeterConfiguration_c = .sbss:0x80575450; // type:object size:0x8 data:4byte sInstance__20LytMeterTimerPart1_c = .sbss:0x80575458; // type:object size:0x4 data:4byte sInstance__20LytMeterTimerPart2_c = .sbss:0x8057545C; // type:object size:0x4 data:4byte diff --git a/include/d/lyt/meter/d_lyt_meter.h b/include/d/lyt/meter/d_lyt_meter.h index 32510333..de76952a 100644 --- a/include/d/lyt/meter/d_lyt_meter.h +++ b/include/d/lyt/meter/d_lyt_meter.h @@ -1,8 +1,9 @@ #ifndef D_LYT_METER_H #define D_LYT_METER_H -// TODO sort includes for vtable order + // clang-format off #include "common.h" + #include "d/lyt/d2d.h" #include "d/d_cursor_hit_check.h" #include "d/lyt/d_lyt_do_button.h" @@ -22,32 +23,10 @@ #include "d/lyt/meter/d_lyt_meter_ganbari_gauge.h" #include "d/lyt/meter/d_lyt_meter_event_skip.h" #include "d/lyt/meter/d_lyt_meter_item_select.h" - #include "d/lyt/meter/d_lyt_meter_parts.h" #include "d/lyt/d_lyt_unknowns.h" - #include "m/m_vec.h" - -enum Meter_e { - METER_GANBARI = 0, - METER_RUPY = 1, - METER_ITEM_SELECT = 2, - METER_CROSS_BTN = 3, - METER_PLUS_BTN = 4, - METER_MINUS_BTN = 5, - METER_A_BTN = 6, - METER_DOWSING = 7, - METER_Z_BTN = 8, - METER_NUN_STK = 9, - METER_REMOCON_BG = 10, - METER_NUN_BG = 11, - METER_HEART = 12, - METER_SHIELD = 13, - METER_1_BTN = 14, - METER_2_BTN = 15, -}; - // clang-format on class dLytMeter1Button_c; @@ -63,10 +42,33 @@ class dLytSkyGauge_c; class dLytBirdGauge_c; class dLytBossGauge_c; -class dLytMeter_c { +// apart from dLytMeterParts_c the names here are made up + +enum MeterFlag_e { + METER_BTN_CROSS_UP = 0x1, + METER_BTN_CROSS_DOWN = 0x2, + METER_BTN_CROSS_LEFT = 0x4, + METER_BTN_CROSS_RIGHT = 0x8, + METER_BTN_B = 0x10, + METER_BTN_PLUS = 0x20, + METER_BTN_MINUS = 0x40, + METER_BTN_1 = 0x80, + METER_BTN_2 = 0x100, + METER_BTN_NUN_STK = 0x200, + METER_BTN_C = 0x400, + METER_BTN_Z = 0x800, + METER_BTN_0x1000 = 0x1000, + + + METER_BTN_CROSS = METER_BTN_CROSS_UP | METER_BTN_CROSS_DOWN | METER_BTN_CROSS_LEFT | METER_BTN_CROSS_RIGHT, +}; + +class dLytMeterMain_c { + friend class dLytMeter_c; + public: - dLytMeter_c(); - virtual ~dLytMeter_c() {} + dLytMeterMain_c(); + virtual ~dLytMeterMain_c() {} bool build(d2d::ResAccIf_c *resAcc); bool remove(); @@ -125,10 +127,11 @@ public: return &mNunStk; } +private: /* 0x00004 */ d2d::ResAccIf_c mResAcc; /* 0x00374 */ d2d::LytBase_c mLyt; /* 0x00404 */ d2d::AnmGroup_c mAnmGroups[34]; - u8 field_0x00C84[0x00C8C - 0x00C84]; + /* 0x00C84 */ u8 _0x00C84[0x00C8C - 0x00C84]; /* 0x00C8C */ dLytMeterGanbariGauge_c mGanbariGauge; /* 0x011E8 */ dLytMeterRupy_c mRupy; /* 0x01A98 */ dLytMeterItemSelect_c mItemSelect; @@ -158,7 +161,7 @@ public: /* 0x130F4 */ d2d::SubPaneList mMeters; /* 0x13100 */ d2d::SubPaneListNode mNodes[16]; - /* 0x13200 */ u8 field_0x13200[0x13204 - 0x13200]; + /* 0x13200 */ u8 _0x13200[0x13204 - 0x13200]; /* 0x13204 */ dLytMeterParts_c mParts[16]; /* 0x136C4 */ mVec3_c mShieldPositions[2]; @@ -201,27 +204,10 @@ public: /* 0x137C0 */ u32 field_0x137C0; }; -STATIC_ASSERT(offsetof(dLytMeter_c, mGanbariGauge) == 0x00C8C); -STATIC_ASSERT(offsetof(dLytMeter_c, mRupy) == 0x011E8); -STATIC_ASSERT(offsetof(dLytMeter_c, mItemSelect) == 0x01A98); -STATIC_ASSERT(offsetof(dLytMeter_c, mCrossBtn) == 0x07260); -STATIC_ASSERT(offsetof(dLytMeter_c, mPlusBtn) == 0x078A0); -STATIC_ASSERT(offsetof(dLytMeter_c, mMinusBtn) == 0x07A64); -STATIC_ASSERT(offsetof(dLytMeter_c, mDowsing) == 0x0C928); -STATIC_ASSERT(offsetof(dLytMeter_c, mABtn) == 0x11E34); -STATIC_ASSERT(offsetof(dLytMeter_c, mZBtn) == 0x12000); -STATIC_ASSERT(offsetof(dLytMeter_c, mNunStk) == 0x121C8); -STATIC_ASSERT(offsetof(dLytMeter_c, mRemoCon) == 0x12350); -STATIC_ASSERT(offsetof(dLytMeter_c, mNunBg) == 0x12440); -STATIC_ASSERT(offsetof(dLytMeter_c, mHeart) == 0x12608); -STATIC_ASSERT(offsetof(dLytMeter_c, mShield) == 0x12DA4); -STATIC_ASSERT(offsetof(dLytMeter_c, field_0x137C0) == 0x137C0); - -// made up name -class dLytMeterContainer_c { +class dLytMeter_c { public: - dLytMeterContainer_c(); - virtual ~dLytMeterContainer_c() { + dLytMeter_c(); + virtual ~dLytMeter_c() { sInstance = nullptr; } @@ -245,32 +231,32 @@ public: static void setStaminaWheelPercent(f32 percent); void setStaminaWheelPercentInternal(f32 percent); - static dLytMeterContainer_c *GetInstance() { + static dLytMeter_c *GetInstance() { return sInstance; } - static dLytMeter_c *GetMeter() { - return &sInstance->mMeter; + static dLytMeterMain_c *GetMain() { + return &sInstance->mMain; } - // Not all of these inlines exist on dLytMeter_c + // Not all of these inlines exist on dLytMeterMain_c // because accessing via GetMeter->get... causes // different instructions sometimes s32 getMeterField_0x13750() const { - return mMeter.field_0x13750; + return mMain.field_0x13750; } u8 getMeterField_0x13770() const { - return mMeter.field_0x13770; + return mMain.field_0x13770; } bool getMeterField_0x13774() const { - return mMeter.field_0x13774; + return mMain.field_0x13774; } bool getMeterField_0x1377F() const { - return mMeter.field_0x1377F; + return mMain.field_0x1377F; } bool checkAllFlags(u32 mask) const { @@ -291,7 +277,7 @@ public: static s32 getCrossBtn0x7BF8() { if (sInstance != nullptr) { - return sInstance->mMeter.mCrossBtn.getField_0x620(); + return sInstance->mMain.mCrossBtn.getField_0x620(); } else { return 6; } @@ -299,7 +285,7 @@ public: static bool getItemSelect0x75A2() { if (sInstance != nullptr) { - return sInstance->mMeter.mItemSelect.getField_0x57A2(); + return sInstance->mMain.mItemSelect.getField_0x57A2(); } else { return 0; } @@ -307,25 +293,25 @@ public: static void setRupyField_0x8A9(u8 val) { if (sInstance != nullptr) { - sInstance->mMeter.mRupy.setField_0x8A9(val); + sInstance->mMain.mRupy.setField_0x8A9(val); } } static void setRupyField_0x8AA(u8 val) { if (sInstance != nullptr) { - sInstance->mMeter.mRupy.setField_0x8AA(val); + sInstance->mMain.mRupy.setField_0x8AA(val); } } static void setRupyField_0x8AC(u8 val) { if (sInstance != nullptr) { - sInstance->mMeter.mRupy.setField_0x8AC(val); + sInstance->mMain.mRupy.setField_0x8AC(val); } } static u8 getRupyField_0x8AC() { if (sInstance != nullptr) { - return sInstance->mMeter.mRupy.getField_0x8AC(); + return sInstance->mMain.mRupy.getField_0x8AC(); } else { return 0; } @@ -333,7 +319,7 @@ public: static s32 getHeartField_0x78C() { if (sInstance != nullptr) { - return sInstance->mMeter.mHeart.getField_0x78C(); + return sInstance->mMain.mHeart.getField_0x78C(); } else { return 0; } @@ -375,7 +361,7 @@ public: static u8 getDowsing0x550A() { if (sInstance != nullptr) { - return sInstance->mMeter.mDowsing.getField_0x550A(); + return sInstance->mMain.mDowsing.getField_0x550A(); } else { return 0; } @@ -383,7 +369,7 @@ public: static bool getfn_800C9FE0() { if (sInstance != nullptr) { - return sInstance->mMeter.fn_800C9FE0(); + return sInstance->mMain.fn_800C9FE0(); } else { return false; } @@ -399,7 +385,7 @@ public: static bool getMinusBtnFn800F7600() { if (sInstance != nullptr) { - return sInstance->mMeter.mMinusBtn.fn_800F7600(); + return sInstance->mMain.mMinusBtn.fn_800F7600(); } else { return false; } @@ -407,7 +393,7 @@ public: static bool getDowsingFn800FE4B0() { if (sInstance != nullptr) { - return sInstance->mMeter.mDowsing.fn_800FE4B0(); + return sInstance->mMain.mDowsing.fn_800FE4B0(); } else { return false; } @@ -416,7 +402,7 @@ public: private: /* 0x00004 */ d2d::ResAccIf_c mResAcc; /* 0x00374 */ dLytMeterEventSkip_c *mpEventSkip; - /* 0x00378 */ dLytMeter_c mMeter; + /* 0x00378 */ dLytMeterMain_c mMain; /* 0x13B3C */ dLytDobutton_c *mpDoButton; /* 0x13B40 */ LytDoButtonRelated *mpDoButtonRelated; /* 0x13B44 */ LytBirdButtonRelated *mpBirdRelated; @@ -434,7 +420,7 @@ private: /* 0x13B65 */ bool field_0x13B65; /* 0x13B66 */ bool field_0x13B66; - static dLytMeterContainer_c *sInstance; + static dLytMeter_c *sInstance; }; #endif diff --git a/include/d/lyt/meter/d_lyt_meter_parts.h b/include/d/lyt/meter/d_lyt_meter_parts.h index 459ab21b..06c330f2 100644 --- a/include/d/lyt/meter/d_lyt_meter_parts.h +++ b/include/d/lyt/meter/d_lyt_meter_parts.h @@ -95,8 +95,8 @@ public: void execute(); void setAnmGroups(d2d::AnmGroup_c *inAnm, d2d::AnmGroup_c *outAnm) { - mpAnm1 = inAnm; - mpAnm2 = outAnm; + mpAnmIn = inAnm; + mpAnmOut = outAnm; } void setShouldBeVisible(bool val) { @@ -110,8 +110,8 @@ private: STATE_FUNC_DECLARE(dLytMeterParts_c, Out); /* 0x00 */ UI_STATE_MGR_DECLARE(dLytMeterParts_c); - /* 0x3C */ d2d::AnmGroup_c *mpAnm1; - /* 0x40 */ d2d::AnmGroup_c *mpAnm2; + /* 0x3C */ d2d::AnmGroup_c *mpAnmIn; + /* 0x40 */ d2d::AnmGroup_c *mpAnmOut; /* 0x44 */ s32 mIndex; /* 0x48 */ bool mShouldBeVisible; }; diff --git a/src/d/lyt/d_lyt_area_caption.cpp b/src/d/lyt/d_lyt_area_caption.cpp index 2379a829..d15b9e1d 100644 --- a/src/d/lyt/d_lyt_area_caption.cpp +++ b/src/d/lyt/d_lyt_area_caption.cpp @@ -178,8 +178,8 @@ void dLytAreaCaptionParts_c::finalizeState_Wait() {} void dLytAreaCaptionParts_c::initializeState_Start() { if (mFirst == 0) { dLytAreaCaption_c::setVisible(true); - dLytMeterContainer_c::GetInstance()->setAreaCaptionOverrideVisibility(false); - dLytMeterContainer_c::GetMeter()->setGanbariGaugeHiddenByAreaCaption(true); + dLytMeter_c::GetInstance()->setAreaCaptionOverrideVisibility(false); + dLytMeter_c::GetMain()->setGanbariGaugeHiddenByAreaCaption(true); } } void dLytAreaCaptionParts_c::executeState_Start() { @@ -187,7 +187,7 @@ void dLytAreaCaptionParts_c::executeState_Start() { mAnmGroups[AREA_CAPTION_ANIM_START].setAnimEnable(false); if (!mFirst) { dLytAreaCaption_c::setVisible(false); - dLytMeterContainer_c::GetInstance()->setAreaCaptionOverrideVisibility(true); + dLytMeter_c::GetInstance()->setAreaCaptionOverrideVisibility(true); } mStateMgr.changeState(StateID_Wait); } else { @@ -203,7 +203,7 @@ void dLytAreaCaptionParts_c::executeState_Start() { mAnmGroups[AREA_CAPTION_ANIM_OUT].setFrame(0.0f); mStateMgr.changeState(StateID_Out); dLytAreaCaption_c::setVisible(false); - dLytMeterContainer_c::GetInstance()->setAreaCaptionOverrideVisibility(true); + dLytMeter_c::GetInstance()->setAreaCaptionOverrideVisibility(true); } } } @@ -216,7 +216,7 @@ void dLytAreaCaptionParts_c::executeState_Out() { mAnmGroups[AREA_CAPTION_ANIM_OUT].setAnimEnable(false); if (!mFirst) { dLytAreaCaption_c::setVisible(false); - dLytMeterContainer_c::GetInstance()->setAreaCaptionOverrideVisibility(true); + dLytMeter_c::GetInstance()->setAreaCaptionOverrideVisibility(true); } mStateMgr.changeState(StateID_Wait); } @@ -236,11 +236,11 @@ bool dLytAreaCaptionParts_c::shouldImmediatelyDismiss() const { return true; } - if (dLytMeterContainer_c::GetInstance()->checkAllFlags(0x400) && dPad::checkButtonCPressed()) { + if (dLytMeter_c::GetInstance()->checkAllFlags(METER_BTN_C) && dPad::checkButtonCPressed()) { return true; } - if (dLytMeterContainer_c::GetInstance()->checkAllFlags(0x20) && dPad::checkButtonPlusPressed()) { + if (dLytMeter_c::GetInstance()->checkAllFlags(METER_BTN_PLUS) && dPad::checkButtonPlusPressed()) { return true; } @@ -248,11 +248,11 @@ bool dLytAreaCaptionParts_c::shouldImmediatelyDismiss() const { return true; } - if (dLytMeterContainer_c::GetInstance()->checkAllFlags(0x80) && dPad::checkButton1Pressed()) { + if (dLytMeter_c::GetInstance()->checkAllFlags(METER_BTN_1) && dPad::checkButton1Pressed()) { return true; } - if (dLytMeterContainer_c::GetInstance()->checkAllFlags(0x100) && dPad::checkButton2Pressed()) { + if (dLytMeter_c::GetInstance()->checkAllFlags(METER_BTN_2) && dPad::checkButton2Pressed()) { return true; } @@ -260,15 +260,15 @@ bool dLytAreaCaptionParts_c::shouldImmediatelyDismiss() const { return true; } - if (dLytMeterContainer_c::GetInstance()->checkAllFlags(0x2) && dPad::checkButtonDpadDownPressed()) { + if (dLytMeter_c::GetInstance()->checkAllFlags(METER_BTN_CROSS_DOWN) && dPad::checkButtonDpadDownPressed()) { return true; } - if (dLytMeterContainer_c::GetInstance()->checkAllFlags(0x4) && dPad::checkButtonDpadLeftPressed()) { + if (dLytMeter_c::GetInstance()->checkAllFlags(METER_BTN_CROSS_LEFT) && dPad::checkButtonDpadLeftPressed()) { return true; } - if (dLytMeterContainer_c::GetInstance()->checkAllFlags(0x8) && dPad::checkButtonDpadRightPressed()) { + if (dLytMeter_c::GetInstance()->checkAllFlags(METER_BTN_CROSS_RIGHT) && dPad::checkButtonDpadRightPressed()) { return true; } diff --git a/src/d/lyt/d_lyt_auto_caption.cpp b/src/d/lyt/d_lyt_auto_caption.cpp index 2bdf0dbd..ffe5304c 100644 --- a/src/d/lyt/d_lyt_auto_caption.cpp +++ b/src/d/lyt/d_lyt_auto_caption.cpp @@ -175,8 +175,8 @@ bool dLytAutoCaption_c::setText(const wchar_t *text) { bool dLytAutoCaption_c::checkSomethingMeter() { if (EventManager::isInEvent() || !dLytControlGame_c::getInstance()->isStateNormal() || - dLytMeterContainer_c::getItemSelect0x75A2() || dLytMeterContainer_c::getMinusBtnFn800F7600() || - dLytMeterContainer_c::getDowsingFn800FE4B0()) { + dLytMeter_c::getItemSelect0x75A2() || dLytMeter_c::getMinusBtnFn800F7600() || + dLytMeter_c::getDowsingFn800FE4B0()) { return true; } return false; diff --git a/src/d/lyt/d_lyt_auto_explain.cpp b/src/d/lyt/d_lyt_auto_explain.cpp index 69cfba74..4c3e87fd 100644 --- a/src/d/lyt/d_lyt_auto_explain.cpp +++ b/src/d/lyt/d_lyt_auto_explain.cpp @@ -168,8 +168,8 @@ bool dLytAutoExplain_c::setText(const wchar_t *text) { bool dLytAutoExplain_c::checkSomethingMeter() { if (EventManager::isInEvent() || !dLytControlGame_c::getInstance()->isStateNormal() || - dLytMeterContainer_c::getItemSelect0x75A2() || dLytMeterContainer_c::getMinusBtnFn800F7600() || - dLytMeterContainer_c::getDowsingFn800FE4B0()) { + dLytMeter_c::getItemSelect0x75A2() || dLytMeter_c::getMinusBtnFn800F7600() || + dLytMeter_c::getDowsingFn800FE4B0()) { return true; } diff --git a/src/d/lyt/meter/d_lyt_meter.cpp b/src/d/lyt/meter/d_lyt_meter.cpp index b801a40a..d0dbb7ae 100644 --- a/src/d/lyt/meter/d_lyt_meter.cpp +++ b/src/d/lyt/meter/d_lyt_meter.cpp @@ -61,7 +61,7 @@ STATE_DEFINE(dLytMeterParts_c, Out); void dLytMeter1Button_c::initializeState_Wait() {} void dLytMeter1Button_c::executeState_Wait() { - if (dLytMeterContainer_c::GetInstance()->checkAllFlags(0x80)) { + if (dLytMeter_c::GetInstance()->checkAllFlags(METER_BTN_1)) { return; } mStateMgr.changeState(StateID_ToUnuse); @@ -108,7 +108,7 @@ void dLytMeter1Button_c::initializeState_Unuse() { mUnuseDelay = 15; } void dLytMeter1Button_c::executeState_Unuse() { - if (dLytMeterContainer_c::GetInstance()->checkAllFlags(0x80)) { + if (dLytMeter_c::GetInstance()->checkAllFlags(METER_BTN_1)) { if (!(mUnuseDelay > 0)) { mStateMgr.changeState(StateID_ToUse); return; @@ -173,7 +173,7 @@ bool dLytMeter1Button_c::remove() { } bool dLytMeter1Button_c::execute() { - dLytMeterContainer_c *container = dLytMeterContainer_c::GetInstance(); + dLytMeter_c *meter = dLytMeter_c::GetInstance(); if (mpOwnerPane == nullptr) { return true; } @@ -195,7 +195,7 @@ bool dLytMeter1Button_c::execute() { mShouldCall = false; } - if (mShouldCall && container->checkAllFlags(0x80)) { + if (mShouldCall && meter->checkAllFlags(METER_BTN_1)) { if (!mHasInitedCall) { mAnm[BUTTON_1_ANIM_CALL].setToEnd(); mAnm[BUTTON_1_ANIM_CALL].setAnimEnable(true); @@ -204,7 +204,7 @@ bool dLytMeter1Button_c::execute() { if (mAnm[BUTTON_1_ANIM_CALL].isEnabled()) { mAnm[BUTTON_1_ANIM_CALL].play(); - if (container->checkAllFlags(0x80) && mCallCount < 3 && mAnm[BUTTON_1_ANIM_CALL].getFrame() == 1.0f) { + if (meter->checkAllFlags(METER_BTN_1) && mCallCount < 3 && mAnm[BUTTON_1_ANIM_CALL].getFrame() == 1.0f) { SmallSoundManager::GetInstance()->playSound(SE_S_1_BUTTON_BLINK); mCallCount++; } @@ -238,7 +238,7 @@ bool dLytMeter1Button_c::shouldCall() const { void dLytMeter2Button_c::initializeState_Wait() {} void dLytMeter2Button_c::executeState_Wait() { - if (dLytMeterContainer_c::GetInstance()->checkAllFlags(0x100)) { + if (dLytMeter_c::GetInstance()->checkAllFlags(METER_BTN_2)) { return; } mStateMgr.changeState(StateID_ToUnuse); @@ -285,7 +285,7 @@ void dLytMeter2Button_c::initializeState_Unuse() { mUnuseDelay = 15; } void dLytMeter2Button_c::executeState_Unuse() { - if (dLytMeterContainer_c::GetInstance()->checkAllFlags(0x100)) { + if (dLytMeter_c::GetInstance()->checkAllFlags(METER_BTN_2)) { if (!(mUnuseDelay > 0)) { mStateMgr.changeState(StateID_ToUse); return; @@ -347,8 +347,8 @@ bool dLytMeter2Button_c::remove() { } bool dLytMeter2Button_c::execute() { - dLytMeterContainer_c *container = dLytMeterContainer_c::GetInstance(); - if (container->getMeterField_0x13774()) { + dLytMeter_c *meter = dLytMeter_c::GetInstance(); + if (meter->getMeterField_0x13774()) { StoryflagManager::sInstance->unsetFlag(832); } if (mpOwnerPane == nullptr) { @@ -372,7 +372,7 @@ bool dLytMeter2Button_c::execute() { mShouldCall = false; } - if (mShouldCall && container->checkAllFlags(0x100)) { + if (mShouldCall && meter->checkAllFlags(METER_BTN_2)) { if (!mHasInitedCall) { mAnm[BUTTON_1_ANIM_CALL].setToEnd(); mAnm[BUTTON_1_ANIM_CALL].setAnimEnable(true); @@ -381,7 +381,7 @@ bool dLytMeter2Button_c::execute() { if (mAnm[BUTTON_1_ANIM_CALL].isEnabled()) { mAnm[BUTTON_1_ANIM_CALL].play(); - if (container->checkAllFlags(0x100) && mCallCount < 3 && mAnm[BUTTON_1_ANIM_CALL].getFrame() == 1.0f) { + if (meter->checkAllFlags(METER_BTN_2) && mCallCount < 3 && mAnm[BUTTON_1_ANIM_CALL].getFrame() == 1.0f) { SmallSoundManager::GetInstance()->playSound(SE_S_2_BUTTON_BLINK); mCallCount++; } @@ -413,23 +413,59 @@ bool dLytMeter2Button_c::shouldCall() const { return false; } +enum MeterPart_e { + METER_GANBARI = 0, + METER_RUPY = 1, + METER_ITEM_SELECT = 2, + METER_CROSS_BTN = 3, + METER_PLUS_BTN = 4, + METER_MINUS_BTN = 5, + METER_A_BTN = 6, + METER_DOWSING = 7, + METER_Z_BTN = 8, + METER_NUN_STK = 9, + METER_REMOCON_BG = 10, + METER_NUN_BG = 11, + METER_HEART = 12, + METER_SHIELD = 13, + METER_1_BTN = 14, + METER_2_BTN = 15, +}; + +#define METER_ANIM_ITEM_SELECT 0 +#define METER_ANIM_MINUS_BTN 1 +#define METER_ANIM_PLUS_BTN 2 +#define METER_ANIM_CROSS_BTN 3 +#define METER_ANIM_1_BTN 4 +#define METER_ANIM_2_BTN 5 +#define METER_ANIM_A_BTN 6 +#define METER_ANIM_REMOCON_BG 7 +#define METER_ANIM_DOWSING 8 +#define METER_ANIM_Z_BTN 9 +#define METER_ANIM_NUN_STK 10 +#define METER_ANIM_NUN_BG 11 +#define METER_ANIM_RUPY 12 +#define METER_ANIM_SHIELD 13 +#define METER_ANIM_HEART 14 +#define METER_ANIM_GANBARI_GAUGE 15 + void dLytMeterParts_c::initializeState_Invisible() {} void dLytMeterParts_c::executeState_Invisible() { if (mShouldBeVisible) { if (mIndex == METER_SHIELD) { - mpAnm1->setForwardOnce(); + mpAnmIn->setForwardOnce(); if (dMessage_c::getInstance()->getField_0x2FC() != 0) { - mpAnm1->setToEnd(); - dLytMeterContainer_c::setRupyField_0x8A9(1); + mpAnmIn->setToEnd(); + dLytMeter_c::setRupyField_0x8A9(1); } else { - mpAnm1->setFrame(0.0f); - dLytMeterContainer_c::setRupyField_0x8A9(2); + mpAnmIn->setFrame(0.0f); + dLytMeter_c::setRupyField_0x8A9(2); } - mpAnm1->setAnimEnable(true); + mpAnmIn->setAnimEnable(true); } else { - mpAnm1->setForwardOnce(); - mpAnm1->setFrame(0.0f); - mpAnm1->setAnimEnable(true); + mpAnmIn->setForwardOnce(); + mpAnmIn->setFrame(0.0f); + mpAnmIn->setAnimEnable(true); } mStateMgr.changeState(StateID_In); } @@ -438,13 +474,13 @@ void dLytMeterParts_c::finalizeState_Invisible() {} void dLytMeterParts_c::initializeState_In() {} void dLytMeterParts_c::executeState_In() { - if (mpAnm1->isEndReached()) { - mpAnm1->setAnimEnable(false); + if (mpAnmIn->isEndReached()) { + mpAnmIn->setAnimEnable(false); mStateMgr.changeState(StateID_Visible); } - if (mpAnm1->isEnabled()) { - mpAnm1->play(); + if (mpAnmIn->isEnabled()) { + mpAnmIn->play(); } } void dLytMeterParts_c::finalizeState_In() {} @@ -453,28 +489,28 @@ void dLytMeterParts_c::initializeState_Visible() {} void dLytMeterParts_c::executeState_Visible() { if (!mShouldBeVisible) { if (mIndex == METER_SHIELD) { - mpAnm2->setForwardOnce(); - if (dLytMeterContainer_c::getRupyField_0x8AC()) { - mpAnm2->setToEnd(); - if (dLytMeterContainer_c::getHeartField_0x78C() == 0) { - dLytMeterContainer_c::setRupyField_0x8AA(1); + mpAnmOut->setForwardOnce(); + if (dLytMeter_c::getRupyField_0x8AC()) { + mpAnmOut->setToEnd(); + if (dLytMeter_c::getHeartField_0x78C() == 0) { + dLytMeter_c::setRupyField_0x8AA(1); } else { - dLytMeterContainer_c::setRupyField_0x8AA(3); + dLytMeter_c::setRupyField_0x8AA(3); } - dLytMeterContainer_c::setRupyField_0x8AC(0); + dLytMeter_c::setRupyField_0x8AC(0); } else { - mpAnm2->setFrame(0.0f); - if (dLytMeterContainer_c::getHeartField_0x78C() == 0) { - dLytMeterContainer_c::setRupyField_0x8AA(2); + mpAnmOut->setFrame(0.0f); + if (dLytMeter_c::getHeartField_0x78C() == 0) { + dLytMeter_c::setRupyField_0x8AA(2); } else { - dLytMeterContainer_c::setRupyField_0x8AA(4); + dLytMeter_c::setRupyField_0x8AA(4); } } - mpAnm2->setAnimEnable(true); + mpAnmOut->setAnimEnable(true); } else { - mpAnm2->setForwardOnce(); - mpAnm2->setFrame(0.0f); - mpAnm2->setAnimEnable(true); + mpAnmOut->setForwardOnce(); + mpAnmOut->setFrame(0.0f); + mpAnmOut->setAnimEnable(true); } mStateMgr.changeState(StateID_Out); } @@ -483,28 +519,28 @@ void dLytMeterParts_c::finalizeState_Visible() {} void dLytMeterParts_c::initializeState_Out() {} void dLytMeterParts_c::executeState_Out() { - dLytMeterContainer_c *container = dLytMeterContainer_c::GetInstance(); - if (mpAnm2->isEndReached()) { + dLytMeter_c *meter = dLytMeter_c::GetInstance(); + if (mpAnmOut->isEndReached()) { if (mIndex == METER_SHIELD && dMessage_c::getInstance()->getField_0x2FC() == -2) { dMessage_c::getInstance()->setField_0x2FC(0); } - mpAnm2->setAnimEnable(false); + mpAnmOut->setAnimEnable(false); mStateMgr.changeState(StateID_Invisible); } - if (mpAnm2->isEnabled()) { - mpAnm2->play(); + if (mpAnmOut->isEnabled()) { + mpAnmOut->play(); } switch (mIndex) { - case 1: container->clearFlags(0x40); break; - case 4: container->clearFlags(0x80); break; - case 3: container->clearFlags(0x1 | 0x2 | 0x4 | 0x8); break; - case 5: container->clearFlags(0x100); break; - case 6: container->clearFlags(0x200); break; - case 8: container->clearFlags(0x400); break; - case 9: container->clearFlags(0x1000); break; - case 10: container->clearFlags(0x200); break; + case METER_ANIM_MINUS_BTN: meter->clearFlags(METER_BTN_MINUS); break; + case METER_ANIM_1_BTN: meter->clearFlags(METER_BTN_1); break; + case METER_ANIM_CROSS_BTN: meter->clearFlags(METER_BTN_CROSS); break; + case METER_ANIM_2_BTN: meter->clearFlags(METER_BTN_2); break; + case METER_ANIM_A_BTN: meter->clearFlags(METER_BTN_NUN_STK); break; + case METER_ANIM_DOWSING: meter->clearFlags(METER_BTN_C); break; + case METER_ANIM_Z_BTN: meter->clearFlags(METER_BTN_0x1000); break; + case METER_ANIM_NUN_STK: meter->clearFlags(METER_BTN_NUN_STK); break; } } void dLytMeterParts_c::finalizeState_Out() {} @@ -519,44 +555,44 @@ void dLytMeterParts_c::execute() { mStateMgr.executeState(); } -bool dLytMeter_c::isNotSilentRealmOrLoftwing() { +bool dLytMeterMain_c::isNotSilentRealmOrLoftwing() { if (isSilentRealm() || dAcPy_c::GetLink()->getRidingActorType() == dAcPy_c::RIDING_LOFTWING) { return false; } return true; } -bool dLytMeter_c::fn_800C9F70() { +bool dLytMeterMain_c::fn_800C9F70() { if ((fn_800D56B0() && !field_0x13775) || fn_800D5650() || fn_800D5680()) { return true; } return false; } -bool dLytMeter_c::fn_800C9FE0() { +bool dLytMeterMain_c::fn_800C9FE0() { if (fn_800D56B0() || !field_0x13750 || fn_800D5680()) { return true; } return false; } -bool dLytMeter_c::fn_800CA040() { +bool dLytMeterMain_c::fn_800CA040() { if (field_0x13774 || fn_800D5650() || fn_800D5680()) { return true; } return false; } -void dLytMeter_c::setUiMode(u16 value) const { +void dLytMeterMain_c::setUiMode(u16 value) const { StoryflagManager::sInstance->setFlagOrCounterToValue(840, value); } -u8 dLytMeter_c::getUiMode() { +u8 dLytMeterMain_c::getUiMode() { return StoryflagManager::sInstance->getFlag(840); } #pragma dont_inline on -dLytMeter_c::dLytMeter_c() {} +dLytMeterMain_c::dLytMeterMain_c() {} #pragma dont_inline reset static const d2d::LytBrlanMapping meterBrlanMap[] = { @@ -598,23 +634,6 @@ static const d2d::LytBrlanMapping meterBrlanMap[] = { {"basicPosition_00_rupyPosition.brlan", "G_rupyPosi_00"}, }; -#define METER_ANIM_ITEM_SELECT 0 -#define METER_ANIM_MINUS_BTN 1 -#define METER_ANIM_PLUS_BTN 2 -#define METER_ANIM_CROSS_BTN 3 -#define METER_ANIM_1_BTN 4 -#define METER_ANIM_2_BTN 5 -#define METER_ANIM_A_BTN 6 -#define METER_ANIM_REMOCON_BG 7 -#define METER_ANIM_DOWSING 8 -#define METER_ANIM_Z_BTN 9 -#define METER_ANIM_NUN_STK 10 -#define METER_ANIM_NUN_BG 11 -#define METER_ANIM_RUPY 12 -#define METER_ANIM_SHIELD 13 -#define METER_ANIM_HEART 14 -#define METER_ANIM_GANBARI_GAUGE 15 - #define METER_ANIM_POSITION_IN_OFFSET 0 #define METER_ANIM_POSITION_OUT_OFFSET 16 #define METER_ANIM_POSITION 32 @@ -626,7 +645,7 @@ static const d2d::LytBrlanMapping meterBrlanMap[] = { static const char *sGroupName = "G_ref_00"; -bool dLytMeter_c::build(d2d::ResAccIf_c *resAcc) { +bool dLytMeterMain_c::build(d2d::ResAccIf_c *resAcc) { mLyt.setResAcc(resAcc); mLyt.build("basicPosition_00.brlyt", nullptr); mLyt.setPriority(0x8A); @@ -878,7 +897,7 @@ bool dLytMeter_c::build(d2d::ResAccIf_c *resAcc) { return true; } -bool dLytMeter_c::remove() { +bool dLytMeterMain_c::remove() { for (int i = 0; i < METER_NUM_ANIMS; i++) { mAnmGroups[i].remove(); } @@ -971,28 +990,28 @@ bool dLytMeter_c::remove() { return true; } -void dLytMeter_c::fn_800D5290() { - dLytMeterContainer_c *container = dLytMeterContainer_c::GetInstance(); +void dLytMeterMain_c::fn_800D5290() { + dLytMeter_c *meter = dLytMeter_c::GetInstance(); if (dLytMap_c::getInstance() != nullptr && !dLytMap_c::getInstance()->unkMeterCheck()) { - container->setFlags(0x20); + meter->setFlags(METER_BTN_PLUS); } LytDoButtonRelated::set(LytDoButtonRelated::DO_BUTTON_PLUS, LytDoButtonRelated::DO_0x74); - container->clearFlags(0x100 | 0x80 | 0x40); + meter->clearFlags(METER_BTN_MINUS | METER_BTN_1 | METER_BTN_2); if (LytDoButtonRelated::get(LytDoButtonRelated::DO_BUTTON_C) == LytDoButtonRelated::DO_NONE) { - container->clearFlags(0x400); + meter->clearFlags(METER_BTN_C); } } -bool dLytMeter_c::fn_800D5350() { +bool dLytMeterMain_c::fn_800D5350() { if (field_0x13748 == 1 && dMessage_c::getInstance()->getField_0x328()) { return true; } return false; } -bool dLytMeter_c::fn_800D5380(u8 arg) { +bool dLytMeterMain_c::fn_800D5380(u8 arg) { if (dAcPy_c::GetLink() != nullptr && (dAcPy_c::GetLink()->checkActionFlagsCont(0x400 | 0x100 | 0x80 | 0x40 | 0x10 | 0x4 | 0x2 | 0x1) && (dAcPy_c::GetLink()->checkActionFlagsCont(0x40) || (arg && mItemSelect.getField_0x5794() == 1)))) { @@ -1002,14 +1021,14 @@ bool dLytMeter_c::fn_800D5380(u8 arg) { } extern "C" bool checkIsInSkykeepPuzzle(); -bool dLytMeter_c::fn_800D53D0() { +bool dLytMeterMain_c::fn_800D53D0() { if (checkIsInSkykeepPuzzle() && !field_0x13774) { return true; } return false; } -bool dLytMeter_c::fn_800D5420() { +bool dLytMeterMain_c::fn_800D5420() { if (!fn_800D5650()) { if (!dStageMgr_c::GetInstance()->isFaderSettled() || !dScGame_c::GetInstance()->isFaderSettled() || !dStageMgr_c::GetInstance()->fn_80199250() || !dStage_c::GetInstance()->fn_801B3EE0()) { @@ -1019,45 +1038,45 @@ bool dLytMeter_c::fn_800D5420() { return false; } -bool dLytMeter_c::isSilentRealm() { +bool dLytMeterMain_c::isSilentRealm() { if (dScGame_c::currentSpawnInfo.getTrial() == SpawnInfo::TRIAL && !dScGame_c::isCurrentStage("D003_8")) { return true; } return false; } -bool dLytMeter_c::fn_800D5590() { - if (dLytMeterContainer_c::getfn_800D97A0() && !dLytMeterContainer_c::GetInstance()->fn_800D56F0()) { +bool dLytMeterMain_c::fn_800D5590() { + if (dLytMeter_c::getfn_800D97A0() && !dLytMeter_c::GetInstance()->fn_800D56F0()) { return true; } - if (dLytMeterContainer_c::getField_0x13B63()) { + if (dLytMeter_c::getField_0x13B63()) { return true; } return field_0x13773; } -void dLytMeter_c::fn_800D5630() { +void dLytMeterMain_c::fn_800D5630() { if (mpBossGauge != nullptr) { mpBossGauge->fn_80158940(); } } -bool dLytMeter_c::fn_800D5650() { +bool dLytMeterMain_c::fn_800D5650() { if (field_0x13750 >= 0 && field_0x13750 <= 1) { return true; } return false; } -bool dLytMeter_c::fn_800D5680() { +bool dLytMeterMain_c::fn_800D5680() { if (field_0x13750 >= 2 && field_0x13750 <= 3) { return true; } return false; } -bool dLytMeter_c::fn_800D56B0() { +bool dLytMeterMain_c::fn_800D56B0() { if (dLytSaveMgr_c::GetInstance() != nullptr && dLytSaveMgr_c::GetInstance()->fn_80285650()) { return true; } @@ -1079,7 +1098,7 @@ bool dLytMeter_c::fn_800D56B0() { return false; } -void dLytMeter_c::checkPaneVisibility() { +void dLytMeterMain_c::checkPaneVisibility() { bool oldTimerVisible = mTimerVisible; bool oldBirdGaugeVisible = mBirdGaugeVisible; bool oldSkyGaugeVisible = mSkyGaugeVisible; @@ -1095,7 +1114,7 @@ void dLytMeter_c::checkPaneVisibility() { } // Set all panes to visible, then go through - // them one by one to + // them one by one to mTimerVisible = true; mBirdGaugeVisible = true; @@ -1157,20 +1176,20 @@ void dLytMeter_c::checkPaneVisibility() { || (MinigameManager::isInMinigameState(MinigameManager::TRIAL_TIME_ATTACK) && LytDoButtonRelated::get(LytDoButtonRelated::DO_BUTTON_B) == LytDoButtonRelated::DO_NONE) || - (dLytMeterContainer_c::getField_0x13B66() || (fn_800D56B0() && !mItemSelect.fn_800F02F0() && !fn_800D53D0()) || + (dLytMeter_c::getField_0x13B66() || (fn_800D56B0() && !mItemSelect.fn_800F02F0() && !fn_800D53D0()) || fn_800D5650() || fn_800D5680())) { mPanesVisible[METER_ANIM_ITEM_SELECT] = false; } if ((fn_800D56B0() && !fn_800D53D0() && !mMinusBtn.fn_800F75E0()) - || (dLytMeterContainer_c::getField_0x13B66() || fn_800D5420() || field_0x13750 == 0 || fn_800D5680())) { + || (dLytMeter_c::getField_0x13B66() || fn_800D5420() || field_0x13750 == 0 || fn_800D5680())) { mPanesVisible[METER_ANIM_MINUS_BTN] = false; } if ((fn_800D56B0() && !fn_800D53D0()) - || (dLytMeterContainer_c::getField_0x13B66() || fn_800D5420() || field_0x13750 == 0 || fn_800D5680()) + || (dLytMeter_c::getField_0x13B66() || fn_800D5420() || field_0x13750 == 0 || fn_800D5680()) || (getUiMode() > 1 && !mPlusBtn.getField_0x1C0() && !mPlusBtn.isCalling())) { mPanesVisible[METER_ANIM_PLUS_BTN] = false; @@ -1178,7 +1197,7 @@ void dLytMeter_c::checkPaneVisibility() { if ((fn_800D56B0() && !fn_800D53D0()) - || (dLytMeterContainer_c::getField_0x13B66() || fn_800D5420() || field_0x13750 == 0 || fn_800D5680()) + || (dLytMeter_c::getField_0x13B66() || fn_800D5420() || field_0x13750 == 0 || fn_800D5680()) || (getUiMode() > 1 && !mCrossBtn.fn_800FA730())) { mPanesVisible[METER_ANIM_CROSS_BTN] = false; @@ -1186,7 +1205,7 @@ void dLytMeter_c::checkPaneVisibility() { if ((fn_800D56B0() && !fn_800D53D0()) - || (dLytMeterContainer_c::getField_0x13B66() || fn_800D5420() || field_0x13750 == 0 || fn_800D5680()) + || (dLytMeter_c::getField_0x13B66() || fn_800D5420() || field_0x13750 == 0 || fn_800D5680()) || (getUiMode() != 0 && !mp1Button->shouldCall())) { mPanesVisible[METER_ANIM_1_BTN] = false; @@ -1194,7 +1213,7 @@ void dLytMeter_c::checkPaneVisibility() { if ((fn_800D56B0() && !fn_800D53D0()) - || (dLytMeterContainer_c::getField_0x13B66() || fn_800D5420() || field_0x13750 == 0 || fn_800D5680()) + || (dLytMeter_c::getField_0x13B66() || fn_800D5420() || field_0x13750 == 0 || fn_800D5680()) || (getUiMode() != 0 && !mp2Button->shouldCall())) { mPanesVisible[METER_ANIM_2_BTN] = false; @@ -1202,7 +1221,7 @@ void dLytMeter_c::checkPaneVisibility() { if ((fn_800D56B0() && !fn_800D53D0()) - || (dLytMeterContainer_c::getField_0x13B66() || fn_800D5420() || field_0x13750 == 0 || fn_800D5680()) + || (dLytMeter_c::getField_0x13B66() || fn_800D5420() || field_0x13750 == 0 || fn_800D5680()) || (getUiMode() > 1)) { mPanesVisible[METER_ANIM_A_BTN] = false; @@ -1210,7 +1229,7 @@ void dLytMeter_c::checkPaneVisibility() { if ((fn_800D56B0() && !fn_800D53D0()) - || (dLytMeterContainer_c::getField_0x13B66() || fn_800D5420() || field_0x13750 == 0 || fn_800D5680()) + || (dLytMeter_c::getField_0x13B66() || fn_800D5420() || field_0x13750 == 0 || fn_800D5680()) || (getUiMode() != 0)) { mPanesVisible[METER_ANIM_REMOCON_BG] = false; @@ -1218,7 +1237,7 @@ void dLytMeter_c::checkPaneVisibility() { if ((fn_800D56B0() && !fn_800D53D0() && !mDowsing.fn_800FE490()) - || (dLytMeterContainer_c::getField_0x13B66() || fn_800D5420() || field_0x13750 == 0 || fn_800D5680()) + || (dLytMeter_c::getField_0x13B66() || fn_800D5420() || field_0x13750 == 0 || fn_800D5680()) || (getUiMode() != 0 && !fn_800D5380(true) && !mDowsing.shouldCall() && !mDowsing.fn_800FE490())) { mPanesVisible[METER_ANIM_DOWSING] = false; @@ -1226,7 +1245,7 @@ void dLytMeter_c::checkPaneVisibility() { if ((fn_800D56B0() && !fn_800D53D0()) - || (dLytMeterContainer_c::getField_0x13B66() || fn_800D5420() || field_0x13750 == 0 || fn_800D5680()) + || (dLytMeter_c::getField_0x13B66() || fn_800D5420() || field_0x13750 == 0 || fn_800D5680()) || (getUiMode() != 0 && !fn_800D5380(true) && !mZBtn.isCalling())) { mPanesVisible[METER_ANIM_Z_BTN] = false; @@ -1234,7 +1253,7 @@ void dLytMeter_c::checkPaneVisibility() { if ((fn_800D56B0() && !fn_800D53D0()) - || (dLytMeterContainer_c::getField_0x13B66() || fn_800D5420() || field_0x13750 == 0 || fn_800D5680()) + || (dLytMeter_c::getField_0x13B66() || fn_800D5420() || field_0x13750 == 0 || fn_800D5680()) || (getUiMode() != 0)) { mPanesVisible[METER_ANIM_NUN_STK] = false; @@ -1242,7 +1261,7 @@ void dLytMeter_c::checkPaneVisibility() { if ((fn_800D56B0() && !fn_800D53D0()) - || (dLytMeterContainer_c::getField_0x13B66() || fn_800D5420() || field_0x13750 == 0 || fn_800D5680()) + || (dLytMeter_c::getField_0x13B66() || fn_800D5420() || field_0x13750 == 0 || fn_800D5680()) || (getUiMode() != 0)) { mPanesVisible[METER_ANIM_NUN_BG] = false; @@ -1258,7 +1277,7 @@ void dLytMeter_c::checkPaneVisibility() { MinigameManager::isInMinigameState(MinigameManager::SPIRAL_CHARGE_TUTORIAL) || MinigameManager::isInMinigameState(MinigameManager::ROLLERCOASTER) || fn_800D56B0() || field_0x1377E) - || (dLytMeterContainer_c::getField_0x13B66() || fn_800D5420() || + || (dLytMeter_c::getField_0x13B66() || fn_800D5420() || (dLytSimpleWindow_c::getInstance() != nullptr && dLytSimpleWindow_c::getInstance()->fn_8012B000()) || fn_800D5650() || fn_800D5680())) { mPanesVisible[METER_ANIM_RUPY] = false; @@ -1283,7 +1302,7 @@ void dLytMeter_c::checkPaneVisibility() { (dMessage_c::getInstance()->getField_0x2FC() == 0 || dMessage_c::getInstance()->getField_0x2FC() == -2)) || field_0x1377E - || (dLytMeterContainer_c::getField_0x13B66() || fn_800D5420() || + || (dLytMeter_c::getField_0x13B66() || fn_800D5420() || (dLytSimpleWindow_c::getInstance() != nullptr && dLytSimpleWindow_c::getInstance()->fn_8012B000()) || fn_800D5650() || fn_800D5680())) { mPanesVisible[METER_ANIM_SHIELD] = false; @@ -1310,7 +1329,7 @@ void dLytMeter_c::checkPaneVisibility() { || (field_0x1377E != 0) - || (dLytMeterContainer_c::getField_0x13B66() || fn_800D5420() || + || (dLytMeter_c::getField_0x13B66() || fn_800D5420() || (dLytSimpleWindow_c::getInstance() != nullptr && dLytSimpleWindow_c::getInstance()->fn_8012B000()) || fn_800D5650() || fn_800D5680())) { mPanesVisible[METER_ANIM_HEART] = false; @@ -1318,7 +1337,7 @@ void dLytMeter_c::checkPaneVisibility() { if (!isSilentRealm() || (fn_800D56B0() && !fn_800D5590()) - || (dLytMeterContainer_c::getField_0x13B66() || fn_800D5420() || field_0x13750 == 0 || fn_800D5680())) { + || (dLytMeter_c::getField_0x13B66() || fn_800D5420() || field_0x13750 == 0 || fn_800D5680())) { mTimerVisible = false; } @@ -1339,12 +1358,12 @@ void dLytMeter_c::checkPaneVisibility() { MinigameManager::isInMinigameState(MinigameManager::SPIRAL_CHARGE_TUTORIAL) || MinigameManager::isInMinigameState(MinigameManager::ROLLERCOASTER)) - || (dLytMeterContainer_c::getField_0x13B66() || fn_800D5420() || fn_800D5650() || fn_800D5680())) { + || (dLytMeter_c::getField_0x13B66() || fn_800D5420() || fn_800D5650() || fn_800D5680())) { mPanesVisible[METER_ANIM_GANBARI_GAUGE] = false; } if ((dAcPy_c::GetLink()->getRidingActorType() != dAcPy_c::RIDING_LOFTWING || fn_800D56B0()) || - (dLytMeterContainer_c::getField_0x13B66() || fn_800D5420() || fn_800D5650() || fn_800D5680())) { + (dLytMeter_c::getField_0x13B66() || fn_800D5420() || fn_800D5650() || fn_800D5680())) { mSkyGaugeVisible = false; } else if (bird != nullptr && mpSkyGauge != nullptr) { mpSkyGauge->setHeight(dAcPy_c::GetLink()->vt_0x260()); @@ -1360,7 +1379,7 @@ void dLytMeter_c::checkPaneVisibility() { if (dAcPy_c::GetLink()->getRidingActorType() != dAcPy_c::RIDING_LOFTWING || !field_0x13780 || - (dLytDobutton_c::getFn0x8010E5D0() != 0x5E || fn_800D56B0() || dLytMeterContainer_c::getField_0x13B66() || + (dLytDobutton_c::getFn0x8010E5D0() != 0x5E || fn_800D56B0() || dLytMeter_c::getField_0x13B66() || fn_800D5420() || fn_800D5650() || fn_800D5680())) { mBirdGaugeVisible = false; } @@ -1388,7 +1407,7 @@ void dLytMeter_c::checkPaneVisibility() { if (!field_0x13781 || fn_800D56B0() || - (dLytMeterContainer_c::getField_0x13B66() || fn_800D5420() || fn_800D5650() || fn_800D5680())) { + (dLytMeter_c::getField_0x13B66() || fn_800D5420() || fn_800D5650() || fn_800D5680())) { mBossGaugeVisible = false; } @@ -1414,8 +1433,8 @@ void dLytMeter_c::checkPaneVisibility() { if (dAcItem_c::getKeyPieceCount() == 0 || dLytAreaCaption_c::getVisible() || fn_800D5380(false) || SceneflagManager::sInstance->checkSceneflagGlobal(4, 0x21) || MinigameManager::isInAnyMinigame() - || (dLytMeterContainer_c::getField_0x13B66() || fn_800D56B0() || field_0x1377E || fn_800D5420() || - fn_800D5650() || fn_800D5680())) { + || (dLytMeter_c::getField_0x13B66() || fn_800D56B0() || field_0x1377E || fn_800D5420() || fn_800D5650() || + fn_800D5680())) { mKakeraKeyVisible = false; } if (mKakeraKeyVisible != oldKakeraKeyVisible) { @@ -1434,7 +1453,7 @@ void dLytMeter_c::checkPaneVisibility() { dAcPy_c::GetLink()->getCurrentAction() == 0x8C || dLytAreaCaption_c::getVisible() || fn_800D5380(false) || MinigameManager::isInAnyMinigame() || fn_800D56B0() || field_0x1377E - || (dLytMeterContainer_c::getField_0x13B66() || fn_800D5420() || fn_800D5650() || fn_800D5680())) { + || (dLytMeter_c::getField_0x13B66() || fn_800D5420() || fn_800D5650() || fn_800D5680())) { mBossKeyVisible = false; } @@ -1451,7 +1470,7 @@ void dLytMeter_c::checkPaneVisibility() { if (dAcItem_c::getSmallKeyCount() == 0 || dLytAreaCaption_c::getVisible() || fn_800D5380(false) || MinigameManager::isInAnyMinigame() || fn_800D56B0() || field_0x1377E - || (dLytMeterContainer_c::getField_0x13B66() || fn_800D5420() || fn_800D5650() || fn_800D5680())) { + || (dLytMeter_c::getField_0x13B66() || fn_800D5420() || fn_800D5650() || fn_800D5680())) { mSmallKeyVisible = false; } @@ -1468,8 +1487,7 @@ void dLytMeter_c::checkPaneVisibility() { if (!field_0x137B2 || dLytAreaCaption_c::getVisible() || fn_800D5380(false) || MinigameManager::isInAnyMinigame() || field_0x1377E - || fn_800D56B0() || dLytMeterContainer_c::getField_0x13B66() || fn_800D5420() || fn_800D5650() || - fn_800D5680()) { + || fn_800D56B0() || dLytMeter_c::getField_0x13B66() || fn_800D5420() || fn_800D5650() || fn_800D5680()) { mDrinkVisible = false; } @@ -1486,19 +1504,19 @@ void dLytMeter_c::checkPaneVisibility() { } } -bool dLytMeter_c::execute() { - dLytMeterContainer_c *container = dLytMeterContainer_c::GetInstance(); +bool dLytMeterMain_c::execute() { + dLytMeter_c *meter = dLytMeter_c::GetInstance(); if (field_0x13775 && !EventManager::isInEvent()) { field_0x13775 = 0; } if (isSilentRealm()) { - container->clearFlags(0x40); - container->clearFlags(0xF); + meter->clearFlags(METER_BTN_MINUS); + meter->clearFlags(METER_BTN_CROSS); } if (dStageMgr_c::GetInstance()->isInLastBoss()) { - container->clearFlags(0x20); + meter->clearFlags(METER_BTN_PLUS); } if (field_0x13750 != 0 && field_0x13748 == 1) { @@ -1634,7 +1652,7 @@ bool dLytMeter_c::execute() { mAnmGroups[METER_ANIM_POSITION].setAnimEnable(false); } - container->resetFlags(); + meter->resetFlags(); LytDoButtonRelated::set(LytDoButtonRelated::DO_BUTTON_A, LytDoButtonRelated::DO_NONE); LytDoButtonRelated::set(LytDoButtonRelated::DO_BUTTON_B, LytDoButtonRelated::DO_NONE); @@ -1683,7 +1701,7 @@ bool dLytMeter_c::execute() { return true; } -bool dLytMeter_c::draw() { +bool dLytMeterMain_c::draw() { mLyt.addToDrawList(); if (mpTimerPart1 != nullptr) { mpTimerPart1->getLyt()->addToDrawList(); @@ -1721,11 +1739,11 @@ bool dLytMeter_c::draw() { return true; } -dLytMeterContainer_c::dLytMeterContainer_c() { +dLytMeter_c::dLytMeter_c() { sInstance = this; } -bool dLytMeterContainer_c::build() { +bool dLytMeter_c::build() { void *data = LayoutArcManager::GetInstance()->getLoadedData("DoButton"); mResAcc.attach(data, ""); if (dScTitle_c::sInstance != nullptr) { @@ -1739,7 +1757,7 @@ bool dLytMeterContainer_c::build() { } dLytAreaCaption_c::create(); - mMeter.build(&mResAcc); + mMain.build(&mResAcc); if (dScTitle_c::sInstance != nullptr) { mpDoButton = nullptr; mpDoButtonRelated = nullptr; @@ -1775,7 +1793,7 @@ bool dLytMeterContainer_c::build() { return true; } -bool dLytMeterContainer_c::remove() { +bool dLytMeter_c::remove() { if (mpDoButton != nullptr) { mpDoButton->remove(); delete mpDoButton; @@ -1786,7 +1804,7 @@ bool dLytMeterContainer_c::remove() { delete mpDoButtonRelated; mpDoButtonRelated = nullptr; } - mMeter.remove(); + mMain.remove(); if (mpEventSkip != nullptr) { mpEventSkip->remove(); delete mpEventSkip; @@ -1802,15 +1820,15 @@ bool dLytMeterContainer_c::remove() { return true; } -bool dLytMeterContainer_c::execute() { - mMeter.mMinusBtn.setField_0x4E80(field_0x13B58); - mMeter.mDowsing.setField_0x54E0(field_0x13B5C); +bool dLytMeter_c::execute() { + mMain.mMinusBtn.setField_0x4E80(field_0x13B58); + mMain.mDowsing.setField_0x54E0(field_0x13B5C); if (mpEventSkip != nullptr) { mpEventSkip->execute(); } dLytAreaCaption_c::update(); - mMeter.execute(); + mMain.execute(); if (mpDoButton != nullptr) { mpDoButton->execute(); } @@ -1830,22 +1848,22 @@ bool dLytMeterContainer_c::execute() { } if (field_0x13B64 || (!EventManager::isInEvent() && field_0x13B65)) { - dLytMeterContainer_c::setField_0x13B63(0); + dLytMeter_c::setField_0x13B63(0); field_0x13B64 = 0; field_0x13B65 = 0; } - if (dLytMeterContainer_c::getField_0x13B63() && EventManager::isInEvent()) { + if (dLytMeter_c::getField_0x13B63() && EventManager::isInEvent()) { field_0x13B65 = 1; } return true; } -bool dLytMeterContainer_c::draw() { +bool dLytMeter_c::draw() { if (mVisible) { - mMeter.draw(); - if (mMeter.field_0x13750 != 3) { + mMain.draw(); + if (mMain.field_0x13750 != 3) { if (mpEventSkip != nullptr) { mpEventSkip->draw(); } @@ -1862,64 +1880,64 @@ bool dLytMeterContainer_c::draw() { return true; } -bool dLytMeterContainer_c::fn_800D5670() { - return mMeter.fn_800D5350(); +bool dLytMeter_c::fn_800D5670() { + return mMain.fn_800D5350(); } -void dLytMeterContainer_c::setAreaCaptionOverrideVisibility(bool visible) { +void dLytMeter_c::setAreaCaptionOverrideVisibility(bool visible) { for (int i = 0; i < METER_NUM_PANES; i++) { - mMeter.mPanesNotHiddenByAreaCaption[i] = visible; + mMain.mPanesNotHiddenByAreaCaption[i] = visible; } - mMeter.field_0x137B2 = visible; + mMain.field_0x137B2 = visible; } -bool dLytMeterContainer_c::fn_800D56F0() { - if (mMeter.mpTimer != nullptr) { - return mMeter.mpTimer->getField_0x54(); +bool dLytMeter_c::fn_800D56F0() { + if (mMain.mpTimer != nullptr) { + return mMain.mpTimer->getField_0x54(); } return false; } -void dLytMeterContainer_c::fn_800D9710() { +void dLytMeter_c::fn_800D9710() { field_0x13B5C = 8; } -void dLytMeterContainer_c::setStaminaWheelPercentInternal(f32 percent) { - mMeter.mGanbariGauge.setStaminaPercent(percent); +void dLytMeter_c::setStaminaWheelPercentInternal(f32 percent) { + mMain.mGanbariGauge.setStaminaPercent(percent); } -void dLytMeterContainer_c::fn_800D9730(u8 val) { - mMeter.mItemSelect.fn_800EF6B0(val); - mMeter.mGanbariGauge.setField_0x539(val != 0); +void dLytMeter_c::fn_800D9730(u8 val) { + mMain.mItemSelect.fn_800EF6B0(val); + mMain.mGanbariGauge.setField_0x539(val != 0); } -void dLytMeterContainer_c::fn_800D9780(bool val) { +void dLytMeter_c::fn_800D9780(bool val) { if (!field_0x13B61) { field_0x13B60 = val; } } -bool dLytMeterContainer_c::fn_800D97A0() { +bool dLytMeter_c::fn_800D97A0() { if (field_0x13B61) { return false; } return field_0x13B60; } -void dLytMeterContainer_c::setStaminaWheelPercent(f32 percent) { +void dLytMeter_c::setStaminaWheelPercent(f32 percent) { if (sInstance != nullptr) { sInstance->setStaminaWheelPercentInternal(percent); } } -void dLytMeterContainer_c::fn_800D97E0(u8 arg) { +void dLytMeter_c::fn_800D97E0(u8 arg) { if (sInstance != nullptr) { sInstance->fn_800D9730(arg); } } -void dLytMeterContainer_c::setVisible(bool b) { +void dLytMeter_c::setVisible(bool b) { if (sInstance != nullptr) { sInstance->mVisible = b; } diff --git a/src/d/lyt/meter/d_lyt_meter_a_btn.cpp b/src/d/lyt/meter/d_lyt_meter_a_btn.cpp index bfb359b4..9e0c1ceb 100644 --- a/src/d/lyt/meter/d_lyt_meter_a_btn.cpp +++ b/src/d/lyt/meter/d_lyt_meter_a_btn.cpp @@ -216,7 +216,7 @@ bool dLytMeterABtn_c::execute() { return true; } - if (dLytMeterContainer_c::GetInstance()->getMeterField_0x13750() == 0) { + if (dLytMeter_c::GetInstance()->getMeterField_0x13750() == 0) { LytDoButtonRelated::set(LytDoButtonRelated::DO_BUTTON_A, LytDoButtonRelated::DO_NONE); if (field_0x1BC != LytDoButtonRelated::DO_NONE) { @@ -228,8 +228,8 @@ bool dLytMeterABtn_c::execute() { bool state = false; - if (EventManager::isInEvent() && !dLytMeterContainer_c::GetInstance()->fn_800D5670() && - dLytMeterContainer_c::GetMeter()->getField_0x1377E() == 0 && !checkIsInSkykeepPuzzle() && + if (EventManager::isInEvent() && !dLytMeter_c::GetInstance()->fn_800D5670() && + dLytMeter_c::GetMain()->getField_0x1377E() == 0 && !checkIsInSkykeepPuzzle() && LytDoButtonRelated::get(LytDoButtonRelated::DO_BUTTON_A) == LytDoButtonRelated::DO_NONE) { field_0x1C9 = 0; diff --git a/src/d/lyt/meter/d_lyt_meter_cross_btn.cpp b/src/d/lyt/meter/d_lyt_meter_cross_btn.cpp index 496ecf6f..010656f3 100644 --- a/src/d/lyt/meter/d_lyt_meter_cross_btn.cpp +++ b/src/d/lyt/meter/d_lyt_meter_cross_btn.cpp @@ -24,7 +24,7 @@ void dLytMeterCrossBtnParts_c::initializeState_Wait() { mOnDelay = 15; } void dLytMeterCrossBtnParts_c::executeState_Wait() { - if (dLytMeterContainer_c::GetMeter()->fn_800D5650()) { + if (dLytMeter_c::GetMain()->fn_800D5650()) { mOnDelay = 0; } @@ -139,7 +139,7 @@ void dLytMeterCrossBtnParts_c::execute(bool bIsVisible) { return; } - if (dLytMeterContainer_c::GetInstance()->getMeterField_0x13750() == 0) { + if (dLytMeter_c::GetInstance()->getMeterField_0x13750() == 0) { if (mIndex == 0) { LytDoButtonRelated::fn_8010EC10(LytDoButtonRelated::DO_NONE, true); } else if (mIndex == 1) { @@ -163,8 +163,8 @@ void dLytMeterCrossBtnParts_c::execute(bool bIsVisible) { } if ((EventManager::isInEvent() && dMessage_c::getInstance()->getField_0x32C() == 12 && !checkIsInSkykeepPuzzle() && - !dLytMeterContainer_c::GetInstance()->fn_800D5670()) || - ((dLytMeterContainer_c::getItemSelect0x75A2() && (mIndex != 1 || field_0x74 != 0)) || !bIsVisible)) { + !dLytMeter_c::GetInstance()->fn_800D5670()) || + ((dLytMeter_c::getItemSelect0x75A2() && (mIndex != 1 || field_0x74 != 0)) || !bIsVisible)) { field_0x7C = 0; if (mIndex == 0) { @@ -354,7 +354,7 @@ void dLytMeterCrossBtn_c::finalizeState_ToUnuse() { void dLytMeterCrossBtn_c::initializeState_Unuse() {} void dLytMeterCrossBtn_c::executeState_Unuse() { - if (dLytMeterContainer_c::GetInstance()->checkAllFlags(0x1)) { + if (dLytMeter_c::GetInstance()->checkAllFlags(METER_BTN_CROSS_UP)) { mStateMgr.changeState(StateID_ToUse); } } diff --git a/src/d/lyt/meter/d_lyt_meter_dowsing.cpp b/src/d/lyt/meter/d_lyt_meter_dowsing.cpp index 37261c9b..b9ea37aa 100644 --- a/src/d/lyt/meter/d_lyt_meter_dowsing.cpp +++ b/src/d/lyt/meter/d_lyt_meter_dowsing.cpp @@ -396,14 +396,14 @@ void dLytMeterDowsing_c::executeState_Wait() { } else if (field_0x5505 != 0) { mStateMgr.changeState(StateID_MenuSelectingIn); } else if (field_0x550A != 0 && - (!dLytMeterContainer_c::GetMeter()->fn_800D5380(0) || dLytMeterContainer_c::GetMeter()->fn_800D5650() || - dLytMeterContainer_c::GetMeter()->fn_800D5680())) { + (!dLytMeter_c::GetMain()->fn_800D5380(0) || dLytMeter_c::GetMain()->fn_800D5650() || + dLytMeter_c::GetMain()->fn_800D5680())) { mStateMgr.changeState(StateID_Reset); - } else if (!dLytMeterContainer_c::GetInstance()->checkAllFlags(0x400)) { + } else if (!dLytMeter_c::GetInstance()->checkAllFlags(METER_BTN_C)) { mStateMgr.changeState(StateID_ToUnuse); - } else if (dLytMeterContainer_c::GetInstance()->getMeterField_0x1377F() != 0 && field_0x550A == 0 && - dLytMeterContainer_c::GetMeter()->fn_800D5380(0) && !dLytMeterContainer_c::GetMeter()->fn_800D5650() && - !dLytMeterContainer_c::GetMeter()->fn_800D5680() && + } else if (dLytMeter_c::GetInstance()->getMeterField_0x1377F() != 0 && field_0x550A == 0 && + dLytMeter_c::GetMain()->fn_800D5380(0) && !dLytMeter_c::GetMain()->fn_800D5650() && + !dLytMeter_c::GetMain()->fn_800D5680() && getSelectedDowsingSlot() != DowsingTarget::SLOT_LOOK && getSelectedDowsingSlot() != DowsingTarget::SLOT_NONE && LytDoButtonRelated::get(LytDoButtonRelated::DO_BUTTON_C) == 0x52) { @@ -554,8 +554,8 @@ void dLytMeterDowsing_c::initializeState_ToUse() { if (FileManager::GetInstance()->getDowsingSlotIdx() != 8 && LytDoButtonRelated::get(LytDoButtonRelated::DO_BUTTON_C) == 0x52 && - dLytMeterContainer_c::GetMeter()->fn_800D5380(0) && !dLytMeterContainer_c::GetMeter()->fn_800D5650() && - !dLytMeterContainer_c::GetMeter()->fn_800D5680()) { + dLytMeter_c::GetMain()->fn_800D5380(0) && !dLytMeter_c::GetMain()->fn_800D5650() && + !dLytMeter_c::GetMain()->fn_800D5680()) { mAnm[DOWSING_ANIM_RESET].setAnimEnable(true); mAnm[DOWSING_ANIM_RESET].setBackwardsOnce(); mAnm[DOWSING_ANIM_RESET].setToStart(); @@ -564,8 +564,8 @@ void dLytMeterDowsing_c::initializeState_ToUse() { void dLytMeterDowsing_c::executeState_ToUse() { if (FileManager::GetInstance()->getDowsingSlotIdx() != 8 && LytDoButtonRelated::get(LytDoButtonRelated::DO_BUTTON_C) == 0x52 && - dLytMeterContainer_c::GetMeter()->fn_800D5380(0) && !dLytMeterContainer_c::GetMeter()->fn_800D5650() && - !dLytMeterContainer_c::GetMeter()->fn_800D5680()) { + dLytMeter_c::GetMain()->fn_800D5380(0) && !dLytMeter_c::GetMain()->fn_800D5650() && + !dLytMeter_c::GetMain()->fn_800D5680()) { if (mAnm[DOWSING_ANIM_INPUT_0].isStop2()) { if (!mAnm[DOWSING_ANIM_RESET].isEnabled() || mAnm[DOWSING_ANIM_RESET].isStop2()) { mStateMgr.changeState(StateID_Wait); @@ -590,7 +590,7 @@ void dLytMeterDowsing_c::finalizeState_ToUse() { void dLytMeterDowsing_c::initializeState_ToUnuse() { mAnm[DOWSING_ANIM_INPUT_0].setForwardOnce(); - if (dLytMeterContainer_c::GetMeter()->fn_800D5650()) { + if (dLytMeter_c::GetMain()->fn_800D5650()) { mAnm[DOWSING_ANIM_INPUT_0].setToEnd2(); } else { mAnm[DOWSING_ANIM_INPUT_0].setToStart(); @@ -599,8 +599,8 @@ void dLytMeterDowsing_c::initializeState_ToUnuse() { if (FileManager::GetInstance()->getDowsingSlotIdx() != 8 && LytDoButtonRelated::get(LytDoButtonRelated::DO_BUTTON_C) == 0x52 && - dLytMeterContainer_c::GetMeter()->fn_800D5380(0) && !dLytMeterContainer_c::GetMeter()->fn_800D5650() && - !dLytMeterContainer_c::GetMeter()->fn_800D5680()) { + dLytMeter_c::GetMain()->fn_800D5380(0) && !dLytMeter_c::GetMain()->fn_800D5650() && + !dLytMeter_c::GetMain()->fn_800D5680()) { mAnm[DOWSING_ANIM_RESET].setAnimEnable(true); mAnm[DOWSING_ANIM_RESET].setForwardOnce(); mAnm[DOWSING_ANIM_RESET].setToStart(); @@ -636,9 +636,9 @@ void dLytMeterDowsing_c::executeState_Unuse() { mLyt.calc(); mAnm[DOWSING_ANIM_INPUT_0].setAnimEnable(false); mStateMgr.changeState(StateID_DemoMove); - } else if (!dLytMeterContainer_c::GetMeter()->fn_800D5680() && - dLytMeterContainer_c::GetInstance()->getMeterField_0x13774() == 0 && - dLytMeterContainer_c::GetInstance()->checkAllFlags(0x400)) { + } else if (!dLytMeter_c::GetMain()->fn_800D5680() && + dLytMeter_c::GetInstance()->getMeterField_0x13774() == 0 && + dLytMeter_c::GetInstance()->checkAllFlags(METER_BTN_C)) { if (field_0x54D8 <= 0) { mStateMgr.changeState(StateID_ToUse); } else { @@ -902,7 +902,7 @@ bool dLytMeterDowsing_c::execute() { if (dLytControlGame_c::getInstance()->isStateNormal()) { if (StoryflagManager::sInstance->getCounterOrFlag(566) && LytDoButtonRelated::get(LytDoButtonRelated::DO_BUTTON_C) != LytDoButtonRelated::DO_NONE) { - if (dLytMeterContainer_c::GetMeter()->fn_800D5380(0)) { + if (dLytMeter_c::GetMain()->fn_800D5380(0)) { field_0x5508 = 0; StoryflagManager::sInstance->unsetFlag(566); if (getSelectedDowsingSlot() != DowsingTarget::SLOT_NONE) { @@ -979,9 +979,9 @@ bool dLytMeterDowsing_c::execute() { } field_0x54E8 = LytDoButtonRelated::get(LytDoButtonRelated::DO_BUTTON_C); field_0x54EC = LytDoButtonRelated::getHas(LytDoButtonRelated::DO_BUTTON_C) && - dLytMeterContainer_c::GetInstance()->checkAllFlags(0x400); + dLytMeter_c::GetInstance()->checkAllFlags(METER_BTN_C); if (*mStateMgr.getStateID() != StateID_ToUnuse && - (dLytMeterContainer_c::GetMeter()->getUiMode() == 0 || field_0x54E8 != 0x51)) { + (dLytMeter_c::GetMain()->getUiMode() == 0 || field_0x54E8 != 0x51)) { if (field_0x54E8 != field_0x54E4) { if (field_0x5500 != 0) { field_0x54E4 = field_0x54E8; @@ -1015,7 +1015,7 @@ bool dLytMeterDowsing_c::execute() { } if (mAnm[DOWSING_ANIM_CALL].isEnabled()) { mAnm[DOWSING_ANIM_CALL].play(); - if (dLytMeterContainer_c::GetInstance()->checkAllFlags(0x400) && + if (dLytMeter_c::GetInstance()->checkAllFlags(METER_BTN_C) && mAnm[DOWSING_ANIM_CALL].getFrame() == 1.0f) { SmallSoundManager::GetInstance()->playSound(SE_S_C_BUTTON_BLINK); } @@ -1110,7 +1110,7 @@ void dLytMeterDowsing_c::fn_800FE110() { mText[0].setShouldBeSelect(false); } - if (dLytMeterContainer_c::GetInstance()->getMeterField_0x1377F() != 0 && field_0x550A == 0) { + if (dLytMeter_c::GetInstance()->getMeterField_0x1377F() != 0 && field_0x550A == 0) { mInput.setShouldBeSelect(true); } else { mInput.setShouldBeSelect(false); @@ -1120,8 +1120,8 @@ void dLytMeterDowsing_c::fn_800FE110() { void dLytMeterDowsing_c::fn_800FE220() { if (getSelectedDowsingSlot() != DowsingTarget::SLOT_NONE && LytDoButtonRelated::get(LytDoButtonRelated::DO_BUTTON_C) == 0x52 && - dLytMeterContainer_c::GetMeter()->fn_800D5380(0) && !dLytMeterContainer_c::GetMeter()->fn_800D5650() && - !dLytMeterContainer_c::GetMeter()->fn_800D5680()) { + dLytMeter_c::GetMain()->fn_800D5380(0) && !dLytMeter_c::GetMain()->fn_800D5650() && + !dLytMeter_c::GetMain()->fn_800D5680()) { mAnm[DOWSING_ANIM_RESET].setAnimEnable(true); mAnm[DOWSING_ANIM_RESET].setForwardOnce(); mAnm[DOWSING_ANIM_RESET].setToStart(); @@ -1174,8 +1174,8 @@ bool dLytMeterDowsing_c::fn_800FE4B0() const { } bool dLytMeterDowsing_c::fn_800FE610() { - if ((!dLytMeterContainer_c::GetMeter()->getDowsingNotHiddenByAreaCaption() && !dLytAreaCaption_c::getVisible()) || - !getPane()->IsVisible() || dLytMeterContainer_c::GetMeter()->fn_800D5680()) { + if ((!dLytMeter_c::GetMain()->getDowsingNotHiddenByAreaCaption() && !dLytAreaCaption_c::getVisible()) || + !getPane()->IsVisible() || dLytMeter_c::GetMain()->fn_800D5680()) { return false; } return true; @@ -1202,7 +1202,7 @@ s32 dLytMeterDowsing_c::convertToLytIndex(s32 slot) const { } u8 dLytMeterDowsing_c::getSelectedDowsingSlot() const { - if (dLytMeterContainer_c::GetMeter()->fn_800D5650()) { + if (dLytMeter_c::GetMain()->fn_800D5650()) { return DowsingTarget::SLOT_NONE; } else { return FileManager::GetInstance()->getDowsingSlotIdx(); diff --git a/src/d/lyt/meter/d_lyt_meter_event_skip.cpp b/src/d/lyt/meter/d_lyt_meter_event_skip.cpp index 38a8c778..4a1e9914 100644 --- a/src/d/lyt/meter/d_lyt_meter_event_skip.cpp +++ b/src/d/lyt/meter/d_lyt_meter_event_skip.cpp @@ -22,8 +22,8 @@ static const d2d::LytBrlanMapping brlanMap[] = { void dLytMeterEventSkip_c::initializeState_Invisible() {} void dLytMeterEventSkip_c::executeState_Invisible() { - if (shouldPromptForSkip() || dLytMeterContainer_c::GetInstance()->getMeterField_0x13774()) { - if (dLytMeterContainer_c::GetInstance()->getMeterField_0x13774()) { + if (shouldPromptForSkip() || dLytMeter_c::GetInstance()->getMeterField_0x13774()) { + if (dLytMeter_c::GetInstance()->getMeterField_0x13774()) { for (int i = 0; i < 2; i++) { mLyt.fn_800AB9A0(mpTextBoxes[i], 1); } @@ -54,7 +54,7 @@ void dLytMeterEventSkip_c::finalizeState_In() {} void dLytMeterEventSkip_c::initializeState_Visible() {} void dLytMeterEventSkip_c::executeState_Visible() { - if (!shouldPromptForSkip() && !dLytMeterContainer_c::GetInstance()->getMeterField_0x13774()) { + if (!shouldPromptForSkip() && !dLytMeter_c::GetInstance()->getMeterField_0x13774()) { mAnm[SKIP_ANIM_OUT].setAnimEnable(true); mAnm[SKIP_ANIM_OUT].setFrame(0.0f); mStateMgr.changeState(StateID_Out); diff --git a/src/d/lyt/meter/d_lyt_meter_item_select.cpp b/src/d/lyt/meter/d_lyt_meter_item_select.cpp index 50213745..f79df912 100644 --- a/src/d/lyt/meter/d_lyt_meter_item_select.cpp +++ b/src/d/lyt/meter/d_lyt_meter_item_select.cpp @@ -521,7 +521,7 @@ void dLytMeterItemSelect_c::executeState_InitWait() { if ((field_0x574C != I_INVALID && field_0x5794 != I_INVALID && !blocked) || field_0x579A != I_INVALID) { realizeSelectedWheelItem(); fn_800EF8C0(true); - if (dLytMeterContainer_c::GetInstance()->checkAllFlags(0x10)) { + if (dLytMeter_c::GetInstance()->checkAllFlags(METER_BTN_B)) { for (int i = 0; i < 4; i++) { if (i == 2) { mBtn[i].setVisible2(false); @@ -592,7 +592,7 @@ void dLytMeterItemSelect_c::executeState_InitWait() { mpPanes[ITEM_SELECT_PANE_ITEM_SELECT]->SetVisible(false); } mAnm[ITEM_SELECT_ANIM_SELECT_LOOP].setAnimEnable(true); - if (dLytMeterContainer_c::GetInstance()->checkAllFlags(0x10)) { + if (dLytMeter_c::GetInstance()->checkAllFlags(METER_BTN_B)) { for (int i = 0; i < 4; i++) { if (i == 2 && blocked) { mBtn[i].setVisible2(false); @@ -684,9 +684,9 @@ void dLytMeterItemSelect_c::executeState_Wait() { } else if ((field_0x5794 == I_SAILCLOTH || (field_0x5794 == I_BOAT_CANNON || field_0x5794 == I_HARP)) && field_0x579A == I_INVALID) { mStateMgr.changeState(StateID_SetSpecialItemIn); - } else if (!dLytMeterContainer_c::GetInstance()->checkAllFlags(0x10)) { + } else if (!dLytMeter_c::GetInstance()->checkAllFlags(METER_BTN_B)) { mStateMgr.changeState(StateID_ToUnuse); - } else if (!dLytMeterContainer_c::GetMeter()->fn_800D5650() && !dLytMeterContainer_c::GetMeter()->fn_800D5680() && + } else if (!dLytMeter_c::GetMain()->fn_800D5650() && !dLytMeter_c::GetMain()->fn_800D5680() && LytDoButtonRelated::get(LytDoButtonRelated::DO_BUTTON_B) != LytDoButtonRelated::DO_ITEMS && LytDoButtonRelated::get(LytDoButtonRelated::DO_BUTTON_B) != LytDoButtonRelated::DO_RETURN && LytDoButtonRelated::get(LytDoButtonRelated::DO_BUTTON_B) != LytDoButtonRelated::DO_DONE && @@ -790,7 +790,7 @@ void dLytMeterItemSelect_c::finalizeState_SelectIn() { void dLytMeterItemSelect_c::initializeState_Select() {} void dLytMeterItemSelect_c::executeState_Select() { - if (dLytMeterContainer_c::getCrossBtn0x7BF8() == 0 && dPad::checkButtonDpadDownPressed()) { + if (dLytMeter_c::getCrossBtn0x7BF8() == 0 && dPad::checkButtonDpadDownPressed()) { if (field_0x5794 != I_INVALID) { field_0x5780 = 0.0f; mStateMgr.changeState(StateID_SetIn); @@ -955,7 +955,7 @@ void dLytMeterItemSelect_c::executeState_Set() { mLyt.calc(); mAnm[ITEM_SELECT_ANIM_IN].setAnimEnable(false); mpPanes[ITEM_SELECT_PANE_ITEM_SELECT]->SetVisible(false); - if (!dLytMeterContainer_c::GetInstance()->checkAllFlags(0x10)) { + if (!dLytMeter_c::GetInstance()->checkAllFlags(METER_BTN_B)) { mStateMgr.changeState(StateID_ToUnuse); } else { mStateMgr.changeState(StateID_SetNone); @@ -970,7 +970,7 @@ void dLytMeterItemSelect_c::executeState_Set() { if ((field_0x5794 == I_SAILCLOTH || field_0x5794 == I_BOAT_CANNON || field_0x5794 == I_HARP) && field_0x579A != field_0x5794) { mStateMgr.changeState(StateID_SetSpecialItemIn); - } else if (!dLytMeterContainer_c::GetInstance()->checkAllFlags(0x10) && field_0x5790 <= 0 && + } else if (!dLytMeter_c::GetInstance()->checkAllFlags(METER_BTN_B) && field_0x5790 <= 0 && (field_0x5794 == I_BOAT_CANNON || field_0x5794 == I_HARP)) { mStateMgr.changeState(StateID_ToUnuse); } else if (field_0x57A2 != 0) { @@ -1112,7 +1112,7 @@ void dLytMeterItemSelect_c::finalizeState_ResetIn() {} void dLytMeterItemSelect_c::initializeState_Reset() {} void dLytMeterItemSelect_c::executeState_Reset() { if (field_0x57A2 != 0 || field_0x5754 == 1 || - (field_0x57A0 != 0 && (dLytMeterContainer_c::GetInstance()->checkAllFlags(0x10) || + (field_0x57A0 != 0 && (dLytMeter_c::GetInstance()->checkAllFlags(METER_BTN_B) || (field_0x5794 != I_HARP && field_0x5794 != I_BOAT_CANNON)))) { mAnm[ITEM_SELECT_ANIM_RESET].setBackwardsOnce(); mAnm[ITEM_SELECT_ANIM_RESET].setToEnd2(); @@ -1126,7 +1126,7 @@ void dLytMeterItemSelect_c::executeState_Reset() { LytDoButtonRelated::get(LytDoButtonRelated::DO_BUTTON_B) == LytDoButtonRelated::DO_RETURN || LytDoButtonRelated::get(LytDoButtonRelated::DO_BUTTON_B) == LytDoButtonRelated::DO_DONE || LytDoButtonRelated::get(LytDoButtonRelated::DO_BUTTON_B) == LytDoButtonRelated::DO_STOP || - field_0x5794 == I_INVALID || !dLytMeterContainer_c::GetInstance()->checkAllFlags(0x10) || + field_0x5794 == I_INVALID || !dLytMeter_c::GetInstance()->checkAllFlags(METER_BTN_B) || field_0x5754 == 1) { mStateMgr.changeState(StateID_ResetOut); } @@ -1141,7 +1141,7 @@ void dLytMeterItemSelect_c::initializeState_ResetOut() { } void dLytMeterItemSelect_c::executeState_ResetOut() { if (field_0x57A2 != 0 || field_0x5754 == 1 || - (field_0x57A0 != 0 && (dLytMeterContainer_c::GetInstance()->checkAllFlags(0x10) || + (field_0x57A0 != 0 && (dLytMeter_c::GetInstance()->checkAllFlags(METER_BTN_B) || (field_0x5794 != I_HARP && field_0x5794 != I_BOAT_CANNON)))) { mAnm[ITEM_SELECT_ANIM_RESET].setToEnd2(); mBtn[2].setVisible(false, true); @@ -1191,7 +1191,7 @@ void dLytMeterItemSelect_c::initializeState_ToUse() { } void dLytMeterItemSelect_c::executeState_ToUse() { if (field_0x57A2 != 0 || field_0x5754 == 1 || - (field_0x57A0 != 0 && (dLytMeterContainer_c::GetInstance()->checkAllFlags(0x10) || + (field_0x57A0 != 0 && (dLytMeter_c::GetInstance()->checkAllFlags(METER_BTN_B) || (field_0x5794 != I_HARP && field_0x5794 != I_BOAT_CANNON)))) { if (field_0x57C4 != 0 && mAnm[ITEM_SELECT_ANIM_OUT].isEnabled()) { mAnm[ITEM_SELECT_ANIM_OUT].setToEnd2(); @@ -1265,7 +1265,7 @@ void dLytMeterItemSelect_c::executeState_ToUnuse() { (field_0x579A == I_SAILCLOTH || field_0x579A == I_BOAT_CANNON || field_0x579A == I_HARP)) { mStateMgr.changeState(StateID_SetNone); } else if (field_0x57A2 != 0 || field_0x5754 == 1 || - (field_0x57A0 != 0 && (dLytMeterContainer_c::GetInstance()->checkAllFlags(0x10) || + (field_0x57A0 != 0 && (dLytMeter_c::GetInstance()->checkAllFlags(METER_BTN_B) || (field_0x5794 != I_HARP && field_0x5794 != I_BOAT_CANNON)))) { fn_800F0310(); return; @@ -1317,10 +1317,10 @@ void dLytMeterItemSelect_c::executeState_Unuse() { mBtn[2].setVisible(false); mStateMgr.changeState(StateID_FrameOffIn); } else if (field_0x57A2 != 0 || field_0x5754 == 1 || - (field_0x57A0 != 0 && (dLytMeterContainer_c::GetInstance()->checkAllFlags(0x10) || + (field_0x57A0 != 0 && (dLytMeter_c::GetInstance()->checkAllFlags(METER_BTN_B) || (field_0x5794 != I_HARP && field_0x5794 != I_BOAT_CANNON)))) { fn_800F0310(); - } else if (dLytMeterContainer_c::GetInstance()->checkAllFlags(0x10) || field_0x5754 == 1) { + } else if (dLytMeter_c::GetInstance()->checkAllFlags(METER_BTN_B) || field_0x5754 == 1) { if (field_0x5794 != I_INVALID) { if (field_0x5794 == I_SAILCLOTH || field_0x5794 == I_BOAT_CANNON || field_0x5794 == I_HARP) { mStateMgr.changeState(StateID_SetSpecialItemIn); @@ -1547,7 +1547,7 @@ void dLytMeterItemSelect_c::finalizeState_FrameOffIn() {} void dLytMeterItemSelect_c::initializeState_FrameOffMove() {} void dLytMeterItemSelect_c::executeState_FrameOffMove() { - if (!dLytMeterContainer_c::GetInstance()->checkAllFlags(0x10)) { + if (!dLytMeter_c::GetInstance()->checkAllFlags(METER_BTN_B)) { mBtn[1].setVisible(false, false); mBtn[0].setVisible(false, false); } else { @@ -1579,7 +1579,7 @@ void dLytMeterItemSelect_c::initializeState_FrameOffOut() { mAnm[ITEM_SELECT_ANIM_RESET].setAnimEnable(true); } - if (!dLytMeterContainer_c::GetInstance()->checkAllFlags(0x10)) { + if (!dLytMeter_c::GetInstance()->checkAllFlags(METER_BTN_B)) { mBtn[0].setVisible(false); mBtn[1].setVisible(false); mBtn[2].setVisible(false); @@ -1628,7 +1628,7 @@ void dLytMeterItemSelect_c::executeState_FrameOffOut() { if (field_0x5768 == 1) { mBtn[1].setVisible(false); mStateMgr.changeState(StateID_Unuse); - } else if (!dLytMeterContainer_c::GetInstance()->checkAllFlags(0x10)) { + } else if (!dLytMeter_c::GetInstance()->checkAllFlags(METER_BTN_B)) { mBtn[1].setVisible(false); mStateMgr.changeState(StateID_Unuse); } else { @@ -2078,7 +2078,7 @@ bool dLytMeterItemSelect_c::execute() { } bool b2 = false; - if (field_0x57B9 != 0 && dLytMeterContainer_c::GetInstance()->checkAllFlags(0x10) && + if (field_0x57B9 != 0 && dLytMeter_c::GetInstance()->checkAllFlags(METER_BTN_B) && mLastDoButtonRelatedAction == 0x85) { if (field_0x57BA == 0) { mAnm[ITEM_SELECT_ANIM_CALL].setToEnd(); @@ -2089,7 +2089,7 @@ bool dLytMeterItemSelect_c::execute() { if (mAnm[ITEM_SELECT_ANIM_CALL].isEnabled()) { mAnm[ITEM_SELECT_ANIM_CALL].play(); - if (dLytMeterContainer_c::GetInstance()->checkAllFlags(0x10) && + if (dLytMeter_c::GetInstance()->checkAllFlags(METER_BTN_B) && mAnm[ITEM_SELECT_ANIM_CALL].getFrame() == 1.0f) { SmallSoundManager::GetInstance()->playSound(SE_S_B_BUTTON_BLINK); } @@ -2110,7 +2110,7 @@ bool dLytMeterItemSelect_c::execute() { if (mAnm[ITEM_SELECT_ANIM_CALL].isEnabled()) { mAnm[ITEM_SELECT_ANIM_CALL].play(); - if (dLytMeterContainer_c::GetInstance()->checkAllFlags(0x10) && + if (dLytMeter_c::GetInstance()->checkAllFlags(METER_BTN_B) && mAnm[ITEM_SELECT_ANIM_CALL].getFrame() == 1.0f) { SmallSoundManager::GetInstance()->playSound(SE_S_PARACHUTE_CALL); } @@ -2337,8 +2337,8 @@ void dLytMeterItemSelect_c::fn_800EF8C0(bool bInstant) { mpPanes[10]->SetAlpha(0xFF); } - if (!mBtn[1].getShouldBeVisible() && dLytMeterContainer_c::GetInstance()->getMeterField_0x13770() != 1 && - dLytMeterContainer_c::GetInstance()->getMeterField_0x13770() != 2) { + if (!mBtn[1].getShouldBeVisible() && dLytMeter_c::GetInstance()->getMeterField_0x13770() != 1 && + dLytMeter_c::GetInstance()->getMeterField_0x13770() != 2) { visible = false; } if (bInstant == false) { @@ -2480,9 +2480,9 @@ bool dLytMeterItemSelect_c::fn_800EFDF0(bool b) const { bool dLytMeterItemSelect_c::fn_800F0030() const { if (!StoryflagManager::sInstance->getCounterOrFlag(58) && !(EventManager::isInEvent() && EventManager::isCurrentEvent("ItemGetGorgeous")) || - (mpOwnerPane == nullptr || !mpOwnerPane->IsVisible() || dLytMeterContainer_c::GetMeter()->fn_800D5650() || - dLytMeterContainer_c::GetMeter()->fn_800D5680() || - !dLytMeterContainer_c::GetMeter()->getItemSelectNotHiddenByAreaCaption())) { + (mpOwnerPane == nullptr || !mpOwnerPane->IsVisible() || dLytMeter_c::GetMain()->fn_800D5650() || + dLytMeter_c::GetMain()->fn_800D5680() || + !dLytMeter_c::GetMain()->getItemSelectNotHiddenByAreaCaption())) { // If we don't have a B-Wheel and we're not currently in the ItemGetGorgeous event, // or (random other conditions), return false return false; @@ -2719,8 +2719,8 @@ bool dLytMeterItemSelect_c::isWheelBlockedByCurrentAction() { dAcPy_c::LINK->checkActionFlags(dAcPy_c::FLG0_SWING_ROPE) || dAcPy_c::LINK->checkCurrentAction(0x9C) || dAcPy_c::LINK->getRidingActorType() == dAcPy_c::RIDING_TRUCK_MINECART || dAcPy_c::LINK->checkCurrentAction(0x95) || isInSpiralChargeTutorialMinigame() || isInRollercoasterMinigame() || - dAcPy_c::LINK->checkCurrentAction(0x8C) || dLytMeterContainer_c::GetMeter()->getField_0x1377E() != 0 || - checkIsInSkykeepPuzzle() || dLytMeterContainer_c::GetInstance()->getMeterField_0x13770() == 0) { + dAcPy_c::LINK->checkCurrentAction(0x8C) || dLytMeter_c::GetMain()->getField_0x1377E() != 0 || + checkIsInSkykeepPuzzle() || dLytMeter_c::GetInstance()->getMeterField_0x13770() == 0) { return true; } diff --git a/src/d/lyt/meter/d_lyt_meter_minus_btn.cpp b/src/d/lyt/meter/d_lyt_meter_minus_btn.cpp index d38b4cc3..f7fcb7a6 100644 --- a/src/d/lyt/meter/d_lyt_meter_minus_btn.cpp +++ b/src/d/lyt/meter/d_lyt_meter_minus_btn.cpp @@ -300,7 +300,7 @@ void dLytMeterMinusBtn_c::executeState_Wait() { mStateMgr.changeState(StateID_DemoMove); } else if (field_0x4EB8 != 0) { mStateMgr.changeState(StateID_MenuSelectingIn); - } else if (!dLytMeterContainer_c::GetInstance()->checkAllFlags(0x40)) { + } else if (!dLytMeter_c::GetInstance()->checkAllFlags(METER_BTN_MINUS)) { mStateMgr.changeState(StateID_ToUnuse); } } @@ -508,7 +508,7 @@ void dLytMeterMinusBtn_c::executeState_Unuse() { mAnm[MINUS_BTN_ANIM_INPUT].setAnimEnable(false); mStateMgr.changeState(StateID_MenuSelectingIn); } else { - if (dLytMeterContainer_c::GetInstance()->checkAllFlags(0x40)) { + if (dLytMeter_c::GetInstance()->checkAllFlags(METER_BTN_MINUS)) { if (field_0x4E84 <= 0) { mStateMgr.changeState(StateID_ToUse); } else { @@ -830,7 +830,7 @@ bool dLytMeterMinusBtn_c::remove() { bool dLytMeterMinusBtn_c::execute() { bool btnShown = true; - if (dLytMeterContainer_c::GetMeter()->getUiMode() > 1 && !shouldCall() && !fn_800F75E0()) { + if (dLytMeter_c::GetMain()->getUiMode() > 1 && !shouldCall() && !fn_800F75E0()) { btnShown = false; } @@ -879,14 +879,14 @@ bool dLytMeterMinusBtn_c::execute() { } if (!StoryflagManager::sInstance->getCounterOrFlag(30)) { - dLytMeterContainer_c::GetInstance()->clearFlags(0x40); + dLytMeter_c::GetInstance()->clearFlags(METER_BTN_MINUS); } fn_800F7300(); mStateMgr.executeState(); - if (field_0x4EB9 != 0 && dLytMeterContainer_c::GetInstance()->checkAllFlags(0x40)) { + if (field_0x4EB9 != 0 && dLytMeter_c::GetInstance()->checkAllFlags(METER_BTN_MINUS)) { if (field_0x4EBA == 0) { mAnm[MINUS_BTN_ANIM_CALL].setToEnd(); mAnm[MINUS_BTN_ANIM_CALL].setAnimEnable(true); @@ -895,7 +895,7 @@ bool dLytMeterMinusBtn_c::execute() { if (mAnm[MINUS_BTN_ANIM_CALL].isEnabled()) { mAnm[MINUS_BTN_ANIM_CALL].play(); - if (dLytMeterContainer_c::GetInstance()->checkAllFlags(0x40) && + if (dLytMeter_c::GetInstance()->checkAllFlags(METER_BTN_MINUS) && mAnm[MINUS_BTN_ANIM_CALL].getFrame() == 1.0f) { SmallSoundManager::GetInstance()->playSound(SE_S_MINUS_BUTTON_BLINK); } @@ -1037,9 +1037,9 @@ bool dLytMeterMinusBtn_c::fn_800F7600() const { bool dLytMeterMinusBtn_c::fn_800F7760() const { if (!StoryflagManager::sInstance->getCounterOrFlag(30) || - (mpOwnerPane == nullptr || !mpOwnerPane->IsVisible() || dLytMeterContainer_c::GetMeter()->fn_800D5650() || - dLytMeterContainer_c::GetMeter()->fn_800D5680() || - !dLytMeterContainer_c::GetMeter()->getMinusBtnNotHiddenByAreaCaption())) { + (mpOwnerPane == nullptr || !mpOwnerPane->IsVisible() || dLytMeter_c::GetMain()->fn_800D5650() || + dLytMeter_c::GetMain()->fn_800D5680() || + !dLytMeter_c::GetMain()->getMinusBtnNotHiddenByAreaCaption())) { return false; } diff --git a/src/d/lyt/meter/d_lyt_meter_nunchaku_bg.cpp b/src/d/lyt/meter/d_lyt_meter_nunchaku_bg.cpp index 8c225929..582cba17 100644 --- a/src/d/lyt/meter/d_lyt_meter_nunchaku_bg.cpp +++ b/src/d/lyt/meter/d_lyt_meter_nunchaku_bg.cpp @@ -142,7 +142,7 @@ bool dLytMeterNunchakuBg_c::build(d2d::ResAccIf_c *resAcc) { mpOwnerPane = nullptr; mOnDelay = 15; - dLytMeterContainer_c::GetMeter()->getNunStk()->getBgPane()->SetVisible(false); + dLytMeter_c::GetMain()->getNunStk()->getBgPane()->SetVisible(false); setMessage(field_0x1B0); @@ -205,7 +205,7 @@ bool dLytMeterNunchakuBg_c::execute() { field_0x1B8 = LytDoButtonRelated::getHas(LytDoButtonRelated::DO_BUTTON_NUN_BG); bool hasNunStk = LytDoButtonRelated::getHas(LytDoButtonRelated::DO_BUTTON_NUN_STK); - u8 val = dLytMeterContainer_c::getDowsing0x550A(); + u8 val = dLytMeter_c::getDowsing0x550A(); if (hasNunStk != field_0x1C5 || val != field_0x1C6) { field_0x1C5 = hasNunStk; field_0x1C6 = val; @@ -213,7 +213,7 @@ bool dLytMeterNunchakuBg_c::execute() { if (hasNunStk) { mAnm[NUN_BG_ANIM_ARROWV].setFrame(1.0f); mAnm[NUN_BG_ANIM_ARROWV].setAnimEnable(true); - dLytMeterContainer_c::GetMeter()->getNunStk()->getBgPane()->SetVisible(true); + dLytMeter_c::GetMain()->getNunStk()->getBgPane()->SetVisible(true); } else { if (val) { mAnm[NUN_BG_ANIM_ARROWV].setFrame(1.0f); @@ -223,7 +223,7 @@ bool dLytMeterNunchakuBg_c::execute() { mAnm[NUN_BG_ANIM_ARROWV].setAnimEnable(true); setMessage(field_0x1B4); } - dLytMeterContainer_c::GetMeter()->getNunStk()->getBgPane()->SetVisible(false); + dLytMeter_c::GetMain()->getNunStk()->getBgPane()->SetVisible(false); } } diff --git a/src/d/lyt/meter/d_lyt_meter_plus_btn.cpp b/src/d/lyt/meter/d_lyt_meter_plus_btn.cpp index ce7e1ccd..4c2cfb9e 100644 --- a/src/d/lyt/meter/d_lyt_meter_plus_btn.cpp +++ b/src/d/lyt/meter/d_lyt_meter_plus_btn.cpp @@ -34,7 +34,7 @@ static const d2d::LytBrlanMapping brlanMap[] = { void dLytMeterPlusBtn_c::initializeState_Wait() {} void dLytMeterPlusBtn_c::executeState_Wait() { - if (!dLytMeterContainer_c::GetInstance()->checkAllFlags(0x20)) { + if (!dLytMeter_c::GetInstance()->checkAllFlags(METER_BTN_PLUS)) { mStateMgr.changeState(StateID_ToUnuse); } } @@ -76,7 +76,7 @@ void dLytMeterPlusBtn_c::finalizeState_ToUnuse() { void dLytMeterPlusBtn_c::initializeState_Unuse() {} void dLytMeterPlusBtn_c::executeState_Unuse() { - if (dLytMeterContainer_c::GetInstance()->checkAllFlags(0x20)) { + if (dLytMeter_c::GetInstance()->checkAllFlags(METER_BTN_PLUS)) { if (field_0x1BC <= 0) { mStateMgr.changeState(StateID_ToUse); } else { @@ -172,7 +172,7 @@ bool dLytMeterPlusBtn_c::execute() { // Better double check if the map is open! if (hasSpecificMapMark() && DungeonflagManager::sInstance->getCounterOrFlag(2, 8) && !isMapOpen() && - dLytMeterContainer_c::GetInstance()->checkAllFlags(0x20) && !isMapOpen()) { + dLytMeter_c::GetInstance()->checkAllFlags(METER_BTN_PLUS) && !isMapOpen()) { mShouldCall = true; } else { if (dLytControlGame_c::getInstance()->isStateNormal()) { @@ -186,7 +186,7 @@ bool dLytMeterPlusBtn_c::execute() { } } - if (mShouldCall && dLytMeterContainer_c::GetInstance()->checkAllFlags(0x20)) { + if (mShouldCall && dLytMeter_c::GetInstance()->checkAllFlags(METER_BTN_PLUS)) { if (!field_0x1C3) { mAnm[PLUS_BTN_ANIM_CALL].setToEnd(); mAnm[PLUS_BTN_ANIM_CALL].setAnimEnable(true); @@ -194,7 +194,7 @@ bool dLytMeterPlusBtn_c::execute() { } if (mAnm[PLUS_BTN_ANIM_CALL].isEnabled()) { mAnm[PLUS_BTN_ANIM_CALL].play(); - if (dLytMeterContainer_c::GetInstance()->checkAllFlags(0x20) && + if (dLytMeter_c::GetInstance()->checkAllFlags(METER_BTN_PLUS) && mAnm[PLUS_BTN_ANIM_CALL].getFrame() == 1.0f && mCallCount < 3) { SmallSoundManager::GetInstance()->playSound(SE_S_PLUS_BUTTON_BLINK); mCallCount++; diff --git a/src/d/lyt/meter/d_lyt_meter_remocon_bg.cpp b/src/d/lyt/meter/d_lyt_meter_remocon_bg.cpp index 0d41c298..0986a7bc 100644 --- a/src/d/lyt/meter/d_lyt_meter_remocon_bg.cpp +++ b/src/d/lyt/meter/d_lyt_meter_remocon_bg.cpp @@ -48,7 +48,7 @@ bool dLytMeterRemoconBg_c::remove() { } bool dLytMeterRemoconBg_c::execute() { - if (EventManager::isInEvent() || dLytMeterContainer_c::getItemSelect0x75A2() != 0) { + if (EventManager::isInEvent() || dLytMeter_c::getItemSelect0x75A2() != 0) { field_0xEC = 0; LytDoButtonRelated::set(LytDoButtonRelated::DO_BUTTON_REMOCON_BG, LytDoButtonRelated::DO_NONE); } else { diff --git a/src/d/lyt/meter/d_lyt_meter_timer.cpp b/src/d/lyt/meter/d_lyt_meter_timer.cpp index 30e2d19e..f79d6c7f 100644 --- a/src/d/lyt/meter/d_lyt_meter_timer.cpp +++ b/src/d/lyt/meter/d_lyt_meter_timer.cpp @@ -201,7 +201,7 @@ void LytMeterTimerPart1_c::initOutAnim() { } void LytMeterTimerPart1_c::startInAnim() { - if (dLytMeterContainer_c::GetMeter()->fn_800D5650()) { + if (dLytMeter_c::GetMain()->fn_800D5650()) { mAnm[TIMER_01_ANIM_MAP_POSITION].setFrame(1.0f); } else { mAnm[TIMER_01_ANIM_MAP_POSITION].setFrame(0.0f); @@ -326,7 +326,7 @@ bool LytMeterTimerPart1_c::incrementTearCount() { mActualTearCount = ItemflagManager::sInstance->getFlagDirect(500); if (mDisplayedTearCount < mActualTearCount && dLytDropLine_c::finishPartMaybe()) { startNextFruitAnim(); - if (!dLytMeterContainer_c::getfn_800C9FE0()) { + if (!dLytMeter_c::getfn_800C9FE0()) { createEffect(mActualTearCount - 1); SmallSoundManager::GetInstance()->playSound(SE_S_SIREN_SHIZUKU_GET_IN); } @@ -623,7 +623,7 @@ void LytMeterTimerPart2_c::initChangeFruitAnim() { } void LytMeterTimerPart2_c::startInAnim() { - if (dLytMeterContainer_c::GetMeter()->fn_800D5650()) { + if (dLytMeter_c::GetMain()->fn_800D5650()) { mAnm[TIMER_02_ANIM_MAP_POSITION].setFrame(1.0f); } else { mAnm[TIMER_02_ANIM_MAP_POSITION].setFrame(0.0f); @@ -1039,7 +1039,7 @@ void dLytMeterTimer_c::executeState_ChangeSiren() { } } - if (dLytMeterContainer_c::getfn_800D97A0() && !field_0x54) { + if (dLytMeter_c::getfn_800D97A0() && !field_0x54) { mpPart2->setVisible(true); } @@ -1053,7 +1053,7 @@ void dLytMeterTimer_c::executeState_ChangeSiren() { break; case 1: if (mpPart2->isFirstFallOutAnimFinished()) { - dLytMeterContainer_c::setField_0x13B61(1); + dLytMeter_c::setField_0x13B61(1); field_0x57 = 2; } break; @@ -1260,7 +1260,7 @@ void dLytMeterTimer_c::executeState_ChangeFruits() { mpPart2->stopSirenSafeAnim(); mpPart2->stopChangeFruitAnim(); mpPart2->resetSingleAnim(TIMER_02_ANIM_CHANGE_FRUIT); - dLytMeterContainer_c::setField_0x13B64(1); + dLytMeter_c::setField_0x13B64(1); gotoFruits(); } else { field_0x60--; @@ -1320,7 +1320,7 @@ bool dLytMeterTimer_c::execute() { gotoChangeSafeBloom(); } - if (mpPart1->getActualTearCount() == TIMER_01_NUM_TEARS && dLytMeterContainer_c::getField_0x13B63()) { + if (mpPart1->getActualTearCount() == TIMER_01_NUM_TEARS && dLytMeter_c::getField_0x13B63()) { if (!field_0x55) { field_0x60 = 20; } @@ -1369,7 +1369,7 @@ void dLytMeterTimer_c::startIn() { mpPart2->stopOutAnim(); mpPart1->startInAnim(); mpPart2->startInAnim(); - if (dLytMeterContainer_c::GetMeter()->fn_800D5650()) { + if (dLytMeter_c::GetMain()->fn_800D5650()) { if (mStateMgr.isState(StateID_ChangeSiren)) { mpPart2->stopFlowerLoopAnim(); mpPart2->resetFlowerLoopAnim(); diff --git a/src/d/lyt/meter/d_lyt_meter_z_btn.cpp b/src/d/lyt/meter/d_lyt_meter_z_btn.cpp index 72148cce..31dca491 100644 --- a/src/d/lyt/meter/d_lyt_meter_z_btn.cpp +++ b/src/d/lyt/meter/d_lyt_meter_z_btn.cpp @@ -193,7 +193,7 @@ bool dLytMeterZBtn_c::execute() { } field_0x1B4 = LytDoButtonRelated::get(LytDoButtonRelated::DO_BUTTON_Z); field_0x1B8 = LytDoButtonRelated::getHas(LytDoButtonRelated::DO_BUTTON_Z) && - dLytMeterContainer_c::GetInstance()->checkAllFlags(0x800); + dLytMeter_c::GetInstance()->checkAllFlags(0x800); mStateMgr.executeState(); for (int i = 0; i < Z_BTN_NUM_ANIMS; i++) { @@ -215,7 +215,7 @@ bool dLytMeterZBtn_c::execute() { field_0x1C5 = 0; } - if (field_0x1C5 != 0 && dLytMeterContainer_c::GetInstance()->checkAllFlags(0x800)) { + if (field_0x1C5 != 0 && dLytMeter_c::GetInstance()->checkAllFlags(0x800)) { if (field_0x1C6 == 0) { mAnm[Z_BTN_ANIM_CALL].setToEnd(); mAnm[Z_BTN_ANIM_CALL].setAnimEnable(true); @@ -223,7 +223,7 @@ bool dLytMeterZBtn_c::execute() { } if (mAnm[Z_BTN_ANIM_CALL].isEnabled()) { mAnm[Z_BTN_ANIM_CALL].play(); - if (dLytMeterContainer_c::GetInstance()->checkAllFlags(0x800) && mAnm[Z_BTN_ANIM_CALL].getFrame() == 1.0f) { + if (dLytMeter_c::GetInstance()->checkAllFlags(0x800) && mAnm[Z_BTN_ANIM_CALL].getFrame() == 1.0f) { SmallSoundManager::GetInstance()->playSound(SE_S_Z_BUTTON_BLINK); } }