dLytMeter_c::fn_800D57B0 OK

20 files changed, 136 insertions, 10 deletions

diff --git a/include/d/a/d_a_bird.h b/include/d/a/d_a_bird.h
index af91133f..42db16b8 100644
--- a/include/d/a/d_a_bird.h
+++ b/include/d/a/d_a_bird.h
@@ -26,8 +26,14 @@ public:
     STATE_FUNC_DECLARE(dBird_c, MiniGameEnd);
     STATE_FUNC_DECLARE(dBird_c, MiniGameLevelUpDemo);
 
+    s16 getNumDashes() const {
+        return mNumDashes;
+    }
+
 private:
     /* 0x??? */ STATE_MGR_DECLARE(dBird_c);
+    u8 _0x36C[0xF8E - 0x36C];
+    /* 0xF8E */ s16 mNumDashes;
 };
 
 #endif
diff --git a/include/d/a/d_a_player.h b/include/d/a/d_a_player.h
index 7adcc2dd..32297c77 100644
--- a/include/d/a/d_a_player.h
+++ b/include/d/a/d_a_player.h
@@ -193,7 +193,7 @@ public:
     /* vt 0x254 */ virtual void isAttackingUnderground();
     /* vt 0x258 */ virtual void vt_0x258();
     /* vt 0x25C */ virtual void vt_0x25C();
-    /* vt 0x260 */ virtual void vt_0x260();
+    /* vt 0x260 */ virtual f32 vt_0x260() const;
     /* vt 0x264 */ virtual void getGroosenatorIfIn();
     /* vt 0x268 */ virtual void setActorRef11();
     /* vt 0x26C */ virtual void doesGameOver();
@@ -290,6 +290,10 @@ public:
         return mCurrentAction == action;
     }
 
+    bool isSittingOrUnk0xAE() const {
+        return mCurrentAction == 0xAD || mCurrentAction == 0xAE;
+    }
+
     inline bool checkSwordAndMoreStates(u32 mask) const {
         return (mSwordAndMoreStates & mask) != 0;
     }
@@ -338,6 +342,8 @@ public:
     static bool isItemRestrictedByBokoBase(ITEM_ID item);
 
     static u32 getCurrentHealthCapacity();
+
+    bool canDowseProbably() const;
 };
 
 #endif
diff --git a/include/d/d_stage_mgr.h b/include/d/d_stage_mgr.h
index d4a3a805..f2f91e41 100644
--- a/include/d/d_stage_mgr.h
+++ b/include/d/d_stage_mgr.h
@@ -49,6 +49,7 @@ public:
 public:
     bool isAreaTypeDungeon() const;
     bool isAreaTypeSky() const;
+    bool isAreaTypeHouse() const;
     bool isAreaTypeDungeonOrBoss() const;
     bool isAreaTypeOverworldOrSkyloft() const;
     s32 getSTIFunk1() const;
diff --git a/include/d/flag/sceneflag_manager.h b/include/d/flag/sceneflag_manager.h
index b65c21df..dbb36b92 100644
--- a/include/d/flag/sceneflag_manager.h
+++ b/include/d/flag/sceneflag_manager.h
@@ -51,7 +51,7 @@ public:
         return checkUncommittedTempOrSceneflag(flag);
     }
     u16 checkFlag(u16 roomId, u16 flag);
-    bool checkSceneflagGlobal(u16 sceneIdx, u16 flag);
+    u16 checkSceneflagGlobal(u16 sceneIdx, u16 flag);
     u16 checkTempOrSceneflag(u16 flag);
     u16 checkUncommittedFlag(u16 roomId, u16 flag);
     void setZoneflag(u16 roomId, u16 flag);
diff --git a/include/d/lyt/d_lyt_bird_gauge.h b/include/d/lyt/d_lyt_bird_gauge.h
index e05fc963..68532922 100644
--- a/include/d/lyt/d_lyt_bird_gauge.h
+++ b/include/d/lyt/d_lyt_bird_gauge.h
@@ -71,6 +71,22 @@ public:
 
     void hide();
 
