5 files changed, 87 insertions, 5 deletions
diff --git a/include/constants/battle_frontier.h b/include/constants/battle_frontier.h
index 1224c0f31..9675615de 100644
--- a/include/constants/battle_frontier.h
+++ b/include/constants/battle_frontier.h
@@ -1,6 +1,8 @@
 #ifndef GUARD_CONSTANTS_BATTLE_FRONTIER_H
 #define GUARD_CONSTANTS_BATTLE_FRONTIER_H
 
+#define FRONTIER_CHALLENGE(facility, mode) ((facility << 8) + mode)
+
 // Battle Frontier facility ids.
 #define FRONTIER_FACILITY_TOWER 0
 #define FRONTIER_FACILITY_DOME 1
@@ -41,6 +43,8 @@
 #define SPECIAL_BATTLE_PIKE_DOUBLE 9
 #define SPECIAL_BATTLE_PYRAMID 10
 
+#define MAX_BATTLE_FRONTIER_POINTS 9999
+
 // For 'ShowFacilityResultsWindow' function which is a part of the 'CallFrontierUtilFunc' special.
 #define RESULTS_LINK_CONTEST 7
 
diff --git a/include/constants/field_specials.h b/include/constants/field_specials.h
new file mode 100644
index 000000000..73d3fb272
--- /dev/null
+++ b/include/constants/field_specials.h
@@ -0,0 +1,44 @@
+#ifndef GUARD_CONSTANTS_FIELD_SPECIALS_H
+#define GUARD_CONSTANTS_FIELD_SPECIALS_H
+
+// PC Locations
+#define PC_LOCATION_OTHER           0
+#define PC_LOCATION_BRENDANS_HOUSE  1
+#define PC_LOCATION_MAYS_HOUSE      2
+
+// Scrollable Multichoice Menus
+#define SCROLL_MULTI_NONE                                  0
+#define SCROLL_MULTI_GLASS_WORKSHOP_VENDOR                 1
+#define SCROLL_MULTI_POKEMON_FAN_CLUB_RATER                2
+#define SCROLL_MULTI_BF_EXCHANGE_CORNER_DECOR_VENDOR_1     3
+#define SCROLL_MULTI_BF_EXCHANGE_CORNER_DECOR_VENDOR_2     4
+#define SCROLL_MULTI_BF_EXCHANGE_CORNER_VITAMIN_VENDOR     5
+#define SCROLL_MULTI_BF_EXCHANGE_CORNER_HOLD_ITEM_VENDOR   6
+#define SCROLL_MULTI_BERRY_POWDER_VENDOR                   7
+#define SCROLL_MULTI_BF_RECEPTIONIST                       8
+#define SCROLL_MULTI_BF_MOVE_TUTOR_1                       9
+#define SCROLL_MULTI_BF_MOVE_TUTOR_2                      10
+#define SCROLL_MULTI_SS_TIDAL_DESTINATION                 11
+#define SCROLL_MULTI_BATTLE_TENT_RULES                    12
+
+#define MAX_SCROLL_MULTI_LENGTH 16
+
+// Dept Store Floor Numbers
+#define DEPT_STORE_FLOORNUM_B4F       0
+#define DEPT_STORE_FLOORNUM_B3F       1
+#define DEPT_STORE_FLOORNUM_B2F       2
+#define DEPT_STORE_FLOORNUM_B1F       3
+#define DEPT_STORE_FLOORNUM_1F        4
+#define DEPT_STORE_FLOORNUM_2F        5
+#define DEPT_STORE_FLOORNUM_3F        6
+#define DEPT_STORE_FLOORNUM_4F        7
+#define DEPT_STORE_FLOORNUM_5F        8
+#define DEPT_STORE_FLOORNUM_6F        9
+#define DEPT_STORE_FLOORNUM_7F       10
+#define DEPT_STORE_FLOORNUM_8F       11
+#define DEPT_STORE_FLOORNUM_9F       12
+#define DEPT_STORE_FLOORNUM_10F      13
+#define DEPT_STORE_FLOORNUM_11F      14
+#define DEPT_STORE_FLOORNUM_ROOFTOP  15
+
+#endif // GUARD_CONSTANTS_FIELD_SPECIALS_H
diff --git a/include/field_specials.h b/include/field_specials.h
index b1a50c811..b9babe4f9 100644
--- a/include/field_specials.h
+++ b/include/field_specials.h
@@ -19,15 +19,15 @@ bool32 ShouldDoRoxanneCall(void);
 bool32 ShouldDoRivalRayquazaCall(void);
 bool32 CountSSTidalStep(u16 delta);
 u8 GetSSTidalLocation(s8 *mapGroup, s8 *mapNum, s16 *x, s16 *y);
