Merge branch 'master' into tag-none

27 files changed, 134 insertions, 135 deletions

diff --git a/include/constants/battle_dome.h b/include/constants/battle_dome.h
index ea7310e55..adac0a938 100644
--- a/include/constants/battle_dome.h
+++ b/include/constants/battle_dome.h
@@ -118,7 +118,7 @@
 #define MOVE_POINTS_ACCURATE   9
 #define MOVE_POINTS_POWERFUL   10  // Most of the moves that are >= 100 power
 #define MOVE_POINTS_POPULAR    11  // Group seems arbitrary. All using it are TM/HMs, but its only 11/58
-#define MOVE_POINTS_LUCK       12  
+#define MOVE_POINTS_LUCK       12
 #define MOVE_POINTS_STRONG     13  // Most of the moves that are >= 90 power
 #define MOVE_POINTS_LOW_PP     14
 #define MOVE_POINTS_EFFECT     15  // Moves with additional effects
diff --git a/include/constants/battle_frontier_trainers.h b/include/constants/battle_frontier_trainers.h
index 2914b153f..af530a759 100644
--- a/include/constants/battle_frontier_trainers.h
+++ b/include/constants/battle_frontier_trainers.h
@@ -2,7 +2,7 @@
 #define GUARD_CONSTANTS_BATTLE_FRONTIER_TRAINERS_H
 
 #define FRONTIER_TRAINER_BRADY          0
-#define FRONTIER_TRAINER_CONNER         1    
+#define FRONTIER_TRAINER_CONNER         1
 #define FRONTIER_TRAINER_BRADLEY        2
 #define FRONTIER_TRAINER_CYBIL          3
 #define FRONTIER_TRAINER_RODETTE        4
diff --git a/include/constants/battle_pyramid.h b/include/constants/battle_pyramid.h
index 004df7155..1be3c1115 100644
--- a/include/constants/battle_pyramid.h
+++ b/include/constants/battle_pyramid.h
@@ -23,7 +23,7 @@
 #define OBJ_POSITIONS_UNIFORM               0
 #define OBJ_POSITIONS_IN_AND_NEAR_ENTRANCE  1
 #define OBJ_POSITIONS_IN_AND_NEAR_EXIT      2
-#define OBJ_POSITIONS_NEAR_ENTRANCE         3         
+#define OBJ_POSITIONS_NEAR_ENTRANCE         3
 #define OBJ_POSITIONS_NEAR_EXIT             4
 
 // Functions IDs for sBattlePyramidFunctions / CallBattlePyramidFunction
diff --git a/include/constants/field_effects.h b/include/constants/field_effects.h
index dc1085f7c..e02e01efb 100644
--- a/include/constants/field_effects.h
+++ b/include/constants/field_effects.h
@@ -1,7 +1,7 @@
 #ifndef GUARD_FIELD_EFFECT_CONSTANTS_H
 #define GUARD_FIELD_EFFECT_CONSTANTS_H
 
-#define FLDEFF_EXCLAMATION_MARK_ICON     0 
+#define FLDEFF_EXCLAMATION_MARK_ICON     0
 #define FLDEFF_USE_CUT_ON_GRASS          1
 #define FLDEFF_USE_CUT_ON_TREE           2
 #define FLDEFF_SHADOW                    3
diff --git a/include/constants/flags.h b/include/constants/flags.h
index 6702fa5ee..ef5a9a75e 100644
--- a/include/constants/flags.h
+++ b/include/constants/flags.h
@@ -337,7 +337,7 @@
 #define FLAG_BEAT_MAGMA_GRUNT_JAGGED_PASS    0x139
 #define FLAG_RECEIVED_AURORA_TICKET          0x13A
 #define FLAG_RECEIVED_MYSTIC_TICKET          0x13B
-#define FLAG_RECEIVED_OLD_SEA_MAP            0x13C 
+#define FLAG_RECEIVED_OLD_SEA_MAP            0x13C
 #define FLAG_UNUSED_MYSTERY_GIFT_0x13D       0x13D
 #define FLAG_UNUSED_MYSTERY_GIFT_0x13E       0x13E
 #define FLAG_UNUSED_MYSTERY_GIFT_0x13F       0x13F
@@ -1135,18 +1135,18 @@
 #define FLAG_ITEM_VICTORY_ROAD_B2F_FULL_HEAL                        0x440
 #define FLAG_ITEM_MT_PYRE_6F_TM_30                                  0x441
 #define FLAG_ITEM_SEAFLOOR_CAVERN_ROOM_9_TM_26                      0x442
-#define FLAG_ITEM_FIERY_PATH_TM06                                   0x443 
-#define FLAG_ITEM_ROUTE_124_RED_SHARD                               0x444 
-#define FLAG_ITEM_ROUTE_124_BLUE_SHARD                              0x445 
-#define FLAG_ITEM_SAFARI_ZONE_NORTH_WEST_TM_22                      0x446 
-#define FLAG_ITEM_ABANDONED_SHIP_ROOMS_1F_HARBOR_MAIL               0x447 
-#define FLAG_ITEM_ABANDONED_SHIP_ROOMS_B1F_ESCAPE_ROPE              0x448 
-#define FLAG_ITEM_ABANDONED_SHIP_ROOMS_2_B1F_DIVE_BALL              0x449 
-#define FLAG_ITEM_ABANDONED_SHIP_ROOMS_B1F_TM_13                    0x44A 
-#define FLAG_ITEM_ABANDONED_SHIP_ROOMS_2_1F_REVIVE                  0x44B 
-#define FLAG_ITEM_ABANDONED_SHIP_CAPTAINS_OFFICE_STORAGE_KEY        0x44C 
-#define FLAG_ITEM_ABANDONED_SHIP_HIDDEN_FLOOR_ROOM_3_WATER_STONE    0x44D 
-#define FLAG_ITEM_ABANDONED_SHIP_HIDDEN_FLOOR_ROOM_1_TM_18          0x44E 
+#define FLAG_ITEM_FIERY_PATH_TM06                                   0x443
+#define FLAG_ITEM_ROUTE_124_RED_SHARD                               0x444
+#define FLAG_ITEM_ROUTE_124_BLUE_SHARD                              0x445
+#define FLAG_ITEM_SAFARI_ZONE_NORTH_WEST_TM_22                      0x446
+#define FLAG_ITEM_ABANDONED_SHIP_ROOMS_1F_HARBOR_MAIL               0x447
+#define FLAG_ITEM_ABANDONED_SHIP_ROOMS_B1F_ESCAPE_ROPE              0x448
+#define FLAG_ITEM_ABANDONED_SHIP_ROOMS_2_B1F_DIVE_BALL              0x449
+#define FLAG_ITEM_ABANDONED_SHIP_ROOMS_B1F_TM_13                    0x44A
+#define FLAG_ITEM_ABANDONED_SHIP_ROOMS_2_1F_REVIVE                  0x44B
+#define FLAG_ITEM_ABANDONED_SHIP_CAPTAINS_OFFICE_STORAGE_KEY        0x44C
+#define FLAG_ITEM_ABANDONED_SHIP_HIDDEN_FLOOR_ROOM_3_WATER_STONE    0x44D
+#define FLAG_ITEM_ABANDONED_SHIP_HIDDEN_FLOOR_ROOM_1_TM_18          0x44E
 #define FLAG_ITEM_ROUTE_121_CARBOS                                  0x44F
 #define FLAG_ITEM_ROUTE_123_ULTRA_BALL                              0x450
 #define FLAG_ITEM_ROUTE_126_GREEN_SHARD                             0x451