+    void setNumDashes(s32 num) {
+        mGameStateDashes = num;
+    }
+
+    void setField_0x690(bool val) {
+        field_0x690 = val;
+    }
+
+    bool getField_0x692() const {
+        return field_0x692;
+    }
+
+    bool getField_0x693() const {
+        return field_0x693;
+    }
+
 private:
     static dLytBirdGauge_c *sInstance;
 
diff --git a/include/d/lyt/d_lyt_boss_gauge.h b/include/d/lyt/d_lyt_boss_gauge.h
index ab959bf7..f62eea3b 100644
--- a/include/d/lyt/d_lyt_boss_gauge.h
+++ b/include/d/lyt/d_lyt_boss_gauge.h
@@ -3,7 +3,6 @@
 
 #include "d/lyt/d2d.h"
 #include "s/s_State.hpp"
-#include "s/s_StateMgr.hpp"
 
 class dLytBossGauge_c {
 public:
@@ -15,6 +14,12 @@ public:
     bool execute();
     bool draw();
 
+    void setMode(s32 mode);
+
+    void setField_0x545(bool value) {
+        field_0x545 = value;
+    }
+
 private:
     STATE_FUNC_DECLARE(dLytBossGauge_c, None);
     STATE_FUNC_DECLARE(dLytBossGauge_c, In);
@@ -25,6 +30,8 @@ private:
     /* 0x040 */ d2d::ResAccIf_c mResAcc;
     /* 0x3B0 */ d2d::dLytSub mLyt;
     /* 0x444 */ d2d::AnmGroup_c mAnmGroups[4];
+    /* 0x544 */ u8 field_0x544;
+    /* 0x545 */ bool field_0x545;
 };
 
 #endif
diff --git a/include/d/lyt/d_lyt_do_button.h b/include/d/lyt/d_lyt_do_button.h
index bb55159f..7970f6d5 100644
--- a/include/d/lyt/d_lyt_do_button.h
+++ b/include/d/lyt/d_lyt_do_button.h
@@ -39,6 +39,14 @@ public:
         }
     }
 
+    static s32 getNextActionToShow() {
+        if (sInstance != nullptr) {
+            return sInstance->mNextDoActionToShow;
+        } else {
+            return 0x29;
+        }
+    }
+
     static s32 getFn0x8010E5E0() {
         if (sInstance != nullptr) {
             return sInstance->fn_8010E5E0();
@@ -54,8 +62,15 @@ public:
             return 0x5E;
         }
     }
-
+    
+    static void setActionTextStuff(s32 p1, s32 p2, bool p3) {
+        if (sInstance != nullptr) {
+            sInstance->setActionTextStuffInternal(p1, p2, p3);
+        }
+    }
+    
 private:
+    void setActionTextStuffInternal(s32, s32, bool);
     s32 fn_8010E5D0() const;
     s32 fn_8010E5E0() const;
 
diff --git a/include/d/lyt/d_lyt_sky_gauge.h b/include/d/lyt/d_lyt_sky_gauge.h
index fb9b6b63..af606b77 100644
--- a/include/d/lyt/d_lyt_sky_gauge.h
+++ b/include/d/lyt/d_lyt_sky_gauge.h
@@ -68,6 +68,12 @@ public:
     void setHeight(f32 height);
 
     static dLytSkyGauge_c *sInstance;
+    void setWantsIn() {
+        mWantsIn = true;
+    }
+    void setWantsOut() {
+        mWantsOut = true;
+    }
 
 private:
     STATE_FUNC_DECLARE(dLytSkyGauge_c, None);
diff --git a/include/d/lyt/d_lyt_unknowns.h b/include/d/lyt/d_lyt_unknowns.h
index a6f22db2..29b8233b 100644
--- a/include/d/lyt/d_lyt_unknowns.h
+++ b/include/d/lyt/d_lyt_unknowns.h
@@ -47,8 +47,8 @@ public:
     };
 
     static void set(DoButton_e button, Action_e value) {
-        LytDoButtonRelated *b = sInstance;
-        if (b != nullptr) {
+        if (sInstance != nullptr) {
+            LytDoButtonRelated *b = sInstance;
             b->field_0x04[button] = value;
             b->field_0x34[button] = true;
         }
diff --git a/include/d/lyt/meter/d_lyt_meter.h b/include/d/lyt/meter/d_lyt_meter.h
index 4c2e158e..b88378de 100644
--- a/include/d/lyt/meter/d_lyt_meter.h
+++ b/include/d/lyt/meter/d_lyt_meter.h
@@ -72,14 +72,18 @@ public:
 
     bool fn_800D5380(u8);
     bool fn_800D5290();
+    bool fn_800D5590();
     bool fn_800D5650();
     bool fn_800D5680();
     bool fn_800D56B0();
-    bool fn_800D57B0();
+    void fn_800D57B0();
     bool execute();
 
     bool isSilentRealm();
 
+    bool fn_800D53D0();
+    bool fn_800D5420();
+
     void setUiMode(u16 value) const;
     u8 getUiMode();
 
@@ -334,6 +338,14 @@ public:
         }
     }
 
