d_lyt_area_caption OK

5 files changed, 31 insertions, 6 deletions

diff --git a/include/d/d_pad.h b/include/d/d_pad.h
index bf5462ae..53a9955a 100644
--- a/include/d/d_pad.h
+++ b/include/d/d_pad.h
@@ -6,9 +6,16 @@ public:
     static bool checkButtonAPressed();
     static bool checkButtonBPressed();
     static bool checkButtonZPressed();
+    static bool checkButtonCPressed();
+    static bool checkButtonMinusPressed();
     static bool checkButtonPlusPressed();
+    static bool checkButton1Pressed();
+    static bool checkButton2Pressed();
 
+    static bool checkButtonDpadUpPressed();
     static bool checkButtonDpadDownPressed();
+    static bool checkButtonDpadLeftPressed();
+    static bool checkButtonDpadRightPressed();
 
     static bool checkButtonAHeld();
     static bool checkButtonZHeld();
diff --git a/include/d/d_stage_mgr.h b/include/d/d_stage_mgr.h
index a03ec212..cc7d16a3 100644
--- a/include/d/d_stage_mgr.h
+++ b/include/d/d_stage_mgr.h
@@ -54,6 +54,17 @@ public:
     bool isAreaTypeOverworldOrSkyloft() const;
     s32 getSTIFunk1() const;
 
+    s32 getSTIFbyte4() const;
+    bool isSTIFbyte4_2or3or4() const;
+    bool isSTIFbyte4_5or6() const;
+    bool isSTIFbyte4_7or8or9or10or11() const;
+    bool isSTIFbyte4_1() const {
+        return getSTIFbyte4() == 1;
+    }
+    bool isSTIFbyte4_0() const {
+        return getSTIFbyte4() == 0;
+    }
+
     s32 getAreaType() const;
     s32 getMapNameId() const;
 
diff --git a/include/d/lyt/d_lyt_area_caption.h b/include/d/lyt/d_lyt_area_caption.h
index af132d0c..8f71818d 100644
--- a/include/d/lyt/d_lyt_area_caption.h
+++ b/include/d/lyt/d_lyt_area_caption.h
@@ -3,7 +3,6 @@
 
 #include "d/lyt/d2d.h"
 #include "s/s_State.hpp"
-#include "s/s_StateMgr.hpp"
 
 class dLytAreaCaptionParts_c {
 public:
@@ -23,13 +22,15 @@ public:
     STATE_FUNC_DECLARE(dLytAreaCaptionParts_c, Out);
 
 private:
+    bool shouldImmediatelyDismiss() const;
+
     /* 0x000 */ UI_STATE_MGR_DECLARE(dLytAreaCaptionParts_c);
     /* 0x040 */ d2d::ResAccIf_c mResAcc;
     /* 0x0EB */ d2d::dLytSub mLyt;
     /* 0x110 */ d2d::AnmGroup_c mAnmGroups[4];
     /* 0x540 */ dTextBox_c *mTextBoxes[3];
-    /* 0x54C */ u8 field_0x54C;
-    /* 0x54D */ u8 field_0x54D;
+    /* 0x54C */ bool field_0x54C;
+    /* 0x54D */ bool field_0x54D;
     /* 0x54E */ u8 mFirst;
     /* 0x54F */ bool mAnmCtrlInUse[4];
 };
@@ -63,10 +64,10 @@ private:
     void doSetTextIfWaiting(const char *);
     void doSetArea(int id);
     void doCheck();
-    dLytAreaCaptionParts_c mParts[2];
 
-    s32 mPartToDraw;
-    bool mVisible;
+    /* 0x000 */ dLytAreaCaptionParts_c mParts[2];
+    /* 0xAA8 */ s32 mPartToDraw;
+    /* 0xAAC */ bool mVisible;
 };
 
 #endif
diff --git a/include/d/lyt/meter/d_lyt_meter.h b/include/d/lyt/meter/d_lyt_meter.h
index a246ae74..102157a0 100644
--- a/include/d/lyt/meter/d_lyt_meter.h
+++ b/include/d/lyt/meter/d_lyt_meter.h
@@ -109,6 +109,10 @@ public:
         return mPanesNotHiddenByAreaCaption[8];
     }
 
+    void setGanbariGaugeHiddenByAreaCaption(bool visible) {
+        mPanesNotHiddenByAreaCaption[15] = visible;
+    }
+
     bool getField_0x1377E() const {
         return field_0x1377E;
     }
diff --git a/include/toBeSorted/event_manager.h b/include/toBeSorted/event_manager.h
index f921ab2b..c248e8b8 100644
--- a/include/toBeSorted/event_manager.h
+++ b/include/toBeSorted/event_manager.h
@@ -41,6 +41,8 @@ public:
         return strequals(getCurrentEventName(), name);
     }
 
+    static bool eventRelatedStateFlags_shift0x11_1();
+
     // Something like isActorInEvent maybe?
     static bool FUN_800a0570(dAcBase_c *actor);
     static bool FUN_800a0ba0();