diff --git a/include/constants/global.h b/include/constants/global.h
index 9b0c46ce4..1cece7975 100644
--- a/include/constants/global.h
+++ b/include/constants/global.h
@@ -86,6 +86,7 @@
 #define EASY_CHAT_BATTLE_WORDS_COUNT 6
 #define MOVE_NAME_LENGTH 12
 #define NUM_QUESTIONNAIRE_WORDS 4
+#define QUIZ_QUESTION_LEN 9
 
 #define MALE 0
 #define FEMALE 1
diff --git a/include/constants/item_effects.h b/include/constants/item_effects.h
index 9a6bcd05e..f08b17ee9 100644
--- a/include/constants/item_effects.h
+++ b/include/constants/item_effects.h
@@ -23,7 +23,7 @@
 #define ITEM3_POISON            0x10
 #define ITEM3_SLEEP             0x20
 #define ITEM3_LEVEL_UP          0x40
-#define ITEM3_GUARD_SPEC        0x80 // Works the same way as the move Mist.   
+#define ITEM3_GUARD_SPEC        0x80 // Works the same way as the move Mist.
 
 #define ITEM3_STATUS_ALL        (ITEM3_CONFUSION | ITEM3_PARALYSIS | ITEM3_FREEZE | ITEM3_BURN | ITEM3_POISON | ITEM3_SLEEP)
 
diff --git a/include/constants/lilycove_lady.h b/include/constants/lilycove_lady.h
index 11b9b31e9..5b1e7d7b4 100644
--- a/include/constants/lilycove_lady.h
+++ b/include/constants/lilycove_lady.h
@@ -10,7 +10,7 @@
 #define LILYCOVE_LADY_STATE_COMPLETED   1
 #define LILYCOVE_LADY_STATE_PRIZE       2
 
-#define LILYCOVE_LADY_GIFT_THRESHOLD    5  
+#define LILYCOVE_LADY_GIFT_THRESHOLD    5
 
 #define QUIZ_AUTHOR_PLAYER           0
 #define QUIZ_AUTHOR_OTHER_PLAYER     1
@@ -20,8 +20,6 @@
 #define QUIZ_AUTHOR_NAME_LADY            0
 #define QUIZ_AUTHOR_NAME_PLAYER          1
 #define QUIZ_AUTHOR_NAME_OTHER_PLAYER    2
-   
-#define QUIZ_QUESTION_LEN 9
 
 // Constants for how many good Pokéblocks the Contest Lady was given
 // This determines how her performance is described when her TV show comes on
diff --git a/include/constants/map_scripts.h b/include/constants/map_scripts.h
index 68d360955..7a56cc908 100644
--- a/include/constants/map_scripts.h
+++ b/include/constants/map_scripts.h
@@ -9,7 +9,7 @@
     They are numbered in the order that they will be called when entering a map (from a warp or camera transition).
     NOTE: These descriptions are just of what they generally do, not what they always or have to do
 
-    3. ON_LOAD: Run after the layout is loaded (but not drawn yet). 
+    3. ON_LOAD: Run after the layout is loaded (but not drawn yet).
                 Almost exclusively used to set metatiles on the map before it's first drawn
 
     6. ON_FRAME_TABLE: Run every frame after the map has faded in, before player input is processed.
diff --git a/include/constants/metatile_labels.h b/include/constants/metatile_labels.h
index b5ef69046..6159bf6cb 100644
--- a/include/constants/metatile_labels.h
+++ b/include/constants/metatile_labels.h
@@ -16,7 +16,7 @@
 #define METATILE_General_MuddySlope_Frame2    0x0EA
 #define METATILE_General_MuddySlope_Frame3    0x0EB
 #define METATILE_General_SandPit_Center       0x121
-#define METATILE_General_Door                 0x021   
+#define METATILE_General_Door                 0x021
 #define METATILE_General_Door_PokeMart        0x041
 #define METATILE_General_Door_PokeCenter      0x061
 #define METATILE_General_Door_Gym             0x1CD
@@ -35,7 +35,7 @@
 #define METATILE_General_SecretBase_VineLeft  0x036
 #define METATILE_General_SecretBase_VineRight 0x037
 #define METATILE_General_RedCaveIndent        0x1A0
-#define METATILE_General_RedCaveOpen          0x1A1 
+#define METATILE_General_RedCaveOpen          0x1A1
 #define METATILE_General_YellowCaveIndent     0x1A8
 #define METATILE_General_YellowCaveOpen       0x1A9
 #define METATILE_General_BlueCaveIndent       0x1B0
diff --git a/include/constants/party_menu.h b/include/constants/party_menu.h
index 7953967ed..e31debb49 100644
--- a/include/constants/party_menu.h
+++ b/include/constants/party_menu.h
@@ -49,14 +49,14 @@
 #define PARTY_LAYOUT_COUNT           4
 #define KEEP_PARTY_LAYOUT            0xFF
 
-#define PARTY_MENU_TYPE_FIELD                     0 
-#define PARTY_MENU_TYPE_IN_BATTLE                 1 
-#define PARTY_MENU_TYPE_CONTEST                   2 
-#define PARTY_MENU_TYPE_CHOOSE_MON                3 
+#define PARTY_MENU_TYPE_FIELD                     0
+#define PARTY_MENU_TYPE_IN_BATTLE                 1
+#define PARTY_MENU_TYPE_CONTEST                   2
+#define PARTY_MENU_TYPE_CHOOSE_MON                3
 #define PARTY_MENU_TYPE_CHOOSE_HALF               4  // multi battles, eReader battles, and some battle facilities
 #define PARTY_MENU_TYPE_MULTI_SHOWCASE            5
-#define PARTY_MENU_TYPE_DAYCARE                   6 
-#define PARTY_MENU_TYPE_MOVE_RELEARNER            7 
+#define PARTY_MENU_TYPE_DAYCARE                   6
+#define PARTY_MENU_TYPE_MOVE_RELEARNER            7
 #define PARTY_MENU_TYPE_UNION_ROOM_REGISTER       8  // trading board
 #define PARTY_MENU_TYPE_UNION_ROOM_TRADE          9  // trading board
 #define PARTY_MENU_TYPE_SPIN_TRADE                10 // Unused beta for Gen IV's Spin Trade