+    static u8 getField_0x13B66() {
+        if (sInstance != nullptr) {
+            return sInstance->field_0x13B66;
+        } else {
+            return 0;
+        }
+    }
+
     static u8 getDowsing0x550A() {
         if (sInstance != nullptr) {
             return sInstance->mMeter.mDowsing.getField_0x550A();
diff --git a/include/d/lyt/meter/d_lyt_meter_drink.h b/include/d/lyt/meter/d_lyt_meter_drink.h
index b6c4d8b7..7ba0fe9f 100644
--- a/include/d/lyt/meter/d_lyt_meter_drink.h
+++ b/include/d/lyt/meter/d_lyt_meter_drink.h
@@ -72,6 +72,14 @@ public:
     bool draw();
     bool execute();
 
+    void setShouldBeVisible(bool v) {
+        field_0x6F4 = v;
+    }
+
+    void setField_0x6E0(const mVec3_c &v) {
+        field_0x6E0 = v;
+    }
+
 private:
     bool fn_800E5C40(int);
     int getPartForDrinkType(dLytMeterDrinkParts_c::DrinkType_e ty) const;
diff --git a/include/d/lyt/meter/d_lyt_meter_item_select.h b/include/d/lyt/meter/d_lyt_meter_item_select.h
index 42100c1c..b076302a 100644
--- a/include/d/lyt/meter/d_lyt_meter_item_select.h
+++ b/include/d/lyt/meter/d_lyt_meter_item_select.h
@@ -203,6 +203,10 @@ public:
         return field_0x57A2;
     }
 
+    u8 getField_0x5794() const {
+        return field_0x5794;
+    }
+
 private:
     void setBtnItem(s32 internalItem);
     void realizeSelectedWheelItem();
diff --git a/include/d/lyt/meter/d_lyt_meter_key.h b/include/d/lyt/meter/d_lyt_meter_key.h
index fef29a9f..43885d4e 100644
--- a/include/d/lyt/meter/d_lyt_meter_key.h
+++ b/include/d/lyt/meter/d_lyt_meter_key.h
@@ -19,6 +19,10 @@ public:
 
     void setPosition(s32 position);
 
+    void setShouldBeVisible(bool v) {
+        mShouldBeVisible = v;
+    }
+
 private:
     STATE_FUNC_DECLARE(dLytMeterKakeraKey_c, Wait);
     STATE_FUNC_DECLARE(dLytMeterKakeraKey_c, On);
@@ -61,6 +65,10 @@ public:
 
     void setPosition(s32 position);
 
+    void setShouldBeVisible(bool v) {
+        mShouldBeVisible = v;
+    }
+
 private:
     STATE_FUNC_DECLARE(dLytMeterBossKey_c, Wait);
     STATE_FUNC_DECLARE(dLytMeterBossKey_c, On);
@@ -100,6 +108,10 @@ public:
 
     void setPosition(s32 position);
 
+    void setShouldBeVisible(bool v) {
+        mShouldBeVisible = v;
+    }
+
 private:
     STATE_FUNC_DECLARE(dLytMeterSmallKey_c, Wait);
     STATE_FUNC_DECLARE(dLytMeterSmallKey_c, On);
diff --git a/include/d/lyt/meter/d_lyt_meter_minus_btn.h b/include/d/lyt/meter/d_lyt_meter_minus_btn.h
index 653305d8..5bc90743 100644
--- a/include/d/lyt/meter/d_lyt_meter_minus_btn.h
+++ b/include/d/lyt/meter/d_lyt_meter_minus_btn.h
@@ -129,10 +129,11 @@ public:
     void setField_0x4E80(s32 value) {
         field_0x4E80 = value;
     }
+    
+    bool fn_800F75E0() const;
 
 private:
     bool shouldCall() const;
-    bool fn_800F75E0() const;
     void fn_800F7300();
     bool fn_800F7600() const;
     bool fn_800F7760() const;
diff --git a/include/d/lyt/meter/d_lyt_meter_plus_btn.h b/include/d/lyt/meter/d_lyt_meter_plus_btn.h
index 9e934f0c..ccbe9781 100644
--- a/include/d/lyt/meter/d_lyt_meter_plus_btn.h
+++ b/include/d/lyt/meter/d_lyt_meter_plus_btn.h
@@ -31,6 +31,10 @@ public:
         mpOwnerPane = pane;
     }
 
