diff --git a/config/SOUE01/splits.txt b/config/SOUE01/splits.txt index 960e6c5c..9676583a 100644 --- a/config/SOUE01/splits.txt +++ b/config/SOUE01/splits.txt @@ -702,6 +702,7 @@ d/lyt/d_lyt_do_button_related.cpp: .rodata start:0x804E7080 end:0x804E72E0 .data start:0x8051AC00 end:0x8051AC18 .sbss start:0x80575470 end:0x80575480 + .bss start:0x805ACF78 end:0x805ACF88 d/lyt/d_lyt_common_a_btn.cpp: .text start:0x8010EF90 end:0x8010F818 align:16 diff --git a/config/SOUE01/symbols.txt b/config/SOUE01/symbols.txt index 4caef926..1f2e55f1 100644 --- a/config/SOUE01/symbols.txt +++ b/config/SOUE01/symbols.txt @@ -6065,7 +6065,7 @@ executeState_Off__24dLytMeterCrossBtnParts_cFv = .text:0x800F9170; // type:funct finalizeState_Off__24dLytMeterCrossBtnParts_cFv = .text:0x800F91E0; // type:function size:0x4 init__24dLytMeterCrossBtnParts_cFv = .text:0x800F91F0; // type:function size:0x80 execute__24dLytMeterCrossBtnParts_cFb = .text:0x800F9270; // type:function size:0x4C8 -setMessage__24dLytMeterCrossBtnParts_cFQ218LytDoButtonRelated8Act_IE_e = .text:0x800F9740; // type:function size:0x508 +setMessage__24dLytMeterCrossBtnParts_cFl = .text:0x800F9740; // type:function size:0x508 initializeState_Wait__19dLytMeterCrossBtn_cFv = .text:0x800F9C50; // type:function size:0x4 executeState_Wait__19dLytMeterCrossBtn_cFv = .text:0x800F9C60; // type:function size:0x4 finalizeState_Wait__19dLytMeterCrossBtn_cFv = .text:0x800F9C70; // type:function size:0x4 @@ -6532,21 +6532,21 @@ execute__14dLytDobutton_cFv = .text:0x8010D6C0; // type:function size:0x80C draw__14dLytDobutton_cFv = .text:0x8010DED0; // type:function size:0x28 realize__14dLytDobutton_cFv = .text:0x8010DF00; // type:function size:0x4CC fn_8010E3D0__14dLytDobutton_cFb = .text:0x8010E3D0; // type:function size:0x1F0 -setActionTextStuffInternal__14dLytDobutton_cFllb = .text:0x8010E5C0; // type:function size:0x10 +setActionTextStuffInternal__14dLytDobutton_cFlQ214dLytDobutton_c8Act_Do_eb = .text:0x8010E5C0; // type:function size:0x10 getActionInternal__14dLytDobutton_cCFv = .text:0x8010E5D0; // type:function size:0x8 fn_8010E5E0__14dLytDobutton_cCFv = .text:0x8010E5E0; // type:function size:0x1C __sinit_\d_lyt_do_button_cpp = .text:0x8010E600; // type:function size:0x410 scope:local __dt__29sFStateID_c<14dLytDobutton_c>Fv = .text:0x8010EA10; // type:function size:0x58 isSameName__29sFStateID_c<14dLytDobutton_c>CFPCc = .text:0x8010EA70; // type:function size:0x88 -fn_8010EB00 = .text:0x8010EB00; // type:function size:0x24 -fn_8010EB30 = .text:0x8010EB30; // type:function size:0x40 +__ct__23LytDoButtonRelatedClassFv = .text:0x8010EB00; // type:function size:0x24 +__dt__23LytDoButtonRelatedClassFv = .text:0x8010EB30; // type:function size:0x40 __ct__18LytDoButtonRelatedFv = .text:0x8010EB70; // type:function size:0x14 build__18LytDoButtonRelatedFPQ23d2d10ResAccIf_c = .text:0x8010EB90; // type:function size:0x70 remove__18LytDoButtonRelatedFv = .text:0x8010EC00; // type:function size:0x8 -fn_8010EC10__18LytDoButtonRelatedFQ218LytDoButtonRelated8Act_IE_eb = .text:0x8010EC10; // type:function size:0x134 -fn_8010ED50__18LytDoButtonRelatedFQ218LytDoButtonRelated8Act_IE_eb = .text:0x8010ED50; // type:function size:0x110 -convertDoButton__18LytDoButtonRelatedFl = .text:0x8010EE60; // type:function size:0xE8 -fn_8010EF50 = .text:0x8010EF50; // type:function size:0x3C +setCrossTop__18LytDoButtonRelatedFQ218LytDoButtonRelated8Act_IE_eb = .text:0x8010EC10; // type:function size:0x134 +setCrossDown__18LytDoButtonRelatedFQ218LytDoButtonRelated8Act_IE_eb = .text:0x8010ED50; // type:function size:0x110 +convertDoButton__18LytDoButtonRelatedFQ214dLytDobutton_c8Act_Do_e = .text:0x8010EE60; // type:function size:0xE8 +__sinit_\d_lyt_do_button_related_cpp = .text:0x8010EF50; // type:function size:0x3C scope:local build__16dLytCommonABtn_cFPQ23d2d10ResAccIf_c = .text:0x8010EF90; // type:function size:0xAC remove__16dLytCommonABtn_cFv = .text:0x8010F040; // type:function size:0x50 execute__16dLytCommonABtn_cFv = .text:0x8010F090; // type:function size:0x58 @@ -6734,10 +6734,10 @@ getPane__20dLytCommonIconItem_cFv = .text:0x80113A50; // type:function size:0x58 __sinit_\d_lyt_common_icon_item_cpp = .text:0x80113AB0; // type:function size:0x338 scope:local __dt__35sFStateID_c<20dLytCommonIconItem_c>Fv = .text:0x80113DF0; // type:function size:0x58 isSameName__35sFStateID_c<20dLytCommonIconItem_c>CFPCc = .text:0x80113E50; // type:function size:0x88 -build__20LytBirdButtonRelatedFPQ23d2d10ResAccIf_c = .text:0x80113EE0; // type:function size:0x224 -remove__20LytBirdButtonRelatedFv = .text:0x80114110; // type:function size:0x58 -execute__20LytBirdButtonRelatedFv = .text:0x80114170; // type:function size:0x10C -draw__20LytBirdButtonRelatedFv = .text:0x80114280; // type:function size:0x44 +build__16dLytTargetBird_cFPQ23d2d10ResAccIf_c = .text:0x80113EE0; // type:function size:0x224 +remove__16dLytTargetBird_cFv = .text:0x80114110; // type:function size:0x58 +execute__16dLytTargetBird_cFv = .text:0x80114170; // type:function size:0x10C +draw__16dLytTargetBird_cFv = .text:0x80114280; // type:function size:0x44 fn_801142D0 = .text:0x801142D0; // type:function size:0x168 fn_80114440 = .text:0x80114440; // type:function size:0x248 fn_80114690 = .text:0x80114690; // type:function size:0x25C @@ -10442,7 +10442,7 @@ dAcOClef__getTadtoneGroupIndex2 = .text:0x80194E80; // type:function size:0x8 dAcOClef__IsSceneflagValid = .text:0x80194E90; // type:function size:0x2C dAcOClef__isTempflagSet = .text:0x80194EC0; // type:function size:0x58 dAcOClef__getSceneflag = .text:0x80194F20; // type:function size:0xC -checkIsInSkykeepPuzzle = .text:0x80194F30; // type:function size:0x8 +checkIsInSkykeepPuzzle__Fv = .text:0x80194F30; // type:function size:0x8 isInSkyKeepPuzzleRoom = .text:0x80194F40; // type:function size:0xA4 isInAnySkyKeepRoom = .text:0x80194FF0; // type:function size:0x38 maybeResetSkykeepPuzzle = .text:0x80195030; // type:function size:0xB4 @@ -31961,8 +31961,8 @@ lbl_8051AA40 = .data:0x8051AA40; // type:object size:0x14 lbl_8051AA54 = .data:0x8051AA54; // type:object size:0xC data:string __vt__13DoButtonClass = .data:0x8051AA60; // type:object size:0x16C __vt__29sFStateID_c<14dLytDobutton_c> = .data:0x8051ABCC; // type:object size:0x34 -lbl_8051AC00 = .data:0x8051AC00; // type:object size:0xC -lbl_8051AC0C = .data:0x8051AC0C; // type:object size:0xC +__vt__23LytDoButtonRelatedClass = .data:0x8051AC00; // type:object size:0xC +__vt__18LytDoButtonRelated = .data:0x8051AC0C; // type:object size:0xC lbl_8051AC18 = .data:0x8051AC18; // type:object size:0x11 data:string lbl_8051AC2C = .data:0x8051AC2C; // type:object size:0xB data:string lbl_8051AC38 = .data:0x8051AC38; // type:object size:0x13 data:string @@ -40103,7 +40103,7 @@ sFinished__16dLytMeterTimer_c = .sbss:0x80575462; // type:object size:0x1 data:b sInstance__14dLytDobutton_c = .sbss:0x80575468; // type:object size:0x8 data:4byte lbl_80575470 = .sbss:0x80575470; // type:object size:0x8 sInstance__18LytDoButtonRelated = .sbss:0x80575478; // type:object size:0x8 data:4byte -sInstance__20LytBirdButtonRelated = .sbss:0x80575480; // type:object size:0x8 data:4byte +sInstance__16dLytTargetBird_c = .sbss:0x80575480; // type:object size:0x8 data:4byte sInstance__15dLytMsgWindow_c = .sbss:0x80575488; // type:object size:0x4 data:4byte lbl_8057548C = .sbss:0x8057548C; // type:object size:0x4 data:4byte CURRENT_ACTOR_EVENT_FLOW_MANAGER = .sbss:0x80575490; // type:object size:0x8 data:4byte diff --git a/configure.py b/configure.py index 0fe1b801..8edfd9c7 100644 --- a/configure.py +++ b/configure.py @@ -491,7 +491,7 @@ config.libs = [ Object(Matching, "d/lyt/meter/d_lyt_meter_heart.cpp"), Object(Matching, "d/lyt/meter/d_lyt_meter_shield_gauge.cpp"), Object(Matching, "d/lyt/d_lyt_do_button.cpp"), - Object(NonMatching, "d/lyt/d_lyt_do_button_related.cpp"), + Object(Matching, "d/lyt/d_lyt_do_button_related.cpp"), Object(Matching, "d/lyt/d_lyt_common_a_btn.cpp"), Object(Matching, "d/lyt/d_lyt_common_icon_material.cpp"), Object(Matching, "d/lyt/d_lyt_common_icon_item.cpp"), diff --git a/include/d/lyt/d_lyt_do_button.h b/include/d/lyt/d_lyt_do_button.h index 5893f817..41e95b8f 100644 --- a/include/d/lyt/d_lyt_do_button.h +++ b/include/d/lyt/d_lyt_do_button.h @@ -177,7 +177,7 @@ public: return sInstance; } - static s32 getField0x47C() { + static Act_Do_e getField0x47C() { if (sInstance != nullptr) { return sInstance->field_0x47C; } else { @@ -193,12 +193,12 @@ public: } } - static s32 getNextActionToShow() { + static Act_Do_e getNextActionToShow() { if (sInstance != nullptr) { return sInstance->mNextDoActionToShow; } else { // @bug (?) should this be ACT_DO_INVALID? - return ICON_NONE; + return (Act_Do_e)ICON_NONE; } } @@ -210,7 +210,7 @@ public: } } - static s32 getAction() { + static Act_Do_e getAction() { if (sInstance != nullptr) { return sInstance->getActionInternal(); } else { @@ -218,20 +218,20 @@ public: } } - static void setActionTextStuff(s32 p1, s32 p2, bool p3) { + static void setActionTextStuff(s32 p1, Act_Do_e p2, bool p3) { if (sInstance != nullptr) { sInstance->setActionTextStuffInternal(p1, p2, p3); } } private: - void setActionTextStuffInternal(s32, s32, bool); - s32 getActionInternal() const; + void setActionTextStuffInternal(s32, Act_Do_e, bool); + Act_Do_e getActionInternal() const; s32 fn_8010E5E0() const; void fn_8010E3D0(bool); void realize(); - void set_0x47C_0x480(s32 v1, s32 v2) { + void set_0x47C_0x480(Act_Do_e v1, s32 v2) { field_0x47C = v1; field_0x480 = v2; } @@ -251,12 +251,12 @@ private: /* 0x0D4 */ d2d::AnmGroup_c mAnmGroups[12]; /* 0x3D4 */ nw4r::lyt::Pane *mpPanes[37]; /* 0x468 */ dTextBox_c *mpTextBoxes[2]; - /* 0x470 */ s32 mDoActionToShow; + /* 0x470 */ Act_Do_e mDoActionToShow; /* 0x474 */ s32 field_0x474; /* 0x478 */ s32 field_0x478; - /* 0x47C */ s32 field_0x47C; + /* 0x47C */ Act_Do_e field_0x47C; /* 0x480 */ s32 field_0x480; - /* 0x484 */ s32 mNextDoActionToShow; + /* 0x484 */ Act_Do_e mNextDoActionToShow; /* 0x488 */ s32 field_0x488; /* 0x48C */ s32 field_0x48C; /* 0x490 */ u8 field_0x490; diff --git a/include/d/lyt/d_lyt_target_bird.h b/include/d/lyt/d_lyt_target_bird.h new file mode 100644 index 00000000..de327ff4 --- /dev/null +++ b/include/d/lyt/d_lyt_target_bird.h @@ -0,0 +1,28 @@ +#ifndef D_LYT_TARGET_BIRD_H +#define D_LYT_TARGET_BIRD_H + +#include "d/lyt/d2d.h" + +// size 0x27C +class dLytTargetBird_c { +public: + dLytTargetBird_c() { + sInstance = this; + } + ~dLytTargetBird_c() { + sInstance = nullptr; + } + bool build(d2d::ResAccIf_c *resAcc); + bool remove(); + bool execute(); + bool draw(); + + static dLytTargetBird_c *sInstance; + +private: + d2d::LytBase_c mLyt; + d2d::AnmGroup_c mAnmGroups[7]; + /* 0x250 */ u8 field_0x250[0x27C - 0x250]; +}; + +#endif diff --git a/include/d/lyt/d_lyt_unknowns.h b/include/d/lyt/d_lyt_unknowns.h index 0d885967..b82e6d4a 100644 --- a/include/d/lyt/d_lyt_unknowns.h +++ b/include/d/lyt/d_lyt_unknowns.h @@ -3,6 +3,7 @@ #include "common.h" #include "d/lyt/d2d.h" +#include "d/lyt/d_lyt_do_button.h" class LytDoButtonRelated { public: @@ -167,6 +168,12 @@ public: ACT_IE_ETC_SAILCLOTH = 145, ACT_IE_ETC_RETURN_2 = 146, + ACT_IE_147 = 147, + ACT_IE_148 = 148, + ACT_IE_149 = 149, + ACT_IE_150 = 150, + ACT_IE_151 = 151, + ACT_IE_NONE = 152, }; @@ -220,10 +227,10 @@ public: } - static Act_IE_e convertDoButton(s32); + static Act_IE_e convertDoButton(dLytDobutton_c::Act_Do_e); - static void fn_8010EC10(Act_IE_e, bool); - static void fn_8010ED50(Act_IE_e, bool); + static void setCrossTop(Act_IE_e, bool); + static void setCrossDown(Act_IE_e, bool); private: static LytDoButtonRelated *sInstance; @@ -231,26 +238,4 @@ private: /* 0x34 */ bool field_0x34[12]; }; -// size 0x27C -class LytBirdButtonRelated { -public: - LytBirdButtonRelated() { - sInstance = this; - } - ~LytBirdButtonRelated() { - sInstance = nullptr; - } - bool build(d2d::ResAccIf_c *resAcc); - bool remove(); - bool execute(); - bool draw(); - - static LytBirdButtonRelated *sInstance; - -private: - d2d::LytBase_c mLyt; - d2d::AnmGroup_c mAnmGroups[7]; - /* 0x250 */ u8 field_0x250[0x27C - 0x250]; -}; - #endif diff --git a/include/d/lyt/meter/d_lyt_meter.h b/include/d/lyt/meter/d_lyt_meter.h index 5f71f75e..6fa03ddd 100644 --- a/include/d/lyt/meter/d_lyt_meter.h +++ b/include/d/lyt/meter/d_lyt_meter.h @@ -25,6 +25,7 @@ #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 "d/lyt/d_lyt_target_bird.h" #include "m/m_vec.h" // clang-format on @@ -291,11 +292,23 @@ public: mFlags = 0xFFFFFFFF; } - static s32 getCrossBtn0x7BF8() { + static dLytMeterCrossBtn_c::CrossIcon_e getCrossIconDown() { if (sInstance != nullptr) { - return sInstance->mMain.mCrossBtn.getField_0x620(); + return sInstance->mMain.mCrossBtn.getIconDown(); } else { - return 6; + return dLytMeterCrossBtn_c::CROSS_ICON_NONE; + } + } + + static void setCrossIconDown(dLytMeterCrossBtn_c::CrossIcon_e icon) { + if (sInstance != nullptr) { + sInstance->mMain.mCrossBtn.setIconDown(icon); + } + } + + static void setCrossIconTop(dLytMeterCrossBtn_c::CrossIcon_e icon) { + if (sInstance != nullptr) { + sInstance->mMain.mCrossBtn.setIconTop(icon); } } @@ -443,7 +456,7 @@ private: /* 0x00378 */ dLytMeterMain_c mMain; /* 0x13B3C */ dLytDobutton_c *mpDoButton; /* 0x13B40 */ LytDoButtonRelated *mpDoButtonRelated; - /* 0x13B44 */ LytBirdButtonRelated *mpBirdRelated; + /* 0x13B44 */ dLytTargetBird_c *mpTargetBird; /* 0x13B48 */ bool mVisible; /* 0x13B49 */ u8 _0x13B49[0x13B50 - 0x13B49]; /* 0x13B50 */ s32 mFlags; diff --git a/include/d/lyt/meter/d_lyt_meter_cross_btn.h b/include/d/lyt/meter/d_lyt_meter_cross_btn.h index a9c48dde..56f91edd 100644 --- a/include/d/lyt/meter/d_lyt_meter_cross_btn.h +++ b/include/d/lyt/meter/d_lyt_meter_cross_btn.h @@ -41,18 +41,30 @@ private: /* 0x54 */ dTextBox_c *mpSizeBox; /* 0x58 */ nw4r::lyt::Pane *mpOwnerPane; /* 0x5C */ s32 mIndex; - /* 0x60 */ s32 field_0x60; - /* 0x64 */ s32 field_0x64; + /* 0x60 */ s32 mSavedMessage; + /* 0x64 */ s32 mMessage; /* 0x68 */ s32 field_0x68; /* 0x6C */ s32 field_0x6C; - /* 0x70 */ s32 field_0x70; - /* 0x74 */ s32 field_0x74; + /* 0x70 */ s32 mSavedIcon; + /* 0x74 */ s32 mCurrentIcon; /* 0x78 */ s32 mOnDelay; /* 0x7C */ u8 field_0x7C; }; class dLytMeterCrossBtn_c : public d2d::dSubPane { public: + enum CrossIcon_e { + CROSS_ICON_TOP_1 = 1, + CROSS_ICON_TOP_3 = 3, + CROSS_ICON_TOP_4 = 4, + + CROSS_ICON_DOWN_0 = 0, + CROSS_ICON_DOWN_2 = 2, + CROSS_ICON_DOWN_5 = 5, + + CROSS_ICON_NONE = 6, + }; + dLytMeterCrossBtn_c() : mStateMgr(*this, sStateID::null) {} virtual bool build(d2d::ResAccIf_c *resAcc) override; virtual bool remove() override; @@ -69,8 +81,16 @@ public: virtual ~dLytMeterCrossBtn_c() {} - s32 getField_0x620() const { - return field_0x620; + CrossIcon_e getIconDown() const { + return mIconDown; + } + + void setIconDown(CrossIcon_e icon) { + mIconDown = icon; + } + + void setIconTop(CrossIcon_e icon) { + mIconTop = icon; } void setOwnerPane(nw4r::lyt::Pane *pane); @@ -93,8 +113,8 @@ private: /* 0x400 */ dWindow_c *mpWindows[4]; /* 0x410 */ dTextBox_c *mpSizeBoxes[4]; /* 0x420 */ dLytMeterCrossBtnParts_c mParts[4]; - /* 0x620 */ s32 field_0x620; - /* 0x624 */ s32 field_0x624; + /* 0x620 */ CrossIcon_e mIconDown; + /* 0x624 */ CrossIcon_e mIconTop; /* 0x628 */ u16 mSavedFiFlow; /* 0x62C */ s32 mCallCount0; /* 0x630 */ s32 mCallCount1; diff --git a/include/toBeSorted/misc_actor.h b/include/toBeSorted/misc_actor.h new file mode 100644 index 00000000..95f4af98 --- /dev/null +++ b/include/toBeSorted/misc_actor.h @@ -0,0 +1,6 @@ +#ifndef MISC_ACTOR_H +#define MISC_ACTOR_H + +bool checkIsInSkykeepPuzzle(); + +#endif diff --git a/src/d/lyt/d_lyt_do_button.cpp b/src/d/lyt/d_lyt_do_button.cpp index 26122bb4..9aec9bcf 100644 --- a/src/d/lyt/d_lyt_do_button.cpp +++ b/src/d/lyt/d_lyt_do_button.cpp @@ -787,13 +787,13 @@ void dLytDobutton_c::fn_8010E3D0(bool b) { mpPanes[1]->SetTranslate(v); } -void dLytDobutton_c::setActionTextStuffInternal(s32 a1, s32 a2, bool b) { +void dLytDobutton_c::setActionTextStuffInternal(s32 a1, Act_Do_e a2, bool b) { field_0x488 = a1; - mNextDoActionToShow = a2; + mNextDoActionToShow = (Act_Do_e)a2; field_0x490 = b; } -s32 dLytDobutton_c::getActionInternal() const { +dLytDobutton_c::Act_Do_e dLytDobutton_c::getActionInternal() const { return mDoActionToShow; } diff --git a/src/d/lyt/d_lyt_do_button_related.cpp b/src/d/lyt/d_lyt_do_button_related.cpp index 502a3d13..5583ed9d 100644 --- a/src/d/lyt/d_lyt_do_button_related.cpp +++ b/src/d/lyt/d_lyt_do_button_related.cpp @@ -1,5 +1,31 @@ +#include "common.h" #include "d/lyt/d2d.h" +#include "d/lyt/d_lyt_do_button.h" #include "d/lyt/d_lyt_unknowns.h" +#include "d/lyt/meter/d_lyt_meter.h" +#include "toBeSorted/misc_actor.h" + +class LytDoButtonRelatedClass { +public: + LytDoButtonRelatedClass(); + virtual ~LytDoButtonRelatedClass(); + +private: + /* 0x04 */ u8 field_0x04; + /* 0x05 */ u8 field_0x05; + /* 0x06 */ u8 field_0x06; +}; + +static LytDoButtonRelatedClass sDoButtonRelatedClass; + +LytDoButtonRelatedClass::LytDoButtonRelatedClass() { + field_0x04 = 0; + field_0x05 = 0; + field_0x06 = LytDoButtonRelated::ACT_IE_NONE; +} +LytDoButtonRelatedClass::~LytDoButtonRelatedClass() {} + +LytDoButtonRelated *LytDoButtonRelated::sInstance; LytDoButtonRelated::LytDoButtonRelated() { sInstance = this; @@ -17,3 +43,174 @@ bool LytDoButtonRelated::build(d2d::ResAccIf_c *resAcc) { bool LytDoButtonRelated::remove() { return true; } + +static const dLytDobutton_c::Act_Do_e sActIEtoDoConversionTable[LytDoButtonRelated::ACT_IE_NONE] = { + dLytDobutton_c::ACT_DO_CLIMB_UP, // ACT_IE_INFO_CLIMB_UP + dLytDobutton_c::ACT_DO_JUMP, // ACT_IE_INFO_JUMP + dLytDobutton_c::ACT_DO_DROP_DOWN, // ACT_IE_INFO_DROP_DOWN + dLytDobutton_c::ACT_DO_LET_GO, // ACT_IE_INFO_LET_GO + dLytDobutton_c::ACT_DO_OPEN, // ACT_IE_INFO_OPEN + dLytDobutton_c::ACT_DO_PUT_DOWN, // ACT_IE_INFO_DROP + dLytDobutton_c::ACT_DO_THROW, // ACT_IE_INFO_THROW + dLytDobutton_c::ACT_DO_BURROW, // ACT_IE_INFO_BURROW + dLytDobutton_c::ACT_DO_ROLL, // ACT_IE_INFO_ROLL + dLytDobutton_c::ACT_DO_9, // ACT_IE_INFO_9 + dLytDobutton_c::ACT_DO_MOVE, // ACT_IE_INFO_MOVE + dLytDobutton_c::ACT_DO_GRAB, // ACT_IE_INFO_GRAB + dLytDobutton_c::ACT_DO_SHOOT, // ACT_IE_INFO_SHOOT + dLytDobutton_c::ACT_DO_13, // ACT_IE_INFO_13 + dLytDobutton_c::ACT_DO_14, // ACT_IE_INFO_14 + dLytDobutton_c::ACT_DO_15, // ACT_IE_INFO_15 + dLytDobutton_c::ACT_DO_TALK, // ACT_IE_INFO_TALK + dLytDobutton_c::ACT_DO_EXAMINE, // ACT_IE_INFO_EXAMINE + dLytDobutton_c::ACT_DO_DRAW, // ACT_IE_INFO_DRAW + dLytDobutton_c::ACT_DO_19, // ACT_IE_INFO_19 + dLytDobutton_c::ACT_DO_BLOW, // ACT_IE_INFO_BLOW + dLytDobutton_c::ACT_DO_21, // ACT_IE_INFO_21 + dLytDobutton_c::ACT_DO_22, // ACT_IE_INFO_22 + dLytDobutton_c::ACT_DO_SWIM, // ACT_IE_INFO_SWIM + dLytDobutton_c::ACT_DO_LEAP, // ACT_IE_INFO_LEAP + dLytDobutton_c::ACT_DO_DASH, // ACT_IE_INFO_DASH + dLytDobutton_c::ACT_DO_GET_OUT, // ACT_IE_INFO_GET_OUT + dLytDobutton_c::ACT_DO_27, // ACT_IE_INFO_27 + dLytDobutton_c::ACT_DO_PICK_UP, // ACT_IE_INFO_PICK_UP + dLytDobutton_c::ACT_DO_SIT, // ACT_IE_INFO_SIT + dLytDobutton_c::ACT_DO_STAND, // ACT_IE_INFO_STAND + dLytDobutton_c::ACT_DO_DIG, // ACT_IE_INFO_DIG + dLytDobutton_c::ACT_DO_32, // ACT_IE_INFO_32 + dLytDobutton_c::ACT_DO_33, // ACT_IE_INFO_33 + dLytDobutton_c::ACT_DO_BREAK_FREE, // ACT_IE_INFO_BREAK_FREE + dLytDobutton_c::ACT_DO_35, // ACT_IE_INFO_35 + dLytDobutton_c::ACT_DO_36, // ACT_IE_INFO_36 + dLytDobutton_c::ACT_DO_PLANT, // ACT_IE_INFO_PLANT + dLytDobutton_c::ACT_DO_CATCH, // ACT_IE_INFO_CATCH + dLytDobutton_c::ACT_DO_SPEED_UP, // ACT_IE_INFO_SPEED_UP + dLytDobutton_c::ACT_DO_SAILCLOTH, // ACT_IE_INFO_SAILCLOTH + dLytDobutton_c::ACT_DO_PUT_AWAY, // ACT_IE_INFO_PUT_AWAY + dLytDobutton_c::ACT_DO_EMERGE, // ACT_IE_INFO_EMERGE + dLytDobutton_c::ACT_DO_INSERT, // ACT_IE_INFO_INSERT + dLytDobutton_c::ACT_DO_44, // ACT_IE_INFO_44 + dLytDobutton_c::ACT_DO_TURN, // ACT_IE_INFO_TURN + dLytDobutton_c::ACT_DO_PUSH_IN, // ACT_IE_INFO_ALIGN + dLytDobutton_c::ACT_DO_47, // ACT_IE_INFO_47 + dLytDobutton_c::ACT_DO_DRAW_BOW, // ACT_IE_INFO_DRAW_BOW + dLytDobutton_c::ACT_DO_49, // ACT_IE_INFO_49 + dLytDobutton_c::ACT_DO_50, // ACT_IE_INFO_50 + dLytDobutton_c::ACT_DO_51, // ACT_IE_INFO_51 + dLytDobutton_c::ACT_DO_SWING, // ACT_IE_INFO_SWING + dLytDobutton_c::ACT_DO_BALANCE, // ACT_IE_INFO_BALANCE + dLytDobutton_c::ACT_DO_JOSTLE, // ACT_IE_INFO_JOSTLE + dLytDobutton_c::ACT_DO_55, // ACT_IE_INFO_55 + dLytDobutton_c::ACT_DO_SLEEP, // ACT_IE_INFO_SLEEP + dLytDobutton_c::ACT_DO_DROP, // ACT_IE_INFO_DROP_2 + dLytDobutton_c::ACT_DO_LAUNCH, // ACT_IE_INFO_LAUNCH + dLytDobutton_c::ACT_DO_READ, // ACT_IE_INFO_READ + dLytDobutton_c::ACT_DO_WHIP, // ACT_IE_INFO_WHIP + dLytDobutton_c::ACT_DO_PULL, // ACT_IE_INFO_PULL + dLytDobutton_c::ACT_DO_DRINK, // ACT_IE_INFO_DRINK + dLytDobutton_c::ACT_DO_63, // ACT_IE_INFO_63 + dLytDobutton_c::ACT_DO_GET_IN, // ACT_IE_INFO_GET_IN + dLytDobutton_c::ACT_DO_FIRE, // ACT_IE_INFO_FIRE + dLytDobutton_c::ACT_DO_ATTACK, // ACT_IE_INFO_ATTACK + dLytDobutton_c::ACT_DO_FATAL_BLOW, // ACT_IE_INFO_FATAL_BLOW + dLytDobutton_c::ACT_DO_JUMP_DOWN, // ACT_IE_INFO_JUMP_DOWN + dLytDobutton_c::ACT_DO_STRUM, // ACT_IE_INFO_STRUM + dLytDobutton_c::ACT_DO_70, // ACT_IE_INFO_70 + dLytDobutton_c::ACT_DO_RELEASE, // ACT_IE_INFO_RELEASE + dLytDobutton_c::ACT_DO_GRAB_2, // ACT_IE_INFO_GRAB_2 + dLytDobutton_c::ACT_DO_READY_STANCE, // ACT_IE_INFO_READY_STANCE + dLytDobutton_c::ACT_DO_REMOVE, // ACT_IE_INFO_REMOVE + dLytDobutton_c::ACT_DO_READY_SWORD, // ACT_IE_INFO_READY_SWORD + dLytDobutton_c::ACT_DO_THRUST_SWORD, // ACT_IE_INFO_THRUST_SWORD + dLytDobutton_c::ACT_DO_USE, // ACT_IE_INFO_USE + dLytDobutton_c::ACT_DO_SCOOP, // ACT_IE_INFO_SCOOP + dLytDobutton_c::ACT_DO_79, // ACT_IE_INFO_79 + dLytDobutton_c::ACT_DO_80, // ACT_IE_INFO_80 + dLytDobutton_c::ACT_DO_LOOK, // ACT_IE_INFO_LOOK + dLytDobutton_c::ACT_DO_DOWSE, // ACT_IE_INFO_DOWSE + dLytDobutton_c::ACT_DO_PILOT, // ACT_IE_INFO_PILOT + dLytDobutton_c::ACT_DO_LOOK_DOWN, // ACT_IE_INFO_LOOK_DOWN + dLytDobutton_c::ACT_DO_DIVE, // ACT_IE_INFO_DIVE + dLytDobutton_c::ACT_DO_SELECT, // ACT_IE_INFO_SELECT + dLytDobutton_c::ACT_DO_GRAB_3, // ACT_IE_INFO_GRAB_3 + dLytDobutton_c::ACT_DO_MOVE_2, // ACT_IE_INFO_MOVE_1 + dLytDobutton_c::ACT_DO_ACCELERATE, // ACT_IE_INFO_ACCELERATE + dLytDobutton_c::ACT_DO_CHARGE, // ACT_IE_INFO_CHARGE + dLytDobutton_c::ACT_DO_LEAN, // ACT_IE_INFO_LEAN + dLytDobutton_c::ACT_DO_PRESS, // ACT_IE_INFO_PRESS +}; + +void LytDoButtonRelated::setCrossTop(Act_IE_e act, bool bHas) { + LytDoButtonRelated *p = sInstance; + if (p != nullptr) { + if (act == ACT_IE_147) { + p->field_0x04[DO_BUTTON_CROSS_T] = ACT_IE_NONE; + p->field_0x34[DO_BUTTON_CROSS_T] = bHas; + if (!checkIsInSkykeepPuzzle()) { + dLytMeter_c::setCrossIconTop(dLytMeterCrossBtn_c::CROSS_ICON_TOP_1); + } else { + dLytMeter_c::setCrossIconTop(dLytMeterCrossBtn_c::CROSS_ICON_NONE); + } + } else if (act == ACT_IE_149) { + p->field_0x04[DO_BUTTON_CROSS_T] = ACT_IE_NONE; + p->field_0x34[DO_BUTTON_CROSS_T] = bHas; + if (!checkIsInSkykeepPuzzle()) { + dLytMeter_c::setCrossIconTop(dLytMeterCrossBtn_c::CROSS_ICON_TOP_3); + } else { + dLytMeter_c::setCrossIconTop(dLytMeterCrossBtn_c::CROSS_ICON_NONE); + } + } else if (act == ACT_IE_151) { + p->field_0x04[DO_BUTTON_CROSS_T] = ACT_IE_NONE; + p->field_0x34[DO_BUTTON_CROSS_T] = bHas; + if (!checkIsInSkykeepPuzzle()) { + dLytMeter_c::setCrossIconTop(dLytMeterCrossBtn_c::CROSS_ICON_TOP_4); + } else { + dLytMeter_c::setCrossIconTop(dLytMeterCrossBtn_c::CROSS_ICON_NONE); + } + } else { + p->field_0x04[DO_BUTTON_CROSS_T] = act; + p->field_0x34[DO_BUTTON_CROSS_T] = bHas; + dLytMeter_c::setCrossIconTop(dLytMeterCrossBtn_c::CROSS_ICON_NONE); + } + } +} + +void LytDoButtonRelated::setCrossDown(Act_IE_e act, bool bHas) { + LytDoButtonRelated *p = sInstance; + if (p != nullptr) { + if (act == ACT_IE_148) { + p->field_0x04[DO_BUTTON_CROSS_D] = ACT_IE_NONE; + p->field_0x34[DO_BUTTON_CROSS_D] = bHas; + if (!checkIsInSkykeepPuzzle()) { + dLytMeter_c::setCrossIconDown(dLytMeterCrossBtn_c::CROSS_ICON_DOWN_0); + } else { + dLytMeter_c::setCrossIconDown(dLytMeterCrossBtn_c::CROSS_ICON_NONE); + } + } else if (act == ACT_IE_150) { + p->field_0x04[DO_BUTTON_CROSS_D] = ACT_IE_NONE; + p->field_0x34[DO_BUTTON_CROSS_D] = bHas; + if (!checkIsInSkykeepPuzzle()) { + dLytMeter_c::setCrossIconDown(dLytMeterCrossBtn_c::CROSS_ICON_DOWN_2); + } else { + dLytMeter_c::setCrossIconDown(dLytMeterCrossBtn_c::CROSS_ICON_NONE); + } + } else if (act == ACT_IE_ETC_CENTER) { + p->field_0x04[DO_BUTTON_CROSS_D] = ACT_IE_NONE; + p->field_0x34[DO_BUTTON_CROSS_D] = bHas; + dLytMeter_c::setCrossIconDown(dLytMeterCrossBtn_c::CROSS_ICON_DOWN_5); + } else { + p->field_0x04[DO_BUTTON_CROSS_D] = act; + p->field_0x34[DO_BUTTON_CROSS_D] = bHas; + dLytMeter_c::setCrossIconDown(dLytMeterCrossBtn_c::CROSS_ICON_NONE); + } + } +} + +LytDoButtonRelated::Act_IE_e LytDoButtonRelated::convertDoButton(dLytDobutton_c::Act_Do_e act) { + for (s32 i = 0; i < ACT_IE_NONE; i++) { + if (sActIEtoDoConversionTable[i] == act) { + return static_cast(i); + } + } + return (Act_IE_e)-1; +} diff --git a/src/d/lyt/meter/d_lyt_meter.cpp b/src/d/lyt/meter/d_lyt_meter.cpp index f6580305..35842b0f 100644 --- a/src/d/lyt/meter/d_lyt_meter.cpp +++ b/src/d/lyt/meter/d_lyt_meter.cpp @@ -39,6 +39,7 @@ #include "toBeSorted/arc_managers/layout_arc_manager.h" #include "toBeSorted/event_manager.h" #include "toBeSorted/minigame_mgr.h" +#include "toBeSorted/misc_actor.h" #include "toBeSorted/small_sound_mgr.h" // clang-format on @@ -1019,7 +1020,6 @@ bool dLytMeterMain_c::fn_800D5380(u8 arg) { return false; } -extern "C" bool checkIsInSkykeepPuzzle(); bool dLytMeterMain_c::fn_800D53D0() { if (checkIsInSkykeepPuzzle() && !field_0x13774) { return true; @@ -1656,8 +1656,8 @@ bool dLytMeterMain_c::execute() { LytDoButtonRelated::set(LytDoButtonRelated::DO_BUTTON_A, LytDoButtonRelated::ACT_IE_NONE); LytDoButtonRelated::set(LytDoButtonRelated::DO_BUTTON_B, LytDoButtonRelated::ACT_IE_NONE); - LytDoButtonRelated::fn_8010EC10(LytDoButtonRelated::ACT_IE_NONE, true); - LytDoButtonRelated::fn_8010ED50(LytDoButtonRelated::ACT_IE_NONE, true); + LytDoButtonRelated::setCrossTop(LytDoButtonRelated::ACT_IE_NONE, true); + LytDoButtonRelated::setCrossDown(LytDoButtonRelated::ACT_IE_NONE, true); LytDoButtonRelated::set(LytDoButtonRelated::DO_BUTTON_CROSS_L, LytDoButtonRelated::ACT_IE_NONE); LytDoButtonRelated::set(LytDoButtonRelated::DO_BUTTON_CROSS_R, LytDoButtonRelated::ACT_IE_NONE); @@ -1761,11 +1761,11 @@ bool dLytMeter_c::build() { if (dScTitle_c::sInstance != nullptr) { mpDoButton = nullptr; mpDoButtonRelated = nullptr; - mpBirdRelated = nullptr; + mpTargetBird = nullptr; } else { mpDoButton = new dLytDobutton_c(); mpDoButtonRelated = new LytDoButtonRelated(); - mpBirdRelated = new LytBirdButtonRelated(); + mpTargetBird = new dLytTargetBird_c(); } if (mpDoButton != nullptr) { @@ -1774,8 +1774,8 @@ bool dLytMeter_c::build() { if (mpDoButtonRelated != nullptr) { mpDoButtonRelated->build(&mResAcc); } - if (mpBirdRelated != nullptr) { - mpBirdRelated->build(&mResAcc); + if (mpTargetBird != nullptr) { + mpTargetBird->build(&mResAcc); } fn_800D97E0(0xb); @@ -1810,10 +1810,10 @@ bool dLytMeter_c::remove() { delete mpEventSkip; mpEventSkip = nullptr; } - if (mpBirdRelated != nullptr) { - mpBirdRelated->remove(); - delete mpBirdRelated; - mpBirdRelated = nullptr; + if (mpTargetBird != nullptr) { + mpTargetBird->remove(); + delete mpTargetBird; + mpTargetBird = nullptr; } dLytAreaCaption_c::remove(); mResAcc.detach(); @@ -1833,8 +1833,8 @@ bool dLytMeter_c::execute() { mpDoButton->execute(); } - if (mpBirdRelated != nullptr) { - mpBirdRelated->execute(); + if (mpTargetBird != nullptr) { + mpTargetBird->execute(); } if (field_0x13B61 || (!EventManager::isInEvent() && field_0x13B62)) { @@ -1871,8 +1871,8 @@ bool dLytMeter_c::draw() { if (mpDoButton != nullptr) { mpDoButton->draw(); } - if (mpBirdRelated != nullptr) { - mpBirdRelated->draw(); + if (mpTargetBird != nullptr) { + mpTargetBird->draw(); } } } 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 be4861ef..4eaf009b 100644 --- a/src/d/lyt/meter/d_lyt_meter_a_btn.cpp +++ b/src/d/lyt/meter/d_lyt_meter_a_btn.cpp @@ -7,6 +7,7 @@ #include "d/lyt/d_window.h" #include "d/lyt/meter/d_lyt_meter.h" #include "toBeSorted/event_manager.h" +#include "toBeSorted/misc_actor.h" STATE_DEFINE(dLytMeterABtn_c, InvisibleWait); STATE_DEFINE(dLytMeterABtn_c, In); @@ -199,8 +200,6 @@ bool dLytMeterABtn_c::remove() { return true; } -extern "C" bool checkIsInSkykeepPuzzle(); - bool dLytMeterABtn_c::execute() { if (mpOwnerPane == nullptr) { return true; diff --git a/src/d/lyt/meter/d_lyt_meter_action_table.inc b/src/d/lyt/meter/d_lyt_meter_action_table.inc index 8f8f38cb..13cdecdb 100644 --- a/src/d/lyt/meter/d_lyt_meter_action_table.inc +++ b/src/d/lyt/meter/d_lyt_meter_action_table.inc @@ -1,5 +1,5 @@ // 001-Action.msbt -static const s32 sActIds[] = { +static const s32 sActIds[LytDoButtonRelated::ACT_IE_NONE] = { 1, // ACT_IE_INFO_CLIMB_UP 2, // ACT_IE_INFO_JUMP 3, // ACT_IE_INFO_DROP_DOWN @@ -147,5 +147,4 @@ static const s32 sActIds[] = { 51, // ACT_IE_ETC_STOW_CANNON 52, // ACT_IE_ETC_SAILCLOTH 53, // ACT_IE_ETC_RETURN_2 - 0, 0, 0, 0, 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 912014eb..a16a09a7 100644 --- a/src/d/lyt/meter/d_lyt_meter_cross_btn.cpp +++ b/src/d/lyt/meter/d_lyt_meter_cross_btn.cpp @@ -9,6 +9,7 @@ #include "d/lyt/meter/d_lyt_meter.h" #include "toBeSorted/event_manager.h" #include "toBeSorted/fi_context.h" +#include "toBeSorted/misc_actor.h" #include "toBeSorted/small_sound_mgr.h" STATE_DEFINE(dLytMeterCrossBtnParts_c, Wait); @@ -21,6 +22,13 @@ STATE_DEFINE(dLytMeterCrossBtn_c, ToUse); STATE_DEFINE(dLytMeterCrossBtn_c, ToUnuse); STATE_DEFINE(dLytMeterCrossBtn_c, Unuse); +#define CROSS_BTN_PART_TOP 0 +#define CROSS_BTN_PART_DOWN 1 +#define CROSS_BTN_PART_LEFT 2 +#define CROSS_BTN_PART_RIGHT 3 + +#define CROSS_BTN_NUM_PARTS 4 + void dLytMeterCrossBtnParts_c::initializeState_Wait() { mOnDelay = 15; } @@ -33,25 +41,25 @@ void dLytMeterCrossBtnParts_c::executeState_Wait() { if (field_0x7C) { if (field_0x68) { bool bDoUpdate = true; - if (field_0x64 != LytDoButtonRelated::ACT_IE_NONE || field_0x70 != field_0x74) { + if (mMessage != LytDoButtonRelated::ACT_IE_NONE || mSavedIcon != mCurrentIcon) { if (timer <= 0) { mStateMgr.changeState(StateID_On); - setMessage(field_0x64); + setMessage(mMessage); } else { bDoUpdate = false; mOnDelay -= 1; } } if (bDoUpdate) { - field_0x60 = field_0x64; - field_0x70 = field_0x74; + mSavedMessage = mMessage; + mSavedIcon = mCurrentIcon; } } else { - if (field_0x64 != LytDoButtonRelated::ACT_IE_NONE || field_0x70 != field_0x74) { - setMessage(field_0x64); + if (mMessage != LytDoButtonRelated::ACT_IE_NONE || mSavedIcon != mCurrentIcon) { + setMessage(mMessage); } - field_0x60 = field_0x64; - field_0x70 = field_0x74; + mSavedMessage = mMessage; + mSavedIcon = mCurrentIcon; } } @@ -76,18 +84,20 @@ void dLytMeterCrossBtnParts_c::finalizeState_On() {} void dLytMeterCrossBtnParts_c::initializeState_Active() {} void dLytMeterCrossBtnParts_c::executeState_Active() { - if (field_0x64 != field_0x60 || !field_0x68 || field_0x70 != field_0x74) { - if ((field_0x64 == LytDoButtonRelated::ACT_IE_NONE && field_0x74 == 6) || !field_0x68) { - if (field_0x60 != field_0x6C) { - field_0x64 = field_0x6C; + if (mMessage != mSavedMessage || !field_0x68 || mSavedIcon != mCurrentIcon) { + if ((mMessage == LytDoButtonRelated::ACT_IE_NONE && mCurrentIcon == dLytMeterCrossBtn_c::CROSS_ICON_NONE) || + !field_0x68) { + if (mSavedMessage != field_0x6C) { + mMessage = field_0x6C; } mStateMgr.changeState(StateID_Off); } else { - setMessage(field_0x64); + setMessage(mMessage); } - field_0x60 = field_0x64; - field_0x70 = field_0x74; - } else if (field_0x60 == LytDoButtonRelated::ACT_IE_NONE && field_0x74 == 6) { + mSavedMessage = mMessage; + mSavedIcon = mCurrentIcon; + } else if (mSavedMessage == LytDoButtonRelated::ACT_IE_NONE && + mCurrentIcon == dLytMeterCrossBtn_c::CROSS_ICON_NONE) { mStateMgr.changeState(StateID_Off); } } @@ -108,10 +118,10 @@ void dLytMeterCrossBtnParts_c::finalizeState_Off() {} void dLytMeterCrossBtnParts_c::init() { field_0x6C = LytDoButtonRelated::ACT_IE_NONE; - field_0x60 = LytDoButtonRelated::ACT_IE_NONE; - field_0x64 = LytDoButtonRelated::ACT_IE_NONE; + mSavedMessage = LytDoButtonRelated::ACT_IE_NONE; + mMessage = LytDoButtonRelated::ACT_IE_NONE; field_0x7C = false; - field_0x70 = 6; + mSavedIcon = dLytMeterCrossBtn_c::CROSS_ICON_NONE; field_0x68 = 1; mOnDelay = 15; mpOwnerPane = 0; @@ -119,7 +129,6 @@ void dLytMeterCrossBtnParts_c::init() { mStateMgr.changeState(StateID_Wait); } -extern "C" bool checkIsInSkykeepPuzzle(); void dLytMeterCrossBtnParts_c::execute(bool bIsVisible) { if (mpOwnerPane == nullptr) { return; @@ -129,7 +138,7 @@ void dLytMeterCrossBtnParts_c::execute(bool bIsVisible) { if (!(*mStateMgr.getStateID() == StateID_On)) { return; } - field_0x70 = 6; + mSavedIcon = dLytMeterCrossBtn_c::CROSS_ICON_NONE; mpAnm[0]->setForwardOnce(); mpAnm[0]->setToEnd2(); mpAnm[0]->setAnimEnable(true); @@ -141,21 +150,21 @@ void dLytMeterCrossBtnParts_c::execute(bool bIsVisible) { } if (dLytMeter_c::GetInstance()->getMeterField_0x13750() == 0) { - if (mIndex == 0) { - LytDoButtonRelated::fn_8010EC10(LytDoButtonRelated::ACT_IE_NONE, true); - } else if (mIndex == 1) { - LytDoButtonRelated::fn_8010ED50(LytDoButtonRelated::ACT_IE_NONE, true); - } else if (mIndex == 2) { + if (mIndex == CROSS_BTN_PART_TOP) { + LytDoButtonRelated::setCrossTop(LytDoButtonRelated::ACT_IE_NONE, true); + } else if (mIndex == CROSS_BTN_PART_DOWN) { + LytDoButtonRelated::setCrossDown(LytDoButtonRelated::ACT_IE_NONE, true); + } else if (mIndex == CROSS_BTN_PART_LEFT) { LytDoButtonRelated::set(LytDoButtonRelated::DO_BUTTON_CROSS_L, LytDoButtonRelated::ACT_IE_NONE); - } else if (mIndex == 3) { + } else if (mIndex == CROSS_BTN_PART_RIGHT) { LytDoButtonRelated::set(LytDoButtonRelated::DO_BUTTON_CROSS_R, LytDoButtonRelated::ACT_IE_NONE); } - if (field_0x64 != LytDoButtonRelated::ACT_IE_NONE) { - field_0x64 = LytDoButtonRelated::ACT_IE_NONE; - field_0x60 = LytDoButtonRelated::ACT_IE_NONE; + if (mMessage != LytDoButtonRelated::ACT_IE_NONE) { + mMessage = LytDoButtonRelated::ACT_IE_NONE; + mSavedMessage = LytDoButtonRelated::ACT_IE_NONE; } - setMessage(field_0x64); + setMessage(mMessage); } if (!bIsVisible && *mStateMgr.getStateID() == StateID_Off) { @@ -165,13 +174,13 @@ void dLytMeterCrossBtnParts_c::execute(bool bIsVisible) { if ((EventManager::isInEvent() && dMessage_c::getInstance()->getField_0x32C() == 12 && !checkIsInSkykeepPuzzle() && !dLytMeter_c::GetInstance()->fn_800D5670()) || - ((dLytMeter_c::getItemSelect0x75A2() && (mIndex != 1 || field_0x74 != 0)) || !bIsVisible)) { + ((dLytMeter_c::getItemSelect0x75A2() && (mIndex != 1 || mCurrentIcon != 0)) || !bIsVisible)) { field_0x7C = 0; if (mIndex == 0) { - LytDoButtonRelated::fn_8010EC10(LytDoButtonRelated::ACT_IE_NONE, true); + LytDoButtonRelated::setCrossTop(LytDoButtonRelated::ACT_IE_NONE, true); } else if (mIndex == 1) { - LytDoButtonRelated::fn_8010ED50(LytDoButtonRelated::ACT_IE_NONE, true); + LytDoButtonRelated::setCrossDown(LytDoButtonRelated::ACT_IE_NONE, true); } else if (mIndex == 2) { LytDoButtonRelated::set(LytDoButtonRelated::DO_BUTTON_CROSS_L, LytDoButtonRelated::ACT_IE_NONE); } else if (mIndex == 3) { @@ -182,16 +191,16 @@ void dLytMeterCrossBtnParts_c::execute(bool bIsVisible) { } if (mIndex == 0) { - field_0x64 = LytDoButtonRelated::get(LytDoButtonRelated::DO_BUTTON_CROSS_T); + mMessage = LytDoButtonRelated::get(LytDoButtonRelated::DO_BUTTON_CROSS_T); field_0x68 = LytDoButtonRelated::getHas(LytDoButtonRelated::DO_BUTTON_CROSS_T); } else if (mIndex == 1) { - field_0x64 = LytDoButtonRelated::get(LytDoButtonRelated::DO_BUTTON_CROSS_D); + mMessage = LytDoButtonRelated::get(LytDoButtonRelated::DO_BUTTON_CROSS_D); field_0x68 = LytDoButtonRelated::getHas(LytDoButtonRelated::DO_BUTTON_CROSS_D); } else if (mIndex == 2) { - field_0x64 = LytDoButtonRelated::get(LytDoButtonRelated::DO_BUTTON_CROSS_L); + mMessage = LytDoButtonRelated::get(LytDoButtonRelated::DO_BUTTON_CROSS_L); field_0x68 = LytDoButtonRelated::getHas(LytDoButtonRelated::DO_BUTTON_CROSS_L); } else if (mIndex == 3) { - field_0x64 = LytDoButtonRelated::get(LytDoButtonRelated::DO_BUTTON_CROSS_R); + mMessage = LytDoButtonRelated::get(LytDoButtonRelated::DO_BUTTON_CROSS_R); field_0x68 = LytDoButtonRelated::getHas(LytDoButtonRelated::DO_BUTTON_CROSS_R); } @@ -213,7 +222,7 @@ void dLytMeterCrossBtnParts_c::setMessage(s32 id) { } // If only there was an easier way to write this - if (field_0x74 == 0 || field_0x74 == 1) { + if (mCurrentIcon == 0 || mCurrentIcon == 1) { mpWindow->SetVisible(false); mpAnm[1]->setFrame(0.0f); mpAnm[1]->setAnimEnable(true); @@ -222,7 +231,7 @@ void dLytMeterCrossBtnParts_c::setMessage(s32 id) { mpLyt->getLayout()->Animate(0); mpLyt->calc(); mpAnm[1]->setAnimEnable(false); - } else if (field_0x74 == 2) { + } else if (mCurrentIcon == 2) { mpWindow->SetVisible(false); mpAnm[1]->setFrame(2.0f); mpAnm[1]->setAnimEnable(true); @@ -231,7 +240,7 @@ void dLytMeterCrossBtnParts_c::setMessage(s32 id) { mpLyt->getLayout()->Animate(0); mpLyt->calc(); mpAnm[1]->setAnimEnable(false); - } else if (field_0x74 == 3) { + } else if (mCurrentIcon == 3) { mpWindow->SetVisible(false); mpAnm[1]->setFrame(3.0f); mpAnm[1]->setAnimEnable(true); @@ -240,7 +249,7 @@ void dLytMeterCrossBtnParts_c::setMessage(s32 id) { mpLyt->getLayout()->Animate(0); mpLyt->calc(); mpAnm[1]->setAnimEnable(false); - } else if (field_0x74 == 4) { + } else if (mCurrentIcon == 4) { mpWindow->SetVisible(false); mpAnm[1]->setFrame(4.0f); mpAnm[1]->setAnimEnable(true); @@ -249,7 +258,7 @@ void dLytMeterCrossBtnParts_c::setMessage(s32 id) { mpLyt->getLayout()->Animate(0); mpLyt->calc(); mpAnm[1]->setAnimEnable(false); - } else if (field_0x74 == 5) { + } else if (mCurrentIcon == 5) { mpWindow->SetVisible(false); mpAnm[1]->setFrame(5.0f); mpAnm[1]->setAnimEnable(true); @@ -385,21 +394,21 @@ bool dLytMeterCrossBtn_c::build(d2d::ResAccIf_c *resAcc) { mpTextboxes[i] = mLyt.getTextBox(sTextBoxes[i]); } - for (int i = 0; i < 4; i++) { + for (int i = 0; i < CROSS_BTN_NUM_PARTS; i++) { mpWindows[i] = mLyt.getWindow(sWindows[i]); mpSizeBoxes[i] = mLyt.getSizeBoxInWindow(sWindows[i]); } - for (int i = 0; i < 4; i++) { + for (int i = 0; i < CROSS_BTN_NUM_PARTS; i++) { mParts[i].mIndex = i; mParts[i].mpLyt = &mLyt; mParts[i].mpAnm[0] = &mAnm[i + CROSS_BTN_ANIM_INPUT_OFFSET]; mParts[i].mpAnm[1] = &mAnm[i + CROSS_BTN_ANIM_PATTERN_OFFSET]; mParts[i].mpTextBoxes[0] = mpTextboxes[i]; - mParts[i].mpTextBoxes[1] = mpTextboxes[i + 4]; + mParts[i].mpTextBoxes[1] = mpTextboxes[i + CROSS_BTN_NUM_PARTS]; mParts[i].mpWindow = mpWindows[i]; mParts[i].mpSizeBox = mpSizeBoxes[i]; - mParts[i].field_0x74 = 6; + mParts[i].mCurrentIcon = dLytMeterCrossBtn_c::CROSS_ICON_NONE; mParts[i].init(); } @@ -410,8 +419,8 @@ bool dLytMeterCrossBtn_c::build(d2d::ResAccIf_c *resAcc) { mSavedFiFlow = 0xFFFF; mCallCount0 = 0; mCallCount1 = 0; - field_0x620 = 6; - field_0x624 = 6; + mIconDown = CROSS_ICON_NONE; + mIconTop = CROSS_ICON_NONE; field_0x637 = 0; field_0x638 = 0; @@ -422,7 +431,7 @@ bool dLytMeterCrossBtn_c::build(d2d::ResAccIf_c *resAcc) { mpOwnerPane = nullptr; - for (int i = 0; i < 4; i++) { + for (int i = 0; i < CROSS_BTN_NUM_PARTS; i++) { mAnm[i + CROSS_BTN_ANIM_INPUT_OFFSET].setToEnd(); mAnm[i + CROSS_BTN_ANIM_INPUT_OFFSET].setAnimEnable(true); } @@ -436,7 +445,7 @@ bool dLytMeterCrossBtn_c::build(d2d::ResAccIf_c *resAcc) { mLyt.calc(); - for (int i = 0; i < 4; i++) { + for (int i = 0; i < CROSS_BTN_NUM_PARTS; i++) { mAnm[i + CROSS_BTN_ANIM_INPUT_OFFSET].setAnimEnable(false); } @@ -465,11 +474,11 @@ bool dLytMeterCrossBtn_c::execute() { mCallCount0 = 0; } - mParts[0].field_0x74 = field_0x624; - mParts[1].field_0x74 = field_0x620; + mParts[CROSS_BTN_PART_TOP].mCurrentIcon = mIconTop; + mParts[CROSS_BTN_PART_DOWN].mCurrentIcon = mIconDown; if (mpOwnerPane != nullptr) { - for (int i = 0; i < 4; i++) { + for (int i = 0; i < CROSS_BTN_NUM_PARTS; i++) { mParts[i].execute(mpOwnerPane->IsVisible()); } } @@ -481,7 +490,7 @@ bool dLytMeterCrossBtn_c::execute() { } if (field_0x637 != 0) { - if (field_0x620 == 0) { + if (mIconDown == 0) { f32 frame = dAcPy_c::GetLink2()->getAnmMatClrFrame(); if (frame == 0.0f) { mAnm[CROSS_BTN_ANIM_CALL_0].setToEnd(); @@ -492,7 +501,8 @@ bool dLytMeterCrossBtn_c::execute() { if (mAnm[CROSS_BTN_ANIM_CALL_0].isEnabled()) { mAnm[CROSS_BTN_ANIM_CALL_0].play(); - if (mParts[1].isActive() && mCallCount0 < 3 && mAnm[CROSS_BTN_ANIM_CALL_0].getFrame() == 1.0f) { + if (mParts[CROSS_BTN_PART_DOWN].isActive() && mCallCount0 < 3 && + mAnm[CROSS_BTN_ANIM_CALL_0].getFrame() == 1.0f) { SmallSoundManager::GetInstance()->playSound(SE_S_SG_CALL); mCallCount0++; } @@ -505,14 +515,15 @@ bool dLytMeterCrossBtn_c::execute() { } if (field_0x639 != 0) { - if (field_0x624 == 3) { + if (mIconTop == 3) { if (field_0x63A == 0) { mAnm[CROSS_BTN_ANIM_CALL_1].setToEnd(); mAnm[CROSS_BTN_ANIM_CALL_1].setAnimEnable(true); } if (mAnm[CROSS_BTN_ANIM_CALL_1].isEnabled()) { mAnm[CROSS_BTN_ANIM_CALL_1].play(); - if (mParts[0].isActive() && mCallCount1 < 3 && mAnm[CROSS_BTN_ANIM_CALL_1].getFrame() == 1.0f) { + if (mParts[CROSS_BTN_PART_TOP].isActive() && mCallCount1 < 3 && + mAnm[CROSS_BTN_ANIM_CALL_1].getFrame() == 1.0f) { SmallSoundManager::GetInstance()->playSound(SE_S_CATAPULT_READY); mCallCount1++; } @@ -525,7 +536,7 @@ bool dLytMeterCrossBtn_c::execute() { } if (field_0x63B != 0) { - if (field_0x620 == 2) { + if (mIconDown == 2) { if (field_0x63C == 0) { mAnm[CROSS_BTN_ANIM_CALL_2].setToEnd(); mAnm[CROSS_BTN_ANIM_CALL_2].setRate(2.0f); @@ -533,7 +544,7 @@ bool dLytMeterCrossBtn_c::execute() { } if (mAnm[CROSS_BTN_ANIM_CALL_2].isEnabled()) { mAnm[CROSS_BTN_ANIM_CALL_2].play(); - if (mParts[1].isActive() && mAnm[CROSS_BTN_ANIM_CALL_2].getFrame() == 1.0f) { + if (mParts[CROSS_BTN_PART_DOWN].isActive() && mAnm[CROSS_BTN_ANIM_CALL_2].getFrame() == 1.0f) { SmallSoundManager::GetInstance()->playSound(SE_S_BIRD_CALL); } } @@ -548,8 +559,8 @@ bool dLytMeterCrossBtn_c::execute() { mAnm[CROSS_BTN_ANIM_LOOP].play(); } - field_0x620 = 6; - field_0x624 = 6; + mIconDown = CROSS_ICON_NONE; + mIconTop = CROSS_ICON_NONE; // Might be arrays field_0x638 = field_0x637; field_0x637 = 0; @@ -563,13 +574,13 @@ bool dLytMeterCrossBtn_c::execute() { void dLytMeterCrossBtn_c::setOwnerPane(nw4r::lyt::Pane *pane) { mpOwnerPane = pane; - for (int i = 0; i < 4; i++) { + for (int i = 0; i < CROSS_BTN_NUM_PARTS; i++) { mParts[i].mpOwnerPane = pane; } } bool dLytMeterCrossBtn_c::fn_800FA730() const { - if (field_0x620 == 2) { + if (mIconDown == 2) { return true; } 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 4b97558e..7d0b0d93 100644 --- a/src/d/lyt/meter/d_lyt_meter_item_select.cpp +++ b/src/d/lyt/meter/d_lyt_meter_item_select.cpp @@ -21,6 +21,7 @@ #include "toBeSorted/d_emitter.h" #include "toBeSorted/event_manager.h" #include "toBeSorted/minigame_mgr.h" +#include "toBeSorted/misc_actor.h" #include "toBeSorted/small_sound_mgr.h" STATE_DEFINE(dLytMeterItemSelectIcon_c, Wait); @@ -790,7 +791,7 @@ void dLytMeterItemSelect_c::finalizeState_SelectIn() { void dLytMeterItemSelect_c::initializeState_Select() {} void dLytMeterItemSelect_c::executeState_Select() { - if (dLytMeter_c::getCrossBtn0x7BF8() == 0 && dPad::checkButtonDpadDownPressed()) { + if (dLytMeter_c::getCrossIconDown() == 0 && dPad::checkButtonDpadDownPressed()) { if (field_0x5794 != I_INVALID) { field_0x5780 = 0.0f; mStateMgr.changeState(StateID_SetIn); @@ -2713,8 +2714,6 @@ s32 dLytMeterItemSelect_c::getBaseItemLytIndexforInternalId(s32 idx) const { return LYT_CMN_ItemInvalid; } -extern "C" bool checkIsInSkykeepPuzzle(); - bool dLytMeterItemSelect_c::isWheelBlockedByCurrentAction() { if (dAcPy_c::LINK->getRidingActorType() == dAcPy_c::RIDING_LOFTWING || dAcPy_c::LINK->checkActionFlags(dAcPy_c::FLG0_SWING_ROPE) || dAcPy_c::LINK->checkCurrentAction(0x9C) ||