Removed trailing spaces in the most relevant files

Command used for the job:
egrep -rl ' $' --include *.c --include *.h --include  *.s --include  *.inc --include  *.txt *  | xargs sed -i 's/\s\+$//g'

Credits to Grant Murphy from Stack Overflow.

5 files changed, 804 insertions, 804 deletions

diff --git a/src/data/battle_frontier/apprentice.h b/src/data/battle_frontier/apprentice.h
index 144129743..c190ea09b 100644
--- a/src/data/battle_frontier/apprentice.h
+++ b/src/data/battle_frontier/apprentice.h
@@ -934,18 +934,18 @@ static const bool8 sValidApprenticeMoves[MOVES_COUNT] =
 // WHICH_MOVE has max 5 occurrences, defined as NUM_WHICH_MOVE_QUESTIONS
 // WHICH_FIRST has max 1 occurrence, lead mon should only be chosen once
 // WHICH_SPEECH has max 1 occurrence, as the apprentice leaves after its asked
-static const u8 sQuestionPossibilities[MAX_APPRENTICE_QUESTIONS] = 
+static const u8 sQuestionPossibilities[MAX_APPRENTICE_QUESTIONS] =
 {
     QUESTION_ID_WHAT_ITEM,
-    QUESTION_ID_WHAT_ITEM, 
-    QUESTION_ID_WHAT_ITEM, 
+    QUESTION_ID_WHAT_ITEM,
+    QUESTION_ID_WHAT_ITEM,
+    QUESTION_ID_WHICH_MOVE,
+    QUESTION_ID_WHICH_MOVE,
+    QUESTION_ID_WHICH_MOVE,
+    QUESTION_ID_WHICH_MOVE,
     QUESTION_ID_WHICH_MOVE,
-    QUESTION_ID_WHICH_MOVE, 
-    QUESTION_ID_WHICH_MOVE, 
-    QUESTION_ID_WHICH_MOVE, 
-    QUESTION_ID_WHICH_MOVE, 
-    QUESTION_ID_WHICH_FIRST, 
-    QUESTION_ID_WIN_SPEECH 
+    QUESTION_ID_WHICH_FIRST,
+    QUESTION_ID_WIN_SPEECH
 };
 
 static void (* const sApprenticeFunctions[])(void) =
diff --git a/src/data/battle_frontier/battle_frontier_exchange_corner.h b/src/data/battle_frontier/battle_frontier_exchange_corner.h
index d29dbdc44..426285e92 100644
--- a/src/data/battle_frontier/battle_frontier_exchange_corner.h
+++ b/src/data/battle_frontier/battle_frontier_exchange_corner.h
@@ -1,51 +1,51 @@
 static const u16 sFrontierExchangeCorner_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 
