Merge branch 'master' into doc-frontierpass2

1 files changed, 39 insertions, 15 deletions

diff --git a/include/battle_pyramid_bag.h b/include/battle_pyramid_bag.h
index df111b939..de571714c 100644
--- a/include/battle_pyramid_bag.h
+++ b/include/battle_pyramid_bag.h
@@ -3,48 +3,72 @@
 
 #include "list_menu.h"
 
-struct PyramidBagResources
+enum {
+    PYRAMIDBAG_LOC_FIELD,
+    PYRAMIDBAG_LOC_BATTLE,
+    PYRAMIDBAG_LOC_PARTY,
+    PYRAMIDBAG_LOC_CHOOSE_TOSS,
+    PYRAMIDBAG_LOC_PREV,
+};
+
+enum {
+    PBAG_SPRITE_BAG,
+    PBAG_SPRITE_ITEM_ICON,
+    PBAG_SPRITE_ITEM_ICON_ALT,
+    PBAG_SPRITE_SWAP_LINE_START, // Swap line consists of 8 sprites
+    PBAG_SPRITE_SWAP_LINE_2,
+    PBAG_SPRITE_SWAP_LINE_3,
+    PBAG_SPRITE_SWAP_LINE_4,
+    PBAG_SPRITE_SWAP_LINE_5,
+    PBAG_SPRITE_SWAP_LINE_6,
+    PBAG_SPRITE_SWAP_LINE_7,
+    PBAG_SPRITE_SWAP_LINE_END,
+    PBAG_SPRITE_COUNT
+};
+#define NUM_SWAP_LINE_SPRITES (1 + PBAG_SPRITE_SWAP_LINE_END - PBAG_SPRITE_SWAP_LINE_START)
+
+struct PyramidBagMenu
 {
-    void (*callback2)(void);
-    u8 tilemapBuffer[0x800];
-    u8 itemsSpriteIds[PYRAMID_BAG_ITEMS_COUNT + 1];
+    void (*exitCallback)(void);
+    u8 tilemapBuffer[BG_SCREEN_SIZE];
+    u8 spriteIds[PBAG_SPRITE_COUNT];
     u8 windowIds[5];
-    u8 unk814;
-    u8 unk815;
+    u8 toSwapPos;
+    bool8 isAltIcon; // Two item icons loaded at a time. Tracks which to show next
     u8 scrollIndicatorsTaskId;
     const u8 *menuActionIds;
-    u8 filler81C[0x820 - 0x81C];
+    u8 unused1[4];
     u8 menuActionsCount;
     u8 listMenuCount;
     u8 listMenuMaxShown;
     struct ListMenuItem bagListItems[PYRAMID_BAG_ITEMS_COUNT + 1];
     u8 itemStrings[PYRAMID_BAG_ITEMS_COUNT + 1][ITEM_NAME_LENGTH + 10];
     s16 state;
-    u8 filler986[0x98C - 0x986];
+    u8 unused2[4];
 };
 
-struct PyramidBagCursorData
+struct PyramidBagMenuState
 {
     void (*callback)(void);
-    u8 unk4;
+    u8 location;
     u16 cursorPosition;
     u16 scrollPosition;
 };
 
-extern struct PyramidBagResources *gPyramidBagResources;
-extern struct PyramidBagCursorData gPyramidBagCursorData;
+extern struct PyramidBagMenu *gPyramidBagMenu;
+extern struct PyramidBagMenuState gPyramidBagMenuState;
 
 void InitBattlePyramidBagCursorPosition(void);
 void CB2_PyramidBagMenuFromStartMenu(void);
 void CB2_ReturnToPyramidBagMenu(void);
-void sub_81C5924(void);
-void sub_81C59BC(void);
+void UpdatePyramidBagList(void);
+void UpdatePyramidBagCursorPos(void);
 void sub_81C4EFC(void);
 void GoToBattlePyramidBagMenu(u8 a0, void (*callback)(void));
 void Task_CloseBattlePyramidBagMessage(u8 taskId);
 void TryStoreHeldItemsInPyramidBag(void);
 void ChooseItemsToTossFromPyramidBag(void);
-void CloseBattlePyramidBagAndSetCallback(u8 taskId);
+void CloseBattlePyramidBag(u8 taskId);
 void DisplayItemMessageInBattlePyramid(u8 taskId, const u8 *str, void (*callback)(u8 taskId));
 
 #endif // GUARD_BATTLE_PYRAMID_BAG_H