10 files changed, 76 insertions, 37 deletions
diff --git a/include/bag.h b/include/bag.h
index c48940173..fec9f67bf 100644
--- a/include/bag.h
+++ b/include/bag.h
@@ -3,18 +3,18 @@
 
 #include "menu_helpers.h"
 
-void sub_810B858(void);
-void sub_810B8F0(u8 windowId, u8 fontId, const u8 * str, u8 x, u8 y, u8 letterSpacing, u8 lineSpacing, u8 speed, u8 colorIdx);
-void sub_810B958(const u8 * str, u8 unused);
-void sub_810B994(void);
-u8 sub_810B9DC(u8 a0, u8 a1);
-void sub_810BA3C(u8 a0);
-u8 sub_810BA70(u8 a0);
-void sub_810BA9C(u8 a0);
-u8 sub_810BAD8(u8 a0);
-void sub_810BAE8(u8 taskId, const struct YesNoFuncTable * ptrs);
-void sub_810BB14(u8 taskId, const struct YesNoFuncTable * ptrs);
-void sub_810BB40(void);
-void sub_810BB74(u8 windowId);
+void InitBagWindows(void);
+void BagPrintTextOnWindow(u8 windowId, u8 fontId, const u8 * str, u8 x, u8 y, u8 letterSpacing, u8 lineSpacing, u8 speed, u8 colorIdx);
+void BagPrintTextOnWin1CenteredColor0(const u8 * str, u8 unused);
+void BagDrawDepositItemTextBox(void);
+u8 ShowBagWindow(u8 whichWindow, u8 nItems);
+void HideBagWindow(u8 whichWindow);
+u8 OpenBagWindow(u8 whichWindow);
+void CloseBagWindow(u8 whichWindow);
+u8 GetBagWindow(u8 whichWindow);
+void BagCreateYesNoMenuBottomRight(u8 taskId, const struct YesNoFuncTable * ptrs);
+void BagCreateYesNoMenuTopRight(u8 taskId, const struct YesNoFuncTable * ptrs);
+void BagPrintMoneyAmount(void);
+void BagDrawTextBoxOnWindow(u8 windowId);
 
 #endif //GUARD_BAG_H
diff --git a/include/constants/item_menu.h b/include/constants/item_menu.h
index 8e91d2a17..2a51b8c1b 100644
--- a/include/constants/item_menu.h
+++ b/include/constants/item_menu.h
@@ -1,6 +1,24 @@
 #ifndef GUARD_CONSTANTS_ITEM_MENU_H
 #define GUARD_CONSTANTS_ITEM_MENU_H
 
+#define OPEN_BAG_ITEMS     0
+#define OPEN_BAG_KEYITEMS  1
+#define OPEN_BAG_POKEBALLS 2
+#define OPEN_BAG_LAST      3
+
+#define ITEMMENULOCATION_FIELD            0
+#define ITEMMENULOCATION_PARTY            1
+#define ITEMMENULOCATION_SHOP             2
+#define ITEMMENULOCATION_ITEMPC           3
+#define ITEMMENULOCATION_PCBOX            4
+#define ITEMMENULOCATION_BATTLE           5
+#define ITEMMENULOCATION_OLDMAN           6
+#define ITEMMENULOCATION_TTVSCR_STATUS    7
+#define ITEMMENULOCATION_TTVSCR_CATCHING  8
+#define ITEMMENULOCATION_TTVSCR_REGISTER  9
+#define ITEMMENULOCATION_TTVSCR_TMS      10
+#define ITEMMENULOCATION_LAST            11
+
 #define ITEMMENUACTION_USE           0
 #define ITEMMENUACTION_TOSS          1
 #define ITEMMENUACTION_REGISTER      2
diff --git a/include/event_scripts.h b/include/event_scripts.h
index dcbe2c137..a597868b9 100644
--- a/include/event_scripts.h
+++ b/include/event_scripts.h
@@ -1195,6 +1195,6 @@ extern const u8 Text_1A5D31[];
 extern const u8 Text_1A5D6E[];
 extern const u8 Text_1A5DB1[];
 
-extern const u8 gUnknown_81A77A0[];
+extern const u8 EventScript_BagItemCanBeRegistered[];
 
 #endif //GUARD_EVENT_SCRIPTS_H
