Cleanup, docs

2 files changed, 33 insertions, 25 deletions

diff --git a/include/d/lyt/d_lyt_deposit.h b/include/d/lyt/d_lyt_deposit.h
index 8596ac43..e9a7128b 100644
--- a/include/d/lyt/d_lyt_deposit.h
+++ b/include/d/lyt/d_lyt_deposit.h
@@ -48,7 +48,7 @@ public:
     }
 
     void setField_0x1952C(bool b) {
-        field_0x1952C = b;
+        mPreventCancellingSelection = b;
     }
 
     s32 getStateStep() const {
@@ -76,7 +76,7 @@ public:
     }
 
     bool getField_0x1952B() const {
-        return field_0x1952B;
+        return mDidDropCancelItem;
     }
 
     bool isHoldingItem() const {
@@ -172,23 +172,23 @@ private:
     /* 0x19523 */ bool mIsFinishActive;
     /* 0x19524 */ bool mIsSellActive;
     /* 0x19525 */ bool mIsSortActive;
-    /* 0x19526 */ bool field_0x19526;
+    /* 0x19526 */ bool mIsRecycleActive;
     /* 0x19527 */ bool field_0x19527;
-    /* 0x19528 */ bool field_0x19528;
-    /* 0x19529 */ bool mHasScrolledOtherStocks;
-    /* 0x1952A */ bool field_0x1952A;
-    /* 0x1952B */ bool field_0x1952B;
-    /* 0x1952C */ bool field_0x1952C;
+    /* 0x19528 */ bool mIsArrangementDone;
+    /* 0x19529 */ bool mHasHandledScrollTempItems;
+    /* 0x1952A */ bool mPrevPointerVisible;
+    /* 0x1952B */ bool mDidDropCancelItem;
+    /* 0x1952C */ bool mPreventCancellingSelection;
     /* 0x19530 */ s32 mCurrentPouchNavTarget;
-    /* 0x19534 */ s32 mCurrentlyHoldingItemSlot;
+    /* 0x19534 */ s32 mCurrentlyHoldingItemSlot; // encoded with SLOT_STOCK_OFFSET
     /* 0x19538 */ s32 mStateStep;
     /* 0x1953C */ s32 mCursorLocation;
-    /* 0x19540 */ UNKWORD field_0x19540;
+    /* 0x19540 */ s32 mCurrentlyHoldingStockOrPouchSlot; // always raw slot
     /* 0x19544 */ s32 mItemSellValue;
-    /* 0x19548 */ UNKWORD field_0x19548;
-    /* 0x1954C */ UNKWORD field_0x1954C;
-    /* 0x19550 */ UNKWORD field_0x19550;
-    /* 0x19554 */ UNKWORD field_0x19554;
+    /* 0x19548 */ UNKWORD field_0x19548; // always -1
+    /* 0x1954C */ s32 mNextLocation;
+    /* 0x19550 */ s32 mChangeCooldown;
+    /* 0x19554 */ s32 mDroppedStockSlot;
     /* 0x19558 */ u8 mPouchItemIds[RING_NUM_ITEMS];
 };
 
diff --git a/include/d/lyt/d_lyt_deposit_stock.h b/include/d/lyt/d_lyt_deposit_stock.h
index 4948c250..a24d1848 100644
--- a/include/d/lyt/d_lyt_deposit_stock.h
+++ b/include/d/lyt/d_lyt_deposit_stock.h
@@ -34,8 +34,8 @@ public:
         return mLyt.getName();
     }
 
-    void nextPage(bool unk);
-    void prevPage(bool unk);
+    void nextPage(bool preventCancellingSelection);
+    void prevPage(bool preventCancellingSelection);
     void fn_80156530(bool unk);
     
     void navigateToItem();
@@ -50,10 +50,11 @@ public:
     void navigateOffIcon();
     void handleNavOrPoint();
 
-    void pickUpItem(s32 slot, bool unk);
+    void pickUpOrPlaceItem(s32 slot, bool place);
     void selectNavTarget(s32 idx);
     void setItem(s32 idx, s32 item);
     s32 getCurrentSlot() const;
+    void loadItems(s32 hiddenSlot);
 
     STATE_MGR_DEFINE_UTIL_EXECUTESTATE(dLytDepositStock_c);
 
@@ -147,13 +148,20 @@ public:
     void setMainStock(bool b) {
         mIsMainStock = b;
     }
+    
+    void onDropItem() {
+        mPickedUpItemOnThisPage = false;
+    }
 
-//private:
+    void setPreventCancellingSelection() {
+        mPreventCancellingSelection = true;
+    }
+
+private:
     static const s32 NUM_ICONS_PER_PAGE = 12;
     static const s32 NUM_PAGES = 5;
 
     void initIcons();
-    void loadItems(s32 hiddenSlot);
     void loadIcon(s32 idx);
     void navigateToPouch();
     void realizeItem(s32 idx);
@@ -173,21 +181,21 @@ public:
     /* 0x0718 */ dLytCommonIconItem_c mIcons[NUM_ICONS_PER_PAGE];
     /* 0x6778 */ d2d::SubPaneList mSubpaneList;
     /* 0x6784 */ d2d::SubPaneListNode mNodes[NUM_ICONS_PER_PAGE];
-    /* 0x6844 */ bool field_0x6844;
+    /* 0x6844 */ bool mIsIdle;
     /* 0x6845 */ bool mIsModePouch;
     /* 0x6846 */ bool mIsModeSell;
     /* 0x6847 */ bool mIsModeSort;
     /* 0x6848 */ bool mIsModeFinish;
     /* 0x6849 */ bool mIsSellBlocked;
     /* 0x684A */ bool mIsSortBlocked;
-    /* 0x684B */ bool field_0x684B;
-    /* 0x684C */ bool field_0x684C;
+    /* 0x684B */ bool mPreventCancellingSelection;
+    /* 0x684C */ bool mPrevPointerVisible;
     /* 0x684D */ bool mIsMainStock;
-    /* 0x684E */ bool field_0x684E;
+    /* 0x684E */ bool mPickedUpItemOnThisPage;
     /* 0x6850 */ s32 mCurrentNavTarget;
-    /* 0x6854 */ UNKWORD field_0x6854;
+    /* 0x6854 */ s32 mNumSlots;
     /* 0x6858 */ s32 mSelectedItemId;
-    /* 0x685C */ UNKWORD field_0x685C;
+    /* 0x685C */ s32 mPickedUpIdx;
     /* 0x6860 */ s32 mArrowDirection;
     /* 0x6864 */ s32 mSavedArrowDirection;
     /* 0x6868 */ s32 mNavMode;