@@ -68,7 +68,7 @@
 #define PARTY_ACTION_CANT_SWITCH        2
 #define PARTY_ACTION_USE_ITEM           3
 #define PARTY_ACTION_ABILITY_PREVENTS   4
-#define PARTY_ACTION_GIVE_ITEM          5  
+#define PARTY_ACTION_GIVE_ITEM          5
 #define PARTY_ACTION_GIVE_PC_ITEM       6   // Unused. Not possible to give non-mail items directly from PC
 #define PARTY_ACTION_GIVE_MAILBOX_MAIL  7
 #define PARTY_ACTION_SWITCH             8
@@ -83,7 +83,7 @@
 #define PARTY_MSG_CHOOSE_MON                0
 #define PARTY_MSG_CHOOSE_MON_OR_CANCEL      1
 #define PARTY_MSG_CHOOSE_MON_AND_CONFIRM    2
-#define PARTY_MSG_MOVE_TO_WHERE             3 
+#define PARTY_MSG_MOVE_TO_WHERE             3
 #define PARTY_MSG_TEACH_WHICH_MON           4
 #define PARTY_MSG_USE_ON_WHICH_MON          5
 #define PARTY_MSG_GIVE_TO_WHICH_MON         6
diff --git a/include/constants/pokemon.h b/include/constants/pokemon.h
index 63c031824..9bafa0a0b 100644
--- a/include/constants/pokemon.h
+++ b/include/constants/pokemon.h
@@ -225,7 +225,7 @@
 // 1 bit each in the Pokémon struct. Gen 4 hard-codes
 // each of these to the given name. In Gen 3 they're
 // used to get an index into giftRibbons in the save block,
-// which can have a value 0-64 (0 is 'no ribbon') that 
+// which can have a value 0-64 (0 is 'no ribbon') that
 // corresponds to one of the special ribbons listed
 // in gGiftRibbonDescriptionPointers. Most of these were
 // never distributed
diff --git a/include/constants/script_menu.h b/include/constants/script_menu.h
index 928ca00e0..c58df7335 100644
--- a/include/constants/script_menu.h
+++ b/include/constants/script_menu.h
@@ -65,7 +65,7 @@
 #define MULTI_RIGHTLEFT                    54
 #define MULTI_GAME_CORNER_TMS              55
 #define MULTI_SSTIDAL_SLATEPORT_NO_BF      56
-#define MULTI_FLOORS                       57 
+#define MULTI_FLOORS                       57
 #define MULTI_SHARDS_R                     58
 #define MULTI_SHARDS_Y                     59
 #define MULTI_SHARDS_RY                    60
@@ -82,9 +82,9 @@
 #define MULTI_SHARDS_YBG                   71
 #define MULTI_SHARDS_RYBG                  72
 #define MULTI_TOURNEY_WITH_RECORD          73
-#define MULTI_CABLE_CLUB_NO_RECORD_MIX     74 
+#define MULTI_CABLE_CLUB_NO_RECORD_MIX     74
 #define MULTI_WIRELESS_NO_RECORD_BERRY     75
-#define MULTI_CABLE_CLUB_WITH_RECORD_MIX   76 
+#define MULTI_CABLE_CLUB_WITH_RECORD_MIX   76
 #define MULTI_WIRELESS_NO_BERRY            77
 #define MULTI_WIRELESS_NO_RECORD           78
 #define MULTI_WIRELESS_ALL_SERVICES        79
diff --git a/include/constants/songs.h b/include/constants/songs.h
index a78ee6faf..d6a418495 100644
--- a/include/constants/songs.h
+++ b/include/constants/songs.h
@@ -267,7 +267,7 @@
 #define SE_RG_HELP_ERROR            259 // SE_RG_HELP_NG
 #define SE_RG_DEOXYS_MOVE           260 // SE_RG_DEOMOV
 #define SE_RG_POKE_JUMP_SUCCESS     261 // SE_RG_EXCELLENT
-#define SE_RG_POKE_JUMP_FAILURE     262 // SE_RG_NAWAMISS 
+#define SE_RG_POKE_JUMP_FAILURE     262 // SE_RG_NAWAMISS
 // New Emerald SFX
 #define SE_POKENAV_CALL             263 // SE_TOREEYE
 #define SE_POKENAV_HANG_UP          264 // SE_TOREOFF
diff --git a/include/constants/tv.h b/include/constants/tv.h
index 095a6ddca..3fe6c57b2 100644
--- a/include/constants/tv.h
+++ b/include/constants/tv.h
@@ -35,7 +35,7 @@
 
 // TVGROUP_RECORD_MIX
 #define TVGROUP_RECORD_MIX_START                    21
-#define TVSHOW_POKEMON_TODAY_CAUGHT                 21 
+#define TVSHOW_POKEMON_TODAY_CAUGHT                 21
 #define TVSHOW_SMART_SHOPPER                        22
 #define TVSHOW_POKEMON_TODAY_FAILED                 23
 #define TVSHOW_FISHING_ADVICE                       24
diff --git a/include/constants/vars.h b/include/constants/vars.h
index d3d1aba87..2cbe3e9b8 100644
--- a/include/constants/vars.h
+++ b/include/constants/vars.h
@@ -149,7 +149,7 @@
 #define VAR_LITTLEROOT_HOUSES_STATE_MAY      0x4082
 #define VAR_UNUSED_0x4083                    0x4083 // Unused Var
 #define VAR_BIRCH_LAB_STATE                  0x4084
-#define VAR_PETALBURG_GYM_STATE              0x4085 // 0-1: Wally tutorial, 2-6: 0-4 badges, 7: Defeated Norman, 8: Rematch Norman 
+#define VAR_PETALBURG_GYM_STATE              0x4085 // 0-1: Wally tutorial, 2-6: 0-4 badges, 7: Defeated Norman, 8: Rematch Norman
 #define VAR_CONTEST_HALL_STATE               0x4086
 #define VAR_CABLE_CLUB_STATE                 0x4087
 #define VAR_CONTEST_TYPE                     0x4088
diff --git a/include/constants/weather.h b/include/constants/weather.h
index becbdda87..c4a23a18b 100644
--- a/include/constants/weather.h
+++ b/include/constants/weather.h
@@ -16,7 +16,7 @@
 #define WEATHER_DROUGHT                 12
 #define WEATHER_DOWNPOUR                13
 #define WEATHER_UNDERWATER_BUBBLES      14
-#define WEATHER_ABNORMAL                15  // The alternating weather during Groudon/Kyogre conflict 
+#define WEATHER_ABNORMAL                15  // The alternating weather during Groudon/Kyogre conflict
 #define WEATHER_ROUTE119_CYCLE          20
 #define WEATHER_ROUTE123_CYCLE          21
 
diff --git a/include/event_scripts.h b/include/event_scripts.h
index c478f41f8..1a24aa59d 100644
--- a/include/event_scripts.h
+++ b/include/event_scripts.h
@@ -240,48 +240,48 @@ extern const u8 gTVWhatsNo1InHoennTodayText05[];
 extern const u8 gTVWhatsNo1InHoennTodayText06[];
 extern const u8 gTVWhatsNo1InHoennTodayText07[];
 extern const u8 gTVWhatsNo1InHoennTodayText08[];