+{
+    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 sFrontierExchangeCorner_Decor2[] =
-{ 
-    DECOR_LAPRAS_DOLL, 
-    DECOR_SNORLAX_DOLL, 
-    DECOR_VENUSAUR_DOLL, 
-    DECOR_CHARIZARD_DOLL, 
-    DECOR_BLASTOISE_DOLL, 
-    0xFFFF 
+{
+    DECOR_LAPRAS_DOLL,
+    DECOR_SNORLAX_DOLL,
+    DECOR_VENUSAUR_DOLL,
+    DECOR_CHARIZARD_DOLL,
+    DECOR_BLASTOISE_DOLL,
+    0xFFFF
 };
 
 static const u16 sFrontierExchangeCorner_Vitamins[] =
-{ 
-    ITEM_PROTEIN, 
-    ITEM_CALCIUM, 
-    ITEM_IRON, 
-    ITEM_ZINC, 
-    ITEM_CARBOS, 
-    ITEM_HP_UP, 
-    0xFFFF 
+{
+    ITEM_PROTEIN,
+    ITEM_CALCIUM,
+    ITEM_IRON,
+    ITEM_ZINC,
+    ITEM_CARBOS,
+    ITEM_HP_UP,
+    0xFFFF
 };
 
 static const u16 sFrontierExchangeCorner_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 
+{
+    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 sFrontierExchangeCorner_Decor1Descriptions[] =
@@ -63,7 +63,7 @@ static const u8 *const sFrontierExchangeCorner_Decor1Descriptions[] =
     gText_Exit,
 };
 
-static const u8 *const sFrontierExchangeCorner_Decor2Descriptions[] = 
+static const u8 *const sFrontierExchangeCorner_Decor2Descriptions[] =
 {
     BattleFrontier_ExchangeServiceCorner_Text_LargeDollDesc,
     BattleFrontier_ExchangeServiceCorner_Text_LargeDollDesc,
@@ -73,7 +73,7 @@ static const u8 *const sFrontierExchangeCorner_Decor2Descriptions[] =
     gText_Exit
 };
 
-static const u8 *const sFrontierExchangeCorner_VitaminsDescriptions[] = 
+static const u8 *const sFrontierExchangeCorner_VitaminsDescriptions[] =
 {
     BattleFrontier_ExchangeServiceCorner_Text_ProteinDesc,
     BattleFrontier_ExchangeServiceCorner_Text_CalciumDesc,
@@ -84,7 +84,7 @@ static const u8 *const sFrontierExchangeCorner_VitaminsDescriptions[] =
     gText_Exit
 };
 
-static const u8 *const sFrontierExchangeCorner_HoldItemsDescriptions[] = 
+static const u8 *const sFrontierExchangeCorner_HoldItemsDescriptions[] =
 {
     BattleFrontier_ExchangeServiceCorner_Text_LeftoversDesc,
     BattleFrontier_ExchangeServiceCorner_Text_WhiteHerbDesc,
diff --git a/src/data/battle_frontier/battle_frontier_trainer_mons.h b/src/data/battle_frontier/battle_frontier_trainer_mons.h
index 183964f2d..efd9ef84d 100644
--- a/src/data/battle_frontier/battle_frontier_trainer_mons.h
+++ b/src/data/battle_frontier/battle_frontier_trainer_mons.h
@@ -343,7 +343,7 @@
     FRONTIER_MON_SPINDA,        \
     FRONTIER_MON_CORSOLA,       \
     FRONTIER_MON_POLIWHIRL,     \
-    -1 
+    -1
 
 #define FRONTIER_MONS_POKEFAN_M_1 \
     FRONTIER_MON_SMOOCHUM,      \
@@ -532,7 +532,7 @@
     FRONTIER_MON_LEDIAN,        \
     FRONTIER_MON_ARIADOS,       \
     FRONTIER_MON_YANMA,         \
-    -1 
+    -1
 
 #define FRONTIER_MONS_BUG_MANIAC_1 \
     FRONTIER_MON_SHEDINJA,      \
@@ -565,7 +565,7 @@
     FRONTIER_MON_LEDIAN,        \
     FRONTIER_MON_ARIADOS,       \
     FRONTIER_MON_YANMA,         \
-    -1 
+    -1
 
 #define FRONTIER_MONS_FISHERMAN_1 \
     FRONTIER_MON_MAGIKARP,      \
@@ -612,7 +612,7 @@
     FRONTIER_MON_CORSOLA,       \
     FRONTIER_MON_MAWILE,        \
     FRONTIER_MON_ONIX,          \
-    -1 
+    -1
 
 #define FRONTIER_MONS_PARASOL_LADY_1 \
     FRONTIER_MON_SUNKERN,       \
@@ -697,7 +697,7 @@
     FRONTIER_MON_ELEKID,        \
     FRONTIER_MON_FLAAFFY,       \
     FRONTIER_MON_MAWILE,        \
-    -1 
+    -1
 
 #define FRONTIER_MONS_BIRD_KEEPER_1 \
     FRONTIER_MON_AZURILL,       \
@@ -769,7 +769,7 @@
     FRONTIER_MON_CORSOLA,       \
     FRONTIER_MON_POLIWHIRL,     \
     FRONTIER_MON_ONIX,          \
-    -1 
+    -1
 
 #define FRONTIER_MONS_HIKER_1   \
     FRONTIER_MON_TYROGUE,       \
@@ -799,7 +799,7 @@
     FRONTIER_MON_LOUDRED,       \
     FRONTIER_MON_NOSEPASS,      \
     FRONTIER_MON_ONIX,          \
-    -1 
+    -1
 
 #define FRONTIER_MONS_KINDLER_1 \
     FRONTIER_MON_SLUGMA,        \
@@ -823,7 +823,7 @@
     FRONTIER_MON_NOSEPASS,      \
     FRONTIER_MON_MAWILE,        \
     FRONTIER_MON_ONIX,          \
-    -1 
+    -1
 
 #define FRONTIER_MONS_RUNNING_TRIATHLETE_1 \
     FRONTIER_MON_AZURILL,       \
@@ -870,7 +870,7 @@
     FRONTIER_MON_LOUDRED,       \
     FRONTIER_MON_SPINDA,        \
     FRONTIER_MON_ONIX,          \
-    -1 
+    -1
 
 #define FRONTIER_MONS_SWIMMING_TRIATHLETE_1 \
     FRONTIER_MON_TYROGUE,       \
@@ -905,7 +905,7 @@
     FRONTIER_MON_SPINDA,        \
     FRONTIER_MON_CORSOLA,       \
     FRONTIER_MON_POLIWHIRL,     \
-    -1 
+    -1
 
 #define FRONTIER_MONS_CYCLING_TRIATHLETE_1 \
     FRONTIER_MON_PICHU,         \
@@ -937,7 +937,7 @@
     FRONTIER_MON_SPINDA,        \
     FRONTIER_MON_FLAAFFY,       \
     FRONTIER_MON_MAWILE,        \
-    -1 
+    -1
 
 #define FRONTIER_MONS_RUNNING_TRIATHLETE_2 \
     FRONTIER_MON_DELCATTY_1,    \
@@ -974,7 +974,7 @@
     FRONTIER_MON_STANTLER_1,    \
     FRONTIER_MON_PIDGEOT_1,     \
     FRONTIER_MON_SCYTHER_1,     \
-    -1 
+    -1
 
 #define FRONTIER_MONS_SWIMMING_TRIATHLETE_2 \
     FRONTIER_MON_WAILMER_1,     \
@@ -1008,7 +1008,7 @@
     FRONTIER_MON_POLIWRATH_1,   \
     FRONTIER_MON_POLITOED_1,    \
     FRONTIER_MON_CLOYSTER_1,    \
-    -1 
+    -1
 
 #define FRONTIER_MONS_CYCLING_TRIATHLETE_2 \
     FRONTIER_MON_DELCATTY_1,    \
@@ -1042,7 +1042,7 @@
     FRONTIER_MON_MAGNETON_1,    \
     FRONTIER_MON_STANTLER_1,    \
     FRONTIER_MON_PIDGEOT_1,     \
-    -1 
+    -1
 
 #define FRONTIER_MONS_BLACK_BELT_BATTLE_GIRL_1 \
     FRONTIER_MON_LICKITUNG_1,   \
@@ -1085,7 +1085,7 @@
     FRONTIER_MON_TORKOAL_1,     \
     FRONTIER_MON_CACTURNE_1,    \
     FRONTIER_MON_POLIWRATH_1,   \
-    -1 
+    -1
 
 #define FRONTIER_MONS_EXPERT_1A \
     FRONTIER_MON_DELCATTY_1,    \
@@ -1126,7 +1126,7 @@
     FRONTIER_MON_RATICATE_1,    \
     FRONTIER_MON_MASQUERAIN_1,  \
     FRONTIER_MON_FURRET_1,      \
-    -1 
+    -1
 
 #define FRONTIER_MONS_EXPERT_1B \
     FRONTIER_MON_DUNSPARCE_1,   \
@@ -1166,7 +1166,7 @@
     FRONTIER_MON_HITMONCHAN_1,  \
     FRONTIER_MON_GIRAFARIG_1,   \
     FRONTIER_MON_HITMONTOP_1,   \
-    -1 
+    -1
 
 #define FRONTIER_MONS_EXPERT_1C \
     FRONTIER_MON_BANETTE_1,     \
@@ -1199,7 +1199,7 @@
     FRONTIER_MON_PINSIR_1,      \
     FRONTIER_MON_POLITOED_1,    \
     FRONTIER_MON_CLOYSTER_1,    \
-    -1 
+    -1
 
 #define FRONTIER_MONS_PSYCHIC_1 \
     FRONTIER_MON_DELCATTY_2,    \
@@ -1235,7 +1235,7 @@
     FRONTIER_MON_CACTURNE_2,    \
     FRONTIER_MON_GOREBYSS_2,    \
     FRONTIER_MON_POLITOED_2,    \
-    -1 
+    -1
 
 #define FRONTIER_MONS_HEX_MANIAC_1 \
     FRONTIER_MON_SABLEYE_2,     \
@@ -1265,7 +1265,7 @@
     FRONTIER_MON_CRAWDAUNT_2,   \
     FRONTIER_MON_GRUMPIG_2,     \
     FRONTIER_MON_CACTURNE_2,    \
-    -1 
+    -1
 
 #define FRONTIER_MONS_POKEMANIAC_1 \
     FRONTIER_MON_LICKITUNG_2,   \
@@ -1299,7 +1299,7 @@
     FRONTIER_MON_MANTINE_2,     \
     FRONTIER_MON_SWALOT_2,      \
     FRONTIER_MON_TORKOAL_2,     \
-    -1 
+    -1
 
 #define FRONTIER_MONS_GENTLEMAN_1A \
     FRONTIER_MON_DELCATTY_2,    \
@@ -1340,7 +1340,7 @@
     FRONTIER_MON_RATICATE_2,    \
     FRONTIER_MON_MASQUERAIN_2,  \
     FRONTIER_MON_FURRET_2,      \
-    -1 
+    -1
 
 #define FRONTIER_MONS_GENTLEMAN_1B \
     FRONTIER_MON_DUNSPARCE_2,   \
@@ -1380,7 +1380,7 @@
     FRONTIER_MON_HITMONCHAN_2,  \
     FRONTIER_MON_GIRAFARIG_2,   \
     FRONTIER_MON_HITMONTOP_2,   \
-    -1 
+    -1
 
 #define FRONTIER_MONS_BUG_MANIAC_2 \
     FRONTIER_MON_LEDIAN,        \
@@ -1402,7 +1402,7 @@
     FRONTIER_MON_NINJASK_2,     \
     FRONTIER_MON_SCYTHER_2,     \
     FRONTIER_MON_PINSIR_2,      \
-    -1 
+    -1
 
 #define FRONTIER_MONS_RUIN_MANIAC_2 \
     FRONTIER_MON_GRAVELER_2,    \
@@ -1427,7 +1427,7 @@
     FRONTIER_MON_RELICANTH_2,   \
     FRONTIER_MON_OMASTAR_2,     \
     FRONTIER_MON_KABUTOPS_2,    \
-    -1 
+    -1
 
 #define FRONTIER_MONS_COLLECTOR_1 \
     FRONTIER_MON_BANETTE_2,     \
@@ -1460,7 +1460,7 @@
     FRONTIER_MON_PINSIR_2,      \
     FRONTIER_MON_POLITOED_2,    \
     FRONTIER_MON_CLOYSTER_2,    \
-    -1 
+    -1
 
 #define FRONTIER_MONS_PARASOL_LADY_2 \
     FRONTIER_MON_GLOOM_2,       \
@@ -1475,7 +1475,7 @@
     FRONTIER_MON_HUNTAIL_2,     \
     FRONTIER_MON_GOREBYSS_2,    \
     FRONTIER_MON_OMASTAR_2,     \
-    -1 
+    -1
 
 #define FRONTIER_MONS_BEAUTY_1  \
     FRONTIER_MON_DELCATTY_2,    \
@@ -1509,7 +1509,7 @@
     FRONTIER_MON_STANTLER_2,    \
     FRONTIER_MON_SWALOT_2,      \
     FRONTIER_MON_PIDGEOT_2,     \
-    -1 
+    -1
 
 #define FRONTIER_MONS_AROMA_LADY_2 \
     FRONTIER_MON_WEEPINBELL_2,  \
@@ -1530,7 +1530,7 @@
     FRONTIER_MON_GRUMPIG_2,     \
     FRONTIER_MON_CACTURNE_2,    \
     FRONTIER_MON_BELLOSSOM_2,   \
-    -1 
+    -1
 
 #define FRONTIER_MONS_COOLTRAINER_1A \
     FRONTIER_MON_DUGTRIO_1,     \
@@ -1566,7 +1566,7 @@
     FRONTIER_MON_GOLEM_1,       \
     FRONTIER_MON_RHYDON_1,      \
     FRONTIER_MON_ALAKAZAM_1,    \
-    -1 
+    -1
 
 #define FRONTIER_MONS_COOLTRAINER_1B \
     FRONTIER_MON_WEEZING_1,     \
@@ -1602,7 +1602,7 @@
     FRONTIER_MON_AERODACTYL_1,  \
     FRONTIER_MON_PORYGON2_1,    \
     FRONTIER_MON_GARDEVOIR_1,   \
-    -1 
+    -1
 
 #define FRONTIER_MONS_COOLTRAINER_1C \
     FRONTIER_MON_EXEGGUTOR_1,   \
@@ -1635,7 +1635,7 @@
     FRONTIER_MON_SALAMENCE_1,   \
     FRONTIER_MON_METAGROSS_1,   \
     FRONTIER_MON_SLAKING_1,     \
-    -1 
+    -1
 
 #define FRONTIER_MONS_PKMN_RANGER_1 \
     FRONTIER_MON_NINJASK_1,     \
@@ -1767,7 +1767,7 @@
     FRONTIER_MON_SALAMENCE_1,   \
     FRONTIER_MON_METAGROSS_1,   \
     FRONTIER_MON_SLAKING_1,     \
-    -1 
+    -1
 
 #define FRONTIER_MONS_PKMN_BREEDER_F_1 \
     FRONTIER_MON_DUGTRIO_1,     \
@@ -1818,7 +1818,7 @@
     FRONTIER_MON_ARMALDO_1,     \
     FRONTIER_MON_GOLDUCK_1,     \
     FRONTIER_MON_RAPIDASH_1,    \
-    -1 
+    -1
 
 // Odd, all the other Youngster/Lass trainers of this group have Dugtrio, but one does not
 #define FRONTIER_MONS_YOUNGSTER_LASS_2_NO_DUGTRIO \
@@ -1854,7 +1854,7 @@
     FRONTIER_MON_GOLEM_2,       \
     FRONTIER_MON_RHYDON_2,      \
     FRONTIER_MON_ALAKAZAM_2,    \
-    -1 
+    -1
 
 #define FRONTIER_MONS_YOUNGSTER_LASS_2 \
     FRONTIER_MON_DUGTRIO_2,            \
@@ -1927,7 +1927,7 @@
     FRONTIER_MON_SALAMENCE_2,   \
     FRONTIER_MON_METAGROSS_2,   \
     FRONTIER_MON_SLAKING_2,     \
-    -1 
+    -1
 
 #define FRONTIER_MONS_BUG_CATCHER_2 \
     FRONTIER_MON_NINJASK_2,     \
@@ -1953,7 +1953,7 @@
     FRONTIER_MON_VENUSAUR_2,    \
     FRONTIER_MON_MEGANIUM_2,    \
     FRONTIER_MON_SCEPTILE_2,    \
-    -1 
+    -1
 
 #define FRONTIER_MONS_NINJA_BOY_2 \
     FRONTIER_MON_PARASECT_2,    \
@@ -1988,7 +1988,7 @@
     FRONTIER_MON_VENUSAUR_2,    \
     FRONTIER_MON_ESPEON_2,      \
     FRONTIER_MON_CROBAT_2,      \
-    -1 
+    -1
 
 #define FRONTIER_MONS_TUBER_2   \
     FRONTIER_MON_QUAGSIRE_2,    \
@@ -2068,7 +2068,7 @@
     FRONTIER_MON_WAILORD_3,     \
     FRONTIER_MON_TENTACRUEL_3,  \
     FRONTIER_MON_STARMIE_3,     \
-    -1 
+    -1
 
 #define FRONTIER_MONS_RUIN_MANIAC_3 \
     FRONTIER_MON_DUGTRIO_3,     \
@@ -2093,7 +2093,7 @@
     FRONTIER_MON_AGGRON_3,      \
     FRONTIER_MON_SWAMPERT_3,    \
     FRONTIER_MON_METAGROSS_3,   \
-    -1 
+    -1
 
 #define FRONTIER_MONS_COLLECTOR_2 \
     FRONTIER_MON_DUGTRIO_3,     \
@@ -2144,7 +2144,7 @@
     FRONTIER_MON_ARMALDO_3,     \
     FRONTIER_MON_GOLDUCK_3,     \
     FRONTIER_MON_RAPIDASH_3,    \
-    -1 
+    -1
 
 #define FRONTIER_MONS_GUITARIST_2 \
     FRONTIER_MON_SABLEYE_2,     \
@@ -2162,7 +2162,7 @@
     FRONTIER_MON_HOUNDOOM_3,    \
     FRONTIER_MON_JOLTEON_3,     \
     FRONTIER_MON_UMBREON_3,     \
-    -1 
+    -1
 
 #define FRONTIER_MONS_BIRD_KEEPER_2 \
     FRONTIER_MON_MURKROW_2,     \
@@ -2234,7 +2234,7 @@
     FRONTIER_MON_AERODACTYL_3,  \
     FRONTIER_MON_AGGRON_3,      \
     FRONTIER_MON_BLAZIKEN_3,    \
-    -1 
+    -1
 
 #define FRONTIER_MONS_KINDLER_2 \
     FRONTIER_MON_GRANBULL_3,    \
@@ -2256,7 +2256,7 @@
     FRONTIER_MON_BLISSEY_3,     \
     FRONTIER_MON_ARCANINE_3,    \
     FRONTIER_MON_SLAKING_3,     \
-    -1 
+    -1
 
 #define FRONTIER_MONS_GENTLEMAN_2 \
     FRONTIER_MON_MUK_3,         \
@@ -2307,7 +2307,7 @@
     FRONTIER_MON_SALAMENCE_3,   \
     FRONTIER_MON_METAGROSS_3,   \
     FRONTIER_MON_SLAKING_3,     \
-    -1 
+    -1
 
 #define FRONTIER_MONS_YOUNGSTER_LASS_3 \
     FRONTIER_MON_DUGTRIO_4,     \
@@ -2343,7 +2343,7 @@
     FRONTIER_MON_GOLEM_4,       \
     FRONTIER_MON_RHYDON_4,      \
     FRONTIER_MON_ALAKAZAM_4,    \
-    -1 
+    -1
 
 #define FRONTIER_MONS_CAMPER_PICNICKER_2 \
     FRONTIER_MON_WEEZING_4,     \
@@ -2417,7 +2417,7 @@
     FRONTIER_MON_BLISSEY_4,     \
     FRONTIER_MON_MILOTIC_4,     \
     FRONTIER_MON_SLAKING_4,     \
-    -1 
+    -1
 
 #define FRONTIER_MONS_SWIMMER_F_2 \
     FRONTIER_MON_GRANBULL_4,    \
@@ -3017,7 +3017,7 @@
     FRONTIER_MON_MANECTRIC_4,   \
     FRONTIER_MON_VILEPLUME_4,   \
     FRONTIER_MON_VICTREEBEL_4,  \
-    -1 
+    -1
 
 #define FRONTIER_MONS_COOLTRAINER_F_2B \
     FRONTIER_MON_ELECTRODE_1,   \
@@ -3418,7 +3418,7 @@
     FRONTIER_MON_SALAMENCE_2,   \
     FRONTIER_MON_METAGROSS_2,   \
     FRONTIER_MON_SLAKING_2,     \
-    -1 
+    -1
 
 // Similar to FRONTIER_MONS_GENERAL_C but _1 (would be identical if not for re-ordering)
 // Used by Pkmn Ranger, Running Triathlete, Cycling Triathlete
@@ -4066,7 +4066,7 @@
     FRONTIER_MON_TYRANITAR_8,   \
     FRONTIER_MON_TYRANITAR_9,   \
     FRONTIER_MON_TYRANITAR_10,  \
-    -1 
+    -1
 
 // For this group, Expert M uses Tyranitar, Expert F uses Dragonite
 #define FRONTIER_MONS_EXPERT_2C(lastmon) \
@@ -4170,7 +4170,7 @@
     FRONTIER_MON_##lastmon##_8, \
     FRONTIER_MON_##lastmon##_9, \
     FRONTIER_MON_##lastmon##_10,\
-    -1 
+    -1
 
 // The strong Psychic M/F trainers all use the below pokemon
 // Additionally they use 1 of 3 legendary trios, and Latios or Latias depending on gender
@@ -4270,7 +4270,7 @@
     FRONTIER_MON_ZAPDOS_6,      \
     FRONTIER_MON_MOLTRES_5,     \
     FRONTIER_MON_MOLTRES_6,     \
-    -1 
+    -1
 
 #define FRONTIER_MONS_PSYCHIC_2B(lati) \
     FRONTIER_MONS_PSYCHIC_2(lati, RAIKOU, ENTEI, SUICUNE) \
@@ -4284,7 +4284,7 @@
     FRONTIER_MON_ENTEI_6,       \
     FRONTIER_MON_SUICUNE_5,     \
     FRONTIER_MON_SUICUNE_6,     \
-    -1 
+    -1
 
 // Because the regis/latis are swapped here they cant all be merged into the same macro and match
 #define FRONTIER_MONS_PSYCHIC_2C(lati) \
@@ -4299,7 +4299,7 @@
     FRONTIER_MON_##lati##_6,    \
     FRONTIER_MON_##lati##_7,    \
     FRONTIER_MON_##lati##_8,    \
-    -1 
+    -1
 
 #define FRONTIER_MONS_HEX_MANIAC_2A \
     FRONTIER_MON_SHARPEDO_2,    \
@@ -4332,7 +4332,7 @@
     FRONTIER_MON_GENGAR_6,      \
     FRONTIER_MON_GENGAR_7,      \
     FRONTIER_MON_GENGAR_8,      \
-    -1 
+    -1
 
 #define FRONTIER_MONS_HEX_MANIAC_2B \
     FRONTIER_MON_SEVIPER_2,     \
@@ -4388,7 +4388,7 @@
     FRONTIER_MON_GENGAR_6,      \
     FRONTIER_MON_GENGAR_7,      \
     FRONTIER_MON_GENGAR_8,      \
-    -1 
+    -1
 
 #define FRONTIER_MONS_HEX_MANIAC_2C \
     FRONTIER_MON_SEVIPER_2,     \
@@ -4450,7 +4450,7 @@
     FRONTIER_MON_GENGAR_6,      \
     FRONTIER_MON_GENGAR_7,      \
     FRONTIER_MON_GENGAR_8,      \
-    -1 
+    -1
 
 // For whatever reason FRONTIER_MON_MAROWAK_2 is in a different order than _1 _3 and _4
 // This order change is the only difference btween FRONITER_MONS_POKEMANIAC_2A and FRONTIER_MONS_POKEMANIAC_2B other than the numbered suffixes
@@ -4542,7 +4542,7 @@
     FRONTIER_MON_TYRANITAR_8,   \
     FRONTIER_MON_TYRANITAR_9,   \
     FRONTIER_MON_TYRANITAR_10,  \
-    -1 
+    -1
 
 #define FRONTIER_MONS_POKEMANIAC_2B \
     FRONTIER_MON_ZANGOOSE_2,    \
@@ -4828,7 +4828,7 @@
     FRONTIER_MON_TYRANITAR_8,   \
     FRONTIER_MON_TYRANITAR_9,   \
     FRONTIER_MON_TYRANITAR_10,  \
-    -1 
+    -1
 
 // Identical to FRONTIER_MONS_COOLTRAINER_2D but with both latias and latios
 #define FRONTIER_MONS_GENTLEMAN_3B  \
@@ -4922,7 +4922,7 @@
     FRONTIER_MON_ENTEI_6,       \
     FRONTIER_MON_SUICUNE_5,     \
     FRONTIER_MON_SUICUNE_6,     \
-    -1 
+    -1
 
 #define FRONTIER_MONS_SWIMMING_TRIATHLETE_M_3 \
     FRONTIER_MON_SNEASEL_2,     \
@@ -5005,7 +5005,7 @@
     FRONTIER_MON_LAPRAS_6,      \
     FRONTIER_MON_LAPRAS_7,      \
     FRONTIER_MON_LAPRAS_8,      \
-    -1 
+    -1
 
 #define FRONTIER_MONS_SWIMMING_TRIATHLETE_F_3 \
     FRONTIER_MON_SNEASEL_2,     \
@@ -5119,7 +5119,7 @@
     FRONTIER_MON_SCIZOR_4,      \
     FRONTIER_MON_HERACROSS_4,   \
     FRONTIER_MON_SHUCKLE_4,     \
-    -1 
+    -1
 
 #define FRONTIER_MONS_FISHERMAN_3 \
     FRONTIER_MON_SEAKING_2,     \
@@ -5229,7 +5229,7 @@
     FRONTIER_MON_REGICE_6,      \
     FRONTIER_MON_REGISTEEL_5,   \
     FRONTIER_MON_REGISTEEL_6,   \
-    -1 
+    -1
 
 #define FRONTIER_MONS_COLLECTOR_3 \
     FRONTIER_MON_VENUSAUR_1,    \
@@ -5268,7 +5268,7 @@
     FRONTIER_MON_CHARIZARD_4,   \
     FRONTIER_MON_TYPHLOSION_4,  \
     FRONTIER_MON_SWAMPERT_4,    \
-    -1 
+    -1
 
 #define FRONTIER_MONS_GUITARIST_3A \
     FRONTIER_MON_ABSOL_2,       \
@@ -5330,7 +5330,7 @@
     FRONTIER_MON_ZAPDOS_6,      \
     FRONTIER_MON_MOLTRES_5,     \
     FRONTIER_MON_MOLTRES_6,     \
-    -1 
+    -1
 
 #define FRONTIER_MONS_GUITARIST_3B \
     FRONTIER_MON_MISDREAVUS_1,  \
@@ -5368,7 +5368,7 @@
     FRONTIER_MON_LATIAS_6,      \
     FRONTIER_MON_LATIOS_5,      \
     FRONTIER_MON_LATIOS_6,      \
-    -1 
+    -1
 
 #define FRONTIER_MONS_BIRD_KEEPER_3 \
     FRONTIER_MON_PIDGEOT_2,     \
@@ -5432,7 +5432,7 @@
     FRONTIER_MON_SALAMENCE_6,   \
     FRONTIER_MON_SALAMENCE_7,   \
     FRONTIER_MON_SALAMENCE_8,   \
-    -1 
+    -1
 
 #define FRONTIER_MONS_SAILOR_3  \
     FRONTIER_MON_MEDICHAM_1,    \
@@ -5515,7 +5515,7 @@
     FRONTIER_MON_LAPRAS_6,      \
     FRONTIER_MON_LAPRAS_7,      \
     FRONTIER_MON_LAPRAS_8,      \
-    -1 
+    -1
 
 #define FRONTIER_MONS_HIKER_3   \
     FRONTIER_MON_DUGTRIO_1,     \
@@ -5596,7 +5596,7 @@
     FRONTIER_MON_TYRANITAR_8,   \
     FRONTIER_MON_TYRANITAR_9,   \
     FRONTIER_MON_TYRANITAR_10,  \
-    -1 
+    -1
 
 #define FRONTIER_MONS_KINDLER_3 \
     FRONTIER_MON_MISDREAVUS_1,  \
@@ -5661,7 +5661,7 @@
     FRONTIER_MON_DRAGONITE_8,   \
     FRONTIER_MON_DRAGONITE_9,   \
     FRONTIER_MON_DRAGONITE_10,  \
-    -1 
+    -1
 
 #define FRONTIER_MONS_PARASOL_LADY_3 \
     FRONTIER_MON_GLALIE_1,      \
@@ -5699,7 +5699,7 @@
     FRONTIER_MON_HOUNDOOM_4,    \
     FRONTIER_MON_VENUSAUR_4,    \
     FRONTIER_MON_FLAREON_4,     \
-    -1 
+    -1
 
 // Only used by one Beauty
 #define FRONTIER_MONS_EEVEELUTIONS \
@@ -5723,7 +5723,7 @@
     FRONTIER_MON_FLAREON_4,     \
     FRONTIER_MON_ESPEON_4,      \
     FRONTIER_MON_UMBREON_4,     \
-    -1 
+    -1
 
 #define FRONTIER_MONS_BEAUTY_2  \
     FRONTIER_MON_JYNX_1,        \
@@ -5765,7 +5765,7 @@
     FRONTIER_MON_LAPRAS_8,      \
     FRONTIER_MON_SALAMENCE_8,   \
     FRONTIER_MON_LATIAS_6,      \
-    -1 
+    -1
 
 #define FRONTIER_MONS_AROMA_LADY_3  \
     FRONTIER_MON_WOBBUFFET_1,   \
@@ -5863,1507 +5863,1507 @@
     FRONTIER_MON_STARMIE_6,     \
     FRONTIER_MON_STARMIE_7,     \
     FRONTIER_MON_STARMIE_8,     \
-    -1 
+    -1
 
-const u16 gBattleFrontierTrainerMons_Brady[] = 
+const u16 gBattleFrontierTrainerMons_Brady[] =
 {
     FRONTIER_MONS_YOUNGSTER_LASS_1
 };
 
-const u16 gBattleFrontierTrainerMons_Conner[] = 
+const u16 gBattleFrontierTrainerMons_Conner[] =
 {
     FRONTIER_MONS_YOUNGSTER_LASS_1
 };
 
-const u16 gBattleFrontierTrainerMons_Bradley[] = 
+const u16 gBattleFrontierTrainerMons_Bradley[] =
 {
     FRONTIER_MONS_YOUNGSTER_LASS_1
 };
 
-const u16 gBattleFrontierTrainerMons_Cybil[] = 
+const u16 gBattleFrontierTrainerMons_Cybil[] =
 {
     FRONTIER_MONS_YOUNGSTER_LASS_1
 };
 
-const u16 gBattleFrontierTrainerMons_Rodette[] = 
+const u16 gBattleFrontierTrainerMons_Rodette[] =
 {
     FRONTIER_MONS_YOUNGSTER_LASS_1
 };
 
-const u16 gBattleFrontierTrainerMons_Peggy[] = 
+const u16 gBattleFrontierTrainerMons_Peggy[] =
 {
     FRONTIER_MONS_YOUNGSTER_LASS_1
 };
 
-const u16 gBattleFrontierTrainerMons_Keith[] = 
+const u16 gBattleFrontierTrainerMons_Keith[] =
 {
     FRONTIER_MONS_SCHOOL_KID_1
 };
 
-const u16 gBattleFrontierTrainerMons_Grayson[] = 
+const u16 gBattleFrontierTrainerMons_Grayson[] =
 {
     FRONTIER_MONS_SCHOOL_KID_1
 };
 
-const u16 gBattleFrontierTrainerMons_Glenn[] = 
+const u16 gBattleFrontierTrainerMons_Glenn[] =
 {
     FRONTIER_MONS_SCHOOL_KID_1
 };
 
-const u16 gBattleFrontierTrainerMons_Liliana[] = 
+const u16 gBattleFrontierTrainerMons_Liliana[] =
 {
     FRONTIER_MONS_SCHOOL_KID_1
 };
 
-const u16 gBattleFrontierTrainerMons_Elise[] = 
+const u16 gBattleFrontierTrainerMons_Elise[] =
 {
     FRONTIER_MONS_SCHOOL_KID_1
 };
 
-const u16 gBattleFrontierTrainerMons_Zoey[] = 
+const u16 gBattleFrontierTrainerMons_Zoey[] =
 {
     FRONTIER_MONS_SCHOOL_KID_1
 };
 
-const u16 gBattleFrontierTrainerMons_Manuel[] = 
+const u16 gBattleFrontierTrainerMons_Manuel[] =
 {
     FRONTIER_MONS_RICH_BOY_LADY_1
 };
 
-const u16 gBattleFrontierTrainerMons_Russ[] = 
+const u16 gBattleFrontierTrainerMons_Russ[] =
 {
     FRONTIER_MONS_RICH_BOY_LADY_1
 };
 
-const u16 gBattleFrontierTrainerMons_Dustin[] = 
+const u16 gBattleFrontierTrainerMons_Dustin[] =
 {
     FRONTIER_MONS_RICH_BOY_LADY_1
 };
 
-const u16 gBattleFrontierTrainerMons_Tina[] = 
+const u16 gBattleFrontierTrainerMons_Tina[] =
 {
     FRONTIER_MONS_RICH_BOY_LADY_1
 };
 
-const u16 gBattleFrontierTrainerMons_Gillian[] = 
+const u16 gBattleFrontierTrainerMons_Gillian[] =
 {
     FRONTIER_MONS_RICH_BOY_LADY_1
 };
 
-const u16 gBattleFrontierTrainerMons_Zoe[] = 
+const u16 gBattleFrontierTrainerMons_Zoe[] =
 {
     FRONTIER_MONS_RICH_BOY_LADY_1
 };
 
-const u16 gBattleFrontierTrainerMons_Chen[] = 
+const u16 gBattleFrontierTrainerMons_Chen[] =
 {
     FRONTIER_MONS_CAMPER_PICNICKER_1
 };
 
-const u16 gBattleFrontierTrainerMons_Al[] = 
+const u16 gBattleFrontierTrainerMons_Al[] =
 {
     FRONTIER_MONS_CAMPER_PICNICKER_1
 };
 
-const u16 gBattleFrontierTrainerMons_Mitch[] = 
+const u16 gBattleFrontierTrainerMons_Mitch[] =
 {
-    FRONTIER_MONS_CAMPER_PICNICKER_1 
+    FRONTIER_MONS_CAMPER_PICNICKER_1
 };
 
-const u16 gBattleFrontierTrainerMons_Anne[] = 
+const u16 gBattleFrontierTrainerMons_Anne[] =
 {
     FRONTIER_MONS_CAMPER_PICNICKER_1
 };
 
-const u16 gBattleFrontierTrainerMons_Alize[] = 
+const u16 gBattleFrontierTrainerMons_Alize[] =
 {
     FRONTIER_MONS_CAMPER_PICNICKER_1
 };
 
-const u16 gBattleFrontierTrainerMons_Lauren[] = 
+const u16 gBattleFrontierTrainerMons_Lauren[] =
 {
-    FRONTIER_MONS_CAMPER_PICNICKER_1 
+    FRONTIER_MONS_CAMPER_PICNICKER_1
 };
 
-const u16 gBattleFrontierTrainerMons_Kipp[] = 
+const u16 gBattleFrontierTrainerMons_Kipp[] =
 {
     FRONTIER_MONS_TUBER_1
 };
 
-const u16 gBattleFrontierTrainerMons_Jason[] = 
+const u16 gBattleFrontierTrainerMons_Jason[] =
 {
     FRONTIER_MONS_TUBER_1
 };
 
-const u16 gBattleFrontierTrainerMons_John[] = 
+const u16 gBattleFrontierTrainerMons_John[] =
 {
     FRONTIER_MONS_TUBER_1
 };
 
-const u16 gBattleFrontierTrainerMons_Ann[] = 
+const u16 gBattleFrontierTrainerMons_Ann[] =
 {
     FRONTIER_MONS_TUBER_1
 };
 
-const u16 gBattleFrontierTrainerMons_Eileen[] = 
+const u16 gBattleFrontierTrainerMons_Eileen[] =
 {
     FRONTIER_MONS_TUBER_1
 };
 
-const u16 gBattleFrontierTrainerMons_Carlie[] = 
+const u16 gBattleFrontierTrainerMons_Carlie[] =
 {
     FRONTIER_MONS_TUBER_1
 };
 
-const u16 gBattleFrontierTrainerMons_Gordon[] = 
+const u16 gBattleFrontierTrainerMons_Gordon[] =
 {
     FRONTIER_MONS_SWIMMER_M_1
 };
 
-const u16 gBattleFrontierTrainerMons_Ayden[] = 
+const u16 gBattleFrontierTrainerMons_Ayden[] =
 {
     FRONTIER_MONS_SWIMMER_M_1
 };
 
-const u16 gBattleFrontierTrainerMons_Marco[] = 
+const u16 gBattleFrontierTrainerMons_Marco[] =
 {
     FRONTIER_MONS_SWIMMER_M_1
 };
 
-const u16 gBattleFrontierTrainerMons_Cierra[] = 
+const u16 gBattleFrontierTrainerMons_Cierra[] =
 {
     FRONTIER_MONS_SWIMMER_F_1
 };
 
-const u16 gBattleFrontierTrainerMons_Marcy[] = 
+const u16 gBattleFrontierTrainerMons_Marcy[] =
 {
     FRONTIER_MONS_SWIMMER_F_1
 };
 
-const u16 gBattleFrontierTrainerMons_Kathy[] = 
+const u16 gBattleFrontierTrainerMons_Kathy[] =
 {
     FRONTIER_MONS_SWIMMER_F_1
 };
 
-const u16 gBattleFrontierTrainerMons_Peyton[] = 
+const u16 gBattleFrontierTrainerMons_Peyton[] =
 {
     FRONTIER_MONS_POKEFAN_M_1
 };
 
-const u16 gBattleFrontierTrainerMons_Julian[] = 
+const u16 gBattleFrontierTrainerMons_Julian[] =
 {
     FRONTIER_MONS_POKEFAN_M_1
 };
 
-const u16 gBattleFrontierTrainerMons_Quinn[] = 
+const u16 gBattleFrontierTrainerMons_Quinn[] =
 {
     FRONTIER_MONS_POKEFAN_M_1
 };
 
-const u16 gBattleFrontierTrainerMons_Haylee[] = 
+const u16 gBattleFrontierTrainerMons_Haylee[] =
 {
-    FRONTIER_MONS_POKEFAN_F_1 
+    FRONTIER_MONS_POKEFAN_F_1
 };
 
-const u16 gBattleFrontierTrainerMons_Amanda[] = 
+const u16 gBattleFrontierTrainerMons_Amanda[] =
 {
-    FRONTIER_MONS_POKEFAN_F_1 
+    FRONTIER_MONS_POKEFAN_F_1
 };
 
-const u16 gBattleFrontierTrainerMons_Stacy[] = 
+const u16 gBattleFrontierTrainerMons_Stacy[] =
 {
     FRONTIER_MONS_POKEFAN_F_1
 };
 
 // The below 6 are the early Pkmn Breeder class trainers, which use groups from other general classes
-const u16 gBattleFrontierTrainerMons_Rafael[] = 
+const u16 gBattleFrontierTrainerMons_Rafael[] =
 {
     FRONTIER_MONS_YOUNGSTER_LASS_1
 };
 
-const u16 gBattleFrontierTrainerMons_Oliver[] = 
+const u16 gBattleFrontierTrainerMons_Oliver[] =
 {
     FRONTIER_MONS_SCHOOL_KID_1
 };
 
-const u16 gBattleFrontierTrainerMons_Payton[] = 
+const u16 gBattleFrontierTrainerMons_Payton[] =
 {
     FRONTIER_MONS_CAMPER_PICNICKER_1
 };
 
-const u16 gBattleFrontierTrainerMons_Pamela[] = 
+const u16 gBattleFrontierTrainerMons_Pamela[] =
 {
     FRONTIER_MONS_YOUNGSTER_LASS_1
 };
 
-const u16 gBattleFrontierTrainerMons_Eliza[] = 
+const u16 gBattleFrontierTrainerMons_Eliza[] =
 {
-    FRONTIER_MONS_SCHOOL_KID_1 
+    FRONTIER_MONS_SCHOOL_KID_1
 };
 
-const u16 gBattleFrontierTrainerMons_Marisa[] = 
+const u16 gBattleFrontierTrainerMons_Marisa[] =
 {
-    FRONTIER_MONS_CAMPER_PICNICKER_1 
+    FRONTIER_MONS_CAMPER_PICNICKER_1
 };
 
-const u16 gBattleFrontierTrainerMons_Lewis[] = 
+const u16 gBattleFrontierTrainerMons_Lewis[] =
 {
     FRONTIER_MONS_BUG_CATCHER_1_EXTRA(METAPOD, KAKUNA)
 };
 
-const u16 gBattleFrontierTrainerMons_Yoshi[] = 
+const u16 gBattleFrontierTrainerMons_Yoshi[] =
 {
-    FRONTIER_MONS_BUG_CATCHER_1_EXTRA(SILCOON, CASCOON) 
+    FRONTIER_MONS_BUG_CATCHER_1_EXTRA(SILCOON, CASCOON)
 };
 
-const u16 gBattleFrontierTrainerMons_Destin[] = 
+const u16 gBattleFrontierTrainerMons_Destin[] =
 {
     FRONTIER_MONS_BUG_CATCHER_1
 };
 
-const u16 gBattleFrontierTrainerMons_Keon[] = 
+const u16 gBattleFrontierTrainerMons_Keon[] =
 {
     FRONTIER_MONS_NINJA_BOY_1
 };
 
-const u16 gBattleFrontierTrainerMons_Stuart[] = 
+const u16 gBattleFrontierTrainerMons_Stuart[] =
 {
     FRONTIER_MONS_NINJA_BOY_1
 };
 
-const u16 gBattleFrontierTrainerMons_Nestor[] = 
+const u16 gBattleFrontierTrainerMons_Nestor[] =
 {
-    FRONTIER_MONS_NINJA_BOY_1 
+    FRONTIER_MONS_NINJA_BOY_1
 };
 
-const u16 gBattleFrontierTrainerMons_Derrick[] = 
+const u16 gBattleFrontierTrainerMons_Derrick[] =
 {
     FRONTIER_MONS_BUG_MANIAC_1
 };
 
-const u16 gBattleFrontierTrainerMons_Bryson[] = 
+const u16 gBattleFrontierTrainerMons_Bryson[] =
 {
     FRONTIER_MONS_BUG_MANIAC_1
 };
 
-const u16 gBattleFrontierTrainerMons_Clayton[] = 
+const u16 gBattleFrontierTrainerMons_Clayton[] =
 {
     FRONTIER_MONS_BUG_MANIAC_1
 };
 
-const u16 gBattleFrontierTrainerMons_Trenton[] = 
+const u16 gBattleFrontierTrainerMons_Trenton[] =
 {
-    FRONTIER_MONS_FISHERMAN_1 
+    FRONTIER_MONS_FISHERMAN_1
 };
 
-const u16 gBattleFrontierTrainerMons_Jenson[] = 
+const u16 gBattleFrontierTrainerMons_Jenson[] =
 {
     FRONTIER_MONS_FISHERMAN_1
 };
 
-const u16 gBattleFrontierTrainerMons_Wesley[] = 
+const u16 gBattleFrontierTrainerMons_Wesley[] =
 {
     FRONTIER_MONS_FISHERMAN_1
 };
 
-const u16 gBattleFrontierTrainerMons_Anton[] = 
+const u16 gBattleFrontierTrainerMons_Anton[] =
 {
     FRONTIER_MONS_RUIN_MANIAC_1
 };
 
-const u16 gBattleFrontierTrainerMons_Lawson[] = 
+const u16 gBattleFrontierTrainerMons_Lawson[] =
 {
     FRONTIER_MONS_RUIN_MANIAC_1
 };
 
-const u16 gBattleFrontierTrainerMons_Sammy[] = 
+const u16 gBattleFrontierTrainerMons_Sammy[] =
 {
     FRONTIER_MONS_RUIN_MANIAC_1
 };
 
 // The below 3 are the early Collector class trainers, which use groups from other general classes
-const u16 gBattleFrontierTrainerMons_Arnie[] = 
+const u16 gBattleFrontierTrainerMons_Arnie[] =
 {
     FRONTIER_MONS_YOUNGSTER_LASS_1
 };
 
-const u16 gBattleFrontierTrainerMons_Adrian[] = 
+const u16 gBattleFrontierTrainerMons_Adrian[] =
 {
     FRONTIER_MONS_SCHOOL_KID_1
 };
 
-const u16 gBattleFrontierTrainerMons_Tristan[] = 
+const u16 gBattleFrontierTrainerMons_Tristan[] =
 {
     FRONTIER_MONS_CAMPER_PICNICKER_1
 };
 
-const u16 gBattleFrontierTrainerMons_Juliana[] = 
+const u16 gBattleFrontierTrainerMons_Juliana[] =
 {
     FRONTIER_MONS_PARASOL_LADY_1
 };
 
-const u16 gBattleFrontierTrainerMons_Rylee[] = 
+const u16 gBattleFrontierTrainerMons_Rylee[] =
 {
     FRONTIER_MONS_PARASOL_LADY_1
 };
 
-const u16 gBattleFrontierTrainerMons_Chelsea[] = 
+const u16 gBattleFrontierTrainerMons_Chelsea[] =
 {
     FRONTIER_MONS_PARASOL_LADY_1
 };
 
 // The below 3 are the early Beauty class trainers, which use groups from other general classes
-const u16 gBattleFrontierTrainerMons_Danela[] = 
+const u16 gBattleFrontierTrainerMons_Danela[] =
 {
     FRONTIER_MONS_YOUNGSTER_LASS_1
 };
 
-const u16 gBattleFrontierTrainerMons_Lizbeth[] = 
+const u16 gBattleFrontierTrainerMons_Lizbeth[] =
 {
     FRONTIER_MONS_SCHOOL_KID_1
 };
 
-const u16 gBattleFrontierTrainerMons_Amelia[] = 
+const u16 gBattleFrontierTrainerMons_Amelia[] =
 {
     FRONTIER_MONS_CAMPER_PICNICKER_1
 };
 
-const u16 gBattleFrontierTrainerMons_Jillian[] = 
+const u16 gBattleFrontierTrainerMons_Jillian[] =
 {
-    FRONTIER_MONS_AROMA_LADY_1 
+    FRONTIER_MONS_AROMA_LADY_1
 };
 
-const u16 gBattleFrontierTrainerMons_Abbie[] = 
+const u16 gBattleFrontierTrainerMons_Abbie[] =
 {
-    FRONTIER_MONS_AROMA_LADY_1 
+    FRONTIER_MONS_AROMA_LADY_1
 };
 
-const u16 gBattleFrontierTrainerMons_Briana[] = 
+const u16 gBattleFrontierTrainerMons_Briana[] =
 {
     FRONTIER_MONS_AROMA_LADY_1
 };
 
-const u16 gBattleFrontierTrainerMons_Antonio[] = 
+const u16 gBattleFrontierTrainerMons_Antonio[] =
 {
     FRONTIER_MONS_GUITARIST_1
 };
 
-const u16 gBattleFrontierTrainerMons_Jaden[] = 
+const u16 gBattleFrontierTrainerMons_Jaden[] =
 {
     FRONTIER_MONS_GUITARIST_1
 };
 
-const u16 gBattleFrontierTrainerMons_Dakota[] = 
+const u16 gBattleFrontierTrainerMons_Dakota[] =
 {
-    FRONTIER_MONS_GUITARIST_1 
+    FRONTIER_MONS_GUITARIST_1
 };
 
-const u16 gBattleFrontierTrainerMons_Brayden[] = 
+const u16 gBattleFrontierTrainerMons_Brayden[] =
 {
     FRONTIER_MONS_BIRD_KEEPER_1
 };
 
-const u16 gBattleFrontierTrainerMons_Corson[] = 
+const u16 gBattleFrontierTrainerMons_Corson[] =
 {
     FRONTIER_MONS_BIRD_KEEPER_1
 };
 
-const u16 gBattleFrontierTrainerMons_Trevin[] = 
+const u16 gBattleFrontierTrainerMons_Trevin[] =
 {
     FRONTIER_MONS_BIRD_KEEPER_1
 };
 
-const u16 gBattleFrontierTrainerMons_Patrick[] = 
+const u16 gBattleFrontierTrainerMons_Patrick[] =
 {
     FRONTIER_MONS_SAILOR_1
 };
 
-const u16 gBattleFrontierTrainerMons_Kaden[] = 
+const u16 gBattleFrontierTrainerMons_Kaden[] =
 {
     FRONTIER_MONS_SAILOR_1
 };
 
-const u16 gBattleFrontierTrainerMons_Maxwell[] = 
+const u16 gBattleFrontierTrainerMons_Maxwell[] =
 {
     FRONTIER_MONS_SAILOR_1
 };
 
-const u16 gBattleFrontierTrainerMons_Daryl[] = 
+const u16 gBattleFrontierTrainerMons_Daryl[] =
 {
     FRONTIER_MONS_HIKER_1
 };
 
-const u16 gBattleFrontierTrainerMons_Kenneth[] = 
+const u16 gBattleFrontierTrainerMons_Kenneth[] =
 {
     FRONTIER_MONS_HIKER_1
 };
 
-const u16 gBattleFrontierTrainerMons_Rich[] = 
+const u16 gBattleFrontierTrainerMons_Rich[] =
 {
     FRONTIER_MONS_HIKER_1
 };
 
-const u16 gBattleFrontierTrainerMons_Caden[] = 
+const u16 gBattleFrontierTrainerMons_Caden[] =
 {
     FRONTIER_MONS_KINDLER_1
 };
 
-const u16 gBattleFrontierTrainerMons_Marlon[] = 
+const u16 gBattleFrontierTrainerMons_Marlon[] =
 {
     FRONTIER_MONS_KINDLER_1
 };
 
-const u16 gBattleFrontierTrainerMons_Nash[] = 
+const u16 gBattleFrontierTrainerMons_Nash[] =
 {
     FRONTIER_MONS_KINDLER_1
 };
 
-const u16 gBattleFrontierTrainerMons_Robby[] = 
+const u16 gBattleFrontierTrainerMons_Robby[] =
 {
     FRONTIER_MONS_RUNNING_TRIATHLETE_1
 };
 
-const u16 gBattleFrontierTrainerMons_Reece[] = 
+const u16 gBattleFrontierTrainerMons_Reece[] =
 {
     FRONTIER_MONS_RUNNING_TRIATHLETE_1
 };
 
-const u16 gBattleFrontierTrainerMons_Kathryn[] = 
+const u16 gBattleFrontierTrainerMons_Kathryn[] =
 {
     FRONTIER_MONS_RUNNING_TRIATHLETE_1
 };
 
-const u16 gBattleFrontierTrainerMons_Ellen[] = 
+const u16 gBattleFrontierTrainerMons_Ellen[] =
 {
     FRONTIER_MONS_RUNNING_TRIATHLETE_1
 };
 
-const u16 gBattleFrontierTrainerMons_Ramon[] = 
+const u16 gBattleFrontierTrainerMons_Ramon[] =
 {
     FRONTIER_MONS_SWIMMING_TRIATHLETE_1
 };
 
-const u16 gBattleFrontierTrainerMons_Arthur[] = 
+const u16 gBattleFrontierTrainerMons_Arthur[] =
 {
     FRONTIER_MONS_SWIMMING_TRIATHLETE_1
 };
 
-const u16 gBattleFrontierTrainerMons_Alondra[] = 
+const u16 gBattleFrontierTrainerMons_Alondra[] =
 {
     FRONTIER_MONS_SWIMMING_TRIATHLETE_1
 };
 
-const u16 gBattleFrontierTrainerMons_Adriana[] = 
+const u16 gBattleFrontierTrainerMons_Adriana[] =
 {
     FRONTIER_MONS_SWIMMING_TRIATHLETE_1
 };
 
-const u16 gBattleFrontierTrainerMons_Malik[] = 
+const u16 gBattleFrontierTrainerMons_Malik[] =
 {
     FRONTIER_MONS_CYCLING_TRIATHLETE_1
 };
 
-const u16 gBattleFrontierTrainerMons_Jill[] = 
+const u16 gBattleFrontierTrainerMons_Jill[] =
 {
     FRONTIER_MONS_CYCLING_TRIATHLETE_1
 };
 
-const u16 gBattleFrontierTrainerMons_Erik[] = 
+const u16 gBattleFrontierTrainerMons_Erik[] =
 {
     FRONTIER_MONS_RUNNING_TRIATHLETE_2
 };
 
-const u16 gBattleFrontierTrainerMons_Yazmin[] = 
+const u16 gBattleFrontierTrainerMons_Yazmin[] =
 {
     FRONTIER_MONS_RUNNING_TRIATHLETE_2
 };
 
-const u16 gBattleFrontierTrainerMons_Jamal[] = 
+const u16 gBattleFrontierTrainerMons_Jamal[] =
 {
     FRONTIER_MONS_SWIMMING_TRIATHLETE_2
 };
 
-const u16 gBattleFrontierTrainerMons_Leslie[] = 
+const u16 gBattleFrontierTrainerMons_Leslie[] =
 {
     FRONTIER_MONS_SWIMMING_TRIATHLETE_2
 };
 
-const u16 gBattleFrontierTrainerMons_Dave[] = 
+const u16 gBattleFrontierTrainerMons_Dave[] =
 {
     FRONTIER_MONS_CYCLING_TRIATHLETE_2
 };
 
-const u16 gBattleFrontierTrainerMons_Carlo[] = 
+const u16 gBattleFrontierTrainerMons_Carlo[] =
 {
     FRONTIER_MONS_CYCLING_TRIATHLETE_2
 };
 
-const u16 gBattleFrontierTrainerMons_Emilia[] = 
+const u16 gBattleFrontierTrainerMons_Emilia[] =
 {
     FRONTIER_MONS_CYCLING_TRIATHLETE_2
 };
 
-const u16 gBattleFrontierTrainerMons_Dalia[] = 
+const u16 gBattleFrontierTrainerMons_Dalia[] =
 {
     FRONTIER_MONS_CYCLING_TRIATHLETE_2
 };
 
-const u16 gBattleFrontierTrainerMons_Hitomi[] = 
+const u16 gBattleFrontierTrainerMons_Hitomi[] =
 {
     FRONTIER_MONS_BLACK_BELT_BATTLE_GIRL_1
 };
 
-const u16 gBattleFrontierTrainerMons_Ricardo[] = 
+const u16 gBattleFrontierTrainerMons_Ricardo[] =
 {
     FRONTIER_MONS_BLACK_BELT_BATTLE_GIRL_1
 };
 
-const u16 gBattleFrontierTrainerMons_Shizuka[] = 
+const u16 gBattleFrontierTrainerMons_Shizuka[] =
 {
     FRONTIER_MONS_BLACK_BELT_BATTLE_GIRL_1
 };
 
-const u16 gBattleFrontierTrainerMons_Joana[] = 
+const u16 gBattleFrontierTrainerMons_Joana[] =
 {
     FRONTIER_MONS_BLACK_BELT_BATTLE_GIRL_1
 };
 
-const u16 gBattleFrontierTrainerMons_Kelly[] = 
+const u16 gBattleFrontierTrainerMons_Kelly[] =
 {
     FRONTIER_MONS_BLACK_BELT_BATTLE_GIRL_1
 };
 
-const u16 gBattleFrontierTrainerMons_Rayna[] = 
+const u16 gBattleFrontierTrainerMons_Rayna[] =
 {
     FRONTIER_MONS_BLACK_BELT_BATTLE_GIRL_1
 };
 
-const u16 gBattleFrontierTrainerMons_Evan[] = 
+const u16 gBattleFrontierTrainerMons_Evan[] =
 {
     FRONTIER_MONS_EXPERT_1A
 };
 
-const u16 gBattleFrontierTrainerMons_Jordan[] = 
+const u16 gBattleFrontierTrainerMons_Jordan[] =
 {
     FRONTIER_MONS_EXPERT_1B
 };
 
-const u16 gBattleFrontierTrainerMons_Joel[] = 
+const u16 gBattleFrontierTrainerMons_Joel[] =
 {
     FRONTIER_MONS_EXPERT_1C
 };
 
-const u16 gBattleFrontierTrainerMons_Kristen[] = 
+const u16 gBattleFrontierTrainerMons_Kristen[] =
 {
     FRONTIER_MONS_EXPERT_1A
 };
 
-const u16 gBattleFrontierTrainerMons_Selphy[] = 
+const u16 gBattleFrontierTrainerMons_Selphy[] =
 {
     FRONTIER_MONS_EXPERT_1B
 };
 
-const u16 gBattleFrontierTrainerMons_Chloe[] = 
+const u16 gBattleFrontierTrainerMons_Chloe[] =
 {
     FRONTIER_MONS_EXPERT_1C
 };
 
-const u16 gBattleFrontierTrainerMons_Norton[] = 
+const u16 gBattleFrontierTrainerMons_Norton[] =
 {
     FRONTIER_MONS_PSYCHIC_1
 };
 
-const u16 gBattleFrontierTrainerMons_Lukas[] = 
+const u16 gBattleFrontierTrainerMons_Lukas[] =
 {
     FRONTIER_MONS_PSYCHIC_1
 };
 
-const u16 gBattleFrontierTrainerMons_Zach[] = 
+const u16 gBattleFrontierTrainerMons_Zach[] =
 {
     FRONTIER_MONS_PSYCHIC_1
 };
 
-const u16 gBattleFrontierTrainerMons_Kaitlyn[] = 
+const u16 gBattleFrontierTrainerMons_Kaitlyn[] =
 {
     FRONTIER_MONS_PSYCHIC_1
 };
 
-const u16 gBattleFrontierTrainerMons_Breanna[] = 
+const u16 gBattleFrontierTrainerMons_Breanna[] =
 {
     FRONTIER_MONS_PSYCHIC_1
 };
 
-const u16 gBattleFrontierTrainerMons_Kendra[] = 
+const u16 gBattleFrontierTrainerMons_Kendra[] =
 {
     FRONTIER_MONS_PSYCHIC_1
 };
 
-const u16 gBattleFrontierTrainerMons_Molly[] = 
+const u16 gBattleFrontierTrainerMons_Molly[] =
 {
     FRONTIER_MONS_HEX_MANIAC_1
 };
 
-const u16 gBattleFrontierTrainerMons_Jazmin[] = 
+const u16 gBattleFrontierTrainerMons_Jazmin[] =
 {
     FRONTIER_MONS_HEX_MANIAC_1
 };
 
-const u16 gBattleFrontierTrainerMons_Kelsey[] = 
+const u16 gBattleFrontierTrainerMons_Kelsey[] =
 {
     FRONTIER_MONS_HEX_MANIAC_1
 };
 
-const u16 gBattleFrontierTrainerMons_Jalen[] = 
+const u16 gBattleFrontierTrainerMons_Jalen[] =
 {
     FRONTIER_MONS_POKEMANIAC_1
 };
 
-const u16 gBattleFrontierTrainerMons_Griffen[] = 
+const u16 gBattleFrontierTrainerMons_Griffen[] =
 {
     FRONTIER_MONS_POKEMANIAC_1
 };
 
-const u16 gBattleFrontierTrainerMons_Xander[] = 
+const u16 gBattleFrontierTrainerMons_Xander[] =
 {
     FRONTIER_MONS_POKEMANIAC_1
 };
 
-const u16 gBattleFrontierTrainerMons_Marvin[] = 
+const u16 gBattleFrontierTrainerMons_Marvin[] =
 {
     FRONTIER_MONS_GENTLEMAN_1A
 };
 
-const u16 gBattleFrontierTrainerMons_Brennan[] = 
+const u16 gBattleFrontierTrainerMons_Brennan[] =
 {
     FRONTIER_MONS_GENTLEMAN_1B
 };
 
-const u16 gBattleFrontierTrainerMons_Baley[] = 
+const u16 gBattleFrontierTrainerMons_Baley[] =
 {
     FRONTIER_MONS_BUG_MANIAC_2
 };
 
-const u16 gBattleFrontierTrainerMons_Zackary[] = 
+const u16 gBattleFrontierTrainerMons_Zackary[] =
 {
     FRONTIER_MONS_RUIN_MANIAC_2
 };
 
-const u16 gBattleFrontierTrainerMons_Gabriel[] = 
+const u16 gBattleFrontierTrainerMons_Gabriel[] =
 {
     FRONTIER_MONS_COLLECTOR_1
 };
 
-const u16 gBattleFrontierTrainerMons_Emily[] = 
+const u16 gBattleFrontierTrainerMons_Emily[] =
 {
     FRONTIER_MONS_PARASOL_LADY_2
 };
 
-const u16 gBattleFrontierTrainerMons_Jordyn[] = 
+const u16 gBattleFrontierTrainerMons_Jordyn[] =
 {
     FRONTIER_MONS_BEAUTY_1
 };
 
-const u16 gBattleFrontierTrainerMons_Sofia[] = 
+const u16 gBattleFrontierTrainerMons_Sofia[] =
 {
     FRONTIER_MONS_AROMA_LADY_2
 };
 
-const u16 gBattleFrontierTrainerMons_Braden[] = 
+const u16 gBattleFrontierTrainerMons_Braden[] =
 {
     FRONTIER_MONS_COOLTRAINER_1A
 };
 
-const u16 gBattleFrontierTrainerMons_Kayden[] = 
+const u16 gBattleFrontierTrainerMons_Kayden[] =
 {
     FRONTIER_MONS_COOLTRAINER_1B
 };
 
-const u16 gBattleFrontierTrainerMons_Cooper[] = 
+const u16 gBattleFrontierTrainerMons_Cooper[] =
 {
     FRONTIER_MONS_COOLTRAINER_1C
 };
 
-const u16 gBattleFrontierTrainerMons_Julia[] = 
+const u16 gBattleFrontierTrainerMons_Julia[] =
 {
     FRONTIER_MONS_COOLTRAINER_1A
 };
 
-const u16 gBattleFrontierTrainerMons_Amara[] = 
+const u16 gBattleFrontierTrainerMons_Amara[] =
 {
     FRONTIER_MONS_COOLTRAINER_1B
 };
 
-const u16 gBattleFrontierTrainerMons_Lynn[] = 
+const u16 gBattleFrontierTrainerMons_Lynn[] =
 {
     FRONTIER_MONS_COOLTRAINER_1C
 };
 
-const u16 gBattleFrontierTrainerMons_Jovan[] = 
+const u16 gBattleFrontierTrainerMons_Jovan[] =
 {
     FRONTIER_MONS_PKMN_RANGER_1
 };
 
-const u16 gBattleFrontierTrainerMons_Dominic[] = 
+const u16 gBattleFrontierTrainerMons_Dominic[] =
 {
     FRONTIER_MONS_PKMN_RANGER_1
 };
 
-const u16 gBattleFrontierTrainerMons_Nikolas[] = 
+const u16 gBattleFrontierTrainerMons_Nikolas[] =
 {
     FRONTIER_MONS_PKMN_RANGER_1
 };
 
-const u16 gBattleFrontierTrainerMons_Valeria[] = 
+const u16 gBattleFrontierTrainerMons_Valeria[] =
 {
     FRONTIER_MONS_PKMN_RANGER_1
 };
 
-const u16 gBattleFrontierTrainerMons_Delaney[] = 
+const u16 gBattleFrontierTrainerMons_Delaney[] =
 {
     FRONTIER_MONS_PKMN_RANGER_1
 };
 
-const u16 gBattleFrontierTrainerMons_Meghan[] = 
+const u16 gBattleFrontierTrainerMons_Meghan[] =
 {
     FRONTIER_MONS_PKMN_RANGER_1
 };
 
-const u16 gBattleFrontierTrainerMons_Roberto[] = 
+const u16 gBattleFrontierTrainerMons_Roberto[] =
 {
     FRONTIER_MONS_DRAGON_TAMER_1
 };
 
-const u16 gBattleFrontierTrainerMons_Damian[] = 
+const u16 gBattleFrontierTrainerMons_Damian[] =
 {
     FRONTIER_MONS_DRAGON_TAMER_1
 };
 
-const u16 gBattleFrontierTrainerMons_Brody[] = 
+const u16 gBattleFrontierTrainerMons_Brody[] =
 {
     FRONTIER_MONS_DRAGON_TAMER_1
 };
 
-const u16 gBattleFrontierTrainerMons_Graham[] = 
+const u16 gBattleFrontierTrainerMons_Graham[] =
 {
     FRONTIER_MONS_DRAGON_TAMER_1
 };
 
-const u16 gBattleFrontierTrainerMons_Tylor[] = 
+const u16 gBattleFrontierTrainerMons_Tylor[] =
 {
     FRONTIER_MONS_POKEFAN_2
 };
 
-const u16 gBattleFrontierTrainerMons_Jaren[] = 
+const u16 gBattleFrontierTrainerMons_Jaren[] =
 {
     FRONTIER_MONS_POKEFAN_2
 };
 
-const u16 gBattleFrontierTrainerMons_Cordell[] = 
+const u16 gBattleFrontierTrainerMons_Cordell[] =
 {
     FRONTIER_MONS_PKMN_BREEDER_M_1
 };
 
-const u16 gBattleFrontierTrainerMons_Jazlyn[] = 
+const u16 gBattleFrontierTrainerMons_Jazlyn[] =
 {
     FRONTIER_MONS_PKMN_BREEDER_F_1
 };
 
-const u16 gBattleFrontierTrainerMons_Zachery[] = 
+const u16 gBattleFrontierTrainerMons_Zachery[] =
 {
     FRONTIER_MONS_YOUNGSTER_LASS_2
 };
 
-const u16 gBattleFrontierTrainerMons_Johan[] = 
+const u16 gBattleFrontierTrainerMons_Johan[] =
 {
     FRONTIER_MONS_YOUNGSTER_LASS_2_NO_DUGTRIO
 };
 
-const u16 gBattleFrontierTrainerMons_Shea[] = 
+const u16 gBattleFrontierTrainerMons_Shea[] =
 {
     FRONTIER_MONS_YOUNGSTER_LASS_2
 };
 
-const u16 gBattleFrontierTrainerMons_Kaila[] = 
+const u16 gBattleFrontierTrainerMons_Kaila[] =
 {
     FRONTIER_MONS_YOUNGSTER_LASS_2
 };
 
-const u16 gBattleFrontierTrainerMons_Isiah[] = 
+const u16 gBattleFrontierTrainerMons_Isiah[] =
 {
     FRONTIER_MONS_SCHOOL_KID_2
 };
 
-const u16 gBattleFrontierTrainerMons_Garrett[] = 
+const u16 gBattleFrontierTrainerMons_Garrett[] =
 {
     FRONTIER_MONS_SCHOOL_KID_2
 };
 
-const u16 gBattleFrontierTrainerMons_Haylie[] = 
+const u16 gBattleFrontierTrainerMons_Haylie[] =
 {
     FRONTIER_MONS_SCHOOL_KID_2
 };
 
-const u16 gBattleFrontierTrainerMons_Megan[] = 
+const u16 gBattleFrontierTrainerMons_Megan[] =
 {
     FRONTIER_MONS_SCHOOL_KID_2
 };
 
-const u16 gBattleFrontierTrainerMons_Issac[] = 
+const u16 gBattleFrontierTrainerMons_Issac[] =
 {
     FRONTIER_MONS_RICH_BOY_LADY_2
 };
 
-const u16 gBattleFrontierTrainerMons_Quinton[] = 
+const u16 gBattleFrontierTrainerMons_Quinton[] =
 {
     FRONTIER_MONS_RICH_BOY_LADY_2
 };
 
-const u16 gBattleFrontierTrainerMons_Salma[] = 
+const u16 gBattleFrontierTrainerMons_Salma[] =
 {
     FRONTIER_MONS_RICH_BOY_LADY_2
 };
 
-const u16 gBattleFrontierTrainerMons_Ansley[] = 
+const u16 gBattleFrontierTrainerMons_Ansley[] =
 {
     FRONTIER_MONS_RICH_BOY_LADY_2
 };
 
-const u16 gBattleFrontierTrainerMons_Holden[] = 
+const u16 gBattleFrontierTrainerMons_Holden[] =
 {
     FRONTIER_MONS_BUG_CATCHER_2
 };
 
-const u16 gBattleFrontierTrainerMons_Luca[] = 
+const u16 gBattleFrontierTrainerMons_Luca[] =
 {
     FRONTIER_MONS_BUG_CATCHER_2
 };
 
-const u16 gBattleFrontierTrainerMons_Jamison[] = 
+const u16 gBattleFrontierTrainerMons_Jamison[] =
 {
     FRONTIER_MONS_NINJA_BOY_2
 };
 
-const u16 gBattleFrontierTrainerMons_Gunnar[] = 
+const u16 gBattleFrontierTrainerMons_Gunnar[] =
 {
     FRONTIER_MONS_NINJA_BOY_2
 };
 
-const u16 gBattleFrontierTrainerMons_Craig[] = 
+const u16 gBattleFrontierTrainerMons_Craig[] =
 {
     FRONTIER_MONS_TUBER_2
 };
 
-const u16 gBattleFrontierTrainerMons_Pierce[] = 
+const u16 gBattleFrontierTrainerMons_Pierce[] =
 {
     FRONTIER_MONS_TUBER_2
 };
 
-const u16 gBattleFrontierTrainerMons_Regina[] = 
+const u16 gBattleFrontierTrainerMons_Regina[] =
 {
     FRONTIER_MONS_TUBER_2
 };
 
-const u16 gBattleFrontierTrainerMons_Alison[] = 
+const u16 gBattleFrontierTrainerMons_Alison[] =
 {
     FRONTIER_MONS_TUBER_2
 };
 
-const u16 gBattleFrontierTrainerMons_Hank[] = 
+const u16 gBattleFrontierTrainerMons_Hank[] =
 {
     FRONTIER_MONS_BUG_MANIAC_3
 };
 
-const u16 gBattleFrontierTrainerMons_Earl[] = 
+const u16 gBattleFrontierTrainerMons_Earl[] =
 {
     FRONTIER_MONS_BUG_MANIAC_3
 };
 
-const u16 gBattleFrontierTrainerMons_Ramiro[] = 
+const u16 gBattleFrontierTrainerMons_Ramiro[] =
 {
     FRONTIER_MONS_FISHERMAN_2
 };
 
-const u16 gBattleFrontierTrainerMons_Hunter[] = 
+const u16 gBattleFrontierTrainerMons_Hunter[] =
 {
     FRONTIER_MONS_FISHERMAN_2
 };
 
-const u16 gBattleFrontierTrainerMons_Aiden[] = 
+const u16 gBattleFrontierTrainerMons_Aiden[] =
 {
     FRONTIER_MONS_RUIN_MANIAC_3
 };
 
-const u16 gBattleFrontierTrainerMons_Xavier[] = 
+const u16 gBattleFrontierTrainerMons_Xavier[] =
 {
     FRONTIER_MONS_RUIN_MANIAC_3
 };
 
-const u16 gBattleFrontierTrainerMons_Clinton[] = 
+const u16 gBattleFrontierTrainerMons_Clinton[] =
 {
     FRONTIER_MONS_COLLECTOR_2
 };
 
-const u16 gBattleFrontierTrainerMons_Jesse[] = 
+const u16 gBattleFrontierTrainerMons_Jesse[] =
 {
     FRONTIER_MONS_COLLECTOR_2
 };
 
-const u16 gBattleFrontierTrainerMons_Eduardo[] = 
+const u16 gBattleFrontierTrainerMons_Eduardo[] =
 {
     FRONTIER_MONS_GUITARIST_2
 };
 
-const u16 gBattleFrontierTrainerMons_Hal[] = 
+const u16 gBattleFrontierTrainerMons_Hal[] =
 {
     FRONTIER_MONS_GUITARIST_2
 };
 
-const u16 gBattleFrontierTrainerMons_Gage[] = 
+const u16 gBattleFrontierTrainerMons_Gage[] =
 {
     FRONTIER_MONS_BIRD_KEEPER_2
 };
 
-const u16 gBattleFrontierTrainerMons_Arnold[] = 
+const u16 gBattleFrontierTrainerMons_Arnold[] =
 {
     FRONTIER_MONS_BIRD_KEEPER_2
 };
 
-const u16 gBattleFrontierTrainerMons_Jarrett[] = 
+const u16 gBattleFrontierTrainerMons_Jarrett[] =
 {
     FRONTIER_MONS_SAILOR_2
 };
 
-const u16 gBattleFrontierTrainerMons_Garett[] = 
+const u16 gBattleFrontierTrainerMons_Garett[] =
 {
     FRONTIER_MONS_SAILOR_2
 };
 
-const u16 gBattleFrontierTrainerMons_Emanuel[] = 
+const u16 gBattleFrontierTrainerMons_Emanuel[] =
 {
     FRONTIER_MONS_HIKER_2
 };
 
-const u16 gBattleFrontierTrainerMons_Gustavo[] = 
+const u16 gBattleFrontierTrainerMons_Gustavo[] =
 {
     FRONTIER_MONS_HIKER_2
 };
 
-const u16 gBattleFrontierTrainerMons_Kameron[] = 
+const u16 gBattleFrontierTrainerMons_Kameron[] =
 {
     FRONTIER_MONS_KINDLER_2
 };
 
-const u16 gBattleFrontierTrainerMons_Alfredo[] = 
+const u16 gBattleFrontierTrainerMons_Alfredo[] =
 {
     FRONTIER_MONS_KINDLER_2
 };
 
-const u16 gBattleFrontierTrainerMons_Ruben[] = 
+const u16 gBattleFrontierTrainerMons_Ruben[] =
 {
     FRONTIER_MONS_GENTLEMAN_2
 };
 
-const u16 gBattleFrontierTrainerMons_Lamar[] = 
+const u16 gBattleFrontierTrainerMons_Lamar[] =
 {
     FRONTIER_MONS_GENTLEMAN_2
 };
 
-const u16 gBattleFrontierTrainerMons_Jaxon[] = 
+const u16 gBattleFrontierTrainerMons_Jaxon[] =
 {
     FRONTIER_MONS_YOUNGSTER_LASS_3
 };
 
-const u16 gBattleFrontierTrainerMons_Logan[] = 
+const u16 gBattleFrontierTrainerMons_Logan[] =
 {
     FRONTIER_MONS_YOUNGSTER_LASS_3
 };
 
-const u16 gBattleFrontierTrainerMons_Emilee[] = 
+const u16 gBattleFrontierTrainerMons_Emilee[] =
 {
     FRONTIER_MONS_YOUNGSTER_LASS_3
 };
 
-const u16 gBattleFrontierTrainerMons_Josie[] = 
+const u16 gBattleFrontierTrainerMons_Josie[] =
 {
     FRONTIER_MONS_YOUNGSTER_LASS_3
 };
 
-const u16 gBattleFrontierTrainerMons_Armando[] = 
+const u16 gBattleFrontierTrainerMons_Armando[] =
 {
     FRONTIER_MONS_CAMPER_PICNICKER_2
 };
 
-const u16 gBattleFrontierTrainerMons_Skyler[] = 
+const u16 gBattleFrontierTrainerMons_Skyler[] =
 {
     FRONTIER_MONS_CAMPER_PICNICKER_2
 };
 
-const u16 gBattleFrontierTrainerMons_Ruth[] = 
+const u16 gBattleFrontierTrainerMons_Ruth[] =
 {
     FRONTIER_MONS_CAMPER_PICNICKER_2
 };
 
-const u16 gBattleFrontierTrainerMons_Melody[] = 
+const u16 gBattleFrontierTrainerMons_Melody[] =
 {
     FRONTIER_MONS_CAMPER_PICNICKER_2
 };
 
-const u16 gBattleFrontierTrainerMons_Pedro[] = 
+const u16 gBattleFrontierTrainerMons_Pedro[] =
 {
     FRONTIER_MONS_SWIMMER_M_2
 };
 
-const u16 gBattleFrontierTrainerMons_Erick[] = 
+const u16 gBattleFrontierTrainerMons_Erick[] =
 {
     FRONTIER_MONS_SWIMMER_M_2
 };
 
-const u16 gBattleFrontierTrainerMons_Elaine[] = 
+const u16 gBattleFrontierTrainerMons_Elaine[] =
 {
     FRONTIER_MONS_SWIMMER_F_2
 };
 
-const u16 gBattleFrontierTrainerMons_Joyce[] = 
+const u16 gBattleFrontierTrainerMons_Joyce[] =
 {
     FRONTIER_MONS_SWIMMER_F_2
 };
 
-const u16 gBattleFrontierTrainerMons_Todd[] = 
+const u16 gBattleFrontierTrainerMons_Todd[] =
 {
     FRONTIER_MONS_POKEFAN_3
 };
 
-const u16 gBattleFrontierTrainerMons_Gavin[] = 
+const u16 gBattleFrontierTrainerMons_Gavin[] =
 {
     FRONTIER_MONS_POKEFAN_3
 };
 
-const u16 gBattleFrontierTrainerMons_Malory[] = 
+const u16 gBattleFrontierTrainerMons_Malory[] =
 {
     FRONTIER_MONS_POKEFAN_3
 };
 
-const u16 gBattleFrontierTrainerMons_Esther[] = 
+const u16 gBattleFrontierTrainerMons_Esther[] =
 {
     FRONTIER_MONS_POKEFAN_3
 };
 
-const u16 gBattleFrontierTrainerMons_Oscar[] = 
+const u16 gBattleFrontierTrainerMons_Oscar[] =
 {
     FRONTIER_MONS_PKMN_BREEDER_2
 };
 
-const u16 gBattleFrontierTrainerMons_Wilson[] = 
+const u16 gBattleFrontierTrainerMons_Wilson[] =
 {
     FRONTIER_MONS_PKMN_BREEDER_2
 };
 
-const u16 gBattleFrontierTrainerMons_Clare[] = 
+const u16 gBattleFrontierTrainerMons_Clare[] =
 {
     FRONTIER_MONS_PKMN_BREEDER_2
 };
 
-const u16 gBattleFrontierTrainerMons_Tess[] = 
+const u16 gBattleFrontierTrainerMons_Tess[] =
 {
     FRONTIER_MONS_PKMN_BREEDER_2
 };
 
-const u16 gBattleFrontierTrainerMons_Leon[] = 
+const u16 gBattleFrontierTrainerMons_Leon[] =
 {
     FRONTIER_MONS_COOLTRAINER_M_2A
 };
 
-const u16 gBattleFrontierTrainerMons_Alonzo[] = 
+const u16 gBattleFrontierTrainerMons_Alonzo[] =
 {
     FRONTIER_MONS_COOLTRAINER_M_2B
 };
 
-const u16 gBattleFrontierTrainerMons_Vince[] = 
+const u16 gBattleFrontierTrainerMons_Vince[] =
 {
     FRONTIER_MONS_COOLTRAINER_2C(LATIOS)
 };
 
-const u16 gBattleFrontierTrainerMons_Bryon[] = 
+const u16 gBattleFrontierTrainerMons_Bryon[] =
 {
     FRONTIER_MONS_COOLTRAINER_2D(LATIOS)
 };
 
-const u16 gBattleFrontierTrainerMons_Ava[] = 
+const u16 gBattleFrontierTrainerMons_Ava[] =
 {
     FRONTIER_MONS_COOLTRAINER_F_2A
 };
 
-const u16 gBattleFrontierTrainerMons_Miriam[] = 
+const u16 gBattleFrontierTrainerMons_Miriam[] =
 {
     FRONTIER_MONS_COOLTRAINER_F_2B
 };
 
-const u16 gBattleFrontierTrainerMons_Carrie[] = 
+const u16 gBattleFrontierTrainerMons_Carrie[] =
 {
     FRONTIER_MONS_COOLTRAINER_2C(LATIAS)
 };
 
-const u16 gBattleFrontierTrainerMons_Gillian2[] = 
+const u16 gBattleFrontierTrainerMons_Gillian2[] =
 {
     FRONTIER_MONS_COOLTRAINER_2D(LATIAS)
 };
 
-const u16 gBattleFrontierTrainerMons_Tyler[] = 
+const u16 gBattleFrontierTrainerMons_Tyler[] =
 {
     FRONTIER_MONS_GENERAL_A
 };
 
-const u16 gBattleFrontierTrainerMons_Chaz[] = 
+const u16 gBattleFrontierTrainerMons_Chaz[] =
 {
     FRONTIER_MONS_GENERAL_B
 };
 
-const u16 gBattleFrontierTrainerMons_Nelson[] = 
+const u16 gBattleFrontierTrainerMons_Nelson[] =
 {
     FRONTIER_MONS_COOLTRAINER_2D(LATIOS)
 };
 
-const u16 gBattleFrontierTrainerMons_Shania[] = 
+const u16 gBattleFrontierTrainerMons_Shania[] =
 {
     FRONTIER_MONS_GENERAL_C
 };
 
-const u16 gBattleFrontierTrainerMons_Stella[] = 
+const u16 gBattleFrontierTrainerMons_Stella[] =
 {
     FRONTIER_MONS_GENERAL_D
 };
 
-const u16 gBattleFrontierTrainerMons_Dorine[] = 
+const u16 gBattleFrontierTrainerMons_Dorine[] =
 {
     FRONTIER_MONS_COOLTRAINER_2D(LATIAS)
 };
 
-const u16 gBattleFrontierTrainerMons_Maddox[] = 
+const u16 gBattleFrontierTrainerMons_Maddox[] =
 {
     FRONTIER_MONS_DRAGON_TAMER_2
 };
 
-const u16 gBattleFrontierTrainerMons_Davin[] = 
+const u16 gBattleFrontierTrainerMons_Davin[] =
 {
     FRONTIER_MONS_DRAGON_TAMER_2
 };
 
-const u16 gBattleFrontierTrainerMons_Trevon[] = 
+const u16 gBattleFrontierTrainerMons_Trevon[] =
 {
     FRONTIER_MONS_DRAGON_TAMER_2
 };
 
-const u16 gBattleFrontierTrainerMons_Mateo[] = 
+const u16 gBattleFrontierTrainerMons_Mateo[] =
 {
     FRONTIER_MONS_BLACK_BELT_2A
 };
 
-const u16 gBattleFrontierTrainerMons_Bret[] = 
+const u16 gBattleFrontierTrainerMons_Bret[] =
 {
     FRONTIER_MONS_BLACK_BELT_BATTLE_GIRL_2B
 };
 
-const u16 gBattleFrontierTrainerMons_Raul[] = 
+const u16 gBattleFrontierTrainerMons_Raul[] =
 {
     FRONTIER_MONS_BLACK_BELT_BATTLE_GIRL_2C
 };
 
-const u16 gBattleFrontierTrainerMons_Kay[] = 
+const u16 gBattleFrontierTrainerMons_Kay[] =
 {
     FRONTIER_MONS_BATTLE_GIRL_2A
 };
 
-const u16 gBattleFrontierTrainerMons_Elena[] = 
+const u16 gBattleFrontierTrainerMons_Elena[] =
 {
     FRONTIER_MONS_BLACK_BELT_BATTLE_GIRL_2B
 };
 
-const u16 gBattleFrontierTrainerMons_Alana[] = 
+const u16 gBattleFrontierTrainerMons_Alana[] =
 {
     FRONTIER_MONS_BLACK_BELT_BATTLE_GIRL_2C
 };
 
-const u16 gBattleFrontierTrainerMons_Alexas[] = 
+const u16 gBattleFrontierTrainerMons_Alexas[] =
 {
     FRONTIER_MONS_EXPERT_2A(TYRANITAR)
 };
 
-const u16 gBattleFrontierTrainerMons_Weston[] = 
+const u16 gBattleFrontierTrainerMons_Weston[] =
 {
     FRONTIER_MONS_EXPERT_2B(LATIOS)
 };
 
-const u16 gBattleFrontierTrainerMons_Jasper[] = 
+const u16 gBattleFrontierTrainerMons_Jasper[] =
 {
     FRONTIER_MONS_EXPERT_2C(TYRANITAR)
 };
 
-const u16 gBattleFrontierTrainerMons_Nadia[] = 
+const u16 gBattleFrontierTrainerMons_Nadia[] =
 {
     FRONTIER_MONS_EXPERT_2A(DRAGONITE)
 };
 
-const u16 gBattleFrontierTrainerMons_Miranda[] = 
+const u16 gBattleFrontierTrainerMons_Miranda[] =
 {
     FRONTIER_MONS_EXPERT_2B(LATIAS)
 };
 
-const u16 gBattleFrontierTrainerMons_Emma[] = 
+const u16 gBattleFrontierTrainerMons_Emma[] =
 {
     FRONTIER_MONS_EXPERT_2C(DRAGONITE)
 };
 
-const u16 gBattleFrontierTrainerMons_Rolando[] = 
+const u16 gBattleFrontierTrainerMons_Rolando[] =
 {
     FRONTIER_MONS_PSYCHIC_2A(LATIOS)
 };
 
-const u16 gBattleFrontierTrainerMons_Stanly[] = 
+const u16 gBattleFrontierTrainerMons_Stanly[] =
 {
     FRONTIER_MONS_PSYCHIC_2B(LATIOS)
 };
 
-const u16 gBattleFrontierTrainerMons_Dario[] = 
+const u16 gBattleFrontierTrainerMons_Dario[] =
 {
     FRONTIER_MONS_PSYCHIC_2C(LATIOS)
 };
 
-const u16 gBattleFrontierTrainerMons_Karlee[] = 
+const u16 gBattleFrontierTrainerMons_Karlee[] =
 {
     FRONTIER_MONS_PSYCHIC_2A(LATIAS)
 };
 
-const u16 gBattleFrontierTrainerMons_Jaylin[] = 
+const u16 gBattleFrontierTrainerMons_Jaylin[] =
 {
     FRONTIER_MONS_PSYCHIC_2B(LATIAS)
 };
 
-const u16 gBattleFrontierTrainerMons_Ingrid[] = 
+const u16 gBattleFrontierTrainerMons_Ingrid[] =
 {
     FRONTIER_MONS_PSYCHIC_2C(LATIAS)
 };
 
-const u16 gBattleFrontierTrainerMons_Delilah[] = 
+const u16 gBattleFrontierTrainerMons_Delilah[] =
 {
     FRONTIER_MONS_HEX_MANIAC_2A
 };
 
-const u16 gBattleFrontierTrainerMons_Carly[] = 
+const u16 gBattleFrontierTrainerMons_Carly[] =
 {
     FRONTIER_MONS_HEX_MANIAC_2B
 };
 
-const u16 gBattleFrontierTrainerMons_Lexie[] = 
+const u16 gBattleFrontierTrainerMons_Lexie[] =
 {
     FRONTIER_MONS_HEX_MANIAC_2C
 };
 
-const u16 gBattleFrontierTrainerMons_Miller[] = 
+const u16 gBattleFrontierTrainerMons_Miller[] =
 {
     FRONTIER_MONS_POKEMANIAC_2A
 };
 
-const u16 gBattleFrontierTrainerMons_Marv[] = 
+const u16 gBattleFrontierTrainerMons_Marv[] =
 {
     FRONTIER_MONS_POKEMANIAC_2B
 };
 
-const u16 gBattleFrontierTrainerMons_Layton[] = 
+const u16 gBattleFrontierTrainerMons_Layton[] =
 {
     FRONTIER_MONS_POKEMANIAC_2C
 };
 
-const u16 gBattleFrontierTrainerMons_Brooks[] = 
+const u16 gBattleFrontierTrainerMons_Brooks[] =
 {
     FRONTIER_MONS_GENERAL_A
 };
 
-const u16 gBattleFrontierTrainerMons_Gregory[] = 
+const u16 gBattleFrontierTrainerMons_Gregory[] =
 {
     FRONTIER_MONS_GENTLEMAN_3A
 };
 
-const u16 gBattleFrontierTrainerMons_Reese[] = 
+const u16 gBattleFrontierTrainerMons_Reese[] =
 {
     FRONTIER_MONS_GENTLEMAN_3B
 };
 
-const u16 gBattleFrontierTrainerMons_Mason[] = 
+const u16 gBattleFrontierTrainerMons_Mason[] =
 {
     FRONTIER_MONS_GENERAL_A
 };
 
-const u16 gBattleFrontierTrainerMons_Toby[] = 
+const u16 gBattleFrontierTrainerMons_Toby[] =
 {
     FRONTIER_MONS_GENERAL_B
 };
 
-const u16 gBattleFrontierTrainerMons_Dorothy[] = 
+const u16 gBattleFrontierTrainerMons_Dorothy[] =
 {
     FRONTIER_MONS_GENERAL_C
 };
 
-const u16 gBattleFrontierTrainerMons_Piper[] = 
+const u16 gBattleFrontierTrainerMons_Piper[] =
 {
     FRONTIER_MONS_GENERAL_D
 };
 
-const u16 gBattleFrontierTrainerMons_Finn[] = 
+const u16 gBattleFrontierTrainerMons_Finn[] =
 {
     FRONTIER_MONS_SWIMMING_TRIATHLETE_M_3
 };
 
-const u16 gBattleFrontierTrainerMons_Samir[] = 
+const u16 gBattleFrontierTrainerMons_Samir[] =
 {
     FRONTIER_MONS_SWIMMING_TRIATHLETE_M_3
 };
 
-const u16 gBattleFrontierTrainerMons_Fiona[] = 
+const u16 gBattleFrontierTrainerMons_Fiona[] =
 {
     FRONTIER_MONS_SWIMMING_TRIATHLETE_F_3
 };
 
-const u16 gBattleFrontierTrainerMons_Gloria[] = 
+const u16 gBattleFrontierTrainerMons_Gloria[] =
 {
     FRONTIER_MONS_SWIMMING_TRIATHLETE_F_3
 };
 
-const u16 gBattleFrontierTrainerMons_Nico[] = 
+const u16 gBattleFrontierTrainerMons_Nico[] =
 {
     FRONTIER_MONS_GENERAL_A
 };
 
-const u16 gBattleFrontierTrainerMons_Jeremy[] = 
+const u16 gBattleFrontierTrainerMons_Jeremy[] =
 {
     FRONTIER_MONS_GENERAL_B
 };
 
-const u16 gBattleFrontierTrainerMons_Caitlin[] = 
+const u16 gBattleFrontierTrainerMons_Caitlin[] =
 {
     FRONTIER_MONS_GENERAL_C
 };
 
-const u16 gBattleFrontierTrainerMons_Reena[] = 
+const u16 gBattleFrontierTrainerMons_Reena[] =
 {
     FRONTIER_MONS_GENERAL_D
 };
 
-const u16 gBattleFrontierTrainerMons_Avery[] = 
+const u16 gBattleFrontierTrainerMons_Avery[] =
 {
     FRONTIER_MONS_BUG_MANIAC_4
 };
 
-const u16 gBattleFrontierTrainerMons_Liam[] = 
+const u16 gBattleFrontierTrainerMons_Liam[] =
 {
     FRONTIER_MONS_BUG_MANIAC_4
 };
 
-const u16 gBattleFrontierTrainerMons_Theo[] = 
+const u16 gBattleFrontierTrainerMons_Theo[] =
 {
     FRONTIER_MONS_FISHERMAN_3
 };
 
-const u16 gBattleFrontierTrainerMons_Bailey[] = 
+const u16 gBattleFrontierTrainerMons_Bailey[] =
 {
     FRONTIER_MONS_FISHERMAN_3
 };
 
-const u16 gBattleFrontierTrainerMons_Hugo[] = 
+const u16 gBattleFrontierTrainerMons_Hugo[] =
 {
     FRONTIER_MONS_RUIN_MANIAC_4
 };
 
-const u16 gBattleFrontierTrainerMons_Bryce[] = 
+const u16 gBattleFrontierTrainerMons_Bryce[] =
 {
     FRONTIER_MONS_RUIN_MANIAC_4
 };
 
-const u16 gBattleFrontierTrainerMons_Gideon[] = 
+const u16 gBattleFrontierTrainerMons_Gideon[] =
 {
     FRONTIER_MONS_COLLECTOR_3
 };
 
-const u16 gBattleFrontierTrainerMons_Triston[] = 
+const u16 gBattleFrontierTrainerMons_Triston[] =
 {
     FRONTIER_MONS_COLLECTOR_3
 };
 
-const u16 gBattleFrontierTrainerMons_Charles[] = 
+const u16 gBattleFrontierTrainerMons_Charles[] =
 {
     FRONTIER_MONS_GUITARIST_3A
 };
 
-const u16 gBattleFrontierTrainerMons_Raymond[] = 
+const u16 gBattleFrontierTrainerMons_Raymond[] =
 {
     FRONTIER_MONS_GUITARIST_3B
 };
 
-const u16 gBattleFrontierTrainerMons_Dirk[] = 
+const u16 gBattleFrontierTrainerMons_Dirk[] =
 {
     FRONTIER_MONS_BIRD_KEEPER_3
 };
 
-const u16 gBattleFrontierTrainerMons_Harold[] = 
+const u16 gBattleFrontierTrainerMons_Harold[] =
 {
     FRONTIER_MONS_BIRD_KEEPER_3
 };
 
-const u16 gBattleFrontierTrainerMons_Omar[] = 
+const u16 gBattleFrontierTrainerMons_Omar[] =
 {
     FRONTIER_MONS_SAILOR_3
 };
 
-const u16 gBattleFrontierTrainerMons_Peter[] = 
+const u16 gBattleFrontierTrainerMons_Peter[] =
 {
     FRONTIER_MONS_SAILOR_3
 };
 
-const u16 gBattleFrontierTrainerMons_Dev[] = 
+const u16 gBattleFrontierTrainerMons_Dev[] =
 {
     FRONTIER_MONS_HIKER_3
 };
 
-const u16 gBattleFrontierTrainerMons_Corey[] = 
+const u16 gBattleFrontierTrainerMons_Corey[] =
 {
     FRONTIER_MONS_HIKER_3
 };
 
-const u16 gBattleFrontierTrainerMons_Andre[] = 
+const u16 gBattleFrontierTrainerMons_Andre[] =
 {
     FRONTIER_MONS_KINDLER_3
 };
 
-const u16 gBattleFrontierTrainerMons_Ferris[] = 
+const u16 gBattleFrontierTrainerMons_Ferris[] =
 {
     FRONTIER_MONS_KINDLER_3
 };
 
-const u16 gBattleFrontierTrainerMons_Alivia[] = 
+const u16 gBattleFrontierTrainerMons_Alivia[] =
 {
     FRONTIER_MONS_PARASOL_LADY_3
 };
 
-const u16 gBattleFrontierTrainerMons_Paige[] = 
+const u16 gBattleFrontierTrainerMons_Paige[] =
 {
     FRONTIER_MONS_PARASOL_LADY_3
 };
 
-const u16 gBattleFrontierTrainerMons_Anya[] = 
+const u16 gBattleFrontierTrainerMons_Anya[] =
 {
     FRONTIER_MONS_EEVEELUTIONS
 };
 
-const u16 gBattleFrontierTrainerMons_Dawn[] = 
+const u16 gBattleFrontierTrainerMons_Dawn[] =
 {
     FRONTIER_MONS_BEAUTY_2
 };
 
-const u16 gBattleFrontierTrainerMons_Abby[] = 
+const u16 gBattleFrontierTrainerMons_Abby[] =
 {
     FRONTIER_MONS_AROMA_LADY_3
 };
 
-const u16 gBattleFrontierTrainerMons_Gretel[] = 
+const u16 gBattleFrontierTrainerMons_Gretel[] =
 {
     FRONTIER_MONS_AROMA_LADY_3
 };
diff --git a/src/data/battle_frontier/battle_tent.h b/src/data/battle_frontier/battle_tent.h
index e1c3750bf..de08dcfd6 100644
--- a/src/data/battle_frontier/battle_tent.h
+++ b/src/data/battle_frontier/battle_tent.h
@@ -1,5 +1,5 @@
 // Slateport Battle Tent.
-const u16 gSlateportBattleTentTrainerMons_Jolie[] = 
+const u16 gSlateportBattleTentTrainerMons_Jolie[] =
 {
     SLATEPORT_TENT_MON_CACNEA_1,
     SLATEPORT_TENT_MON_LOMBRE_1,
@@ -15,7 +15,7 @@ const u16 gSlateportBattleTentTrainerMons_Jolie[] =
     -1
 };
 
-const u16 gSlateportBattleTentTrainerMons_Malachi[] = 
+const u16 gSlateportBattleTentTrainerMons_Malachi[] =
 {
     SLATEPORT_TENT_MON_CACNEA_1,
     SLATEPORT_TENT_MON_GRAVELER,
@@ -31,7 +31,7 @@ const u16 gSlateportBattleTentTrainerMons_Malachi[] =
     -1
 };
 
-const u16 gSlateportBattleTentTrainerMons_Kelsie[] = 
+const u16 gSlateportBattleTentTrainerMons_Kelsie[] =
 {
     SLATEPORT_TENT_MON_WAILMER_1,
     SLATEPORT_TENT_MON_WAILMER_2,
@@ -47,7 +47,7 @@ const u16 gSlateportBattleTentTrainerMons_Kelsie[] =
     -1
 };
 
-const u16 gSlateportBattleTentTrainerMons_Davon[] = 
+const u16 gSlateportBattleTentTrainerMons_Davon[] =
 {
     SLATEPORT_TENT_MON_WAILMER_1,
     SLATEPORT_TENT_MON_WAILMER_2,
@@ -64,7 +64,7 @@ const u16 gSlateportBattleTentTrainerMons_Davon[] =
     -1
 };
 
-const u16 gSlateportBattleTentTrainerMons_Glenda[] = 
+const u16 gSlateportBattleTentTrainerMons_Glenda[] =
 {
     SLATEPORT_TENT_MON_ZIGZAGOON_1,
     SLATEPORT_TENT_MON_ZIGZAGOON_2,
@@ -82,7 +82,7 @@ const u16 gSlateportBattleTentTrainerMons_Glenda[] =
     -1
 };
 
-const u16 gSlateportBattleTentTrainerMons_Helena[] = 
+const u16 gSlateportBattleTentTrainerMons_Helena[] =
 {
     SLATEPORT_TENT_MON_MIGHTYENA_1,
     SLATEPORT_TENT_MON_MIGHTYENA_2,
@@ -98,7 +98,7 @@ const u16 gSlateportBattleTentTrainerMons_Helena[] =
     -1
 };
 
-const u16 gSlateportBattleTentTrainerMons_Rodolfo[] = 
+const u16 gSlateportBattleTentTrainerMons_Rodolfo[] =
 {
     SLATEPORT_TENT_MON_ZIGZAGOON_1,
     SLATEPORT_TENT_MON_ZIGZAGOON_2,
@@ -116,7 +116,7 @@ const u16 gSlateportBattleTentTrainerMons_Rodolfo[] =
     -1
 };
 
-const u16 gSlateportBattleTentTrainerMons_Davion[] = 
+const u16 gSlateportBattleTentTrainerMons_Davion[] =
 {
     SLATEPORT_TENT_MON_BALTOY,
     SLATEPORT_TENT_MON_VOLTORB,
@@ -135,7 +135,7 @@ const u16 gSlateportBattleTentTrainerMons_Davion[] =
     -1
 };
 
-const u16 gSlateportBattleTentTrainerMons_Kendall[] = 
+const u16 gSlateportBattleTentTrainerMons_Kendall[] =
 {
     SLATEPORT_TENT_MON_WAILMER_1,
     SLATEPORT_TENT_MON_WINGULL_1,
@@ -154,7 +154,7 @@ const u16 gSlateportBattleTentTrainerMons_Kendall[] =
     -1
 };
 
-const u16 gSlateportBattleTentTrainerMons_Colten[] = 
+const u16 gSlateportBattleTentTrainerMons_Colten[] =
 {
     SLATEPORT_TENT_MON_ZIGZAGOON_1,
     SLATEPORT_TENT_MON_BEAUTIFLY,
@@ -171,7 +171,7 @@ const u16 gSlateportBattleTentTrainerMons_Colten[] =
     -1
 };
 
-const u16 gSlateportBattleTentTrainerMons_Irvin[] = 
+const u16 gSlateportBattleTentTrainerMons_Irvin[] =
 {
     SLATEPORT_TENT_MON_ZIGZAGOON_1,
     SLATEPORT_TENT_MON_ZIGZAGOON_2,
@@ -189,7 +189,7 @@ const u16 gSlateportBattleTentTrainerMons_Irvin[] =
     -1
 };
 
-const u16 gSlateportBattleTentTrainerMons_Shaun[] = 
+const u16 gSlateportBattleTentTrainerMons_Shaun[] =
 {
     SLATEPORT_TENT_MON_BALTOY,
     SLATEPORT_TENT_MON_MIGHTYENA_1,
@@ -207,7 +207,7 @@ const u16 gSlateportBattleTentTrainerMons_Shaun[] =
     -1
 };
 
-const u16 gSlateportBattleTentTrainerMons_Kyler[] = 
+const u16 gSlateportBattleTentTrainerMons_Kyler[] =
 {
     SLATEPORT_TENT_MON_ELECTRIKE_1,
     SLATEPORT_TENT_MON_VOLTORB,
@@ -224,7 +224,7 @@ const u16 gSlateportBattleTentTrainerMons_Kyler[] =
     -1
 };
 
-const u16 gSlateportBattleTentTrainerMons_Maggie[] = 
+const u16 gSlateportBattleTentTrainerMons_Maggie[] =
 {
     SLATEPORT_TENT_MON_LOMBRE_1,
     SLATEPORT_TENT_MON_NUZLEAF,
@@ -240,7 +240,7 @@ const u16 gSlateportBattleTentTrainerMons_Maggie[] =
     -1
 };
 
-const u16 gSlateportBattleTentTrainerMons_Stephon[] = 
+const u16 gSlateportBattleTentTrainerMons_Stephon[] =
 {
     SLATEPORT_TENT_MON_PELIPPER_1,
     SLATEPORT_TENT_MON_LOMBRE_1,
@@ -256,7 +256,7 @@ const u16 gSlateportBattleTentTrainerMons_Stephon[] =
     -1
 };
 
-const u16 gSlateportBattleTentTrainerMons_Rebecca[] = 
+const u16 gSlateportBattleTentTrainerMons_Rebecca[] =
 {
     SLATEPORT_TENT_MON_PELIPPER_1,
     SLATEPORT_TENT_MON_NUZLEAF,
@@ -272,7 +272,7 @@ const u16 gSlateportBattleTentTrainerMons_Rebecca[] =
     -1
 };
 
-const u16 gSlateportBattleTentTrainerMons_Reggie[] = 
+const u16 gSlateportBattleTentTrainerMons_Reggie[] =
 {
     SLATEPORT_TENT_MON_MARILL_1,
     SLATEPORT_TENT_MON_WINGULL_1,
@@ -289,7 +289,7 @@ const u16 gSlateportBattleTentTrainerMons_Reggie[] =
     -1
 };
 
-const u16 gSlateportBattleTentTrainerMons_Janae[] = 
+const u16 gSlateportBattleTentTrainerMons_Janae[] =
 {
     SLATEPORT_TENT_MON_ZIGZAGOON_1,
     SLATEPORT_TENT_MON_ZIGZAGOON_2,
@@ -306,7 +306,7 @@ const u16 gSlateportBattleTentTrainerMons_Janae[] =
     -1
 };
 
-const u16 gSlateportBattleTentTrainerMons_Caiden[] = 
+const u16 gSlateportBattleTentTrainerMons_Caiden[] =
 {
     SLATEPORT_TENT_MON_LOMBRE_1,
     SLATEPORT_TENT_MON_NINJASK_1,
@@ -324,7 +324,7 @@ const u16 gSlateportBattleTentTrainerMons_Caiden[] =
     -1
 };
 
-const u16 gSlateportBattleTentTrainerMons_Kirsten[] = 
+const u16 gSlateportBattleTentTrainerMons_Kirsten[] =
 {
     SLATEPORT_TENT_MON_LOMBRE_1,
     SLATEPORT_TENT_MON_GRAVELER,
@@ -342,7 +342,7 @@ const u16 gSlateportBattleTentTrainerMons_Kirsten[] =
     -1
 };
 
-const u16 gSlateportBattleTentTrainerMons_Kurtis[] = 
+const u16 gSlateportBattleTentTrainerMons_Kurtis[] =
 {
     SLATEPORT_TENT_MON_ZIGZAGOON_1,
     SLATEPORT_TENT_MON_ZIGZAGOON_2,
@@ -358,7 +358,7 @@ const u16 gSlateportBattleTentTrainerMons_Kurtis[] =
     -1
 };
 
-const u16 gSlateportBattleTentTrainerMons_Stefan[] = 
+const u16 gSlateportBattleTentTrainerMons_Stefan[] =
 {
     SLATEPORT_TENT_MON_WAILMER_1,
     SLATEPORT_TENT_MON_WAILMER_2,
@@ -374,7 +374,7 @@ const u16 gSlateportBattleTentTrainerMons_Stefan[] =
     -1
 };
 
-const u16 gSlateportBattleTentTrainerMons_Avery[] = 
+const u16 gSlateportBattleTentTrainerMons_Avery[] =
 {
     SLATEPORT_TENT_MON_BEAUTIFLY,
     SLATEPORT_TENT_MON_DUSTOX,
@@ -390,7 +390,7 @@ const u16 gSlateportBattleTentTrainerMons_Avery[] =
     -1
 };
 
-const u16 gSlateportBattleTentTrainerMons_Dwane[] = 
+const u16 gSlateportBattleTentTrainerMons_Dwane[] =
 {
     SLATEPORT_TENT_MON_NINJASK_1,
     SLATEPORT_TENT_MON_NINJASK_2,
@@ -406,7 +406,7 @@ const u16 gSlateportBattleTentTrainerMons_Dwane[] =
     -1
 };
 
-const u16 gSlateportBattleTentTrainerMons_Mckenna[] = 
+const u16 gSlateportBattleTentTrainerMons_Mckenna[] =
 {
     SLATEPORT_TENT_MON_CACNEA_2,
     SLATEPORT_TENT_MON_SWELLOW,
@@ -422,7 +422,7 @@ const u16 gSlateportBattleTentTrainerMons_Mckenna[] =
     -1
 };
 
-const u16 gSlateportBattleTentTrainerMons_Camryn[] = 
+const u16 gSlateportBattleTentTrainerMons_Camryn[] =
 {
     SLATEPORT_TENT_MON_WAILMER_2,
     SLATEPORT_TENT_MON_MARILL_1,
@@ -439,7 +439,7 @@ const u16 gSlateportBattleTentTrainerMons_Camryn[] =
     -1
 };
 
-const u16 gSlateportBattleTentTrainerMons_Natasha[] = 
+const u16 gSlateportBattleTentTrainerMons_Natasha[] =
 {
     SLATEPORT_TENT_MON_ZIGZAGOON_2,
     SLATEPORT_TENT_MON_DUSTOX,
@@ -455,7 +455,7 @@ const u16 gSlateportBattleTentTrainerMons_Natasha[] =
     -1
 };
 
-const u16 gSlateportBattleTentTrainerMons_Austyn[] = 
+const u16 gSlateportBattleTentTrainerMons_Austyn[] =
 {
     SLATEPORT_TENT_MON_ARON_2,
     SLATEPORT_TENT_MON_LOUDRED,
@@ -472,7 +472,7 @@ const u16 gSlateportBattleTentTrainerMons_Austyn[] =
     -1
 };
 
-const u16 gSlateportBattleTentTrainerMons_Donovan[] = 
+const u16 gSlateportBattleTentTrainerMons_Donovan[] =
 {
     SLATEPORT_TENT_MON_LOMBRE_1,
     SLATEPORT_TENT_MON_GRAVELER,
@@ -491,7 +491,7 @@ const u16 gSlateportBattleTentTrainerMons_Donovan[] =
     -1
 };
 
-const u16 gSlateportBattleTentTrainerMons_Tamia[] = 
+const u16 gSlateportBattleTentTrainerMons_Tamia[] =
 {
     SLATEPORT_TENT_MON_BEAUTIFLY,
     SLATEPORT_TENT_MON_MARILL_1,
@@ -507,7 +507,7 @@ const u16 gSlateportBattleTentTrainerMons_Tamia[] =
     -1
 };
 
-const struct BattleFrontierTrainer gSlateportBattleTentTrainers[NUM_BATTLE_TENT_TRAINERS] = 
+const struct BattleFrontierTrainer gSlateportBattleTentTrainers[NUM_BATTLE_TENT_TRAINERS] =
 {
     [SLATEPORT_TENT_TRAINER_JOLIE] = {
         .facilityClass = FACILITY_CLASS_AROMA_LADY,
@@ -751,7 +751,7 @@ const struct BattleFrontierTrainer gSlateportBattleTentTrainers[NUM_BATTLE_TENT_
     }
 };
 
-const struct FacilityMon gSlateportBattleTentMons[NUM_SLATEPORT_TENT_MONS] = 
+const struct FacilityMon gSlateportBattleTentMons[NUM_SLATEPORT_TENT_MONS] =
 {
     [SLATEPORT_TENT_MON_ZIGZAGOON_1] = {
         .species = SPECIES_ZIGZAGOON,
@@ -1246,7 +1246,7 @@ const struct FacilityMon gSlateportBattleTentMons[NUM_SLATEPORT_TENT_MONS] =
 };
 
 // Verdanturf Battle Tent.
-const u16 gVerdanturfBattleTentTrainerMons_Brenna[] = 
+const u16 gVerdanturfBattleTentTrainerMons_Brenna[] =
 {
     VERDANTURF_TENT_MON_SHROOMISH,
     VERDANTURF_TENT_MON_SWALOT,
@@ -1256,7 +1256,7 @@ const u16 gVerdanturfBattleTentTrainerMons_Brenna[] =
     -1
 };
 
-const u16 gVerdanturfBattleTentTrainerMons_Dilan[] = 
+const u16 gVerdanturfBattleTentTrainerMons_Dilan[] =
 {
     VERDANTURF_TENT_MON_GRAVELER,
     VERDANTURF_TENT_MON_TRAPINCH,
@@ -1266,7 +1266,7 @@ const u16 gVerdanturfBattleTentTrainerMons_Dilan[] =
     -1
 };
 
-const u16 gVerdanturfBattleTentTrainerMons_Eliana[] = 
+const u16 gVerdanturfBattleTentTrainerMons_Eliana[] =
 {
     VERDANTURF_TENT_MON_MAGIKARP,
     VERDANTURF_TENT_MON_BARBOACH,
@@ -1276,7 +1276,7 @@ const u16 gVerdanturfBattleTentTrainerMons_Eliana[] =
     -1
 };
 
-const u16 gVerdanturfBattleTentTrainerMons_Markus[] = 
+const u16 gVerdanturfBattleTentTrainerMons_Markus[] =
 {
     VERDANTURF_TENT_MON_MAGIKARP,
     VERDANTURF_TENT_MON_BARBOACH,
@@ -1286,7 +1286,7 @@ const u16 gVerdanturfBattleTentTrainerMons_Markus[] =
     -1
 };
 
-const u16 gVerdanturfBattleTentTrainerMons_Caitlyn[] = 
+const u16 gVerdanturfBattleTentTrainerMons_Caitlyn[] =
 {
     VERDANTURF_TENT_MON_POOCHYENA,
     VERDANTURF_TENT_MON_KECLEON,
@@ -1297,7 +1297,7 @@ const u16 gVerdanturfBattleTentTrainerMons_Caitlyn[] =
     -1
 };
 
-const u16 gVerdanturfBattleTentTrainerMons_Desiree[] = 
+const u16 gVerdanturfBattleTentTrainerMons_Desiree[] =
 {
     VERDANTURF_TENT_MON_WINGULL,
     VERDANTURF_TENT_MON_KECLEON,
@@ -1307,7 +1307,7 @@ const u16 gVerdanturfBattleTentTrainerMons_Desiree[] =
     -1
 };
 
-const u16 gVerdanturfBattleTentTrainerMons_Ronald[] = 
+const u16 gVerdanturfBattleTentTrainerMons_Ronald[] =
 {
     VERDANTURF_TENT_MON_ZIGZAGOON,
     VERDANTURF_TENT_MON_LINOONE,
@@ -1317,7 +1317,7 @@ const u16 gVerdanturfBattleTentTrainerMons_Ronald[] =
     -1
 };
 
-const u16 gVerdanturfBattleTentTrainerMons_Ashten[] = 
+const u16 gVerdanturfBattleTentTrainerMons_Ashten[] =
 {
     VERDANTURF_TENT_MON_ARON_1,
     VERDANTURF_TENT_MON_KECLEON,
@@ -1327,7 +1327,7 @@ const u16 gVerdanturfBattleTentTrainerMons_Ashten[] =
     -1
 };
 
-const u16 gVerdanturfBattleTentTrainerMons_Gerard[] = 
+const u16 gVerdanturfBattleTentTrainerMons_Gerard[] =
 {
     VERDANTURF_TENT_MON_MARILL,
     VERDANTURF_TENT_MON_BARBOACH,
@@ -1337,7 +1337,7 @@ const u16 gVerdanturfBattleTentTrainerMons_Gerard[] =
     -1
 };
 
-const u16 gVerdanturfBattleTentTrainerMons_Bradly[] = 
+const u16 gVerdanturfBattleTentTrainerMons_Bradly[] =
 {
     VERDANTURF_TENT_MON_NUZLEAF,
     VERDANTURF_TENT_MON_TAILLOW,
@@ -1347,7 +1347,7 @@ const u16 gVerdanturfBattleTentTrainerMons_Bradly[] =
     -1
 };
 
-const u16 gVerdanturfBattleTentTrainerMons_Dennis[] = 
+const u16 gVerdanturfBattleTentTrainerMons_Dennis[] =
 {
     VERDANTURF_TENT_MON_NINJASK,
     VERDANTURF_TENT_MON_TRAPINCH,
@@ -1357,7 +1357,7 @@ const u16 gVerdanturfBattleTentTrainerMons_Dennis[] =
     -1
 };
 
-const u16 gVerdanturfBattleTentTrainerMons_Prestin[] = 
+const u16 gVerdanturfBattleTentTrainerMons_Prestin[] =
 {
     VERDANTURF_TENT_MON_KADABRA,
     VERDANTURF_TENT_MON_MIGHTYENA,
@@ -1369,7 +1369,7 @@ const u16 gVerdanturfBattleTentTrainerMons_Prestin[] =
     -1
 };
 
-const u16 gVerdanturfBattleTentTrainerMons_Ernesto[] = 
+const u16 gVerdanturfBattleTentTrainerMons_Ernesto[] =
 {
     VERDANTURF_TENT_MON_MAGNEMITE,
     VERDANTURF_TENT_MON_VOLTORB,
@@ -1379,7 +1379,7 @@ const u16 gVerdanturfBattleTentTrainerMons_Ernesto[] =
     -1
 };
 
-const u16 gVerdanturfBattleTentTrainerMons_Nala[] = 
+const u16 gVerdanturfBattleTentTrainerMons_Nala[] =
 {
     VERDANTURF_TENT_MON_ZIGZAGOON,
     VERDANTURF_TENT_MON_SHROOMISH,
@@ -1391,7 +1391,7 @@ const u16 gVerdanturfBattleTentTrainerMons_Nala[] =
     -1
 };
 
-const u16 gVerdanturfBattleTentTrainerMons_Darnell[] = 
+const u16 gVerdanturfBattleTentTrainerMons_Darnell[] =
 {
     VERDANTURF_TENT_MON_POOCHYENA,
     VERDANTURF_TENT_MON_SOLROCK,
@@ -1402,7 +1402,7 @@ const u16 gVerdanturfBattleTentTrainerMons_Darnell[] =
     -1
 };
 
-const u16 gVerdanturfBattleTentTrainerMons_Ashlyn[] = 
+const u16 gVerdanturfBattleTentTrainerMons_Ashlyn[] =
 {
     VERDANTURF_TENT_MON_SOLROCK,
     VERDANTURF_TENT_MON_MARILL,
@@ -1414,7 +1414,7 @@ const u16 gVerdanturfBattleTentTrainerMons_Ashlyn[] =
     -1
 };
 
-const u16 gVerdanturfBattleTentTrainerMons_Addison[] = 
+const u16 gVerdanturfBattleTentTrainerMons_Addison[] =
 {
     VERDANTURF_TENT_MON_POOCHYENA,
     VERDANTURF_TENT_MON_ZIGZAGOON,
@@ -1424,7 +1424,7 @@ const u16 gVerdanturfBattleTentTrainerMons_Addison[] =
     -1
 };
 
-const u16 gVerdanturfBattleTentTrainerMons_Justine[] = 
+const u16 gVerdanturfBattleTentTrainerMons_Justine[] =
 {
     VERDANTURF_TENT_MON_POOCHYENA,
     VERDANTURF_TENT_MON_ZIGZAGOON,
@@ -1434,7 +1434,7 @@ const u16 gVerdanturfBattleTentTrainerMons_Justine[] =
     -1
 };
 
-const u16 gVerdanturfBattleTentTrainerMons_Tyson[] = 
+const u16 gVerdanturfBattleTentTrainerMons_Tyson[] =
 {
     VERDANTURF_TENT_MON_MACHOP,
     VERDANTURF_TENT_MON_MAKUHITA,
@@ -1446,7 +1446,7 @@ const u16 gVerdanturfBattleTentTrainerMons_Tyson[] =
     -1
 };
 
-const u16 gVerdanturfBattleTentTrainerMons_Laila[] = 
+const u16 gVerdanturfBattleTentTrainerMons_Laila[] =
 {
     VERDANTURF_TENT_MON_MACHOP,
     VERDANTURF_TENT_MON_MAKUHITA,
@@ -1457,7 +1457,7 @@ const u16 gVerdanturfBattleTentTrainerMons_Laila[] =
     -1
 };
 
-const u16 gVerdanturfBattleTentTrainerMons_Waren[] = 
+const u16 gVerdanturfBattleTentTrainerMons_Waren[] =
 {
     VERDANTURF_TENT_MON_POOCHYENA,
     VERDANTURF_TENT_MON_ARON_1,
@@ -1467,7 +1467,7 @@ const u16 gVerdanturfBattleTentTrainerMons_Waren[] =
     -1
 };
 
-const u16 gVerdanturfBattleTentTrainerMons_Tobias[] = 
+const u16 gVerdanturfBattleTentTrainerMons_Tobias[] =
 {
     VERDANTURF_TENT_MON_MAGIKARP,
     VERDANTURF_TENT_MON_BARBOACH,
@@ -1477,7 +1477,7 @@ const u16 gVerdanturfBattleTentTrainerMons_Tobias[] =
     -1
 };
 
-const u16 gVerdanturfBattleTentTrainerMons_Josiah[] = 
+const u16 gVerdanturfBattleTentTrainerMons_Josiah[] =
 {
     VERDANTURF_TENT_MON_WINGULL,
     VERDANTURF_TENT_MON_SWABLU,
@@ -1487,7 +1487,7 @@ const u16 gVerdanturfBattleTentTrainerMons_Josiah[] =
     -1
 };
 
-const u16 gVerdanturfBattleTentTrainerMons_Dion[] = 
+const u16 gVerdanturfBattleTentTrainerMons_Dion[] =
 {
     VERDANTURF_TENT_MON_NINJASK,
     VERDANTURF_TENT_MON_DUSTOX,
@@ -1498,7 +1498,7 @@ const u16 gVerdanturfBattleTentTrainerMons_Dion[] =
     -1
 };
 
-const u16 gVerdanturfBattleTentTrainerMons_Kenzie[] = 
+const u16 gVerdanturfBattleTentTrainerMons_Kenzie[] =
 {
     VERDANTURF_TENT_MON_LOTAD,
     VERDANTURF_TENT_MON_NUMEL_1,
@@ -1509,7 +1509,7 @@ const u16 gVerdanturfBattleTentTrainerMons_Kenzie[] =
     -1
 };
 
-const u16 gVerdanturfBattleTentTrainerMons_Lillian[] = 
+const u16 gVerdanturfBattleTentTrainerMons_Lillian[] =
 {
     VERDANTURF_TENT_MON_GOLDEEN_2,
     VERDANTURF_TENT_MON_PELIPPER,
@@ -1519,7 +1519,7 @@ const u16 gVerdanturfBattleTentTrainerMons_Lillian[] =
     -1
 };
 
-const u16 gVerdanturfBattleTentTrainerMons_Lesley[] = 
+const u16 gVerdanturfBattleTentTrainerMons_Lesley[] =
 {
     VERDANTURF_TENT_MON_NUZLEAF,
     VERDANTURF_TENT_MON_POOCHYENA,
@@ -1529,7 +1529,7 @@ const u16 gVerdanturfBattleTentTrainerMons_Lesley[] =
     -1
 };
 
-const u16 gVerdanturfBattleTentTrainerMons_Marquis[] = 
+const u16 gVerdanturfBattleTentTrainerMons_Marquis[] =
 {
     VERDANTURF_TENT_MON_GOLDEEN_2,
     VERDANTURF_TENT_MON_PELIPPER,
@@ -1540,7 +1540,7 @@ const u16 gVerdanturfBattleTentTrainerMons_Marquis[] =
     -1
 };
 
-const u16 gVerdanturfBattleTentTrainerMons_Freddy[] = 
+const u16 gVerdanturfBattleTentTrainerMons_Freddy[] =
 {
     VERDANTURF_TENT_MON_LOTAD,
     VERDANTURF_TENT_MON_SEVIPER,
@@ -1550,7 +1550,7 @@ const u16 gVerdanturfBattleTentTrainerMons_Freddy[] =
     -1
 };
 
-const u16 gVerdanturfBattleTentTrainerMons_Cecilia[] = 
+const u16 gVerdanturfBattleTentTrainerMons_Cecilia[] =
 {
     VERDANTURF_TENT_MON_SWELLOW,
     VERDANTURF_TENT_MON_NUZLEAF,
@@ -1560,7 +1560,7 @@ const u16 gVerdanturfBattleTentTrainerMons_Cecilia[] =
     -1
 };
 
-const struct BattleFrontierTrainer gVerdanturfBattleTentTrainers[NUM_BATTLE_TENT_TRAINERS] = 
+const struct BattleFrontierTrainer gVerdanturfBattleTentTrainers[NUM_BATTLE_TENT_TRAINERS] =
 {
     [VERDANTURF_TENT_TRAINER_BRENNA] = {
         .facilityClass = FACILITY_CLASS_AROMA_LADY,
@@ -1804,7 +1804,7 @@ const struct BattleFrontierTrainer gVerdanturfBattleTentTrainers[NUM_BATTLE_TENT
     }
 };
 
-const struct FacilityMon gVerdanturfBattleTentMons[NUM_VERDANTURF_TENT_MONS] = 
+const struct FacilityMon gVerdanturfBattleTentMons[NUM_VERDANTURF_TENT_MONS] =
 {
     [VERDANTURF_TENT_MON_POOCHYENA] = {
         .species = SPECIES_POOCHYENA,
@@ -2124,7 +2124,7 @@ const struct FacilityMon gVerdanturfBattleTentMons[NUM_VERDANTURF_TENT_MONS] =
 };
 
 // Fallarbor Battle Tent.
-const u16 gFallarborBattleTentTrainerMons_Amber[] = 
+const u16 gFallarborBattleTentTrainerMons_Amber[] =
 {
     FALLARBOR_TENT_MON_SWALOT,
     FALLARBOR_TENT_MON_SHROOMISH,
@@ -2135,7 +2135,7 @@ const u16 gFallarborBattleTentTrainerMons_Amber[] =
     -1
 };
 
-const u16 gFallarborBattleTentTrainerMons_Javier[] = 
+const u16 gFallarborBattleTentTrainerMons_Javier[] =
 {
     FALLARBOR_TENT_MON_SOLROCK,
     FALLARBOR_TENT_MON_TRAPINCH,
@@ -2146,7 +2146,7 @@ const u16 gFallarborBattleTentTrainerMons_Javier[] =
     -1
 };
 
-const u16 gFallarborBattleTentTrainerMons_Natalie[] = 
+const u16 gFallarborBattleTentTrainerMons_Natalie[] =
 {
     FALLARBOR_TENT_MON_MAGIKARP,
     FALLARBOR_TENT_MON_PELIPPER,
@@ -2156,7 +2156,7 @@ const u16 gFallarborBattleTentTrainerMons_Natalie[] =
     -1
 };
 
-const u16 gFallarborBattleTentTrainerMons_Treve[] = 
+const u16 gFallarborBattleTentTrainerMons_Treve[] =
 {
     FALLARBOR_TENT_MON_WINGULL,
     FALLARBOR_TENT_MON_PELIPPER,
@@ -2166,7 +2166,7 @@ const u16 gFallarborBattleTentTrainerMons_Treve[] =
     -1
 };
 
-const u16 gFallarborBattleTentTrainerMons_Arianna[] = 
+const u16 gFallarborBattleTentTrainerMons_Arianna[] =
 {
     FALLARBOR_TENT_MON_ELECTRIKE,
     FALLARBOR_TENT_MON_LINOONE_2,
@@ -2176,7 +2176,7 @@ const u16 gFallarborBattleTentTrainerMons_Arianna[] =
     -1
 };
 
-const u16 gFallarborBattleTentTrainerMons_Jadyn[] = 
+const u16 gFallarborBattleTentTrainerMons_Jadyn[] =
 {
     FALLARBOR_TENT_MON_NUMEL,
     FALLARBOR_TENT_MON_LOUDRED,
@@ -2187,7 +2187,7 @@ const u16 gFallarborBattleTentTrainerMons_Jadyn[] =
     -1
 };
 
-const u16 gFallarborBattleTentTrainerMons_Gerardo[] = 
+const u16 gFallarborBattleTentTrainerMons_Gerardo[] =
 {
     FALLARBOR_TENT_MON_SOLROCK,
     FALLARBOR_TENT_MON_ELECTRIKE,
@@ -2197,7 +2197,7 @@ const u16 gFallarborBattleTentTrainerMons_Gerardo[] =
     -1
 };
 
-const u16 gFallarborBattleTentTrainerMons_Jonn[] = 
+const u16 gFallarborBattleTentTrainerMons_Jonn[] =
 {
     FALLARBOR_TENT_MON_ARON_1,
     FALLARBOR_TENT_MON_ARON_2,
@@ -2207,7 +2207,7 @@ const u16 gFallarborBattleTentTrainerMons_Jonn[] =
     -1
 };
 
-const u16 gFallarborBattleTentTrainerMons_Esteban[] = 
+const u16 gFallarborBattleTentTrainerMons_Esteban[] =
 {
     FALLARBOR_TENT_MON_MAGIKARP,
     FALLARBOR_TENT_MON_WINGULL,
@@ -2217,7 +2217,7 @@ const u16 gFallarborBattleTentTrainerMons_Esteban[] =
     -1
 };
 
-const u16 gFallarborBattleTentTrainerMons_Jameson[] = 
+const u16 gFallarborBattleTentTrainerMons_Jameson[] =
 {
     FALLARBOR_TENT_MON_LINOONE_1,
     FALLARBOR_TENT_MON_PLUSLE,
@@ -2227,7 +2227,7 @@ const u16 gFallarborBattleTentTrainerMons_Jameson[] =
     -1
 };
 
-const u16 gFallarborBattleTentTrainerMons_Alanzo[] = 
+const u16 gFallarborBattleTentTrainerMons_Alanzo[] =
 {
     FALLARBOR_TENT_MON_NINCADA,
     FALLARBOR_TENT_MON_BEAUTIFLY,
@@ -2239,7 +2239,7 @@ const u16 gFallarborBattleTentTrainerMons_Alanzo[] =
     -1
 };
 
-const u16 gFallarborBattleTentTrainerMons_Howard[] = 
+const u16 gFallarborBattleTentTrainerMons_Howard[] =
 {
     FALLARBOR_TENT_MON_ELECTRIKE,
     FALLARBOR_TENT_MON_LINOONE_2,
@@ -2249,7 +2249,7 @@ const u16 gFallarborBattleTentTrainerMons_Howard[] =
     -1
 };
 
-const u16 gFallarborBattleTentTrainerMons_Conrad[] = 
+const u16 gFallarborBattleTentTrainerMons_Conrad[] =
 {
     FALLARBOR_TENT_MON_ELECTRIKE,
     FALLARBOR_TENT_MON_MAGNEMITE,
@@ -2259,7 +2259,7 @@ const u16 gFallarborBattleTentTrainerMons_Conrad[] =
     -1
 };
 
-const u16 gFallarborBattleTentTrainerMons_Makenna[] = 
+const u16 gFallarborBattleTentTrainerMons_Makenna[] =
 {
     FALLARBOR_TENT_MON_KECLEON,
     FALLARBOR_TENT_MON_WHISMUR,
@@ -2269,7 +2269,7 @@ const u16 gFallarborBattleTentTrainerMons_Makenna[] =
     -1
 };
 
-const u16 gFallarborBattleTentTrainerMons_Brayan[] = 
+const u16 gFallarborBattleTentTrainerMons_Brayan[] =
 {
     FALLARBOR_TENT_MON_NUMEL,
     FALLARBOR_TENT_MON_KECLEON,
@@ -2281,7 +2281,7 @@ const u16 gFallarborBattleTentTrainerMons_Brayan[] =
     -1
 };
 
-const u16 gFallarborBattleTentTrainerMons_Mariana[] = 
+const u16 gFallarborBattleTentTrainerMons_Mariana[] =
 {
     FALLARBOR_TENT_MON_NUMEL,
     FALLARBOR_TENT_MON_KECLEON,
@@ -2293,7 +2293,7 @@ const u16 gFallarborBattleTentTrainerMons_Mariana[] =
     -1
 };
 
-const u16 gFallarborBattleTentTrainerMons_Sheldon[] = 
+const u16 gFallarborBattleTentTrainerMons_Sheldon[] =
 {
     FALLARBOR_TENT_MON_PLUSLE,
     FALLARBOR_TENT_MON_POOCHYENA,
@@ -2303,7 +2303,7 @@ const u16 gFallarborBattleTentTrainerMons_Sheldon[] =
     -1
 };
 
-const u16 gFallarborBattleTentTrainerMons_Gianna[] = 
+const u16 gFallarborBattleTentTrainerMons_Gianna[] =
 {
     FALLARBOR_TENT_MON_LINOONE_1,
     FALLARBOR_TENT_MON_PLUSLE,
@@ -2313,7 +2313,7 @@ const u16 gFallarborBattleTentTrainerMons_Gianna[] =
     -1
 };
 
-const u16 gFallarborBattleTentTrainerMons_Yahir[] = 
+const u16 gFallarborBattleTentTrainerMons_Yahir[] =
 {
     FALLARBOR_TENT_MON_KECLEON,
     FALLARBOR_TENT_MON_MACHOKE,
@@ -2324,7 +2324,7 @@ const u16 gFallarborBattleTentTrainerMons_Yahir[] =
     -1
 };
 
-const u16 gFallarborBattleTentTrainerMons_Britney[] = 
+const u16 gFallarborBattleTentTrainerMons_Britney[] =
 {
     FALLARBOR_TENT_MON_KECLEON,
     FALLARBOR_TENT_MON_MAKUHITA,
@@ -2335,7 +2335,7 @@ const u16 gFallarborBattleTentTrainerMons_Britney[] =
     -1
 };
 
-const u16 gFallarborBattleTentTrainerMons_Hecter[] = 
+const u16 gFallarborBattleTentTrainerMons_Hecter[] =
 {
     FALLARBOR_TENT_MON_NUMEL,
     FALLARBOR_TENT_MON_LINOONE_1,
@@ -2346,7 +2346,7 @@ const u16 gFallarborBattleTentTrainerMons_Hecter[] =
     -1
 };
 
-const u16 gFallarborBattleTentTrainerMons_Tannor[] = 
+const u16 gFallarborBattleTentTrainerMons_Tannor[] =
 {
     FALLARBOR_TENT_MON_MAGIKARP,
     FALLARBOR_TENT_MON_BARBOACH,
@@ -2356,7 +2356,7 @@ const u16 gFallarborBattleTentTrainerMons_Tannor[] =
     -1
 };
 
-const u16 gFallarborBattleTentTrainerMons_Benji[] = 
+const u16 gFallarborBattleTentTrainerMons_Benji[] =
 {
     FALLARBOR_TENT_MON_SWABLU,
     FALLARBOR_TENT_MON_SKARMORY,
@@ -2366,7 +2366,7 @@ const u16 gFallarborBattleTentTrainerMons_Benji[] =
     -1
 };
 
-const u16 gFallarborBattleTentTrainerMons_Rory[] = 
+const u16 gFallarborBattleTentTrainerMons_Rory[] =
 {
     FALLARBOR_TENT_MON_NINCADA,
     FALLARBOR_TENT_MON_DUSTOX,
@@ -2377,7 +2377,7 @@ const u16 gFallarborBattleTentTrainerMons_Rory[] =
     -1
 };
 
-const u16 gFallarborBattleTentTrainerMons_Eleanor[] = 
+const u16 gFallarborBattleTentTrainerMons_Eleanor[] =
 {
     FALLARBOR_TENT_MON_LINOONE_2,
     FALLARBOR_TENT_MON_WINGULL,
@@ -2389,7 +2389,7 @@ const u16 gFallarborBattleTentTrainerMons_Eleanor[] =
     -1
 };
 
-const u16 gFallarborBattleTentTrainerMons_Evelyn[] = 
+const u16 gFallarborBattleTentTrainerMons_Evelyn[] =
 {
     FALLARBOR_TENT_MON_PELIPPER,
     FALLARBOR_TENT_MON_WAILMER,
@@ -2399,7 +2399,7 @@ const u16 gFallarborBattleTentTrainerMons_Evelyn[] =
     -1
 };
 
-const u16 gFallarborBattleTentTrainerMons_Arielle[] = 
+const u16 gFallarborBattleTentTrainerMons_Arielle[] =
 {
     FALLARBOR_TENT_MON_LINOONE_1,
     FALLARBOR_TENT_MON_POOCHYENA,
@@ -2409,7 +2409,7 @@ const u16 gFallarborBattleTentTrainerMons_Arielle[] =
     -1
 };
 
-const u16 gFallarborBattleTentTrainerMons_Connar[] = 
+const u16 gFallarborBattleTentTrainerMons_Connar[] =
 {
     FALLARBOR_TENT_MON_MAKUHITA,
     FALLARBOR_TENT_MON_MACHOKE,
@@ -2420,7 +2420,7 @@ const u16 gFallarborBattleTentTrainerMons_Connar[] =
     -1
 };
 
-const u16 gFallarborBattleTentTrainerMons_Maurice[] = 
+const u16 gFallarborBattleTentTrainerMons_Maurice[] =
 {
     FALLARBOR_TENT_MON_KECLEON,
     FALLARBOR_TENT_MON_MAGIKARP,
@@ -2430,7 +2430,7 @@ const u16 gFallarborBattleTentTrainerMons_Maurice[] =
     -1
 };
 
-const u16 gFallarborBattleTentTrainerMons_Kianna[] = 
+const u16 gFallarborBattleTentTrainerMons_Kianna[] =
 {
     FALLARBOR_TENT_MON_LOUDRED,
     FALLARBOR_TENT_MON_MIGHTYENA,
@@ -2441,7 +2441,7 @@ const u16 gFallarborBattleTentTrainerMons_Kianna[] =
     -1
 };
 
-const struct BattleFrontierTrainer gFallarborBattleTentTrainers[NUM_BATTLE_TENT_TRAINERS] = 
+const struct BattleFrontierTrainer gFallarborBattleTentTrainers[NUM_BATTLE_TENT_TRAINERS] =
 {
     [FALLARBOR_TENT_TRAINER_AMBER] = {
         .facilityClass = FACILITY_CLASS_AROMA_LADY,
@@ -2685,7 +2685,7 @@ const struct BattleFrontierTrainer gFallarborBattleTentTrainers[NUM_BATTLE_TENT_
     }
 };
 
-const struct FacilityMon gFallarborBattleTentMons[NUM_FALLARBOR_TENT_MONS] = 
+const struct FacilityMon gFallarborBattleTentMons[NUM_FALLARBOR_TENT_MONS] =
 {
     [FALLARBOR_TENT_MON_NUMEL] = {
         .species = SPECIES_NUMEL,
diff --git a/src/data/battle_frontier/trainer_hill.h b/src/data/battle_frontier/trainer_hill.h
index 127eb8ed4..75785b258 100644
--- a/src/data/battle_frontier/trainer_hill.h
+++ b/src/data/battle_frontier/trainer_hill.h
@@ -194,22 +194,22 @@ static const struct TrHillFloor sDataTagJPDefault_Floors[] = {
         },
         .display = {
             .metatileData = {
-                0x31, 0x35, 0x35, 0x3b, 0x26, 0x26, 0x1b, 0x1c, 0x1d, 0x25, 0x39, 0x3a, 0x3b, 0x3b, 0x3b, 0x08, 
-                0x31, 0x2b, 0x2b, 0x3b, 0x34, 0x34, 0x2b, 0x2b, 0x34, 0x33, 0x3f, 0x3f, 0x3f, 0x3f, 0x3b, 0x08, 
-                0x31, 0x2b, 0x2b, 0x3b, 0x3b, 0x3b, 0x34, 0x34, 0x3b, 0x33, 0x3f, 0x3f, 0x3f, 0x3b, 0x3b, 0x08, 
-                0x31, 0x2b, 0x2b, 0x35, 0x35, 0x35, 0x35, 0x35, 0x3b, 0x33, 0x3f, 0x3f, 0x3f, 0x3b, 0x3f, 0x08, 
-                0x31, 0x2b, 0x34, 0x34, 0x34, 0x2b, 0x34, 0x34, 0x3b, 0x2c, 0x3f, 0x3f, 0x3f, 0x3b, 0x3b, 0x08, 
-                0x31, 0x2b, 0x3b, 0x35, 0x3b, 0x2b, 0x3b, 0x35, 0x3b, 0x35, 0x3b, 0x3f, 0x3f, 0x3f, 0x3b, 0x08, 
-                0x31, 0x2b, 0x3b, 0x2b, 0x3b, 0x2b, 0x3b, 0x2b, 0x3b, 0x2b, 0x3b, 0x3f, 0x3f, 0x3f, 0x3b, 0x08, 
-                0x31, 0x34, 0x3b, 0x2b, 0x3b, 0x34, 0x3b, 0x2b, 0x35, 0x2b, 0x3b, 0x3b, 0x3f, 0x3b, 0x3b, 0x08, 
-                0x31, 0x3b, 0x3b, 0x34, 0x3b, 0x3b, 0x3b, 0x34, 0x34, 0x34, 0x3f, 0x3b, 0x3b, 0x3b, 0x3f, 0x08, 
-                0x08, 0x08, 0x08, 0x08, 0x08, 0x08, 0x08, 0x08, 0x08, 0x08, 0x08, 0x08, 0x08, 0x08, 0x08, 0x08, 
-                0x08, 0x08, 0x08, 0x08, 0x08, 0x08, 0x08, 0x08, 0x08, 0x08, 0x08, 0x08, 0x08, 0x08, 0x08, 0x08, 
-                0x08, 0x08, 0x08, 0x08, 0x08, 0x08, 0x08, 0x08, 0x08, 0x08, 0x08, 0x08, 0x08, 0x08, 0x08, 0x08, 
-                0x08, 0x08, 0x08, 0x08, 0x08, 0x08, 0x08, 0x08, 0x08, 0x08, 0x08, 0x08, 0x08, 0x08, 0x08, 0x08, 
-                0x08, 0x08, 0x08, 0x08, 0x08, 0x08, 0x08, 0x08, 0x08, 0x08, 0x08, 0x08, 0x08, 0x08, 0x08, 0x08, 
-                0x08, 0x08, 0x08, 0x08, 0x08, 0x08, 0x08, 0x08, 0x08, 0x08, 0x08, 0x08, 0x08, 0x08, 0x08, 0x08, 
-                0x08, 0x08, 0x08, 0x08, 0x08, 0x08, 0x08, 0x08, 0x08, 0x08, 0x08, 0x08, 0x08, 0x08, 0x08, 0x08, 
+                0x31, 0x35, 0x35, 0x3b, 0x26, 0x26, 0x1b, 0x1c, 0x1d, 0x25, 0x39, 0x3a, 0x3b, 0x3b, 0x3b, 0x08,
+                0x31, 0x2b, 0x2b, 0x3b, 0x34, 0x34, 0x2b, 0x2b, 0x34, 0x33, 0x3f, 0x3f, 0x3f, 0x3f, 0x3b, 0x08,
+                0x31, 0x2b, 0x2b, 0x3b, 0x3b, 0x3b, 0x34, 0x34, 0x3b, 0x33, 0x3f, 0x3f, 0x3f, 0x3b, 0x3b, 0x08,
+                0x31, 0x2b, 0x2b, 0x35, 0x35, 0x35, 0x35, 0x35, 0x3b, 0x33, 0x3f, 0x3f, 0x3f, 0x3b, 0x3f, 0x08,
+                0x31, 0x2b, 0x34, 0x34, 0x34, 0x2b, 0x34, 0x34, 0x3b, 0x2c, 0x3f, 0x3f, 0x3f, 0x3b, 0x3b, 0x08,
+                0x31, 0x2b, 0x3b, 0x35, 0x3b, 0x2b, 0x3b, 0x35, 0x3b, 0x35, 0x3b, 0x3f, 0x3f, 0x3f, 0x3b, 0x08,
+                0x31, 0x2b, 0x3b, 0x2b, 0x3b, 0x2b, 0x3b, 0x2b, 0x3b, 0x2b, 0x3b, 0x3f, 0x3f, 0x3f, 0x3b, 0x08,
+                0x31, 0x34, 0x3b, 0x2b, 0x3b, 0x34, 0x3b, 0x2b, 0x35, 0x2b, 0x3b, 0x3b, 0x3f, 0x3b, 0x3b, 0x08,
+                0x31, 0x3b, 0x3b, 0x34, 0x3b, 0x3b, 0x3b, 0x34, 0x34, 0x34, 0x3f, 0x3b, 0x3b, 0x3b, 0x3f, 0x08,
+                0x08, 0x08, 0x08, 0x08, 0x08, 0x08, 0x08, 0x08, 0x08, 0x08, 0x08, 0x08, 0x08, 0x08, 0x08, 0x08,
+                0x08, 0x08, 0x08, 0x08, 0x08, 0x08, 0x08, 0x08, 0x08, 0x08, 0x08, 0x08, 0x08, 0x08, 0x08, 0x08,
+                0x08, 0x08, 0x08, 0x08, 0x08, 0x08, 0x08, 0x08, 0x08, 0x08, 0x08, 0x08, 0x08, 0x08, 0x08, 0x08,
+                0x08, 0x08, 0x08, 0x08, 0x08, 0x08, 0x08, 0x08, 0x08, 0x08, 0x08, 0x08, 0x08, 0x08, 0x08, 0x08,
+                0x08, 0x08, 0x08, 0x08, 0x08, 0x08, 0x08, 0x08, 0x08, 0x08, 0x08, 0x08, 0x08, 0x08, 0x08, 0x08,
+                0x08, 0x08, 0x08, 0x08, 0x08, 0x08, 0x08, 0x08, 0x08, 0x08, 0x08, 0x08, 0x08, 0x08, 0x08, 0x08,
+                0x08, 0x08, 0x08, 0x08, 0x08, 0x08, 0x08, 0x08, 0x08, 0x08, 0x08, 0x08, 0x08, 0x08, 0x08, 0x08,
             },
             .collisionData = { 0x0381, 0x6fc1, 0x6341, 0x6041, 0x7f41, 0x4401, 0x5541, 0x5541, 0x11c1, 0xffff, 0xffff, 0xffff, 0xffff, 0xffff, 0xffff, 0xffff },
             .coords = { COORDS_XY(8,2), COORDS_XY(8,7) },
@@ -396,22 +396,22 @@ static const struct TrHillFloor sDataTagJPDefault_Floors[] = {
         },
         .display = {
             .metatileData = {
-                0x31, 0x3b, 0x35, 0x3b, 0x39, 0x26, 0x1b, 0x1c, 0x1d, 0x25, 0x39, 0x3a, 0x3b, 0x35, 0x3b, 0x08, 
-                0x31, 0x3b, 0x2b, 0x3b, 0x3b, 0x2b, 0x2b, 0x2b, 0x2b, 0x2b, 0x3b, 0x3b, 0x3b, 0x2b, 0x3b, 0x08, 
-                0x31, 0x3b, 0x2b, 0x3b, 0x3b, 0x2b, 0x2b, 0x2b, 0x2b, 0x2b, 0x3e, 0x3e, 0x3b, 0x2b, 0x3b, 0x08, 
-                0x31, 0x3b, 0x2b, 0x3b, 0x3b, 0x2b, 0x2b, 0x2b, 0x2b, 0x2b, 0x3b, 0x3b, 0x3b, 0x2b, 0x3b, 0x08, 
-                0x3f, 0x3b, 0x2b, 0x3b, 0x3b, 0x2b, 0x2b, 0x2b, 0x2b, 0x2b, 0x3b, 0x3e, 0x3e, 0x2b, 0x3b, 0x08, 
-                0x31, 0x3b, 0x2b, 0x3b, 0x3b, 0x2b, 0x2b, 0x2c, 0x2b, 0x2b, 0x3b, 0x3b, 0x3b, 0x2b, 0x3b, 0x08, 
-                0x31, 0x3f, 0x2b, 0x3b, 0x3b, 0x2c, 0x2c, 0x3b, 0x2c, 0x2c, 0x3e, 0x3e, 0x3b, 0x2b, 0x3b, 0x08, 
-                0x31, 0x3b, 0x2b, 0x35, 0x35, 0x35, 0x35, 0x3b, 0x35, 0x35, 0x35, 0x35, 0x35, 0x2b, 0x3b, 0x08, 
-                0x3f, 0x3b, 0x2c, 0x2c, 0x2c, 0x2c, 0x2c, 0x3b, 0x2c, 0x2c, 0x2c, 0x2c, 0x2c, 0x2c, 0x3b, 0x08, 
-                0x31, 0x3b, 0x3f, 0x3f, 0x3b, 0x35, 0x35, 0x3b, 0x35, 0x35, 0x35, 0x35, 0x35, 0x35, 0x35, 0x08, 
-                0x31, 0x3f, 0x3f, 0x3f, 0x3b, 0x2b, 0x2b, 0x35, 0x2b, 0x2b, 0x2b, 0x2b, 0x2b, 0x2b, 0x2b, 0x08, 
-                0x31, 0x3f, 0x3f, 0x3b, 0x3b, 0x2b, 0x2b, 0x2b, 0x2b, 0x2b, 0x2b, 0x2b, 0x2b, 0x2b, 0x2b, 0x08, 
-                0x31, 0x3b, 0x3b, 0x3b, 0x3f, 0x2c, 0x2c, 0x2c, 0x2c, 0x2c, 0x2c, 0x2c, 0x2c, 0x2c, 0x2c, 0x08, 
-                0x08, 0x08, 0x08, 0x08, 0x08, 0x08, 0x08, 0x08, 0x08, 0x08, 0x08, 0x08, 0x08, 0x08, 0x08, 0x08, 
-                0x08, 0x08, 0x08, 0x08, 0x08, 0x08, 0x08, 0x08, 0x08, 0x08, 0x08, 0x08, 0x08, 0x08, 0x08, 0x08, 
-                0x08, 0x08, 0x08, 0x08, 0x08, 0x08, 0x08, 0x08, 0x08, 0x08, 0x08, 0x08, 0x08, 0x08, 0x08, 0x08, 
+                0x31, 0x3b, 0x35, 0x3b, 0x39, 0x26, 0x1b, 0x1c, 0x1d, 0x25, 0x39, 0x3a, 0x3b, 0x35, 0x3b, 0x08,
+                0x31, 0x3b, 0x2b, 0x3b, 0x3b, 0x2b, 0x2b, 0x2b, 0x2b, 0x2b, 0x3b, 0x3b, 0x3b, 0x2b, 0x3b, 0x08,
+                0x31, 0x3b, 0x2b, 0x3b, 0x3b, 0x2b, 0x2b, 0x2b, 0x2b, 0x2b, 0x3e, 0x3e, 0x3b, 0x2b, 0x3b, 0x08,
+                0x31, 0x3b, 0x2b, 0x3b, 0x3b, 0x2b, 0x2b, 0x2b, 0x2b, 0x2b, 0x3b, 0x3b, 0x3b, 0x2b, 0x3b, 0x08,
+                0x3f, 0x3b, 0x2b, 0x3b, 0x3b, 0x2b, 0x2b, 0x2b, 0x2b, 0x2b, 0x3b, 0x3e, 0x3e, 0x2b, 0x3b, 0x08,
+                0x31, 0x3b, 0x2b, 0x3b, 0x3b, 0x2b, 0x2b, 0x2c, 0x2b, 0x2b, 0x3b, 0x3b, 0x3b, 0x2b, 0x3b, 0x08,
+                0x31, 0x3f, 0x2b, 0x3b, 0x3b, 0x2c, 0x2c, 0x3b, 0x2c, 0x2c, 0x3e, 0x3e, 0x3b, 0x2b, 0x3b, 0x08,
+                0x31, 0x3b, 0x2b, 0x35, 0x35, 0x35, 0x35, 0x3b, 0x35, 0x35, 0x35, 0x35, 0x35, 0x2b, 0x3b, 0x08,
+                0x3f, 0x3b, 0x2c, 0x2c, 0x2c, 0x2c, 0x2c, 0x3b, 0x2c, 0x2c, 0x2c, 0x2c, 0x2c, 0x2c, 0x3b, 0x08,
+                0x31, 0x3b, 0x3f, 0x3f, 0x3b, 0x35, 0x35, 0x3b, 0x35, 0x35, 0x35, 0x35, 0x35, 0x35, 0x35, 0x08,
+                0x31, 0x3f, 0x3f, 0x3f, 0x3b, 0x2b, 0x2b, 0x35, 0x2b, 0x2b, 0x2b, 0x2b, 0x2b, 0x2b, 0x2b, 0x08,
+                0x31, 0x3f, 0x3f, 0x3b, 0x3b, 0x2b, 0x2b, 0x2b, 0x2b, 0x2b, 0x2b, 0x2b, 0x2b, 0x2b, 0x2b, 0x08,
+                0x31, 0x3b, 0x3b, 0x3b, 0x3f, 0x2c, 0x2c, 0x2c, 0x2c, 0x2c, 0x2c, 0x2c, 0x2c, 0x2c, 0x2c, 0x08,
+                0x08, 0x08, 0x08, 0x08, 0x08, 0x08, 0x08, 0x08, 0x08, 0x08, 0x08, 0x08, 0x08, 0x08, 0x08, 0x08,
+                0x08, 0x08, 0x08, 0x08, 0x08, 0x08, 0x08, 0x08, 0x08, 0x08, 0x08, 0x08, 0x08, 0x08, 0x08, 0x08,
+                0x08, 0x08, 0x08, 0x08, 0x08, 0x08, 0x08, 0x08, 0x08, 0x08, 0x08, 0x08, 0x08, 0x08, 0x08, 0x08,
             },
             .collisionData = { 0x0381, 0x27c5, 0x27c5, 0x27c5, 0x27c5, 0x27c5, 0x26c5, 0x2005, 0x3efd, 0x1, 0x6ff, 0x7ff, 0x7ff, 0xffff, 0xffff, 0xffff },
             .coords = { COORDS_XY(7,6), COORDS_XY(7,10) },
@@ -727,21 +727,21 @@ static const struct TrHillFloor sDataTagNormal_Floors[] =
         },
             .display = {
             .metatileData = {
-                0x31, 0x3B, 0x35, 0x35, 0x26, 0x26, 0x1B, 0x1C, 0x1D, 0x25, 0x26, 0x3A, 0x3B, 0x35, 0x3B, 0x08, 
-                0x31, 0x3B, 0x2C, 0x2C, 0x2C, 0x2B, 0x24, 0x24, 0x24, 0x24, 0x2C, 0x3B, 0x3B, 0x2C, 0x3B, 0x08, 
-                0x2D, 0x3B, 0x3B, 0x3B, 0x3B, 0x2B, 0x3B, 0x3B, 0x3B, 0x3B, 0x35, 0x3B, 0x35, 0x35, 0x3B, 0x08, 
-                0x33, 0x3B, 0x32, 0x21, 0x30, 0x2B, 0x3B, 0x32, 0x21, 0x30, 0x2B, 0x3B, 0x2C, 0x2B, 0x3B, 0x08, 
-                0x33, 0x35, 0x3B, 0x3B, 0x3B, 0x2C, 0x35, 0x3B, 0x3B, 0x3B, 0x2B, 0x3B, 0x3B, 0x2B, 0x3B, 0x08, 
-                0x34, 0x2C, 0x3B, 0x32, 0x21, 0x30, 0x2B, 0x32, 0x30, 0x3B, 0x2B, 0x32, 0x30, 0x2C, 0x3B, 0x08, 
-                0x31, 0x35, 0x3B, 0x3B, 0x35, 0x3B, 0x2C, 0x3B, 0x3B, 0x35, 0x2C, 0x3B, 0x3B, 0x35, 0x35, 0x08, 
-                0x31, 0x2C, 0x32, 0x30, 0x2B, 0x32, 0x30, 0x35, 0x3B, 0x2B, 0x32, 0x21, 0x30, 0x2C, 0x2C, 0x08, 
-                0x31, 0x35, 0x3B, 0x3B, 0x2B, 0x3B, 0x3B, 0x2B, 0x3B, 0x2C, 0x3B, 0x35, 0x3B, 0x3B, 0x3B, 0x08, 
-                0x31, 0x2C, 0x32, 0x30, 0x2B, 0x32, 0x30, 0x2B, 0x3B, 0x32, 0x30, 0x2B, 0x32, 0x30, 0x3B, 0x08, 
-                0x31, 0x35, 0x35, 0x35, 0x2B, 0x3B, 0x3B, 0x2B, 0x3B, 0x3B, 0x35, 0x2B, 0x3B, 0x35, 0x35, 0x08, 
-                0x31, 0x2B, 0x2C, 0x2C, 0x2C, 0x32, 0x30, 0x2B, 0x32, 0x30, 0x2C, 0x2C, 0x3B, 0x2C, 0x2C, 0x08, 
-                0x31, 0x2B, 0x3B, 0x3B, 0x35, 0x3B, 0x3B, 0x2B, 0x3B, 0x3B, 0x35, 0x3B, 0x3B, 0x3B, 0x3B, 0x08, 
-                0x31, 0x2C, 0x32, 0x30, 0x2B, 0x3B, 0x3B, 0x2C, 0x32, 0x30, 0x2C, 0x32, 0x30, 0x3B, 0x35, 0x08, 
-                0x31, 0x3B, 0x3B, 0x3B, 0x2C, 0x3B, 0x3B, 0x3B, 0x3B, 0x3B, 0x3B, 0x3B, 0x3B, 0x3B, 0x2C, 0x08, 
+                0x31, 0x3B, 0x35, 0x35, 0x26, 0x26, 0x1B, 0x1C, 0x1D, 0x25, 0x26, 0x3A, 0x3B, 0x35, 0x3B, 0x08,
+                0x31, 0x3B, 0x2C, 0x2C, 0x2C, 0x2B, 0x24, 0x24, 0x24, 0x24, 0x2C, 0x3B, 0x3B, 0x2C, 0x3B, 0x08,
+                0x2D, 0x3B, 0x3B, 0x3B, 0x3B, 0x2B, 0x3B, 0x3B, 0x3B, 0x3B, 0x35, 0x3B, 0x35, 0x35, 0x3B, 0x08,
+                0x33, 0x3B, 0x32, 0x21, 0x30, 0x2B, 0x3B, 0x32, 0x21, 0x30, 0x2B, 0x3B, 0x2C, 0x2B, 0x3B, 0x08,
+                0x33, 0x35, 0x3B, 0x3B, 0x3B, 0x2C, 0x35, 0x3B, 0x3B, 0x3B, 0x2B, 0x3B, 0x3B, 0x2B, 0x3B, 0x08,
+                0x34, 0x2C, 0x3B, 0x32, 0x21, 0x30, 0x2B, 0x32, 0x30, 0x3B, 0x2B, 0x32, 0x30, 0x2C, 0x3B, 0x08,
+                0x31, 0x35, 0x3B, 0x3B, 0x35, 0x3B, 0x2C, 0x3B, 0x3B, 0x35, 0x2C, 0x3B, 0x3B, 0x35, 0x35, 0x08,
+                0x31, 0x2C, 0x32, 0x30, 0x2B, 0x32, 0x30, 0x35, 0x3B, 0x2B, 0x32, 0x21, 0x30, 0x2C, 0x2C, 0x08,
+                0x31, 0x35, 0x3B, 0x3B, 0x2B, 0x3B, 0x3B, 0x2B, 0x3B, 0x2C, 0x3B, 0x35, 0x3B, 0x3B, 0x3B, 0x08,
+                0x31, 0x2C, 0x32, 0x30, 0x2B, 0x32, 0x30, 0x2B, 0x3B, 0x32, 0x30, 0x2B, 0x32, 0x30, 0x3B, 0x08,
+                0x31, 0x35, 0x35, 0x35, 0x2B, 0x3B, 0x3B, 0x2B, 0x3B, 0x3B, 0x35, 0x2B, 0x3B, 0x35, 0x35, 0x08,
+                0x31, 0x2B, 0x2C, 0x2C, 0x2C, 0x32, 0x30, 0x2B, 0x32, 0x30, 0x2C, 0x2C, 0x3B, 0x2C, 0x2C, 0x08,
+                0x31, 0x2B, 0x3B, 0x3B, 0x35, 0x3B, 0x3B, 0x2B, 0x3B, 0x3B, 0x35, 0x3B, 0x3B, 0x3B, 0x3B, 0x08,
+                0x31, 0x2C, 0x32, 0x30, 0x2B, 0x3B, 0x3B, 0x2C, 0x32, 0x30, 0x2C, 0x32, 0x30, 0x3B, 0x35, 0x08,
+                0x31, 0x3B, 0x3B, 0x3B, 0x2C, 0x3B, 0x3B, 0x3B, 0x3B, 0x3B, 0x3B, 0x3B, 0x3B, 0x3B, 0x2C, 0x08,
                 0x08, 0x08, 0x08, 0x08, 0x08, 0x08, 0x08, 0x08, 0x08, 0x08, 0x08, 0x08, 0x08, 0x08, 0x08, 0x08,
             },
             .collisionData = {0x0381, 0x3FE5, 0x0401, 0xBDED, 0x8425, 0xDFBD, 0x0221, 0x7E7F, 0x0941, 0x7F7D, 0x0911, 0x7FF7, 0x4101, 0x79F9, 0x0803, 0xFFFF},
@@ -1049,21 +1049,21 @@ static const struct TrHillFloor sDataTagNormal_Floors[] =
         },
             .display = {
             .metatileData = {
-                0xD1, 0xD5, 0xD5, 0xD5, 0xD9, 0xD9, 0x1B, 0x1C, 0x1D, 0xC5, 0xC6, 0xCE, 0xD5, 0xDB, 0xD5, 0x08, 
-                0xD1, 0xCB, 0xC4, 0xC4, 0xDB, 0xDB, 0xC4, 0xC4, 0xC4, 0xCC, 0xCC, 0xCC, 0xCB, 0xDB, 0xCB, 0x08, 
-                0xD1, 0xCB, 0xDB, 0xDB, 0x17, 0x17, 0x17, 0xDB, 0xDB, 0xDB, 0xDB, 0xDB, 0xCB, 0xDB, 0xCB, 0x08, 
-                0xD1, 0xCB, 0xDB, 0xD5, 0x17, 0x17, 0x17, 0xD5, 0xD5, 0xD5, 0xD5, 0xDF, 0xCB, 0xDB, 0xCB, 0x08, 
-                0xD1, 0xCB, 0xDB, 0xCB, 0x17, 0x17, 0x1F, 0xCB, 0xCB, 0xC4, 0xC4, 0xDB, 0xCB, 0xDB, 0xCB, 0x08, 
-                0xD1, 0xCB, 0xDB, 0xCB, 0xDB, 0xDB, 0xC4, 0xCB, 0xCB, 0xDF, 0xD5, 0xD5, 0xCB, 0xDB, 0xCB, 0x08, 
-                0xD1, 0xCB, 0xDB, 0xCB, 0xDB, 0xDB, 0xDB, 0xCB, 0xCB, 0xDB, 0xC4, 0xC4, 0xCB, 0xDB, 0xCB, 0x08, 
-                0xD1, 0xCB, 0xDB, 0xCB, 0xDB, 0xDB, 0xDB, 0xCB, 0xCB, 0xD5, 0xD5, 0xDF, 0xCB, 0xDB, 0xCB, 0x08, 
-                0xD1, 0xCB, 0xDB, 0xCB, 0xDB, 0xDB, 0xDB, 0xCB, 0xCB, 0xC4, 0xC4, 0xDB, 0xCB, 0xDB, 0xCB, 0x08, 
-                0xD1, 0xCB, 0xDB, 0xCB, 0xDB, 0xDB, 0xDB, 0xCB, 0xCB, 0xDF, 0xD5, 0xD5, 0xCB, 0xDB, 0xCB, 0x08, 
-                0xD1, 0xCB, 0xDB, 0xCB, 0xDB, 0xDB, 0xDB, 0xC4, 0xC4, 0xDB, 0xC4, 0xC4, 0xC4, 0xDB, 0xCB, 0x08, 
-                0xD1, 0xCB, 0xDB, 0xCB, 0x9B, 0x9B, 0x9B, 0x9B, 0x9B, 0x9B, 0xDB, 0xD5, 0xD5, 0xD5, 0xCB, 0x08, 
-                0xD1, 0xC4, 0xDB, 0xCB, 0xDB, 0xDB, 0xDB, 0xDB, 0xDB, 0x9B, 0xDB, 0xCB, 0xCB, 0xCB, 0xCB, 0x08, 
-                0xD1, 0xDB, 0xDB, 0xCB, 0xDB, 0xDB, 0xDB, 0xDB, 0xDB, 0x9B, 0xDB, 0xCB, 0xCB, 0xCB, 0xCB, 0x08, 
-                0xD1, 0xDB, 0xDB, 0xC4, 0xDB, 0xDB, 0xDB, 0xDB, 0xDB, 0x9B, 0xDB, 0xC4, 0xC4, 0xC4, 0xC4, 0x08, 
+                0xD1, 0xD5, 0xD5, 0xD5, 0xD9, 0xD9, 0x1B, 0x1C, 0x1D, 0xC5, 0xC6, 0xCE, 0xD5, 0xDB, 0xD5, 0x08,
+                0xD1, 0xCB, 0xC4, 0xC4, 0xDB, 0xDB, 0xC4, 0xC4, 0xC4, 0xCC, 0xCC, 0xCC, 0xCB, 0xDB, 0xCB, 0x08,
+                0xD1, 0xCB, 0xDB, 0xDB, 0x17, 0x17, 0x17, 0xDB, 0xDB, 0xDB, 0xDB, 0xDB, 0xCB, 0xDB, 0xCB, 0x08,
+                0xD1, 0xCB, 0xDB, 0xD5, 0x17, 0x17, 0x17, 0xD5, 0xD5, 0xD5, 0xD5, 0xDF, 0xCB, 0xDB, 0xCB, 0x08,
+                0xD1, 0xCB, 0xDB, 0xCB, 0x17, 0x17, 0x1F, 0xCB, 0xCB, 0xC4, 0xC4, 0xDB, 0xCB, 0xDB, 0xCB, 0x08,
+                0xD1, 0xCB, 0xDB, 0xCB, 0xDB, 0xDB, 0xC4, 0xCB, 0xCB, 0xDF, 0xD5, 0xD5, 0xCB, 0xDB, 0xCB, 0x08,
+                0xD1, 0xCB, 0xDB, 0xCB, 0xDB, 0xDB, 0xDB, 0xCB, 0xCB, 0xDB, 0xC4, 0xC4, 0xCB, 0xDB, 0xCB, 0x08,
+                0xD1, 0xCB, 0xDB, 0xCB, 0xDB, 0xDB, 0xDB, 0xCB, 0xCB, 0xD5, 0xD5, 0xDF, 0xCB, 0xDB, 0xCB, 0x08,
+                0xD1, 0xCB, 0xDB, 0xCB, 0xDB, 0xDB, 0xDB, 0xCB, 0xCB, 0xC4, 0xC4, 0xDB, 0xCB, 0xDB, 0xCB, 0x08,
+                0xD1, 0xCB, 0xDB, 0xCB, 0xDB, 0xDB, 0xDB, 0xCB, 0xCB, 0xDF, 0xD5, 0xD5, 0xCB, 0xDB, 0xCB, 0x08,
+                0xD1, 0xCB, 0xDB, 0xCB, 0xDB, 0xDB, 0xDB, 0xC4, 0xC4, 0xDB, 0xC4, 0xC4, 0xC4, 0xDB, 0xCB, 0x08,
+                0xD1, 0xCB, 0xDB, 0xCB, 0x9B, 0x9B, 0x9B, 0x9B, 0x9B, 0x9B, 0xDB, 0xD5, 0xD5, 0xD5, 0xCB, 0x08,
+                0xD1, 0xC4, 0xDB, 0xCB, 0xDB, 0xDB, 0xDB, 0xDB, 0xDB, 0x9B, 0xDB, 0xCB, 0xCB, 0xCB, 0xCB, 0x08,
+                0xD1, 0xDB, 0xDB, 0xCB, 0xDB, 0xDB, 0xDB, 0xDB, 0xDB, 0x9B, 0xDB, 0xCB, 0xCB, 0xCB, 0xCB, 0x08,
+                0xD1, 0xDB, 0xDB, 0xC4, 0xDB, 0xDB, 0xDB, 0xDB, 0xDB, 0x9B, 0xDB, 0xC4, 0xC4, 0xC4, 0xC4, 0x08,
                 0x08, 0x08, 0x08, 0x08, 0x08, 0x08, 0x08, 0x08, 0x08, 0x08, 0x08, 0x08, 0x08, 0x08, 0x08, 0x08,
             },
             .collisionData = {0x0381, 0x73FB, 0x400B, 0x400B, 0x51EB, 0x538B, 0x51BB, 0x518B, 0x51EB, 0x518B, 0x51BB, 0x5003, 0x501F, 0x101F, 0x101F, 0xFFFF},
@@ -1370,21 +1370,21 @@ static const struct TrHillFloor sDataTagNormal_Floors[] =
         },
             .display = {
             .metatileData = {
-                0x31, 0x35, 0x35, 0x35, 0x26, 0x26, 0x13, 0x14, 0x15, 0x38, 0x26, 0x2E, 0x35, 0x35, 0x3B, 0x08, 
-                0x69, 0x63, 0x64, 0x64, 0x64, 0x64, 0x71, 0x71, 0x71, 0x72, 0x64, 0x64, 0x64, 0x63, 0x73, 0x08, 
-                0x69, 0x63, 0x73, 0x73, 0x73, 0x73, 0x73, 0x73, 0x73, 0x73, 0x73, 0x73, 0x73, 0x63, 0x73, 0x08, 
-                0x69, 0x63, 0x73, 0x73, 0x73, 0x73, 0x73, 0x73, 0x73, 0x73, 0x73, 0x73, 0x73, 0x63, 0x73, 0x08, 
-                0x69, 0x63, 0x43, 0x41, 0x40, 0x41, 0x42, 0x41, 0x41, 0x4A, 0x42, 0x41, 0x41, 0x63, 0x73, 0x08, 
-                0x69, 0x63, 0x73, 0x73, 0x73, 0x73, 0x73, 0x73, 0x73, 0x64, 0x73, 0x73, 0x73, 0x63, 0x73, 0x08, 
-                0x69, 0x63, 0x41, 0x43, 0x4B, 0x43, 0x43, 0x41, 0x42, 0x42, 0x40, 0x41, 0x40, 0x63, 0x73, 0x08, 
-                0x69, 0x63, 0x73, 0x73, 0x64, 0x73, 0x73, 0x73, 0x73, 0x73, 0x73, 0x73, 0x73, 0x63, 0x73, 0x08, 
-                0x69, 0x63, 0x41, 0x40, 0x42, 0x42, 0x41, 0x41, 0x42, 0x4A, 0x42, 0x41, 0x42, 0x63, 0x73, 0x08, 
-                0x69, 0x63, 0x73, 0x73, 0x73, 0x73, 0x73, 0x73, 0x73, 0x64, 0x73, 0x73, 0x73, 0x63, 0x73, 0x08, 
-                0x69, 0x63, 0x41, 0x42, 0x41, 0x43, 0x4B, 0x41, 0x41, 0x41, 0x40, 0x43, 0x41, 0x63, 0x73, 0x08, 
-                0x69, 0x63, 0x73, 0x73, 0x73, 0x73, 0x64, 0x73, 0x73, 0x73, 0x73, 0x73, 0x73, 0x63, 0x73, 0x08, 
-                0x69, 0x63, 0x41, 0x40, 0x43, 0x41, 0x42, 0x42, 0x41, 0x4A, 0x42, 0x41, 0x42, 0x63, 0x73, 0x08, 
-                0x69, 0x64, 0x73, 0x73, 0x73, 0x73, 0x73, 0x73, 0x73, 0x64, 0x73, 0x73, 0x73, 0x64, 0x73, 0x08, 
-                0x69, 0x43, 0x43, 0x41, 0x42, 0x42, 0x41, 0x43, 0x41, 0x41, 0x40, 0x42, 0x41, 0x42, 0x73, 0x08, 
+                0x31, 0x35, 0x35, 0x35, 0x26, 0x26, 0x13, 0x14, 0x15, 0x38, 0x26, 0x2E, 0x35, 0x35, 0x3B, 0x08,
+                0x69, 0x63, 0x64, 0x64, 0x64, 0x64, 0x71, 0x71, 0x71, 0x72, 0x64, 0x64, 0x64, 0x63, 0x73, 0x08,
+                0x69, 0x63, 0x73, 0x73, 0x73, 0x73, 0x73, 0x73, 0x73, 0x73, 0x73, 0x73, 0x73, 0x63, 0x73, 0x08,
+                0x69, 0x63, 0x73, 0x73, 0x73, 0x73, 0x73, 0x73, 0x73, 0x73, 0x73, 0x73, 0x73, 0x63, 0x73, 0x08,
+                0x69, 0x63, 0x43, 0x41, 0x40, 0x41, 0x42, 0x41, 0x41, 0x4A, 0x42, 0x41, 0x41, 0x63, 0x73, 0x08,
+                0x69, 0x63, 0x73, 0x73, 0x73, 0x73, 0x73, 0x73, 0x73, 0x64, 0x73, 0x73, 0x73, 0x63, 0x73, 0x08,
+                0x69, 0x63, 0x41, 0x43, 0x4B, 0x43, 0x43, 0x41, 0x42, 0x42, 0x40, 0x41, 0x40, 0x63, 0x73, 0x08,
+                0x69, 0x63, 0x73, 0x73, 0x64, 0x73, 0x73, 0x73, 0x73, 0x73, 0x73, 0x73, 0x73, 0x63, 0x73, 0x08,
+                0x69, 0x63, 0x41, 0x40, 0x42, 0x42, 0x41, 0x41, 0x42, 0x4A, 0x42, 0x41, 0x42, 0x63, 0x73, 0x08,
+                0x69, 0x63, 0x73, 0x73, 0x73, 0x73, 0x73, 0x73, 0x73, 0x64, 0x73, 0x73, 0x73, 0x63, 0x73, 0x08,
+                0x69, 0x63, 0x41, 0x42, 0x41, 0x43, 0x4B, 0x41, 0x41, 0x41, 0x40, 0x43, 0x41, 0x63, 0x73, 0x08,
+                0x69, 0x63, 0x73, 0x73, 0x73, 0x73, 0x64, 0x73, 0x73, 0x73, 0x73, 0x73, 0x73, 0x63, 0x73, 0x08,
+                0x69, 0x63, 0x41, 0x40, 0x43, 0x41, 0x42, 0x42, 0x41, 0x4A, 0x42, 0x41, 0x42, 0x63, 0x73, 0x08,
+                0x69, 0x64, 0x73, 0x73, 0x73, 0x73, 0x73, 0x73, 0x73, 0x64, 0x73, 0x73, 0x73, 0x64, 0x73, 0x08,
+                0x69, 0x43, 0x43, 0x41, 0x42, 0x42, 0x41, 0x43, 0x41, 0x41, 0x40, 0x42, 0x41, 0x42, 0x73, 0x08,
                 0x69, 0x42, 0x73, 0x73, 0x73, 0x73, 0x73, 0x73, 0x73, 0x73, 0x73, 0x73, 0x73, 0x42, 0x73, 0x08,
             },
             .collisionData = {0x0381, 0x7C3D, 0x4005, 0x4005, 0x4005, 0x4045, 0x4005, 0x4805, 0x4005, 0x4045, 0x4005, 0x4205, 0x4005, 0x4045, 0x1, 0x1},
@@ -1684,21 +1684,21 @@ static const struct TrHillFloor sDataTagNormal_Floors[] =
         },
             .display = {
             .metatileData = {
-                0x31, 0x3B, 0x3B, 0x3B, 0x39, 0x26, 0x1B, 0x1C, 0x1D, 0x25, 0x39, 0x3A, 0x3B, 0x3B, 0x3B, 0x08, 
-                0x1F, 0x17, 0x17, 0x17, 0x17, 0x2B, 0x24, 0x24, 0x24, 0x2B, 0x3B, 0x3B, 0x3B, 0x3B, 0x3B, 0x08, 
-                0x33, 0x17, 0x17, 0x17, 0x17, 0x2B, 0x3B, 0x3B, 0x3B, 0x2B, 0x35, 0x35, 0x3B, 0x35, 0x35, 0x08, 
-                0x33, 0x17, 0x17, 0x17, 0x17, 0x2B, 0x3B, 0x3B, 0x3B, 0x2B, 0x2C, 0x2C, 0x3B, 0x2C, 0x2C, 0x08, 
-                0x33, 0x17, 0x1F, 0x17, 0x17, 0x2B, 0x3B, 0x3B, 0x3B, 0x2B, 0x17, 0x17, 0x17, 0x17, 0x17, 0x08, 
-                0x34, 0x17, 0x2C, 0x17, 0x17, 0x2B, 0x3B, 0x3B, 0x3B, 0x2C, 0x17, 0x17, 0x17, 0x17, 0x17, 0x08, 
-                0x17, 0x17, 0x17, 0x17, 0x17, 0x2C, 0x3B, 0x3B, 0x3B, 0x3B, 0x17, 0x17, 0x17, 0x17, 0x17, 0x08, 
-                0x1F, 0x17, 0x17, 0x17, 0x17, 0x1F, 0x17, 0x3B, 0x3B, 0x3B, 0x17, 0x17, 0x17, 0x17, 0x17, 0x08, 
-                0x33, 0x17, 0x17, 0x17, 0x17, 0x2B, 0x3B, 0x3B, 0x3B, 0x35, 0x1F, 0x17, 0x17, 0x1F, 0x17, 0x08, 
-                0x34, 0x17, 0x17, 0x17, 0x17, 0x2B, 0x3B, 0x3B, 0x3B, 0x2B, 0x2C, 0x3B, 0x3B, 0x2B, 0x17, 0x08, 
-                0x17, 0x17, 0x17, 0x1F, 0x17, 0x2B, 0x3B, 0x3B, 0x3B, 0x2B, 0x17, 0x17, 0x17, 0x2C, 0x17, 0x08, 
-                0x1F, 0x17, 0x17, 0x2C, 0x17, 0x2B, 0x3B, 0x3B, 0x3B, 0x2B, 0x17, 0x3B, 0x1F, 0x3B, 0x17, 0x08, 
-                0x33, 0x17, 0x17, 0x17, 0x17, 0x2B, 0x3B, 0x3B, 0x3B, 0x2B, 0x17, 0x3B, 0x2B, 0x3B, 0x17, 0x08, 
-                0x33, 0x17, 0x17, 0x17, 0x17, 0x2B, 0x35, 0x35, 0x35, 0x2B, 0x17, 0x3B, 0x2C, 0x3B, 0x17, 0x08, 
-                0x34, 0x17, 0x17, 0x17, 0x17, 0x2C, 0x2C, 0x2C, 0x2C, 0x2C, 0x17, 0x17, 0x17, 0x17, 0x17, 0x08, 
+                0x31, 0x3B, 0x3B, 0x3B, 0x39, 0x26, 0x1B, 0x1C, 0x1D, 0x25, 0x39, 0x3A, 0x3B, 0x3B, 0x3B, 0x08,
+                0x1F, 0x17, 0x17, 0x17, 0x17, 0x2B, 0x24, 0x24, 0x24, 0x2B, 0x3B, 0x3B, 0x3B, 0x3B, 0x3B, 0x08,
+                0x33, 0x17, 0x17, 0x17, 0x17, 0x2B, 0x3B, 0x3B, 0x3B, 0x2B, 0x35, 0x35, 0x3B, 0x35, 0x35, 0x08,
+                0x33, 0x17, 0x17, 0x17, 0x17, 0x2B, 0x3B, 0x3B, 0x3B, 0x2B, 0x2C, 0x2C, 0x3B, 0x2C, 0x2C, 0x08,
+                0x33, 0x17, 0x1F, 0x17, 0x17, 0x2B, 0x3B, 0x3B, 0x3B, 0x2B, 0x17, 0x17, 0x17, 0x17, 0x17, 0x08,
+                0x34, 0x17, 0x2C, 0x17, 0x17, 0x2B, 0x3B, 0x3B, 0x3B, 0x2C, 0x17, 0x17, 0x17, 0x17, 0x17, 0x08,
+                0x17, 0x17, 0x17, 0x17, 0x17, 0x2C, 0x3B, 0x3B, 0x3B, 0x3B, 0x17, 0x17, 0x17, 0x17, 0x17, 0x08,
+                0x1F, 0x17, 0x17, 0x17, 0x17, 0x1F, 0x17, 0x3B, 0x3B, 0x3B, 0x17, 0x17, 0x17, 0x17, 0x17, 0x08,
+                0x33, 0x17, 0x17, 0x17, 0x17, 0x2B, 0x3B, 0x3B, 0x3B, 0x35, 0x1F, 0x17, 0x17, 0x1F, 0x17, 0x08,
+                0x34, 0x17, 0x17, 0x17, 0x17, 0x2B, 0x3B, 0x3B, 0x3B, 0x2B, 0x2C, 0x3B, 0x3B, 0x2B, 0x17, 0x08,
+                0x17, 0x17, 0x17, 0x1F, 0x17, 0x2B, 0x3B, 0x3B, 0x3B, 0x2B, 0x17, 0x17, 0x17, 0x2C, 0x17, 0x08,
+                0x1F, 0x17, 0x17, 0x2C, 0x17, 0x2B, 0x3B, 0x3B, 0x3B, 0x2B, 0x17, 0x3B, 0x1F, 0x3B, 0x17, 0x08,
+                0x33, 0x17, 0x17, 0x17, 0x17, 0x2B, 0x3B, 0x3B, 0x3B, 0x2B, 0x17, 0x3B, 0x2B, 0x3B, 0x17, 0x08,
+                0x33, 0x17, 0x17, 0x17, 0x17, 0x2B, 0x35, 0x35, 0x35, 0x2B, 0x17, 0x3B, 0x2C, 0x3B, 0x17, 0x08,
+                0x34, 0x17, 0x17, 0x17, 0x17, 0x2C, 0x2C, 0x2C, 0x2C, 0x2C, 0x17, 0x17, 0x17, 0x17, 0x17, 0x08,
                 0x08, 0x08, 0x08, 0x08, 0x08, 0x08, 0x08, 0x08, 0x08, 0x08, 0x08, 0x08, 0x08, 0x08, 0x08, 0x08,
             },
             .collisionData = {0x0381, 0x7C1, 0x8441, 0x8477, 0x8441, 0xA441, 0x0401, 0x1, 0x8401, 0x8465, 0x0445, 0x1441, 0x8449, 0x8449, 0x87C1, 0xFFFF},
@@ -2005,21 +2005,21 @@ static const struct TrHillFloor sDataTagVariety_Floors[] = {
                 },
             .display = {
                 .metatileData = {
-                    0x31, 0x3B, 0x3B, 0x3B, 0x39, 0x39, 0x13, 0x14, 0x15, 0x38, 0x39, 0x3A, 0x3B, 0x3B, 0x3B, 0x08, 
-                    0x40, 0x41, 0x41, 0x41, 0x41, 0x41, 0x42, 0x43, 0x43, 0x43, 0x43, 0x43, 0x40, 0x41, 0x41, 0x08, 
-                    0x40, 0xFB, 0x43, 0x41, 0x41, 0x41, 0x42, 0x40, 0x43, 0x41, 0x42, 0x42, 0x42, 0xFB, 0x41, 0x08, 
-                    0x40, 0x41, 0xFB, 0x41, 0x41, 0x41, 0x42, 0x40, 0x43, 0x41, 0x43, 0x43, 0xFB, 0x40, 0x41, 0x08, 
-                    0x40, 0x41, 0x41, 0xFB, 0x43, 0x41, 0x42, 0x40, 0x43, 0x43, 0x43, 0xFB, 0x41, 0x40, 0x41, 0x08, 
-                    0x40, 0x41, 0x41, 0x41, 0x42, 0x42, 0x42, 0x40, 0x43, 0x43, 0x43, 0x41, 0x41, 0x40, 0x41, 0x08, 
-                    0x40, 0x41, 0x41, 0x41, 0xFE, 0xFE, 0xFE, 0xFB, 0xFE, 0xFE, 0xFE, 0x41, 0x41, 0x40, 0x41, 0x08, 
-                    0x40, 0x41, 0x41, 0x41, 0xFE, 0xFE, 0xFE, 0xFB, 0xFE, 0xFE, 0xFE, 0x41, 0x41, 0x40, 0x41, 0x08, 
-                    0x40, 0x41, 0x42, 0x41, 0xFE, 0xFB, 0xFB, 0xFB, 0xFB, 0xFB, 0xFE, 0x41, 0x41, 0x40, 0x41, 0x08, 
-                    0x40, 0x41, 0x41, 0x41, 0xFE, 0xFE, 0xFE, 0xFB, 0xFE, 0xFE, 0xFE, 0x41, 0x41, 0x40, 0x41, 0x08, 
-                    0x40, 0x41, 0x41, 0x41, 0xFE, 0xFE, 0xFE, 0xFB, 0xFE, 0xFE, 0xFE, 0x41, 0x41, 0x40, 0x41, 0x08, 
-                    0x40, 0x42, 0x41, 0x43, 0x43, 0x43, 0x41, 0x40, 0x42, 0x42, 0x42, 0x42, 0x41, 0x40, 0x41, 0x08, 
-                    0x40, 0x40, 0x41, 0xFB, 0x41, 0x41, 0x41, 0x41, 0x41, 0x41, 0x41, 0xFB, 0x41, 0x40, 0x41, 0x08, 
-                    0x40, 0x40, 0xFB, 0x43, 0x43, 0x41, 0x41, 0x41, 0x42, 0x42, 0x42, 0x42, 0xFB, 0x40, 0x41, 0x08, 
-                    0x40, 0xFB, 0x43, 0x43, 0x41, 0x41, 0x43, 0x43, 0x43, 0x43, 0x43, 0x43, 0x43, 0xFB, 0x41, 0x08, 
+                    0x31, 0x3B, 0x3B, 0x3B, 0x39, 0x39, 0x13, 0x14, 0x15, 0x38, 0x39, 0x3A, 0x3B, 0x3B, 0x3B, 0x08,
+                    0x40, 0x41, 0x41, 0x41, 0x41, 0x41, 0x42, 0x43, 0x43, 0x43, 0x43, 0x43, 0x40, 0x41, 0x41, 0x08,
+                    0x40, 0xFB, 0x43, 0x41, 0x41, 0x41, 0x42, 0x40, 0x43, 0x41, 0x42, 0x42, 0x42, 0xFB, 0x41, 0x08,
+                    0x40, 0x41, 0xFB, 0x41, 0x41, 0x41, 0x42, 0x40, 0x43, 0x41, 0x43, 0x43, 0xFB, 0x40, 0x41, 0x08,
+                    0x40, 0x41, 0x41, 0xFB, 0x43, 0x41, 0x42, 0x40, 0x43, 0x43, 0x43, 0xFB, 0x41, 0x40, 0x41, 0x08,
+                    0x40, 0x41, 0x41, 0x41, 0x42, 0x42, 0x42, 0x40, 0x43, 0x43, 0x43, 0x41, 0x41, 0x40, 0x41, 0x08,
+                    0x40, 0x41, 0x41, 0x41, 0xFE, 0xFE, 0xFE, 0xFB, 0xFE, 0xFE, 0xFE, 0x41, 0x41, 0x40, 0x41, 0x08,
+                    0x40, 0x41, 0x41, 0x41, 0xFE, 0xFE, 0xFE, 0xFB, 0xFE, 0xFE, 0xFE, 0x41, 0x41, 0x40, 0x41, 0x08,
+                    0x40, 0x41, 0x42, 0x41, 0xFE, 0xFB, 0xFB, 0xFB, 0xFB, 0xFB, 0xFE, 0x41, 0x41, 0x40, 0x41, 0x08,
+                    0x40, 0x41, 0x41, 0x41, 0xFE, 0xFE, 0xFE, 0xFB, 0xFE, 0xFE, 0xFE, 0x41, 0x41, 0x40, 0x41, 0x08,
+                    0x40, 0x41, 0x41, 0x41, 0xFE, 0xFE, 0xFE, 0xFB, 0xFE, 0xFE, 0xFE, 0x41, 0x41, 0x40, 0x41, 0x08,
+                    0x40, 0x42, 0x41, 0x43, 0x43, 0x43, 0x41, 0x40, 0x42, 0x42, 0x42, 0x42, 0x41, 0x40, 0x41, 0x08,
+                    0x40, 0x40, 0x41, 0xFB, 0x41, 0x41, 0x41, 0x41, 0x41, 0x41, 0x41, 0xFB, 0x41, 0x40, 0x41, 0x08,
+                    0x40, 0x40, 0xFB, 0x43, 0x43, 0x41, 0x41, 0x41, 0x42, 0x42, 0x42, 0x42, 0xFB, 0x40, 0x41, 0x08,
+                    0x40, 0xFB, 0x43, 0x43, 0x41, 0x41, 0x43, 0x43, 0x43, 0x43, 0x43, 0x43, 0x43, 0xFB, 0x41, 0x08,
                     0x40, 0x42, 0x42, 0x42, 0x42, 0x42, 0x42, 0x42, 0x42, 0x42, 0x42, 0x42, 0x42, 0x42, 0x42, 0x08,
                 },
                 .collisionData = {0x0381, 0x1, 0x1, 0x1, 0x1, 0x1, 0x1, 0x1, 0x1, 0x1, 0x1, 0x1, 0x1, 0x1, 0x1, 0x1},
@@ -2345,21 +2345,21 @@ static const struct TrHillFloor sDataTagVariety_Floors[] = {
                 },
             .display = {
                 .metatileData = {
-                    0x31, 0x3B, 0x3B, 0x3B, 0x39, 0x39, 0x13, 0x14, 0x15, 0x38, 0x39, 0x3A, 0x3B, 0x3B, 0x3B, 0x08, 
-                    0x91, 0x9B, 0x9C, 0x96, 0x40, 0x40, 0x96, 0x9B, 0x96, 0x40, 0x40, 0x96, 0x9B, 0x9C, 0x9B, 0x08, 
-                    0x9C, 0x9B, 0x96, 0x40, 0xDB, 0xDB, 0x40, 0x96, 0x40, 0xDB, 0xDB, 0x42, 0x96, 0x9B, 0x9B, 0x08, 
-                    0x91, 0x96, 0x40, 0xDB, 0xDB, 0xDB, 0xDB, 0xDB, 0xDB, 0xDB, 0xDB, 0xDB, 0x42, 0x96, 0x9C, 0x08, 
-                    0x91, 0x42, 0xDB, 0xDB, 0xD6, 0xD6, 0xD6, 0xDB, 0xD6, 0xD6, 0xD6, 0xDB, 0xDB, 0x42, 0x9B, 0x08, 
-                    0x96, 0x42, 0xDB, 0xD6, 0xD6, 0xD6, 0xD6, 0xD6, 0xD6, 0xD6, 0xD6, 0xD6, 0xDB, 0x42, 0x96, 0x08, 
-                    0x96, 0x42, 0xDB, 0xD6, 0xD6, 0xD6, 0xD6, 0xD6, 0xD6, 0xD6, 0xD6, 0xD6, 0xDB, 0x42, 0x96, 0x08, 
-                    0x96, 0x42, 0xDB, 0xD6, 0xD6, 0xD6, 0xD6, 0xD6, 0xD6, 0xD6, 0xD6, 0xD6, 0xDB, 0x42, 0x96, 0x08, 
-                    0x96, 0x42, 0xDB, 0xDB, 0xD6, 0xD6, 0xD6, 0xD6, 0xD6, 0xD6, 0xD6, 0xDB, 0xDB, 0x42, 0x96, 0x08, 
-                    0x91, 0x96, 0x42, 0xDB, 0xDB, 0xD6, 0xD6, 0xD6, 0xD6, 0xD6, 0xDB, 0xDB, 0x42, 0x96, 0x9B, 0x08, 
-                    0x91, 0x9B, 0x96, 0x42, 0xDB, 0xDB, 0xD6, 0xD6, 0xD6, 0xDB, 0xDB, 0x42, 0x96, 0x9B, 0x9C, 0x08, 
-                    0x9C, 0x9B, 0x9B, 0x96, 0x42, 0xDB, 0xDB, 0xD6, 0xDB, 0xDB, 0x42, 0x96, 0x9B, 0x9B, 0x9B, 0x08, 
-                    0x96, 0x9B, 0x9B, 0x9B, 0x96, 0x41, 0xDB, 0xDB, 0xDB, 0x42, 0x96, 0x9B, 0x9B, 0x9C, 0x96, 0x08, 
-                    0xD6, 0x96, 0x9C, 0x9B, 0x9B, 0x96, 0x41, 0xDB, 0x42, 0x96, 0x9B, 0x9B, 0x9B, 0x96, 0xD6, 0x08, 
-                    0x9C, 0xD6, 0x96, 0x9B, 0x9C, 0x9B, 0x96, 0x40, 0x96, 0x9B, 0x9C, 0x9B, 0x96, 0xD6, 0x9C, 0x08, 
+                    0x31, 0x3B, 0x3B, 0x3B, 0x39, 0x39, 0x13, 0x14, 0x15, 0x38, 0x39, 0x3A, 0x3B, 0x3B, 0x3B, 0x08,
+                    0x91, 0x9B, 0x9C, 0x96, 0x40, 0x40, 0x96, 0x9B, 0x96, 0x40, 0x40, 0x96, 0x9B, 0x9C, 0x9B, 0x08,
+                    0x9C, 0x9B, 0x96, 0x40, 0xDB, 0xDB, 0x40, 0x96, 0x40, 0xDB, 0xDB, 0x42, 0x96, 0x9B, 0x9B, 0x08,
+                    0x91, 0x96, 0x40, 0xDB, 0xDB, 0xDB, 0xDB, 0xDB, 0xDB, 0xDB, 0xDB, 0xDB, 0x42, 0x96, 0x9C, 0x08,
+                    0x91, 0x42, 0xDB, 0xDB, 0xD6, 0xD6, 0xD6, 0xDB, 0xD6, 0xD6, 0xD6, 0xDB, 0xDB, 0x42, 0x9B, 0x08,
+                    0x96, 0x42, 0xDB, 0xD6, 0xD6, 0xD6, 0xD6, 0xD6, 0xD6, 0xD6, 0xD6, 0xD6, 0xDB, 0x42, 0x96, 0x08,
+                    0x96, 0x42, 0xDB, 0xD6, 0xD6, 0xD6, 0xD6, 0xD6, 0xD6, 0xD6, 0xD6, 0xD6, 0xDB, 0x42, 0x96, 0x08,
+                    0x96, 0x42, 0xDB, 0xD6, 0xD6, 0xD6, 0xD6, 0xD6, 0xD6, 0xD6, 0xD6, 0xD6, 0xDB, 0x42, 0x96, 0x08,
+                    0x96, 0x42, 0xDB, 0xDB, 0xD6, 0xD6, 0xD6, 0xD6, 0xD6, 0xD6, 0xD6, 0xDB, 0xDB, 0x42, 0x96, 0x08,
+                    0x91, 0x96, 0x42, 0xDB, 0xDB, 0xD6, 0xD6, 0xD6, 0xD6, 0xD6, 0xDB, 0xDB, 0x42, 0x96, 0x9B, 0x08,
+                    0x91, 0x9B, 0x96, 0x42, 0xDB, 0xDB, 0xD6, 0xD6, 0xD6, 0xDB, 0xDB, 0x42, 0x96, 0x9B, 0x9C, 0x08,
+                    0x9C, 0x9B, 0x9B, 0x96, 0x42, 0xDB, 0xDB, 0xD6, 0xDB, 0xDB, 0x42, 0x96, 0x9B, 0x9B, 0x9B, 0x08,
+                    0x96, 0x9B, 0x9B, 0x9B, 0x96, 0x41, 0xDB, 0xDB, 0xDB, 0x42, 0x96, 0x9B, 0x9B, 0x9C, 0x96, 0x08,
+                    0xD6, 0x96, 0x9C, 0x9B, 0x9B, 0x96, 0x41, 0xDB, 0x42, 0x96, 0x9B, 0x9B, 0x9B, 0x96, 0xD6, 0x08,
+                    0x9C, 0xD6, 0x96, 0x9B, 0x9C, 0x9B, 0x96, 0x40, 0x96, 0x9B, 0x9C, 0x9B, 0x96, 0xD6, 0x9C, 0x08,
                     0x08, 0x08, 0x08, 0x08, 0x08, 0x08, 0x08, 0x08, 0x08, 0x08, 0x08, 0x08, 0x08, 0x08, 0x08, 0x08,
                 },
                 .collisionData = {0x0381, 0x1, 0x1, 0x1, 0x1, 0x1, 0x1, 0x1, 0x1, 0x1, 0x1, 0x1, 0x1, 0x1, 0x1, 0xFFFF},
@@ -2666,21 +2666,21 @@ static const struct TrHillFloor sDataTagVariety_Floors[] = {
                 },
             .display = {
                 .metatileData = {
-                    0x31, 0x3B, 0x3B, 0x3B, 0x39, 0x39, 0x1B, 0x1C, 0x1D, 0x38, 0x39, 0x3A, 0x3B, 0x3B, 0x3B, 0x08, 
-                    0x91, 0x9B, 0x9B, 0x9B, 0x9B, 0x9B, 0x84, 0x84, 0x84, 0x9A, 0x9B, 0x9B, 0x9B, 0x9B, 0x9B, 0x08, 
-                    0x17, 0xB2, 0xA1, 0xA1, 0xA1, 0xA1, 0xA1, 0xA1, 0xA1, 0xA1, 0xA1, 0xB0, 0x17, 0xB2, 0xA1, 0x08, 
-                    0x17, 0xBB, 0x17, 0x17, 0x17, 0x17, 0x17, 0x17, 0x17, 0x17, 0x17, 0xBB, 0x17, 0x17, 0x17, 0x08, 
-                    0x17, 0xB2, 0xA1, 0xA1, 0xA1, 0xA1, 0xA1, 0xA1, 0xA1, 0xA1, 0xA1, 0xB0, 0x17, 0xB2, 0xA1, 0x08, 
-                    0x17, 0x17, 0x17, 0xBB, 0x17, 0x17, 0x17, 0x17, 0x17, 0xBB, 0x17, 0x17, 0x17, 0x17, 0x17, 0x08, 
-                    0x17, 0xB2, 0xA1, 0xA1, 0xA1, 0xA1, 0xA1, 0xA1, 0xA1, 0xA1, 0xA1, 0xB0, 0x17, 0xB2, 0xA1, 0x08, 
-                    0x17, 0x17, 0xBB, 0x17, 0x17, 0x17, 0x17, 0xBB, 0x17, 0x17, 0x17, 0x17, 0x17, 0x17, 0x17, 0x08, 
-                    0x17, 0xB2, 0xA1, 0xA1, 0xA1, 0xA1, 0xA1, 0xA1, 0xA1, 0xA1, 0xA1, 0xB0, 0x17, 0xB2, 0xA1, 0x08, 
-                    0x17, 0x17, 0x17, 0x17, 0x17, 0xBB, 0x17, 0x17, 0x17, 0x17, 0xBB, 0x17, 0x17, 0x17, 0x17, 0x08, 
-                    0x17, 0xB2, 0xA1, 0xA1, 0xA1, 0xA1, 0xA1, 0xA1, 0xA1, 0xA1, 0xA1, 0xB0, 0x17, 0xB2, 0xA1, 0x08, 
-                    0x17, 0x17, 0x17, 0x17, 0x17, 0x17, 0x17, 0x17, 0x17, 0xBB, 0x17, 0x17, 0xBB, 0x17, 0x17, 0x08, 
-                    0x17, 0xB2, 0xA1, 0xA1, 0xA1, 0xA1, 0xA1, 0xA1, 0xA1, 0xA1, 0xA1, 0xB0, 0x17, 0xB2, 0xA1, 0x08, 
-                    0x17, 0x17, 0x17, 0x17, 0xBB, 0x17, 0x17, 0x17, 0x17, 0x17, 0x17, 0x17, 0x17, 0x17, 0x17, 0x08, 
-                    0x17, 0xB2, 0xA1, 0xA1, 0xA1, 0xA1, 0xA1, 0xA1, 0xA1, 0xA1, 0xA1, 0xB0, 0x17, 0xB2, 0xA1, 0x08, 
+                    0x31, 0x3B, 0x3B, 0x3B, 0x39, 0x39, 0x1B, 0x1C, 0x1D, 0x38, 0x39, 0x3A, 0x3B, 0x3B, 0x3B, 0x08,
+                    0x91, 0x9B, 0x9B, 0x9B, 0x9B, 0x9B, 0x84, 0x84, 0x84, 0x9A, 0x9B, 0x9B, 0x9B, 0x9B, 0x9B, 0x08,
+                    0x17, 0xB2, 0xA1, 0xA1, 0xA1, 0xA1, 0xA1, 0xA1, 0xA1, 0xA1, 0xA1, 0xB0, 0x17, 0xB2, 0xA1, 0x08,
+                    0x17, 0xBB, 0x17, 0x17, 0x17, 0x17, 0x17, 0x17, 0x17, 0x17, 0x17, 0xBB, 0x17, 0x17, 0x17, 0x08,
+                    0x17, 0xB2, 0xA1, 0xA1, 0xA1, 0xA1, 0xA1, 0xA1, 0xA1, 0xA1, 0xA1, 0xB0, 0x17, 0xB2, 0xA1, 0x08,
+                    0x17, 0x17, 0x17, 0xBB, 0x17, 0x17, 0x17, 0x17, 0x17, 0xBB, 0x17, 0x17, 0x17, 0x17, 0x17, 0x08,
+                    0x17, 0xB2, 0xA1, 0xA1, 0xA1, 0xA1, 0xA1, 0xA1, 0xA1, 0xA1, 0xA1, 0xB0, 0x17, 0xB2, 0xA1, 0x08,
+                    0x17, 0x17, 0xBB, 0x17, 0x17, 0x17, 0x17, 0xBB, 0x17, 0x17, 0x17, 0x17, 0x17, 0x17, 0x17, 0x08,
+                    0x17, 0xB2, 0xA1, 0xA1, 0xA1, 0xA1, 0xA1, 0xA1, 0xA1, 0xA1, 0xA1, 0xB0, 0x17, 0xB2, 0xA1, 0x08,
+                    0x17, 0x17, 0x17, 0x17, 0x17, 0xBB, 0x17, 0x17, 0x17, 0x17, 0xBB, 0x17, 0x17, 0x17, 0x17, 0x08,
+                    0x17, 0xB2, 0xA1, 0xA1, 0xA1, 0xA1, 0xA1, 0xA1, 0xA1, 0xA1, 0xA1, 0xB0, 0x17, 0xB2, 0xA1, 0x08,
+                    0x17, 0x17, 0x17, 0x17, 0x17, 0x17, 0x17, 0x17, 0x17, 0xBB, 0x17, 0x17, 0xBB, 0x17, 0x17, 0x08,
+                    0x17, 0xB2, 0xA1, 0xA1, 0xA1, 0xA1, 0xA1, 0xA1, 0xA1, 0xA1, 0xA1, 0xB0, 0x17, 0xB2, 0xA1, 0x08,
+                    0x17, 0x17, 0x17, 0x17, 0xBB, 0x17, 0x17, 0x17, 0x17, 0x17, 0x17, 0x17, 0x17, 0x17, 0x17, 0x08,
+                    0x17, 0xB2, 0xA1, 0xA1, 0xA1, 0xA1, 0xA1, 0xA1, 0xA1, 0xA1, 0xA1, 0xB0, 0x17, 0xB2, 0xA1, 0x08,
                     0x17, 0xBB, 0xBB, 0xBB, 0xBB, 0xBB, 0xBB, 0xBB, 0xBB, 0xBB, 0xBB, 0xBB, 0x17, 0xBB, 0xBB, 0x08,
                 },
                 .collisionData = {0x0381, 0x0381, 0x7FF7, 0x1, 0x7FF7, 0x1, 0x7FF7, 0x1, 0x7FF7, 0x1, 0x7FF7, 0x1, 0x7FF7, 0x1, 0x7FF7, 0x1},
@@ -2978,21 +2978,21 @@ static const struct TrHillFloor sDataTagVariety_Floors[] = {
                 },
             .display = {
                 .metatileData = {
-                    0x31, 0x3B, 0x3B, 0x3B, 0x39, 0x39, 0x13, 0x14, 0x15, 0x38, 0x39, 0x3A, 0x3B, 0x3B, 0x3B, 0x08, 
-                    0x69, 0x40, 0x6D, 0x41, 0x73, 0x41, 0x5E, 0x41, 0x71, 0x42, 0x45, 0x45, 0x45, 0x45, 0x45, 0x08, 
-                    0x43, 0x73, 0x64, 0x73, 0x43, 0x73, 0x64, 0x73, 0x41, 0x73, 0x45, 0x45, 0x45, 0x45, 0x45, 0x08, 
-                    0x65, 0x40, 0x73, 0x42, 0x6D, 0x42, 0x73, 0x42, 0x6D, 0x42, 0x45, 0x45, 0x45, 0x45, 0x45, 0x08, 
-                    0x6C, 0x73, 0x41, 0x73, 0x64, 0x73, 0x40, 0x73, 0x64, 0x73, 0x40, 0x73, 0x42, 0x73, 0x41, 0x08, 
-                    0x69, 0x40, 0x6D, 0x41, 0x73, 0x40, 0x6D, 0x43, 0x73, 0x43, 0x6D, 0x42, 0x73, 0x42, 0x6D, 0x08, 
-                    0x40, 0x73, 0x64, 0x73, 0x43, 0x73, 0x64, 0x73, 0x41, 0x73, 0x64, 0x73, 0x41, 0x73, 0x64, 0x08, 
-                    0x65, 0x42, 0x73, 0x42, 0x6D, 0x41, 0x73, 0x40, 0x6D, 0x42, 0x73, 0x41, 0x6D, 0x42, 0x73, 0x08, 
-                    0x6C, 0x73, 0x41, 0x73, 0x64, 0x73, 0x42, 0x73, 0x64, 0x73, 0x42, 0x73, 0x64, 0x73, 0x42, 0x08, 
-                    0x69, 0x40, 0x6D, 0x41, 0x73, 0x41, 0x6D, 0x42, 0x73, 0x43, 0x6D, 0x41, 0x73, 0x43, 0x6D, 0x08, 
-                    0x40, 0x73, 0x64, 0x73, 0x43, 0x73, 0x64, 0x73, 0x43, 0x73, 0x64, 0x73, 0x42, 0x73, 0x64, 0x08, 
-                    0x65, 0x42, 0x73, 0x42, 0x6D, 0x43, 0x73, 0x42, 0x6D, 0x42, 0x73, 0x41, 0x6D, 0x40, 0x73, 0x08, 
-                    0x6C, 0x73, 0x40, 0x73, 0x64, 0x73, 0x41, 0x73, 0x64, 0x73, 0x42, 0x73, 0x64, 0x73, 0x42, 0x08, 
-                    0x69, 0x40, 0x6D, 0x42, 0x73, 0x42, 0x6D, 0x43, 0x73, 0x40, 0x6D, 0x41, 0x73, 0x40, 0x6D, 0x08, 
-                    0x40, 0x73, 0x64, 0x73, 0x40, 0x73, 0x64, 0x73, 0x40, 0x73, 0x64, 0x73, 0x43, 0x73, 0x64, 0x08, 
+                    0x31, 0x3B, 0x3B, 0x3B, 0x39, 0x39, 0x13, 0x14, 0x15, 0x38, 0x39, 0x3A, 0x3B, 0x3B, 0x3B, 0x08,
+                    0x69, 0x40, 0x6D, 0x41, 0x73, 0x41, 0x5E, 0x41, 0x71, 0x42, 0x45, 0x45, 0x45, 0x45, 0x45, 0x08,
+                    0x43, 0x73, 0x64, 0x73, 0x43, 0x73, 0x64, 0x73, 0x41, 0x73, 0x45, 0x45, 0x45, 0x45, 0x45, 0x08,
+                    0x65, 0x40, 0x73, 0x42, 0x6D, 0x42, 0x73, 0x42, 0x6D, 0x42, 0x45, 0x45, 0x45, 0x45, 0x45, 0x08,
+                    0x6C, 0x73, 0x41, 0x73, 0x64, 0x73, 0x40, 0x73, 0x64, 0x73, 0x40, 0x73, 0x42, 0x73, 0x41, 0x08,
+                    0x69, 0x40, 0x6D, 0x41, 0x73, 0x40, 0x6D, 0x43, 0x73, 0x43, 0x6D, 0x42, 0x73, 0x42, 0x6D, 0x08,
+                    0x40, 0x73, 0x64, 0x73, 0x43, 0x73, 0x64, 0x73, 0x41, 0x73, 0x64, 0x73, 0x41, 0x73, 0x64, 0x08,
+                    0x65, 0x42, 0x73, 0x42, 0x6D, 0x41, 0x73, 0x40, 0x6D, 0x42, 0x73, 0x41, 0x6D, 0x42, 0x73, 0x08,
+                    0x6C, 0x73, 0x41, 0x73, 0x64, 0x73, 0x42, 0x73, 0x64, 0x73, 0x42, 0x73, 0x64, 0x73, 0x42, 0x08,
+                    0x69, 0x40, 0x6D, 0x41, 0x73, 0x41, 0x6D, 0x42, 0x73, 0x43, 0x6D, 0x41, 0x73, 0x43, 0x6D, 0x08,
+                    0x40, 0x73, 0x64, 0x73, 0x43, 0x73, 0x64, 0x73, 0x43, 0x73, 0x64, 0x73, 0x42, 0x73, 0x64, 0x08,
+                    0x65, 0x42, 0x73, 0x42, 0x6D, 0x43, 0x73, 0x42, 0x6D, 0x42, 0x73, 0x41, 0x6D, 0x40, 0x73, 0x08,
+                    0x6C, 0x73, 0x40, 0x73, 0x64, 0x73, 0x41, 0x73, 0x64, 0x73, 0x42, 0x73, 0x64, 0x73, 0x42, 0x08,
+                    0x69, 0x40, 0x6D, 0x42, 0x73, 0x42, 0x6D, 0x43, 0x73, 0x40, 0x6D, 0x41, 0x73, 0x40, 0x6D, 0x08,
+                    0x40, 0x73, 0x64, 0x73, 0x40, 0x73, 0x64, 0x73, 0x40, 0x73, 0x64, 0x73, 0x43, 0x73, 0x64, 0x08,
                     0x08, 0x08, 0x08, 0x08, 0x08, 0x08, 0x08, 0x08, 0x08, 0x08, 0x08, 0x08, 0x08, 0x08, 0x08, 0x08,
                 },
                 .collisionData = {0x0381, 0x1, 0x2201, 0x1, 0x8881, 0x1, 0x2223, 0x1, 0x8889, 0x1, 0x2223, 0x1, 0x8889, 0x1, 0x2223, 0xFFFF},
@@ -3304,21 +3304,21 @@ static const struct TrHillFloor sDataTagUnique_Floors[] = {
                 },
             .display = {
                 .metatileData = {
-                    0xF1, 0xF5, 0xFB, 0xF5, 0xE6, 0xE6, 0x1B, 0x14, 0x15, 0xF8, 0xF9, 0xFA, 0xFB, 0xFB, 0xFB, 0x08, 
-                    0xF1, 0xEB, 0xFB, 0xEB, 0xEC, 0xEC, 0xEC, 0xF9, 0xE6, 0xEE, 0xF5, 0xF5, 0xF5, 0xF5, 0xF5, 0x08, 
-                    0xF1, 0xEB, 0xFB, 0xEB, 0xFB, 0x9B, 0x9B, 0xFB, 0xEB, 0xEC, 0xEC, 0xEC, 0xEC, 0xEC, 0xEB, 0x08, 
-                    0xF1, 0xEB, 0xFB, 0xEB, 0x9B, 0xDB, 0xDB, 0x9B, 0xEC, 0xFB, 0xF5, 0xF5, 0xF5, 0xFB, 0xEB, 0x08, 
-                    0xF1, 0xEB, 0xFB, 0xEB, 0xF5, 0x95, 0x95, 0xF5, 0xF5, 0xF5, 0xEB, 0xEC, 0xEB, 0xFB, 0xEB, 0x08, 
-                    0xED, 0xEB, 0xFB, 0xEC, 0xEC, 0xEC, 0xEC, 0xEC, 0xEC, 0xEC, 0xEB, 0xFB, 0xEB, 0xFB, 0xEB, 0x08, 
-                    0xF4, 0xEB, 0xFB, 0xF5, 0xF5, 0xF5, 0xF5, 0xF5, 0xF5, 0xF5, 0xEB, 0xFB, 0xEB, 0xFB, 0xEB, 0x08, 
-                    0xF1, 0xEB, 0xFB, 0xEB, 0xEC, 0xEC, 0xEC, 0xEC, 0xEC, 0xEC, 0xEC, 0xFB, 0xEB, 0xFB, 0xEC, 0x08, 
-                    0xF1, 0xEB, 0xFB, 0xEB, 0xFB, 0xF5, 0xF5, 0xF5, 0xF5, 0xF5, 0xF5, 0xF5, 0xEB, 0xF5, 0xFB, 0x08, 
-                    0xF1, 0xEC, 0xFB, 0xEB, 0xFB, 0xEC, 0xEC, 0xEC, 0xEC, 0xEC, 0xEC, 0xEC, 0xEC, 0xEB, 0xFB, 0x08, 
-                    0xF1, 0xF5, 0xF5, 0xEB, 0xF5, 0xF5, 0xF5, 0xF5, 0xF5, 0xF5, 0xF5, 0xF5, 0xFB, 0xEB, 0xFB, 0x08, 
-                    0xF1, 0xEC, 0xEC, 0xEC, 0xEC, 0xEC, 0xEC, 0xEC, 0xEC, 0xEC, 0xEC, 0xEB, 0xFB, 0xEB, 0xFB, 0x08, 
-                    0xF1, 0xF5, 0xF5, 0xF5, 0xF5, 0xF5, 0xF5, 0xF5, 0xF5, 0xF5, 0xF5, 0xEB, 0xFB, 0xEB, 0xFB, 0x08, 
-                    0xF1, 0xEC, 0xEC, 0xEC, 0xEC, 0xEC, 0xEC, 0xEC, 0xEC, 0xEC, 0xEC, 0xEC, 0xFB, 0xEC, 0xFB, 0x08, 
-                    0xF1, 0xFB, 0xFB, 0xFB, 0xFB, 0xFB, 0xFB, 0xFB, 0xFB, 0xFB, 0xFB, 0xFB, 0xFB, 0xFB, 0xFB, 0x08, 
+                    0xF1, 0xF5, 0xFB, 0xF5, 0xE6, 0xE6, 0x1B, 0x14, 0x15, 0xF8, 0xF9, 0xFA, 0xFB, 0xFB, 0xFB, 0x08,
+                    0xF1, 0xEB, 0xFB, 0xEB, 0xEC, 0xEC, 0xEC, 0xF9, 0xE6, 0xEE, 0xF5, 0xF5, 0xF5, 0xF5, 0xF5, 0x08,
+                    0xF1, 0xEB, 0xFB, 0xEB, 0xFB, 0x9B, 0x9B, 0xFB, 0xEB, 0xEC, 0xEC, 0xEC, 0xEC, 0xEC, 0xEB, 0x08,
+                    0xF1, 0xEB, 0xFB, 0xEB, 0x9B, 0xDB, 0xDB, 0x9B, 0xEC, 0xFB, 0xF5, 0xF5, 0xF5, 0xFB, 0xEB, 0x08,
+                    0xF1, 0xEB, 0xFB, 0xEB, 0xF5, 0x95, 0x95, 0xF5, 0xF5, 0xF5, 0xEB, 0xEC, 0xEB, 0xFB, 0xEB, 0x08,
+                    0xED, 0xEB, 0xFB, 0xEC, 0xEC, 0xEC, 0xEC, 0xEC, 0xEC, 0xEC, 0xEB, 0xFB, 0xEB, 0xFB, 0xEB, 0x08,
+                    0xF4, 0xEB, 0xFB, 0xF5, 0xF5, 0xF5, 0xF5, 0xF5, 0xF5, 0xF5, 0xEB, 0xFB, 0xEB, 0xFB, 0xEB, 0x08,
+                    0xF1, 0xEB, 0xFB, 0xEB, 0xEC, 0xEC, 0xEC, 0xEC, 0xEC, 0xEC, 0xEC, 0xFB, 0xEB, 0xFB, 0xEC, 0x08,
+                    0xF1, 0xEB, 0xFB, 0xEB, 0xFB, 0xF5, 0xF5, 0xF5, 0xF5, 0xF5, 0xF5, 0xF5, 0xEB, 0xF5, 0xFB, 0x08,
+                    0xF1, 0xEC, 0xFB, 0xEB, 0xFB, 0xEC, 0xEC, 0xEC, 0xEC, 0xEC, 0xEC, 0xEC, 0xEC, 0xEB, 0xFB, 0x08,
+                    0xF1, 0xF5, 0xF5, 0xEB, 0xF5, 0xF5, 0xF5, 0xF5, 0xF5, 0xF5, 0xF5, 0xF5, 0xFB, 0xEB, 0xFB, 0x08,
+                    0xF1, 0xEC, 0xEC, 0xEC, 0xEC, 0xEC, 0xEC, 0xEC, 0xEC, 0xEC, 0xEC, 0xEB, 0xFB, 0xEB, 0xFB, 0x08,
+                    0xF1, 0xF5, 0xF5, 0xF5, 0xF5, 0xF5, 0xF5, 0xF5, 0xF5, 0xF5, 0xF5, 0xEB, 0xFB, 0xEB, 0xFB, 0x08,
+                    0xF1, 0xEC, 0xEC, 0xEC, 0xEC, 0xEC, 0xEC, 0xEC, 0xEC, 0xEC, 0xEC, 0xEC, 0xFB, 0xEC, 0xFB, 0x08,
+                    0xF1, 0xFB, 0xFB, 0xFB, 0xFB, 0xFB, 0xFB, 0xFB, 0xFB, 0xFB, 0xFB, 0xFB, 0xFB, 0xFB, 0xFB, 0x08,
                     0x08, 0x08, 0x08, 0x08, 0x08, 0x08, 0x08, 0x08, 0x08, 0x08, 0x08, 0x08, 0x08, 0x08, 0x08, 0x08,
                 },
                 .collisionData = {0x0381, 0x5E01, 0x50FF, 0x5083, 0x503B, 0x5FEB, 0xC02B, 0x5FEB, 0x5009, 0x57FD, 0x1005, 0x7FF5, 0x15, 0x7FF5, 0x1, 0xFFFF},
@@ -3625,21 +3625,21 @@ static const struct TrHillFloor sDataTagUnique_Floors[] = {
                 },
             .display = {
                 .metatileData = {
-                    0x31, 0x3B, 0x3B, 0x3B, 0x39, 0x26, 0x1B, 0x1C, 0x1D, 0x25, 0x39, 0x3A, 0x3B, 0x3B, 0x3B, 0x08, 
-                    0x2D, 0x3B, 0x3B, 0x3B, 0x35, 0x2C, 0x23, 0x24, 0x23, 0x2C, 0x35, 0x3B, 0x3B, 0x3B, 0x3B, 0x08, 
-                    0x94, 0x87, 0x9B, 0x87, 0x8C, 0x87, 0x8B, 0x87, 0x8C, 0x87, 0x8C, 0x87, 0x95, 0x87, 0x9B, 0x08, 
-                    0x91, 0x8F, 0x9B, 0x8F, 0x9B, 0x8F, 0x8C, 0x8F, 0x9B, 0x8F, 0x9B, 0x8F, 0x8C, 0x8F, 0x95, 0x08, 
-                    0x8D, 0x97, 0x95, 0x97, 0x9B, 0x97, 0x95, 0x97, 0x95, 0x97, 0x9B, 0x97, 0x9B, 0x97, 0x8C, 0x08, 
-                    0x94, 0x87, 0x8C, 0x87, 0x9B, 0x87, 0x8C, 0x87, 0x8B, 0x87, 0x9B, 0x9B, 0x9B, 0x87, 0x9B, 0x08, 
-                    0x91, 0x8F, 0x9B, 0x8F, 0x95, 0x8F, 0x9B, 0x8F, 0x8C, 0x8F, 0x95, 0x9B, 0x95, 0x8F, 0x9B, 0x08, 
-                    0x91, 0x97, 0x95, 0x97, 0x8C, 0x97, 0x95, 0x97, 0x95, 0x97, 0x8C, 0x9B, 0x8C, 0x97, 0x95, 0x08, 
-                    0x91, 0x87, 0x8C, 0x87, 0x9B, 0x87, 0x8C, 0x87, 0x8B, 0x87, 0x9B, 0x87, 0x95, 0x87, 0x8C, 0x08, 
-                    0x8D, 0x8F, 0x9B, 0x8F, 0x95, 0x8F, 0x9B, 0x8F, 0x8C, 0x8F, 0x9B, 0x8F, 0x8C, 0x8F, 0x9B, 0x08, 
-                    0x94, 0x97, 0x95, 0x97, 0x8C, 0x97, 0x9B, 0x97, 0x95, 0x97, 0x95, 0x97, 0x9B, 0x97, 0x9B, 0x08, 
-                    0x91, 0x87, 0x8C, 0x87, 0x95, 0x87, 0x95, 0x87, 0x8B, 0x87, 0x8C, 0x87, 0x9B, 0x87, 0x9B, 0x08, 
-                    0x91, 0x8F, 0x95, 0x8F, 0x8B, 0x8F, 0x8C, 0x8F, 0x8C, 0x8F, 0x9B, 0x8F, 0x95, 0x8F, 0x9B, 0x08, 
-                    0x91, 0x97, 0x8C, 0x97, 0x8C, 0x97, 0x9B, 0x97, 0x9B, 0x97, 0x9B, 0x97, 0x8B, 0x97, 0x9B, 0x08, 
-                    0x91, 0x9B, 0x9B, 0x9B, 0x9B, 0x9B, 0x9B, 0x9B, 0x9B, 0x9B, 0x9B, 0x9B, 0x8C, 0x9B, 0x9B, 0x08, 
+                    0x31, 0x3B, 0x3B, 0x3B, 0x39, 0x26, 0x1B, 0x1C, 0x1D, 0x25, 0x39, 0x3A, 0x3B, 0x3B, 0x3B, 0x08,
+                    0x2D, 0x3B, 0x3B, 0x3B, 0x35, 0x2C, 0x23, 0x24, 0x23, 0x2C, 0x35, 0x3B, 0x3B, 0x3B, 0x3B, 0x08,
+                    0x94, 0x87, 0x9B, 0x87, 0x8C, 0x87, 0x8B, 0x87, 0x8C, 0x87, 0x8C, 0x87, 0x95, 0x87, 0x9B, 0x08,
+                    0x91, 0x8F, 0x9B, 0x8F, 0x9B, 0x8F, 0x8C, 0x8F, 0x9B, 0x8F, 0x9B, 0x8F, 0x8C, 0x8F, 0x95, 0x08,
+                    0x8D, 0x97, 0x95, 0x97, 0x9B, 0x97, 0x95, 0x97, 0x95, 0x97, 0x9B, 0x97, 0x9B, 0x97, 0x8C, 0x08,
+                    0x94, 0x87, 0x8C, 0x87, 0x9B, 0x87, 0x8C, 0x87, 0x8B, 0x87, 0x9B, 0x9B, 0x9B, 0x87, 0x9B, 0x08,
+                    0x91, 0x8F, 0x9B, 0x8F, 0x95, 0x8F, 0x9B, 0x8F, 0x8C, 0x8F, 0x95, 0x9B, 0x95, 0x8F, 0x9B, 0x08,
+                    0x91, 0x97, 0x95, 0x97, 0x8C, 0x97, 0x95, 0x97, 0x95, 0x97, 0x8C, 0x9B, 0x8C, 0x97, 0x95, 0x08,
+                    0x91, 0x87, 0x8C, 0x87, 0x9B, 0x87, 0x8C, 0x87, 0x8B, 0x87, 0x9B, 0x87, 0x95, 0x87, 0x8C, 0x08,
+                    0x8D, 0x8F, 0x9B, 0x8F, 0x95, 0x8F, 0x9B, 0x8F, 0x8C, 0x8F, 0x9B, 0x8F, 0x8C, 0x8F, 0x9B, 0x08,
+                    0x94, 0x97, 0x95, 0x97, 0x8C, 0x97, 0x9B, 0x97, 0x95, 0x97, 0x95, 0x97, 0x9B, 0x97, 0x9B, 0x08,
+                    0x91, 0x87, 0x8C, 0x87, 0x95, 0x87, 0x95, 0x87, 0x8B, 0x87, 0x8C, 0x87, 0x9B, 0x87, 0x9B, 0x08,
+                    0x91, 0x8F, 0x95, 0x8F, 0x8B, 0x8F, 0x8C, 0x8F, 0x8C, 0x8F, 0x9B, 0x8F, 0x95, 0x8F, 0x9B, 0x08,
+                    0x91, 0x97, 0x8C, 0x97, 0x8C, 0x97, 0x9B, 0x97, 0x9B, 0x97, 0x9B, 0x97, 0x8B, 0x97, 0x9B, 0x08,
+                    0x91, 0x9B, 0x9B, 0x9B, 0x9B, 0x9B, 0x9B, 0x9B, 0x9B, 0x9B, 0x9B, 0x9B, 0x8C, 0x9B, 0x9B, 0x08,
                     0x08, 0x08, 0x08, 0x08, 0x08, 0x08, 0x08, 0x08, 0x08, 0x08, 0x08, 0x08, 0x08, 0x08, 0x08, 0x08,
                 },
                 .collisionData = {0x0381, 0x7C1, 0x8AA1, 0x0209, 0x5557, 0xA281, 0x81, 0x5D6D, 0x2283, 0x89, 0xDD55, 0x20A1, 0xA81, 0x7D5D, 0x9, 0xFFFF},
@@ -3946,21 +3946,21 @@ static const struct TrHillFloor sDataTagUnique_Floors[] = {
                 },
             .display = {
                 .metatileData = {
-                    0x31, 0x3B, 0x3B, 0x3B, 0x39, 0x39, 0x13, 0x14, 0x15, 0x38, 0x39, 0x3A, 0x3B, 0x3B, 0x3B, 0x08, 
-                    0x69, 0x46, 0x46, 0x46, 0x46, 0x46, 0x46, 0x46, 0x46, 0x46, 0x46, 0x46, 0x46, 0x7C, 0x46, 0x08, 
-                    0x69, 0x46, 0x7A, 0x73, 0x73, 0x73, 0x79, 0x73, 0x73, 0x73, 0x7D, 0x73, 0x73, 0x73, 0x46, 0x08, 
-                    0x69, 0x46, 0x73, 0x46, 0x46, 0x46, 0x46, 0x46, 0x46, 0x46, 0x46, 0x46, 0x46, 0x46, 0x46, 0x08, 
-                    0x69, 0x46, 0x73, 0x73, 0x7B, 0x73, 0x7C, 0x73, 0x7B, 0x73, 0x7A, 0x73, 0x73, 0x73, 0x46, 0x08, 
-                    0x69, 0x46, 0x46, 0x46, 0x46, 0x46, 0x46, 0x46, 0x46, 0x46, 0x46, 0x46, 0x46, 0x7A, 0x46, 0x08, 
-                    0x69, 0x46, 0x73, 0x73, 0x73, 0x73, 0x73, 0x7D, 0x7C, 0x73, 0x7C, 0x73, 0x7B, 0x73, 0x46, 0x08, 
-                    0x69, 0x46, 0x46, 0x46, 0x46, 0x46, 0x46, 0x7C, 0x46, 0x46, 0x46, 0x46, 0x46, 0x46, 0x46, 0x08, 
-                    0x91, 0x46, 0x9B, 0x9B, 0x9B, 0x46, 0x3B, 0x3B, 0x3B, 0x46, 0x9B, 0x9B, 0x9B, 0x9B, 0x46, 0x08, 
-                    0x91, 0x46, 0x9B, 0x9B, 0x9B, 0x46, 0x3B, 0x3B, 0x3B, 0x46, 0x9B, 0x9B, 0x9B, 0x9B, 0x46, 0x08, 
-                    0x91, 0x46, 0x9B, 0x9B, 0x9B, 0x46, 0x3B, 0x3B, 0x3B, 0x46, 0x9B, 0x9B, 0x9B, 0x9B, 0x46, 0x08, 
-                    0xF1, 0x46, 0x46, 0x46, 0x46, 0x46, 0x46, 0x78, 0x46, 0x46, 0x46, 0x46, 0x46, 0x46, 0x46, 0x08, 
-                    0xF1, 0x46, 0xFB, 0xFB, 0xFB, 0xFB, 0xFB, 0xFB, 0x7A, 0xFB, 0xFB, 0xFB, 0xFB, 0xFB, 0x7C, 0x08, 
-                    0xF1, 0x46, 0x46, 0x46, 0x46, 0x46, 0x46, 0x46, 0x46, 0x46, 0x46, 0x46, 0x46, 0x46, 0xFB, 0x08, 
-                    0x7C, 0xFB, 0x7B, 0xFB, 0x7A, 0xFB, 0x79, 0xFB, 0xB3, 0xFB, 0x7D, 0xFB, 0x7E, 0xFB, 0x7D, 0x08, 
+                    0x31, 0x3B, 0x3B, 0x3B, 0x39, 0x39, 0x13, 0x14, 0x15, 0x38, 0x39, 0x3A, 0x3B, 0x3B, 0x3B, 0x08,
+                    0x69, 0x46, 0x46, 0x46, 0x46, 0x46, 0x46, 0x46, 0x46, 0x46, 0x46, 0x46, 0x46, 0x7C, 0x46, 0x08,
+                    0x69, 0x46, 0x7A, 0x73, 0x73, 0x73, 0x79, 0x73, 0x73, 0x73, 0x7D, 0x73, 0x73, 0x73, 0x46, 0x08,
+                    0x69, 0x46, 0x73, 0x46, 0x46, 0x46, 0x46, 0x46, 0x46, 0x46, 0x46, 0x46, 0x46, 0x46, 0x46, 0x08,
+                    0x69, 0x46, 0x73, 0x73, 0x7B, 0x73, 0x7C, 0x73, 0x7B, 0x73, 0x7A, 0x73, 0x73, 0x73, 0x46, 0x08,
+                    0x69, 0x46, 0x46, 0x46, 0x46, 0x46, 0x46, 0x46, 0x46, 0x46, 0x46, 0x46, 0x46, 0x7A, 0x46, 0x08,
+                    0x69, 0x46, 0x73, 0x73, 0x73, 0x73, 0x73, 0x7D, 0x7C, 0x73, 0x7C, 0x73, 0x7B, 0x73, 0x46, 0x08,
+                    0x69, 0x46, 0x46, 0x46, 0x46, 0x46, 0x46, 0x7C, 0x46, 0x46, 0x46, 0x46, 0x46, 0x46, 0x46, 0x08,
+                    0x91, 0x46, 0x9B, 0x9B, 0x9B, 0x46, 0x3B, 0x3B, 0x3B, 0x46, 0x9B, 0x9B, 0x9B, 0x9B, 0x46, 0x08,
+                    0x91, 0x46, 0x9B, 0x9B, 0x9B, 0x46, 0x3B, 0x3B, 0x3B, 0x46, 0x9B, 0x9B, 0x9B, 0x9B, 0x46, 0x08,
+                    0x91, 0x46, 0x9B, 0x9B, 0x9B, 0x46, 0x3B, 0x3B, 0x3B, 0x46, 0x9B, 0x9B, 0x9B, 0x9B, 0x46, 0x08,
+                    0xF1, 0x46, 0x46, 0x46, 0x46, 0x46, 0x46, 0x78, 0x46, 0x46, 0x46, 0x46, 0x46, 0x46, 0x46, 0x08,
+                    0xF1, 0x46, 0xFB, 0xFB, 0xFB, 0xFB, 0xFB, 0xFB, 0x7A, 0xFB, 0xFB, 0xFB, 0xFB, 0xFB, 0x7C, 0x08,
+                    0xF1, 0x46, 0x46, 0x46, 0x46, 0x46, 0x46, 0x46, 0x46, 0x46, 0x46, 0x46, 0x46, 0x46, 0xFB, 0x08,
+                    0x7C, 0xFB, 0x7B, 0xFB, 0x7A, 0xFB, 0x79, 0xFB, 0xB3, 0xFB, 0x7D, 0xFB, 0x7E, 0xFB, 0x7D, 0x08,
                     0x08, 0x08, 0x08, 0x08, 0x08, 0x08, 0x08, 0x08, 0x08, 0x08, 0x08, 0x08, 0x08, 0x08, 0x08, 0x08,
                 },
                 .collisionData = {0x0381, 0x7FFB, 0x4003, 0x5FFF, 0x4003, 0x7FFB, 0x4003, 0x7EFF, 0x4443, 0x4443, 0x4443, 0x7EFF, 0x4001, 0x7FFD, 0x1, 0xFFFF},
@@ -4257,21 +4257,21 @@ static const struct TrHillFloor sDataTagUnique_Floors[] = {
                 },
             .display = {
                 .metatileData = {
-                    0xF1, 0xFB, 0xFB, 0xFB, 0xF9, 0xF9, 0x1B, 0x1C, 0x1D, 0xE5, 0xE6, 0xEE, 0xF5, 0xFB, 0xFB, 0x08, 
-                    0xED, 0xF5, 0xF5, 0xF5, 0xFB, 0xFB, 0xEC, 0xEC, 0xEC, 0xEB, 0xEC, 0xEC, 0xEC, 0xFB, 0xFB, 0x08, 
-                    0xF4, 0xEC, 0xEC, 0xEC, 0xFB, 0xFB, 0xFB, 0xFB, 0xFB, 0xEB, 0xFB, 0xFB, 0xFB, 0xFB, 0xFB, 0x08, 
-                    0xF1, 0xF5, 0xF5, 0xF5, 0xF5, 0xF5, 0xF5, 0xF5, 0xFB, 0xEB, 0xFB, 0xF5, 0xF5, 0xF5, 0xF5, 0x08, 
-                    0xF1, 0xEB, 0xEC, 0xEC, 0xEC, 0xEB, 0xEC, 0xEC, 0xFB, 0xEC, 0xFB, 0xEC, 0xEC, 0xEC, 0xEC, 0x08, 
-                    0xF1, 0xEB, 0xFB, 0xFB, 0xFB, 0xEB, 0xFB, 0xF5, 0xFB, 0xF5, 0xFB, 0xFB, 0xFB, 0xFB, 0xFB, 0x08, 
-                    0xF1, 0xEB, 0xFB, 0xF5, 0xFB, 0xEB, 0xFB, 0xEB, 0xFB, 0xEB, 0xF5, 0xF5, 0xF5, 0xFB, 0xFB, 0x08, 
-                    0xF1, 0xEB, 0xFB, 0xEB, 0xFB, 0xEB, 0xFB, 0xEB, 0xFB, 0xEB, 0xEC, 0xEC, 0xEC, 0xFB, 0xFB, 0x08, 
-                    0xF1, 0xEB, 0xFB, 0xEB, 0xFB, 0xEB, 0xFB, 0xEB, 0xFB, 0xEB, 0xFB, 0xF5, 0xF5, 0xF5, 0xF5, 0x08, 
-                    0xF1, 0xEB, 0xFB, 0xEB, 0xFB, 0xEB, 0xFB, 0xEB, 0xFB, 0xEB, 0xFB, 0xEC, 0xEC, 0xEC, 0xEC, 0x08, 
-                    0xF1, 0xEB, 0xFB, 0xEB, 0xFB, 0xEB, 0xFB, 0xEB, 0xFB, 0xEB, 0xFB, 0xFB, 0xFB, 0xFB, 0xFB, 0x08, 
-                    0xF1, 0xEB, 0xFB, 0xEB, 0xFB, 0xEB, 0xFB, 0xEB, 0xFB, 0xEB, 0xF5, 0xF5, 0xF5, 0xF5, 0xFB, 0x08, 
-                    0xF1, 0xEC, 0xFB, 0xEB, 0xFB, 0xEC, 0xFB, 0xEB, 0xFB, 0xEC, 0xEC, 0xEC, 0xEC, 0xEC, 0xFB, 0x08, 
-                    0xF1, 0xFB, 0xFB, 0xEB, 0xFB, 0xFB, 0xFB, 0xEB, 0xFB, 0xFB, 0xFB, 0xFB, 0xFB, 0xFB, 0xFB, 0x08, 
-                    0xF1, 0xFB, 0xFB, 0xEC, 0xFB, 0xFB, 0xFB, 0xEC, 0xFB, 0xFB, 0xFB, 0xFB, 0xFB, 0xFB, 0xFB, 0x08, 
+                    0xF1, 0xFB, 0xFB, 0xFB, 0xF9, 0xF9, 0x1B, 0x1C, 0x1D, 0xE5, 0xE6, 0xEE, 0xF5, 0xFB, 0xFB, 0x08,
+                    0xED, 0xF5, 0xF5, 0xF5, 0xFB, 0xFB, 0xEC, 0xEC, 0xEC, 0xEB, 0xEC, 0xEC, 0xEC, 0xFB, 0xFB, 0x08,
+                    0xF4, 0xEC, 0xEC, 0xEC, 0xFB, 0xFB, 0xFB, 0xFB, 0xFB, 0xEB, 0xFB, 0xFB, 0xFB, 0xFB, 0xFB, 0x08,
+                    0xF1, 0xF5, 0xF5, 0xF5, 0xF5, 0xF5, 0xF5, 0xF5, 0xFB, 0xEB, 0xFB, 0xF5, 0xF5, 0xF5, 0xF5, 0x08,
+                    0xF1, 0xEB, 0xEC, 0xEC, 0xEC, 0xEB, 0xEC, 0xEC, 0xFB, 0xEC, 0xFB, 0xEC, 0xEC, 0xEC, 0xEC, 0x08,
+                    0xF1, 0xEB, 0xFB, 0xFB, 0xFB, 0xEB, 0xFB, 0xF5, 0xFB, 0xF5, 0xFB, 0xFB, 0xFB, 0xFB, 0xFB, 0x08,
+                    0xF1, 0xEB, 0xFB, 0xF5, 0xFB, 0xEB, 0xFB, 0xEB, 0xFB, 0xEB, 0xF5, 0xF5, 0xF5, 0xFB, 0xFB, 0x08,
+                    0xF1, 0xEB, 0xFB, 0xEB, 0xFB, 0xEB, 0xFB, 0xEB, 0xFB, 0xEB, 0xEC, 0xEC, 0xEC, 0xFB, 0xFB, 0x08,
+                    0xF1, 0xEB, 0xFB, 0xEB, 0xFB, 0xEB, 0xFB, 0xEB, 0xFB, 0xEB, 0xFB, 0xF5, 0xF5, 0xF5, 0xF5, 0x08,
+                    0xF1, 0xEB, 0xFB, 0xEB, 0xFB, 0xEB, 0xFB, 0xEB, 0xFB, 0xEB, 0xFB, 0xEC, 0xEC, 0xEC, 0xEC, 0x08,
+                    0xF1, 0xEB, 0xFB, 0xEB, 0xFB, 0xEB, 0xFB, 0xEB, 0xFB, 0xEB, 0xFB, 0xFB, 0xFB, 0xFB, 0xFB, 0x08,
+                    0xF1, 0xEB, 0xFB, 0xEB, 0xFB, 0xEB, 0xFB, 0xEB, 0xFB, 0xEB, 0xF5, 0xF5, 0xF5, 0xF5, 0xFB, 0x08,
+                    0xF1, 0xEC, 0xFB, 0xEB, 0xFB, 0xEC, 0xFB, 0xEB, 0xFB, 0xEC, 0xEC, 0xEC, 0xEC, 0xEC, 0xFB, 0x08,
+                    0xF1, 0xFB, 0xFB, 0xEB, 0xFB, 0xFB, 0xFB, 0xEB, 0xFB, 0xFB, 0xFB, 0xFB, 0xFB, 0xFB, 0xFB, 0x08,
+                    0xF1, 0xFB, 0xFB, 0xEC, 0xFB, 0xFB, 0xFB, 0xEC, 0xFB, 0xFB, 0xFB, 0xFB, 0xFB, 0xFB, 0xFB, 0x08,
                     0x08, 0x08, 0x08, 0x08, 0x08, 0x08, 0x08, 0x08, 0x08, 0x08, 0x08, 0x08, 0x08, 0x08, 0x08, 0x08,
                 },
                 .collisionData = {0x0381, 0x3F9, 0xF041, 0x41, 0x7F5F, 0x4401, 0x4541, 0x5579, 0x5541, 0x555F, 0x5541, 0x5541, 0x557D, 0x1101, 0x1101, 0xFFFF},
@@ -4590,21 +4590,21 @@ static const struct TrHillFloor sDataTagExpert_Floors[] = {
                 },
             .display = {
                 .metatileData = {
-                    0x31, 0x3B, 0x3B, 0x3B, 0x39, 0x39, 0x1B, 0x14, 0x15, 0x38, 0x39, 0x3A, 0x3B, 0x3B, 0x3B, 0x08, 
-                    0x31, 0x3B, 0x3B, 0x3B, 0x3B, 0x3B, 0x2C, 0x39, 0x39, 0x3A, 0x3B, 0x3B, 0x3B, 0x3B, 0x3B, 0x08, 
-                    0x31, 0x3B, 0x08, 0x08, 0x08, 0x08, 0x08, 0x3B, 0x08, 0x08, 0x08, 0x08, 0x08, 0x3B, 0x3B, 0x08, 
-                    0x69, 0x73, 0x08, 0x4D, 0x4D, 0x4D, 0x4D, 0xD1, 0x4D, 0x4D, 0x4D, 0x4D, 0x08, 0x69, 0x73, 0x08, 
-                    0x40, 0x3B, 0x08, 0x55, 0x55, 0x55, 0x55, 0xD1, 0x55, 0x55, 0x55, 0x55, 0x08, 0x31, 0x41, 0x08, 
-                    0x69, 0x41, 0x08, 0xC5, 0xD9, 0xD9, 0xD9, 0x9A, 0xD9, 0xD9, 0xD9, 0xC6, 0x08, 0x41, 0x73, 0x08, 
-                    0x69, 0x3B, 0x08, 0xD4, 0xDB, 0x9B, 0x73, 0x73, 0x73, 0x9B, 0xDB, 0xCC, 0x08, 0x31, 0x73, 0x08, 
-                    0x69, 0x3B, 0x08, 0xCD, 0x9B, 0x73, 0x73, 0x44, 0x73, 0x73, 0x9B, 0xD5, 0x08, 0x31, 0x73, 0x08, 
-                    0x69, 0x3B, 0x08, 0xD4, 0xDB, 0x9B, 0x73, 0x73, 0x73, 0x9B, 0xDB, 0xCC, 0x08, 0x31, 0x73, 0x08, 
-                    0x69, 0x41, 0x08, 0xD1, 0xDB, 0xDB, 0xDB, 0x9B, 0xDB, 0xDB, 0xDB, 0xDB, 0x08, 0x41, 0x73, 0x08, 
-                    0x40, 0x3B, 0x08, 0x08, 0xC7, 0xC7, 0xDB, 0xDB, 0xDB, 0xC7, 0xC7, 0x08, 0x08, 0x31, 0x41, 0x08, 
-                    0x69, 0x3B, 0x4D, 0x4D, 0x67, 0x67, 0xDB, 0xDB, 0xDB, 0x67, 0x67, 0x4D, 0x4D, 0x31, 0x73, 0x08, 
-                    0x69, 0x3B, 0x55, 0x55, 0xD7, 0xD7, 0xD1, 0xDB, 0xDB, 0xD7, 0xD7, 0x55, 0x55, 0x31, 0x73, 0x08, 
-                    0x69, 0x3B, 0x39, 0x39, 0x39, 0x39, 0x3A, 0x3B, 0x3B, 0x39, 0x39, 0x39, 0x39, 0x3A, 0x73, 0x08, 
-                    0x69, 0x73, 0x73, 0x73, 0x73, 0x73, 0x73, 0x73, 0x73, 0x73, 0x73, 0x73, 0x73, 0x73, 0x73, 0x08, 
+                    0x31, 0x3B, 0x3B, 0x3B, 0x39, 0x39, 0x1B, 0x14, 0x15, 0x38, 0x39, 0x3A, 0x3B, 0x3B, 0x3B, 0x08,
+                    0x31, 0x3B, 0x3B, 0x3B, 0x3B, 0x3B, 0x2C, 0x39, 0x39, 0x3A, 0x3B, 0x3B, 0x3B, 0x3B, 0x3B, 0x08,
+                    0x31, 0x3B, 0x08, 0x08, 0x08, 0x08, 0x08, 0x3B, 0x08, 0x08, 0x08, 0x08, 0x08, 0x3B, 0x3B, 0x08,
+                    0x69, 0x73, 0x08, 0x4D, 0x4D, 0x4D, 0x4D, 0xD1, 0x4D, 0x4D, 0x4D, 0x4D, 0x08, 0x69, 0x73, 0x08,
+                    0x40, 0x3B, 0x08, 0x55, 0x55, 0x55, 0x55, 0xD1, 0x55, 0x55, 0x55, 0x55, 0x08, 0x31, 0x41, 0x08,
+                    0x69, 0x41, 0x08, 0xC5, 0xD9, 0xD9, 0xD9, 0x9A, 0xD9, 0xD9, 0xD9, 0xC6, 0x08, 0x41, 0x73, 0x08,
+                    0x69, 0x3B, 0x08, 0xD4, 0xDB, 0x9B, 0x73, 0x73, 0x73, 0x9B, 0xDB, 0xCC, 0x08, 0x31, 0x73, 0x08,
+                    0x69, 0x3B, 0x08, 0xCD, 0x9B, 0x73, 0x73, 0x44, 0x73, 0x73, 0x9B, 0xD5, 0x08, 0x31, 0x73, 0x08,
+                    0x69, 0x3B, 0x08, 0xD4, 0xDB, 0x9B, 0x73, 0x73, 0x73, 0x9B, 0xDB, 0xCC, 0x08, 0x31, 0x73, 0x08,
+                    0x69, 0x41, 0x08, 0xD1, 0xDB, 0xDB, 0xDB, 0x9B, 0xDB, 0xDB, 0xDB, 0xDB, 0x08, 0x41, 0x73, 0x08,
+                    0x40, 0x3B, 0x08, 0x08, 0xC7, 0xC7, 0xDB, 0xDB, 0xDB, 0xC7, 0xC7, 0x08, 0x08, 0x31, 0x41, 0x08,
+                    0x69, 0x3B, 0x4D, 0x4D, 0x67, 0x67, 0xDB, 0xDB, 0xDB, 0x67, 0x67, 0x4D, 0x4D, 0x31, 0x73, 0x08,
+                    0x69, 0x3B, 0x55, 0x55, 0xD7, 0xD7, 0xD1, 0xDB, 0xDB, 0xD7, 0xD7, 0x55, 0x55, 0x31, 0x73, 0x08,
+                    0x69, 0x3B, 0x39, 0x39, 0x39, 0x39, 0x3A, 0x3B, 0x3B, 0x39, 0x39, 0x39, 0x39, 0x3A, 0x73, 0x08,
+                    0x69, 0x73, 0x73, 0x73, 0x73, 0x73, 0x73, 0x73, 0x73, 0x73, 0x73, 0x73, 0x73, 0x73, 0x73, 0x08,
                     0x08, 0x08, 0x08, 0x08, 0x08, 0x08, 0x08, 0x08, 0x08, 0x08, 0x08, 0x08, 0x08, 0x08, 0x08, 0x08,
                 },
                 .collisionData = {0x0381, 0x0201, 0x3EF9, 0x3EF9, 0x3EF9, 0x2009, 0x3019, 0x2009, 0x3019, 0x2009, 0x3019, 0x3019, 0x3C79, 0x1, 0x1, 0xFFFF},
@@ -4912,21 +4912,21 @@ static const struct TrHillFloor sDataTagExpert_Floors[] = {
                 },
             .display = {
                 .metatileData = {
-                    0x31, 0x3B, 0x3B, 0x3B, 0x39, 0x39, 0x13, 0x14, 0x15, 0x38, 0x39, 0x3A, 0x3B, 0x3B, 0x3B, 0x08, 
-                    0x91, 0x46, 0x46, 0x46, 0x46, 0x46, 0x46, 0x46, 0x46, 0x46, 0x46, 0x46, 0x46, 0x46, 0x78, 0x08, 
-                    0x91, 0x46, 0x9B, 0x7C, 0x9B, 0x9B, 0x9B, 0x7D, 0x9B, 0x7C, 0x9B, 0x7B, 0x9B, 0x7A, 0x9B, 0x08, 
-                    0x91, 0x46, 0x7D, 0x46, 0x46, 0x46, 0x46, 0x46, 0x46, 0x46, 0x46, 0x46, 0x46, 0x46, 0x46, 0x08, 
-                    0x91, 0x46, 0x9B, 0x7E, 0x9B, 0x9B, 0x9B, 0x7D, 0x9B, 0x7E, 0x9B, 0xB3, 0x9B, 0x9B, 0x9B, 0x08, 
-                    0x91, 0x46, 0x46, 0x46, 0x46, 0x46, 0x46, 0x46, 0x46, 0x46, 0x46, 0x46, 0x46, 0x46, 0x9B, 0x08, 
-                    0x91, 0x46, 0x9B, 0x7D, 0x9B, 0x7C, 0x9B, 0x7B, 0x9B, 0x7A, 0x9B, 0x7C, 0x9B, 0x9B, 0x9B, 0x08, 
-                    0x91, 0x46, 0x9B, 0x46, 0x46, 0x46, 0x46, 0x46, 0x46, 0x46, 0x46, 0x46, 0x46, 0x46, 0x46, 0x08, 
-                    0x91, 0x46, 0x9B, 0x7C, 0x9B, 0x7D, 0x9B, 0x7E, 0x9B, 0x9B, 0x9B, 0x7D, 0x9B, 0x7E, 0x9B, 0x08, 
-                    0x91, 0x46, 0x46, 0x46, 0x46, 0x46, 0x46, 0x46, 0x46, 0x46, 0x46, 0x46, 0x46, 0x46, 0xB3, 0x08, 
-                    0x91, 0xD6, 0x96, 0x9B, 0x9B, 0x96, 0xD6, 0xDB, 0xD6, 0x96, 0x9B, 0x9B, 0x96, 0xD6, 0x9B, 0x08, 
-                    0xD6, 0x96, 0x9B, 0x9B, 0x96, 0xD6, 0xDB, 0xDB, 0xDB, 0xD6, 0x96, 0x9B, 0x9B, 0x96, 0xD6, 0x08, 
-                    0x96, 0x9B, 0x9B, 0x96, 0xD6, 0xDB, 0xDB, 0xDB, 0xDB, 0xDB, 0xD6, 0x96, 0x9B, 0x9B, 0x96, 0x08, 
-                    0xD6, 0x96, 0x9B, 0x9B, 0x96, 0xD6, 0xDB, 0xDB, 0xDB, 0xD6, 0x96, 0x9B, 0x9B, 0x96, 0xD6, 0x08, 
-                    0x91, 0xD6, 0x96, 0x9B, 0x9B, 0x96, 0xD6, 0xDB, 0xD6, 0x96, 0x9B, 0x9B, 0x96, 0xD6, 0x9B, 0x08, 
+                    0x31, 0x3B, 0x3B, 0x3B, 0x39, 0x39, 0x13, 0x14, 0x15, 0x38, 0x39, 0x3A, 0x3B, 0x3B, 0x3B, 0x08,
+                    0x91, 0x46, 0x46, 0x46, 0x46, 0x46, 0x46, 0x46, 0x46, 0x46, 0x46, 0x46, 0x46, 0x46, 0x78, 0x08,
+                    0x91, 0x46, 0x9B, 0x7C, 0x9B, 0x9B, 0x9B, 0x7D, 0x9B, 0x7C, 0x9B, 0x7B, 0x9B, 0x7A, 0x9B, 0x08,
+                    0x91, 0x46, 0x7D, 0x46, 0x46, 0x46, 0x46, 0x46, 0x46, 0x46, 0x46, 0x46, 0x46, 0x46, 0x46, 0x08,
+                    0x91, 0x46, 0x9B, 0x7E, 0x9B, 0x9B, 0x9B, 0x7D, 0x9B, 0x7E, 0x9B, 0xB3, 0x9B, 0x9B, 0x9B, 0x08,
+                    0x91, 0x46, 0x46, 0x46, 0x46, 0x46, 0x46, 0x46, 0x46, 0x46, 0x46, 0x46, 0x46, 0x46, 0x9B, 0x08,
+                    0x91, 0x46, 0x9B, 0x7D, 0x9B, 0x7C, 0x9B, 0x7B, 0x9B, 0x7A, 0x9B, 0x7C, 0x9B, 0x9B, 0x9B, 0x08,
+                    0x91, 0x46, 0x9B, 0x46, 0x46, 0x46, 0x46, 0x46, 0x46, 0x46, 0x46, 0x46, 0x46, 0x46, 0x46, 0x08,
+                    0x91, 0x46, 0x9B, 0x7C, 0x9B, 0x7D, 0x9B, 0x7E, 0x9B, 0x9B, 0x9B, 0x7D, 0x9B, 0x7E, 0x9B, 0x08,
+                    0x91, 0x46, 0x46, 0x46, 0x46, 0x46, 0x46, 0x46, 0x46, 0x46, 0x46, 0x46, 0x46, 0x46, 0xB3, 0x08,
+                    0x91, 0xD6, 0x96, 0x9B, 0x9B, 0x96, 0xD6, 0xDB, 0xD6, 0x96, 0x9B, 0x9B, 0x96, 0xD6, 0x9B, 0x08,
+                    0xD6, 0x96, 0x9B, 0x9B, 0x96, 0xD6, 0xDB, 0xDB, 0xDB, 0xD6, 0x96, 0x9B, 0x9B, 0x96, 0xD6, 0x08,
+                    0x96, 0x9B, 0x9B, 0x96, 0xD6, 0xDB, 0xDB, 0xDB, 0xDB, 0xDB, 0xD6, 0x96, 0x9B, 0x9B, 0x96, 0x08,
+                    0xD6, 0x96, 0x9B, 0x9B, 0x96, 0xD6, 0xDB, 0xDB, 0xDB, 0xD6, 0x96, 0x9B, 0x9B, 0x96, 0xD6, 0x08,
+                    0x91, 0xD6, 0x96, 0x9B, 0x9B, 0x96, 0xD6, 0xDB, 0xD6, 0x96, 0x9B, 0x9B, 0x96, 0xD6, 0x9B, 0x08,
                     0x08, 0x08, 0x08, 0x08, 0x08, 0x08, 0x08, 0x08, 0x08, 0x08, 0x08, 0x08, 0x08, 0x08, 0x08, 0x08,
                 },
                 .collisionData = {0x0381, 0x7FFD, 0x4001, 0x5FFF, 0x4001, 0x7FFD, 0x4001, 0x5FFF, 0x4001, 0x7FFD, 0x1, 0x1, 0x1, 0x1, 0x1, 0xFFFF},
@@ -5234,21 +5234,21 @@ static const struct TrHillFloor sDataTagExpert_Floors[] = {
                 },
             .display = {
                 .metatileData = {
-                    0xD1, 0xDB, 0xDB, 0xDB, 0xD9, 0xD9, 0x1B, 0x14, 0x15, 0x98, 0x99, 0x9A, 0x9B, 0x9B, 0x9B, 0x08, 
-                    0xD1, 0xDB, 0xDB, 0xDB, 0xD5, 0xD5, 0xC3, 0xF9, 0x86, 0x8E, 0x95, 0x9B, 0x9B, 0x9B, 0x9B, 0x08, 
-                    0xD1, 0xDB, 0xDB, 0xD5, 0xCB, 0xCB, 0xCB, 0xFB, 0x8B, 0x8B, 0x8B, 0x95, 0x9B, 0x9B, 0x9B, 0x08, 
-                    0xD1, 0xDB, 0xD5, 0xCB, 0xCB, 0xCB, 0xCB, 0xFB, 0x8B, 0x8B, 0x8B, 0x8B, 0x95, 0x9B, 0x9B, 0x08, 
-                    0xD1, 0xDB, 0xCB, 0xCB, 0xCB, 0xCB, 0xCB, 0xFB, 0x8B, 0x8B, 0x8B, 0x8B, 0x8B, 0x9B, 0x9B, 0x08, 
-                    0xD1, 0xD5, 0xCB, 0xCB, 0xCB, 0xCB, 0xCB, 0xFB, 0x8C, 0x8B, 0x8B, 0x8B, 0x8B, 0x95, 0x9B, 0x08, 
-                    0xD1, 0xCB, 0xCB, 0xCB, 0xCB, 0xCC, 0xCC, 0xFB, 0xFB, 0x8C, 0x8B, 0x8B, 0x8B, 0x8B, 0x9B, 0x08, 
-                    0xD1, 0xCC, 0xCC, 0xCC, 0xCC, 0xFB, 0xF5, 0xFB, 0xF5, 0xFB, 0x8B, 0x8B, 0x8B, 0x8B, 0x9B, 0x08, 
-                    0xD1, 0xD5, 0xD5, 0xD5, 0xD5, 0xFB, 0xEC, 0xFB, 0xEC, 0xFB, 0x8B, 0x8B, 0x8B, 0x8B, 0x9B, 0x08, 
-                    0xD1, 0xCB, 0xCB, 0xCB, 0xCB, 0xF5, 0xF5, 0xFB, 0xFB, 0xF5, 0x8B, 0x8B, 0x8B, 0x8B, 0x9B, 0x08, 
-                    0xD1, 0xCC, 0xCB, 0xCB, 0xCB, 0xCB, 0xCB, 0xFB, 0xFB, 0x8B, 0x8B, 0x8B, 0x8B, 0x8C, 0x9B, 0x08, 
-                    0xD1, 0xDB, 0xCB, 0xCB, 0xCB, 0xCB, 0xCB, 0xFB, 0xF5, 0x8B, 0x8B, 0x8B, 0x8B, 0x9B, 0x9B, 0x08, 
-                    0xD1, 0xDB, 0xCC, 0xCB, 0xCB, 0xCB, 0xCB, 0xFB, 0x8B, 0x8B, 0x8B, 0x8B, 0x8C, 0x9B, 0x9B, 0x08, 
-                    0xD1, 0xDB, 0xDB, 0xCC, 0xCB, 0xCB, 0xCB, 0xFB, 0x8B, 0x8B, 0x8B, 0x8C, 0x9B, 0x9B, 0x9B, 0x08, 
-                    0xD1, 0xDB, 0xDB, 0xDB, 0xCC, 0xCC, 0xCB, 0xFB, 0x8C, 0x8C, 0x8C, 0x9B, 0x9B, 0x9B, 0x9B, 0x08, 
+                    0xD1, 0xDB, 0xDB, 0xDB, 0xD9, 0xD9, 0x1B, 0x14, 0x15, 0x98, 0x99, 0x9A, 0x9B, 0x9B, 0x9B, 0x08,
+                    0xD1, 0xDB, 0xDB, 0xDB, 0xD5, 0xD5, 0xC3, 0xF9, 0x86, 0x8E, 0x95, 0x9B, 0x9B, 0x9B, 0x9B, 0x08,
+                    0xD1, 0xDB, 0xDB, 0xD5, 0xCB, 0xCB, 0xCB, 0xFB, 0x8B, 0x8B, 0x8B, 0x95, 0x9B, 0x9B, 0x9B, 0x08,
+                    0xD1, 0xDB, 0xD5, 0xCB, 0xCB, 0xCB, 0xCB, 0xFB, 0x8B, 0x8B, 0x8B, 0x8B, 0x95, 0x9B, 0x9B, 0x08,
+                    0xD1, 0xDB, 0xCB, 0xCB, 0xCB, 0xCB, 0xCB, 0xFB, 0x8B, 0x8B, 0x8B, 0x8B, 0x8B, 0x9B, 0x9B, 0x08,
+                    0xD1, 0xD5, 0xCB, 0xCB, 0xCB, 0xCB, 0xCB, 0xFB, 0x8C, 0x8B, 0x8B, 0x8B, 0x8B, 0x95, 0x9B, 0x08,
+                    0xD1, 0xCB, 0xCB, 0xCB, 0xCB, 0xCC, 0xCC, 0xFB, 0xFB, 0x8C, 0x8B, 0x8B, 0x8B, 0x8B, 0x9B, 0x08,
+                    0xD1, 0xCC, 0xCC, 0xCC, 0xCC, 0xFB, 0xF5, 0xFB, 0xF5, 0xFB, 0x8B, 0x8B, 0x8B, 0x8B, 0x9B, 0x08,
+                    0xD1, 0xD5, 0xD5, 0xD5, 0xD5, 0xFB, 0xEC, 0xFB, 0xEC, 0xFB, 0x8B, 0x8B, 0x8B, 0x8B, 0x9B, 0x08,
+                    0xD1, 0xCB, 0xCB, 0xCB, 0xCB, 0xF5, 0xF5, 0xFB, 0xFB, 0xF5, 0x8B, 0x8B, 0x8B, 0x8B, 0x9B, 0x08,
+                    0xD1, 0xCC, 0xCB, 0xCB, 0xCB, 0xCB, 0xCB, 0xFB, 0xFB, 0x8B, 0x8B, 0x8B, 0x8B, 0x8C, 0x9B, 0x08,
+                    0xD1, 0xDB, 0xCB, 0xCB, 0xCB, 0xCB, 0xCB, 0xFB, 0xF5, 0x8B, 0x8B, 0x8B, 0x8B, 0x9B, 0x9B, 0x08,
+                    0xD1, 0xDB, 0xCC, 0xCB, 0xCB, 0xCB, 0xCB, 0xFB, 0x8B, 0x8B, 0x8B, 0x8B, 0x8C, 0x9B, 0x9B, 0x08,
+                    0xD1, 0xDB, 0xDB, 0xCC, 0xCB, 0xCB, 0xCB, 0xFB, 0x8B, 0x8B, 0x8B, 0x8C, 0x9B, 0x9B, 0x9B, 0x08,
+                    0xD1, 0xDB, 0xDB, 0xDB, 0xCC, 0xCC, 0xCB, 0xFB, 0x8C, 0x8C, 0x8C, 0x9B, 0x9B, 0x9B, 0x9B, 0x08,
                     0xD1, 0xDB, 0xDB, 0xDB, 0xDB, 0xDB, 0xCC, 0xFB, 0x9B, 0x9B, 0x9B, 0x9B, 0x9B, 0x9B, 0x9B, 0x08,
                 },
                 .collisionData = {0x0381, 0x0201, 0xEE1, 0x1EF1, 0x3EF9, 0x3EF9, 0x7E7D, 0x783D, 0x2BD, 0x783D, 0x7E7D, 0x3E79, 0x3EF9, 0x1EF1, 0xEE1, 0x201},
@@ -5548,21 +5548,21 @@ static const struct TrHillFloor sDataTagExpert_Floors[] = {
                 },
             .display = {
                 .metatileData = {
-                    0x31, 0x3B, 0x3B, 0x3B, 0x39, 0x39, 0x13, 0x14, 0x15, 0x39, 0x39, 0x3A, 0x3B, 0x3B, 0x3B, 0x08, 
-                    0x96, 0xFB, 0xF6, 0xFD, 0xF6, 0xF6, 0xFB, 0x46, 0xFB, 0xF6, 0xF6, 0xFD, 0xF6, 0xFB, 0x9B, 0x08, 
-                    0xFB, 0x9B, 0xFB, 0xF6, 0xFB, 0xFB, 0xFB, 0x46, 0xFB, 0xFB, 0xFB, 0xF6, 0xFB, 0x9B, 0xFB, 0x08, 
-                    0xF6, 0xFB, 0x9B, 0xFB, 0xFB, 0x46, 0x46, 0x9B, 0x46, 0x46, 0xFB, 0xFB, 0x9B, 0xFB, 0xF6, 0x08, 
-                    0xFD, 0xF6, 0xFB, 0x9B, 0x46, 0x36, 0x36, 0x9B, 0x36, 0x36, 0x46, 0x9B, 0xFB, 0xF6, 0xFD, 0x08, 
-                    0xF6, 0xFB, 0xFB, 0x46, 0x9B, 0x46, 0x46, 0xDB, 0x46, 0x46, 0x9B, 0x46, 0xFB, 0xFB, 0xF6, 0x08, 
-                    0xF6, 0xFB, 0x46, 0x36, 0x46, 0x9B, 0xDB, 0xD6, 0xDB, 0x9B, 0x46, 0x36, 0x46, 0xFB, 0xF6, 0x08, 
-                    0xFB, 0xFB, 0x46, 0x36, 0x9B, 0xDB, 0xD6, 0xD6, 0xD6, 0xDB, 0x9B, 0x36, 0x46, 0xFB, 0xFB, 0x08, 
-                    0x96, 0x9B, 0x9B, 0x9B, 0x9B, 0xD6, 0xD6, 0x96, 0xD6, 0xD6, 0xDB, 0x9B, 0x9B, 0x9B, 0x96, 0x08, 
-                    0xFB, 0xFB, 0x46, 0x36, 0x9B, 0xDB, 0xD6, 0xD6, 0xD6, 0xDB, 0x9B, 0x36, 0x46, 0xFB, 0xFB, 0x08, 
-                    0xF6, 0xFB, 0x46, 0x36, 0x46, 0x9B, 0xDB, 0xD6, 0xDB, 0x9B, 0x46, 0x36, 0x46, 0xFB, 0xF6, 0x08, 
-                    0xF6, 0xFB, 0xFB, 0x46, 0x9B, 0x46, 0x46, 0xDB, 0x46, 0x46, 0x9B, 0x46, 0xFB, 0xFB, 0xF6, 0x08, 
-                    0xFD, 0xF6, 0xFB, 0x9B, 0x46, 0x36, 0x36, 0x9B, 0x36, 0x36, 0x46, 0x9B, 0xFB, 0xF6, 0xFD, 0x08, 
-                    0xF6, 0xFB, 0x9B, 0xFB, 0xFB, 0x46, 0x46, 0x9B, 0x46, 0x46, 0xFB, 0xFB, 0x9B, 0xFB, 0xF6, 0x08, 
-                    0xFB, 0x9B, 0xFB, 0xF6, 0xFB, 0xFB, 0xFB, 0x46, 0xFB, 0xFB, 0xFB, 0xF6, 0xFB, 0x9B, 0xFB, 0x08, 
+                    0x31, 0x3B, 0x3B, 0x3B, 0x39, 0x39, 0x13, 0x14, 0x15, 0x39, 0x39, 0x3A, 0x3B, 0x3B, 0x3B, 0x08,
+                    0x96, 0xFB, 0xF6, 0xFD, 0xF6, 0xF6, 0xFB, 0x46, 0xFB, 0xF6, 0xF6, 0xFD, 0xF6, 0xFB, 0x9B, 0x08,
+                    0xFB, 0x9B, 0xFB, 0xF6, 0xFB, 0xFB, 0xFB, 0x46, 0xFB, 0xFB, 0xFB, 0xF6, 0xFB, 0x9B, 0xFB, 0x08,
+                    0xF6, 0xFB, 0x9B, 0xFB, 0xFB, 0x46, 0x46, 0x9B, 0x46, 0x46, 0xFB, 0xFB, 0x9B, 0xFB, 0xF6, 0x08,
+                    0xFD, 0xF6, 0xFB, 0x9B, 0x46, 0x36, 0x36, 0x9B, 0x36, 0x36, 0x46, 0x9B, 0xFB, 0xF6, 0xFD, 0x08,
+                    0xF6, 0xFB, 0xFB, 0x46, 0x9B, 0x46, 0x46, 0xDB, 0x46, 0x46, 0x9B, 0x46, 0xFB, 0xFB, 0xF6, 0x08,
+                    0xF6, 0xFB, 0x46, 0x36, 0x46, 0x9B, 0xDB, 0xD6, 0xDB, 0x9B, 0x46, 0x36, 0x46, 0xFB, 0xF6, 0x08,
+                    0xFB, 0xFB, 0x46, 0x36, 0x9B, 0xDB, 0xD6, 0xD6, 0xD6, 0xDB, 0x9B, 0x36, 0x46, 0xFB, 0xFB, 0x08,
+                    0x96, 0x9B, 0x9B, 0x9B, 0x9B, 0xD6, 0xD6, 0x96, 0xD6, 0xD6, 0xDB, 0x9B, 0x9B, 0x9B, 0x96, 0x08,
+                    0xFB, 0xFB, 0x46, 0x36, 0x9B, 0xDB, 0xD6, 0xD6, 0xD6, 0xDB, 0x9B, 0x36, 0x46, 0xFB, 0xFB, 0x08,
+                    0xF6, 0xFB, 0x46, 0x36, 0x46, 0x9B, 0xDB, 0xD6, 0xDB, 0x9B, 0x46, 0x36, 0x46, 0xFB, 0xF6, 0x08,
+                    0xF6, 0xFB, 0xFB, 0x46, 0x9B, 0x46, 0x46, 0xDB, 0x46, 0x46, 0x9B, 0x46, 0xFB, 0xFB, 0xF6, 0x08,
+                    0xFD, 0xF6, 0xFB, 0x9B, 0x46, 0x36, 0x36, 0x9B, 0x36, 0x36, 0x46, 0x9B, 0xFB, 0xF6, 0xFD, 0x08,
+                    0xF6, 0xFB, 0x9B, 0xFB, 0xFB, 0x46, 0x46, 0x9B, 0x46, 0x46, 0xFB, 0xFB, 0x9B, 0xFB, 0xF6, 0x08,
+                    0xFB, 0x9B, 0xFB, 0xF6, 0xFB, 0xFB, 0xFB, 0x46, 0xFB, 0xFB, 0xFB, 0xF6, 0xFB, 0x9B, 0xFB, 0x08,
                     0x96, 0xFB, 0xF6, 0xFD, 0xF6, 0xF6, 0xFB, 0x46, 0xFB, 0xF6, 0xF6, 0xFD, 0xF6, 0xFB, 0x9B, 0x08,
                 },
                 .collisionData = {0x0381, 0x0101, 0x0101, 0x6C1, 0x0821, 0x16D1, 0x2829, 0x2009, 0x1, 0x2009, 0x2829, 0x16D1, 0x0821, 0x6C1, 0x0101, 0x101},