2 files changed, 99 insertions, 31 deletions
diff --git a/src/data/battle_frontier/battle_frontier_exchange_corner.h b/src/data/battle_frontier/battle_frontier_exchange_corner.h
new file mode 100644
index 000000000..77d327b5a
--- /dev/null
+++ b/src/data/battle_frontier/battle_frontier_exchange_corner.h
@@ -0,0 +1,99 @@
+static const u16 sBFExchangeCorner_Decor1[] =
+{ 
+    DECOR_KISS_POSTER, 
+    DECOR_KISS_CUSHION, 
+    DECOR_SMOOCHUM_DOLL, 
+    DECOR_TOGEPI_DOLL, 
+    DECOR_MEOWTH_DOLL, 
+    DECOR_CLEFAIRY_DOLL, 
+    DECOR_DITTO_DOLL, 
+    DECOR_CYNDAQUIL_DOLL, 
+    DECOR_CHIKORITA_DOLL, 
+    DECOR_TOTODILE_DOLL, 
+    0xFFFF 
+};
+
+static const u16 sBFExchangeCorner_Decor2[] =
+{ 
+    DECOR_LAPRAS_DOLL, 
+    DECOR_SNORLAX_DOLL, 
+    DECOR_VENUSAUR_DOLL, 
+    DECOR_CHARIZARD_DOLL, 
+    DECOR_BLASTOISE_DOLL, 
+    0xFFFF 
+};
+
+static const u16 sBFExchangeCorner_Vitamins[] =
+{ 
+    ITEM_PROTEIN, 
+    ITEM_CALCIUM, 
+    ITEM_IRON, 
+    ITEM_ZINC, 
+    ITEM_CARBOS, 
+    ITEM_HP_UP, 
+    0xFFFF 
+};
+
+static const u16 sBFExchangeCorner_HoldItems[] =
+{ 
+    ITEM_LEFTOVERS, 
+    ITEM_WHITE_HERB, 
+    ITEM_QUICK_CLAW, 
+    ITEM_MENTAL_HERB, 
+    ITEM_BRIGHT_POWDER, 
+    ITEM_CHOICE_BAND, 
+    ITEM_KINGS_ROCK, 
+    ITEM_FOCUS_BAND, 
+    ITEM_SCOPE_LENS, 
+    0xFFFF 
+};
+
+static const u8 *const sBFExchangeCorner_Decor1Descriptions[] =
+{
+    BattleFrontier_BattlePointExchangeServiceCorner_Text_2601AA,
+    BattleFrontier_BattlePointExchangeServiceCorner_Text_2601D0,
+    BattleFrontier_BattlePointExchangeServiceCorner_Text_260201,
+    BattleFrontier_BattlePointExchangeServiceCorner_Text_26022F,
+    BattleFrontier_BattlePointExchangeServiceCorner_Text_26025B,
+    BattleFrontier_BattlePointExchangeServiceCorner_Text_260287,
+    BattleFrontier_BattlePointExchangeServiceCorner_Text_2602B5,
+    BattleFrontier_BattlePointExchangeServiceCorner_Text_2602E0,
+    BattleFrontier_BattlePointExchangeServiceCorner_Text_26030F,
+    BattleFrontier_BattlePointExchangeServiceCorner_Text_26033E,
+    gText_Exit,
+};
+
+static const u8 *const sBFExchangeCorner_Decor2Descriptions[] = 
+{
+    BattleFrontier_BattlePointExchangeServiceCorner_Text_26036C,
+    BattleFrontier_BattlePointExchangeServiceCorner_Text_26036C,
+    BattleFrontier_BattlePointExchangeServiceCorner_Text_26036C,
+    BattleFrontier_BattlePointExchangeServiceCorner_Text_26036C,
+    BattleFrontier_BattlePointExchangeServiceCorner_Text_26036C,
+    gText_Exit
+};
+
+static const u8 *const sBFExchangeCorner_VitaminsDescriptions[] = 
+{
+    BattleFrontier_BattlePointExchangeServiceCorner_Text_260397,
+    BattleFrontier_BattlePointExchangeServiceCorner_Text_2603BE,
+    BattleFrontier_BattlePointExchangeServiceCorner_Text_2603E6,
+    BattleFrontier_BattlePointExchangeServiceCorner_Text_26040E,
+    BattleFrontier_BattlePointExchangeServiceCorner_Text_260436,
+    BattleFrontier_BattlePointExchangeServiceCorner_Text_26045C,
+    gText_Exit
+};
+
+static const u8 *const sBFExchangeCorner_HoldItemsDescriptions[] = 
+{
+    BattleFrontier_BattlePointExchangeServiceCorner_Text_26047A,
+    BattleFrontier_BattlePointExchangeServiceCorner_Text_2604AC,
+    BattleFrontier_BattlePointExchangeServiceCorner_Text_2604D8,
+    BattleFrontier_BattlePointExchangeServiceCorner_Text_26050F,
+    BattleFrontier_BattlePointExchangeServiceCorner_Text_260542,
+    BattleFrontier_BattlePointExchangeServiceCorner_Text_260575,
+    BattleFrontier_BattlePointExchangeServiceCorner_Text_2605A8,
+    BattleFrontier_BattlePointExchangeServiceCorner_Text_2605E2,
+    BattleFrontier_BattlePointExchangeServiceCorner_Text_260613,
+    gText_Exit
+};
diff --git a/src/data/pokemon/tutor_learnsets.h b/src/data/pokemon/tutor_learnsets.h
index 0a930e993..ad9db319c 100644
--- a/src/data/pokemon/tutor_learnsets.h
+++ b/src/data/pokemon/tutor_learnsets.h
@@ -1,34 +1,3 @@
-#define TUTOR_MOVE_MEGA_PUNCH 0
-#define TUTOR_MOVE_SWORDS_DANCE 1
-#define TUTOR_MOVE_MEGA_KICK 2
-#define TUTOR_MOVE_BODY_SLAM 3
-#define TUTOR_MOVE_DOUBLE_EDGE 4
-#define TUTOR_MOVE_COUNTER 5
-#define TUTOR_MOVE_SEISMIC_TOSS 6
-#define TUTOR_MOVE_MIMIC 7
-#define TUTOR_MOVE_METRONOME 8
-#define TUTOR_MOVE_SOFT_BOILED 9
-#define TUTOR_MOVE_DREAM_EATER 10
-#define TUTOR_MOVE_THUNDER_WAVE 11
-#define TUTOR_MOVE_EXPLOSION 12
-#define TUTOR_MOVE_ROCK_SLIDE 13
-#define TUTOR_MOVE_SUBSTITUTE 14
-#define TUTOR_MOVE_DYNAMIC_PUNCH 15
-#define TUTOR_MOVE_ROLLOUT 16
-#define TUTOR_MOVE_PSYCH_UP 17
-#define TUTOR_MOVE_SNORE 18
-#define TUTOR_MOVE_ICY_WIND 19
-#define TUTOR_MOVE_ENDURE 20
-#define TUTOR_MOVE_MUD_SLAP 21
-#define TUTOR_MOVE_ICE_PUNCH 22
-#define TUTOR_MOVE_SWAGGER 23
-#define TUTOR_MOVE_SLEEP_TALK 24
-#define TUTOR_MOVE_SWIFT 25
-#define TUTOR_MOVE_DEFENSE_CURL 26
-#define TUTOR_MOVE_THUNDER_PUNCH 27
-#define TUTOR_MOVE_FIRE_PUNCH 28
-#define TUTOR_MOVE_FURY_CUTTER 29
-
 const u16 gTutorMoves[] =
 {
     [TUTOR_MOVE_MEGA_PUNCH] = MOVE_MEGA_PUNCH,