-extern const u8 TVSecretBaseSecrets_Text_Intro[]; 
+extern const u8 TVSecretBaseSecrets_Text_Intro[];
 extern const u8 TVSecretBaseSecrets_Text_WhatWillPlayerDoNext1[];
 extern const u8 TVSecretBaseSecrets_Text_WhatWillPlayerDoNext2[];
 extern const u8 TVSecretBaseSecrets_Text_TookXStepsBeforeLeaving[];
-extern const u8 TVSecretBaseSecrets_Text_BaseFailedToInterestPlayer[]; 
-extern const u8 TVSecretBaseSecrets_Text_PlayerEnjoyedBase[]; 
+extern const u8 TVSecretBaseSecrets_Text_BaseFailedToInterestPlayer[];
+extern const u8 TVSecretBaseSecrets_Text_PlayerEnjoyedBase[];
 extern const u8 TVSecretBaseSecrets_Text_PlayerHugeFanOfBase[];
-extern const u8 TVSecretBaseSecrets_Text_Outro[]; 
-extern const u8 TVSecretBaseSecrets_Text_StoppedMoving1[]; 
-extern const u8 TVSecretBaseSecrets_Text_StoppedMoving2[]; 
-extern const u8 TVSecretBaseSecrets_Text_UsedChair[]; 
-extern const u8 TVSecretBaseSecrets_Text_UsedBalloon[]; 
-extern const u8 TVSecretBaseSecrets_Text_UsedTent[]; 
-extern const u8 TVSecretBaseSecrets_Text_UsedPlant[]; 
-extern const u8 TVSecretBaseSecrets_Text_UsedGoldShield[]; 
-extern const u8 TVSecretBaseSecrets_Text_UsedSilverShield[]; 
-extern const u8 TVSecretBaseSecrets_Text_UsedGlassOrnament[]; 
-extern const u8 TVSecretBaseSecrets_Text_UsedTV[]; 
-extern const u8 TVSecretBaseSecrets_Text_UsedMudBall[]; 
-extern const u8 TVSecretBaseSecrets_Text_UsedBag[]; 
-extern const u8 TVSecretBaseSecrets_Text_UsedCushion[]; 
-extern const u8 TVSecretBaseSecrets_Text_HitCushion[]; 
-extern const u8 TVSecretBaseSecrets_Text_HuggedCushion[]; 
-extern const u8 TVSecretBaseSecrets_Text_BattledWon[]; 
-extern const u8 TVSecretBaseSecrets_Text_BattledLost[]; 
-extern const u8 TVSecretBaseSecrets_Text_DeclinedBattle[]; 
-extern const u8 TVSecretBaseSecrets_Text_UsedPoster[]; 
-extern const u8 TVSecretBaseSecrets_Text_UsedNoteMat[]; 
-extern const u8 TVSecretBaseSecrets_Text_BattledDraw[]; 
-extern const u8 TVSecretBaseSecrets_Text_UsedSpinMat[]; 
-extern const u8 TVSecretBaseSecrets_Text_UsedSandOrnament[]; 
-extern const u8 TVSecretBaseSecrets_Text_UsedDesk[]; 
-extern const u8 TVSecretBaseSecrets_Text_UsedBrick[]; 
-extern const u8 TVSecretBaseSecrets_Text_UsedSolidBoard[]; 
-extern const u8 TVSecretBaseSecrets_Text_UsedFence[]; 
-extern const u8 TVSecretBaseSecrets_Text_UsedGlitterMat[]; 
-extern const u8 TVSecretBaseSecrets_Text_UsedTire[]; 
-extern const u8 TVSecretBaseSecrets_Text_UsedStand[]; 
+extern const u8 TVSecretBaseSecrets_Text_Outro[];
+extern const u8 TVSecretBaseSecrets_Text_StoppedMoving1[];
+extern const u8 TVSecretBaseSecrets_Text_StoppedMoving2[];
+extern const u8 TVSecretBaseSecrets_Text_UsedChair[];
+extern const u8 TVSecretBaseSecrets_Text_UsedBalloon[];
+extern const u8 TVSecretBaseSecrets_Text_UsedTent[];
+extern const u8 TVSecretBaseSecrets_Text_UsedPlant[];
+extern const u8 TVSecretBaseSecrets_Text_UsedGoldShield[];
+extern const u8 TVSecretBaseSecrets_Text_UsedSilverShield[];
+extern const u8 TVSecretBaseSecrets_Text_UsedGlassOrnament[];
+extern const u8 TVSecretBaseSecrets_Text_UsedTV[];
+extern const u8 TVSecretBaseSecrets_Text_UsedMudBall[];
+extern const u8 TVSecretBaseSecrets_Text_UsedBag[];
+extern const u8 TVSecretBaseSecrets_Text_UsedCushion[];
+extern const u8 TVSecretBaseSecrets_Text_HitCushion[];
+extern const u8 TVSecretBaseSecrets_Text_HuggedCushion[];
+extern const u8 TVSecretBaseSecrets_Text_BattledWon[];
+extern const u8 TVSecretBaseSecrets_Text_BattledLost[];
+extern const u8 TVSecretBaseSecrets_Text_DeclinedBattle[];
+extern const u8 TVSecretBaseSecrets_Text_UsedPoster[];
+extern const u8 TVSecretBaseSecrets_Text_UsedNoteMat[];
+extern const u8 TVSecretBaseSecrets_Text_BattledDraw[];
+extern const u8 TVSecretBaseSecrets_Text_UsedSpinMat[];
+extern const u8 TVSecretBaseSecrets_Text_UsedSandOrnament[];
+extern const u8 TVSecretBaseSecrets_Text_UsedDesk[];
+extern const u8 TVSecretBaseSecrets_Text_UsedBrick[];
+extern const u8 TVSecretBaseSecrets_Text_UsedSolidBoard[];
+extern const u8 TVSecretBaseSecrets_Text_UsedFence[];
+extern const u8 TVSecretBaseSecrets_Text_UsedGlitterMat[];
+extern const u8 TVSecretBaseSecrets_Text_UsedTire[];
+extern const u8 TVSecretBaseSecrets_Text_UsedStand[];
 extern const u8 TVSecretBaseSecrets_Text_BrokeDoor[];
-extern const u8 TVSecretBaseSecrets_Text_UsedDoll[]; 
-extern const u8 TVSecretBaseSecrets_Text_UsedSlide[]; 
-extern const u8 TVSecretBaseSecrets_Text_UsedSlideButDidntGoDown[]; 
+extern const u8 TVSecretBaseSecrets_Text_UsedDoll[];
+extern const u8 TVSecretBaseSecrets_Text_UsedSlide[];
+extern const u8 TVSecretBaseSecrets_Text_UsedSlideButDidntGoDown[];
 extern const u8 TVSecretBaseSecrets_Text_UsedJumpMat[];
 extern const u8 gTVSafariFanClubText00[];
 extern const u8 gTVSafariFanClubText01[];