+    bool getField_0x1C0() const {
+        return field_0x1C0;
+    }
+
 private:
     void setMessage(s32 id);
     bool isMapOpen() const;
diff --git a/include/d/lyt/meter/d_lyt_meter_rupy.h b/include/d/lyt/meter/d_lyt_meter_rupy.h
index f2d3c06c..cacdbc88 100644
--- a/include/d/lyt/meter/d_lyt_meter_rupy.h
+++ b/include/d/lyt/meter/d_lyt_meter_rupy.h
@@ -109,6 +109,10 @@ public:
         field_0x8AC = val;
     }
 
+    void setSize(u8 size) {
+        mSize = size;
+    }
+
 private:
     bool updateDisplayedAmount(bool suppressSound);
     bool hasChangeInRupees() const;
diff --git a/include/d/lyt/meter/d_lyt_meter_shield_gauge.h b/include/d/lyt/meter/d_lyt_meter_shield_gauge.h
index 12a4d730..fb8ee441 100644
--- a/include/d/lyt/meter/d_lyt_meter_shield_gauge.h
+++ b/include/d/lyt/meter/d_lyt_meter_shield_gauge.h
@@ -39,6 +39,10 @@ public:
         field_0x318 = v;
     }
 
+    u8 getField_0x31D() const {
+        return field_0x31D;
+    }
+
 private:
     s32 getLytFrameForShield(s32) const;
     void setLevel(f32 level);
diff --git a/include/d/lyt/meter/d_lyt_meter_timer.h b/include/d/lyt/meter/d_lyt_meter_timer.h
index 1d6c1d61..85f7c42f 100644
--- a/include/d/lyt/meter/d_lyt_meter_timer.h
+++ b/include/d/lyt/meter/d_lyt_meter_timer.h
@@ -245,10 +245,10 @@ public:
     bool build();
     bool remove();
     bool execute();
-
-private:
     bool startIn2();
     bool startOut2();
+
+private:
     void startIn();
     void gotoChangeSiren();
     void gotoSiren();
diff --git a/include/d/lyt/msg_window/d_lyt_simple_window.h b/include/d/lyt/msg_window/d_lyt_simple_window.h
new file mode 100644
index 00000000..2356fd83
--- /dev/null
+++ b/include/d/lyt/msg_window/d_lyt_simple_window.h
@@ -0,0 +1,19 @@
+#ifndef D_LYT_SIMPLE_WINDOW_H
+#define D_LYT_SIMPLE_WINDOW_H
+
+class dLytSimpleWindow_c {
+public:
+    dLytSimpleWindow_c() {}
+    virtual ~dLytSimpleWindow_c() {}
+
+    static dLytSimpleWindow_c *getInstance() {
+        return sInstance;
+    }
+
+    bool fn_8012B000();
+
+private:
+    static dLytSimpleWindow_c *sInstance;
+};
+
+#endif
diff --git a/include/toBeSorted/minigame_mgr.h b/include/toBeSorted/minigame_mgr.h
index e83c7364..a74ddbeb 100644
--- a/include/toBeSorted/minigame_mgr.h
+++ b/include/toBeSorted/minigame_mgr.h
@@ -19,6 +19,7 @@ public:
         HARP_PLAYING,
     };
     static bool isInMinigameState(Minigame game);
+    static bool isInAnyMinigame();
 
     static void create();
     static void destroy();