diff --git a/include/graphics.h b/include/graphics.h
index eb9a9a20d..296dee465 100644
--- a/include/graphics.h
+++ b/include/graphics.h
@@ -4861,7 +4861,7 @@ extern const u16 gUnknown_8D12404[];
 extern const u32 gUnknown_8E830CC[];
 extern const u32 gUnknown_8E832C0[];
 extern const u32 gUnknown_8E83444[];
-extern const u32 gUnknown_8E835B4[];
-extern const u32 gUnknown_8E83604[];
+extern const u32 gBagBgPalette[];
+extern const u32 gBagBgPalette_FemaleOverride[];
 
 #endif //GUARD_GRAPHICS_H
diff --git a/include/item_menu.h b/include/item_menu.h
index d8257ccf1..4720080da 100644
--- a/include/item_menu.h
+++ b/include/item_menu.h
@@ -13,13 +13,13 @@ struct BagStruct
 {
     void (*bagCallback)(void);
     u8 location;
-    u8 unk5;
+    u8 bagOpen;
     u16 pocket;
     u16 itemsAbove[3];
     u16 cursorPos[3];
 };
 
-extern struct BagStruct gUnknown_203ACFC;
+extern struct BagStruct gBagMenuState;
 
 extern u16 gSpecialVar_ItemId;
 
@@ -27,19 +27,19 @@ extern u16 gSpecialVar_ItemId;
 void sub_81AAC50(void);
 void sub_81AAC70(void);
 void CB2_SetUpReshowBattleScreenAfterMenu(void);
-void sub_81089BC(void);
-void sub_810B108(u8);
+void ResetBagCursorPositions(void);
+void InitPokeDudeBag(u8);
 void CB2_BagMenuFromStartMenu(void);
 void MoveItemSlotInList(struct ItemSlot * itemSlots_, u32 from, u32 to_);
 void ItemMenu_StartFadeToExitCallback(u8 taskId);
-void sub_8108CB4(void);
+void Bag_BeginCloseWin0Animation(void);
 void ItemMenu_SetExitCallback(void (*)(void));
 void DisplayItemMessageInBag(u8 taskId, u8 fontId, const u8 * string, TaskFunc followUpFunc);
-void sub_810A1F8(u8 taskId);
-void sub_8107ECC(void);
-void InitTutorialBag(void);
-void sub_8108DC8(u8 pocketId);
-void sub_81089F4(u8 pocketId);
+void Task_ReturnToBagFromContextMenu(u8 taskId);
+void CB2_BagMenuFromBattle(void);
+void InitOldManBag(void);
+void Pocket_CalculateNItemsAndMaxShowed(u8 pocketId);
+void PocketCalculateInitialCursorPosAndItemsAbove(u8 pocketId);
 void GoToBagMenu(u8 menuType, u8 pocket, MainCallback callback);
 
 #endif //GUARD_ITEM_MENU_H
diff --git a/include/item_menu_icons.h b/include/item_menu_icons.h
index b5b5c6b0b..fd66a9375 100644
--- a/include/item_menu_icons.h
+++ b/include/item_menu_icons.h
@@ -3,28 +3,26 @@
 
 #include "global.h"
 
-extern void * gUnknown_2039884;
-
-extern const struct CompressedSpriteSheet gUnknown_83D41E4;
-extern const struct CompressedSpriteSheet gUnknown_83D41EC;
-extern const struct CompressedSpritePalette gUnknown_83D41F4;
+extern const struct CompressedSpriteSheet gSpriteSheet_Backpack;
+extern const struct CompressedSpriteSheet gSpriteSheet_Satchel;
+extern const struct CompressedSpritePalette gSpritePalette_BagOrSatchel;
 
 extern const struct CompressedSpriteSheet gBagSwapSpriteSheet;
 extern const struct CompressedSpritePalette gBagSwapSpritePalette;
 
 void ResetItemMenuIconState(void);
-void sub_80985E4(void);
+void ItemMenuIcons_CreateInsertIndicatorBarHidden(void);
 void DestroyItemMenuIcon(bool8 a0);
 void CreateItemMenuIcon(u16 itemId, bool8 a0);
 void CopyItemIconPicTo4x4Buffer(const void *src, void *dest);
 u8 AddItemIconObject(u16 tilesTag, u16 paletteTag, u16 itemId);
 u8 AddItemIconObjectWithCustomObjectTemplate(const struct SpriteTemplate * origTemplate, u16 tilesTag, u16 paletteTag, u16 itemId);
 void sub_80989A0(u16 itemId, u8 idx);