diff --git a/include/global.fieldmap.h b/include/global.fieldmap.h
index 6bafa9747..41b8539ff 100644
--- a/include/global.fieldmap.h
+++ b/include/global.fieldmap.h
@@ -146,7 +146,7 @@ struct MapHeader
     /* 0x1A */ bool8 allowCycling:1;
                bool8 allowEscaping:1; // Escape Rope and Dig
                bool8 allowRunning:1;
-               bool8 showMapName:5; // the last 4 bits are unused 
+               bool8 showMapName:5; // the last 4 bits are unused
                                     // but the 5 bit sized bitfield is required to match
     /* 0x1B */ u8 battleType;
 };
diff --git a/include/global.h b/include/global.h
index e4c11f9ef..d14aa60f4 100644
--- a/include/global.h
+++ b/include/global.h
@@ -312,7 +312,7 @@ struct BattleTowerEReaderTrainer
     /*0xB8*/ u32 checksum;
 };
 
-// For displaying party information on the player's Battle Dome tourney page 
+// For displaying party information on the player's Battle Dome tourney page
 struct DomeMonData
 {
     u16 moves[MAX_MON_MOVES];
@@ -436,7 +436,7 @@ struct PlayersApprentice
     /*0xB1*/ u8 questionsAnswered:4;
     /*0xB1*/ u8 leadMonId:2;
     /*0xB2*/ u8 party:3;
-    /*0xB2*/ u8 saveId:2; 
+    /*0xB2*/ u8 saveId:2;
     /*0xB3*/ u8 unused;
     /*0xB4*/ u8 speciesIds[MULTI_PARTY_SIZE];
     /*0xB8*/ struct ApprenticeQuestion questions[APPRENTICE_MAX_QUESTIONS];
@@ -761,7 +761,7 @@ struct LilycoveLadyQuiz
 {
     /*0x000*/ u8 id;
     /*0x001*/ u8 state;
-    /*0x002*/ u16 question[9];
+    /*0x002*/ u16 question[QUIZ_QUESTION_LEN];
     /*0x014*/ u16 correctAnswer;
     /*0x016*/ u16 playerAnswer;
     /*0x018*/ u8 playerName[PLAYER_NAME_LENGTH + 1];
diff --git a/include/librfu.h b/include/librfu.h
index 69c696172..0026adece 100644
--- a/include/librfu.h
+++ b/include/librfu.h
@@ -30,12 +30,12 @@
     Calculate the number of the transferable DMA count based on this 42 cycles and the access cycles of the destination and source.
     For example, if both the CPU internal RAM --> VRAM have a one cycle access, then a 21 count DMA can occur.
 
-  
-  If RFU is used outside of these restrictions, problems, such as the loss of data caused by the failure of the AGB, as a clock slave, 
+
+  If RFU is used outside of these restrictions, problems, such as the loss of data caused by the failure of the AGB, as a clock slave,
   to notify that data has been received from the RFU, will occur.
   When this problem occurs, the REQ callback will send a REQ_commandID=ID_CLOCK_SLAVE_MS_CHANGE_ERROR_BY_DMA_REQ notification.
    (When using Link Manager, the LMAN call back will send a LMAN_msg=LMAN_MSG_CLOCK_SLAVE_MS_CHANGE_ERROR_BY_DMA notification.)
-  
+
 */
 
 // REQ-COMMAND (STWI) ID CODE LIST
@@ -137,7 +137,7 @@
 // Definition Data Returned by Return Values for Library Functions
 // *******************************************************
 
-// The function doesn't have return value. 
+// The function doesn't have return value.
 // Value of u8 *status for rfu_REQ_pollConnectParent (Connection Trial Status)
 // #define CP_STATUS_DONE                  0x00               // Connection successful
 // #define CP_STATUS_IN_PROCESS            0x01               // Connecting
@@ -145,7 +145,7 @@
 // #define CP_STATUS_DISCONNECTED          0x03               // Disconnected by parent device while connecting
 // #define CP_STATUS_UNKNOWN               0xff               // Cannot read status due to REQ-API execution error
 
-// The function doesn't exist. 
+// The function doesn't exist.
 // Value of u8 *status argument for rfu_REQ_pollRecoveryConnect (Link Restore Status)
 // #define RC_STATUS_DONE                  0x00               // Connection restore successful
 // #define RC_STATUS_FAILED                0x01               // Connection restore failure (meaningless to try anymore)
@@ -324,7 +324,7 @@ struct STWIStatus
     vu8 sending;
 };
 
-// This struct is used as u8 array in SDK. 
+// This struct is used as u8 array in SDK.
 struct RfuIntrStruct
 {
     union RfuPacket rxPacketAlloc;
@@ -475,7 +475,7 @@ extern struct RfuSlotStatusUNI *gRfuSlotStatusUNI[RFU_CHILD_MAX];
 // librfu_sio32id
 s32 AgbRFU_checkID(u8 maxTries);
 
-// Arguments with "bm..." specify slots of the form (0x01 << slot number) that are the object of a function operation. 
+// Arguments with "bm..." specify slots of the form (0x01 << slot number) that are the object of a function operation.
 
 // librfu_rfu
 // API Initialization and Initial Settings
diff --git a/include/link.h b/include/link.h
index 407dbabb9..5479d77d4 100644
--- a/include/link.h
+++ b/include/link.h
@@ -75,7 +75,7 @@
 #define LINKCMD_SEND_BLOCK_REQ          0xCCCC
 #define LINKCMD_START_TRADE             0xCCDD
 #define LINKCMD_CONFIRM_FINISH_TRADE    0xDCBA
-#define LINKCMD_SET_MONS_TO_TRADE       0xDDDD 
+#define LINKCMD_SET_MONS_TO_TRADE       0xDDDD
 #define LINKCMD_PLAYER_CANCEL_TRADE     0xDDEE
 #define LINKCMD_REQUEST_CANCEL          0xEEAA
 #define LINKCMD_BOTH_CANCEL_TRADE       0xEEBB
@@ -92,7 +92,7 @@
 #define LINKTYPE_DOUBLE_BATTLE         0x2244
 #define LINKTYPE_MULTI_BATTLE          0x2255
 #define LINKTYPE_BATTLE_TOWER_50       0x2266
-#define LINKTYPE_BATTLE_TOWER_OPEN     0x2277 
+#define LINKTYPE_BATTLE_TOWER_OPEN     0x2277
 #define LINKTYPE_BATTLE_TOWER          0x2288
 #define LINKTYPE_RECORD_MIX_BEFORE     0x3311
 #define LINKTYPE_RECORD_MIX_AFTER      0x3322
diff --git a/include/overworld.h b/include/overworld.h
index 16c75861c..8005a2222 100644
--- a/include/overworld.h
+++ b/include/overworld.h
@@ -15,7 +15,7 @@
 
 // These two are a hack to stop user input until link stuff can be
 // resolved.
-#define LINK_KEY_CODE_HANDLE_RECV_QUEUE 0x1B 
+#define LINK_KEY_CODE_HANDLE_RECV_QUEUE 0x1B
 #define LINK_KEY_CODE_HANDLE_SEND_QUEUE 0x1C
 #define LINK_KEY_CODE_EXIT_SEAT 0x1D
 #define LINK_KEY_CODE_UNK_8 0x1E
diff --git a/include/pokeball.h b/include/pokeball.h
index 8ea675ce4..d88e80173 100644
--- a/include/pokeball.h
+++ b/include/pokeball.h
@@ -21,7 +21,7 @@ enum
 enum {
     BALL_AFFINE_ANIM_0,
     BALL_ROTATE_RIGHT,
-    BALL_ROTATE_LEFT, 
+    BALL_ROTATE_LEFT,
     BALL_AFFINE_ANIM_3,
     BALL_AFFINE_ANIM_4
 };
diff --git a/include/pokemon_storage_system.h b/include/pokemon_storage_system.h
index 73a7833ee..a0e4f8947 100644
--- a/include/pokemon_storage_system.h
+++ b/include/pokemon_storage_system.h
@@ -6,8 +6,8 @@
 #define IN_BOX_COLUMNS          6 // Number of columns, 5 Pokémon per column
 #define IN_BOX_COUNT            (IN_BOX_ROWS * IN_BOX_COLUMNS)
 
-/* 
-            COLUMNS         
+/*
+            COLUMNS
 ROWS        0   1   2   3   4   5
             6   7   8   9   10  11
             12  13  14  15  16  17
diff --git a/include/strings.h b/include/strings.h
index 2357e3777..7317f8aac 100644
--- a/include/strings.h
+++ b/include/strings.h
@@ -1607,10 +1607,10 @@ extern const u8 BattleFrontier_BattleTowerMultiPartnerRoom_Text_BirdKeeperMon1[]
 extern const u8 BattleFrontier_BattleTowerMultiPartnerRoom_Text_BirdKeeperMon2Ask[];
 extern const u8 BattleFrontier_BattleTowerMultiPartnerRoom_Text_BirdKeeperAccept[];
 extern const u8 BattleFrontier_BattleTowerMultiPartnerRoom_Text_BirdKeeperReject[];
-extern const u8 BattleFrontier_BattleTowerMultiPartnerRoom_Text_NinjaBoyIntro[]; 
+extern const u8 BattleFrontier_BattleTowerMultiPartnerRoom_Text_NinjaBoyIntro[];
 extern const u8 BattleFrontier_BattleTowerMultiPartnerRoom_Text_NinjaBoyMon1[];
 extern const u8 BattleFrontier_BattleTowerMultiPartnerRoom_Text_NinjaBoyMon2Ask[];
-extern const u8 BattleFrontier_BattleTowerMultiPartnerRoom_Text_NinjaBoyAccept[]; 
+extern const u8 BattleFrontier_BattleTowerMultiPartnerRoom_Text_NinjaBoyAccept[];
 extern const u8 BattleFrontier_BattleTowerMultiPartnerRoom_Text_NinjaBoyReject[];
 extern const u8 BattleFrontier_BattleTowerMultiPartnerRoom_Text_ParasolLadyIntro[];
 extern const u8 BattleFrontier_BattleTowerMultiPartnerRoom_Text_ParasolLadyMon1[];
@@ -1620,8 +1620,8 @@ extern const u8 BattleFrontier_BattleTowerMultiPartnerRoom_Text_ParasolLadyRejec
 extern const u8 BattleFrontier_BattleTowerMultiPartnerRoom_Text_BugManiacIntro[];
 extern const u8 BattleFrontier_BattleTowerMultiPartnerRoom_Text_BugManiacMon1[];
 extern const u8 BattleFrontier_BattleTowerMultiPartnerRoom_Text_BugManiacMon2Ask[];
-extern const u8 BattleFrontier_BattleTowerMultiPartnerRoom_Text_BugManiacAccept[]; 
-extern const u8 BattleFrontier_BattleTowerMultiPartnerRoom_Text_BugManiacReject[]; 
+extern const u8 BattleFrontier_BattleTowerMultiPartnerRoom_Text_BugManiacAccept[];
+extern const u8 BattleFrontier_BattleTowerMultiPartnerRoom_Text_BugManiacReject[];
 extern const u8 BattleFrontier_BattleTowerMultiPartnerRoom_Text_SailorIntro[];
 extern const u8 BattleFrontier_BattleTowerMultiPartnerRoom_Text_SailorMon1[];
 extern const u8 BattleFrontier_BattleTowerMultiPartnerRoom_Text_SailorMon2Ask[];
@@ -1634,13 +1634,13 @@ extern const u8 BattleFrontier_BattleTowerMultiPartnerRoom_Text_CollectorAccept[
 extern const u8 BattleFrontier_BattleTowerMultiPartnerRoom_Text_CollectorReject[];
 extern const u8 BattleFrontier_BattleTowerMultiPartnerRoom_Text_PkmnRangerMIntro[];
 extern const u8 BattleFrontier_BattleTowerMultiPartnerRoom_Text_PkmnRangerMMon1[];
-extern const u8 BattleFrontier_BattleTowerMultiPartnerRoom_Text_PkmnRangerMMon2Ask[]; 
+extern const u8 BattleFrontier_BattleTowerMultiPartnerRoom_Text_PkmnRangerMMon2Ask[];
 extern const u8 BattleFrontier_BattleTowerMultiPartnerRoom_Text_PkmnRangerMAccept[];
 extern const u8 BattleFrontier_BattleTowerMultiPartnerRoom_Text_PkmnRangerMReject[];
 extern const u8 BattleFrontier_BattleTowerMultiPartnerRoom_Text_PkmnRangerFIntro[];
 extern const u8 BattleFrontier_BattleTowerMultiPartnerRoom_Text_PkmnRangerFMon1[];
 extern const u8 BattleFrontier_BattleTowerMultiPartnerRoom_Text_PkmnRangerFMon2Ask[];
-extern const u8 BattleFrontier_BattleTowerMultiPartnerRoom_Text_PkmnRangerFAccept[]; 
+extern const u8 BattleFrontier_BattleTowerMultiPartnerRoom_Text_PkmnRangerFAccept[];
 extern const u8 BattleFrontier_BattleTowerMultiPartnerRoom_Text_PkmnRangerFReject[];
 extern const u8 BattleFrontier_BattleTowerMultiPartnerRoom_Text_AromaLadyIntro[];
 extern const u8 BattleFrontier_BattleTowerMultiPartnerRoom_Text_AromaLadyMon1[];
@@ -1649,20 +1649,20 @@ extern const u8 BattleFrontier_BattleTowerMultiPartnerRoom_Text_AromaLadyAccept[
 extern const u8 BattleFrontier_BattleTowerMultiPartnerRoom_Text_AromaLadyReject[];
 extern const u8 BattleFrontier_BattleTowerMultiPartnerRoom_Text_RuinManiacIntro[];
 extern const u8 BattleFrontier_BattleTowerMultiPartnerRoom_Text_RuinManiacMon1[];
-extern const u8 BattleFrontier_BattleTowerMultiPartnerRoom_Text_RuinManiacMon2Ask[]; 
+extern const u8 BattleFrontier_BattleTowerMultiPartnerRoom_Text_RuinManiacMon2Ask[];
 extern const u8 BattleFrontier_BattleTowerMultiPartnerRoom_Text_RuinManiacAccept[];
 extern const u8 BattleFrontier_BattleTowerMultiPartnerRoom_Text_RuinManiacReject[];
-extern const u8 BattleFrontier_BattleTowerMultiPartnerRoom_Text_CoolTrainerMIntro[]; 
+extern const u8 BattleFrontier_BattleTowerMultiPartnerRoom_Text_CoolTrainerMIntro[];
 extern const u8 BattleFrontier_BattleTowerMultiPartnerRoom_Text_CoolTrainerMMon1[];
 extern const u8 BattleFrontier_BattleTowerMultiPartnerRoom_Text_CoolTrainerMMon2Ask[];
 extern const u8 BattleFrontier_BattleTowerMultiPartnerRoom_Text_CoolTrainerMAccept[];
-extern const u8 BattleFrontier_BattleTowerMultiPartnerRoom_Text_CoolTrainerMReject[]; 
-extern const u8 BattleFrontier_BattleTowerMultiPartnerRoom_Text_CoolTrainerFIntro[]; 
-extern const u8 BattleFrontier_BattleTowerMultiPartnerRoom_Text_CoolTrainerFMon1[]; 
+extern const u8 BattleFrontier_BattleTowerMultiPartnerRoom_Text_CoolTrainerMReject[];
+extern const u8 BattleFrontier_BattleTowerMultiPartnerRoom_Text_CoolTrainerFIntro[];
+extern const u8 BattleFrontier_BattleTowerMultiPartnerRoom_Text_CoolTrainerFMon1[];
 extern const u8 BattleFrontier_BattleTowerMultiPartnerRoom_Text_CoolTrainerFMon2Ask[];
 extern const u8 BattleFrontier_BattleTowerMultiPartnerRoom_Text_CoolTrainerFAccept[];
 extern const u8 BattleFrontier_BattleTowerMultiPartnerRoom_Text_CoolTrainerFReject[];
-extern const u8 BattleFrontier_BattleTowerMultiPartnerRoom_Text_PokemaniacIntro[]; 
+extern const u8 BattleFrontier_BattleTowerMultiPartnerRoom_Text_PokemaniacIntro[];
 extern const u8 BattleFrontier_BattleTowerMultiPartnerRoom_Text_PokemaniacMon1[];
 extern const u8 BattleFrontier_BattleTowerMultiPartnerRoom_Text_PokemaniacMon2Ask[];
 extern const u8 BattleFrontier_BattleTowerMultiPartnerRoom_Text_PokemaniacAccept[];
@@ -1673,28 +1673,28 @@ extern const u8 BattleFrontier_BattleTowerMultiPartnerRoom_Text_KindlerMon2Ask[]
 extern const u8 BattleFrontier_BattleTowerMultiPartnerRoom_Text_KindlerAccept[];
 extern const u8 BattleFrontier_BattleTowerMultiPartnerRoom_Text_KindlerReject[];
 extern const u8 BattleFrontier_BattleTowerMultiPartnerRoom_Text_CamperIntro[];
-extern const u8 BattleFrontier_BattleTowerMultiPartnerRoom_Text_CamperMon1[]; 
-extern const u8 BattleFrontier_BattleTowerMultiPartnerRoom_Text_CamperMon2Ask[]; 
-extern const u8 BattleFrontier_BattleTowerMultiPartnerRoom_Text_CamperAccept[]; 
-extern const u8 BattleFrontier_BattleTowerMultiPartnerRoom_Text_CamperReject[]; 
-extern const u8 BattleFrontier_BattleTowerMultiPartnerRoom_Text_PicnickerIntro[]; 
-extern const u8 BattleFrontier_BattleTowerMultiPartnerRoom_Text_PicnickerMon1[]; 
+extern const u8 BattleFrontier_BattleTowerMultiPartnerRoom_Text_CamperMon1[];
+extern const u8 BattleFrontier_BattleTowerMultiPartnerRoom_Text_CamperMon2Ask[];
+extern const u8 BattleFrontier_BattleTowerMultiPartnerRoom_Text_CamperAccept[];
+extern const u8 BattleFrontier_BattleTowerMultiPartnerRoom_Text_CamperReject[];
+extern const u8 BattleFrontier_BattleTowerMultiPartnerRoom_Text_PicnickerIntro[];
+extern const u8 BattleFrontier_BattleTowerMultiPartnerRoom_Text_PicnickerMon1[];
 extern const u8 BattleFrontier_BattleTowerMultiPartnerRoom_Text_PicnickerMon2Ask[];
-extern const u8 BattleFrontier_BattleTowerMultiPartnerRoom_Text_PicnickerAccept[]; 
+extern const u8 BattleFrontier_BattleTowerMultiPartnerRoom_Text_PicnickerAccept[];
 extern const u8 BattleFrontier_BattleTowerMultiPartnerRoom_Text_PicnickerReject[];
-extern const u8 BattleFrontier_BattleTowerMultiPartnerRoom_Text_PsychicMIntro[]; 
+extern const u8 BattleFrontier_BattleTowerMultiPartnerRoom_Text_PsychicMIntro[];
 extern const u8 BattleFrontier_BattleTowerMultiPartnerRoom_Text_PsychicMMon1[];
-extern const u8 BattleFrontier_BattleTowerMultiPartnerRoom_Text_PsychicMMon2Ask[]; 
+extern const u8 BattleFrontier_BattleTowerMultiPartnerRoom_Text_PsychicMMon2Ask[];
 extern const u8 BattleFrontier_BattleTowerMultiPartnerRoom_Text_PsychicMAccept[];
-extern const u8 BattleFrontier_BattleTowerMultiPartnerRoom_Text_PsychicMReject[]; 
-extern const u8 BattleFrontier_BattleTowerMultiPartnerRoom_Text_PsychicFIntro[]; 
-extern const u8 BattleFrontier_BattleTowerMultiPartnerRoom_Text_PsychicFMon1[]; 
+extern const u8 BattleFrontier_BattleTowerMultiPartnerRoom_Text_PsychicMReject[];
+extern const u8 BattleFrontier_BattleTowerMultiPartnerRoom_Text_PsychicFIntro[];
+extern const u8 BattleFrontier_BattleTowerMultiPartnerRoom_Text_PsychicFMon1[];
 extern const u8 BattleFrontier_BattleTowerMultiPartnerRoom_Text_PsychicFMon2Ask[];
-extern const u8 BattleFrontier_BattleTowerMultiPartnerRoom_Text_PsychicFAccept[]; 
+extern const u8 BattleFrontier_BattleTowerMultiPartnerRoom_Text_PsychicFAccept[];
 extern const u8 BattleFrontier_BattleTowerMultiPartnerRoom_Text_PsychicFReject[];
 extern const u8 BattleFrontier_BattleTowerMultiPartnerRoom_Text_SchoolKidFIntro[];
-extern const u8 BattleFrontier_BattleTowerMultiPartnerRoom_Text_SchoolKidFMon1[]; 
-extern const u8 BattleFrontier_BattleTowerMultiPartnerRoom_Text_SchoolKidFMon2Ask[]; 
+extern const u8 BattleFrontier_BattleTowerMultiPartnerRoom_Text_SchoolKidFMon1[];
+extern const u8 BattleFrontier_BattleTowerMultiPartnerRoom_Text_SchoolKidFMon2Ask[];
 extern const u8 BattleFrontier_BattleTowerMultiPartnerRoom_Text_SchoolKidFAccept[];
 extern const u8 BattleFrontier_BattleTowerMultiPartnerRoom_Text_SchoolKidFReject[];
 extern const u8 BattleFrontier_BattleTowerMultiPartnerRoom_Text_PkmnBreederFIntro[];
@@ -1706,27 +1706,27 @@ extern const u8 BattleFrontier_BattleTowerMultiPartnerRoom_Text_PokefanFIntro[];
 extern const u8 BattleFrontier_BattleTowerMultiPartnerRoom_Text_PokefanFMon1[];
 extern const u8 BattleFrontier_BattleTowerMultiPartnerRoom_Text_PokefanFMon2Ask[];
 extern const u8 BattleFrontier_BattleTowerMultiPartnerRoom_Text_PokefanFAccept[];
-extern const u8 BattleFrontier_BattleTowerMultiPartnerRoom_Text_PokefanFReject[]; 
+extern const u8 BattleFrontier_BattleTowerMultiPartnerRoom_Text_PokefanFReject[];
 extern const u8 BattleFrontier_BattleTowerMultiPartnerRoom_Text_SwimmerFIntro[];
-extern const u8 BattleFrontier_BattleTowerMultiPartnerRoom_Text_SwimmerFMon1[]; 
+extern const u8 BattleFrontier_BattleTowerMultiPartnerRoom_Text_SwimmerFMon1[];
 extern const u8 BattleFrontier_BattleTowerMultiPartnerRoom_Text_SwimmerFMon2Ask[];
 extern const u8 BattleFrontier_BattleTowerMultiPartnerRoom_Text_SwimmerFAccept[];
-extern const u8 BattleFrontier_BattleTowerMultiPartnerRoom_Text_SwimmerFReject[]; 
-extern const u8 BattleFrontier_BattleTowerMultiPartnerRoom_Text_SwimmingTriathleteMIntro[]; 
+extern const u8 BattleFrontier_BattleTowerMultiPartnerRoom_Text_SwimmerFReject[];
+extern const u8 BattleFrontier_BattleTowerMultiPartnerRoom_Text_SwimmingTriathleteMIntro[];
 extern const u8 BattleFrontier_BattleTowerMultiPartnerRoom_Text_SwimmingTriathleteMMon1[];
 extern const u8 BattleFrontier_BattleTowerMultiPartnerRoom_Text_SwimmingTriathleteMMon2Ask[];
-extern const u8 BattleFrontier_BattleTowerMultiPartnerRoom_Text_SwimmingTriathleteMAccept[]; 
+extern const u8 BattleFrontier_BattleTowerMultiPartnerRoom_Text_SwimmingTriathleteMAccept[];
 extern const u8 BattleFrontier_BattleTowerMultiPartnerRoom_Text_SwimmingTriathleteMReject[];
-extern const u8 BattleFrontier_BattleTowerMultiPartnerRoom_Text_SwimmingTriathleteFIntro[]; 
-extern const u8 BattleFrontier_BattleTowerMultiPartnerRoom_Text_SwimmingTriathleteFMon1[]; 
+extern const u8 BattleFrontier_BattleTowerMultiPartnerRoom_Text_SwimmingTriathleteFIntro[];
+extern const u8 BattleFrontier_BattleTowerMultiPartnerRoom_Text_SwimmingTriathleteFMon1[];
 extern const u8 BattleFrontier_BattleTowerMultiPartnerRoom_Text_SwimmingTriathleteFMon2Ask[];
 extern const u8 BattleFrontier_BattleTowerMultiPartnerRoom_Text_SwimmingTriathleteFAccept[];
 extern const u8 BattleFrontier_BattleTowerMultiPartnerRoom_Text_SwimmingTriathleteFReject[];
 extern const u8 BattleFrontier_BattleTowerMultiPartnerRoom_Text_SwimmerMIntro[];
 extern const u8 BattleFrontier_BattleTowerMultiPartnerRoom_Text_SwimmerMMon1[];
-extern const u8 BattleFrontier_BattleTowerMultiPartnerRoom_Text_SwimmerMMon2Ask[]; 
+extern const u8 BattleFrontier_BattleTowerMultiPartnerRoom_Text_SwimmerMMon2Ask[];
 extern const u8 BattleFrontier_BattleTowerMultiPartnerRoom_Text_SwimmerMAccept[];
-extern const u8 BattleFrontier_BattleTowerMultiPartnerRoom_Text_SwimmerMReject[]; 
+extern const u8 BattleFrontier_BattleTowerMultiPartnerRoom_Text_SwimmerMReject[];
 
 // Battle Dome.
 extern const u8 BattleDome_Text_Potential1[];
diff --git a/include/trainer_hill.h b/include/trainer_hill.h
index acf8facca..647ba9647 100644
--- a/include/trainer_hill.h
+++ b/include/trainer_hill.h
@@ -23,19 +23,19 @@ struct TrHillRoomTrainers
 
 struct TrHillDisplay
 {
-    // Metatile data. Add 0x200 to the values in this array to get metatiles. 
+    // Metatile data. Add 0x200 to the values in this array to get metatiles.
     // This data then overwrites the metatiles in the map starting at (0,5)
-    u8 metatileData[0x100]; 
-    // Collision data. One bit for each tile in column-major order, 
+    u8 metatileData[0x100];
+    // Collision data. One bit for each tile in column-major order,
     // so every array entry is one row. 1 = impassable, 0 = passable
     u16 collisionData[16];
     // Trainer coordinates, starting at (0,6). Format is 0bYYYYXXXX.
     u8 coords[2];
-    // Trainer facing directions. Same as (DIR_* - 1). 
+    // Trainer facing directions. Same as (DIR_* - 1).
     // Effectively an array of nibbles, one for each trainer.
     u8 direction;
     // Trainer sight ranges. Effectively an array of nibbles, one for each trainer.
-    u8 range; 
+    u8 range;
 };
 
 struct TrHillFloor