14 files changed, 151 insertions, 52 deletions
diff --git a/include/bag.h b/include/bag.h
index f82531778..fec9f67bf 100644
--- a/include/bag.h
+++ b/include/bag.h
@@ -1,18 +1,20 @@
 #ifndef GUARD_BAG_H
 #define GUARD_BAG_H
 
-void sub_810B858(void);
-void sub_810B8F0(u8 windowId, u8 fontId, const u8 * str, u8 x, u8 y, u8 letterSpacing, u8 lineSpacing, s8 speed, u8 colorIdx);
-void sub_810B958(const u8 * str);
-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);
+#include "menu_helpers.h"
+
+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/battle_controllers.h b/include/battle_controllers.h
index 06a0e2957..412856353 100644
--- a/include/battle_controllers.h
+++ b/include/battle_controllers.h
@@ -2,6 +2,7 @@
 #define GUARD_BATTLE_CONTROLLERS_H
 
 #include "global.h"
+#include "battle.h"
 
 enum
 {
diff --git a/include/constants/item_menu.h b/include/constants/item_menu.h
new file mode 100644
index 000000000..d173b9212
--- /dev/null
+++ b/include/constants/item_menu.h
@@ -0,0 +1,35 @@
+#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_OLD_MAN          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
+#define ITEMMENUACTION_GIVE          3
+#define ITEMMENUACTION_CANCEL        4
+#define ITEMMENUACTION_BATTLE_USE    5
+#define ITEMMENUACTION_CHECK         6
+#define ITEMMENUACTION_OPEN          7
+#define ITEMMENUACTION_OPEN_BERRIES  8
+#define ITEMMENUACTION_WALK          9
+#define ITEMMENUACTION_DESELECT     10
+#define ITEMMENUACTION_DUMMY        11
+
+#endif //GUARD_CONSTANTS_ITEM_MENU_H
diff --git a/include/data.h b/include/data.h
index 72e6b66fc..f308b044c 100644
--- a/include/data.h
+++ b/include/data.h
@@ -57,7 +57,7 @@ extern const struct SpriteFrameImage gUnknown_82346D8[];
 extern const struct SpriteFrameImage gUnknown_82346F8[];
 extern const struct SpriteFrameImage gTrainerBackPicTable_Red[];
 extern const struct SpriteFrameImage gTrainerBackPicTable_Leaf[];
-extern const struct SpriteFrameImage gTrainerBackPicTable_PokeDude[];
+extern const struct SpriteFrameImage gTrainerBackPicTable_Pokedude[];
 extern const struct SpriteFrameImage gTrainerBackPicTable_OldMan[];
 extern const struct SpriteFrameImage gTrainerBackPicTable_RSBrendan[];
 extern const struct SpriteFrameImage gTrainerBackPicTable_RSMay[];
diff --git a/include/event_scripts.h b/include/event_scripts.h
index b5e355484..a597868b9 100644
--- a/include/event_scripts.h
+++ b/include/event_scripts.h
@@ -1195,4 +1195,6 @@ extern const u8 Text_1A5D31[];
 extern const u8 Text_1A5D6E[];
 extern const u8 Text_1A5DB1[];
 
+extern const u8 EventScript_BagItemCanBeRegistered[];
+
 #endif //GUARD_EVENT_SCRIPTS_H
diff --git a/include/gflib.h b/include/gflib.h
new file mode 100644
index 000000000..a6dfc62df
--- /dev/null
+++ b/include/gflib.h
@@ -0,0 +1,18 @@
+#ifndef GUARD_GFLIB_H
+#define GUARD_GFLIB_H
+
+#include "global.h"
+
+#include "bg.h"
+#include "palette.h"
+#include "gpu_regs.h"
+#include "dma3.h"
+#include "malloc.h"
+#include "sound.h"
+#include "text.h"
+#include "sprite.h"
+#include "window.h"
+#include "blit.h"
+#include "string_util.h"
+
+#endif //GUARD_GFLIB_H
diff --git a/include/graphics.h b/include/graphics.h
index a668364bd..e87acb556 100644
--- a/include/graphics.h
+++ b/include/graphics.h
@@ -1,7 +1,3 @@
-//
-// Created by scott on 10/21/2017.
-//
-
 #ifndef GUARD_GRAPHICS_H
 #define GUARD_GRAPHICS_H
 
@@ -2656,7 +2652,7 @@ extern const u32 gTrainerPalette_RSBrendan1[];
 extern const u32 gTrainerPalette_RSMay1[];
 extern const u32 gTrainerPalette_LeafBackPic[];
 extern const u32 gTrainerPalette_RedBackPic[];
-extern const u32 gTrainerPalette_PokeDudeBackPic[];
+extern const u32 gTrainerPalette_PokedudeBackPic[];
 extern const u32 gTrainerPalette_OldManBackPic[];
 extern const u32 gTrainerPalette_PokemonBreederM[];
 extern const u32 gTrainerPalette_RSPokemonBreederF[];
@@ -4358,7 +4354,7 @@ extern const u8 gBerryPouchBg1Tilemap[];
 
 extern const u8 gTrainerBackPic_Red[];
 extern const u8 gTrainerBackPic_Leaf[];
-extern const u8 gTrainerBackPic_PokeDude[];
+extern const u8 gTrainerBackPic_Pokedude[];
 extern const u8 gTrainerBackPic_OldMan[];
 extern const u8 gTrainerBackPic_RSBrendan[];
 extern const u8 gTrainerBackPic_RSMay[];
@@ -4861,4 +4857,11 @@ extern const u16 gBattleInterface_BallStatusBarPal[];
 extern const u16 gBattleInterface_BallDisplayPal[];
 extern const u16 gUnknown_8D12404[];
 
+// item_menu
+extern const u32 gUnknown_8E830CC[];
+extern const u32 gUnknown_8E832C0[];
+extern const u32 gUnknown_8E83444[];
+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 187674e83..27bd73e72 100644
--- a/include/item_menu.h
+++ b/include/item_menu.h
@@ -3,6 +3,7 @@
 
 #include "global.h"
 #include "task.h"
+#include "constants/item_menu.h"
 
 // Exported type declarations
 
@@ -10,15 +11,15 @@
 
 struct BagStruct
 {
-    void (*bagCallback)(void);
+    MainCallback bagCallback;
     u8 location;
-    u8 pocket;
-    u16 unk6;
-    u8 cursorPosition[6];
-    u8 scrollPosition[6];
+    bool8 bagOpen;
+    u16 pocket;
+    u16 itemsAbove[3];
+    u16 cursorPos[3];
 };
 
-extern struct BagStruct gUnknown_203ACFC;
+extern struct BagStruct gBagMenuState;
 
 extern u16 gSpecialVar_ItemId;
 
@@ -26,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 ItemMenu_MoveItemSlotToNewPositionInArray(struct ItemSlot * slots, int pos1, int pos2);
+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 bgId, const u8 * string, TaskFunc followUpFunc);
-void sub_810A1F8(u8 taskId);
-void sub_8107ECC(void);
-void sub_810AF74(void);
-void sub_8108DC8(u8 pocketId);
-void sub_81089F4(u8 pocketId);
+void DisplayItemMessageInBag(u8 taskId, u8 fontId, const u8 * string, TaskFunc followUpFunc);
+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/map_name_popup.h b/include/map_name_popup.h
index c8ce02c30..a7c1234c6 100644
--- a/include/map_name_popup.h
+++ b/include/map_name_popup.h
@@ -4,5 +4,6 @@
 #include "global.h"
 
 void CreateMapNamePopupIfNotAlreadyRunning(bool32 palIntoFadedBuffer);