-void sub_813A128(void);
+void ShowScrollableMultichoice(void);
 void sub_813A878(u8 a0);
 u8 sub_813BADC(u8 a0);
-bool8 sub_813B9C0(void);
+bool8 InPokemonCenter(void);
 void SetShoalItemFlag(u16 v0);
 void UpdateFrontierManiac(u16 a0);
 void UpdateFrontierGambler(u16 a0);
 void ResetCyclingRoadChallengeData(void);
-bool8 warp0_in_pokecenter(void);
+bool8 UsedPokemonCenterWarp(void);
 void ResetFanClub(void);
 bool8 sub_813B21C(void);
 void set_unknown_box_id(u8 id);
diff --git a/include/global.tv.h b/include/global.tv.h
index abb01d471..1cef057ae 100644
--- a/include/global.tv.h
+++ b/include/global.tv.h
@@ -4,8 +4,7 @@
 enum
 {
     TVSHOW_OFF_AIR,
-
-    TVSHOW_FAN_CLUB_LETTER = 1,
+    TVSHOW_FAN_CLUB_LETTER,
     TVSHOW_RECENT_HAPPENINGS,
     TVSHOW_PKMN_FAN_CLUB_OPINIONS,
     TVSHOW_UNKN_SHOWTYPE_04,
diff --git a/include/party_menu.h b/include/party_menu.h
index c9843e484..d76e50788 100644
--- a/include/party_menu.h
+++ b/include/party_menu.h
@@ -26,6 +26,41 @@ enum
     PARTY_GIVE_ITEM,
 };
 
+enum
+{
+    TUTOR_MOVE_MEGA_PUNCH,
+    TUTOR_MOVE_SWORDS_DANCE,
+    TUTOR_MOVE_MEGA_KICK,
+    TUTOR_MOVE_BODY_SLAM,
+    TUTOR_MOVE_DOUBLE_EDGE,
+    TUTOR_MOVE_COUNTER,
+    TUTOR_MOVE_SEISMIC_TOSS,
+    TUTOR_MOVE_MIMIC,
+    TUTOR_MOVE_METRONOME,
+    TUTOR_MOVE_SOFT_BOILED,
+    TUTOR_MOVE_DREAM_EATER,
+    TUTOR_MOVE_THUNDER_WAVE,
+    TUTOR_MOVE_EXPLOSION,
+    TUTOR_MOVE_ROCK_SLIDE,
+    TUTOR_MOVE_SUBSTITUTE,
+    TUTOR_MOVE_DYNAMIC_PUNCH,
+    TUTOR_MOVE_ROLLOUT,
+    TUTOR_MOVE_PSYCH_UP,
+    TUTOR_MOVE_SNORE,
+    TUTOR_MOVE_ICY_WIND,
+    TUTOR_MOVE_ENDURE,
+    TUTOR_MOVE_MUD_SLAP,
+    TUTOR_MOVE_ICE_PUNCH,
+    TUTOR_MOVE_SWAGGER,
+    TUTOR_MOVE_SLEEP_TALK,
+    TUTOR_MOVE_SWIFT,
+    TUTOR_MOVE_DEFENSE_CURL,
+    TUTOR_MOVE_THUNDER_PUNCH,
+    TUTOR_MOVE_FIRE_PUNCH,
+    TUTOR_MOVE_FURY_CUTTER,
+    TUTOR_MOVE_COUNT
+};
+
 struct Struct203CEC8
 {
     MainCallback exitCallback;