3 files changed, 51 insertions, 7 deletions
diff --git a/include/constants/help_system.h b/include/constants/help_system.h
new file mode 100644
index 000000000..b74183370
--- /dev/null
+++ b/include/constants/help_system.h
@@ -0,0 +1,42 @@
+#ifndef GUARD_CONSTANTS_HELP_SYSTEM_H
+#define GUARD_CONSTANTS_HELP_SYSTEM_H
+
+#define HELPCONTEXT_NONE 0
+#define HELPCONTEXT_TITLE_SCREEN 1
+#define HELPCONTEXT_NEW_GAME 2
+#define HELPCONTEXT_NAMING_SCREEN 3
+#define HELPCONTEXT_POKEDEX 4
+#define HELPCONTEXT_PARTY_MENU 5
+#define HELPCONTEXT_POKEMON_INFO 6
+#define HELPCONTEXT_POKEMON_SKILLS 7
+#define HELPCONTEXT_POKEMON_MOVES 8
+#define HELPCONTEXT_BAG 9
+#define HELPCONTEXT_TRAINER_CARD_FRONT 10
+#define HELPCONTEXT_TRAINER_CARD_BACK 11
+#define HELPCONTEXT_SAVE 12
+#define HELPCONTEXT_OPTIONS 13
+#define HELPCONTEXT_PLAYERS_HOUSE 14
+#define HELPCONTEXT_OAKS_LAB 15
+#define HELPCONTEXT_POKECENTER 16
+#define HELPCONTEXT_MART 17
+#define HELPCONTEXT_GYM 18
+#define HELPCONTEXT_INDOORS 19
+#define HELPCONTEXT_OVERWORLD 20
+#define HELPCONTEXT_DUNGEON 21 // Caves and Forests
+#define HELPCONTEXT_SURFING 22
+#define HELPCONTEXT_WILD_BATTLE 23
+#define HELPCONTEXT_TRAINER_BATTLE_SINGLE 24
+#define HELPCONTEXT_TRAINER_BATTLE_DOUBLE 25
+#define HELPCONTEXT_SAFARI_BATTLE 26
+#define HELPCONTEXT_PC 27
+#define HELPCONTEXT_BILLS_PC 28
+#define HELPCONTEXT_PLAYERS_PC_ITEMS 29
+#define HELPCONTEXT_PLAYERS_PC_MAILBOX 30
+#define HELPCONTEXT_PC_MISC 31 // Prof Oaks PC and the HoF PC
+#define HELPCONTEXT_BEDROOM_PC 32
+#define HELPCONTEXT_BEDROOM_PC_ITEMS 33
+#define HELPCONTEXT_BEDROOM_PC_MAILBOX 34
+#define HELPCONTEXT_UNUSED 35
+#define HELPCONTEXT_COUNT  36
+
+#endif //GUARD_CONSTANTS_HELP_SYSTEM_H
+\ No newline at end of file
diff --git a/include/help_system.h b/include/help_system.h
index c5ae5e5fa..8a078f3bc 100644
--- a/include/help_system.h
+++ b/include/help_system.h
@@ -4,6 +4,7 @@
 #include "global.h"
 #include "list_menu.h"
 #include "blit.h"
+#include "constants/help_system.h"
 
 struct HelpSystemListMenu_sub
 {
@@ -29,9 +30,10 @@ extern bool8 gHelpSystemEnabled;
 extern bool8 gHelpSystemToggleWithRButtonDisabled;
 
 // help_system_812B1E0
-void HelpSystem_SetSomeVariable(u8);
-void HelpSystem_SetSomeVariable2(u8);
-bool8 sub_812B40C(void);
+void SetHelpContextDontCheckBattle(u8);
+void SetHelpContextForMap(void);
+void SetHelpContext(u8);
+bool8 HelpSystem_UpdateHasntSeenIntro(void);
 bool8 sub_812B45C(void);
 void HelpSystem_Disable(void);
 void HelpSystem_Enable(void);
@@ -44,7 +46,7 @@ bool8 HelpSystemSubroutine_MenuInputHandlerMain(struct HelpSystemListMenu * help
 bool8 HelpMenuSubroutine_InitSubmenu(struct HelpSystemListMenu * helpListMenu, struct ListMenuItem * listMenuItemsBuffer);
 bool8 HelpMenuSubroutine_ReturnFromSubmenu(struct HelpSystemListMenu * helpListMenu, struct ListMenuItem * listMenuItemsBuffer);
 bool8 HelpMenuSubroutine_SubmenuInputHandler(struct HelpSystemListMenu * helpListMenu, struct ListMenuItem * listMenuItemsBuffer);
-void sub_812BDEC(void);
+void HelpSystem_PrintTopicLabel(void);
 bool8 HelpMenuSubroutine_HelpItemPrint(struct HelpSystemListMenu * helpListMenu, struct ListMenuItem * listMenuItemsBuffer);
 bool8 HelpMenuSubroutine_ReturnFromHelpItem(struct HelpSystemListMenu * helpListMenu, struct ListMenuItem * listMenuItemsBuffer);
 bool8 HelpMenuSubroutine_HelpItemWaitButton(struct HelpSystemListMenu * helpListMenu, struct ListMenuItem * listMenuItemsBuffer);
@@ -89,8 +91,8 @@ void HelpSystem_FillPanel3(void);
 void PrintListMenuItems(void);
 void PlaceListMenuCursor(void);
 bool8 MoveCursor(u8 by, u8 dirn);
-void HelpSystem_BackupSomeVariable(void);
-void HelpSystem_RestoreSomeVariable(void);
+void BackupHelpContext(void);
+void RestoreHelpContext(void);
 void HelpSystemRenderText(u8 font, u8 * dest, const u8 * src, u8 x, u8 y, u8 width, u8 height);
 void HelpSystem_DisableToggleWithRButton(void);
 
diff --git a/include/player_pc.h b/include/player_pc.h
index f62835911..84cf2327c 100644
--- a/include/player_pc.h
+++ b/include/player_pc.h
@@ -13,7 +13,7 @@ struct PlayerPCItemPageStruct
     u8 pageItems;
     u8 count;
     u8 filler_6[3];
-    u8 unk_9;
+    bool8 notInRoom;
     u8 scrollIndicatorId;
     u8 filler_B[5];
 };