wip

2 files changed, 27 insertions, 4 deletions

diff --git a/include/d/lyt/d_lyt_pause.h b/include/d/lyt/d_lyt_pause.h
index 90094664..88978cd7 100644
--- a/include/d/lyt/d_lyt_pause.h
+++ b/include/d/lyt/d_lyt_pause.h
@@ -31,6 +31,10 @@ public:
         return field_0x0832;
     }
 
+    void setField_0x0837(bool b) {
+        field_0x0837 = b;
+    }
+
     bool getField_0x0838() const {
         return field_0x0838;
     }
@@ -39,6 +43,14 @@ public:
         return field_0x083B;
     }
 
+    void setField_0x083C(bool b) {
+        field_0x083C = b;
+    }
+
+    void setField_0x083D(bool b) {
+        field_0x083D = b;
+    }
+
     bool getField_0x083E() const {
         return field_0x083E;
     }
@@ -66,7 +78,7 @@ public:
         SELECT_NONE = 10,
     };
 
-    void setSelection(SelectionType_e type, s32 id, bool restricted);
+    void setSelection(SelectionType_e type, u16 id, bool restricted);
 
     bool isCurrentSelectionRestricted() const {
         return mCurrentSelectionIsRestricted;
@@ -118,16 +130,17 @@ private:
     /* 0x0832 */ bool field_0x0832;
     /* 0x0833 */ u8 mCurrentSelectionTab;
 
-    /* 0x0834 */ u8 _0x0834[0x0838 - 0x0834];
+    /* 0x0834 */ u8 _0x0834[0x0837 - 0x0834];
 
+    /* 0x0837 */ bool field_0x0837;
     /* 0x0838 */ bool field_0x0838;
 
     /* 0x0839 */ u8 _0x0839[0x083B - 0x0839];
     
     /* 0x083B */ bool field_0x083B;
 
-    /* 0x083C */ u8 _0x083C[0x083E - 0x083C];
-
+    /* 0x083C */ bool field_0x083C;
+    /* 0x083D */ bool field_0x083D;
     /* 0x083E */ bool field_0x083E;
     /* 0x083F */ bool field_0x083F;
     /* 0x0840 */ bool field_0x0840;
diff --git a/include/d/lyt/d_lyt_pause_disp_00.h b/include/d/lyt/d_lyt_pause_disp_00.h
index 81e20caa..3805c434 100644
--- a/include/d/lyt/d_lyt_pause_disp_00.h
+++ b/include/d/lyt/d_lyt_pause_disp_00.h
@@ -26,6 +26,14 @@ public:
     STATE_FUNC_DECLARE(dLytPauseDisp00_c, Out);
 
 private:
+    static s32 navTargetToBounding(s32 target) {
+        return target - 1;
+    }
+
+    static s32 boundingToNavTarget(s32 target) {
+        return target + 1;
+    }
+
     void setAnm(int idx, f32 value);
     void stopAnm(int idx);
     void playBackwards(d2d::AnmGroup_c &anm);
@@ -49,8 +57,10 @@ private:
 
     s32 updateSelection();
     s32 getPointerPane() const;
+    bool isPointingAtRingIcon();
 
     void hideItemIcons();
+    u16 getPointedItemSpecial(s32 paneIdx, bool *pLocked);
 
     enum LoadRingTextCmd_e {
         RING_TEXT_RELEASE_TO_CONFIRM = 0,