+void DismissMapNamePopup(void);
 
 #endif //GUARD_MAP_NAME_POPUP_H
diff --git a/include/menu_helpers.h b/include/menu_helpers.h
index 1e75b336c..d26f50483 100644
--- a/include/menu_helpers.h
+++ b/include/menu_helpers.h
@@ -20,14 +20,14 @@ 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);
 u8 GetLRKeysState(void);
 u8 GetLRKeysPressedAndHeld(void);
 bool8 itemid_link_can_give_berry(u16 itemId);
-bool8 itemid_80BF6D8_mail_related(u16 itemId);
+bool8 CanWriteMailHere(u16 itemId);
 void ResetVramOamAndBgCntRegs(void);
 
 #endif //GUARD_MENU_HELPERS_H
diff --git a/include/strings.h b/include/strings.h
index eace8d67e..7e8a4fbb4 100644
--- a/include/strings.h
+++ b/include/strings.h
@@ -112,8 +112,8 @@ extern const u8 gText_OhNoICantBuyThat[];
 extern const u8 gText_HowManyWouldYouLikeToSell[];
 extern const u8 gText_ICanPayThisMuch_WouldThatBeOkay[];
 extern const u8 gText_TurnedOverItemsWorthYen[];
-extern const u8 gPokeDudeText_TMTypes[];
-extern const u8 gPokeDudeText_ReadTMDescription[];
+extern const u8 gPokedudeText_TMTypes[];
+extern const u8 gPokedudeText_ReadTMDescription[];
 extern const u8 gFameCheckerText_Cancel[];
 extern const u8 gFameCheckerText_ListMenuCursor[];
 extern const u8 gFameCheckerText_FameCheckerWillBeClosed[];
@@ -134,7 +134,7 @@ extern const u8 gTeachyTvString_CatchPkmn[];
 extern const u8 gTeachyTvString_AboutTMs[];
 extern const u8 gTeachyTvString_RegisterItem[];
 extern const u8 gTeachyTvString_Cancel[];
-extern const u8 gTeachyTvText_PokeDudeSaysHello[];
+extern const u8 gTeachyTvText_PokedudeSaysHello[];
 extern const u8 gTeachyTvText_BattleScript1[];
 extern const u8 gTeachyTvText_StatusScript1[];
 extern const u8 gTeachyTvText_MatchupsScript1[];
@@ -1038,4 +1038,22 @@ 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[];
+extern const u8 gOtherText_Check[];
+extern const u8 gOtherText_Open[];
+extern const u8 gOtherText_Deselect[];
+extern const u8 gText_Items2[];
+extern const u8 gText_PokeBalls2[];
+extern const u8 gText_KeyItems2[];
+extern const u8 gText_CloseBag[];
+extern const u8 gText_CantWriteMailHere[];
+extern const u8 gText_DepositHowManyStrVars1[];
+extern const u8 gText_DepositedStrVar2StrVar1s[];
+extern const u8 gText_NoRoomToStoreItems[];
+
 #endif //GUARD_STRINGS_H
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..22fb021e0 100644
--- a/include/tm_case.h
+++ b/include/tm_case.h
@@ -1,8 +1,18 @@
 #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);
+void Pokedude_InitTMCase(void);
 
 #endif //GUARD_TM_CASE_H