-void sub_80986A8(s16 x, u16 y);
-void sub_8098660(u8);
+void ItemMenuIcons_MoveInsertIndicatorBar(s16 x, u16 y);
+void ItemMenuIcons_ToggleInsertIndicatorBarVisibility(bool8 invisible);
 void sub_8098528(u8);
 void sub_8098580(void);
-const void * sub_8098974(u16 itemId, u8 ptrId);
-void sub_80984FC(u8 animNum);
+const void * GetItemIconGfxPtr(u16 itemId, u8 ptrId);
+void CreateBagOrSatchelSprite(u8 animNum);
 
 #endif // GUARD_ITEM_MENU_ICONS
diff --git a/include/menu_helpers.h b/include/menu_helpers.h
index 90aeb95f6..d26f50483 100644
--- a/include/menu_helpers.h
+++ b/include/menu_helpers.h
@@ -20,7 +20,7 @@ bool8 sub_80BF748(void);
 bool8 MenuHelpers_LinkSomething(void);
 void SetVBlankHBlankCallbacksToNull(void);
 void ResetAllBgsCoordinatesAndBgCntRegs(void);
-u8 sub_80BF8E4(void);
+u8 GetDialogBoxFontId(void);
 bool8 AdjustQuantityAccordingToDPadInput(s16 *arg0, u16 arg1);
 void DisplayMessageAndContinueTask(u8 taskId, u8 windowId, u16 tileNum, u8 paletteNum, u8 fontId, u8 textSpeed, const u8 *string, void *taskFunc);
 void CreateYesNoMenuWithCallbacks(u8 taskId, const struct WindowTemplate *template, u8 fontId, u8 left, u8 top, u16 tileStart, u8 palette, const struct YesNoFuncTable *yesNo);
diff --git a/include/strings.h b/include/strings.h
index 852e88a5c..6241bd8a9 100644
--- a/include/strings.h
+++ b/include/strings.h
@@ -1038,6 +1038,9 @@ extern const u8 gText_SaveFailedScreen_CheckingBackupMemory[];
 extern const u8 gText_SaveFailedScreen_BackupMemoryDamaged[];
 extern const u8 gText_SaveFailedScreen_SaveCompleted[];
 
+// bag
+extern const u8 gText_DepositItem[];
+
 // item_menu
 extern const u8 gOtherText_Register[];
 extern const u8 gOtherText_Walk[];
diff --git a/include/teachy_tv.h b/include/teachy_tv.h
index 36bac6a67..3484f88c1 100644
--- a/include/teachy_tv.h
+++ b/include/teachy_tv.h
@@ -1,6 +1,16 @@
 #ifndef GUARD_TEACHY_TV_H
 #define GUARD_TEACHY_TV_H
 
+enum TeachyTvScript
+{
+    TTVSCR_BATTLE,
+    TTVSCR_STATUS,
+    TTVSCR_MATCHUPS,
+    TTVSCR_CATCHING,
+    TTVSCR_TMS,
+    TTVSCR_REGISTER
+};
+
 void InitTeachyTvController(u8 mode, void (*cb)());
 void CB2_ReturnToTeachyTV(void);
 void SetTeachyTvControllerModeToResume(void);
diff --git a/include/tm_case.h b/include/tm_case.h
index f77eae457..bb88fc4d1 100644
--- a/include/tm_case.h
+++ b/include/tm_case.h
@@ -1,6 +1,16 @@
 #ifndef GUARD_TM_CASE_H
 #define GUARD_TM_CASE_H
 
+enum TmCaseType
+{
+    TMCASE_FROMFIELD,
+    TMCASE_FROMPARTYGIVE,
+    TMCASE_FROMMARTSELL,
+    TMCASE_FROMPOKEMONSTORAGEPC,
+    TMCASE_FROMBATTLE,
+    TMCASE_NA
+};
+
 void InitTMCase(u8 a0, void (* a1)(void), u8 a2);
 void ResetTMCaseCursorPos(void);
 void PokeDude_InitTMCase(void);