8 files changed, 30 insertions, 7 deletions
diff --git a/include/battle_tower.h b/include/battle_tower.h
index 0782725b6..ec00d1f96 100644
--- a/include/battle_tower.h
+++ b/include/battle_tower.h
@@ -5,6 +5,6 @@
 
 u16 sub_8164FCC(u8, u8);
 void sub_80E7524(u32 *);
-void sub_80E7490(void);
+void ValidateEReaderTrainer(void);
 
 #endif //GUARD_BATTLE_TOWER_H
diff --git a/include/constants/vars.h b/include/constants/vars.h
index 6dc8d0ccd..c9340a3b4 100644
--- a/include/constants/vars.h
+++ b/include/constants/vars.h
@@ -51,12 +51,12 @@
 #define VAR_0x402D                 0x402D
 #define VAR_0x402E                 0x402E
 
-#define VAR_FRONTIER_MANIAC_FACILITY 0x402F
+#define VAR_0x402F                 0x402F
 
-#define VAR_FRONTIER_GAMBLER_FACILITY       0x4030
-#define VAR_FRONTIER_GAMBLER_SET_FACILITY_F 0x4031
-#define VAR_FRONTIER_GAMBLER_AMOUNT_BET     0x4032
-#define VAR_FRONTIER_GAMBLER_PLACED_BET_F   0x4033
+#define VAR_0x4030                 0x4030
+#define VAR_0x4031                 0x4031
+#define VAR_0x4032                 0x4032
+#define VAR_ENIGMA_BERRY_AVAILABLE 0x4033
 
 #define VAR_0x4034                 0x4034
 #define VAR_0x4035                 0x4035
diff --git a/include/easy_chat.h b/include/easy_chat.h
index 78e371cbb..bd5c9a026 100644
--- a/include/easy_chat.h
+++ b/include/easy_chat.h
@@ -38,5 +38,6 @@ void InitializeEasyChatWordArray(u16 *words, u16 length);
 void ConvertEasyChatWordsToString(u8 *dest, const u16 *src, u16 length1, u16 length2);
 bool8 ECWord_CheckIfOutsideOfValidRange(u16 word);
 void sub_80BDE28(void);
+void EnableRareWord(u8);
 
 #endif // GUARD_EASYCHAT_H
diff --git a/include/global.berry.h b/include/global.berry.h
index 5c8a43a02..148bbc957 100644
--- a/include/global.berry.h
+++ b/include/global.berry.h
@@ -1,6 +1,7 @@
 #ifndef GUARD_GLOBAL_BERRY_H
 #define GUARD_GLOBAL_BERRY_H
 
+#define BERRY_NAME_LENGTH 6
 #define BERRY_NAME_COUNT 7
 #define BERRY_ITEM_EFFECT_COUNT 18
 
diff --git a/include/mail_data.h b/include/mail_data.h
index bbe695203..0275d8dc6 100644
--- a/include/mail_data.h
+++ b/include/mail_data.h
@@ -10,5 +10,6 @@
 // Exported ROM declarations
 
 u16 sub_80D45E8(u16, u16 *);
+bool8 itemid_is_mail(u16 itemId);
 
 #endif //GUARD_MAIL_DATA_H
diff --git a/include/mystery_event_msg.h b/include/mystery_event_msg.h
new file mode 100644
index 000000000..e96c3069b
--- /dev/null
+++ b/include/mystery_event_msg.h
@@ -0,0 +1,18 @@
+#ifndef GUARD_MYSTERY_EVENT_MSG_H
+#define GUARD_MYSTERY_EVENT_MSG_H
+
+#include <gba/gba.h>
+
+extern const u8 gText_MysteryGiftBerry[];
+extern const u8 gText_MysteryGiftBerryTransform[];
+extern const u8 gText_MysteryGiftBerryObtained[];
+extern const u8 gText_MysteryGiftSpecialRibbon[];
+extern const u8 gText_MysteryGiftNationalDex[];
+extern const u8 gText_MysteryGiftRareWord[];
+extern const u8 gText_MysteryGiftSentOver[];
+extern const u8 gText_MysteryGiftFullParty[];
+extern const u8 gText_MysteryGiftNewTrainer[];
+extern const u8 gText_MysteryGiftNewAdversaryInBattleTower[];
+extern const u8 gText_MysteryGiftCantBeUsed[];
+
+#endif // GUARD_MYSTERY_EVENT_MSG_H
diff --git a/include/mystery_event_script.h b/include/mystery_event_script.h
index 8f90ccf53..be64663ed 100644
--- a/include/mystery_event_script.h
+++ b/include/mystery_event_script.h
@@ -7,7 +7,7 @@ u32 RunMysteryEventScript(u8 *);
 void SetMysteryEventScriptStatus(u32 val);
 u16 GetRecordMixingGift(void);
 
-void sub_80DA89C(void *);
+void sub_80DA89C(u8 *);
 bool32 sub_80DA8B0(u32 *);
 
 #endif // GUARD_MYSTERY_EVENT_SCRIPT_H
diff --git a/include/strings.h b/include/strings.h
index 90c84c9b9..40021a01d 100644
--- a/include/strings.h
+++ b/include/strings.h
@@ -89,5 +89,7 @@ extern const u8 gText_Cancel4[];
 extern const u8 gText_IsThisTheCorrectTime[];
 extern const u8 gText_PkmnFainted3[];
 extern const u8 gText_Coins[];
+extern const u8 gText_EggNickname[];
+extern const u8 gText_Pokemon[];
 
 #endif //GUARD_STRINGS_H