8 files changed, 12 insertions, 12 deletions
diff --git a/include/constants/flags.h b/include/constants/flags.h
index 7f4655d4e..b13be9d9a 100644
--- a/include/constants/flags.h
+++ b/include/constants/flags.h
@@ -1377,7 +1377,7 @@
 #define TRAINERS_FLAG_NO    0x356
 #define CODE_FLAGS          (FLAG_TRAINER_FLAG_START + TRAINERS_FLAG_NO + 0xA) // 0x860
 
-// TODO: Find what these are
+// TODO: These three are badge flags
 #define FLAG_UNK820         0x820
 #define FLAG_UNK824         0x824
 #define FLAG_UNK826         0x826
diff --git a/include/constants/global.h b/include/constants/global.h
index 3cac8d473..d7508c940 100644
--- a/include/constants/global.h
+++ b/include/constants/global.h
@@ -45,7 +45,7 @@ enum
 
 enum
 {
-    OPTIONS_BUTTON_MODE_NORMAL,
+    OPTIONS_BUTTON_MODE_HELP,
     OPTIONS_BUTTON_MODE_LR,
     OPTIONS_BUTTON_MODE_L_EQUALS_A
 };
diff --git a/include/constants/songs.h b/include/constants/songs.h
index 193a57756..3c0e72757 100644
--- a/include/constants/songs.h
+++ b/include/constants/songs.h
@@ -254,7 +254,7 @@
 #define SE_SHIP_HORN 249
 #define SE_HELP_OPEN 250
 #define SE_HELP_CLOSE 251
-#define SE_HELP_PAGE 252
+#define SE_HELP_ERR 252
 
 #define MUS_ME_ASA 256
 #define MUS_FANFA1 257
diff --git a/include/event_data.h b/include/event_data.h
index 036b0a325..7c62ac92b 100644
--- a/include/event_data.h
+++ b/include/event_data.h
@@ -32,7 +32,7 @@ u8 FlagSet(u16 id);
 u8 FlagClear(u16 id);
 bool8 FlagGet(u16 id);
 u16 * GetVarPointer(u16 id);
-bool32 sub_806E2BC(void);
+bool32 Flag_0x839_IsSet(void);
 void sub_806E6FC(void);
 void sub_806E2D0(void);
 void sub_806E370(void);
diff --git a/include/help_system.h b/include/help_system.h
index 3ba0cf475..f28c168f7 100644
--- a/include/help_system.h
+++ b/include/help_system.h
@@ -25,7 +25,7 @@ struct HelpSystemListMenu
 
 extern struct HelpSystemListMenu gHelpSystemListMenu;
 extern struct ListMenuItem gHelpSystemListMenuItems[];
-extern bool8 gUnknown_3005ECC;
+extern bool8 gHelpSystemEnabled;
 extern u8 gUnknown_203F175;
 
 // help_system_812B1E0
@@ -33,8 +33,8 @@ void sub_812B1E0(u8);
 void HelpSystem_SetSomeVariable2(u8);
 bool8 sub_812B40C(void);
 bool8 sub_812B45C(void);
-void sub_812B478(void);
-void sub_812B484(void);
+void HelpSystem_Disable(void);
+void HelpSystem_Enable(void);
 void sub_812B4B8(void);
 bool8 sub_812BB9C(struct HelpSystemListMenu * a0, struct ListMenuItem * a1);
 bool8 sub_812BC54(struct HelpSystemListMenu * a0, struct ListMenuItem * a1);
diff --git a/include/main_menu.h b/include/main_menu.h
index 2a0cd81d5..d8c2a5ab1 100644
--- a/include/main_menu.h
+++ b/include/main_menu.h
@@ -1,6 +1,6 @@
 #ifndef GUARD_MAIN_MENU_H
 #define GUARD_MAIN_MENU_H
 
-void sub_800C300(void);
+void CB2_InitMainMenu(void);
 
 #endif //GUARD_MAIN_MENU_H
diff --git a/include/strings.h b/include/strings.h
index 5a746fb6a..e7d40281d 100644
--- a/include/strings.h
+++ b/include/strings.h
@@ -357,9 +357,9 @@ extern const u8 gText_Player[];
 extern const u8 gText_Time[];
 extern const u8 gText_Colon[];
 extern const u8 gText_Pokedex[];
-extern const u8 gUnknown_841B6EB[];
-extern const u8 gUnknown_841B6EC[];
-extern const u8 gUnknown_841B6F3[];
+extern const u8 gTextJPDummy_Hiki[];
+extern const u8 gText_Badges[];
+extern const u8 gTextJPDummy_Ko[];
 extern const u8 gUnknown_841B6F4[];
 
 // mystery_gift_menu
diff --git a/include/text_window_graphics.h b/include/text_window_graphics.h
index 17e919705..e2b351de9 100644
--- a/include/text_window_graphics.h
+++ b/include/text_window_graphics.h
@@ -14,6 +14,6 @@ extern const u16 gUnknown_8471DEC[][16];
 
 extern const struct TextWindowGraphics gUserFrames[];
 
-const struct TextWindowGraphics * sub_8069788(u8 idx);
+const struct TextWindowGraphics * GetUserFrameGraphicsInfo(u8 idx);
 
 #endif //GUARD_TEXT_WINDOW_GRAPHICS_H