1395 files changed, 1624 insertions, 1740 deletions

diff --git a/Makefile b/Makefile
index 50626c6c8..3ca1f7a34 100644
--- a/Makefile
+++ b/Makefile
@@ -43,127 +43,11 @@ compare_sapphire compare_sapphire_rev1 compare_sapphire_rev2
 C_SRCS := $(wildcard src/*.c)
 C_OBJS := $(C_SRCS:%.c=%.o)
 
-ASM_OBJS := \
-asm/crt0.o \
-asm/rom3.o \
-asm/decompress.o \
-asm/rom_800D42C.o \
-asm/calculate_base_damage.o \
-asm/rom_803D1FC.o \
-asm/rom_8040EB4.o \
-asm/daycare.o \
-asm/egg_hatch.o \
-asm/rom_804373C.o \
-asm/load_save.o \
-asm/trade.o \
-asm/berry_blender.o \
-asm/fieldmap.o \
-asm/metatile_behavior.o \
-asm/field_camera.o \
-asm/field_door.o \
-asm/field_player_avatar.o \
-asm/field_map_obj.o \
-asm/field_ground_effect.o \
-asm/rom_8065394.o \
-asm/rom_806936C.o \
-asm/party_menu.o \
-asm/rom_806D7F8.o \
-asm/tileset.o \
-asm/rom_8074BAC.o \
-asm/rom5.o \
-asm/title_screen.o \
-asm/weather.o \
-asm/rom_8080874.o \
-asm/battle_setup.o \
-asm/cable_club.o \
-asm/mori_debug_menu.o \
-asm/trainer_see.o \
-asm/field_effect.o \
-asm/rom_80859BC.o \
-asm/pokedex.o \
-asm/trainer_card.o \
-asm/rom_8094928.o \
-asm/item_menu.o \
-asm/battle_anim_80A7E7C.o \
-asm/item.o \
-asm/matuda_debug_menu.o \
-asm/contest.o \
-asm/shop.o \
-asm/script_menu.o \
-asm/naming_screen.o \
-asm/money.o \
-asm/contest_effect.o \
-asm/record_mixing.o \
-asm/sound_check_menu.o \
-asm/secret_base.o \
-asm/tv.o \
-asm/contest_link_80C2020.o \
-asm/script_pokemon_util_80C4BF0.o \
-asm/field_poison.o \
-asm/big_shroomish_barboach.o \
-asm/fldeff_80C5CD4.o \
-asm/truck_scene.o \
-asm/porthole.o \
-asm/rotating_gate.o \
-asm/safari_zone.o \
-asm/contest_link_80C857C.o \
-asm/item_use.o \
-asm/battle_anim_80CA710.o \
-asm/bike.o \
-asm/easy_chat.o \
-asm/pokenav.o \
-asm/mon_markings.o \
-asm/mauville_old_man.o \
-asm/mail.o \
-asm/menu_helpers.o \
-asm/script_pokemon_util_80F99CC.o \
-asm/dewford_trend.o \
-asm/heal_location.o \
-asm/region_map.o \
-asm/cute_sketch.o \
-asm/decoration.o \
-asm/slot_machine.o \
-asm/contest_painting.o \
-asm/battle_ai.o \
-asm/trader.o \
-asm/rom6.o \
-asm/battle_records.o \
-asm/pokedex_area_screen.o \
-asm/evolution_scene.o \
-asm/roulette.o \
-asm/pokedex_cry_screen.o \
-asm/coins.o \
-asm/landmark.o \
-asm/fldeff_strength.o \
-asm/battle_transition.o \
-asm/battle_811DA74.o \
-asm/battle_message.o \
-asm/choose_party.o \
-asm/cable_car.o \
-asm/roulette_util.o \
-asm/cable_car_util.o \
-asm/unused_8124F94.o \
-asm/mystery_event_script.o \
-asm/field_effect_helpers.o \
-asm/contest_ai.o \
-asm/rom_81258BC.o \
-asm/player_pc.o \
-asm/rom_813BA94.o \
-asm/berry_tag_screen.o \
-asm/mystery_event_menu.o \
-asm/save_failed_screen.o \
-asm/rom_81473B8.o \
-asm/rom_8148B8C.o \
-asm/menu_cursor.o \
-asm/libgcnmultiboot.o \
-asm/m4a_1.o \
-asm/m4a_3.o \
-asm/libagbsyscall.o
-
-DATA_ASM_OBJS := data/data2.o data/graphics.o data/sound_data.o \
-data/event_scripts.o data/battle_anim_scripts.o \
-data/battle_scripts_1.o data/battle_scripts_2.o data/field_effect_scripts.o \
-data/battle_ai_scripts.o data/contest_ai_scripts.o data/script_funcs.o
+ASM_SRCS := $(wildcard asm/*.s)
+ASM_OBJS := $(ASM_SRCS:%.s=%.o)
+
+DATA_ASM_SRCS := $(wildcard data/*.s)
+DATA_ASM_OBJS := $(DATA_ASM_SRCS:%.s=%.o)
 
 SONG_SRCS := $(wildcard sound/songs/*.s)
 SONG_OBJS := $(SONG_SRCS:%.s=%.o)
diff --git a/asm/battle_811DA74.s b/asm/battle_811DA74.s
index a51ab4e85..dc3cd456f 100644
--- a/asm/battle_811DA74.s
+++ b/asm/battle_811DA74.s
@@ -1,6 +1,6 @@
-	.include "constants/gba_constants.s"
-	.include "constants/species_constants.s"
-	.include "asm/macros.s"
+	.include "constants/gba_constants.inc"
+	.include "constants/species_constants.inc"
+	.include "asm/macros.inc"
 
 	.syntax unified
 
diff --git a/asm/battle_ai.s b/asm/battle_ai.s
index 029458352..78a218688 100644
--- a/asm/battle_ai.s
+++ b/asm/battle_ai.s
@@ -1,6 +1,6 @@
-	.include "constants/gba_constants.s"
-	.include "constants/species_constants.s"
-	.include "asm/macros.s"
+	.include "constants/gba_constants.inc"
+	.include "constants/species_constants.inc"
+	.include "asm/macros.inc"
 
 	.syntax unified
 
diff --git a/asm/battle_anim_80A7E7C.s b/asm/battle_anim_80A7E7C.s
index b305c7a42..362acec8b 100644
--- a/asm/battle_anim_80A7E7C.s
+++ b/asm/battle_anim_80A7E7C.s
@@ -1,6 +1,6 @@
-	.include "constants/gba_constants.s"
-	.include "constants/species_constants.s"
-	.include "asm/macros.s"
+	.include "constants/gba_constants.inc"
+	.include "constants/species_constants.inc"
+	.include "asm/macros.inc"
 
 	.syntax unified
 
diff --git a/asm/battle_anim_80CA710.s b/asm/battle_anim_80CA710.s
index dc366a5da..d784aa4b7 100644
--- a/asm/battle_anim_80CA710.s
+++ b/asm/battle_anim_80CA710.s
@@ -1,6 +1,6 @@
-	.include "constants/gba_constants.s"
-	.include "constants/species_constants.s"
-	.include "asm/macros.s"
+	.include "constants/gba_constants.inc"
+	.include "constants/species_constants.inc"
+	.include "asm/macros.inc"
 
 	.syntax unified
 
diff --git a/asm/battle_message.s b/asm/battle_message.s
index 8986ac835..8f903970f 100644
--- a/asm/battle_message.s
+++ b/asm/battle_message.s
@@ -1,6 +1,6 @@
-	.include "constants/gba_constants.s"
-	.include "constants/species_constants.s"
-	.include "asm/macros.s"
+	.include "constants/gba_constants.inc"
+	.include "constants/species_constants.inc"
+	.include "asm/macros.inc"
 
 	.syntax unified
 
diff --git a/asm/battle_records.s b/asm/battle_records.s
index 10eaa45ae..4960803ca 100644
--- a/asm/battle_records.s
+++ b/asm/battle_records.s
@@ -1,6 +1,6 @@
-	.include "constants/gba_constants.s"
-	.include "constants/species_constants.s"
-	.include "asm/macros.s"
+	.include "constants/gba_constants.inc"
+	.include "constants/species_constants.inc"
+	.include "asm/macros.inc"
 
 	.syntax unified
 
diff --git a/asm/battle_setup.s b/asm/battle_setup.s
index 3f78709b0..66a305229 100644
--- a/asm/battle_setup.s
+++ b/asm/battle_setup.s
@@ -1,6 +1,6 @@
-	.include "constants/gba_constants.s"
-	.include "constants/species_constants.s"
-	.include "asm/macros.s"
+	.include "constants/gba_constants.inc"
+	.include "constants/species_constants.inc"
+	.include "asm/macros.inc"
 
 	.syntax unified
 
diff --git a/asm/battle_transition.s b/asm/battle_transition.s
index 66443242b..a4b4d1666 100644
--- a/asm/battle_transition.s
+++ b/asm/battle_transition.s
@@ -1,6 +1,6 @@
-	.include "constants/gba_constants.s"
-	.include "constants/species_constants.s"
-	.include "asm/macros.s"
+	.include "constants/gba_constants.inc"
+	.include "constants/species_constants.inc"
+	.include "asm/macros.inc"
 
 	.syntax unified
 
diff --git a/asm/berry_blender.s b/asm/berry_blender.s
index 70af7824d..6b47805ca 100644
--- a/asm/berry_blender.s
+++ b/asm/berry_blender.s
@@ -1,6 +1,6 @@
-	.include "constants/gba_constants.s"
-	.include "constants/species_constants.s"
-	.include "asm/macros.s"
+	.include "constants/gba_constants.inc"
+	.include "constants/species_constants.inc"
+	.include "asm/macros.inc"
 
 	.syntax unified
 
diff --git a/asm/berry_tag_screen.s b/asm/berry_tag_screen.s
index 00476338e..c1b2c586c 100644
--- a/asm/berry_tag_screen.s
+++ b/asm/berry_tag_screen.s
@@ -1,6 +1,6 @@
-	.include "constants/gba_constants.s"
-	.include "constants/species_constants.s"
-	.include "asm/macros.s"
+	.include "constants/gba_constants.inc"
+	.include "constants/species_constants.inc"
+	.include "asm/macros.inc"
 
 	.syntax unified
 
diff --git a/asm/big_shroomish_barboach.s b/asm/big_shroomish_barboach.s
index 94ad0dc98..f65615dff 100644
--- a/asm/big_shroomish_barboach.s
+++ b/asm/big_shroomish_barboach.s
@@ -1,6 +1,6 @@
-	.include "constants/gba_constants.s"
-	.include "constants/species_constants.s"
-	.include "asm/macros.s"
+	.include "constants/gba_constants.inc"
+	.include "constants/species_constants.inc"
+	.include "asm/macros.inc"
 
 	.syntax unified
 
diff --git a/asm/bike.s b/asm/bike.s
index 4b324c111..d73fa55dc 100644
--- a/asm/bike.s
+++ b/asm/bike.s
@@ -1,6 +1,6 @@
-	.include "constants/gba_constants.s"
-	.include "constants/species_constants.s"
-	.include "asm/macros.s"
+	.include "constants/gba_constants.inc"
+	.include "constants/species_constants.inc"
+	.include "asm/macros.inc"
 
 	.syntax unified
 
diff --git a/asm/cable_car.s b/asm/cable_car.s
index 719f4f7b6..8fa960638 100644
--- a/asm/cable_car.s
+++ b/asm/cable_car.s
@@ -1,6 +1,6 @@
-	.include "constants/gba_constants.s"
-	.include "constants/species_constants.s"
-	.include "asm/macros.s"
+	.include "constants/gba_constants.inc"
+	.include "constants/species_constants.inc"
+	.include "asm/macros.inc"
 
 	.syntax unified
 
diff --git a/asm/cable_car_util.s b/asm/cable_car_util.s
index 950a31c4a..d02c5bb2e 100644
--- a/asm/cable_car_util.s
+++ b/asm/cable_car_util.s
@@ -1,6 +1,6 @@
-	.include "constants/gba_constants.s"
-	.include "constants/species_constants.s"
-	.include "asm/macros.s"
+	.include "constants/gba_constants.inc"
+	.include "constants/species_constants.inc"
+	.include "asm/macros.inc"
 
 	.syntax unified
 
diff --git a/asm/cable_club.s b/asm/cable_club.s
index b7b7bb82d..212e28a95 100644
--- a/asm/cable_club.s
+++ b/asm/cable_club.s
@@ -1,6 +1,6 @@
-	.include "constants/gba_constants.s"
-	.include "constants/species_constants.s"
-	.include "asm/macros.s"
+	.include "constants/gba_constants.inc"
+	.include "constants/species_constants.inc"
+	.include "asm/macros.inc"
 
 	.syntax unified
 
diff --git a/asm/calculate_base_damage.s b/asm/calculate_base_damage.s
index 99b6efaab..54f53f1a2 100644
--- a/asm/calculate_base_damage.s
+++ b/asm/calculate_base_damage.s
@@ -1,6 +1,6 @@
-	.include "constants/gba_constants.s"
-	.include "constants/species_constants.s"
-	.include "asm/macros.s"
+	.include "constants/gba_constants.inc"
+	.include "constants/species_constants.inc"
+	.include "asm/macros.inc"
 
 	.syntax unified
 
diff --git a/asm/choose_party.s b/asm/choose_party.s
index 07125dfae..762e48e61 100644
--- a/asm/choose_party.s
+++ b/asm/choose_party.s
@@ -1,6 +1,6 @@
-	.include "constants/gba_constants.s"
-	.include "constants/species_constants.s"
-	.include "asm/macros.s"
+	.include "constants/gba_constants.inc"
+	.include "constants/species_constants.inc"
+	.include "asm/macros.inc"
 
 	.syntax unified
 
diff --git a/asm/coins.s b/asm/coins.s
index 5b9726fbb..9393897d6 100644
--- a/asm/coins.s
+++ b/asm/coins.s
@@ -1,6 +1,6 @@
-	.include "constants/gba_constants.s"
-	.include "constants/species_constants.s"
-	.include "asm/macros.s"
+	.include "constants/gba_constants.inc"
+	.include "constants/species_constants.inc"
+	.include "asm/macros.inc"
 
 	.syntax unified
 
diff --git a/asm/contest.s b/asm/contest.s
index e8b413c5d..f3b176969 100644
--- a/asm/contest.s
+++ b/asm/contest.s
@@ -1,6 +1,6 @@
-	.include "constants/gba_constants.s"
-	.include "constants/species_constants.s"
-	.include "asm/macros.s"
+	.include "constants/gba_constants.inc"
+	.include "constants/species_constants.inc"
+	.include "asm/macros.inc"
 
 	.syntax unified
 
diff --git a/asm/contest_ai.s b/asm/contest_ai.s
index ecd2bbb59..fdc9afbb3 100644
--- a/asm/contest_ai.s
+++ b/asm/contest_ai.s
@@ -1,6 +1,6 @@
-	.include "constants/gba_constants.s"
-	.include "constants/species_constants.s"
-	.include "asm/macros.s"
+	.include "constants/gba_constants.inc"
+	.include "constants/species_constants.inc"
+	.include "asm/macros.inc"
 
 	.syntax unified
 
diff --git a/asm/contest_effect.s b/asm/contest_effect.s
index 028b56c0e..32dc389b4 100644
--- a/asm/contest_effect.s
+++ b/asm/contest_effect.s
@@ -1,6 +1,6 @@
-	.include "constants/gba_constants.s"
-	.include "constants/species_constants.s"
-	.include "asm/macros.s"
+	.include "constants/gba_constants.inc"
+	.include "constants/species_constants.inc"
+	.include "asm/macros.inc"
 
 	.syntax unified
 
diff --git a/asm/contest_link_80C2020.s b/asm/contest_link_80C2020.s
index 390902a18..f57ffac1e 100644
--- a/asm/contest_link_80C2020.s
+++ b/asm/contest_link_80C2020.s
@@ -1,6 +1,6 @@
-	.include "constants/gba_constants.s"
-	.include "constants/species_constants.s"
-	.include "asm/macros.s"
+	.include "constants/gba_constants.inc"
+	.include "constants/species_constants.inc"
+	.include "asm/macros.inc"
 
 	.syntax unified
 
diff --git a/asm/contest_link_80C857C.s b/asm/contest_link_80C857C.s
index 7a848f817..4e7da323d 100644
--- a/asm/contest_link_80C857C.s
+++ b/asm/contest_link_80C857C.s
@@ -1,6 +1,6 @@
-	.include "constants/gba_constants.s"
-	.include "constants/species_constants.s"
-	.include "asm/macros.s"
+	.include "constants/gba_constants.inc"
+	.include "constants/species_constants.inc"
+	.include "asm/macros.inc"
 
 	.syntax unified
 
diff --git a/asm/contest_painting.s b/asm/contest_painting.s
index 11f1ce69d..8edea71c1 100644
--- a/asm/contest_painting.s
+++ b/asm/contest_painting.s
@@ -1,6 +1,6 @@
-	.include "constants/gba_constants.s"
-	.include "constants/species_constants.s"
-	.include "asm/macros.s"
+	.include "constants/gba_constants.inc"
+	.include "constants/species_constants.inc"
+	.include "asm/macros.inc"
 
 	.syntax unified
 
diff --git a/asm/crt0.s b/asm/crt0.s
index f2c60b4e3..7a492ff17 100644
--- a/asm/crt0.s
+++ b/asm/crt0.s
@@ -1,4 +1,4 @@
-	.include "constants/gba_constants.s"
+	.include "constants/gba_constants.inc"
 
 	.syntax unified
 
@@ -11,7 +11,7 @@
 Start: @ 8000000
 	b Init
 
-	.include "asm/rom_header.s"
+	.include "asm/rom_header.inc"
 
 @ 80000C0
 	.word 0
diff --git a/asm/cute_sketch.s b/asm/cute_sketch.s
index 0f1b217a7..afacc19f6 100644
--- a/asm/cute_sketch.s
+++ b/asm/cute_sketch.s
@@ -1,6 +1,6 @@
-	.include "constants/gba_constants.s"
-	.include "constants/species_constants.s"
-	.include "asm/macros.s"
+	.include "constants/gba_constants.inc"
+	.include "constants/species_constants.inc"
+	.include "asm/macros.inc"
 
 	.syntax unified
 
diff --git a/asm/daycare.s b/asm/daycare.s
index 072b646d1..17543a508 100644
--- a/asm/daycare.s
+++ b/asm/daycare.s
@@ -1,6 +1,6 @@
-	.include "constants/gba_constants.s"
-	.include "constants/species_constants.s"
-	.include "asm/macros.s"
+	.include "constants/gba_constants.inc"
+	.include "constants/species_constants.inc"
+	.include "asm/macros.inc"
 
 	.syntax unified
 
diff --git a/asm/decompress.s b/asm/decompress.s
index 32349001f..0f80acaab 100644
--- a/asm/decompress.s
+++ b/asm/decompress.s
@@ -1,6 +1,6 @@
-	.include "constants/gba_constants.s"
-	.include "constants/species_constants.s"
-	.include "asm/macros.s"
+	.include "constants/gba_constants.inc"
+	.include "constants/species_constants.inc"
+	.include "asm/macros.inc"
 
 	.syntax unified
 
diff --git a/asm/decoration.s b/asm/decoration.s
index ba4517877..057251070 100644
--- a/asm/decoration.s
+++ b/asm/decoration.s
@@ -1,6 +1,6 @@
-	.include "constants/gba_constants.s"
-	.include "constants/species_constants.s"
-	.include "asm/macros.s"
+	.include "constants/gba_constants.inc"
+	.include "constants/species_constants.inc"
+	.include "asm/macros.inc"
 
 	.syntax unified
 
diff --git a/asm/dewford_trend.s b/asm/dewford_trend.s
index cdea62334..d2b887e2a 100644
--- a/asm/dewford_trend.s
+++ b/asm/dewford_trend.s
@@ -1,6 +1,6 @@
-	.include "constants/gba_constants.s"
-	.include "constants/species_constants.s"
-	.include "asm/macros.s"
+	.include "constants/gba_constants.inc"
+	.include "constants/species_constants.inc"
+	.include "asm/macros.inc"
 
 	.syntax unified
 
diff --git a/asm/easy_chat.s b/asm/easy_chat.s
index 5b80f2da5..fc4692828 100644
--- a/asm/easy_chat.s
+++ b/asm/easy_chat.s
@@ -1,6 +1,6 @@
-	.include "constants/gba_constants.s"
-	.include "constants/species_constants.s"
-	.include "asm/macros.s"
+	.include "constants/gba_constants.inc"
+	.include "constants/species_constants.inc"
+	.include "asm/macros.inc"
 
 	.syntax unified
 
diff --git a/asm/egg_hatch.s b/asm/egg_hatch.s
index ae27d6e31..505dc862c 100644
--- a/asm/egg_hatch.s
+++ b/asm/egg_hatch.s
@@ -1,6 +1,6 @@
-	.include "constants/gba_constants.s"
-	.include "constants/species_constants.s"
-	.include "asm/macros.s"
+	.include "constants/gba_constants.inc"
+	.include "constants/species_constants.inc"
+	.include "asm/macros.inc"
 
 	.syntax unified
 
diff --git a/asm/evolution_scene.s b/asm/evolution_scene.s
index 8453e277f..d411bb080 100644
--- a/asm/evolution_scene.s
+++ b/asm/evolution_scene.s
@@ -1,6 +1,6 @@
-	.include "constants/gba_constants.s"
-	.include "constants/species_constants.s"
-	.include "asm/macros.s"
+	.include "constants/gba_constants.inc"
+	.include "constants/species_constants.inc"
+	.include "asm/macros.inc"
 
 	.syntax unified
 
diff --git a/asm/field_camera.s b/asm/field_camera.s
index 20187f062..624e1cd14 100644
--- a/asm/field_camera.s
+++ b/asm/field_camera.s
@@ -1,6 +1,6 @@
-	.include "constants/gba_constants.s"
-	.include "constants/species_constants.s"
-	.include "asm/macros.s"
+	.include "constants/gba_constants.inc"
+	.include "constants/species_constants.inc"
+	.include "asm/macros.inc"
 
 	.syntax unified
 
diff --git a/asm/field_door.s b/asm/field_door.s
index 535874fbe..56a7254ca 100644
--- a/asm/field_door.s
+++ b/asm/field_door.s
@@ -1,6 +1,6 @@
-	.include "constants/gba_constants.s"
-	.include "constants/species_constants.s"
-	.include "asm/macros.s"
+	.include "constants/gba_constants.inc"
+	.include "constants/species_constants.inc"
+	.include "asm/macros.inc"
 
 	.syntax unified
 
diff --git a/asm/field_effect.s b/asm/field_effect.s
index f7240cb38..6ec6d639b 100644
--- a/asm/field_effect.s
+++ b/asm/field_effect.s
@@ -1,6 +1,6 @@
-	.include "constants/gba_constants.s"
-	.include "constants/species_constants.s"
-	.include "asm/macros.s"
+	.include "constants/gba_constants.inc"
+	.include "constants/species_constants.inc"
+	.include "asm/macros.inc"
 
 	.syntax unified
 
diff --git a/asm/field_effect_helpers.s b/asm/field_effect_helpers.s
index 90766a99b..68a1b02c9 100644
--- a/asm/field_effect_helpers.s
+++ b/asm/field_effect_helpers.s
@@ -1,6 +1,6 @@
-	.include "constants/gba_constants.s"
-	.include "constants/species_constants.s"
-	.include "asm/macros.s"
+	.include "constants/gba_constants.inc"
+	.include "constants/species_constants.inc"
+	.include "asm/macros.inc"
 
 	.syntax unified
 
diff --git a/asm/field_ground_effect.s b/asm/field_ground_effect.s
index 0b7e8a983..c853d8c50 100644
--- a/asm/field_ground_effect.s
+++ b/asm/field_ground_effect.s
@@ -1,6 +1,6 @@
-	.include "constants/gba_constants.s"
-	.include "constants/species_constants.s"
-	.include "asm/macros.s"
+	.include "constants/gba_constants.inc"
+	.include "constants/species_constants.inc"
+	.include "asm/macros.inc"
 
 	.syntax unified
 
diff --git a/asm/field_map_obj.s b/asm/field_map_obj.s
index 58533b91e..b884252be 100644
--- a/asm/field_map_obj.s
+++ b/asm/field_map_obj.s
@@ -1,6 +1,6 @@
-	.include "constants/gba_constants.s"
-	.include "constants/species_constants.s"
-	.include "asm/macros.s"
+	.include "constants/gba_constants.inc"
+	.include "constants/species_constants.inc"
+	.include "asm/macros.inc"
 
 	.syntax unified
 
diff --git a/asm/field_player_avatar.s b/asm/field_player_avatar.s
index fc08732b0..3d4f8a008 100644
--- a/asm/field_player_avatar.s
+++ b/asm/field_player_avatar.s
@@ -1,6 +1,6 @@
-	.include "constants/gba_constants.s"
-	.include "constants/species_constants.s"
-	.include "asm/macros.s"
+	.include "constants/gba_constants.inc"
+	.include "constants/species_constants.inc"
+	.include "asm/macros.inc"
 
 	.syntax unified
 
diff --git a/asm/field_poison.s b/asm/field_poison.s
index f51c18cfe..82209060e 100644
--- a/asm/field_poison.s
+++ b/asm/field_poison.s
@@ -1,6 +1,6 @@
-	.include "constants/gba_constants.s"
-	.include "constants/species_constants.s"
-	.include "asm/macros.s"
+	.include "constants/gba_constants.inc"
+	.include "constants/species_constants.inc"
+	.include "asm/macros.inc"
 
 	.syntax unified
 
diff --git a/asm/fieldmap.s b/asm/fieldmap.s
index d92bc82a2..5d914c422 100644
--- a/asm/fieldmap.s
+++ b/asm/fieldmap.s
@@ -1,5 +1,5 @@
-	.include "constants/gba_constants.s"
-	.include "asm/macros.s"
+	.include "constants/gba_constants.inc"
+	.include "asm/macros.inc"
 
 	.syntax unified
 
diff --git a/asm/fldeff_80C5CD4.s b/asm/fldeff_80C5CD4.s
index 1e62f5516..585718434 100644
--- a/asm/fldeff_80C5CD4.s
+++ b/asm/fldeff_80C5CD4.s
@@ -1,6 +1,6 @@
-	.include "constants/gba_constants.s"
-	.include "constants/species_constants.s"
-	.include "asm/macros.s"
+	.include "constants/gba_constants.inc"
+	.include "constants/species_constants.inc"
+	.include "asm/macros.inc"
 
 	.syntax unified
 
diff --git a/asm/fldeff_strength.s b/asm/fldeff_strength.s
index 3e811cd88..e595a5fc9 100644
--- a/asm/fldeff_strength.s
+++ b/asm/fldeff_strength.s
@@ -1,6 +1,6 @@
-	.include "constants/gba_constants.s"
-	.include "constants/species_constants.s"
-	.include "asm/macros.s"
+	.include "constants/gba_constants.inc"
+	.include "constants/species_constants.inc"
+	.include "asm/macros.inc"
 
 	.syntax unified
 
diff --git a/asm/heal_location.s b/asm/heal_location.s
index 6e8181b45..bc156678f 100644
--- a/asm/heal_location.s
+++ b/asm/heal_location.s
@@ -1,6 +1,6 @@
-	.include "constants/gba_constants.s"
-	.include "constants/species_constants.s"
-	.include "asm/macros.s"
+	.include "constants/gba_constants.inc"
+	.include "constants/species_constants.inc"
+	.include "asm/macros.inc"
 
 	.syntax unified
 
diff --git a/asm/item.s b/asm/item.s
index 7616abe97..b86eab8e6 100644
--- a/asm/item.s
+++ b/asm/item.s
@@ -1,6 +1,6 @@
-	.include "constants/gba_constants.s"
-	.include "constants/species_constants.s"
-	.include "asm/macros.s"
+	.include "constants/gba_constants.inc"
+	.include "constants/species_constants.inc"
+	.include "asm/macros.inc"
 
 	.syntax unified
 
diff --git a/asm/item_menu.s b/asm/item_menu.s
index d35feb54f..04e6e04ec 100644
--- a/asm/item_menu.s
+++ b/asm/item_menu.s
@@ -1,6 +1,6 @@
-	.include "constants/gba_constants.s"
-	.include "constants/species_constants.s"
-	.include "asm/macros.s"
+	.include "constants/gba_constants.inc"
+	.include "constants/species_constants.inc"
+	.include "asm/macros.inc"
 
 	.syntax unified
 
diff --git a/asm/item_use.s b/asm/item_use.s
index 3b2e27b46..dcb8a68dc 100644
--- a/asm/item_use.s
+++ b/asm/item_use.s
@@ -1,6 +1,6 @@
-	.include "constants/gba_constants.s"
-	.include "constants/species_constants.s"
-	.include "asm/macros.s"
+	.include "constants/gba_constants.inc"
+	.include "constants/species_constants.inc"
+	.include "asm/macros.inc"
 
 	.syntax unified
 
diff --git a/asm/landmark.s b/asm/landmark.s
index 05f509dfe..9e74feadd 100644
--- a/asm/landmark.s
+++ b/asm/landmark.s
@@ -1,6 +1,6 @@
-	.include "constants/gba_constants.s"
-	.include "constants/species_constants.s"
-	.include "asm/macros.s"
+	.include "constants/gba_constants.inc"
+	.include "constants/species_constants.inc"
+	.include "asm/macros.inc"
 
 	.syntax unified
 
diff --git a/asm/libagbsyscall.s b/asm/libagbsyscall.s
index bdb642327..3b59592b6 100644
--- a/asm/libagbsyscall.s
+++ b/asm/libagbsyscall.s
@@ -1,4 +1,4 @@
-	.include "asm/macros.s"
+	.include "asm/macros.inc"
 
 	.syntax unified
 
diff --git a/asm/libgcnmultiboot.s b/asm/libgcnmultiboot.s
index 3dd4fe8ab..87003abbc 100644
--- a/asm/libgcnmultiboot.s
+++ b/asm/libgcnmultiboot.s
@@ -1,8 +1,8 @@
 @ This library can be used to download and execute a multi-boot image from
 @ a GameCube using the JOY Bus protocol over the link cable.
 
-	.include "asm/macros.s"
-	.include "constants/constants.s"
+	.include "asm/macros.inc"
+	.include "constants/constants.inc"
 
 	.equiv GCMB_STRUCT_BASE_DEST_PTR,       0x20
 	.equiv GCMB_STRUCT_CUR_DEST_PTR,        0x24
diff --git a/asm/load_save.s b/asm/load_save.s
index 66fa16959..09a9ea969 100644
--- a/asm/load_save.s
+++ b/asm/load_save.s
@@ -1,6 +1,6 @@
-	.include "constants/gba_constants.s"
-	.include "constants/species_constants.s"
-	.include "asm/macros.s"
+	.include "constants/gba_constants.inc"
+	.include "constants/species_constants.inc"
+	.include "asm/macros.inc"
 
 	.syntax unified
 
diff --git a/asm/m4a_1.s b/asm/m4a_1.s
index 3f449c9fe..d9af09f05 100644
--- a/asm/m4a_1.s
+++ b/asm/m4a_1.s
@@ -1,6 +1,6 @@
-	.include "asm/macros.s"
-	.include "constants/gba_constants.s"
-	.include "constants/m4a_constants.s"
+	.include "asm/macros.inc"
+	.include "constants/gba_constants.inc"
+	.include "constants/m4a_constants.inc"
 
 	.syntax unified
 
diff --git a/asm/m4a_3.s b/asm/m4a_3.s
index 68cd8803a..a842ae925 100644
--- a/asm/m4a_3.s
+++ b/asm/m4a_3.s
@@ -1,6 +1,6 @@
-	.include "asm/macros.s"
-	.include "constants/gba_constants.s"
-	.include "constants/m4a_constants.s"
+	.include "asm/macros.inc"
+	.include "constants/gba_constants.inc"
+	.include "constants/m4a_constants.inc"
 
 	.syntax unified
 
diff --git a/asm/macros.s b/asm/macros.inc
index 42c35026e..6d8657892 100644
--- a/asm/macros.s
+++ b/asm/macros.inc
@@ -1,9 +1,9 @@
-	.include "asm/macros/asm.s"
-	.include "asm/macros/function.s"
-	.include "asm/macros/movement.s"
-	.include "asm/macros/pokemon_data.s"
-	.include "asm/macros/ec.s"
-	.include "asm/macros/map.s"
+	.include "asm/macros/asm.inc"
+	.include "asm/macros/function.inc"
+	.include "asm/macros/movement.inc"
+	.include "asm/macros/pokemon_data.inc"
+	.include "asm/macros/ec.inc"
+	.include "asm/macros/map.inc"
 
 	.macro region_map_location x, y, width, height, name
 	.byte \x
diff --git a/asm/macros/asm.s b/asm/macros/asm.inc
index 4ac003fab..4ac003fab 100644
--- a/asm/macros/asm.s
+++ b/asm/macros/asm.inc
diff --git a/asm/macros/battle_ai_script.s b/asm/macros/battle_ai_script.inc
index 38a44ddfb..38a44ddfb 100644
--- a/asm/macros/battle_ai_script.s
+++ b/asm/macros/battle_ai_script.inc
diff --git a/asm/macros/battle_anim.s b/asm/macros/battle_anim.inc
index fc2777326..fc2777326 100644
--- a/asm/macros/battle_anim.s
+++ b/asm/macros/battle_anim.inc
diff --git a/asm/macros/battle_script.s b/asm/macros/battle_script.inc
index 5dd1d5a1a..5dd1d5a1a 100644
--- a/asm/macros/battle_script.s
+++ b/asm/macros/battle_script.inc
diff --git a/asm/macros/contest_ai_script.s b/asm/macros/contest_ai_script.inc
index 05d70e351..05d70e351 100755..100644
--- a/asm/macros/contest_ai_script.s
+++ b/asm/macros/contest_ai_script.inc
diff --git a/asm/macros/ec.s b/asm/macros/ec.inc
index 44c974e53..44c974e53 100644
--- a/asm/macros/ec.s
+++ b/asm/macros/ec.inc
diff --git a/asm/macros/event.s b/asm/macros/event.inc
index e3caa0c4f..e3caa0c4f 100644
--- a/asm/macros/event.s
+++ b/asm/macros/event.inc
diff --git a/asm/macros/field_effect_script.s b/asm/macros/field_effect_script.inc
index d5895b0ef..d5895b0ef 100644
--- a/asm/macros/field_effect_script.s
+++ b/asm/macros/field_effect_script.inc
diff --git a/asm/macros/function.s b/asm/macros/function.inc
index 67fb373a8..67fb373a8 100644
--- a/asm/macros/function.s
+++ b/asm/macros/function.inc
diff --git a/asm/macros/m4a.s b/asm/macros/m4a.inc
index 6c5abc09b..6c5abc09b 100644
--- a/asm/macros/m4a.s
+++ b/asm/macros/m4a.inc
diff --git a/asm/macros/map.s b/asm/macros/map.inc
index 41844b5cd..41844b5cd 100644
--- a/asm/macros/map.s
+++ b/asm/macros/map.inc
diff --git a/asm/macros/movement.s b/asm/macros/movement.inc
index 674ce7169..674ce7169 100644
--- a/asm/macros/movement.s
+++ b/asm/macros/movement.inc
diff --git a/asm/macros/music_voice.s b/asm/macros/music_voice.inc
index b7a9e7f8d..b7a9e7f8d 100644
--- a/asm/macros/music_voice.s
+++ b/asm/macros/music_voice.inc
diff --git a/asm/macros/pokemon_data.s b/asm/macros/pokemon_data.inc
index b0a5f22e3..b0a5f22e3 100644
--- a/asm/macros/pokemon_data.s
+++ b/asm/macros/pokemon_data.inc
diff --git a/asm/mail.s b/asm/mail.s
index 5a3efbf69..a08571018 100644
--- a/asm/mail.s
+++ b/asm/mail.s
@@ -1,6 +1,6 @@
-	.include "constants/gba_constants.s"
-	.include "constants/species_constants.s"
-	.include "asm/macros.s"
+	.include "constants/gba_constants.inc"
+	.include "constants/species_constants.inc"
+	.include "asm/macros.inc"
 
 	.syntax unified
 
diff --git a/asm/matuda_debug_menu.s b/asm/matuda_debug_menu.s
index fe76a8eb6..b6026ddf9 100644
--- a/asm/matuda_debug_menu.s
+++ b/asm/matuda_debug_menu.s
@@ -1,6 +1,6 @@
-	.include "constants/gba_constants.s"
-	.include "constants/species_constants.s"
-	.include "asm/macros.s"
+	.include "constants/gba_constants.inc"
+	.include "constants/species_constants.inc"
+	.include "asm/macros.inc"
 
 	.syntax unified
 
diff --git a/asm/mauville_old_man.s b/asm/mauville_old_man.s
index afd35a3f8..4cd52107c 100644
--- a/asm/mauville_old_man.s
+++ b/asm/mauville_old_man.s
@@ -1,6 +1,6 @@
-	.include "constants/gba_constants.s"
-	.include "constants/species_constants.s"
-	.include "asm/macros.s"
+	.include "constants/gba_constants.inc"
+	.include "constants/species_constants.inc"
+	.include "asm/macros.inc"
 
 	.syntax unified
 
diff --git a/asm/menu_cursor.s b/asm/menu_cursor.s
index 8fb1c969c..3ae01310d 100644
--- a/asm/menu_cursor.s
+++ b/asm/menu_cursor.s
@@ -1,6 +1,6 @@
-	.include "constants/gba_constants.s"
-	.include "constants/species_constants.s"
-	.include "asm/macros.s"
+	.include "constants/gba_constants.inc"
+	.include "constants/species_constants.inc"
+	.include "asm/macros.inc"
 
 	.syntax unified
 
diff --git a/asm/menu_helpers.s b/asm/menu_helpers.s
index 28f8a2959..eafb7788b 100644
--- a/asm/menu_helpers.s
+++ b/asm/menu_helpers.s
@@ -1,6 +1,6 @@
-	.include "constants/gba_constants.s"
-	.include "constants/species_constants.s"
-	.include "asm/macros.s"
+	.include "constants/gba_constants.inc"
+	.include "constants/species_constants.inc"
+	.include "asm/macros.inc"
 
 	.syntax unified
 
diff --git a/asm/metatile_behavior.s b/asm/metatile_behavior.s
index 2607b8b3b..0217bf6c0 100644
--- a/asm/metatile_behavior.s
+++ b/asm/metatile_behavior.s
@@ -1,6 +1,6 @@
-	.include "constants/gba_constants.s"
-	.include "constants/species_constants.s"
-	.include "asm/macros.s"
+	.include "constants/gba_constants.inc"
+	.include "constants/species_constants.inc"
+	.include "asm/macros.inc"
 
 	.syntax unified
 
diff --git a/asm/mon_markings.s b/asm/mon_markings.s
index 762135a92..6d5322b91 100644
--- a/asm/mon_markings.s
+++ b/asm/mon_markings.s
@@ -1,6 +1,6 @@
-	.include "constants/gba_constants.s"
-	.include "constants/species_constants.s"
-	.include "asm/macros.s"
+	.include "constants/gba_constants.inc"
+	.include "constants/species_constants.inc"
+	.include "asm/macros.inc"
 
 	.syntax unified
 
diff --git a/asm/money.s b/asm/money.s
index c194bf238..72e5cda54 100644
--- a/asm/money.s
+++ b/asm/money.s
@@ -1,6 +1,6 @@
-	.include "constants/gba_constants.s"
-	.include "constants/species_constants.s"
-	.include "asm/macros.s"
+	.include "constants/gba_constants.inc"
+	.include "constants/species_constants.inc"
+	.include "asm/macros.inc"
 
 	.syntax unified
 
diff --git a/asm/mori_debug_menu.s b/asm/mori_debug_menu.s
index 37374b9ea..b61ad2f54 100644
--- a/asm/mori_debug_menu.s
+++ b/asm/mori_debug_menu.s
@@ -1,6 +1,6 @@
-	.include "constants/gba_constants.s"
-	.include "constants/species_constants.s"
-	.include "asm/macros.s"
+	.include "constants/gba_constants.inc"
+	.include "constants/species_constants.inc"
+	.include "asm/macros.inc"
 
 	.syntax unified
 
diff --git a/asm/mystery_event_menu.s b/asm/mystery_event_menu.s
index ae4a03f93..1bb8d76bc 100644
--- a/asm/mystery_event_menu.s
+++ b/asm/mystery_event_menu.s
@@ -1,6 +1,6 @@
-	.include "constants/gba_constants.s"
-	.include "constants/species_constants.s"
-	.include "asm/macros.s"
+	.include "constants/gba_constants.inc"
+	.include "constants/species_constants.inc"
+	.include "asm/macros.inc"
 
 	.syntax unified
 
diff --git a/asm/mystery_event_script.s b/asm/mystery_event_script.s
index 057517bb2..5107e301d 100644
--- a/asm/mystery_event_script.s
+++ b/asm/mystery_event_script.s
@@ -1,6 +1,6 @@
-	.include "constants/gba_constants.s"
-	.include "constants/species_constants.s"
-	.include "asm/macros.s"
+	.include "constants/gba_constants.inc"
+	.include "constants/species_constants.inc"
+	.include "asm/macros.inc"
 
 	.syntax unified
 
diff --git a/asm/naming_screen.s b/asm/naming_screen.s
index e8ea18e34..121b44790 100644
--- a/asm/naming_screen.s
+++ b/asm/naming_screen.s
@@ -1,6 +1,6 @@
-	.include "constants/gba_constants.s"
-	.include "constants/species_constants.s"
-	.include "asm/macros.s"
+	.include "constants/gba_constants.inc"
+	.include "constants/species_constants.inc"
+	.include "asm/macros.inc"
 
 	.syntax unified
 
diff --git a/asm/party_menu.s b/asm/party_menu.s
index b63af2e13..232dc0019 100644
--- a/asm/party_menu.s
+++ b/asm/party_menu.s
@@ -1,6 +1,6 @@
-	.include "constants/gba_constants.s"
-	.include "constants/species_constants.s"
-	.include "asm/macros.s"
+	.include "constants/gba_constants.inc"
+	.include "constants/species_constants.inc"
+	.include "asm/macros.inc"
 
 	.syntax unified
 
diff --git a/asm/player_pc.s b/asm/player_pc.s
index 83b706fe3..82d804bb3 100644
--- a/asm/player_pc.s
+++ b/asm/player_pc.s
@@ -1,6 +1,6 @@
-	.include "constants/gba_constants.s"
-	.include "constants/species_constants.s"
-	.include "asm/macros.s"
+	.include "constants/gba_constants.inc"
+	.include "constants/species_constants.inc"
+	.include "asm/macros.inc"
 
 	.syntax unified
 
diff --git a/asm/pokedex.s b/asm/pokedex.s
index 0c9f97432..95a692106 100644
--- a/asm/pokedex.s
+++ b/asm/pokedex.s
@@ -1,6 +1,6 @@
-	.include "constants/gba_constants.s"
-	.include "constants/species_constants.s"
-	.include "asm/macros.s"
+	.include "constants/gba_constants.inc"
+	.include "constants/species_constants.inc"
+	.include "asm/macros.inc"
 
 	.syntax unified
 
diff --git a/asm/pokedex_area_screen.s b/asm/pokedex_area_screen.s
index 7aba42bfd..ba9829dfe 100644
--- a/asm/pokedex_area_screen.s
+++ b/asm/pokedex_area_screen.s
@@ -1,6 +1,6 @@
-	.include "constants/gba_constants.s"
-	.include "constants/species_constants.s"
-	.include "asm/macros.s"
+	.include "constants/gba_constants.inc"
+	.include "constants/species_constants.inc"
+	.include "asm/macros.inc"
 
 	.syntax unified
 
diff --git a/asm/pokedex_cry_screen.s b/asm/pokedex_cry_screen.s
index 42c21c16c..bded77228 100644
--- a/asm/pokedex_cry_screen.s
+++ b/asm/pokedex_cry_screen.s
@@ -1,6 +1,6 @@
-	.include "constants/gba_constants.s"
-	.include "constants/species_constants.s"
-	.include "asm/macros.s"
+	.include "constants/gba_constants.inc"
+	.include "constants/species_constants.inc"
+	.include "asm/macros.inc"
 
 	.syntax unified
 
diff --git a/asm/pokenav.s b/asm/pokenav.s
index c324201d5..968386bd1 100644
--- a/asm/pokenav.s
+++ b/asm/pokenav.s
@@ -1,6 +1,6 @@
-	.include "constants/gba_constants.s"
-	.include "constants/species_constants.s"
-	.include "asm/macros.s"
+	.include "constants/gba_constants.inc"
+	.include "constants/species_constants.inc"
+	.include "asm/macros.inc"
 
 	.syntax unified
 
diff --git a/asm/porthole.s b/asm/porthole.s
index 6c880748d..5936433e6 100644
--- a/asm/porthole.s
+++ b/asm/porthole.s
@@ -1,6 +1,6 @@
-	.include "constants/gba_constants.s"
-	.include "constants/species_constants.s"
-	.include "asm/macros.s"
+	.include "constants/gba_constants.inc"
+	.include "constants/species_constants.inc"
+	.include "asm/macros.inc"
 
 	.syntax unified
 
diff --git a/asm/record_mixing.s b/asm/record_mixing.s
index 2df37cb74..d8d0e26c0 100644
--- a/asm/record_mixing.s
+++ b/asm/record_mixing.s
@@ -1,6 +1,6 @@
-	.include "constants/gba_constants.s"
-	.include "constants/species_constants.s"
-	.include "asm/macros.s"
+	.include "constants/gba_constants.inc"
+	.include "constants/species_constants.inc"
+	.include "asm/macros.inc"
 
 	.syntax unified
 
diff --git a/asm/region_map.s b/asm/region_map.s
index 373b20d97..61449ba53 100644
--- a/asm/region_map.s
+++ b/asm/region_map.s
@@ -1,6 +1,6 @@
-	.include "constants/gba_constants.s"
-	.include "constants/species_constants.s"
-	.include "asm/macros.s"
+	.include "constants/gba_constants.inc"
+	.include "constants/species_constants.inc"
+	.include "asm/macros.inc"
 
 	.syntax unified
 
diff --git a/asm/rom3.s b/asm/rom3.s
index 736b7b6ad..257163aa2 100644
--- a/asm/rom3.s
+++ b/asm/rom3.s
@@ -1,6 +1,6 @@
-	.include "constants/gba_constants.s"
-	.include "constants/species_constants.s"
-	.include "asm/macros.s"
+	.include "constants/gba_constants.inc"
+	.include "constants/species_constants.inc"
+	.include "asm/macros.inc"
 
 	.syntax unified
 
diff --git a/asm/rom5.s b/asm/rom5.s
index a9d49a60e..4b0947a5d 100644
--- a/asm/rom5.s
+++ b/asm/rom5.s
@@ -1,6 +1,6 @@
-	.include "constants/gba_constants.s"
-	.include "constants/species_constants.s"
-	.include "asm/macros.s"
+	.include "constants/gba_constants.inc"
+	.include "constants/species_constants.inc"
+	.include "asm/macros.inc"
 
 	.syntax unified
 
diff --git a/asm/rom6.s b/asm/rom6.s
index 898686d41..fcbb69f76 100644
--- a/asm/rom6.s
+++ b/asm/rom6.s
@@ -1,6 +1,6 @@
-	.include "constants/gba_constants.s"
-	.include "constants/species_constants.s"
-	.include "asm/macros.s"
+	.include "constants/gba_constants.inc"
+	.include "constants/species_constants.inc"
+	.include "asm/macros.inc"
 
 	.syntax unified
 
diff --git a/asm/rom_800D42C.s b/asm/rom_800D42C.s
index 65b0279ed..85b369486 100644
--- a/asm/rom_800D42C.s
+++ b/asm/rom_800D42C.s
@@ -1,6 +1,6 @@
-	.include "constants/gba_constants.s"
-	.include "constants/species_constants.s"
-	.include "asm/macros.s"
+	.include "constants/gba_constants.inc"
+	.include "constants/species_constants.inc"
+	.include "asm/macros.inc"
 
 	.syntax unified
 
diff --git a/asm/rom_803D1FC.s b/asm/rom_803D1FC.s
index 91ab01a6a..e011d3c43 100644
--- a/asm/rom_803D1FC.s
+++ b/asm/rom_803D1FC.s
@@ -1,6 +1,6 @@
-	.include "constants/gba_constants.s"
-	.include "constants/species_constants.s"
-	.include "asm/macros.s"
+	.include "constants/gba_constants.inc"
+	.include "constants/species_constants.inc"
+	.include "asm/macros.inc"
 
 	.syntax unified
 
diff --git a/asm/rom_8040EB4.s b/asm/rom_8040EB4.s
index e5ba5758d..cf7780f78 100644
--- a/asm/rom_8040EB4.s
+++ b/asm/rom_8040EB4.s
@@ -1,5 +1,5 @@
-	.include "constants/gba_constants.s"
-	.include "asm/macros.s"
+	.include "constants/gba_constants.inc"
+	.include "asm/macros.inc"
 
 	.syntax unified
 
diff --git a/asm/rom_804373C.s b/asm/rom_804373C.s
index bae258fee..8690ed355 100644
--- a/asm/rom_804373C.s
+++ b/asm/rom_804373C.s
@@ -1,6 +1,6 @@
-	.include "constants/gba_constants.s"
-	.include "constants/species_constants.s"
-	.include "asm/macros.s"
+	.include "constants/gba_constants.inc"
+	.include "constants/species_constants.inc"
+	.include "asm/macros.inc"
 
 	.syntax unified
 
diff --git a/asm/rom_8065394.s b/asm/rom_8065394.s
index 37e33d029..7746aa5fd 100644
--- a/asm/rom_8065394.s
+++ b/asm/rom_8065394.s
@@ -1,5 +1,5 @@
-	.include "constants/gba_constants.s"
-	.include "asm/macros.s"
+	.include "constants/gba_constants.inc"
+	.include "asm/macros.inc"
 
 	.syntax unified
 
diff --git a/asm/rom_806936C.s b/asm/rom_806936C.s
index 117143f19..9c1a0f441 100644
--- a/asm/rom_806936C.s
+++ b/asm/rom_806936C.s
@@ -1,6 +1,6 @@
-	.include "constants/gba_constants.s"
-	.include "constants/species_constants.s"
-	.include "asm/macros.s"
+	.include "constants/gba_constants.inc"
+	.include "constants/species_constants.inc"
+	.include "asm/macros.inc"
 
 	.syntax unified
 
diff --git a/asm/rom_806D7F8.s b/asm/rom_806D7F8.s
index 6b8ae47cb..609e0a362 100644
--- a/asm/rom_806D7F8.s
+++ b/asm/rom_806D7F8.s
@@ -1,6 +1,6 @@
-	.include "constants/gba_constants.s"
-	.include "constants/species_constants.s"
-	.include "asm/macros.s"
+	.include "constants/gba_constants.inc"
+	.include "constants/species_constants.inc"
+	.include "asm/macros.inc"
 
 	.syntax unified
 
diff --git a/asm/rom_8074BAC.s b/asm/rom_8074BAC.s
index e3b0fe07a..27f89abde 100644
--- a/asm/rom_8074BAC.s
+++ b/asm/rom_8074BAC.s
@@ -1,6 +1,6 @@
-	.include "constants/gba_constants.s"
-	.include "constants/species_constants.s"
-	.include "asm/macros.s"
+	.include "constants/gba_constants.inc"
+	.include "constants/species_constants.inc"
+	.include "asm/macros.inc"
 
 	.syntax unified
 
diff --git a/asm/rom_8080874.s b/asm/rom_8080874.s
index 309bd3ba9..f672bd3cb 100644
--- a/asm/rom_8080874.s
+++ b/asm/rom_8080874.s
@@ -1,6 +1,6 @@
-	.include "constants/gba_constants.s"
-	.include "constants/species_constants.s"
-	.include "asm/macros.s"
+	.include "constants/gba_constants.inc"
+	.include "constants/species_constants.inc"
+	.include "asm/macros.inc"
 
 	.syntax unified
 
diff --git a/asm/rom_80859BC.s b/asm/rom_80859BC.s
index 6685b3084..8d199442c 100644
--- a/asm/rom_80859BC.s
+++ b/asm/rom_80859BC.s
@@ -1,6 +1,6 @@
-	.include "constants/gba_constants.s"
-	.include "constants/species_constants.s"
-	.include "asm/macros.s"
+	.include "constants/gba_constants.inc"
+	.include "constants/species_constants.inc"
+	.include "asm/macros.inc"
 
 	.syntax unified
 
diff --git a/asm/rom_8094928.s b/asm/rom_8094928.s
index fab0f2531..6b6f9e4e5 100644
--- a/asm/rom_8094928.s
+++ b/asm/rom_8094928.s
@@ -1,6 +1,6 @@
-	.include "constants/gba_constants.s"
-	.include "constants/species_constants.s"
-	.include "asm/macros.s"
+	.include "constants/gba_constants.inc"
+	.include "constants/species_constants.inc"
+	.include "asm/macros.inc"
 
 	.syntax unified
 
diff --git a/asm/rom_81258BC.s b/asm/rom_81258BC.s
index 0c8e021ab..b13240a8e 100644
--- a/asm/rom_81258BC.s
+++ b/asm/rom_81258BC.s
@@ -1,6 +1,6 @@
-	.include "constants/gba_constants.s"
-	.include "constants/species_constants.s"
-	.include "asm/macros.s"
+	.include "constants/gba_constants.inc"
+	.include "constants/species_constants.inc"
+	.include "asm/macros.inc"
 
 	.syntax unified
 
diff --git a/asm/rom_813BA94.s b/asm/rom_813BA94.s
index 79a52f971..5c1f75667 100644
--- a/asm/rom_813BA94.s
+++ b/asm/rom_813BA94.s
@@ -1,6 +1,6 @@
-	.include "constants/gba_constants.s"
-	.include "constants/species_constants.s"
-	.include "asm/macros.s"
+	.include "constants/gba_constants.inc"
+	.include "constants/species_constants.inc"
+	.include "asm/macros.inc"
 
 	.syntax unified
 
diff --git a/asm/rom_81473B8.s b/asm/rom_81473B8.s
index 01af93d76..babd1d40d 100644
--- a/asm/rom_81473B8.s
+++ b/asm/rom_81473B8.s
@@ -1,6 +1,6 @@
-	.include "constants/gba_constants.s"
-	.include "constants/species_constants.s"
-	.include "asm/macros.s"
+	.include "constants/gba_constants.inc"
+	.include "constants/species_constants.inc"
+	.include "asm/macros.inc"
 
 	.syntax unified
 
diff --git a/asm/rom_8148B8C.s b/asm/rom_8148B8C.s
index 366ac74d7..6ed24195f 100644
--- a/asm/rom_8148B8C.s
+++ b/asm/rom_8148B8C.s
@@ -1,6 +1,6 @@
-	.include "constants/gba_constants.s"
-	.include "constants/species_constants.s"
-	.include "asm/macros.s"
+	.include "constants/gba_constants.inc"
+	.include "constants/species_constants.inc"
+	.include "asm/macros.inc"
 
 	.syntax unified
 
diff --git a/asm/rom_header.s b/asm/rom_header.inc
index a7348ad1f..a7348ad1f 100644
--- a/asm/rom_header.s
+++ b/asm/rom_header.inc
diff --git a/asm/rotating_gate.s b/asm/rotating_gate.s
index 3737d9ffc..9c7b3847b 100644
--- a/asm/rotating_gate.s
+++ b/asm/rotating_gate.s
@@ -1,6 +1,6 @@
-	.include "constants/gba_constants.s"
-	.include "constants/species_constants.s"
-	.include "asm/macros.s"
+	.include "constants/gba_constants.inc"
+	.include "constants/species_constants.inc"
+	.include "asm/macros.inc"
 
 	.syntax unified
 
diff --git a/asm/roulette.s b/asm/roulette.s
index b7b97558a..2551af009 100644
--- a/asm/roulette.s
+++ b/asm/roulette.s
@@ -1,6 +1,6 @@
-	.include "constants/gba_constants.s"
-	.include "constants/species_constants.s"
-	.include "asm/macros.s"
+	.include "constants/gba_constants.inc"
+	.include "constants/species_constants.inc"
+	.include "asm/macros.inc"
 
 	.syntax unified
 
diff --git a/asm/roulette_util.s b/asm/roulette_util.s
index 569a42712..191c9592f 100644
--- a/asm/roulette_util.s
+++ b/asm/roulette_util.s
@@ -1,6 +1,6 @@
-	.include "constants/gba_constants.s"
-	.include "constants/species_constants.s"
-	.include "asm/macros.s"
+	.include "constants/gba_constants.inc"
+	.include "constants/species_constants.inc"
+	.include "asm/macros.inc"
 
 	.syntax unified
 
diff --git a/asm/safari_zone.s b/asm/safari_zone.s
index 75fc532e3..6785c17af 100644
--- a/asm/safari_zone.s
+++ b/asm/safari_zone.s
@@ -1,6 +1,6 @@
-	.include "constants/gba_constants.s"
-	.include "constants/species_constants.s"
-	.include "asm/macros.s"
+	.include "constants/gba_constants.inc"
+	.include "constants/species_constants.inc"
+	.include "asm/macros.inc"
 
 	.syntax unified
 
diff --git a/asm/save_failed_screen.s b/asm/save_failed_screen.s
index 35e0cb359..a114bbea3 100644
--- a/asm/save_failed_screen.s
+++ b/asm/save_failed_screen.s
@@ -1,6 +1,6 @@
-	.include "constants/gba_constants.s"
-	.include "constants/species_constants.s"
-	.include "asm/macros.s"
+	.include "constants/gba_constants.inc"
+	.include "constants/species_constants.inc"
+	.include "asm/macros.inc"
 
 	.syntax unified
 
diff --git a/asm/script_menu.s b/asm/script_menu.s
index 6d6c68244..bd6180940 100644
--- a/asm/script_menu.s
+++ b/asm/script_menu.s
@@ -1,6 +1,6 @@
-	.include "constants/gba_constants.s"
-	.include "constants/species_constants.s"
-	.include "asm/macros.s"
+	.include "constants/gba_constants.inc"
+	.include "constants/species_constants.inc"
+	.include "asm/macros.inc"
 
 	.syntax unified
 
diff --git a/asm/script_pokemon_util_80C4BF0.s b/asm/script_pokemon_util_80C4BF0.s
index 883adfe5d..ad598120c 100644
--- a/asm/script_pokemon_util_80C4BF0.s
+++ b/asm/script_pokemon_util_80C4BF0.s
@@ -1,6 +1,6 @@
-	.include "constants/gba_constants.s"
-	.include "constants/species_constants.s"
-	.include "asm/macros.s"
+	.include "constants/gba_constants.inc"
+	.include "constants/species_constants.inc"
+	.include "asm/macros.inc"
 
 	.syntax unified
 
diff --git a/asm/script_pokemon_util_80F99CC.s b/asm/script_pokemon_util_80F99CC.s
index 24d690d1a..805fadadd 100644
--- a/asm/script_pokemon_util_80F99CC.s
+++ b/asm/script_pokemon_util_80F99CC.s
@@ -1,6 +1,6 @@
-	.include "constants/gba_constants.s"
-	.include "constants/species_constants.s"
-	.include "asm/macros.s"
+	.include "constants/gba_constants.inc"
+	.include "constants/species_constants.inc"
+	.include "asm/macros.inc"
 
 	.syntax unified
 
diff --git a/asm/secret_base.s b/asm/secret_base.s
index 9a41a2dd8..474d0d531 100644
--- a/asm/secret_base.s
+++ b/asm/secret_base.s
@@ -1,6 +1,6 @@
-	.include "constants/gba_constants.s"
-	.include "constants/species_constants.s"
-	.include "asm/macros.s"
+	.include "constants/gba_constants.inc"
+	.include "constants/species_constants.inc"
+	.include "asm/macros.inc"
 
 	.syntax unified
 
diff --git a/asm/shop.s b/asm/shop.s
index 760586c18..a87bb308c 100644
--- a/asm/shop.s
+++ b/asm/shop.s
@@ -1,6 +1,6 @@
-	.include "constants/gba_constants.s"
-	.include "constants/species_constants.s"
-	.include "asm/macros.s"
+	.include "constants/gba_constants.inc"
+	.include "constants/species_constants.inc"
+	.include "asm/macros.inc"
 
 	.syntax unified
 
diff --git a/asm/slot_machine.s b/asm/slot_machine.s
index e4c4e7220..ee176211f 100644
--- a/asm/slot_machine.s
+++ b/asm/slot_machine.s
@@ -1,6 +1,6 @@
-	.include "constants/gba_constants.s"
-	.include "constants/species_constants.s"
-	.include "asm/macros.s"
+	.include "constants/gba_constants.inc"
+	.include "constants/species_constants.inc"
+	.include "asm/macros.inc"
 
 	.syntax unified
 
diff --git a/asm/sound_check_menu.s b/asm/sound_check_menu.s
index 25a524258..1e072ee64 100644
--- a/asm/sound_check_menu.s
+++ b/asm/sound_check_menu.s
@@ -1,6 +1,6 @@
-	.include "constants/gba_constants.s"
-	.include "constants/species_constants.s"
-	.include "asm/macros.s"
+	.include "constants/gba_constants.inc"
+	.include "constants/species_constants.inc"
+	.include "asm/macros.inc"
 
 	.syntax unified
 
diff --git a/asm/tileset.s b/asm/tileset.s
index e64355432..d6bf2557a 100644
--- a/asm/tileset.s
+++ b/asm/tileset.s
@@ -1,5 +1,5 @@
-	.include "constants/gba_constants.s"
-	.include "asm/macros.s"
+	.include "constants/gba_constants.inc"
+	.include "asm/macros.inc"
 
 	.syntax unified
 
diff --git a/asm/title_screen.s b/asm/title_screen.s
index cf3960429..1e545020e 100644
--- a/asm/title_screen.s
+++ b/asm/title_screen.s
@@ -1,6 +1,6 @@
-	.include "constants/gba_constants.s"
-	.include "constants/species_constants.s"
-	.include "asm/macros.s"
+	.include "constants/gba_constants.inc"
+	.include "constants/species_constants.inc"
+	.include "asm/macros.inc"
 
 	.syntax unified
 
diff --git a/asm/trade.s b/asm/trade.s
index 7896289d7..d17fef24e 100644
--- a/asm/trade.s
+++ b/asm/trade.s
@@ -1,6 +1,6 @@
-	.include "constants/gba_constants.s"
-	.include "constants/species_constants.s"
-	.include "asm/macros.s"
+	.include "constants/gba_constants.inc"
+	.include "constants/species_constants.inc"
+	.include "asm/macros.inc"
 
 	.syntax unified
 
diff --git a/asm/trader.s b/asm/trader.s
index 3800588e3..f7fd5ccae 100644
--- a/asm/trader.s
+++ b/asm/trader.s
@@ -1,6 +1,6 @@
-	.include "constants/gba_constants.s"
-	.include "constants/species_constants.s"
-	.include "asm/macros.s"
+	.include "constants/gba_constants.inc"
+	.include "constants/species_constants.inc"
+	.include "asm/macros.inc"
 
 	.syntax unified
 
diff --git a/asm/trainer_card.s b/asm/trainer_card.s
index 927cb17c2..e46113132 100644
--- a/asm/trainer_card.s
+++ b/asm/trainer_card.s
@@ -1,6 +1,6 @@
-	.include "constants/gba_constants.s"
-	.include "constants/species_constants.s"
-	.include "asm/macros.s"
+	.include "constants/gba_constants.inc"
+	.include "constants/species_constants.inc"
+	.include "asm/macros.inc"
 
 	.syntax unified
 
diff --git a/asm/trainer_see.s b/asm/trainer_see.s
index 98a775bb6..18585ed3a 100644
--- a/asm/trainer_see.s
+++ b/asm/trainer_see.s
@@ -1,6 +1,6 @@
-	.include "constants/gba_constants.s"
-	.include "constants/species_constants.s"
-	.include "asm/macros.s"
+	.include "constants/gba_constants.inc"
+	.include "constants/species_constants.inc"
+	.include "asm/macros.inc"
 
 	.syntax unified
 
diff --git a/asm/truck_scene.s b/asm/truck_scene.s
index 399c3010b..10dacf5bb 100644
--- a/asm/truck_scene.s
+++ b/asm/truck_scene.s
@@ -1,6 +1,6 @@
-	.include "constants/gba_constants.s"
-	.include "constants/species_constants.s"
-	.include "asm/macros.s"
+	.include "constants/gba_constants.inc"
+	.include "constants/species_constants.inc"
+	.include "asm/macros.inc"
 
 	.syntax unified
 
diff --git a/asm/tv.s b/asm/tv.s
index 227710573..3e3c519ff 100644
--- a/asm/tv.s
+++ b/asm/tv.s
@@ -1,6 +1,6 @@
-	.include "constants/gba_constants.s"
-	.include "constants/species_constants.s"
-	.include "asm/macros.s"
+	.include "constants/gba_constants.inc"
+	.include "constants/species_constants.inc"
+	.include "asm/macros.inc"
 
 	.syntax unified
 
diff --git a/asm/unused_8124F94.s b/asm/unused_8124F94.s
index 56b90ca23..335cf4453 100644
--- a/asm/unused_8124F94.s
+++ b/asm/unused_8124F94.s
@@ -1,6 +1,6 @@
-	.include "constants/gba_constants.s"
-	.include "constants/species_constants.s"
-	.include "asm/macros.s"
+	.include "constants/gba_constants.inc"
+	.include "constants/species_constants.inc"
+	.include "asm/macros.inc"
 
 	.syntax unified
 
diff --git a/asm/weather.s b/asm/weather.s
index f32813762..fbcc61b6f 100644
--- a/asm/weather.s
+++ b/asm/weather.s
@@ -1,6 +1,6 @@
-	.include "constants/gba_constants.s"
-	.include "constants/species_constants.s"
-	.include "asm/macros.s"
+	.include "constants/gba_constants.inc"
+	.include "constants/species_constants.inc"
+	.include "asm/macros.inc"
 
 	.syntax unified
 
diff --git a/constants/ability_constants.s b/constants/ability_constants.inc
index 8ccc872f7..8ccc872f7 100644
--- a/constants/ability_constants.s
+++ b/constants/ability_constants.inc
diff --git a/constants/battle.s b/constants/battle.inc
index c6094b15f..c6094b15f 100644
--- a/constants/battle.s
+++ b/constants/battle.inc
diff --git a/constants/battle_move_constants.s b/constants/battle_move_constants.inc
index a05da3db3..a05da3db3 100644
--- a/constants/battle_move_constants.s
+++ b/constants/battle_move_constants.inc
diff --git a/constants/battle_move_effects.s b/constants/battle_move_effects.inc
index bd801083b..bd801083b 100644
--- a/constants/battle_move_effects.s
+++ b/constants/battle_move_effects.inc
diff --git a/constants/battle_text.s b/constants/battle_text.inc
index f7025f68f..f7025f68f 100644
--- a/constants/battle_text.s
+++ b/constants/battle_text.inc
diff --git a/constants/battle_tower_constants.s b/constants/battle_tower_constants.inc
index 136b43bd7..136b43bd7 100644
--- a/constants/battle_tower_constants.s
+++ b/constants/battle_tower_constants.inc
diff --git a/constants/berry_constants.s b/constants/berry_constants.inc
index 2ecd7ac36..2ecd7ac36 100644
--- a/constants/berry_constants.s
+++ b/constants/berry_constants.inc
diff --git a/constants/constants.inc b/constants/constants.inc
new file mode 100644
index 000000000..de281bd93
--- /dev/null
+++ b/constants/constants.inc
@@ -0,0 +1,29 @@
+	.include "constants/gba_constants.inc"
+	.include "constants/misc_constants.inc"
+	.include "constants/species_constants.inc"
+	.include "constants/ability_constants.inc"
+	.include "constants/move_constants.inc"
+	.include "constants/item_constants.inc"
+	.include "constants/type_constants.inc"
+	.include "constants/contest_constants.inc"
+	.include "constants/pokemon_data_constants.inc"
+	.include "constants/item_data_constants.inc"
+	.include "constants/battle_move_constants.inc"
+	.include "constants/easy_chat_constants.inc"
+	.include "constants/trainer_constants.inc"
+	.include "constants/map_constants.inc"
+	.include "constants/berry_constants.inc"
+	.include "constants/map_object_constants.inc"
+	.include "constants/battle_tower_constants.inc"
+	.include "constants/opponent_constants.inc"
+	.include "constants/decorations.inc"
+	.include "constants/variables.inc"
+	.include "constants/songs.inc"
+	.include "constants/version.inc"
+	.include "constants/region_map_sections.inc"
+	.include "constants/hold_effects.inc"
+	.include "constants/battle.inc"
+	.include "constants/battle_text.inc"
+	.include "constants/battle_move_effects.inc"
+	.include "constants/contest_move_effects.inc"
+	.include "constants/game_stat.inc"
diff --git a/constants/constants.s b/constants/constants.s
deleted file mode 100644
index daca14090..000000000
--- a/constants/constants.s
+++ /dev/null
@@ -1,29 +0,0 @@
-	.include "constants/gba_constants.s"
-	.include "constants/misc_constants.s"
-	.include "constants/species_constants.s"
-	.include "constants/ability_constants.s"
-	.include "constants/move_constants.s"
-	.include "constants/item_constants.s"
-	.include "constants/type_constants.s"
-	.include "constants/contest_constants.s"
-	.include "constants/pokemon_data_constants.s"
-	.include "constants/item_data_constants.s"
-	.include "constants/battle_move_constants.s"
-	.include "constants/easy_chat_constants.s"
-	.include "constants/trainer_constants.s"
-	.include "constants/map_constants.s"
-	.include "constants/berry_constants.s"
-	.include "constants/map_object_constants.s"
-	.include "constants/battle_tower_constants.s"
-	.include "constants/opponent_constants.s"
-	.include "constants/decorations.s"
-	.include "constants/variables.s"
-	.include "constants/songs.s"
-	.include "constants/version.s"
-	.include "constants/region_map_sections.s"
-	.include "constants/hold_effects.s"
-	.include "constants/battle.s"
-	.include "constants/battle_text.s"
-	.include "constants/battle_move_effects.s"
-	.include "constants/contest_move_effects.s"
-	.include "constants/game_stat.s"
diff --git a/constants/contest_constants.s b/constants/contest_constants.inc
index e971764d6..e971764d6 100644
--- a/constants/contest_constants.s
+++ b/constants/contest_constants.inc
diff --git a/constants/contest_move_effects.s b/constants/contest_move_effects.inc
index b19e05004..b19e05004 100644
--- a/constants/contest_move_effects.s
+++ b/constants/contest_move_effects.inc
diff --git a/constants/decorations.s b/constants/decorations.inc
index 482799f9e..482799f9e 100644
--- a/constants/decorations.s
+++ b/constants/decorations.inc
diff --git a/constants/easy_chat_constants.s b/constants/easy_chat_constants.inc
index 69639769d..69639769d 100644
--- a/constants/easy_chat_constants.s
+++ b/constants/easy_chat_constants.inc
diff --git a/constants/game_stat.s b/constants/game_stat.inc
index ff8b2df00..ff8b2df00 100644
--- a/constants/game_stat.s
+++ b/constants/game_stat.inc
diff --git a/constants/gba_constants.s b/constants/gba_constants.inc
index 9d59c8fcd..9d59c8fcd 100644
--- a/constants/gba_constants.s
+++ b/constants/gba_constants.inc
diff --git a/constants/hold_effects.s b/constants/hold_effects.inc
index 349a195bd..349a195bd 100644
--- a/constants/hold_effects.s
+++ b/constants/hold_effects.inc
diff --git a/constants/item_constants.s b/constants/item_constants.inc
index 934ebd798..934ebd798 100644
--- a/constants/item_constants.s
+++ b/constants/item_constants.inc
diff --git a/constants/item_data_constants.s b/constants/item_data_constants.inc
index 07ceb6e3b..07ceb6e3b 100644
--- a/constants/item_data_constants.s
+++ b/constants/item_data_constants.inc
diff --git a/constants/m4a_constants.s b/constants/m4a_constants.inc
index 62ca5bb55..62ca5bb55 100644
--- a/constants/m4a_constants.s
+++ b/constants/m4a_constants.inc
diff --git a/constants/map_constants.s b/constants/map_constants.inc
index d7a8a323e..d7a8a323e 100644
--- a/constants/map_constants.s
+++ b/constants/map_constants.inc
diff --git a/constants/map_object_constants.s b/constants/map_object_constants.inc
index e0843914f..e0843914f 100644
--- a/constants/map_object_constants.s
+++ b/constants/map_object_constants.inc
diff --git a/constants/misc_constants.s b/constants/misc_constants.inc
index 64f671e8f..64f671e8f 100644
--- a/constants/misc_constants.s
+++ b/constants/misc_constants.inc
diff --git a/constants/move_constants.s b/constants/move_constants.inc
index b6c8edf98..b6c8edf98 100644
--- a/constants/move_constants.s
+++ b/constants/move_constants.inc
diff --git a/constants/opponent_constants.s b/constants/opponent_constants.inc
index 6782d3151..6782d3151 100644
--- a/constants/opponent_constants.s
+++ b/constants/opponent_constants.inc
diff --git a/constants/pokemon_data_constants.s b/constants/pokemon_data_constants.inc
index cf5d4df41..cf5d4df41 100644
--- a/constants/pokemon_data_constants.s
+++ b/constants/pokemon_data_constants.inc
diff --git a/constants/region_map_sections.s b/constants/region_map_sections.inc
index 25f1b6ee1..25f1b6ee1 100644
--- a/constants/region_map_sections.s
+++ b/constants/region_map_sections.inc
diff --git a/constants/songs.s b/constants/songs.inc
index a89376983..a89376983 100644
--- a/constants/songs.s
+++ b/constants/songs.inc
diff --git a/constants/species_constants.s b/constants/species_constants.inc
index 8f164a1d9..8f164a1d9 100644
--- a/constants/species_constants.s
+++ b/constants/species_constants.inc
diff --git a/constants/trainer_constants.s b/constants/trainer_constants.inc
index 48ed3036e..48ed3036e 100644
--- a/constants/trainer_constants.s
+++ b/constants/trainer_constants.inc
diff --git a/constants/type_constants.s b/constants/type_constants.inc
index c6611bd8a..c6611bd8a 100644
--- a/constants/type_constants.s
+++ b/constants/type_constants.inc
diff --git a/constants/variables.s b/constants/variables.inc
index b92ca5975..b92ca5975 100644
--- a/constants/variables.s
+++ b/constants/variables.inc
diff --git a/constants/version.s b/constants/version.inc
index 33d2804fc..33d2804fc 100644
--- a/constants/version.s
+++ b/constants/version.inc
diff --git a/data/bard_music.s b/data/bard_music.inc
index 87f9ecf46..87f9ecf46 100644
--- a/data/bard_music.s
+++ b/data/bard_music.inc
diff --git a/data/base_stats.s b/data/base_stats.inc
index 47128c8a6..47128c8a6 100644
--- a/data/base_stats.s
+++ b/data/base_stats.inc
diff --git a/data/battle_ai_scripts.s b/data/battle_ai_scripts.s
index a0dc3f6cf..86023ca01 100644
--- a/data/battle_ai_scripts.s
+++ b/data/battle_ai_scripts.s
@@ -1,6 +1,6 @@
-	.include "asm/macros.s"
-	.include "constants/constants.s"
-	.include "asm/macros/battle_ai_script.s"
+	.include "asm/macros.inc"
+	.include "constants/constants.inc"
+	.include "asm/macros/battle_ai_script.inc"
 
 	.section script_data, "aw", %progbits
 
diff --git a/data/battle_anim_scripts.s b/data/battle_anim_scripts.s
index 1f06a4b24..fad85183f 100644
--- a/data/battle_anim_scripts.s
+++ b/data/battle_anim_scripts.s
@@ -1,6 +1,6 @@
-	.include "asm/macros.s"
-	.include "asm/macros/battle_anim.s"
-	.include "constants/constants.s"
+	.include "asm/macros.inc"
+	.include "asm/macros/battle_anim.inc"
+	.include "constants/constants.inc"
 
 	.section script_data, "aw", %progbits
 
diff --git a/data/battle_moves.s b/data/battle_moves.inc
index ff7e2cb33..ff7e2cb33 100644
--- a/data/battle_moves.s
+++ b/data/battle_moves.inc
diff --git a/data/battle_scripts_1.s b/data/battle_scripts_1.s
index 0a472467e..f65807005 100644
--- a/data/battle_scripts_1.s
+++ b/data/battle_scripts_1.s
@@ -1,6 +1,6 @@
-	.include "asm/macros.s"
-	.include "constants/constants.s"
-	.include "asm/macros/battle_script.s"
+	.include "asm/macros.inc"
+	.include "constants/constants.inc"
+	.include "asm/macros/battle_script.inc"
 
 	.section script_data, "aw", %progbits
 
diff --git a/data/battle_scripts_2.s b/data/battle_scripts_2.s
index 248baf978..4bee5101c 100644
--- a/data/battle_scripts_2.s
+++ b/data/battle_scripts_2.s
@@ -1,6 +1,6 @@
-	.include "asm/macros.s"
-	.include "constants/constants.s"
-	.include "asm/macros/battle_script.s"
+	.include "asm/macros.inc"
+	.include "constants/constants.inc"
+	.include "asm/macros/battle_script.inc"
 
 	.section script_data, "aw", %progbits
 
diff --git a/data/battle_tower/held_items.s b/data/battle_tower/held_items.inc
index 6c4f0838b..6c4f0838b 100644
--- a/data/battle_tower/held_items.s
+++ b/data/battle_tower/held_items.inc
diff --git a/data/battle_tower/level_100_mons.s b/data/battle_tower/level_100_mons.inc
index 9e678153e..9e678153e 100644
--- a/data/battle_tower/level_100_mons.s
+++ b/data/battle_tower/level_100_mons.inc
diff --git a/data/battle_tower/level_50_mons.s b/data/battle_tower/level_50_mons.inc
index 3dfc269a8..3dfc269a8 100644
--- a/data/battle_tower/level_50_mons.s
+++ b/data/battle_tower/level_50_mons.inc
diff --git a/data/battle_tower/trainers.s b/data/battle_tower/trainers.inc
index 05fadc320..05fadc320 100644
--- a/data/battle_tower/trainers.s
+++ b/data/battle_tower/trainers.inc
diff --git a/data/berries.s b/data/berries.inc
index 7d7d3edd1..7d7d3edd1 100644
--- a/data/berries.s
+++ b/data/berries.inc
diff --git a/data/clock_hand_coords.s b/data/clock_hand_coords.inc
index 476ffb788..476ffb788 100644
--- a/data/clock_hand_coords.s
+++ b/data/clock_hand_coords.inc
diff --git a/data/contest_ai_scripts.s b/data/contest_ai_scripts.s
index e0ca72de2..2c709ba09 100644
--- a/data/contest_ai_scripts.s
+++ b/data/contest_ai_scripts.s
@@ -1,6 +1,6 @@
-	.include "asm/macros.s"
-	.include "asm/macros/contest_ai_script.s"
-	.include "constants/constants.s"
+	.include "asm/macros.inc"
+	.include "asm/macros/contest_ai_script.inc"
+	.include "constants/constants.inc"
 
 	.section script_data, "aw", %progbits
 
diff --git a/data/contest_effect_funcs.s b/data/contest_effect_funcs.inc
index 8dbe9d595..8dbe9d595 100644
--- a/data/contest_effect_funcs.s
+++ b/data/contest_effect_funcs.inc
diff --git a/data/contest_effects.s b/data/contest_effects.inc
index 55d5c0e50..55d5c0e50 100644
--- a/data/contest_effects.s
+++ b/data/contest_effects.inc
diff --git a/data/contest_excitement_table.s b/data/contest_excitement_table.inc
index 359e46c54..359e46c54 100644
--- a/data/contest_excitement_table.s
+++ b/data/contest_excitement_table.inc
diff --git a/data/contest_moves.s b/data/contest_moves.inc
index 8765c0dbe..8765c0dbe 100644
--- a/data/contest_moves.s
+++ b/data/contest_moves.inc
diff --git a/data/contest_opponents.s b/data/contest_opponents.inc
index 2c502285e..2c502285e 100644
--- a/data/contest_opponents.s
+++ b/data/contest_opponents.inc
diff --git a/data/crc16_table.s b/data/crc16_table.inc
index a1f8babd0..a1f8babd0 100644
--- a/data/crc16_table.s
+++ b/data/crc16_table.inc
diff --git a/data/cry_id_table.s b/data/cry_id_table.inc
index 5a39a2194..5a39a2194 100644
--- a/data/cry_id_table.s
+++ b/data/cry_id_table.inc
diff --git a/data/cute_sketch.s b/data/cute_sketch.inc
index 4e23cd87d..4e23cd87d 100644
--- a/data/cute_sketch.s
+++ b/data/cute_sketch.inc
diff --git a/data/data2.s b/data/data2.s
index a5a979625..f527bd91d 100644
--- a/data/data2.s
+++ b/data/data2.s
@@ -1,7 +1,7 @@
 @ the second big chunk of data
 
-	.include "asm/macros.s"
-	.include "constants/constants.s"
+	.include "asm/macros.inc"
+	.include "constants/constants.inc"
 
 	.section .rodata
 
@@ -245,22 +245,22 @@ gSpriteAnimTable_81E7C64:: @ 81E7C64
 	.4byte gSpriteAnim_81E7C5C
 
 @ 81E7C74
-	.include "data/graphics/pokemon/front_pic_coords.s"
+	.include "data/graphics/pokemon/front_pic_coords.inc"
 
 @ 81E8354
-	.include "data/graphics/pokemon/front_pic_table.s"
+	.include "data/graphics/pokemon/front_pic_table.inc"
 
 @ 81E9114
-	.include "data/graphics/pokemon/back_pic_coords.s"
+	.include "data/graphics/pokemon/back_pic_coords.inc"
 
 @ 81E97F4
-	.include "data/graphics/pokemon/back_pic_table.s"
+	.include "data/graphics/pokemon/back_pic_table.inc"
 
 @ 81EA5B4
-	.include "data/graphics/pokemon/palette_table.s"
+	.include "data/graphics/pokemon/palette_table.inc"
 
 @ 81EB374
-	.include "data/graphics/pokemon/shiny_palette_table.s"
+	.include "data/graphics/pokemon/shiny_palette_table.inc"
 
 	.align 2
 gSpriteAnim_81EC134:: @ 81EC134
@@ -699,13 +699,13 @@ gUnknown_081EC2A4:: @ 81EC2A4
 	.4byte gSpriteAnimTable_81EC2A0
 
 @ 81EC3F0
-	.include "data/graphics/trainers/front_pic_coords.s"
+	.include "data/graphics/trainers/front_pic_coords.inc"
 
 @ 81EC53C
-	.include "data/graphics/trainers/front_pic_table.s"
+	.include "data/graphics/trainers/front_pic_table.inc"
 
 @ 81EC7D4
-	.include "data/graphics/trainers/front_pic_palette_table.s"
+	.include "data/graphics/trainers/front_pic_palette_table.inc"
 
 	.align 2
 gSpriteAnim_81ECA6C:: @ 81ECA6C
@@ -756,31 +756,31 @@ gUnknown_081ECACC:: @ 81ECACC
 	.4byte gSpriteAnimTable_81ECAC4
 
 @ 81ECAD8
-	.include "data/graphics/trainers/back_pic_coords.s"
+	.include "data/graphics/trainers/back_pic_coords.inc"
 
 @ 81ECAE4
-	.include "data/graphics/trainers/back_pic_table.s"
+	.include "data/graphics/trainers/back_pic_table.inc"
 
 @ 81ECAFC
-	.include "data/graphics/trainers/back_pic_palette_table.s"
+	.include "data/graphics/trainers/back_pic_palette_table.inc"
 
 @ 81ECB14
-	.include "data/enemy_mon_elevation.s"
+	.include "data/enemy_mon_elevation.inc"
 
 @ 81ECCB0
-	.include "data/trainer_parties.s"
+	.include "data/trainer_parties.inc"
 
 @ 81F0208
-	.include "data/text/trainer_class_names.s"
+	.include "data/text/trainer_class_names.inc"
 
 @ 81F04FC
-	.include "data/trainers.s"
+	.include "data/trainers.inc"
 
 @ 81F716C
-	.include "data/text/species_names.s"
+	.include "data/text/species_names.inc"
 
 @ 81F8320
-	.include "data/text/move_names.s"
+	.include "data/text/move_names.inc"
 
 	.align 2
 @ 81F9528
@@ -982,19 +982,19 @@ gSpriteAffineAnimTable_81F971C:: @ 81F971C
 	.4byte gSpriteAffineAnim_81F9704
 
 @ 81F9720
-	.include "data/type_effectiveness.s"
+	.include "data/type_effectiveness.inc"
 
 @ 81F9870
-	.include "data/text/type_names.s"
+	.include "data/text/type_names.inc"
 
 @ 81F98F0
-	.include "data/trainer_money.s"
+	.include "data/trainer_money.inc"
 
 @ 81F99CC
-	.include "data/text/ability_descriptions.s"
+	.include "data/text/ability_descriptions.inc"
 
 @ 81FA248
-	.include "data/text/ability_names.s"
+	.include "data/text/ability_names.inc"
 
 	.align 2
 gUnknown_081FA640:: @ 81FA640
@@ -1848,7 +1848,7 @@ gUnknown_081FB048:: @ 81FB048
 	.4byte nullsub_48
 
 @ 81FB12C
-	.include "data/battle_moves.s"
+	.include "data/battle_moves.inc"
 
 	.align 2
 gUnknown_081FC1D0:: @ 81FC1D0
@@ -1859,40 +1859,40 @@ gUnknown_081FC1D0:: @ 81FC1D0
 	.space 2
 
 @ 81FC1E0
-	.include "data/species_id_conversion_tables.s"
+	.include "data/species_id_conversion_tables.inc"
 
 @ 81FCB84
-	.include "data/spinda_spot_graphics.s"
+	.include "data/spinda_spot_graphics.inc"
 
 @ 81FCC14
-	.include "data/item_effects.s"
+	.include "data/item_effects.inc"
 
 @ 81FD070
-	.include "data/nature_stat_table.s"
+	.include "data/nature_stat_table.inc"
 
 @ 81FD0F0
-	.include "data/tm_hm_learnsets.s"
+	.include "data/tm_hm_learnsets.inc"
 
 @ 81FDDD0
-	.include "data/trainer_class_index_tables.s"
+	.include "data/trainer_class_index_tables.inc"
 
 @ 81FDE6A
-	.include "data/cry_id_table.s"
+	.include "data/cry_id_table.inc"
 
 @ 81FDF78
-	.include "data/experience_tables/tables.s"
+	.include "data/experience_tables/tables.inc"
 
 @ 81FEC18
-	.include "data/base_stats.s"
+	.include "data/base_stats.inc"
 
 @ 8201928
-	.include "data/level_up_learnsets.s"
+	.include "data/level_up_learnsets.inc"
 
 @ 8203B68
-	.include "data/evolution_table.s"
+	.include "data/evolution_table.inc"
 
 @ 8207BC8
-	.include "data/level_up_learnset_pointers.s"
+	.include "data/level_up_learnset_pointers.inc"
 
 gUnknown_08208238:: @ 8208238
 	.byte 0x03, 0x0C, 0x30, 0xC0
@@ -1989,10 +1989,10 @@ gUnknown_08208337:: @ 8208337
 	.string "ニドラン♀$", 13
 
 @ 8208344
-	.include "data/sine_table.s"
+	.include "data/sine_table.inc"
 
 @ 82085C4
-	.include "data/sine_degree_table.s"
+	.include "data/sine_degree_table.inc"
 
 	.align 2
 gBitTable:: @ 820872C
@@ -2055,14 +2055,14 @@ gUnknown_082087C4:: @ 82087C4
 	.byte 4, 8
 
 @ 82087DC
-	.include "data/crc16_table.s"
+	.include "data/crc16_table.inc"
 
 	.align 2
 gMiscBlank_Gfx:: @ 82089DC
 	.incbin "graphics/interface/blank.4bpp"
 
 @ 82091DC
-	.include "data/egg_moves.s"
+	.include "data/egg_moves.inc"
 
 	.align 2
 gUnknown_08209AC4:: @ 8209AC4
@@ -3297,7 +3297,7 @@ gSpriteAffineAnimTable_8215AC0:: @ 8215AC0
 	.4byte gSpriteAffineAnim_8215AB0
 
 @ 8215AC4
-	.include "data/ingame_trades.s"
+	.include "data/ingame_trades.inc"
 
 gTradeBallVerticalVelocityTable:: @ 8215BA0
 	.byte  0
@@ -3916,19 +3916,19 @@ gUnknown_082166D8:: @ 82166D8
 	.4byte sub_8055D38
 
 @ 82166E0
-	.include "data/tilesets/graphics.s"
+	.include "data/tilesets/graphics.inc"
 
 @ 8259C1C
-	.include "data/tilesets/metatiles.s"
+	.include "data/tilesets/metatiles.inc"
 
 @ 8286CF4
-	.include "data/tilesets/headers.s"
+	.include "data/tilesets/headers.inc"
 
-	.include "data/maps/_assets.s"
-	.include "data/maps/attributes_table.s"
-	.include "data/maps/headers.s"
-	.include "data/maps/_groups.s"
-	.include "data/maps/connections.s"
+	.include "data/maps/_assets.inc"
+	.include "data/maps/attributes_table.inc"
+	.include "data/maps/headers.inc"
+	.include "data/maps/_groups.inc"
+	.include "data/maps/connections.inc"
 
 	.align 2
 gUnknown_08308E28:: @ 8308E28
@@ -4782,10 +4782,10 @@ gUnknown_0830FD3C:: @ 830FD3C
 	.4byte CameraObject_2
 
 @ 830FD48
-	.include "data/graphics/field_objects/map_object_graphics.s"
+	.include "data/graphics/field_objects/map_object_graphics.inc"
 
 @ 8368528
-	.include "data/graphics/field_objects/field_effect_object_graphics.s"
+	.include "data/graphics/field_objects/field_effect_object_graphics.inc"
 
 	.align 2
 gUnknown_0836DA88:: @ 836DA88
@@ -5026,25 +5026,25 @@ gUnknown_0836DC09:: @ 836DC09
 	.byte DIR_SOUTH
 
 @ 836DC58
-	.include "data/graphics/field_objects/map_object_graphics_info_pointers.s"
+	.include "data/graphics/field_objects/map_object_graphics_info_pointers.inc"
 
 @ 836DFC0
-	.include "data/graphics/field_objects/field_effect_object_template_pointers.s"
+	.include "data/graphics/field_objects/field_effect_object_template_pointers.inc"
 
 @ 836E050
-	.include "data/graphics/field_objects/map_object_pic_tables.s"
+	.include "data/graphics/field_objects/map_object_pic_tables.inc"
 
 @ 83708C8
-	.include "data/graphics/field_objects/map_object_anims.s"
+	.include "data/graphics/field_objects/map_object_anims.inc"
 
 @ 83711C4
-	.include "data/graphics/field_objects/base_oam.s"
+	.include "data/graphics/field_objects/base_oam.inc"
 
 @ 8371204
-	.include "data/graphics/field_objects/map_object_subsprites.s"
+	.include "data/graphics/field_objects/map_object_subsprites.inc"
 
 @ 83718D4
-	.include "data/graphics/field_objects/map_object_graphics_info.s"
+	.include "data/graphics/field_objects/map_object_graphics_info.inc"
 
 	.align 2
 gUnknown_0837377C:: @ 837377C
@@ -5250,10 +5250,10 @@ gUnknown_0837399C:: @ 837399C
 	.4byte Unknown_8373988
 
 @ 83739AC
-	.include "data/graphics/field_objects/berry_tree_graphics_tables.s"
+	.include "data/graphics/field_objects/berry_tree_graphics_tables.inc"
 
 @ 8374524
-	.include "data/graphics/field_objects/field_effect_objects.s"
+	.include "data/graphics/field_objects/field_effect_objects.inc"
 
 	.align 1
 gUnknown_0837520C:: @ 837520C
@@ -9754,399 +9754,399 @@ gUnknown_0837F5E0:: @ 837F5E0
 	obj_tiles gMiscBlank_Gfx, 2048, 0xd755
 	obj_tiles gMiscBlank_Gfx, 2048, 0xd756
 
-	.include "data/maps/events/PetalburgCity.s"
-	.include "data/maps/events/SlateportCity.s"
-	.include "data/maps/events/MauvilleCity.s"
-	.include "data/maps/events/RustboroCity.s"
-	.include "data/maps/events/FortreeCity.s"
-	.include "data/maps/events/LilycoveCity.s"
-	.include "data/maps/events/MossdeepCity.s"
-	.include "data/maps/events/SootopolisCity.s"
-	.include "data/maps/events/EverGrandeCity.s"
-	.include "data/maps/events/LittlerootTown.s"
-	.include "data/maps/events/OldaleTown.s"
-	.include "data/maps/events/DewfordTown.s"
-	.include "data/maps/events/LavaridgeTown.s"
-	.include "data/maps/events/FallarborTown.s"
-	.include "data/maps/events/VerdanturfTown.s"
-	.include "data/maps/events/PacifidlogTown.s"
-	.include "data/maps/events/Route101.s"
-	.include "data/maps/events/Route102.s"
-	.include "data/maps/events/Route103.s"
-	.include "data/maps/events/Route104.s"
-	.include "data/maps/events/Route105.s"
-	.include "data/maps/events/Route106.s"
-	.include "data/maps/events/Route107.s"
-	.include "data/maps/events/Route108.s"
-	.include "data/maps/events/Route109.s"
-	.include "data/maps/events/Route110.s"
-	.include "data/maps/events/Route111.s"
-	.include "data/maps/events/Route112.s"
-	.include "data/maps/events/Route113.s"
-	.include "data/maps/events/Route114.s"
-	.include "data/maps/events/Route115.s"
-	.include "data/maps/events/Route116.s"
-	.include "data/maps/events/Route117.s"
-	.include "data/maps/events/Route118.s"
-	.include "data/maps/events/Route119.s"
-	.include "data/maps/events/Route120.s"
-	.include "data/maps/events/Route121.s"
-	.include "data/maps/events/Route122.s"
-	.include "data/maps/events/Route123.s"
-	.include "data/maps/events/Route124.s"
-	.include "data/maps/events/Route125.s"
-	.include "data/maps/events/Route126.s"
-	.include "data/maps/events/Route127.s"
-	.include "data/maps/events/Route128.s"
-	.include "data/maps/events/Route129.s"
-	.include "data/maps/events/Route130.s"
-	.include "data/maps/events/Route131.s"
-	.include "data/maps/events/Route132.s"
-	.include "data/maps/events/Route133.s"
-	.include "data/maps/events/Route134.s"
-	.include "data/maps/events/Underwater1.s"
-	.include "data/maps/events/Underwater2.s"
-	.include "data/maps/events/Underwater3.s"
-	.include "data/maps/events/Underwater4.s"
-	.include "data/maps/events/LittlerootTown_BrendansHouse_1F.s"
-	.include "data/maps/events/LittlerootTown_BrendansHouse_2F.s"
-	.include "data/maps/events/LittlerootTown_MaysHouse_1F.s"
-	.include "data/maps/events/LittlerootTown_MaysHouse_2F.s"
-	.include "data/maps/events/LittlerootTown_ProfessorBirchsLab.s"
-	.include "data/maps/events/OldaleTown_House1.s"
-	.include "data/maps/events/OldaleTown_House2.s"
-	.include "data/maps/events/OldaleTown_PokemonCenter_1F.s"
-	.include "data/maps/events/OldaleTown_PokemonCenter_2F.s"
-	.include "data/maps/events/OldaleTown_Mart.s"
-	.include "data/maps/events/DewfordTown_House1.s"
-	.include "data/maps/events/DewfordTown_PokemonCenter_1F.s"
-	.include "data/maps/events/DewfordTown_PokemonCenter_2F.s"
-	.include "data/maps/events/DewfordTown_Gym.s"
-	.include "data/maps/events/DewfordTown_Hall.s"
-	.include "data/maps/events/DewfordTown_House2.s"
-	.include "data/maps/events/LavaridgeTown_HerbShop.s"
-	.include "data/maps/events/LavaridgeTown_Gym_1F.s"
-	.include "data/maps/events/LavaridgeTown_Gym_B1F.s"
-	.include "data/maps/events/LavaridgeTown_House.s"
-	.include "data/maps/events/LavaridgeTown_Mart.s"
-	.include "data/maps/events/LavaridgeTown_PokemonCenter_1F.s"
-	.include "data/maps/events/LavaridgeTown_PokemonCenter_2F.s"
-	.include "data/maps/events/FallarborTown_Mart.s"
-	.include "data/maps/events/FallarborTown_ContestLobby.s"
-	.include "data/maps/events/FallarborTown_ContestHall.s"
-	.include "data/maps/events/FallarborTown_PokemonCenter_1F.s"
-	.include "data/maps/events/FallarborTown_PokemonCenter_2F.s"
-	.include "data/maps/events/FallarborTown_House1.s"
-	.include "data/maps/events/FallarborTown_House2.s"
-	.include "data/maps/events/VerdanturfTown_ContestLobby.s"
-	.include "data/maps/events/VerdanturfTown_ContestHall.s"
-	.include "data/maps/events/VerdanturfTown_Mart.s"
-	.include "data/maps/events/VerdanturfTown_PokemonCenter_1F.s"
-	.include "data/maps/events/VerdanturfTown_PokemonCenter_2F.s"
-	.include "data/maps/events/VerdanturfTown_WandasHouse.s"
-	.include "data/maps/events/VerdanturfTown_FriendshipRatersHouse.s"
-	.include "data/maps/events/VerdanturfTown_House.s"
-	.include "data/maps/events/PacifidlogTown_PokemonCenter_1F.s"
-	.include "data/maps/events/PacifidlogTown_PokemonCenter_2F.s"
-	.include "data/maps/events/PacifidlogTown_House1.s"
-	.include "data/maps/events/PacifidlogTown_House2.s"
-	.include "data/maps/events/PacifidlogTown_House3.s"
-	.include "data/maps/events/PacifidlogTown_House4.s"
-	.include "data/maps/events/PacifidlogTown_House5.s"
-	.include "data/maps/events/PetalburgCity_WallysHouse.s"
-	.include "data/maps/events/PetalburgCity_Gym.s"
-	.include "data/maps/events/PetalburgCity_House1.s"
-	.include "data/maps/events/PetalburgCity_House2.s"
-	.include "data/maps/events/PetalburgCity_PokemonCenter_1F.s"
-	.include "data/maps/events/PetalburgCity_PokemonCenter_2F.s"
-	.include "data/maps/events/PetalburgCity_Mart.s"
-	.include "data/maps/events/SlateportCity_SternsShipyard_1F.s"
-	.include "data/maps/events/SlateportCity_SternsShipyard_2F.s"
-	.include "data/maps/events/SlateportCity_ContestLobby.s"
-	.include "data/maps/events/SlateportCity_ContestHall.s"
-	.include "data/maps/events/SlateportCity_House1.s"
-	.include "data/maps/events/SlateportCity_PokemonFanClub.s"
-	.include "data/maps/events/SlateportCity_OceanicMuseum_1F.s"
-	.include "data/maps/events/SlateportCity_OceanicMuseum_2F.s"
-	.include "data/maps/events/SlateportCity_Harbor.s"
-	.include "data/maps/events/SlateportCity_House2.s"
-	.include "data/maps/events/SlateportCity_PokemonCenter_1F.s"
-	.include "data/maps/events/SlateportCity_PokemonCenter_2F.s"
-	.include "data/maps/events/SlateportCity_Mart.s"
-	.include "data/maps/events/MauvilleCity_Gym.s"
-	.include "data/maps/events/MauvilleCity_BikeShop.s"
-	.include "data/maps/events/MauvilleCity_House1.s"
-	.include "data/maps/events/MauvilleCity_GameCorner.s"
-	.include "data/maps/events/MauvilleCity_House2.s"
-	.include "data/maps/events/MauvilleCity_PokemonCenter_1F.s"
-	.include "data/maps/events/MauvilleCity_PokemonCenter_2F.s"
-	.include "data/maps/events/MauvilleCity_Mart.s"
-	.include "data/maps/events/RustboroCity_DevonCorp_1F.s"
-	.include "data/maps/events/RustboroCity_DevonCorp_2F.s"
-	.include "data/maps/events/RustboroCity_DevonCorp_3F.s"
-	.include "data/maps/events/RustboroCity_Gym.s"
-	.include "data/maps/events/RustboroCity_PokemonSchool.s"
-	.include "data/maps/events/RustboroCity_PokemonCenter_1F.s"
-	.include "data/maps/events/RustboroCity_PokemonCenter_2F.s"
-	.include "data/maps/events/RustboroCity_Mart.s"
-	.include "data/maps/events/RustboroCity_Flat1_1F.s"
-	.include "data/maps/events/RustboroCity_Flat1_2F.s"
-	.include "data/maps/events/RustboroCity_House1.s"
-	.include "data/maps/events/RustboroCity_CuttersHouse.s"
-	.include "data/maps/events/RustboroCity_House2.s"
-	.include "data/maps/events/RustboroCity_Flat2_1F.s"
-	.include "data/maps/events/RustboroCity_Flat2_2F.s"
-	.include "data/maps/events/RustboroCity_Flat2_3F.s"
-	.include "data/maps/events/RustboroCity_House3.s"
-	.include "data/maps/events/FortreeCity_House1.s"
-	.include "data/maps/events/FortreeCity_Gym.s"
-	.include "data/maps/events/FortreeCity_PokemonCenter_1F.s"
-	.include "data/maps/events/FortreeCity_PokemonCenter_2F.s"
-	.include "data/maps/events/FortreeCity_Mart.s"
-	.include "data/maps/events/FortreeCity_House2.s"
-	.include "data/maps/events/FortreeCity_House3.s"
-	.include "data/maps/events/FortreeCity_House4.s"
-	.include "data/maps/events/FortreeCity_House5.s"
-	.include "data/maps/events/FortreeCity_DecorationShop.s"
-	.include "data/maps/events/LilycoveCity_CoveLilyMotel_1F.s"
-	.include "data/maps/events/LilycoveCity_CoveLilyMotel_2F.s"
-	.include "data/maps/events/LilycoveCity_LilycoveMuseum_1F.s"
-	.include "data/maps/events/LilycoveCity_LilycoveMuseum_2F.s"
-	.include "data/maps/events/LilycoveCity_ContestLobby.s"
-	.include "data/maps/events/LilycoveCity_ContestHall.s"
-	.include "data/maps/events/LilycoveCity_PokemonCenter_1F.s"
-	.include "data/maps/events/LilycoveCity_PokemonCenter_2F.s"
-	.include "data/maps/events/LilycoveCity_UnusedMart.s"
-	.include "data/maps/events/LilycoveCity_PokemonTrainerFanClub.s"
-	.include "data/maps/events/LilycoveCity_Harbor.s"
-	.include "data/maps/events/LilycoveCity_EmptyMap.s"
-	.include "data/maps/events/LilycoveCity_MoveDeletersHouse.s"
-	.include "data/maps/events/LilycoveCity_House1.s"
-	.include "data/maps/events/LilycoveCity_House2.s"
-	.include "data/maps/events/LilycoveCity_House3.s"
-	.include "data/maps/events/LilycoveCity_House4.s"
-	.include "data/maps/events/LilycoveCity_DepartmentStore_1F.s"
-	.include "data/maps/events/LilycoveCity_DepartmentStore_2F.s"
-	.include "data/maps/events/LilycoveCity_DepartmentStore_3F.s"
-	.include "data/maps/events/LilycoveCity_DepartmentStore_4F.s"
-	.include "data/maps/events/LilycoveCity_DepartmentStore_5F.s"
-	.include "data/maps/events/LilycoveCity_DepartmentStoreRooftop.s"
-	.include "data/maps/events/LilycoveCity_DepartmentStoreElevator.s"
-	.include "data/maps/events/MossdeepCity_Gym.s"
-	.include "data/maps/events/MossdeepCity_House1.s"
-	.include "data/maps/events/MossdeepCity_House2.s"
-	.include "data/maps/events/MossdeepCity_PokemonCenter_1F.s"
-	.include "data/maps/events/MossdeepCity_PokemonCenter_2F.s"
-	.include "data/maps/events/MossdeepCity_Mart.s"
-	.include "data/maps/events/MossdeepCity_House3.s"
-	.include "data/maps/events/MossdeepCity_StevensHouse.s"
-	.include "data/maps/events/MossdeepCity_House4.s"
-	.include "data/maps/events/MossdeepCity_SpaceCenter_1F.s"
-	.include "data/maps/events/MossdeepCity_SpaceCenter_2F.s"
-	.include "data/maps/events/MossdeepCity_GameCorner_1F.s"
-	.include "data/maps/events/MossdeepCity_GameCorner_B1F.s"
-	.include "data/maps/events/SootopolisCity_Gym_1F.s"
-	.include "data/maps/events/SootopolisCity_Gym_B1F.s"
-	.include "data/maps/events/SootopolisCity_PokemonCenter_1F.s"
-	.include "data/maps/events/SootopolisCity_PokemonCenter_2F.s"
-	.include "data/maps/events/SootopolisCity_Mart.s"
-	.include "data/maps/events/SootopolisCity_House1.s"
-	.include "data/maps/events/SootopolisCity_House2.s"
-	.include "data/maps/events/SootopolisCity_House3.s"
-	.include "data/maps/events/SootopolisCity_House4.s"
-	.include "data/maps/events/SootopolisCity_House5.s"
-	.include "data/maps/events/SootopolisCity_House6.s"
-	.include "data/maps/events/SootopolisCity_House7.s"
-	.include "data/maps/events/SootopolisCity_House8.s"
-	.include "data/maps/events/EverGrandeCity_SidneysRoom.s"
-	.include "data/maps/events/EverGrandeCity_PhoebesRoom.s"
-	.include "data/maps/events/EverGrandeCity_GlaciasRoom.s"
-	.include "data/maps/events/EverGrandeCity_DrakesRoom.s"
-	.include "data/maps/events/EverGrandeCity_ChampionsRoom.s"
-	.include "data/maps/events/EverGrandeCity_Corridor1.s"
-	.include "data/maps/events/EverGrandeCity_Corridor2.s"
-	.include "data/maps/events/EverGrandeCity_Corridor3.s"
-	.include "data/maps/events/EverGrandeCity_Corridor4.s"
-	.include "data/maps/events/EverGrandeCity_Corridor5.s"
-	.include "data/maps/events/EverGrandeCity_PokemonLeague.s"
-	.include "data/maps/events/EverGrandeCity_HallOfFame.s"
-	.include "data/maps/events/EverGrandeCity_PokemonCenter_1F.s"
-	.include "data/maps/events/EverGrandeCity_PokemonCenter_2F.s"
-	.include "data/maps/events/Route104_MrBrineysHouse.s"
-	.include "data/maps/events/Route104_PrettyPetalFlowerShop.s"
-	.include "data/maps/events/Route111_WinstrateFamilysHouse.s"
-	.include "data/maps/events/Route111_OldLadysRestStop.s"
-	.include "data/maps/events/Route112_CableCarStation.s"
-	.include "data/maps/events/MtChimney_CableCarStation.s"
-	.include "data/maps/events/Route114_FossilManiacsHouse.s"
-	.include "data/maps/events/Route114_FossilManiacsTunnel.s"
-	.include "data/maps/events/Route114_LanettesHouse.s"
-	.include "data/maps/events/Route116_TunnelersRestHouse.s"
-	.include "data/maps/events/Route117_PokemonDayCare.s"
-	.include "data/maps/events/Route121_SafariZoneEntrance.s"
-	.include "data/maps/events/MeteorFalls_1F_1R.s"
-	.include "data/maps/events/MeteorFalls_1F_2R.s"
-	.include "data/maps/events/MeteorFalls_B1F_1R.s"
-	.include "data/maps/events/MeteorFalls_B1F_2R.s"
-	.include "data/maps/events/RusturfTunnel.s"
-	.include "data/maps/events/Underwater_SootopolisCity.s"
-	.include "data/maps/events/DesertRuins.s"
-	.include "data/maps/events/GraniteCave_1F.s"
-	.include "data/maps/events/GraniteCave_B1F.s"
-	.include "data/maps/events/GraniteCave_B2F.s"
-	.include "data/maps/events/GraniteCave_StevensRoom.s"
-	.include "data/maps/events/PetalburgWoods.s"
-	.include "data/maps/events/MtChimney.s"
-	.include "data/maps/events/JaggedPass.s"
-	.include "data/maps/events/FieryPath.s"
-	.include "data/maps/events/MtPyre_1F.s"
-	.include "data/maps/events/MtPyre_2F.s"
-	.include "data/maps/events/MtPyre_3F.s"
-	.include "data/maps/events/MtPyre_4F.s"
-	.include "data/maps/events/MtPyre_5F.s"
-	.include "data/maps/events/MtPyre_6F.s"
-	.include "data/maps/events/MtPyre_Exterior.s"
-	.include "data/maps/events/MtPyre_Summit.s"
-	.include "data/maps/events/AquaHideout_1F.s"
-	.include "data/maps/events/AquaHideout_B1F.s"
-	.include "data/maps/events/AquaHideout_B2F.s"
-	.include "data/maps/events/Underwater_SeafloorCavern.s"
-	.include "data/maps/events/SeafloorCavern_Entrance.s"
-	.include "data/maps/events/SeafloorCavern_Room1.s"
-	.include "data/maps/events/SeafloorCavern_Room2.s"
-	.include "data/maps/events/SeafloorCavern_Room3.s"
-	.include "data/maps/events/SeafloorCavern_Room4.s"
-	.include "data/maps/events/SeafloorCavern_Room5.s"
-	.include "data/maps/events/SeafloorCavern_Room6.s"
-	.include "data/maps/events/SeafloorCavern_Room7.s"
-	.include "data/maps/events/SeafloorCavern_Room8.s"
-	.include "data/maps/events/SeafloorCavern_Room9.s"
-	.include "data/maps/events/CaveOfOrigin_Entrance.s"
-	.include "data/maps/events/CaveOfOrigin_1F.s"
-	.include "data/maps/events/CaveOfOrigin_B1F.s"
-	.include "data/maps/events/CaveOfOrigin_B2F.s"
-	.include "data/maps/events/CaveOfOrigin_B3F.s"
-	.include "data/maps/events/CaveOfOrigin_B4F.s"
-	.include "data/maps/events/VictoryRoad_1F.s"
-	.include "data/maps/events/VictoryRoad_B1F.s"
-	.include "data/maps/events/VictoryRoad_B2F.s"
-	.include "data/maps/events/ShoalCave_LowTideEntranceRoom.s"
-	.include "data/maps/events/ShoalCave_LowTideInnerRoom.s"
-	.include "data/maps/events/ShoalCave_LowTideStairsRoom.s"
-	.include "data/maps/events/ShoalCave_LowTideLowerRoom.s"
-	.include "data/maps/events/ShoalCave_HighTideEntranceRoom.s"
-	.include "data/maps/events/ShoalCave_HighTideInnerRoom.s"
-	.include "data/maps/events/NewMauville_Entrance.s"
-	.include "data/maps/events/NewMauville_Inside.s"
-	.include "data/maps/events/AbandonedShip_Deck.s"
-	.include "data/maps/events/AbandonedShip_Corridors_1F.s"
-	.include "data/maps/events/AbandonedShip_Rooms_1F.s"
-	.include "data/maps/events/AbandonedShip_Corridors_B1F.s"
-	.include "data/maps/events/AbandonedShip_Rooms_B1F.s"
-	.include "data/maps/events/AbandonedShip_Rooms2_B1F.s"
-	.include "data/maps/events/AbandonedShip_Underwater1.s"
-	.include "data/maps/events/AbandonedShip_Room_B1F.s"
-	.include "data/maps/events/AbandonedShip_Rooms2_1F.s"
-	.include "data/maps/events/AbandonedShip_CaptainsOffice.s"
-	.include "data/maps/events/AbandonedShip_Underwater2.s"
-	.include "data/maps/events/AbandonedShip_HiddenFloorCorridors.s"
-	.include "data/maps/events/AbandonedShip_HiddenFloorRooms.s"
-	.include "data/maps/events/IslandCave.s"
-	.include "data/maps/events/AncientTomb.s"
-	.include "data/maps/events/Underwater_Route134.s"
-	.include "data/maps/events/Underwater_SealedChamber.s"
-	.include "data/maps/events/SealedChamber_OuterRoom.s"
-	.include "data/maps/events/SealedChamber_InnerRoom.s"
-	.include "data/maps/events/ScorchedSlab.s"
-	.include "data/maps/events/MagmaHideout_1F.s"
-	.include "data/maps/events/MagmaHideout_B1F.s"
-	.include "data/maps/events/MagmaHideout_B2F.s"
-	.include "data/maps/events/SkyPillar_Entrance.s"
-	.include "data/maps/events/SkyPillar_Outside.s"
-	.include "data/maps/events/SkyPillar_1F.s"
-	.include "data/maps/events/SkyPillar_2F.s"
-	.include "data/maps/events/SkyPillar_3F.s"
-	.include "data/maps/events/SkyPillar_4F.s"
-	.include "data/maps/events/ShoalCave_LowTideIceRoom.s"
-	.include "data/maps/events/SkyPillar_5F.s"
-	.include "data/maps/events/SkyPillar_Top.s"
-	.include "data/maps/events/SecretBase_RedCave1.s"
-	.include "data/maps/events/SecretBase_BrownCave1.s"
-	.include "data/maps/events/SecretBase_BlueCave1.s"
-	.include "data/maps/events/SecretBase_YellowCave1.s"
-	.include "data/maps/events/SecretBase_Tree1.s"
-	.include "data/maps/events/SecretBase_Shrub1.s"
-	.include "data/maps/events/SecretBase_RedCave2.s"
-	.include "data/maps/events/SecretBase_BrownCave2.s"
-	.include "data/maps/events/SecretBase_BlueCave2.s"
-	.include "data/maps/events/SecretBase_YellowCave2.s"
-	.include "data/maps/events/SecretBase_Tree2.s"
-	.include "data/maps/events/SecretBase_Shrub2.s"
-	.include "data/maps/events/SecretBase_RedCave3.s"
-	.include "data/maps/events/SecretBase_BrownCave3.s"
-	.include "data/maps/events/SecretBase_BlueCave3.s"
-	.include "data/maps/events/SecretBase_YellowCave3.s"
-	.include "data/maps/events/SecretBase_Tree3.s"
-	.include "data/maps/events/SecretBase_Shrub3.s"
-	.include "data/maps/events/SecretBase_RedCave4.s"
-	.include "data/maps/events/SecretBase_BrownCave4.s"
-	.include "data/maps/events/SecretBase_BlueCave4.s"
-	.include "data/maps/events/SecretBase_YellowCave4.s"
-	.include "data/maps/events/SecretBase_Tree4.s"
-	.include "data/maps/events/SecretBase_Shrub4.s"
-	.include "data/maps/events/SingleBattleColosseum.s"
-	.include "data/maps/events/TradeCenter.s"
-	.include "data/maps/events/RecordCorner.s"
-	.include "data/maps/events/DoubleBattleColosseum.s"
-	.include "data/maps/events/LinkContestRoom1.s"
-	.include "data/maps/events/LinkContestRoom2.s"
-	.include "data/maps/events/LinkContestRoom3.s"
-	.include "data/maps/events/LinkContestRoom4.s"
-	.include "data/maps/events/LinkContestRoom5.s"
-	.include "data/maps/events/LinkContestRoom6.s"
-	.include "data/maps/events/UnknownMap_25_29.s"
-	.include "data/maps/events/UnknownMap_25_30.s"
-	.include "data/maps/events/UnknownMap_25_31.s"
-	.include "data/maps/events/UnknownMap_25_32.s"
-	.include "data/maps/events/UnknownMap_25_33.s"
-	.include "data/maps/events/UnknownMap_25_34.s"
-	.include "data/maps/events/InsideOfTruck.s"
-	.include "data/maps/events/SSTidalCorridor.s"
-	.include "data/maps/events/SSTidalLowerDeck.s"
-	.include "data/maps/events/SSTidalRooms.s"
-	.include "data/maps/events/SafariZone_Northwest.s"
-	.include "data/maps/events/SafariZone_Northeast.s"
-	.include "data/maps/events/SafariZone_Southwest.s"
-	.include "data/maps/events/SafariZone_Southeast.s"
-	.include "data/maps/events/BattleTower_Outside.s"
-	.include "data/maps/events/BattleTower_Lobby.s"
-	.include "data/maps/events/BattleTower_Elevator.s"
-	.include "data/maps/events/BattleTower_Corridor.s"
-	.include "data/maps/events/BattleTower_BattleRoom.s"
-	.include "data/maps/events/SouthernIsland_Exterior.s"
-	.include "data/maps/events/SouthernIsland_Interior.s"
-	.include "data/maps/events/SafariZone_RestHouse.s"
-	.include "data/maps/events/Route104_Prototype.s"
-	.include "data/maps/events/Route104_PrototypePrettyPetalFlowerShop.s"
-	.include "data/maps/events/Route109_SeashoreHouse.s"
-	.include "data/maps/events/Route110_TrickHouseEntrance.s"
-	.include "data/maps/events/Route110_TrickHouseEnd.s"
-	.include "data/maps/events/Route110_TrickHouseCorridor.s"
-	.include "data/maps/events/Route110_TrickHousePuzzle1.s"
-	.include "data/maps/events/Route110_TrickHousePuzzle2.s"
-	.include "data/maps/events/Route110_TrickHousePuzzle3.s"
-	.include "data/maps/events/Route110_TrickHousePuzzle4.s"
-	.include "data/maps/events/Route110_TrickHousePuzzle5.s"
-	.include "data/maps/events/Route110_TrickHousePuzzle6.s"
-	.include "data/maps/events/Route110_TrickHousePuzzle7.s"
-	.include "data/maps/events/Route110_TrickHousePuzzle8.s"
-	.include "data/maps/events/Route110_SeasideCyclingRoadSouthEntrance.s"
-	.include "data/maps/events/Route110_SeasideCyclingRoadNorthEntrance.s"
-	.include "data/maps/events/Route113_GlassWorkshop.s"
-	.include "data/maps/events/Route123_BerryMastersHouse.s"
-	.include "data/maps/events/Route119_WeatherInstitute_1F.s"
-	.include "data/maps/events/Route119_WeatherInstitute_2F.s"
-	.include "data/maps/events/Route119_House.s"
+	.include "data/maps/events/PetalburgCity.inc"
+	.include "data/maps/events/SlateportCity.inc"
+	.include "data/maps/events/MauvilleCity.inc"
+	.include "data/maps/events/RustboroCity.inc"
+	.include "data/maps/events/FortreeCity.inc"
+	.include "data/maps/events/LilycoveCity.inc"
+	.include "data/maps/events/MossdeepCity.inc"
+	.include "data/maps/events/SootopolisCity.inc"
+	.include "data/maps/events/EverGrandeCity.inc"
+	.include "data/maps/events/LittlerootTown.inc"
+	.include "data/maps/events/OldaleTown.inc"
+	.include "data/maps/events/DewfordTown.inc"
+	.include "data/maps/events/LavaridgeTown.inc"
+	.include "data/maps/events/FallarborTown.inc"
+	.include "data/maps/events/VerdanturfTown.inc"
+	.include "data/maps/events/PacifidlogTown.inc"
+	.include "data/maps/events/Route101.inc"
+	.include "data/maps/events/Route102.inc"
+	.include "data/maps/events/Route103.inc"
+	.include "data/maps/events/Route104.inc"
+	.include "data/maps/events/Route105.inc"
+	.include "data/maps/events/Route106.inc"
+	.include "data/maps/events/Route107.inc"
+	.include "data/maps/events/Route108.inc"
+	.include "data/maps/events/Route109.inc"
+	.include "data/maps/events/Route110.inc"
+	.include "data/maps/events/Route111.inc"
+	.include "data/maps/events/Route112.inc"
+	.include "data/maps/events/Route113.inc"
+	.include "data/maps/events/Route114.inc"
+	.include "data/maps/events/Route115.inc"
+	.include "data/maps/events/Route116.inc"
+	.include "data/maps/events/Route117.inc"
+	.include "data/maps/events/Route118.inc"
+	.include "data/maps/events/Route119.inc"
+	.include "data/maps/events/Route120.inc"
+	.include "data/maps/events/Route121.inc"
+	.include "data/maps/events/Route122.inc"
+	.include "data/maps/events/Route123.inc"
+	.include "data/maps/events/Route124.inc"
+	.include "data/maps/events/Route125.inc"
+	.include "data/maps/events/Route126.inc"
+	.include "data/maps/events/Route127.inc"
+	.include "data/maps/events/Route128.inc"
+	.include "data/maps/events/Route129.inc"
+	.include "data/maps/events/Route130.inc"
+	.include "data/maps/events/Route131.inc"
+	.include "data/maps/events/Route132.inc"
+	.include "data/maps/events/Route133.inc"
+	.include "data/maps/events/Route134.inc"
+	.include "data/maps/events/Underwater1.inc"
+	.include "data/maps/events/Underwater2.inc"
+	.include "data/maps/events/Underwater3.inc"
+	.include "data/maps/events/Underwater4.inc"
+	.include "data/maps/events/LittlerootTown_BrendansHouse_1F.inc"
+	.include "data/maps/events/LittlerootTown_BrendansHouse_2F.inc"
+	.include "data/maps/events/LittlerootTown_MaysHouse_1F.inc"
+	.include "data/maps/events/LittlerootTown_MaysHouse_2F.inc"
+	.include "data/maps/events/LittlerootTown_ProfessorBirchsLab.inc"
+	.include "data/maps/events/OldaleTown_House1.inc"
+	.include "data/maps/events/OldaleTown_House2.inc"
+	.include "data/maps/events/OldaleTown_PokemonCenter_1F.inc"
+	.include "data/maps/events/OldaleTown_PokemonCenter_2F.inc"
+	.include "data/maps/events/OldaleTown_Mart.inc"
+	.include "data/maps/events/DewfordTown_House1.inc"
+	.include "data/maps/events/DewfordTown_PokemonCenter_1F.inc"
+	.include "data/maps/events/DewfordTown_PokemonCenter_2F.inc"
+	.include "data/maps/events/DewfordTown_Gym.inc"
+	.include "data/maps/events/DewfordTown_Hall.inc"
+	.include "data/maps/events/DewfordTown_House2.inc"
+	.include "data/maps/events/LavaridgeTown_HerbShop.inc"
+	.include "data/maps/events/LavaridgeTown_Gym_1F.inc"
+	.include "data/maps/events/LavaridgeTown_Gym_B1F.inc"
+	.include "data/maps/events/LavaridgeTown_House.inc"
+	.include "data/maps/events/LavaridgeTown_Mart.inc"
+	.include "data/maps/events/LavaridgeTown_PokemonCenter_1F.inc"
+	.include "data/maps/events/LavaridgeTown_PokemonCenter_2F.inc"
+	.include "data/maps/events/FallarborTown_Mart.inc"
+	.include "data/maps/events/FallarborTown_ContestLobby.inc"
+	.include "data/maps/events/FallarborTown_ContestHall.inc"
+	.include "data/maps/events/FallarborTown_PokemonCenter_1F.inc"
+	.include "data/maps/events/FallarborTown_PokemonCenter_2F.inc"
+	.include "data/maps/events/FallarborTown_House1.inc"
+	.include "data/maps/events/FallarborTown_House2.inc"
+	.include "data/maps/events/VerdanturfTown_ContestLobby.inc"
+	.include "data/maps/events/VerdanturfTown_ContestHall.inc"
+	.include "data/maps/events/VerdanturfTown_Mart.inc"
+	.include "data/maps/events/VerdanturfTown_PokemonCenter_1F.inc"
+	.include "data/maps/events/VerdanturfTown_PokemonCenter_2F.inc"
+	.include "data/maps/events/VerdanturfTown_WandasHouse.inc"
+	.include "data/maps/events/VerdanturfTown_FriendshipRatersHouse.inc"
+	.include "data/maps/events/VerdanturfTown_House.inc"
+	.include "data/maps/events/PacifidlogTown_PokemonCenter_1F.inc"
+	.include "data/maps/events/PacifidlogTown_PokemonCenter_2F.inc"
+	.include "data/maps/events/PacifidlogTown_House1.inc"
+	.include "data/maps/events/PacifidlogTown_House2.inc"
+	.include "data/maps/events/PacifidlogTown_House3.inc"
+	.include "data/maps/events/PacifidlogTown_House4.inc"
+	.include "data/maps/events/PacifidlogTown_House5.inc"
+	.include "data/maps/events/PetalburgCity_WallysHouse.inc"
+	.include "data/maps/events/PetalburgCity_Gym.inc"
+	.include "data/maps/events/PetalburgCity_House1.inc"
+	.include "data/maps/events/PetalburgCity_House2.inc"
+	.include "data/maps/events/PetalburgCity_PokemonCenter_1F.inc"
+	.include "data/maps/events/PetalburgCity_PokemonCenter_2F.inc"
+	.include "data/maps/events/PetalburgCity_Mart.inc"
+	.include "data/maps/events/SlateportCity_SternsShipyard_1F.inc"
+	.include "data/maps/events/SlateportCity_SternsShipyard_2F.inc"
+	.include "data/maps/events/SlateportCity_ContestLobby.inc"
+	.include "data/maps/events/SlateportCity_ContestHall.inc"
+	.include "data/maps/events/SlateportCity_House1.inc"
+	.include "data/maps/events/SlateportCity_PokemonFanClub.inc"
+	.include "data/maps/events/SlateportCity_OceanicMuseum_1F.inc"
+	.include "data/maps/events/SlateportCity_OceanicMuseum_2F.inc"
+	.include "data/maps/events/SlateportCity_Harbor.inc"
+	.include "data/maps/events/SlateportCity_House2.inc"
+	.include "data/maps/events/SlateportCity_PokemonCenter_1F.inc"
+	.include "data/maps/events/SlateportCity_PokemonCenter_2F.inc"
+	.include "data/maps/events/SlateportCity_Mart.inc"
+	.include "data/maps/events/MauvilleCity_Gym.inc"
+	.include "data/maps/events/MauvilleCity_BikeShop.inc"
+	.include "data/maps/events/MauvilleCity_House1.inc"
+	.include "data/maps/events/MauvilleCity_GameCorner.inc"
+	.include "data/maps/events/MauvilleCity_House2.inc"
+	.include "data/maps/events/MauvilleCity_PokemonCenter_1F.inc"
+	.include "data/maps/events/MauvilleCity_PokemonCenter_2F.inc"
+	.include "data/maps/events/MauvilleCity_Mart.inc"
+	.include "data/maps/events/RustboroCity_DevonCorp_1F.inc"
+	.include "data/maps/events/RustboroCity_DevonCorp_2F.inc"
+	.include "data/maps/events/RustboroCity_DevonCorp_3F.inc"
+	.include "data/maps/events/RustboroCity_Gym.inc"
+	.include "data/maps/events/RustboroCity_PokemonSchool.inc"
+	.include "data/maps/events/RustboroCity_PokemonCenter_1F.inc"
+	.include "data/maps/events/RustboroCity_PokemonCenter_2F.inc"
+	.include "data/maps/events/RustboroCity_Mart.inc"
+	.include "data/maps/events/RustboroCity_Flat1_1F.inc"
+	.include "data/maps/events/RustboroCity_Flat1_2F.inc"
+	.include "data/maps/events/RustboroCity_House1.inc"
+	.include "data/maps/events/RustboroCity_CuttersHouse.inc"
+	.include "data/maps/events/RustboroCity_House2.inc"
+	.include "data/maps/events/RustboroCity_Flat2_1F.inc"
+	.include "data/maps/events/RustboroCity_Flat2_2F.inc"
+	.include "data/maps/events/RustboroCity_Flat2_3F.inc"
+	.include "data/maps/events/RustboroCity_House3.inc"
+	.include "data/maps/events/FortreeCity_House1.inc"
+	.include "data/maps/events/FortreeCity_Gym.inc"
+	.include "data/maps/events/FortreeCity_PokemonCenter_1F.inc"
+	.include "data/maps/events/FortreeCity_PokemonCenter_2F.inc"
+	.include "data/maps/events/FortreeCity_Mart.inc"
+	.include "data/maps/events/FortreeCity_House2.inc"
+	.include "data/maps/events/FortreeCity_House3.inc"
+	.include "data/maps/events/FortreeCity_House4.inc"
+	.include "data/maps/events/FortreeCity_House5.inc"
+	.include "data/maps/events/FortreeCity_DecorationShop.inc"
+	.include "data/maps/events/LilycoveCity_CoveLilyMotel_1F.inc"
+	.include "data/maps/events/LilycoveCity_CoveLilyMotel_2F.inc"
+	.include "data/maps/events/LilycoveCity_LilycoveMuseum_1F.inc"
+	.include "data/maps/events/LilycoveCity_LilycoveMuseum_2F.inc"
+	.include "data/maps/events/LilycoveCity_ContestLobby.inc"
+	.include "data/maps/events/LilycoveCity_ContestHall.inc"
+	.include "data/maps/events/LilycoveCity_PokemonCenter_1F.inc"
+	.include "data/maps/events/LilycoveCity_PokemonCenter_2F.inc"
+	.include "data/maps/events/LilycoveCity_UnusedMart.inc"
+	.include "data/maps/events/LilycoveCity_PokemonTrainerFanClub.inc"
+	.include "data/maps/events/LilycoveCity_Harbor.inc"
+	.include "data/maps/events/LilycoveCity_EmptyMap.inc"
+	.include "data/maps/events/LilycoveCity_MoveDeletersHouse.inc"
+	.include "data/maps/events/LilycoveCity_House1.inc"
+	.include "data/maps/events/LilycoveCity_House2.inc"
+	.include "data/maps/events/LilycoveCity_House3.inc"
+	.include "data/maps/events/LilycoveCity_House4.inc"
+	.include "data/maps/events/LilycoveCity_DepartmentStore_1F.inc"
+	.include "data/maps/events/LilycoveCity_DepartmentStore_2F.inc"
+	.include "data/maps/events/LilycoveCity_DepartmentStore_3F.inc"
+	.include "data/maps/events/LilycoveCity_DepartmentStore_4F.inc"
+	.include "data/maps/events/LilycoveCity_DepartmentStore_5F.inc"
+	.include "data/maps/events/LilycoveCity_DepartmentStoreRooftop.inc"
+	.include "data/maps/events/LilycoveCity_DepartmentStoreElevator.inc"
+	.include "data/maps/events/MossdeepCity_Gym.inc"
+	.include "data/maps/events/MossdeepCity_House1.inc"
+	.include "data/maps/events/MossdeepCity_House2.inc"
+	.include "data/maps/events/MossdeepCity_PokemonCenter_1F.inc"
+	.include "data/maps/events/MossdeepCity_PokemonCenter_2F.inc"
+	.include "data/maps/events/MossdeepCity_Mart.inc"
+	.include "data/maps/events/MossdeepCity_House3.inc"
+	.include "data/maps/events/MossdeepCity_StevensHouse.inc"
+	.include "data/maps/events/MossdeepCity_House4.inc"
+	.include "data/maps/events/MossdeepCity_SpaceCenter_1F.inc"
+	.include "data/maps/events/MossdeepCity_SpaceCenter_2F.inc"
+	.include "data/maps/events/MossdeepCity_GameCorner_1F.inc"
+	.include "data/maps/events/MossdeepCity_GameCorner_B1F.inc"
+	.include "data/maps/events/SootopolisCity_Gym_1F.inc"
+	.include "data/maps/events/SootopolisCity_Gym_B1F.inc"
+	.include "data/maps/events/SootopolisCity_PokemonCenter_1F.inc"
+	.include "data/maps/events/SootopolisCity_PokemonCenter_2F.inc"
+	.include "data/maps/events/SootopolisCity_Mart.inc"
+	.include "data/maps/events/SootopolisCity_House1.inc"
+	.include "data/maps/events/SootopolisCity_House2.inc"
+	.include "data/maps/events/SootopolisCity_House3.inc"
+	.include "data/maps/events/SootopolisCity_House4.inc"
+	.include "data/maps/events/SootopolisCity_House5.inc"
+	.include "data/maps/events/SootopolisCity_House6.inc"
+	.include "data/maps/events/SootopolisCity_House7.inc"
+	.include "data/maps/events/SootopolisCity_House8.inc"
+	.include "data/maps/events/EverGrandeCity_SidneysRoom.inc"
+	.include "data/maps/events/EverGrandeCity_PhoebesRoom.inc"
+	.include "data/maps/events/EverGrandeCity_GlaciasRoom.inc"
+	.include "data/maps/events/EverGrandeCity_DrakesRoom.inc"
+	.include "data/maps/events/EverGrandeCity_ChampionsRoom.inc"
+	.include "data/maps/events/EverGrandeCity_Corridor1.inc"
+	.include "data/maps/events/EverGrandeCity_Corridor2.inc"
+	.include "data/maps/events/EverGrandeCity_Corridor3.inc"
+	.include "data/maps/events/EverGrandeCity_Corridor4.inc"
+	.include "data/maps/events/EverGrandeCity_Corridor5.inc"
+	.include "data/maps/events/EverGrandeCity_PokemonLeague.inc"
+	.include "data/maps/events/EverGrandeCity_HallOfFame.inc"
+	.include "data/maps/events/EverGrandeCity_PokemonCenter_1F.inc"
+	.include "data/maps/events/EverGrandeCity_PokemonCenter_2F.inc"
+	.include "data/maps/events/Route104_MrBrineysHouse.inc"
+	.include "data/maps/events/Route104_PrettyPetalFlowerShop.inc"
+	.include "data/maps/events/Route111_WinstrateFamilysHouse.inc"
+	.include "data/maps/events/Route111_OldLadysRestStop.inc"
+	.include "data/maps/events/Route112_CableCarStation.inc"
+	.include "data/maps/events/MtChimney_CableCarStation.inc"
+	.include "data/maps/events/Route114_FossilManiacsHouse.inc"
+	.include "data/maps/events/Route114_FossilManiacsTunnel.inc"
+	.include "data/maps/events/Route114_LanettesHouse.inc"
+	.include "data/maps/events/Route116_TunnelersRestHouse.inc"
+	.include "data/maps/events/Route117_PokemonDayCare.inc"
+	.include "data/maps/events/Route121_SafariZoneEntrance.inc"
+	.include "data/maps/events/MeteorFalls_1F_1R.inc"
+	.include "data/maps/events/MeteorFalls_1F_2R.inc"
+	.include "data/maps/events/MeteorFalls_B1F_1R.inc"
+	.include "data/maps/events/MeteorFalls_B1F_2R.inc"
+	.include "data/maps/events/RusturfTunnel.inc"
+	.include "data/maps/events/Underwater_SootopolisCity.inc"
+	.include "data/maps/events/DesertRuins.inc"
+	.include "data/maps/events/GraniteCave_1F.inc"
+	.include "data/maps/events/GraniteCave_B1F.inc"
+	.include "data/maps/events/GraniteCave_B2F.inc"
+	.include "data/maps/events/GraniteCave_StevensRoom.inc"
+	.include "data/maps/events/PetalburgWoods.inc"
+	.include "data/maps/events/MtChimney.inc"
+	.include "data/maps/events/JaggedPass.inc"
+	.include "data/maps/events/FieryPath.inc"
+	.include "data/maps/events/MtPyre_1F.inc"
+	.include "data/maps/events/MtPyre_2F.inc"
+	.include "data/maps/events/MtPyre_3F.inc"
+	.include "data/maps/events/MtPyre_4F.inc"
+	.include "data/maps/events/MtPyre_5F.inc"
+	.include "data/maps/events/MtPyre_6F.inc"
+	.include "data/maps/events/MtPyre_Exterior.inc"
+	.include "data/maps/events/MtPyre_Summit.inc"
+	.include "data/maps/events/AquaHideout_1F.inc"
+	.include "data/maps/events/AquaHideout_B1F.inc"
+	.include "data/maps/events/AquaHideout_B2F.inc"
+	.include "data/maps/events/Underwater_SeafloorCavern.inc"
+	.include "data/maps/events/SeafloorCavern_Entrance.inc"
+	.include "data/maps/events/SeafloorCavern_Room1.inc"
+	.include "data/maps/events/SeafloorCavern_Room2.inc"
+	.include "data/maps/events/SeafloorCavern_Room3.inc"
+	.include "data/maps/events/SeafloorCavern_Room4.inc"
+	.include "data/maps/events/SeafloorCavern_Room5.inc"
+	.include "data/maps/events/SeafloorCavern_Room6.inc"
+	.include "data/maps/events/SeafloorCavern_Room7.inc"
+	.include "data/maps/events/SeafloorCavern_Room8.inc"
+	.include "data/maps/events/SeafloorCavern_Room9.inc"
+	.include "data/maps/events/CaveOfOrigin_Entrance.inc"
+	.include "data/maps/events/CaveOfOrigin_1F.inc"
+	.include "data/maps/events/CaveOfOrigin_B1F.inc"
+	.include "data/maps/events/CaveOfOrigin_B2F.inc"
+	.include "data/maps/events/CaveOfOrigin_B3F.inc"
+	.include "data/maps/events/CaveOfOrigin_B4F.inc"
+	.include "data/maps/events/VictoryRoad_1F.inc"
+	.include "data/maps/events/VictoryRoad_B1F.inc"
+	.include "data/maps/events/VictoryRoad_B2F.inc"
+	.include "data/maps/events/ShoalCave_LowTideEntranceRoom.inc"
+	.include "data/maps/events/ShoalCave_LowTideInnerRoom.inc"
+	.include "data/maps/events/ShoalCave_LowTideStairsRoom.inc"
+	.include "data/maps/events/ShoalCave_LowTideLowerRoom.inc"
+	.include "data/maps/events/ShoalCave_HighTideEntranceRoom.inc"
+	.include "data/maps/events/ShoalCave_HighTideInnerRoom.inc"
+	.include "data/maps/events/NewMauville_Entrance.inc"
+	.include "data/maps/events/NewMauville_Inside.inc"
+	.include "data/maps/events/AbandonedShip_Deck.inc"
+	.include "data/maps/events/AbandonedShip_Corridors_1F.inc"
+	.include "data/maps/events/AbandonedShip_Rooms_1F.inc"
+	.include "data/maps/events/AbandonedShip_Corridors_B1F.inc"
+	.include "data/maps/events/AbandonedShip_Rooms_B1F.inc"
+	.include "data/maps/events/AbandonedShip_Rooms2_B1F.inc"
+	.include "data/maps/events/AbandonedShip_Underwater1.inc"
+	.include "data/maps/events/AbandonedShip_Room_B1F.inc"
+	.include "data/maps/events/AbandonedShip_Rooms2_1F.inc"
+	.include "data/maps/events/AbandonedShip_CaptainsOffice.inc"
+	.include "data/maps/events/AbandonedShip_Underwater2.inc"
+	.include "data/maps/events/AbandonedShip_HiddenFloorCorridors.inc"
+	.include "data/maps/events/AbandonedShip_HiddenFloorRooms.inc"
+	.include "data/maps/events/IslandCave.inc"
+	.include "data/maps/events/AncientTomb.inc"
+	.include "data/maps/events/Underwater_Route134.inc"
+	.include "data/maps/events/Underwater_SealedChamber.inc"
+	.include "data/maps/events/SealedChamber_OuterRoom.inc"
+	.include "data/maps/events/SealedChamber_InnerRoom.inc"
+	.include "data/maps/events/ScorchedSlab.inc"
+	.include "data/maps/events/MagmaHideout_1F.inc"
+	.include "data/maps/events/MagmaHideout_B1F.inc"
+	.include "data/maps/events/MagmaHideout_B2F.inc"
+	.include "data/maps/events/SkyPillar_Entrance.inc"
+	.include "data/maps/events/SkyPillar_Outside.inc"
+	.include "data/maps/events/SkyPillar_1F.inc"
+	.include "data/maps/events/SkyPillar_2F.inc"
+	.include "data/maps/events/SkyPillar_3F.inc"
+	.include "data/maps/events/SkyPillar_4F.inc"
+	.include "data/maps/events/ShoalCave_LowTideIceRoom.inc"
+	.include "data/maps/events/SkyPillar_5F.inc"
+	.include "data/maps/events/SkyPillar_Top.inc"
+	.include "data/maps/events/SecretBase_RedCave1.inc"
+	.include "data/maps/events/SecretBase_BrownCave1.inc"
+	.include "data/maps/events/SecretBase_BlueCave1.inc"
+	.include "data/maps/events/SecretBase_YellowCave1.inc"
+	.include "data/maps/events/SecretBase_Tree1.inc"
+	.include "data/maps/events/SecretBase_Shrub1.inc"
+	.include "data/maps/events/SecretBase_RedCave2.inc"
+	.include "data/maps/events/SecretBase_BrownCave2.inc"
+	.include "data/maps/events/SecretBase_BlueCave2.inc"
+	.include "data/maps/events/SecretBase_YellowCave2.inc"
+	.include "data/maps/events/SecretBase_Tree2.inc"
+	.include "data/maps/events/SecretBase_Shrub2.inc"
+	.include "data/maps/events/SecretBase_RedCave3.inc"
+	.include "data/maps/events/SecretBase_BrownCave3.inc"
+	.include "data/maps/events/SecretBase_BlueCave3.inc"
+	.include "data/maps/events/SecretBase_YellowCave3.inc"
+	.include "data/maps/events/SecretBase_Tree3.inc"
+	.include "data/maps/events/SecretBase_Shrub3.inc"
+	.include "data/maps/events/SecretBase_RedCave4.inc"
+	.include "data/maps/events/SecretBase_BrownCave4.inc"
+	.include "data/maps/events/SecretBase_BlueCave4.inc"
+	.include "data/maps/events/SecretBase_YellowCave4.inc"
+	.include "data/maps/events/SecretBase_Tree4.inc"
+	.include "data/maps/events/SecretBase_Shrub4.inc"
+	.include "data/maps/events/SingleBattleColosseum.inc"
+	.include "data/maps/events/TradeCenter.inc"
+	.include "data/maps/events/RecordCorner.inc"
+	.include "data/maps/events/DoubleBattleColosseum.inc"
+	.include "data/maps/events/LinkContestRoom1.inc"
+	.include "data/maps/events/LinkContestRoom2.inc"
+	.include "data/maps/events/LinkContestRoom3.inc"
+	.include "data/maps/events/LinkContestRoom4.inc"
+	.include "data/maps/events/LinkContestRoom5.inc"
+	.include "data/maps/events/LinkContestRoom6.inc"
+	.include "data/maps/events/UnknownMap_25_29.inc"
+	.include "data/maps/events/UnknownMap_25_30.inc"
+	.include "data/maps/events/UnknownMap_25_31.inc"
+	.include "data/maps/events/UnknownMap_25_32.inc"
+	.include "data/maps/events/UnknownMap_25_33.inc"
+	.include "data/maps/events/UnknownMap_25_34.inc"
+	.include "data/maps/events/InsideOfTruck.inc"
+	.include "data/maps/events/SSTidalCorridor.inc"
+	.include "data/maps/events/SSTidalLowerDeck.inc"
+	.include "data/maps/events/SSTidalRooms.inc"
+	.include "data/maps/events/SafariZone_Northwest.inc"
+	.include "data/maps/events/SafariZone_Northeast.inc"
+	.include "data/maps/events/SafariZone_Southwest.inc"
+	.include "data/maps/events/SafariZone_Southeast.inc"
+	.include "data/maps/events/BattleTower_Outside.inc"
+	.include "data/maps/events/BattleTower_Lobby.inc"
+	.include "data/maps/events/BattleTower_Elevator.inc"
+	.include "data/maps/events/BattleTower_Corridor.inc"
+	.include "data/maps/events/BattleTower_BattleRoom.inc"
+	.include "data/maps/events/SouthernIsland_Exterior.inc"
+	.include "data/maps/events/SouthernIsland_Interior.inc"
+	.include "data/maps/events/SafariZone_RestHouse.inc"
+	.include "data/maps/events/Route104_Prototype.inc"
+	.include "data/maps/events/Route104_PrototypePrettyPetalFlowerShop.inc"
+	.include "data/maps/events/Route109_SeashoreHouse.inc"
+	.include "data/maps/events/Route110_TrickHouseEntrance.inc"
+	.include "data/maps/events/Route110_TrickHouseEnd.inc"
+	.include "data/maps/events/Route110_TrickHouseCorridor.inc"
+	.include "data/maps/events/Route110_TrickHousePuzzle1.inc"
+	.include "data/maps/events/Route110_TrickHousePuzzle2.inc"
+	.include "data/maps/events/Route110_TrickHousePuzzle3.inc"
+	.include "data/maps/events/Route110_TrickHousePuzzle4.inc"
+	.include "data/maps/events/Route110_TrickHousePuzzle5.inc"
+	.include "data/maps/events/Route110_TrickHousePuzzle6.inc"
+	.include "data/maps/events/Route110_TrickHousePuzzle7.inc"
+	.include "data/maps/events/Route110_TrickHousePuzzle8.inc"
+	.include "data/maps/events/Route110_SeasideCyclingRoadSouthEntrance.inc"
+	.include "data/maps/events/Route110_SeasideCyclingRoadNorthEntrance.inc"
+	.include "data/maps/events/Route113_GlassWorkshop.inc"
+	.include "data/maps/events/Route123_BerryMastersHouse.inc"
+	.include "data/maps/events/Route119_WeatherInstitute_1F.inc"
+	.include "data/maps/events/Route119_WeatherInstitute_2F.inc"
+	.include "data/maps/events/Route119_House.inc"
 Route124_DivingTreasureHuntersHouse_MapObjects:: @ 839300C
 	object_event 1, MAP_OBJ_GFX_MAN_6, 0, 5, 0, 4, 0, 0, 9, 0, 0, 0, 0, 0, 0, Route124_DivingTreasureHuntersHouse_EventScript_163E04, 0, 0, 0
 
@@ -11019,7 +11019,7 @@ gTrainerBattleSpecs_4:: @ 839AE28
 	.4byte gTrainerBattleScriptReturnAddress, 6
 
 @ 839AE70
-	.include "data/trainer_eye_trainers.s"
+	.include "data/trainer_eye_trainers.inc"
 
 	.align 2
 gUnknown_0839B1F0:: @ 839B1F0
@@ -11185,7 +11185,7 @@ gSpriteTemplate_839B528:: @ 839B528
 	spr_template 0xFFFF, 4100, gOamData_839B4D8, gSpriteAnimTable_839B508, gSpriteImageTable_839B4F0, gDummySpriteAffineAnimTable, objc_exclamation_mark_probably
 
 @ 839B540
-	.include "data/wild_mons.s"
+	.include "data/wild_mons.inc"
 
 	.align 2
 gWildFeebasRoute119Data:: @ 839DBFC
@@ -11687,7 +11687,7 @@ gUnknown_0839FA7C:: @ 839FA7C
 	.incbin "graphics/pokedex/noball.4bpp.lz"
 
 @ 839FAC4
-	.include "data/pokedex_orders.s"
+	.include "data/pokedex_orders.inc"
 
 	.align 2
 gOamData_83A0404:: @ 83A0404
@@ -11915,13 +11915,13 @@ gUnknown_083A05F8:: @ 83A05F8
 	.string "$"
 
 @ 83A05F9
-	.include "data/pokedex_entries.s"
+	.include "data/pokedex_entries.inc"
 
 gUnknown_083B4EC4:: @ 83B4EC4
 	.space 32
 
 @ 83B4EE4
-	.include "data/graphics/pokemon/footprint_table.s"
+	.include "data/graphics/pokemon/footprint_table.inc"
 
 gUnknown_083B5558:: @ 83B5558
 	.incbin "baserom.gba", 0x3b5558, 0x24
@@ -12979,13 +12979,13 @@ gUnknown_083BBCA0:: @ 83BBCA0
 	.4byte PCText_Plain
 
 @ 83BBD20
-	.include "data/graphics/pokemon/icon_table.s"
+	.include "data/graphics/pokemon/icon_table.inc"
 
 @ 83BC400
-	.include "data/graphics/pokemon/icon_palette_indices.s"
+	.include "data/graphics/pokemon/icon_palette_indices.inc"
 
 @ 83BC5B8
-	.include "data/graphics/pokemon/icon_palette_table.s"
+	.include "data/graphics/pokemon/icon_palette_table.inc"
 
 	.align 2
 gOamData_83BC5E8:: @ 83BC5E8
@@ -13067,10 +13067,10 @@ gSpriteImageSizes:: @ 83BC668
 	.2byte 0x400 @ 4×8
 
 @ 83BC680
-	.include "data/text/move_descriptions.s"
+	.include "data/text/move_descriptions.inc"
 
 @ 83C0F60
-	.include "data/text/nature_names.s"
+	.include "data/text/nature_names.inc"
 
 	.align 2
 gUnknown_083C1068:: @ 83C1068
@@ -13735,7 +13735,7 @@ gSpriteTemplate_83C1E04:: @ 83C1E04
 	spr_template 0xFFFF, 30020, gOamData_83C1D58, gSpriteAnimTable_83C1D68, gSpriteImageTable_83C1D6C, gSpriteAffineAnimTable_83C1DFC, SpriteCallbackDummy
 
 @ 83C1E1C
-	.include "data/graphics/berries/graphics_table.s"
+	.include "data/graphics/berries/graphics_table.inc"
 
 	.align 2
 gUnknown_083C1F74:: @ 83C1F74
@@ -13785,10 +13785,10 @@ gBattleAnimSpriteTemplate_83C2010:: @ 83C2010
 	spr_template 0, 0, gDummyOamData, gDummySpriteAnimTable, NULL, gDummySpriteAffineAnimTable, sub_80A8818
 
 @ 83C2028
-	.include "data/text/item_descriptions.s"
+	.include "data/text/item_descriptions.inc"
 
 @ 83C5564
-	.include "data/items.s"
+	.include "data/items.inc"
 
 @ 83C9150
 	.string "テストです$" @ "test"
@@ -13963,7 +13963,7 @@ gUnknown_083C9400:: @ 83C9400
 	.incbin "baserom.gba", 0x003c9400, 0x8
 
 @ 83C9408
-	.include "data/contest_opponents.s"
+	.include "data/contest_opponents.inc"
 
 gUnknown_083CA308:: @ 83CA308
 	.byte 19,  0
@@ -14131,7 +14131,7 @@ gUnknown_083CA4CC:: @ 83CA4CC
 gUnknown_083CA4D4:: @ 83CA4D4
 	spr_template 0xABE0, 0xABE0, gOamData_837DF2C, gDummySpriteAnimTable, NULL, gDummySpriteAffineAnimTable, SpriteCallbackDummy
 
-	.include "data/text/contest_strings.s"
+	.include "data/text/contest_strings.inc"
 
 gUnknownText_MissedTurn:: @ 83CC355
 	.string "Missed turn$"
@@ -14297,7 +14297,7 @@ gUnknown_083CC5A4:: @ 83CC5A4
 	.incbin "baserom.gba", 0x003cc5a4, 0x10
 
 @ 83CC5B4
-	.include "data/contest_excitement_table.s"
+	.include "data/contest_excitement_table.inc"
 
 	.align 2
 gUnknown_083CC5D0:: @ 83CC5D0
@@ -14361,17 +14361,17 @@ gUnknown_083CC738:: @ 83CC738
 	.incbin "baserom.gba", 0x003cc738, 0x8
 
 @ 83CC740
-	.include "data/text/berry_descriptions.s"
+	.include "data/text/berry_descriptions.inc"
 
 @ 83CD2CC
-	.include "data/berries.s"
+	.include "data/berries.inc"
 
 	.align 2
 gUnknown_083CD780:: @ 83CD780
 	.4byte 0, 0
 
 @ 83CD788
-	.include "data/multichoice.s"
+	.include "data/multichoice.inc"
 
 	.align 2
 gUnknown_083CE048:: @ 83CE048
@@ -14765,10 +14765,10 @@ gUnknown_083CF58C:: @ 83CF58C
 	obj_pal gMenuMoneyPal, 0x2722
 
 @ 83CF594
-	.include "data/contest_moves.s"
+	.include "data/contest_moves.inc"
 
 @ 83D00AC
-	.include "data/contest_effects.s"
+	.include "data/contest_effects.inc"
 
 @ A lookup table with TRUE for each combo starter ID and FALSE for ID 0,
 @ which means "not a combo starter move".
@@ -14779,7 +14779,7 @@ gComboStarterLookupTable:: @ 83D016C
 	.endr
 
 @ 83D01AC
-	.include "data/contest_effect_funcs.s"
+	.include "data/contest_effect_funcs.inc"
 
 	.align 2
 gUnknown_083D026C:: @ 83D026C
@@ -14935,7 +14935,7 @@ gOtherText_RL:: @ 83D0409
 	.string "  RL$"
 
 @ 83D040E
-	.include "data/text/song_names.s"
+	.include "data/text/song_names.inc"
 
 gUnknown_083D1358:: @ 83D1358
 	.incbin "baserom.gba", 0x003d1358, 0x1c
@@ -20829,19 +20829,19 @@ gUnknown_083DBEAC:: @ 83DBEAC
 	.incbin "baserom.gba", 0x003dbeac, 0x80
 
 @ 83DBF2C
-	.include "data/text/easy_chat/group_words.s"
+	.include "data/text/easy_chat/group_words.inc"
 
 @ 83DE138
-	.include "data/text/easy_chat/words_by_letter.s"
+	.include "data/text/easy_chat/words_by_letter.inc"
 
 @ 83DEFFA
-	.include "data/text/easy_chat/group_sizes.s"
+	.include "data/text/easy_chat/group_sizes.inc"
 
 @ 83DF010
-	.include "data/text/easy_chat/group_orders.s"
+	.include "data/text/easy_chat/group_orders.inc"
 
 @ 83DFE6C
-	.include "data/text/easy_chat/group_name_table.s"
+	.include "data/text/easy_chat/group_name_table.inc"
 
 gUnknown_083DFEC4:: @ 83DFEC4
 	.incbin "baserom.gba", 0x003dfec4, 0x4
@@ -21016,13 +21016,13 @@ gPokenavCityMap_Petalburg_0:: @ 83E0F6C
 	.incbin "graphics/pokenav/city_maps/petalburg_0.bin.lz"
 
 @ 83E0FC8
-	.include "data/text/ribbon_descriptions.s"
+	.include "data/text/ribbon_descriptions.inc"
 
 @ 83E1204
-	.include "data/text/gift_ribbon_descriptions.s"
+	.include "data/text/gift_ribbon_descriptions.inc"
 
 @ 83E178C
-	.include "data/text/trainer_eye_descriptions.s"
+	.include "data/text/trainer_eye_descriptions.inc"
 
 	.align 2
 gUnknown_083E31B0:: @ 83E31B0
@@ -22219,10 +22219,10 @@ gUnknown_083E6B04:: @ 83E6B04
 	.incbin "graphics/pokenav/region_map_map.bin.lz"
 
 @ 83E6E50
-	.include "data/region_map_sections.s"
+	.include "data/region_map_sections.inc"
 
 @ 83E6FF4
-	.include "data/region_map_locations.s"
+	.include "data/region_map_locations.inc"
 
 gUnknown_083E7684:: @ 83E7684
 	.incbin "baserom.gba", 0x003e7684, 0x34
@@ -22362,10 +22362,10 @@ gSpriteTemplate_83E7A38:: @ 83E7A38
 	spr_template 2, 2, gOamData_83E79DC, gSpriteAnimTable_83E7A1C, NULL, gDummySpriteAffineAnimTable, SpriteCallbackDummy
 
 @ 83E7A50
-	.include "data/cute_sketch.s"
+	.include "data/cute_sketch.inc"
 
 @ 83E9FD0
-	.include "data/decorations.s"
+	.include "data/decorations.inc"
 
 	.align 2
 gUnknown_083EC5E4:: @ 83EC5E4
@@ -24230,7 +24230,7 @@ gSpriteTemplate_83F7B40:: @ 83F7B40
 	spr_template 4096, 4096, gOamData_83F7B08, gSpriteAnimTable_83F7B24, NULL, gDummySpriteAffineAnimTable, sub_810B230
 
 @ 83F7B58
-	.include "data/clock_hand_coords.s"
+	.include "data/clock_hand_coords.inc"
 
 gUnknown_083F7E28:: @ 83F7E28
 	.incbin "baserom.gba", 0x003f7e28, 0x80
@@ -25402,7 +25402,7 @@ gCryMeterNeedleSpritePalettes:: @ 83FB79C
 	null_obj_pal
 
 @ 83FB7AC
-	.include "data/landmarks.s"
+	.include "data/landmarks.inc"
 
 	.align 2
 gUnknown_083FBB88:: @ 83FBB88
@@ -25761,7 +25761,7 @@ gUnknown_083FDB44:: @ 83FDB44
 gUnknown_083FDFF4:: @ 83FDFF4
 	.incbin "graphics/battle_transitions/elite_four_bg_map.bin"
 
-	.include "data/text/battle_strings.s"
+	.include "data/text/battle_strings.inc"
 
 gUnknown_084016BC:: @ 84016BC
 	.incbin "baserom.gba", 0x004016bc, 0xec
@@ -26943,16 +26943,16 @@ gRoamerLocations:: @ 8402E80
 	.byte 0xFF,0xFF,0xFF,0xFF,0xFF,0xFF
 
 @ 8402F00
-	.include "data/battle_tower/trainers.s"
+	.include "data/battle_tower/trainers.inc"
 
 @ 8403860
-	.include "data/battle_tower/held_items.s"
+	.include "data/battle_tower/held_items.inc"
 
 @ 84038E0
-	.include "data/battle_tower/level_50_mons.s"
+	.include "data/battle_tower/level_50_mons.inc"
 
 @ 8404BA0
-	.include "data/battle_tower/level_100_mons.s"
+	.include "data/battle_tower/level_100_mons.inc"
 
 gUnknown_08405E60:: @ 8405E60
 	.incbin "baserom.gba", 0x00405e60, 0x1e
@@ -28071,7 +28071,7 @@ gUnknown_0840B869:: @ 840B869
 gUnknown_0840B878::
 	.incbin "baserom.gba", 0x0040B878, 0xf
 
-	.include "data/text/credits.s"
+	.include "data/text/credits.inc"
 
 gUnknown_0840CA00:: @ 840CA00
 	.incbin "baserom.gba", 0x0040ca00, 0x8
@@ -30216,7 +30216,7 @@ gUnknown_08411980:: @ 8411980
 	.incbin "graphics/misc/clock_small.4bpp.lz"
 
 @ 8411A10
-	.include "data/mon_pokeblock_anims.s"
+	.include "data/mon_pokeblock_anims.inc"
 
 	.align 2
 gSpriteAffineAnim_8411E90:: @ 8411E90
@@ -30915,7 +30915,7 @@ gUnknown_084170F4:: @ 84170F4
 	.incbin "baserom.gba", 0x004170f4, 0xD0
 
 @ 84171C4
-	.include "data/bard_music.s"
+	.include "data/bard_music.inc"
 
 UnknownString_1stRound:
 	.string "1st round$"
@@ -31140,7 +31140,7 @@ gOtherText_FourQuestions:: @ 842C7D6
 	.string "????$"
 
 @ 842C7DB
-	.include "data/text/easy_chat/group_name_strings.s"
+	.include "data/text/easy_chat/group_name_strings.inc"
 
 gOtherText_ThreeQuestions:: @ 842C890
 	.string "???$"
@@ -31354,7 +31354,7 @@ gOtherText_LinkStandby:: @ 842CEAF
 	.string "Link standby...$"
 
 @ 842CEBF
-	.include "data/text/landmarks.s"
+	.include "data/text/landmarks.inc"
 
 gOtherText_Terminator4:: @ 842D0E6
 	.string "$"
diff --git a/data/decorations.s b/data/decorations.inc
index 268ebee9a..268ebee9a 100644
--- a/data/decorations.s
+++ b/data/decorations.inc
diff --git a/data/egg_moves.s b/data/egg_moves.inc
index e684e04ce..e684e04ce 100644
--- a/data/egg_moves.s
+++ b/data/egg_moves.inc
diff --git a/data/enemy_mon_elevation.s b/data/enemy_mon_elevation.inc
index 7e13f20d5..7e13f20d5 100644
--- a/data/enemy_mon_elevation.s
+++ b/data/enemy_mon_elevation.inc
diff --git a/data/event_scripts.s b/data/event_scripts.s
index 73e7da981..79104d56a 100644
--- a/data/event_scripts.s
+++ b/data/event_scripts.s
@@ -1,11 +1,11 @@
-	.include "asm/macros.s"
-	.include "asm/macros/event.s"
-	.include "constants/constants.s"
+	.include "asm/macros.inc"
+	.include "asm/macros/event.inc"
+	.include "constants/constants.inc"
 
 	.section script_data, "aw", %progbits
 
 @ 814AE30
-	.include "data/script_cmd_table.s"
+	.include "data/script_cmd_table.inc"
 
 	.align 2
 gSpecialVars::
@@ -28,7 +28,7 @@ gSpecialVars::
 	.4byte 0x203869e
 	.4byte 0x203869c
 
-	.include "data/specials.s"
+	.include "data/specials.inc"
 
 	.align 2
 gStdScripts::
@@ -42,346 +42,346 @@ gStdScripts::
 	.4byte Std_ObtainDecoration
 gStdScripts_End::
 
-	.include "data/scripts/maps/PetalburgCity.s"
-	.include "data/scripts/maps/SlateportCity.s"
-	.include "data/scripts/maps/MauvilleCity.s"
-	.include "data/scripts/maps/RustboroCity.s"
-	.include "data/scripts/maps/FortreeCity.s"
-	.include "data/scripts/maps/LilycoveCity.s"
-	.include "data/scripts/maps/MossdeepCity.s"
-	.include "data/scripts/maps/SootopolisCity.s"
-	.include "data/scripts/maps/EverGrandeCity.s"
-	.include "data/scripts/maps/LittlerootTown.s"
-	.include "data/scripts/maps/OldaleTown.s"
-	.include "data/scripts/maps/DewfordTown.s"
-	.include "data/scripts/maps/LavaridgeTown.s"
-	.include "data/scripts/maps/FallarborTown.s"
-	.include "data/scripts/maps/VerdanturfTown.s"
-	.include "data/scripts/maps/PacifidlogTown.s"
-	.include "data/scripts/maps/Route101.s"
-	.include "data/scripts/maps/Route102.s"
-	.include "data/scripts/maps/Route103.s"
-	.include "data/scripts/maps/Route104.s"
-	.include "data/scripts/maps/Route105.s"
-	.include "data/scripts/maps/Route106.s"
-	.include "data/scripts/maps/Route107.s"
-	.include "data/scripts/maps/Route108.s"
-	.include "data/scripts/maps/Route109.s"
-	.include "data/scripts/maps/Route110.s"
-	.include "data/scripts/maps/Route111.s"
-	.include "data/scripts/maps/Route112.s"
-	.include "data/scripts/maps/Route113.s"
-	.include "data/scripts/maps/Route114.s"
-	.include "data/scripts/maps/Route115.s"
-	.include "data/scripts/maps/Route116.s"
-	.include "data/scripts/maps/Route117.s"
-	.include "data/scripts/maps/Route118.s"
-	.include "data/scripts/maps/Route119.s"
-	.include "data/scripts/maps/Route120.s"
-	.include "data/scripts/maps/Route121.s"
-	.include "data/scripts/maps/Route122.s"
-	.include "data/scripts/maps/Route123.s"
-	.include "data/scripts/maps/Route124.s"
-	.include "data/scripts/maps/Route125.s"
-	.include "data/scripts/maps/Route126.s"
-	.include "data/scripts/maps/Route127.s"
-	.include "data/scripts/maps/Route128.s"
-	.include "data/scripts/maps/Route129.s"
-	.include "data/scripts/maps/Route130.s"
-	.include "data/scripts/maps/Route131.s"
-	.include "data/scripts/maps/Route132.s"
-	.include "data/scripts/maps/Route133.s"
-	.include "data/scripts/maps/Route134.s"
-	.include "data/scripts/maps/Underwater1.s"
-	.include "data/scripts/maps/Underwater2.s"
-	.include "data/scripts/maps/Underwater3.s"
-	.include "data/scripts/maps/Underwater4.s"
-	.include "data/scripts/maps/LittlerootTown_BrendansHouse_1F.s"
-	.include "data/scripts/maps/LittlerootTown_BrendansHouse_2F.s"
-	.include "data/scripts/maps/LittlerootTown_MaysHouse_1F.s"
-	.include "data/scripts/maps/LittlerootTown_MaysHouse_2F.s"
-	.include "data/scripts/maps/LittlerootTown_ProfessorBirchsLab.s"
-	.include "data/scripts/maps/OldaleTown_House1.s"
-	.include "data/scripts/maps/OldaleTown_House2.s"
-	.include "data/scripts/maps/OldaleTown_PokemonCenter_1F.s"
-	.include "data/scripts/maps/OldaleTown_PokemonCenter_2F.s"
-	.include "data/scripts/maps/OldaleTown_Mart.s"
-	.include "data/scripts/maps/DewfordTown_House1.s"
-	.include "data/scripts/maps/DewfordTown_PokemonCenter_1F.s"
-	.include "data/scripts/maps/DewfordTown_PokemonCenter_2F.s"
-	.include "data/scripts/maps/DewfordTown_Gym.s"
-	.include "data/scripts/maps/DewfordTown_Hall.s"
-	.include "data/scripts/maps/DewfordTown_House2.s"
-	.include "data/scripts/maps/LavaridgeTown_HerbShop.s"
-	.include "data/scripts/maps/LavaridgeTown_Gym_1F.s"
-	.include "data/scripts/maps/LavaridgeTown_Gym_B1F.s"
-	.include "data/scripts/maps/LavaridgeTown_House.s"
-	.include "data/scripts/maps/LavaridgeTown_Mart.s"
-	.include "data/scripts/maps/LavaridgeTown_PokemonCenter_1F.s"
-	.include "data/scripts/maps/LavaridgeTown_PokemonCenter_2F.s"
-	.include "data/scripts/maps/FallarborTown_Mart.s"
-	.include "data/scripts/maps/FallarborTown_ContestLobby.s"
-	.include "data/scripts/maps/FallarborTown_ContestHall.s"
-	.include "data/scripts/maps/FallarborTown_PokemonCenter_1F.s"
-	.include "data/scripts/maps/FallarborTown_PokemonCenter_2F.s"
-	.include "data/scripts/maps/FallarborTown_House1.s"
-	.include "data/scripts/maps/FallarborTown_House2.s"
-	.include "data/scripts/maps/VerdanturfTown_ContestLobby.s"
-	.include "data/scripts/maps/VerdanturfTown_ContestHall.s"
-	.include "data/scripts/maps/VerdanturfTown_Mart.s"
-	.include "data/scripts/maps/VerdanturfTown_PokemonCenter_1F.s"
-	.include "data/scripts/maps/VerdanturfTown_PokemonCenter_2F.s"
-	.include "data/scripts/maps/VerdanturfTown_WandasHouse.s"
-	.include "data/scripts/maps/VerdanturfTown_FriendshipRatersHouse.s"
-	.include "data/scripts/maps/VerdanturfTown_House.s"
-	.include "data/scripts/maps/PacifidlogTown_PokemonCenter_1F.s"
-	.include "data/scripts/maps/PacifidlogTown_PokemonCenter_2F.s"
-	.include "data/scripts/maps/PacifidlogTown_House1.s"
-	.include "data/scripts/maps/PacifidlogTown_House2.s"
-	.include "data/scripts/maps/PacifidlogTown_House3.s"
-	.include "data/scripts/maps/PacifidlogTown_House4.s"
-	.include "data/scripts/maps/PacifidlogTown_House5.s"
-	.include "data/scripts/maps/PetalburgCity_WallysHouse.s"
-	.include "data/scripts/maps/PetalburgCity_Gym.s"
-	.include "data/scripts/maps/PetalburgCity_House1.s"
-	.include "data/scripts/maps/PetalburgCity_House2.s"
-	.include "data/scripts/maps/PetalburgCity_PokemonCenter_1F.s"
-	.include "data/scripts/maps/PetalburgCity_PokemonCenter_2F.s"
-	.include "data/scripts/maps/PetalburgCity_Mart.s"
-	.include "data/scripts/maps/SlateportCity_SternsShipyard_1F.s"
-	.include "data/scripts/maps/SlateportCity_SternsShipyard_2F.s"
-	.include "data/scripts/maps/SlateportCity_ContestLobby.s"
-	.include "data/scripts/maps/SlateportCity_ContestHall.s"
-	.include "data/scripts/maps/SlateportCity_House1.s"
-	.include "data/scripts/maps/SlateportCity_PokemonFanClub.s"
-	.include "data/scripts/maps/SlateportCity_OceanicMuseum_1F.s"
-	.include "data/scripts/maps/SlateportCity_OceanicMuseum_2F.s"
-	.include "data/scripts/maps/SlateportCity_Harbor.s"
-	.include "data/scripts/maps/SlateportCity_House2.s"
-	.include "data/scripts/maps/SlateportCity_PokemonCenter_1F.s"
-	.include "data/scripts/maps/SlateportCity_PokemonCenter_2F.s"
-	.include "data/scripts/maps/SlateportCity_Mart.s"
-	.include "data/scripts/maps/MauvilleCity_Gym.s"
-	.include "data/scripts/maps/MauvilleCity_BikeShop.s"
-	.include "data/scripts/maps/MauvilleCity_House1.s"
-	.include "data/scripts/maps/MauvilleCity_GameCorner.s"
-	.include "data/scripts/maps/MauvilleCity_House2.s"
-	.include "data/scripts/maps/MauvilleCity_PokemonCenter_1F.s"
-	.include "data/scripts/maps/MauvilleCity_PokemonCenter_2F.s"
-	.include "data/scripts/maps/MauvilleCity_Mart.s"
-	.include "data/scripts/maps/RustboroCity_DevonCorp_1F.s"
-	.include "data/scripts/maps/RustboroCity_DevonCorp_2F.s"
-	.include "data/scripts/maps/RustboroCity_DevonCorp_3F.s"
-	.include "data/scripts/maps/RustboroCity_Gym.s"
-	.include "data/scripts/maps/RustboroCity_PokemonSchool.s"
-	.include "data/scripts/maps/RustboroCity_PokemonCenter_1F.s"
-	.include "data/scripts/maps/RustboroCity_PokemonCenter_2F.s"
-	.include "data/scripts/maps/RustboroCity_Mart.s"
-	.include "data/scripts/maps/RustboroCity_Flat1_1F.s"
-	.include "data/scripts/maps/RustboroCity_Flat1_2F.s"
-	.include "data/scripts/maps/RustboroCity_House1.s"
-	.include "data/scripts/maps/RustboroCity_CuttersHouse.s"
-	.include "data/scripts/maps/RustboroCity_House2.s"
-	.include "data/scripts/maps/RustboroCity_Flat2_1F.s"
-	.include "data/scripts/maps/RustboroCity_Flat2_2F.s"
-	.include "data/scripts/maps/RustboroCity_Flat2_3F.s"
-	.include "data/scripts/maps/RustboroCity_House3.s"
-	.include "data/scripts/maps/FortreeCity_House1.s"
-	.include "data/scripts/maps/FortreeCity_Gym.s"
-	.include "data/scripts/maps/FortreeCity_PokemonCenter_1F.s"
-	.include "data/scripts/maps/FortreeCity_PokemonCenter_2F.s"
-	.include "data/scripts/maps/FortreeCity_Mart.s"
-	.include "data/scripts/maps/FortreeCity_House2.s"
-	.include "data/scripts/maps/FortreeCity_House3.s"
-	.include "data/scripts/maps/FortreeCity_House4.s"
-	.include "data/scripts/maps/FortreeCity_House5.s"
-	.include "data/scripts/maps/FortreeCity_DecorationShop.s"
-	.include "data/scripts/maps/LilycoveCity_CoveLilyMotel_1F.s"
-	.include "data/scripts/maps/LilycoveCity_CoveLilyMotel_2F.s"
-	.include "data/scripts/maps/LilycoveCity_LilycoveMuseum_1F.s"
-	.include "data/scripts/maps/LilycoveCity_LilycoveMuseum_2F.s"
-	.include "data/scripts/maps/LilycoveCity_ContestLobby.s"
-	.include "data/scripts/maps/LilycoveCity_ContestHall.s"
-	.include "data/scripts/maps/LilycoveCity_PokemonCenter_1F.s"
-	.include "data/scripts/maps/LilycoveCity_PokemonCenter_2F.s"
-	.include "data/scripts/maps/LilycoveCity_UnusedMart.s"
-	.include "data/scripts/maps/LilycoveCity_PokemonTrainerFanClub.s"
-	.include "data/scripts/maps/LilycoveCity_Harbor.s"
-	.include "data/scripts/maps/LilycoveCity_EmptyMap.s"
-	.include "data/scripts/maps/LilycoveCity_MoveDeletersHouse.s"
-	.include "data/scripts/maps/LilycoveCity_House1.s"
-	.include "data/scripts/maps/LilycoveCity_House2.s"
-	.include "data/scripts/maps/LilycoveCity_House3.s"
-	.include "data/scripts/maps/LilycoveCity_House4.s"
-	.include "data/scripts/maps/LilycoveCity_DepartmentStore_1F.s"
-	.include "data/scripts/maps/LilycoveCity_DepartmentStore_2F.s"
-	.include "data/scripts/maps/LilycoveCity_DepartmentStore_3F.s"
-	.include "data/scripts/maps/LilycoveCity_DepartmentStore_4F.s"
-	.include "data/scripts/maps/LilycoveCity_DepartmentStore_5F.s"
-	.include "data/scripts/maps/LilycoveCity_DepartmentStoreRooftop.s"
-	.include "data/scripts/maps/LilycoveCity_DepartmentStoreElevator.s"
-	.include "data/scripts/maps/MossdeepCity_Gym.s"
-	.include "data/scripts/maps/MossdeepCity_House1.s"
-	.include "data/scripts/maps/MossdeepCity_House2.s"
-	.include "data/scripts/maps/MossdeepCity_PokemonCenter_1F.s"
-	.include "data/scripts/maps/MossdeepCity_PokemonCenter_2F.s"
-	.include "data/scripts/maps/MossdeepCity_Mart.s"
-	.include "data/scripts/maps/MossdeepCity_House3.s"
-	.include "data/scripts/maps/MossdeepCity_StevensHouse.s"
-	.include "data/scripts/maps/MossdeepCity_House4.s"
-	.include "data/scripts/maps/MossdeepCity_SpaceCenter_1F.s"
-	.include "data/scripts/maps/MossdeepCity_SpaceCenter_2F.s"
-	.include "data/scripts/maps/MossdeepCity_GameCorner_1F.s"
-	.include "data/scripts/maps/MossdeepCity_GameCorner_B1F.s"
-	.include "data/scripts/maps/SootopolisCity_Gym_1F.s"
-	.include "data/scripts/maps/SootopolisCity_Gym_B1F.s"
-	.include "data/scripts/maps/SootopolisCity_PokemonCenter_1F.s"
-	.include "data/scripts/maps/SootopolisCity_PokemonCenter_2F.s"
-	.include "data/scripts/maps/SootopolisCity_Mart.s"
-	.include "data/scripts/maps/SootopolisCity_House1.s"
-	.include "data/scripts/maps/SootopolisCity_House2.s"
-	.include "data/scripts/maps/SootopolisCity_House3.s"
-	.include "data/scripts/maps/SootopolisCity_House4.s"
-	.include "data/scripts/maps/SootopolisCity_House5.s"
-	.include "data/scripts/maps/SootopolisCity_House6.s"
-	.include "data/scripts/maps/SootopolisCity_House7.s"
-	.include "data/scripts/maps/SootopolisCity_House8.s"
-	.include "data/scripts/maps/EverGrandeCity_SidneysRoom.s"
-	.include "data/scripts/maps/EverGrandeCity_PhoebesRoom.s"
-	.include "data/scripts/maps/EverGrandeCity_GlaciasRoom.s"
-	.include "data/scripts/maps/EverGrandeCity_DrakesRoom.s"
-	.include "data/scripts/maps/EverGrandeCity_ChampionsRoom.s"
-	.include "data/scripts/maps/EverGrandeCity_Corridor1.s"
-	.include "data/scripts/maps/EverGrandeCity_Corridor2.s"
-	.include "data/scripts/maps/EverGrandeCity_Corridor3.s"
-	.include "data/scripts/maps/EverGrandeCity_Corridor4.s"
-	.include "data/scripts/maps/EverGrandeCity_Corridor5.s"
-	.include "data/scripts/maps/EverGrandeCity_PokemonLeague.s"
-	.include "data/scripts/maps/EverGrandeCity_HallOfFame.s"
-	.include "data/scripts/maps/EverGrandeCity_PokemonCenter_1F.s"
-	.include "data/scripts/maps/EverGrandeCity_PokemonCenter_2F.s"
-	.include "data/scripts/maps/Route104_MrBrineysHouse.s"
-	.include "data/scripts/maps/Route104_PrettyPetalFlowerShop.s"
-	.include "data/scripts/maps/Route111_WinstrateFamilysHouse.s"
-	.include "data/scripts/maps/Route111_OldLadysRestStop.s"
-	.include "data/scripts/maps/Route112_CableCarStation.s"
-	.include "data/scripts/maps/MtChimney_CableCarStation.s"
-	.include "data/scripts/maps/Route114_FossilManiacsHouse.s"
-	.include "data/scripts/maps/Route114_FossilManiacsTunnel.s"
-	.include "data/scripts/maps/Route114_LanettesHouse.s"
-	.include "data/scripts/maps/Route116_TunnelersRestHouse.s"
-	.include "data/scripts/maps/Route117_PokemonDayCare.s"
-	.include "data/scripts/maps/Route121_SafariZoneEntrance.s"
-	.include "data/scripts/maps/MeteorFalls_1F_1R.s"
-	.include "data/scripts/maps/MeteorFalls_1F_2R.s"
-	.include "data/scripts/maps/MeteorFalls_B1F_1R.s"
-	.include "data/scripts/maps/MeteorFalls_B1F_2R.s"
-	.include "data/scripts/maps/RusturfTunnel.s"
-	.include "data/scripts/maps/Underwater_SootopolisCity.s"
-	.include "data/scripts/maps/DesertRuins.s"
-	.include "data/scripts/maps/GraniteCave_1F.s"
-	.include "data/scripts/maps/GraniteCave_B1F.s"
-	.include "data/scripts/maps/GraniteCave_B2F.s"
-	.include "data/scripts/maps/GraniteCave_StevensRoom.s"
-	.include "data/scripts/maps/PetalburgWoods.s"
-	.include "data/scripts/maps/MtChimney.s"
-	.include "data/scripts/maps/JaggedPass.s"
-	.include "data/scripts/maps/FieryPath.s"
-	.include "data/scripts/maps/MtPyre_1F.s"
-	.include "data/scripts/maps/MtPyre_2F.s"
-	.include "data/scripts/maps/MtPyre_3F.s"
-	.include "data/scripts/maps/MtPyre_4F.s"
-	.include "data/scripts/maps/MtPyre_5F.s"
-	.include "data/scripts/maps/MtPyre_6F.s"
-	.include "data/scripts/maps/MtPyre_Exterior.s"
-	.include "data/scripts/maps/MtPyre_Summit.s"
-	.include "data/scripts/maps/AquaHideout_1F.s"
-	.include "data/scripts/maps/AquaHideout_B1F.s"
-	.include "data/scripts/maps/AquaHideout_B2F.s"
-	.include "data/scripts/maps/Underwater_SeafloorCavern.s"
-	.include "data/scripts/maps/SeafloorCavern_Entrance.s"
-	.include "data/scripts/maps/SeafloorCavern_Room1.s"
-	.include "data/scripts/maps/SeafloorCavern_Room2.s"
-	.include "data/scripts/maps/SeafloorCavern_Room3.s"
-	.include "data/scripts/maps/SeafloorCavern_Room4.s"
-	.include "data/scripts/maps/SeafloorCavern_Room5.s"
-	.include "data/scripts/maps/SeafloorCavern_Room6.s"
-	.include "data/scripts/maps/SeafloorCavern_Room7.s"
-	.include "data/scripts/maps/SeafloorCavern_Room8.s"
-	.include "data/scripts/maps/SeafloorCavern_Room9.s"
-	.include "data/scripts/maps/CaveOfOrigin_Entrance.s"
-	.include "data/scripts/maps/CaveOfOrigin_1F.s"
-	.include "data/scripts/maps/CaveOfOrigin_B1F.s"
-	.include "data/scripts/maps/CaveOfOrigin_B2F.s"
-	.include "data/scripts/maps/CaveOfOrigin_B3F.s"
-	.include "data/scripts/maps/CaveOfOrigin_B4F.s"
-	.include "data/scripts/maps/VictoryRoad_1F.s"
-	.include "data/scripts/maps/VictoryRoad_B1F.s"
-	.include "data/scripts/maps/VictoryRoad_B2F.s"
-	.include "data/scripts/maps/ShoalCave_LowTideEntranceRoom.s"
-	.include "data/scripts/maps/ShoalCave_LowTideInnerRoom.s"
-	.include "data/scripts/maps/ShoalCave_LowTideStairsRoom.s"
-	.include "data/scripts/maps/ShoalCave_LowTideLowerRoom.s"
-	.include "data/scripts/maps/ShoalCave_HighTideEntranceRoom.s"
-	.include "data/scripts/maps/ShoalCave_HighTideInnerRoom.s"
-	.include "data/scripts/maps/NewMauville_Entrance.s"
-	.include "data/scripts/maps/NewMauville_Inside.s"
-	.include "data/scripts/maps/AbandonedShip_Deck.s"
-	.include "data/scripts/maps/AbandonedShip_Corridors_1F.s"
-	.include "data/scripts/maps/AbandonedShip_Rooms_1F.s"
-	.include "data/scripts/maps/AbandonedShip_Corridors_B1F.s"
-	.include "data/scripts/maps/AbandonedShip_Rooms_B1F.s"
-	.include "data/scripts/maps/AbandonedShip_Rooms2_B1F.s"
-	.include "data/scripts/maps/AbandonedShip_Underwater1.s"
-	.include "data/scripts/maps/AbandonedShip_Room_B1F.s"
-	.include "data/scripts/maps/AbandonedShip_Rooms2_1F.s"
-	.include "data/scripts/maps/AbandonedShip_CaptainsOffice.s"
-	.include "data/scripts/maps/AbandonedShip_Underwater2.s"
-	.include "data/scripts/maps/AbandonedShip_HiddenFloorCorridors.s"
-	.include "data/scripts/maps/AbandonedShip_HiddenFloorRooms.s"
-	.include "data/scripts/maps/IslandCave.s"
-	.include "data/scripts/maps/AncientTomb.s"
-	.include "data/scripts/maps/Underwater_Route134.s"
-	.include "data/scripts/maps/Underwater_SealedChamber.s"
-	.include "data/scripts/maps/SealedChamber_OuterRoom.s"
-	.include "data/scripts/maps/SealedChamber_InnerRoom.s"
-	.include "data/scripts/maps/ScorchedSlab.s"
-	.include "data/scripts/maps/MagmaHideout_1F.s"
-	.include "data/scripts/maps/MagmaHideout_B1F.s"
-	.include "data/scripts/maps/MagmaHideout_B2F.s"
-	.include "data/scripts/maps/SkyPillar_Entrance.s"
-	.include "data/scripts/maps/SkyPillar_Outside.s"
-	.include "data/scripts/maps/SkyPillar_1F.s"
-	.include "data/scripts/maps/SkyPillar_2F.s"
-	.include "data/scripts/maps/SkyPillar_3F.s"
-	.include "data/scripts/maps/SkyPillar_4F.s"
-	.include "data/scripts/maps/ShoalCave_LowTideIceRoom.s"
-	.include "data/scripts/maps/SkyPillar_5F.s"
-	.include "data/scripts/maps/SkyPillar_Top.s"
-	.include "data/scripts/maps/SecretBase_BlueCave1.s"
-	.include "data/scripts/maps/SecretBase_BlueCave2.s"
-	.include "data/scripts/maps/SecretBase_BlueCave3.s"
-	.include "data/scripts/maps/SecretBase_BlueCave4.s"
-	.include "data/scripts/maps/SecretBase_BrownCave1.s"
-	.include "data/scripts/maps/SecretBase_BrownCave2.s"
-	.include "data/scripts/maps/SecretBase_BrownCave3.s"
-	.include "data/scripts/maps/SecretBase_BrownCave4.s"
-	.include "data/scripts/maps/SecretBase_RedCave1.s"
-	.include "data/scripts/maps/SecretBase_RedCave2.s"
-	.include "data/scripts/maps/SecretBase_RedCave3.s"
-	.include "data/scripts/maps/SecretBase_RedCave4.s"
-	.include "data/scripts/maps/SecretBase_Shrub1.s"
-	.include "data/scripts/maps/SecretBase_Shrub2.s"
-	.include "data/scripts/maps/SecretBase_Shrub3.s"
-	.include "data/scripts/maps/SecretBase_Shrub4.s"
-	.include "data/scripts/maps/SecretBase_Tree1.s"
-	.include "data/scripts/maps/SecretBase_Tree2.s"
-	.include "data/scripts/maps/SecretBase_Tree3.s"
-	.include "data/scripts/maps/SecretBase_Tree4.s"
-	.include "data/scripts/maps/SecretBase_YellowCave1.s"
-	.include "data/scripts/maps/SecretBase_YellowCave2.s"
-	.include "data/scripts/maps/SecretBase_YellowCave3.s"
-	.include "data/scripts/maps/SecretBase_YellowCave4.s"
+	.include "data/scripts/maps/PetalburgCity.inc"
+	.include "data/scripts/maps/SlateportCity.inc"
+	.include "data/scripts/maps/MauvilleCity.inc"
+	.include "data/scripts/maps/RustboroCity.inc"
+	.include "data/scripts/maps/FortreeCity.inc"
+	.include "data/scripts/maps/LilycoveCity.inc"
+	.include "data/scripts/maps/MossdeepCity.inc"
+	.include "data/scripts/maps/SootopolisCity.inc"
+	.include "data/scripts/maps/EverGrandeCity.inc"
+	.include "data/scripts/maps/LittlerootTown.inc"
+	.include "data/scripts/maps/OldaleTown.inc"
+	.include "data/scripts/maps/DewfordTown.inc"
+	.include "data/scripts/maps/LavaridgeTown.inc"
+	.include "data/scripts/maps/FallarborTown.inc"
+	.include "data/scripts/maps/VerdanturfTown.inc"
+	.include "data/scripts/maps/PacifidlogTown.inc"
+	.include "data/scripts/maps/Route101.inc"
+	.include "data/scripts/maps/Route102.inc"
+	.include "data/scripts/maps/Route103.inc"
+	.include "data/scripts/maps/Route104.inc"
+	.include "data/scripts/maps/Route105.inc"
+	.include "data/scripts/maps/Route106.inc"
+	.include "data/scripts/maps/Route107.inc"
+	.include "data/scripts/maps/Route108.inc"
+	.include "data/scripts/maps/Route109.inc"
+	.include "data/scripts/maps/Route110.inc"
+	.include "data/scripts/maps/Route111.inc"
+	.include "data/scripts/maps/Route112.inc"
+	.include "data/scripts/maps/Route113.inc"
+	.include "data/scripts/maps/Route114.inc"
+	.include "data/scripts/maps/Route115.inc"
+	.include "data/scripts/maps/Route116.inc"
+	.include "data/scripts/maps/Route117.inc"
+	.include "data/scripts/maps/Route118.inc"
+	.include "data/scripts/maps/Route119.inc"
+	.include "data/scripts/maps/Route120.inc"
+	.include "data/scripts/maps/Route121.inc"
+	.include "data/scripts/maps/Route122.inc"
+	.include "data/scripts/maps/Route123.inc"
+	.include "data/scripts/maps/Route124.inc"
+	.include "data/scripts/maps/Route125.inc"
+	.include "data/scripts/maps/Route126.inc"
+	.include "data/scripts/maps/Route127.inc"
+	.include "data/scripts/maps/Route128.inc"
+	.include "data/scripts/maps/Route129.inc"
+	.include "data/scripts/maps/Route130.inc"
+	.include "data/scripts/maps/Route131.inc"
+	.include "data/scripts/maps/Route132.inc"
+	.include "data/scripts/maps/Route133.inc"
+	.include "data/scripts/maps/Route134.inc"
+	.include "data/scripts/maps/Underwater1.inc"
+	.include "data/scripts/maps/Underwater2.inc"
+	.include "data/scripts/maps/Underwater3.inc"
+	.include "data/scripts/maps/Underwater4.inc"
+	.include "data/scripts/maps/LittlerootTown_BrendansHouse_1F.inc"
+	.include "data/scripts/maps/LittlerootTown_BrendansHouse_2F.inc"
+	.include "data/scripts/maps/LittlerootTown_MaysHouse_1F.inc"
+	.include "data/scripts/maps/LittlerootTown_MaysHouse_2F.inc"
+	.include "data/scripts/maps/LittlerootTown_ProfessorBirchsLab.inc"
+	.include "data/scripts/maps/OldaleTown_House1.inc"
+	.include "data/scripts/maps/OldaleTown_House2.inc"
+	.include "data/scripts/maps/OldaleTown_PokemonCenter_1F.inc"
+	.include "data/scripts/maps/OldaleTown_PokemonCenter_2F.inc"
+	.include "data/scripts/maps/OldaleTown_Mart.inc"
+	.include "data/scripts/maps/DewfordTown_House1.inc"
+	.include "data/scripts/maps/DewfordTown_PokemonCenter_1F.inc"
+	.include "data/scripts/maps/DewfordTown_PokemonCenter_2F.inc"
+	.include "data/scripts/maps/DewfordTown_Gym.inc"
+	.include "data/scripts/maps/DewfordTown_Hall.inc"
+	.include "data/scripts/maps/DewfordTown_House2.inc"
+	.include "data/scripts/maps/LavaridgeTown_HerbShop.inc"
+	.include "data/scripts/maps/LavaridgeTown_Gym_1F.inc"
+	.include "data/scripts/maps/LavaridgeTown_Gym_B1F.inc"
+	.include "data/scripts/maps/LavaridgeTown_House.inc"
+	.include "data/scripts/maps/LavaridgeTown_Mart.inc"
+	.include "data/scripts/maps/LavaridgeTown_PokemonCenter_1F.inc"
+	.include "data/scripts/maps/LavaridgeTown_PokemonCenter_2F.inc"
+	.include "data/scripts/maps/FallarborTown_Mart.inc"
+	.include "data/scripts/maps/FallarborTown_ContestLobby.inc"
+	.include "data/scripts/maps/FallarborTown_ContestHall.inc"
+	.include "data/scripts/maps/FallarborTown_PokemonCenter_1F.inc"
+	.include "data/scripts/maps/FallarborTown_PokemonCenter_2F.inc"
+	.include "data/scripts/maps/FallarborTown_House1.inc"
+	.include "data/scripts/maps/FallarborTown_House2.inc"
+	.include "data/scripts/maps/VerdanturfTown_ContestLobby.inc"
+	.include "data/scripts/maps/VerdanturfTown_ContestHall.inc"
+	.include "data/scripts/maps/VerdanturfTown_Mart.inc"
+	.include "data/scripts/maps/VerdanturfTown_PokemonCenter_1F.inc"
+	.include "data/scripts/maps/VerdanturfTown_PokemonCenter_2F.inc"
+	.include "data/scripts/maps/VerdanturfTown_WandasHouse.inc"
+	.include "data/scripts/maps/VerdanturfTown_FriendshipRatersHouse.inc"
+	.include "data/scripts/maps/VerdanturfTown_House.inc"
+	.include "data/scripts/maps/PacifidlogTown_PokemonCenter_1F.inc"
+	.include "data/scripts/maps/PacifidlogTown_PokemonCenter_2F.inc"
+	.include "data/scripts/maps/PacifidlogTown_House1.inc"
+	.include "data/scripts/maps/PacifidlogTown_House2.inc"
+	.include "data/scripts/maps/PacifidlogTown_House3.inc"
+	.include "data/scripts/maps/PacifidlogTown_House4.inc"
+	.include "data/scripts/maps/PacifidlogTown_House5.inc"
+	.include "data/scripts/maps/PetalburgCity_WallysHouse.inc"
+	.include "data/scripts/maps/PetalburgCity_Gym.inc"
+	.include "data/scripts/maps/PetalburgCity_House1.inc"
+	.include "data/scripts/maps/PetalburgCity_House2.inc"
+	.include "data/scripts/maps/PetalburgCity_PokemonCenter_1F.inc"
+	.include "data/scripts/maps/PetalburgCity_PokemonCenter_2F.inc"
+	.include "data/scripts/maps/PetalburgCity_Mart.inc"
+	.include "data/scripts/maps/SlateportCity_SternsShipyard_1F.inc"
+	.include "data/scripts/maps/SlateportCity_SternsShipyard_2F.inc"
+	.include "data/scripts/maps/SlateportCity_ContestLobby.inc"
+	.include "data/scripts/maps/SlateportCity_ContestHall.inc"
+	.include "data/scripts/maps/SlateportCity_House1.inc"
+	.include "data/scripts/maps/SlateportCity_PokemonFanClub.inc"
+	.include "data/scripts/maps/SlateportCity_OceanicMuseum_1F.inc"
+	.include "data/scripts/maps/SlateportCity_OceanicMuseum_2F.inc"
+	.include "data/scripts/maps/SlateportCity_Harbor.inc"
+	.include "data/scripts/maps/SlateportCity_House2.inc"
+	.include "data/scripts/maps/SlateportCity_PokemonCenter_1F.inc"
+	.include "data/scripts/maps/SlateportCity_PokemonCenter_2F.inc"
+	.include "data/scripts/maps/SlateportCity_Mart.inc"
+	.include "data/scripts/maps/MauvilleCity_Gym.inc"
+	.include "data/scripts/maps/MauvilleCity_BikeShop.inc"
+	.include "data/scripts/maps/MauvilleCity_House1.inc"
+	.include "data/scripts/maps/MauvilleCity_GameCorner.inc"
+	.include "data/scripts/maps/MauvilleCity_House2.inc"
+	.include "data/scripts/maps/MauvilleCity_PokemonCenter_1F.inc"
+	.include "data/scripts/maps/MauvilleCity_PokemonCenter_2F.inc"
+	.include "data/scripts/maps/MauvilleCity_Mart.inc"
+	.include "data/scripts/maps/RustboroCity_DevonCorp_1F.inc"
+	.include "data/scripts/maps/RustboroCity_DevonCorp_2F.inc"
+	.include "data/scripts/maps/RustboroCity_DevonCorp_3F.inc"
+	.include "data/scripts/maps/RustboroCity_Gym.inc"
+	.include "data/scripts/maps/RustboroCity_PokemonSchool.inc"
+	.include "data/scripts/maps/RustboroCity_PokemonCenter_1F.inc"
+	.include "data/scripts/maps/RustboroCity_PokemonCenter_2F.inc"
+	.include "data/scripts/maps/RustboroCity_Mart.inc"
+	.include "data/scripts/maps/RustboroCity_Flat1_1F.inc"
+	.include "data/scripts/maps/RustboroCity_Flat1_2F.inc"
+	.include "data/scripts/maps/RustboroCity_House1.inc"
+	.include "data/scripts/maps/RustboroCity_CuttersHouse.inc"
+	.include "data/scripts/maps/RustboroCity_House2.inc"
+	.include "data/scripts/maps/RustboroCity_Flat2_1F.inc"
+	.include "data/scripts/maps/RustboroCity_Flat2_2F.inc"
+	.include "data/scripts/maps/RustboroCity_Flat2_3F.inc"
+	.include "data/scripts/maps/RustboroCity_House3.inc"
+	.include "data/scripts/maps/FortreeCity_House1.inc"
+	.include "data/scripts/maps/FortreeCity_Gym.inc"
+	.include "data/scripts/maps/FortreeCity_PokemonCenter_1F.inc"
+	.include "data/scripts/maps/FortreeCity_PokemonCenter_2F.inc"
+	.include "data/scripts/maps/FortreeCity_Mart.inc"
+	.include "data/scripts/maps/FortreeCity_House2.inc"
+	.include "data/scripts/maps/FortreeCity_House3.inc"
+	.include "data/scripts/maps/FortreeCity_House4.inc"
+	.include "data/scripts/maps/FortreeCity_House5.inc"
+	.include "data/scripts/maps/FortreeCity_DecorationShop.inc"
+	.include "data/scripts/maps/LilycoveCity_CoveLilyMotel_1F.inc"
+	.include "data/scripts/maps/LilycoveCity_CoveLilyMotel_2F.inc"
+	.include "data/scripts/maps/LilycoveCity_LilycoveMuseum_1F.inc"
+	.include "data/scripts/maps/LilycoveCity_LilycoveMuseum_2F.inc"
+	.include "data/scripts/maps/LilycoveCity_ContestLobby.inc"
+	.include "data/scripts/maps/LilycoveCity_ContestHall.inc"
+	.include "data/scripts/maps/LilycoveCity_PokemonCenter_1F.inc"
+	.include "data/scripts/maps/LilycoveCity_PokemonCenter_2F.inc"
+	.include "data/scripts/maps/LilycoveCity_UnusedMart.inc"
+	.include "data/scripts/maps/LilycoveCity_PokemonTrainerFanClub.inc"
+	.include "data/scripts/maps/LilycoveCity_Harbor.inc"
+	.include "data/scripts/maps/LilycoveCity_EmptyMap.inc"
+	.include "data/scripts/maps/LilycoveCity_MoveDeletersHouse.inc"
+	.include "data/scripts/maps/LilycoveCity_House1.inc"
+	.include "data/scripts/maps/LilycoveCity_House2.inc"
+	.include "data/scripts/maps/LilycoveCity_House3.inc"
+	.include "data/scripts/maps/LilycoveCity_House4.inc"
+	.include "data/scripts/maps/LilycoveCity_DepartmentStore_1F.inc"
+	.include "data/scripts/maps/LilycoveCity_DepartmentStore_2F.inc"
+	.include "data/scripts/maps/LilycoveCity_DepartmentStore_3F.inc"
+	.include "data/scripts/maps/LilycoveCity_DepartmentStore_4F.inc"
+	.include "data/scripts/maps/LilycoveCity_DepartmentStore_5F.inc"
+	.include "data/scripts/maps/LilycoveCity_DepartmentStoreRooftop.inc"
+	.include "data/scripts/maps/LilycoveCity_DepartmentStoreElevator.inc"
+	.include "data/scripts/maps/MossdeepCity_Gym.inc"
+	.include "data/scripts/maps/MossdeepCity_House1.inc"
+	.include "data/scripts/maps/MossdeepCity_House2.inc"
+	.include "data/scripts/maps/MossdeepCity_PokemonCenter_1F.inc"
+	.include "data/scripts/maps/MossdeepCity_PokemonCenter_2F.inc"
+	.include "data/scripts/maps/MossdeepCity_Mart.inc"
+	.include "data/scripts/maps/MossdeepCity_House3.inc"
+	.include "data/scripts/maps/MossdeepCity_StevensHouse.inc"
+	.include "data/scripts/maps/MossdeepCity_House4.inc"
+	.include "data/scripts/maps/MossdeepCity_SpaceCenter_1F.inc"
+	.include "data/scripts/maps/MossdeepCity_SpaceCenter_2F.inc"
+	.include "data/scripts/maps/MossdeepCity_GameCorner_1F.inc"
+	.include "data/scripts/maps/MossdeepCity_GameCorner_B1F.inc"
+	.include "data/scripts/maps/SootopolisCity_Gym_1F.inc"
+	.include "data/scripts/maps/SootopolisCity_Gym_B1F.inc"
+	.include "data/scripts/maps/SootopolisCity_PokemonCenter_1F.inc"
+	.include "data/scripts/maps/SootopolisCity_PokemonCenter_2F.inc"
+	.include "data/scripts/maps/SootopolisCity_Mart.inc"
+	.include "data/scripts/maps/SootopolisCity_House1.inc"
+	.include "data/scripts/maps/SootopolisCity_House2.inc"
+	.include "data/scripts/maps/SootopolisCity_House3.inc"
+	.include "data/scripts/maps/SootopolisCity_House4.inc"
+	.include "data/scripts/maps/SootopolisCity_House5.inc"
+	.include "data/scripts/maps/SootopolisCity_House6.inc"
+	.include "data/scripts/maps/SootopolisCity_House7.inc"
+	.include "data/scripts/maps/SootopolisCity_House8.inc"
+	.include "data/scripts/maps/EverGrandeCity_SidneysRoom.inc"
+	.include "data/scripts/maps/EverGrandeCity_PhoebesRoom.inc"
+	.include "data/scripts/maps/EverGrandeCity_GlaciasRoom.inc"
+	.include "data/scripts/maps/EverGrandeCity_DrakesRoom.inc"
+	.include "data/scripts/maps/EverGrandeCity_ChampionsRoom.inc"
+	.include "data/scripts/maps/EverGrandeCity_Corridor1.inc"
+	.include "data/scripts/maps/EverGrandeCity_Corridor2.inc"
+	.include "data/scripts/maps/EverGrandeCity_Corridor3.inc"
+	.include "data/scripts/maps/EverGrandeCity_Corridor4.inc"
+	.include "data/scripts/maps/EverGrandeCity_Corridor5.inc"
+	.include "data/scripts/maps/EverGrandeCity_PokemonLeague.inc"
+	.include "data/scripts/maps/EverGrandeCity_HallOfFame.inc"
+	.include "data/scripts/maps/EverGrandeCity_PokemonCenter_1F.inc"
+	.include "data/scripts/maps/EverGrandeCity_PokemonCenter_2F.inc"
+	.include "data/scripts/maps/Route104_MrBrineysHouse.inc"
+	.include "data/scripts/maps/Route104_PrettyPetalFlowerShop.inc"
+	.include "data/scripts/maps/Route111_WinstrateFamilysHouse.inc"
+	.include "data/scripts/maps/Route111_OldLadysRestStop.inc"
+	.include "data/scripts/maps/Route112_CableCarStation.inc"
+	.include "data/scripts/maps/MtChimney_CableCarStation.inc"
+	.include "data/scripts/maps/Route114_FossilManiacsHouse.inc"
+	.include "data/scripts/maps/Route114_FossilManiacsTunnel.inc"
+	.include "data/scripts/maps/Route114_LanettesHouse.inc"
+	.include "data/scripts/maps/Route116_TunnelersRestHouse.inc"
+	.include "data/scripts/maps/Route117_PokemonDayCare.inc"
+	.include "data/scripts/maps/Route121_SafariZoneEntrance.inc"
+	.include "data/scripts/maps/MeteorFalls_1F_1R.inc"
+	.include "data/scripts/maps/MeteorFalls_1F_2R.inc"
+	.include "data/scripts/maps/MeteorFalls_B1F_1R.inc"
+	.include "data/scripts/maps/MeteorFalls_B1F_2R.inc"
+	.include "data/scripts/maps/RusturfTunnel.inc"
+	.include "data/scripts/maps/Underwater_SootopolisCity.inc"
+	.include "data/scripts/maps/DesertRuins.inc"
+	.include "data/scripts/maps/GraniteCave_1F.inc"
+	.include "data/scripts/maps/GraniteCave_B1F.inc"
+	.include "data/scripts/maps/GraniteCave_B2F.inc"
+	.include "data/scripts/maps/GraniteCave_StevensRoom.inc"
+	.include "data/scripts/maps/PetalburgWoods.inc"
+	.include "data/scripts/maps/MtChimney.inc"
+	.include "data/scripts/maps/JaggedPass.inc"
+	.include "data/scripts/maps/FieryPath.inc"
+	.include "data/scripts/maps/MtPyre_1F.inc"
+	.include "data/scripts/maps/MtPyre_2F.inc"
+	.include "data/scripts/maps/MtPyre_3F.inc"
+	.include "data/scripts/maps/MtPyre_4F.inc"
+	.include "data/scripts/maps/MtPyre_5F.inc"
+	.include "data/scripts/maps/MtPyre_6F.inc"
+	.include "data/scripts/maps/MtPyre_Exterior.inc"
+	.include "data/scripts/maps/MtPyre_Summit.inc"
+	.include "data/scripts/maps/AquaHideout_1F.inc"
+	.include "data/scripts/maps/AquaHideout_B1F.inc"
+	.include "data/scripts/maps/AquaHideout_B2F.inc"
+	.include "data/scripts/maps/Underwater_SeafloorCavern.inc"
+	.include "data/scripts/maps/SeafloorCavern_Entrance.inc"
+	.include "data/scripts/maps/SeafloorCavern_Room1.inc"
+	.include "data/scripts/maps/SeafloorCavern_Room2.inc"
+	.include "data/scripts/maps/SeafloorCavern_Room3.inc"
+	.include "data/scripts/maps/SeafloorCavern_Room4.inc"
+	.include "data/scripts/maps/SeafloorCavern_Room5.inc"
+	.include "data/scripts/maps/SeafloorCavern_Room6.inc"
+	.include "data/scripts/maps/SeafloorCavern_Room7.inc"
+	.include "data/scripts/maps/SeafloorCavern_Room8.inc"
+	.include "data/scripts/maps/SeafloorCavern_Room9.inc"
+	.include "data/scripts/maps/CaveOfOrigin_Entrance.inc"
+	.include "data/scripts/maps/CaveOfOrigin_1F.inc"
+	.include "data/scripts/maps/CaveOfOrigin_B1F.inc"
+	.include "data/scripts/maps/CaveOfOrigin_B2F.inc"
+	.include "data/scripts/maps/CaveOfOrigin_B3F.inc"
+	.include "data/scripts/maps/CaveOfOrigin_B4F.inc"
+	.include "data/scripts/maps/VictoryRoad_1F.inc"
+	.include "data/scripts/maps/VictoryRoad_B1F.inc"
+	.include "data/scripts/maps/VictoryRoad_B2F.inc"
+	.include "data/scripts/maps/ShoalCave_LowTideEntranceRoom.inc"
+	.include "data/scripts/maps/ShoalCave_LowTideInnerRoom.inc"
+	.include "data/scripts/maps/ShoalCave_LowTideStairsRoom.inc"
+	.include "data/scripts/maps/ShoalCave_LowTideLowerRoom.inc"
+	.include "data/scripts/maps/ShoalCave_HighTideEntranceRoom.inc"
+	.include "data/scripts/maps/ShoalCave_HighTideInnerRoom.inc"
+	.include "data/scripts/maps/NewMauville_Entrance.inc"
+	.include "data/scripts/maps/NewMauville_Inside.inc"
+	.include "data/scripts/maps/AbandonedShip_Deck.inc"
+	.include "data/scripts/maps/AbandonedShip_Corridors_1F.inc"
+	.include "data/scripts/maps/AbandonedShip_Rooms_1F.inc"
+	.include "data/scripts/maps/AbandonedShip_Corridors_B1F.inc"
+	.include "data/scripts/maps/AbandonedShip_Rooms_B1F.inc"
+	.include "data/scripts/maps/AbandonedShip_Rooms2_B1F.inc"
+	.include "data/scripts/maps/AbandonedShip_Underwater1.inc"
+	.include "data/scripts/maps/AbandonedShip_Room_B1F.inc"
+	.include "data/scripts/maps/AbandonedShip_Rooms2_1F.inc"
+	.include "data/scripts/maps/AbandonedShip_CaptainsOffice.inc"
+	.include "data/scripts/maps/AbandonedShip_Underwater2.inc"
+	.include "data/scripts/maps/AbandonedShip_HiddenFloorCorridors.inc"
+	.include "data/scripts/maps/AbandonedShip_HiddenFloorRooms.inc"
+	.include "data/scripts/maps/IslandCave.inc"
+	.include "data/scripts/maps/AncientTomb.inc"
+	.include "data/scripts/maps/Underwater_Route134.inc"
+	.include "data/scripts/maps/Underwater_SealedChamber.inc"
+	.include "data/scripts/maps/SealedChamber_OuterRoom.inc"
+	.include "data/scripts/maps/SealedChamber_InnerRoom.inc"
+	.include "data/scripts/maps/ScorchedSlab.inc"
+	.include "data/scripts/maps/MagmaHideout_1F.inc"
+	.include "data/scripts/maps/MagmaHideout_B1F.inc"
+	.include "data/scripts/maps/MagmaHideout_B2F.inc"
+	.include "data/scripts/maps/SkyPillar_Entrance.inc"
+	.include "data/scripts/maps/SkyPillar_Outside.inc"
+	.include "data/scripts/maps/SkyPillar_1F.inc"
+	.include "data/scripts/maps/SkyPillar_2F.inc"
+	.include "data/scripts/maps/SkyPillar_3F.inc"
+	.include "data/scripts/maps/SkyPillar_4F.inc"
+	.include "data/scripts/maps/ShoalCave_LowTideIceRoom.inc"
+	.include "data/scripts/maps/SkyPillar_5F.inc"
+	.include "data/scripts/maps/SkyPillar_Top.inc"
+	.include "data/scripts/maps/SecretBase_BlueCave1.inc"
+	.include "data/scripts/maps/SecretBase_BlueCave2.inc"
+	.include "data/scripts/maps/SecretBase_BlueCave3.inc"
+	.include "data/scripts/maps/SecretBase_BlueCave4.inc"
+	.include "data/scripts/maps/SecretBase_BrownCave1.inc"
+	.include "data/scripts/maps/SecretBase_BrownCave2.inc"
+	.include "data/scripts/maps/SecretBase_BrownCave3.inc"
+	.include "data/scripts/maps/SecretBase_BrownCave4.inc"
+	.include "data/scripts/maps/SecretBase_RedCave1.inc"
+	.include "data/scripts/maps/SecretBase_RedCave2.inc"
+	.include "data/scripts/maps/SecretBase_RedCave3.inc"
+	.include "data/scripts/maps/SecretBase_RedCave4.inc"
+	.include "data/scripts/maps/SecretBase_Shrub1.inc"
+	.include "data/scripts/maps/SecretBase_Shrub2.inc"
+	.include "data/scripts/maps/SecretBase_Shrub3.inc"
+	.include "data/scripts/maps/SecretBase_Shrub4.inc"
+	.include "data/scripts/maps/SecretBase_Tree1.inc"
+	.include "data/scripts/maps/SecretBase_Tree2.inc"
+	.include "data/scripts/maps/SecretBase_Tree3.inc"
+	.include "data/scripts/maps/SecretBase_Tree4.inc"
+	.include "data/scripts/maps/SecretBase_YellowCave1.inc"
+	.include "data/scripts/maps/SecretBase_YellowCave2.inc"
+	.include "data/scripts/maps/SecretBase_YellowCave3.inc"
+	.include "data/scripts/maps/SecretBase_YellowCave4.inc"
 
 gUnknown_0815F36C:: @ 815F36C
 	lockall
@@ -551,305 +551,305 @@ EventScript_15F573:
 	msgbox UnknownString_81A3C31, 3
 	end
 
-	.include "data/scripts/maps/SingleBattleColosseum.s"
-	.include "data/scripts/maps/TradeCenter.s"
-	.include "data/scripts/maps/RecordCorner.s"
-	.include "data/scripts/maps/DoubleBattleColosseum.s"
-	.include "data/scripts/maps/LinkContestRoom1.s"
-	.include "data/scripts/maps/LinkContestRoom2.s"
-	.include "data/scripts/maps/LinkContestRoom3.s"
-	.include "data/scripts/maps/LinkContestRoom4.s"
-	.include "data/scripts/maps/LinkContestRoom5.s"
-	.include "data/scripts/maps/LinkContestRoom6.s"
-	.include "data/scripts/maps/UnknownMap_25_29.s"
-	.include "data/scripts/maps/UnknownMap_25_30.s"
-	.include "data/scripts/maps/UnknownMap_25_31.s"
-	.include "data/scripts/maps/UnknownMap_25_32.s"
-	.include "data/scripts/maps/UnknownMap_25_33.s"
-	.include "data/scripts/maps/UnknownMap_25_34.s"
-	.include "data/scripts/maps/InsideOfTruck.s"
-	.include "data/scripts/maps/SSTidalCorridor.s"
-	.include "data/scripts/maps/SSTidalLowerDeck.s"
-	.include "data/scripts/maps/SSTidalRooms.s"
-	.include "data/scripts/maps/SafariZone_Northwest.s"
-	.include "data/scripts/maps/SafariZone_Northeast.s"
-	.include "data/scripts/maps/SafariZone_Southwest.s"
-	.include "data/scripts/maps/SafariZone_Southeast.s"
-	.include "data/scripts/maps/BattleTower_Outside.s"
-	.include "data/scripts/maps/BattleTower_Lobby.s"
-	.include "data/scripts/maps/BattleTower_Elevator.s"
-	.include "data/scripts/maps/BattleTower_Corridor.s"
-	.include "data/scripts/maps/BattleTower_BattleRoom.s"
-	.include "data/scripts/maps/SouthernIsland_Exterior.s"
-	.include "data/scripts/maps/SouthernIsland_Interior.s"
-	.include "data/scripts/maps/SafariZone_RestHouse.s"
-	.include "data/scripts/maps/Route104_Prototype.s"
-	.include "data/scripts/maps/Route104_PrototypePrettyPetalFlowerShop.s"
-	.include "data/scripts/maps/Route109_SeashoreHouse.s"
-	.include "data/scripts/maps/Route110_TrickHouseEntrance.s"
-	.include "data/scripts/maps/Route110_TrickHouseEnd.s"
-	.include "data/scripts/maps/Route110_TrickHouseCorridor.s"
-	.include "data/scripts/maps/Route110_TrickHousePuzzle1.s"
-	.include "data/scripts/maps/Route110_TrickHousePuzzle2.s"
-	.include "data/scripts/maps/Route110_TrickHousePuzzle3.s"
-	.include "data/scripts/maps/Route110_TrickHousePuzzle4.s"
-	.include "data/scripts/maps/Route110_TrickHousePuzzle5.s"
-	.include "data/scripts/maps/Route110_TrickHousePuzzle6.s"
-	.include "data/scripts/maps/Route110_TrickHousePuzzle7.s"
-	.include "data/scripts/maps/Route110_TrickHousePuzzle8.s"
-	.include "data/scripts/maps/Route110_SeasideCyclingRoadSouthEntrance.s"
-	.include "data/scripts/maps/Route110_SeasideCyclingRoadNorthEntrance.s"
-	.include "data/scripts/maps/Route113_GlassWorkshop.s"
-	.include "data/scripts/maps/Route123_BerryMastersHouse.s"
-	.include "data/scripts/maps/Route119_WeatherInstitute_1F.s"
-	.include "data/scripts/maps/Route119_WeatherInstitute_2F.s"
-	.include "data/scripts/maps/Route119_House.s"
-	.include "data/scripts/maps/Route124_DivingTreasureHuntersHouse.s"
-
-	.include "data/text/maps/PetalburgCity.s"
-	.include "data/text/maps/SlateportCity.s"
-	.include "data/text/maps/MauvilleCity.s"
-	.include "data/text/maps/RustboroCity.s"
-	.include "data/text/maps/FortreeCity.s"
-	.include "data/text/maps/LilycoveCity.s"
-	.include "data/text/maps/MossdeepCity.s"
-	.include "data/text/maps/SootopolisCity.s"
-	.include "data/text/maps/EverGrandeCity.s"
-	.include "data/text/maps/LittlerootTown.s"
-	.include "data/text/maps/OldaleTown.s"
-	.include "data/text/maps/DewfordTown.s"
-	.include "data/text/maps/LavaridgeTown.s"
-	.include "data/text/maps/FallarborTown.s"
-	.include "data/text/maps/VerdanturfTown.s"
-	.include "data/text/maps/PacifidlogTown.s"
-	.include "data/text/maps/Route101.s"
-	.include "data/text/maps/Route102.s"
-	.include "data/text/maps/Route103.s"
-	.include "data/text/maps/Route104.s"
-	.include "data/text/maps/Route105.s"
-	.include "data/text/maps/Route106.s"
-	.include "data/text/maps/Route107.s"
-	.include "data/text/maps/Route108.s"
-	.include "data/text/maps/Route109.s"
-	.include "data/text/maps/Route110.s"
-	.include "data/text/maps/Route111.s"
-	.include "data/text/maps/Route112.s"
-	.include "data/text/maps/Route113.s"
-	.include "data/text/maps/Route114.s"
-	.include "data/text/maps/Route115.s"
-	.include "data/text/maps/Route116.s"
-	.include "data/text/maps/Route117.s"
-	.include "data/text/maps/Route118.s"
-	.include "data/text/maps/Route119.s"
-	.include "data/text/maps/Route120.s"
-	.include "data/text/maps/Route121.s"
-	.include "data/text/maps/Route123.s"
-	.include "data/text/maps/Route124.s"
-	.include "data/text/maps/Route128.s"
-	.include "data/text/maps/LittlerootTown_BrendansHouse_1F.s"
-	.include "data/text/maps/LittlerootTown_BrendansHouse_2F.s"
-	.include "data/text/maps/LittlerootTown_MaysHouse_1F.s"
-	.include "data/text/maps/LittlerootTown_MaysHouse_2F.s"
-	.include "data/text/maps/LittlerootTown_ProfessorBirchsLab.s"
-	.include "data/text/maps/OldaleTown_House1.s"
-	.include "data/text/maps/OldaleTown_House2.s"
-	.include "data/text/maps/OldaleTown_PokemonCenter_1F.s"
-	.include "data/text/maps/OldaleTown_Mart.s"
-	.include "data/text/maps/DewfordTown_House1.s"
-	.include "data/text/maps/DewfordTown_PokemonCenter_1F.s"
-	.include "data/text/maps/DewfordTown_Gym.s"
-	.include "data/text/maps/DewfordTown_Hall.s"
-	.include "data/text/maps/DewfordTown_House2.s"
-	.include "data/text/maps/LavaridgeTown_HerbShop.s"
-	.include "data/text/maps/LavaridgeTown_Gym_1F.s"
-	.include "data/text/maps/LavaridgeTown_House.s"
-	.include "data/text/maps/LavaridgeTown_Mart.s"
-	.include "data/text/maps/LavaridgeTown_PokemonCenter_1F.s"
-	.include "data/text/maps/FallarborTown_Mart.s"
-	.include "data/text/maps/FallarborTown_ContestLobby.s"
-	.include "data/text/maps/FallarborTown_ContestHall.s"
-	.include "data/text/maps/FallarborTown_PokemonCenter_1F.s"
-	.include "data/text/maps/FallarborTown_House1.s"
-	.include "data/text/maps/FallarborTown_House2.s"
-	.include "data/text/maps/VerdanturfTown_ContestLobby.s"
-	.include "data/text/maps/VerdanturfTown_ContestHall.s"
-	.include "data/text/maps/VerdanturfTown_Mart.s"
-	.include "data/text/maps/VerdanturfTown_PokemonCenter_1F.s"
-	.include "data/text/maps/VerdanturfTown_WandasHouse.s"
-	.include "data/text/maps/VerdanturfTown_FriendshipRatersHouse.s"
-	.include "data/text/maps/VerdanturfTown_House.s"
-	.include "data/text/maps/PacifidlogTown_PokemonCenter_1F.s"
-	.include "data/text/maps/PacifidlogTown_House1.s"
-	.include "data/text/maps/PacifidlogTown_House2.s"
-	.include "data/text/maps/PacifidlogTown_House3.s"
-	.include "data/text/maps/PacifidlogTown_House4.s"
-	.include "data/text/maps/PacifidlogTown_House5.s"
-	.include "data/text/maps/PetalburgCity_WallysHouse.s"
-	.include "data/text/maps/PetalburgCity_Gym.s"
-	.include "data/text/maps/PetalburgCity_House1.s"
-	.include "data/text/maps/PetalburgCity_House2.s"
-	.include "data/text/maps/PetalburgCity_PokemonCenter_1F.s"
-	.include "data/text/maps/PetalburgCity_Mart.s"
-	.include "data/text/maps/SlateportCity_SternsShipyard_1F.s"
-	.include "data/text/maps/SlateportCity_SternsShipyard_2F.s"
-	.include "data/text/maps/SlateportCity_ContestLobby.s"
-	.include "data/text/maps/SlateportCity_ContestHall.s"
-	.include "data/text/maps/SlateportCity_House1.s"
-	.include "data/text/maps/SlateportCity_PokemonFanClub.s"
-	.include "data/text/maps/SlateportCity_OceanicMuseum_1F.s"
-	.include "data/text/maps/SlateportCity_OceanicMuseum_2F.s"
-	.include "data/text/maps/SlateportCity_Harbor.s"
-	.include "data/text/maps/SlateportCity_House2.s"
-	.include "data/text/maps/SlateportCity_PokemonCenter_1F.s"
-	.include "data/text/maps/SlateportCity_Mart.s"
-	.include "data/text/maps/MauvilleCity_Gym.s"
-	.include "data/text/maps/MauvilleCity_BikeShop.s"
-	.include "data/text/maps/MauvilleCity_House1.s"
-	.include "data/text/maps/MauvilleCity_GameCorner.s"
-	.include "data/text/maps/MauvilleCity_House2.s"
-	.include "data/text/maps/MauvilleCity_PokemonCenter_1F.s"
-	.include "data/text/maps/MauvilleCity_PokemonCenter_2F.s"
-	.include "data/text/maps/MauvilleCity_Mart.s"
-	.include "data/text/maps/RustboroCity_DevonCorp_1F.s"
-	.include "data/text/maps/RustboroCity_DevonCorp_2F.s"
-	.include "data/text/maps/RustboroCity_DevonCorp_3F.s"
-	.include "data/text/maps/RustboroCity_Gym.s"
-	.include "data/text/maps/RustboroCity_PokemonSchool.s"
-	.include "data/text/maps/RustboroCity_PokemonCenter_1F.s"
-	.include "data/text/maps/RustboroCity_Mart.s"
-	.include "data/text/maps/RustboroCity_Flat1_1F.s"
-	.include "data/text/maps/RustboroCity_Flat1_2F.s"
-	.include "data/text/maps/RustboroCity_House1.s"
-	.include "data/text/maps/RustboroCity_CuttersHouse.s"
-	.include "data/text/maps/RustboroCity_House2.s"
-	.include "data/text/maps/RustboroCity_Flat2_1F.s"
-	.include "data/text/maps/RustboroCity_Flat2_2F.s"
-	.include "data/text/maps/RustboroCity_Flat2_3F.s"
-	.include "data/text/maps/RustboroCity_House3.s"
-	.include "data/text/maps/FortreeCity_House1.s"
-	.include "data/text/maps/FortreeCity_Gym.s"
-	.include "data/text/maps/FortreeCity_PokemonCenter_1F.s"
-	.include "data/text/maps/FortreeCity_Mart.s"
-	.include "data/text/maps/FortreeCity_House2.s"
-	.include "data/text/maps/FortreeCity_House3.s"
-	.include "data/text/maps/FortreeCity_House4.s"
-	.include "data/text/maps/FortreeCity_House5.s"
-	.include "data/text/maps/FortreeCity_DecorationShop.s"
-	.include "data/text/maps/LilycoveCity_CoveLilyMotel_1F.s"
-	.include "data/text/maps/LilycoveCity_CoveLilyMotel_2F.s"
-	.include "data/text/maps/LilycoveCity_LilycoveMuseum_1F.s"
-	.include "data/text/maps/LilycoveCity_LilycoveMuseum_2F.s"
-	.include "data/text/maps/LilycoveCity_ContestLobby.s"
-	.include "data/text/maps/LilycoveCity_ContestHall.s"
-	.include "data/text/maps/LilycoveCity_PokemonCenter_1F.s"
-	.include "data/text/maps/LilycoveCity_PokemonTrainerFanClub.s"
-	.include "data/text/maps/LilycoveCity_Harbor.s"
-	.include "data/text/maps/LilycoveCity_MoveDeletersHouse.s"
-	.include "data/text/maps/LilycoveCity_House1.s"
-	.include "data/text/maps/LilycoveCity_House2.s"
-	.include "data/text/maps/LilycoveCity_House3.s"
-	.include "data/text/maps/LilycoveCity_House4.s"
-	.include "data/text/maps/LilycoveCity_DepartmentStore_1F.s"
-	.include "data/text/maps/LilycoveCity_DepartmentStore_2F.s"
-	.include "data/text/maps/LilycoveCity_DepartmentStore_3F.s"
-	.include "data/text/maps/LilycoveCity_DepartmentStore_4F.s"
-	.include "data/text/maps/LilycoveCity_DepartmentStore_5F.s"
-	.include "data/text/maps/LilycoveCity_DepartmentStoreRooftop.s"
-	.include "data/text/maps/MossdeepCity_Gym.s"
-	.include "data/text/maps/MossdeepCity_House1.s"
-	.include "data/text/maps/MossdeepCity_House2.s"
-	.include "data/text/maps/MossdeepCity_PokemonCenter_1F.s"
-	.include "data/text/maps/MossdeepCity_PokemonCenter_2F.s"
-	.include "data/text/maps/MossdeepCity_Mart.s"
-	.include "data/text/maps/MossdeepCity_House3.s"
-	.include "data/text/maps/MossdeepCity_StevensHouse.s"
-	.include "data/text/maps/MossdeepCity_House4.s"
-	.include "data/text/maps/MossdeepCity_SpaceCenter_1F.s"
-	.include "data/text/maps/MossdeepCity_SpaceCenter_2F.s"
-	.include "data/text/maps/MossdeepCity_GameCorner_1F.s"
-	.include "data/text/maps/MossdeepCity_GameCorner_B1F.s"
-	.include "data/text/maps/SootopolisCity_Gym_1F.s"
-	.include "data/text/maps/SootopolisCity_Gym_B1F.s"
-	.include "data/text/maps/SootopolisCity_PokemonCenter_1F.s"
-	.include "data/text/maps/SootopolisCity_Mart.s"
-	.include "data/text/maps/SootopolisCity_House1.s"
-	.include "data/text/maps/SootopolisCity_House2.s"
-	.include "data/text/maps/SootopolisCity_House3.s"
-	.include "data/text/maps/SootopolisCity_House4.s"
-	.include "data/text/maps/SootopolisCity_House5.s"
-	.include "data/text/maps/SootopolisCity_House6.s"
-	.include "data/text/maps/SootopolisCity_House7.s"
-	.include "data/text/maps/SootopolisCity_House8.s"
-	.include "data/text/maps/EverGrandeCity_SidneysRoom.s"
-	.include "data/text/maps/EverGrandeCity_PhoebesRoom.s"
-	.include "data/text/maps/EverGrandeCity_GlaciasRoom.s"
-	.include "data/text/maps/EverGrandeCity_DrakesRoom.s"
-	.include "data/text/maps/EverGrandeCity_ChampionsRoom.s"
-	.include "data/text/maps/EverGrandeCity_PokemonLeague.s"
-	.include "data/text/maps/EverGrandeCity_HallOfFame.s"
-	.include "data/text/maps/EverGrandeCity_PokemonCenter_1F.s"
-	.include "data/text/maps/Route104_MrBrineysHouse.s"
-	.include "data/text/maps/Route111_WinstrateFamilysHouse.s"
-	.include "data/text/maps/Route111_OldLadysRestStop.s"
-	.include "data/text/maps/Route112_CableCarStation.s"
-	.include "data/text/maps/MtChimney_CableCarStation.s"
-	.include "data/text/maps/Route114_FossilManiacsHouse.s"
-	.include "data/text/maps/Route114_FossilManiacsTunnel.s"
-	.include "data/text/maps/Route114_LanettesHouse.s"
-	.include "data/text/maps/Route116_TunnelersRestHouse.s"
-	.include "data/text/maps/MeteorFalls_1F_1R.s"
-	.include "data/text/maps/MeteorFalls_1F_2R.s"
-	.include "data/text/maps/RusturfTunnel.s"
-	.include "data/text/maps/GraniteCave_1F.s"
-	.include "data/text/maps/GraniteCave_StevensRoom.s"
-	.include "data/text/maps/PetalburgWoods.s"
-	.include "data/text/maps/MtChimney.s"
-	.include "data/text/maps/JaggedPass.s"
-	.include "data/text/maps/MtPyre_1F.s"
-	.include "data/text/maps/MtPyre_2F.s"
-	.include "data/text/maps/MtPyre_3F.s"
-	.include "data/text/maps/MtPyre_4F.s"
-	.include "data/text/maps/MtPyre_5F.s"
-	.include "data/text/maps/MtPyre_6F.s"
-	.include "data/text/maps/AquaHideout_1F.s"
-	.include "data/text/maps/AquaHideout_B1F.s"
-	.include "data/text/maps/AquaHideout_B2F.s"
-	.include "data/text/maps/Underwater_SeafloorCavern.s"
-	.include "data/text/maps/SeafloorCavern_Room1.s"
-	.include "data/text/maps/SeafloorCavern_Room3.s"
-	.include "data/text/maps/SeafloorCavern_Room4.s"
-	.include "data/text/maps/VictoryRoad_1F.s"
-	.include "data/text/maps/VictoryRoad_B1F.s"
-	.include "data/text/maps/VictoryRoad_B2F.s"
-	.include "data/text/maps/ShoalCave_LowTideEntranceRoom.s"
-	.include "data/text/maps/ShoalCave_LowTideInnerRoom.s"
-	.include "data/text/maps/ShoalCave_LowTideStairsRoom.s"
-	.include "data/text/maps/ShoalCave_LowTideLowerRoom.s"
-	.include "data/text/maps/NewMauville_Entrance.s"
-	.include "data/text/maps/NewMauville_Inside.s"
-	.include "data/text/maps/AbandonedShip_Corridors_1F.s"
-	.include "data/text/maps/AbandonedShip_Rooms_1F.s"
-	.include "data/text/maps/AbandonedShip_Corridors_B1F.s"
-	.include "data/text/maps/AbandonedShip_HiddenFloorCorridors.s"
-	.include "data/text/maps/AbandonedShip_Rooms_B1F.s"
-	.include "data/text/maps/AbandonedShip_Rooms2_B1F.s"
-	.include "data/text/maps/AbandonedShip_Rooms2_1F.s"
-	.include "data/text/maps/AbandonedShip_CaptainsOffice.s"
-	.include "data/text/maps/AbandonedShip_HiddenFloorRooms.s"
-	.include "data/text/maps/SecretBase_RedCave1.s"
-	.include "data/text/maps/InsideOfTruck.s"
-	.include "data/text/maps/SSTidalCorridor.s"
-	.include "data/text/maps/SSTidalLowerDeck.s"
-	.include "data/text/maps/SSTidalRooms.s"
-	.include "data/text/maps/BattleTower_Outside.s"
-	.include "data/text/maps/BattleTower_Lobby.s"
-	.include "data/text/maps/BattleTower_BattleRoom.s"
-	.include "data/text/maps/SouthernIsland_Exterior.s"
-	.include "data/text/maps/SouthernIsland_Interior.s"
-	.include "data/text/maps/Route104_Prototype.s"
-	.include "data/text/maps/Route104_PrototypePrettyPetalFlowerShop.s"
-	.include "data/text/maps/Route109_SeashoreHouse.s"
-	.include "data/text/maps/Route110_TrickHouseEntrance.s"
+	.include "data/scripts/maps/SingleBattleColosseum.inc"
+	.include "data/scripts/maps/TradeCenter.inc"
+	.include "data/scripts/maps/RecordCorner.inc"
+	.include "data/scripts/maps/DoubleBattleColosseum.inc"
+	.include "data/scripts/maps/LinkContestRoom1.inc"
+	.include "data/scripts/maps/LinkContestRoom2.inc"
+	.include "data/scripts/maps/LinkContestRoom3.inc"
+	.include "data/scripts/maps/LinkContestRoom4.inc"
+	.include "data/scripts/maps/LinkContestRoom5.inc"
+	.include "data/scripts/maps/LinkContestRoom6.inc"
+	.include "data/scripts/maps/UnknownMap_25_29.inc"
+	.include "data/scripts/maps/UnknownMap_25_30.inc"
+	.include "data/scripts/maps/UnknownMap_25_31.inc"
+	.include "data/scripts/maps/UnknownMap_25_32.inc"
+	.include "data/scripts/maps/UnknownMap_25_33.inc"
+	.include "data/scripts/maps/UnknownMap_25_34.inc"
+	.include "data/scripts/maps/InsideOfTruck.inc"
+	.include "data/scripts/maps/SSTidalCorridor.inc"
+	.include "data/scripts/maps/SSTidalLowerDeck.inc"
+	.include "data/scripts/maps/SSTidalRooms.inc"
+	.include "data/scripts/maps/SafariZone_Northwest.inc"
+	.include "data/scripts/maps/SafariZone_Northeast.inc"
+	.include "data/scripts/maps/SafariZone_Southwest.inc"
+	.include "data/scripts/maps/SafariZone_Southeast.inc"
+	.include "data/scripts/maps/BattleTower_Outside.inc"
+	.include "data/scripts/maps/BattleTower_Lobby.inc"
+	.include "data/scripts/maps/BattleTower_Elevator.inc"
+	.include "data/scripts/maps/BattleTower_Corridor.inc"
+	.include "data/scripts/maps/BattleTower_BattleRoom.inc"
+	.include "data/scripts/maps/SouthernIsland_Exterior.inc"
+	.include "data/scripts/maps/SouthernIsland_Interior.inc"
+	.include "data/scripts/maps/SafariZone_RestHouse.inc"
+	.include "data/scripts/maps/Route104_Prototype.inc"
+	.include "data/scripts/maps/Route104_PrototypePrettyPetalFlowerShop.inc"
+	.include "data/scripts/maps/Route109_SeashoreHouse.inc"
+	.include "data/scripts/maps/Route110_TrickHouseEntrance.inc"
+	.include "data/scripts/maps/Route110_TrickHouseEnd.inc"
+	.include "data/scripts/maps/Route110_TrickHouseCorridor.inc"
+	.include "data/scripts/maps/Route110_TrickHousePuzzle1.inc"
+	.include "data/scripts/maps/Route110_TrickHousePuzzle2.inc"
+	.include "data/scripts/maps/Route110_TrickHousePuzzle3.inc"
+	.include "data/scripts/maps/Route110_TrickHousePuzzle4.inc"
+	.include "data/scripts/maps/Route110_TrickHousePuzzle5.inc"
+	.include "data/scripts/maps/Route110_TrickHousePuzzle6.inc"
+	.include "data/scripts/maps/Route110_TrickHousePuzzle7.inc"
+	.include "data/scripts/maps/Route110_TrickHousePuzzle8.inc"
+	.include "data/scripts/maps/Route110_SeasideCyclingRoadSouthEntrance.inc"
+	.include "data/scripts/maps/Route110_SeasideCyclingRoadNorthEntrance.inc"
+	.include "data/scripts/maps/Route113_GlassWorkshop.inc"
+	.include "data/scripts/maps/Route123_BerryMastersHouse.inc"
+	.include "data/scripts/maps/Route119_WeatherInstitute_1F.inc"
+	.include "data/scripts/maps/Route119_WeatherInstitute_2F.inc"
+	.include "data/scripts/maps/Route119_House.inc"
+	.include "data/scripts/maps/Route124_DivingTreasureHuntersHouse.inc"
+
+	.include "data/text/maps/PetalburgCity.inc"
+	.include "data/text/maps/SlateportCity.inc"
+	.include "data/text/maps/MauvilleCity.inc"
+	.include "data/text/maps/RustboroCity.inc"
+	.include "data/text/maps/FortreeCity.inc"
+	.include "data/text/maps/LilycoveCity.inc"
+	.include "data/text/maps/MossdeepCity.inc"
+	.include "data/text/maps/SootopolisCity.inc"
+	.include "data/text/maps/EverGrandeCity.inc"
+	.include "data/text/maps/LittlerootTown.inc"
+	.include "data/text/maps/OldaleTown.inc"
+	.include "data/text/maps/DewfordTown.inc"
+	.include "data/text/maps/LavaridgeTown.inc"
+	.include "data/text/maps/FallarborTown.inc"
+	.include "data/text/maps/VerdanturfTown.inc"
+	.include "data/text/maps/PacifidlogTown.inc"
+	.include "data/text/maps/Route101.inc"
+	.include "data/text/maps/Route102.inc"
+	.include "data/text/maps/Route103.inc"
+	.include "data/text/maps/Route104.inc"
+	.include "data/text/maps/Route105.inc"
+	.include "data/text/maps/Route106.inc"
+	.include "data/text/maps/Route107.inc"
+	.include "data/text/maps/Route108.inc"
+	.include "data/text/maps/Route109.inc"
+	.include "data/text/maps/Route110.inc"
+	.include "data/text/maps/Route111.inc"
+	.include "data/text/maps/Route112.inc"
+	.include "data/text/maps/Route113.inc"
+	.include "data/text/maps/Route114.inc"
+	.include "data/text/maps/Route115.inc"
+	.include "data/text/maps/Route116.inc"
+	.include "data/text/maps/Route117.inc"
+	.include "data/text/maps/Route118.inc"
+	.include "data/text/maps/Route119.inc"
+	.include "data/text/maps/Route120.inc"
+	.include "data/text/maps/Route121.inc"
+	.include "data/text/maps/Route123.inc"
+	.include "data/text/maps/Route124.inc"
+	.include "data/text/maps/Route128.inc"
+	.include "data/text/maps/LittlerootTown_BrendansHouse_1F.inc"
+	.include "data/text/maps/LittlerootTown_BrendansHouse_2F.inc"
+	.include "data/text/maps/LittlerootTown_MaysHouse_1F.inc"
+	.include "data/text/maps/LittlerootTown_MaysHouse_2F.inc"
+	.include "data/text/maps/LittlerootTown_ProfessorBirchsLab.inc"
+	.include "data/text/maps/OldaleTown_House1.inc"
+	.include "data/text/maps/OldaleTown_House2.inc"
+	.include "data/text/maps/OldaleTown_PokemonCenter_1F.inc"
+	.include "data/text/maps/OldaleTown_Mart.inc"
+	.include "data/text/maps/DewfordTown_House1.inc"
+	.include "data/text/maps/DewfordTown_PokemonCenter_1F.inc"
+	.include "data/text/maps/DewfordTown_Gym.inc"
+	.include "data/text/maps/DewfordTown_Hall.inc"
+	.include "data/text/maps/DewfordTown_House2.inc"
+	.include "data/text/maps/LavaridgeTown_HerbShop.inc"
+	.include "data/text/maps/LavaridgeTown_Gym_1F.inc"
+	.include "data/text/maps/LavaridgeTown_House.inc"
+	.include "data/text/maps/LavaridgeTown_Mart.inc"
+	.include "data/text/maps/LavaridgeTown_PokemonCenter_1F.inc"
+	.include "data/text/maps/FallarborTown_Mart.inc"
+	.include "data/text/maps/FallarborTown_ContestLobby.inc"
+	.include "data/text/maps/FallarborTown_ContestHall.inc"
+	.include "data/text/maps/FallarborTown_PokemonCenter_1F.inc"
+	.include "data/text/maps/FallarborTown_House1.inc"
+	.include "data/text/maps/FallarborTown_House2.inc"
+	.include "data/text/maps/VerdanturfTown_ContestLobby.inc"
+	.include "data/text/maps/VerdanturfTown_ContestHall.inc"
+	.include "data/text/maps/VerdanturfTown_Mart.inc"
+	.include "data/text/maps/VerdanturfTown_PokemonCenter_1F.inc"
+	.include "data/text/maps/VerdanturfTown_WandasHouse.inc"
+	.include "data/text/maps/VerdanturfTown_FriendshipRatersHouse.inc"
+	.include "data/text/maps/VerdanturfTown_House.inc"
+	.include "data/text/maps/PacifidlogTown_PokemonCenter_1F.inc"
+	.include "data/text/maps/PacifidlogTown_House1.inc"
+	.include "data/text/maps/PacifidlogTown_House2.inc"
+	.include "data/text/maps/PacifidlogTown_House3.inc"
+	.include "data/text/maps/PacifidlogTown_House4.inc"
+	.include "data/text/maps/PacifidlogTown_House5.inc"
+	.include "data/text/maps/PetalburgCity_WallysHouse.inc"
+	.include "data/text/maps/PetalburgCity_Gym.inc"
+	.include "data/text/maps/PetalburgCity_House1.inc"
+	.include "data/text/maps/PetalburgCity_House2.inc"
+	.include "data/text/maps/PetalburgCity_PokemonCenter_1F.inc"
+	.include "data/text/maps/PetalburgCity_Mart.inc"
+	.include "data/text/maps/SlateportCity_SternsShipyard_1F.inc"
+	.include "data/text/maps/SlateportCity_SternsShipyard_2F.inc"
+	.include "data/text/maps/SlateportCity_ContestLobby.inc"
+	.include "data/text/maps/SlateportCity_ContestHall.inc"
+	.include "data/text/maps/SlateportCity_House1.inc"
+	.include "data/text/maps/SlateportCity_PokemonFanClub.inc"
+	.include "data/text/maps/SlateportCity_OceanicMuseum_1F.inc"
+	.include "data/text/maps/SlateportCity_OceanicMuseum_2F.inc"
+	.include "data/text/maps/SlateportCity_Harbor.inc"
+	.include "data/text/maps/SlateportCity_House2.inc"
+	.include "data/text/maps/SlateportCity_PokemonCenter_1F.inc"
+	.include "data/text/maps/SlateportCity_Mart.inc"
+	.include "data/text/maps/MauvilleCity_Gym.inc"
+	.include "data/text/maps/MauvilleCity_BikeShop.inc"
+	.include "data/text/maps/MauvilleCity_House1.inc"
+	.include "data/text/maps/MauvilleCity_GameCorner.inc"
+	.include "data/text/maps/MauvilleCity_House2.inc"
+	.include "data/text/maps/MauvilleCity_PokemonCenter_1F.inc"
+	.include "data/text/maps/MauvilleCity_PokemonCenter_2F.inc"
+	.include "data/text/maps/MauvilleCity_Mart.inc"
+	.include "data/text/maps/RustboroCity_DevonCorp_1F.inc"
+	.include "data/text/maps/RustboroCity_DevonCorp_2F.inc"
+	.include "data/text/maps/RustboroCity_DevonCorp_3F.inc"
+	.include "data/text/maps/RustboroCity_Gym.inc"
+	.include "data/text/maps/RustboroCity_PokemonSchool.inc"
+	.include "data/text/maps/RustboroCity_PokemonCenter_1F.inc"
+	.include "data/text/maps/RustboroCity_Mart.inc"
+	.include "data/text/maps/RustboroCity_Flat1_1F.inc"
+	.include "data/text/maps/RustboroCity_Flat1_2F.inc"
+	.include "data/text/maps/RustboroCity_House1.inc"
+	.include "data/text/maps/RustboroCity_CuttersHouse.inc"
+	.include "data/text/maps/RustboroCity_House2.inc"
+	.include "data/text/maps/RustboroCity_Flat2_1F.inc"
+	.include "data/text/maps/RustboroCity_Flat2_2F.inc"
+	.include "data/text/maps/RustboroCity_Flat2_3F.inc"
+	.include "data/text/maps/RustboroCity_House3.inc"
+	.include "data/text/maps/FortreeCity_House1.inc"
+	.include "data/text/maps/FortreeCity_Gym.inc"
+	.include "data/text/maps/FortreeCity_PokemonCenter_1F.inc"
+	.include "data/text/maps/FortreeCity_Mart.inc"
+	.include "data/text/maps/FortreeCity_House2.inc"
+	.include "data/text/maps/FortreeCity_House3.inc"
+	.include "data/text/maps/FortreeCity_House4.inc"
+	.include "data/text/maps/FortreeCity_House5.inc"
+	.include "data/text/maps/FortreeCity_DecorationShop.inc"
+	.include "data/text/maps/LilycoveCity_CoveLilyMotel_1F.inc"
+	.include "data/text/maps/LilycoveCity_CoveLilyMotel_2F.inc"
+	.include "data/text/maps/LilycoveCity_LilycoveMuseum_1F.inc"
+	.include "data/text/maps/LilycoveCity_LilycoveMuseum_2F.inc"
+	.include "data/text/maps/LilycoveCity_ContestLobby.inc"
+	.include "data/text/maps/LilycoveCity_ContestHall.inc"
+	.include "data/text/maps/LilycoveCity_PokemonCenter_1F.inc"
+	.include "data/text/maps/LilycoveCity_PokemonTrainerFanClub.inc"
+	.include "data/text/maps/LilycoveCity_Harbor.inc"
+	.include "data/text/maps/LilycoveCity_MoveDeletersHouse.inc"
+	.include "data/text/maps/LilycoveCity_House1.inc"
+	.include "data/text/maps/LilycoveCity_House2.inc"
+	.include "data/text/maps/LilycoveCity_House3.inc"
+	.include "data/text/maps/LilycoveCity_House4.inc"
+	.include "data/text/maps/LilycoveCity_DepartmentStore_1F.inc"
+	.include "data/text/maps/LilycoveCity_DepartmentStore_2F.inc"
+	.include "data/text/maps/LilycoveCity_DepartmentStore_3F.inc"
+	.include "data/text/maps/LilycoveCity_DepartmentStore_4F.inc"
+	.include "data/text/maps/LilycoveCity_DepartmentStore_5F.inc"
+	.include "data/text/maps/LilycoveCity_DepartmentStoreRooftop.inc"
+	.include "data/text/maps/MossdeepCity_Gym.inc"
+	.include "data/text/maps/MossdeepCity_House1.inc"
+	.include "data/text/maps/MossdeepCity_House2.inc"
+	.include "data/text/maps/MossdeepCity_PokemonCenter_1F.inc"
+	.include "data/text/maps/MossdeepCity_PokemonCenter_2F.inc"
+	.include "data/text/maps/MossdeepCity_Mart.inc"
+	.include "data/text/maps/MossdeepCity_House3.inc"
+	.include "data/text/maps/MossdeepCity_StevensHouse.inc"
+	.include "data/text/maps/MossdeepCity_House4.inc"
+	.include "data/text/maps/MossdeepCity_SpaceCenter_1F.inc"
+	.include "data/text/maps/MossdeepCity_SpaceCenter_2F.inc"
+	.include "data/text/maps/MossdeepCity_GameCorner_1F.inc"
+	.include "data/text/maps/MossdeepCity_GameCorner_B1F.inc"
+	.include "data/text/maps/SootopolisCity_Gym_1F.inc"
+	.include "data/text/maps/SootopolisCity_Gym_B1F.inc"
+	.include "data/text/maps/SootopolisCity_PokemonCenter_1F.inc"
+	.include "data/text/maps/SootopolisCity_Mart.inc"
+	.include "data/text/maps/SootopolisCity_House1.inc"
+	.include "data/text/maps/SootopolisCity_House2.inc"
+	.include "data/text/maps/SootopolisCity_House3.inc"
+	.include "data/text/maps/SootopolisCity_House4.inc"
+	.include "data/text/maps/SootopolisCity_House5.inc"
+	.include "data/text/maps/SootopolisCity_House6.inc"
+	.include "data/text/maps/SootopolisCity_House7.inc"
+	.include "data/text/maps/SootopolisCity_House8.inc"
+	.include "data/text/maps/EverGrandeCity_SidneysRoom.inc"
+	.include "data/text/maps/EverGrandeCity_PhoebesRoom.inc"
+	.include "data/text/maps/EverGrandeCity_GlaciasRoom.inc"
+	.include "data/text/maps/EverGrandeCity_DrakesRoom.inc"
+	.include "data/text/maps/EverGrandeCity_ChampionsRoom.inc"
+	.include "data/text/maps/EverGrandeCity_PokemonLeague.inc"
+	.include "data/text/maps/EverGrandeCity_HallOfFame.inc"
+	.include "data/text/maps/EverGrandeCity_PokemonCenter_1F.inc"
+	.include "data/text/maps/Route104_MrBrineysHouse.inc"
+	.include "data/text/maps/Route111_WinstrateFamilysHouse.inc"
+	.include "data/text/maps/Route111_OldLadysRestStop.inc"
+	.include "data/text/maps/Route112_CableCarStation.inc"
+	.include "data/text/maps/MtChimney_CableCarStation.inc"
+	.include "data/text/maps/Route114_FossilManiacsHouse.inc"
+	.include "data/text/maps/Route114_FossilManiacsTunnel.inc"
+	.include "data/text/maps/Route114_LanettesHouse.inc"
+	.include "data/text/maps/Route116_TunnelersRestHouse.inc"
+	.include "data/text/maps/MeteorFalls_1F_1R.inc"
+	.include "data/text/maps/MeteorFalls_1F_2R.inc"
+	.include "data/text/maps/RusturfTunnel.inc"
+	.include "data/text/maps/GraniteCave_1F.inc"
+	.include "data/text/maps/GraniteCave_StevensRoom.inc"
+	.include "data/text/maps/PetalburgWoods.inc"
+	.include "data/text/maps/MtChimney.inc"
+	.include "data/text/maps/JaggedPass.inc"
+	.include "data/text/maps/MtPyre_1F.inc"
+	.include "data/text/maps/MtPyre_2F.inc"
+	.include "data/text/maps/MtPyre_3F.inc"
+	.include "data/text/maps/MtPyre_4F.inc"
+	.include "data/text/maps/MtPyre_5F.inc"
+	.include "data/text/maps/MtPyre_6F.inc"
+	.include "data/text/maps/AquaHideout_1F.inc"
+	.include "data/text/maps/AquaHideout_B1F.inc"
+	.include "data/text/maps/AquaHideout_B2F.inc"
+	.include "data/text/maps/Underwater_SeafloorCavern.inc"
+	.include "data/text/maps/SeafloorCavern_Room1.inc"
+	.include "data/text/maps/SeafloorCavern_Room3.inc"
+	.include "data/text/maps/SeafloorCavern_Room4.inc"
+	.include "data/text/maps/VictoryRoad_1F.inc"
+	.include "data/text/maps/VictoryRoad_B1F.inc"
+	.include "data/text/maps/VictoryRoad_B2F.inc"
+	.include "data/text/maps/ShoalCave_LowTideEntranceRoom.inc"
+	.include "data/text/maps/ShoalCave_LowTideInnerRoom.inc"
+	.include "data/text/maps/ShoalCave_LowTideStairsRoom.inc"
+	.include "data/text/maps/ShoalCave_LowTideLowerRoom.inc"
+	.include "data/text/maps/NewMauville_Entrance.inc"
+	.include "data/text/maps/NewMauville_Inside.inc"
+	.include "data/text/maps/AbandonedShip_Corridors_1F.inc"
+	.include "data/text/maps/AbandonedShip_Rooms_1F.inc"
+	.include "data/text/maps/AbandonedShip_Corridors_B1F.inc"
+	.include "data/text/maps/AbandonedShip_HiddenFloorCorridors.inc"
+	.include "data/text/maps/AbandonedShip_Rooms_B1F.inc"
+	.include "data/text/maps/AbandonedShip_Rooms2_B1F.inc"
+	.include "data/text/maps/AbandonedShip_Rooms2_1F.inc"
+	.include "data/text/maps/AbandonedShip_CaptainsOffice.inc"
+	.include "data/text/maps/AbandonedShip_HiddenFloorRooms.inc"
+	.include "data/text/maps/SecretBase_RedCave1.inc"
+	.include "data/text/maps/InsideOfTruck.inc"
+	.include "data/text/maps/SSTidalCorridor.inc"
+	.include "data/text/maps/SSTidalLowerDeck.inc"
+	.include "data/text/maps/SSTidalRooms.inc"
+	.include "data/text/maps/BattleTower_Outside.inc"
+	.include "data/text/maps/BattleTower_Lobby.inc"
+	.include "data/text/maps/BattleTower_BattleRoom.inc"
+	.include "data/text/maps/SouthernIsland_Exterior.inc"
+	.include "data/text/maps/SouthernIsland_Interior.inc"
+	.include "data/text/maps/Route104_Prototype.inc"
+	.include "data/text/maps/Route104_PrototypePrettyPetalFlowerShop.inc"
+	.include "data/text/maps/Route109_SeashoreHouse.inc"
+	.include "data/text/maps/Route110_TrickHouseEntrance.inc"
 
 Route110_TrickHousePuzzle1_Text_19C1B8:: @ 819C1B8
 	.string "{PLAYER} found a scroll.$"
@@ -866,23 +866,23 @@ UnknownString_819C21F: @ 819C21F
 	.string "...On closer inspection, this is written\n"
 	.string "on it: “Write the secret code here.”$"
 
-	.include "data/text/maps/Route110_TrickHouseEnd.s"
-	.include "data/text/maps/Route110_TrickHousePuzzle1.s"
-	.include "data/text/maps/Route110_TrickHousePuzzle2.s"
-	.include "data/text/maps/Route110_TrickHousePuzzle3.s"
-	.include "data/text/maps/Route110_TrickHousePuzzle4.s"
-	.include "data/text/maps/Route110_TrickHousePuzzle5.s"
-	.include "data/text/maps/Route110_TrickHousePuzzle6.s"
-	.include "data/text/maps/Route110_TrickHousePuzzle7.s"
-	.include "data/text/maps/Route110_TrickHousePuzzle8.s"
-	.include "data/text/maps/Route110_SeasideCyclingRoadSouthEntrance.s"
-	.include "data/text/maps/Route110_SeasideCyclingRoadNorthEntrance.s"
-	.include "data/text/maps/Route113_GlassWorkshop.s"
-	.include "data/text/maps/Route123_BerryMastersHouse.s"
-	.include "data/text/maps/Route119_WeatherInstitute_1F.s"
-	.include "data/text/maps/Route119_WeatherInstitute_2F.s"
-	.include "data/text/maps/Route119_House.s"
-	.include "data/text/maps/Route124_DivingTreasureHuntersHouse.s"
+	.include "data/text/maps/Route110_TrickHouseEnd.inc"
+	.include "data/text/maps/Route110_TrickHousePuzzle1.inc"
+	.include "data/text/maps/Route110_TrickHousePuzzle2.inc"
+	.include "data/text/maps/Route110_TrickHousePuzzle3.inc"
+	.include "data/text/maps/Route110_TrickHousePuzzle4.inc"
+	.include "data/text/maps/Route110_TrickHousePuzzle5.inc"
+	.include "data/text/maps/Route110_TrickHousePuzzle6.inc"
+	.include "data/text/maps/Route110_TrickHousePuzzle7.inc"
+	.include "data/text/maps/Route110_TrickHousePuzzle8.inc"
+	.include "data/text/maps/Route110_SeasideCyclingRoadSouthEntrance.inc"
+	.include "data/text/maps/Route110_SeasideCyclingRoadNorthEntrance.inc"
+	.include "data/text/maps/Route113_GlassWorkshop.inc"
+	.include "data/text/maps/Route123_BerryMastersHouse.inc"
+	.include "data/text/maps/Route119_WeatherInstitute_1F.inc"
+	.include "data/text/maps/Route119_WeatherInstitute_2F.inc"
+	.include "data/text/maps/Route119_House.inc"
+	.include "data/text/maps/Route124_DivingTreasureHuntersHouse.inc"
 
 
 Std_2:
@@ -3222,7 +3222,7 @@ OldaleTown_PokemonCenter_1F_Text_1A1275:: @ 81A1275
 	.string "While infected, POKéMON are said to\n"
 	.string "grow exceptionally well.$"
 
-	.include "data/text/surf.s"
+	.include "data/text/surf.inc"
 
 SealedChamber_InnerRoom_Text_1A138B:: @ 81A138B
 	.string "It sounded as if a door opened\n"
@@ -3279,8 +3279,8 @@ PacifidlogTown_House2_EventScript_1A14DC:: @ 81A14DC
 Route101_EventScript_1A14DC:: @ 81A14DC
 	return
 
-	.include "data/scripts/berry_tree.s"
-	.include "data/text/berry_tree.s"
+	.include "data/scripts/berry_tree.inc"
+	.include "data/text/berry_tree.inc"
 
 UnknownString_81A1948: @ 81A1948
 	.string "If some vines drop down, this tree can\n"
@@ -4297,8 +4297,8 @@ SecretBase_RedCave1_EventScript_1A350A:: @ 81A350A
 	release
 	end
 
-	.include "data/text/secret_power_tm.s"
-	.include "data/scripts/secret_power_tm.s"
+	.include "data/text/secret_power_tm.inc"
+	.include "data/scripts/secret_power_tm.inc"
 
 UnknownString_81A38FB: @ 81A38FB
 	.string "All decorations and furniture in your\n"
@@ -4365,14 +4365,14 @@ UnknownString_81A3CC9: @ 81A3CC9
 	.string "Moving completed.\p"
 	.string "Would you like to use the SECRET POWER?$"
 
-	.include "data/scripts/cable_club.s"
-	.include "data/text/cable_club.s"
+	.include "data/scripts/cable_club.inc"
+	.include "data/text/cable_club.inc"
 
-	.include "data/scripts/contest_hall.s"
-	.include "data/text/contest_hall.s"
+	.include "data/scripts/contest_hall.inc"
+	.include "data/text/contest_hall.inc"
 
-	.include "data/scripts/tv.s"
-	.include "data/text/tv.s"
+	.include "data/scripts/tv.inc"
+	.include "data/text/tv.inc"
 
 BattleTower_Lobby_EventScript_1ADE46:: @ 81ADE46
 FallarborTown_ContestLobby_EventScript_1ADE46:: @ 81ADE46
@@ -4742,55 +4742,55 @@ BattleTower_Lobby_EventScript_1AE30F:: @ 81AE30F
 	setflag 918
 	return
 
-	.include "data/scripts/gabby_and_ty.s"
+	.include "data/scripts/gabby_and_ty.inc"
 
-	.include "data/scripts/bard.s"
-	.include "data/scripts/hipster.s"
-	.include "data/text/trader.s"
-	.include "data/scripts/trader.s"
-	.include "data/text/storyteller.s"
-	.include "data/scripts/storyteller.s"
-	.include "data/text/giddy.s"
-	.include "data/scripts/giddy.s"
-	.include "data/text/bard.s"
-	.include "data/text/hipster.s"
+	.include "data/scripts/bard.inc"
+	.include "data/scripts/hipster.inc"
+	.include "data/text/trader.inc"
+	.include "data/scripts/trader.inc"
+	.include "data/text/storyteller.inc"
+	.include "data/scripts/storyteller.inc"
+	.include "data/text/giddy.inc"
+	.include "data/scripts/giddy.inc"
+	.include "data/text/bard.inc"
+	.include "data/text/hipster.inc"
 
-	.include "data/field_move_scripts.s"
-	.include "data/item_ball_scripts.s"
+	.include "data/field_move_scripts.inc"
+	.include "data/item_ball_scripts.inc"
 
-	.include "data/scripts/mystery_event_club.s"
-	.include "data/text/mystery_event_club.s"
+	.include "data/scripts/mystery_event_club.inc"
+	.include "data/text/mystery_event_club.inc"
 
-	.include "data/scripts/day_care.s"
-	.include "data/text/day_care.s"
+	.include "data/scripts/day_care.inc"
+	.include "data/text/day_care.inc"
 
-	.include "data/scripts/magma_chimney.s"
-	.include "data/scripts/magma_summit.s"
+	.include "data/scripts/magma_chimney.inc"
+	.include "data/scripts/magma_summit.inc"
 
-	.include "data/text/aqua_chimney.s"
-	.include "data/text/magma_chimney.s"
-	.include "data/text/aqua_awakening.s"
-	.include "data/text/magma_awakening.s"
-	.include "data/text/aqua_settled.s"
-	.include "data/text/magma_settled.s"
-	.include "data/text/aqua_summit.s"
-	.include "data/text/magma_summit.s"
+	.include "data/text/aqua_chimney.inc"
+	.include "data/text/magma_chimney.inc"
+	.include "data/text/aqua_awakening.inc"
+	.include "data/text/magma_awakening.inc"
+	.include "data/text/aqua_settled.inc"
+	.include "data/text/magma_settled.inc"
+	.include "data/text/aqua_summit.inc"
+	.include "data/text/magma_summit.inc"
 
 gUnknown_081B694A:: @ 81B694A
 	lighten 1
 	darken 1
 	end
 
-	.include "data/scripts/players_house.s"
+	.include "data/scripts/players_house.inc"
 
 Event_RunningShoesManual:: @ 81B6E5A
 	msgbox UnknownString_81728E3, 3
 	end
 
-	.include "data/text/pokeblocks.s"
-	.include "data/scripts/pokeblocks.s"
+	.include "data/text/pokeblocks.inc"
+	.include "data/scripts/pokeblocks.inc"
 
-	.include "data/text/trainers.s"
+	.include "data/text/trainers.inc"
 
 Event_RepelWoreOff:: @ 81C33E6
 	msgbox Text_RepelWoreOff, 3
@@ -4799,8 +4799,8 @@ Event_RepelWoreOff:: @ 81C33E6
 Text_RepelWoreOff: @ 81C33EF
 	.string "REPEL’s effect wore off...$"
 
-	.include "data/scripts/safari_zone.s"
-	.include "data/text/safari_zone.s"
+	.include "data/scripts/safari_zone.inc"
+	.include "data/text/safari_zone.inc"
 
 MauvilleCity_GameCorner_EventScript_1C407E:: @ 81C407E
 	checkitem ITEM_COIN_CASE, 1
@@ -4831,14 +4831,14 @@ MauvilleCity_GameCorner_EventScript_1C40DA:: @ 81C40DA
 	waitstate
 	end
 
-	.include "data/text/roulette.s"
-	.include "data/text/barboach.s"
-	.include "data/text/pokedex_rating.s"
-	.include "data/text/lottery_corner.s"
-	.include "data/text/eon_ticket.s"
-	.include "data/text/braille.s"
-	.include "data/text/berries.s"
-	.include "data/text/shoal_cave.s"
+	.include "data/text/roulette.inc"
+	.include "data/text/barboach.inc"
+	.include "data/text/pokedex_rating.inc"
+	.include "data/text/lottery_corner.inc"
+	.include "data/text/eon_ticket.inc"
+	.include "data/text/braille.inc"
+	.include "data/text/berries.inc"
+	.include "data/text/shoal_cave.inc"
 
 PictureBookShelfText: @ 81C6A69
 	.string "There’s a set of POKéMON picture books.$"
@@ -4960,5 +4960,5 @@ Text_1C6C62: @ 81C6C62
 	.align 2
 	.string "$"
 
-	.include "data/text/save.s"
-	.include "data/text/birch_speech.s"
+	.include "data/text/save.inc"
+	.include "data/text/birch_speech.inc"
diff --git a/data/evolution_table.s b/data/evolution_table.inc
index 8234ac7a2..8234ac7a2 100644
--- a/data/evolution_table.s
+++ b/data/evolution_table.inc
diff --git a/data/experience_tables/tables.s b/data/experience_tables/tables.inc
index 5018efc0f..5018efc0f 100644
--- a/data/experience_tables/tables.s
+++ b/data/experience_tables/tables.inc
diff --git a/data/field_effect_scripts.s b/data/field_effect_scripts.s
index a1f796f83..aabb1252d 100644
--- a/data/field_effect_scripts.s
+++ b/data/field_effect_scripts.s
@@ -1,6 +1,6 @@
-	.include "asm/macros.s"
-	.include "asm/macros/field_effect_script.s"
-	.include "constants/constants.s"
+	.include "asm/macros.inc"
+	.include "asm/macros/field_effect_script.inc"
+	.include "constants/constants.inc"
 
 	.section script_data, "aw", %progbits
 
diff --git a/data/field_move_scripts.s b/data/field_move_scripts.inc
index 413ab351a..413ab351a 100644
--- a/data/field_move_scripts.s
+++ b/data/field_move_scripts.inc
diff --git a/data/graphics.s b/data/graphics.s
index 6dcd10041..f809c6ddd 100644
--- a/data/graphics.s
+++ b/data/graphics.s
@@ -15,7 +15,7 @@ gUnknown_08D00524:: @ 8D00524
 	.incbin "graphics/interface/menu_map.bin"
 
 @ 8D01524
-	.include "data/graphics/pokemon/circled_question_mark_graphics.s"
+	.include "data/graphics/pokemon/circled_question_mark_graphics.inc"
 
 @ 8D019E4
 	.incbin "graphics/unused/old_charmap.4bpp.lz" @ japanese table and bunch of stuff
@@ -2512,10 +2512,10 @@ gBattleAnimSpritePalette_257:: @ 8D2FD6C
 	.incbin "graphics/battle_anims/sprites/257.gbapal.lz"
 
 @ 8D2FD8C
-	.include "data/graphics/pokemon/graphics.s"
+	.include "data/graphics/pokemon/graphics.inc"
 
 @ 8E48D38
-	.include "data/graphics/trainers/graphics.s"
+	.include "data/graphics/trainers/graphics.inc"
 
 	.align 2
 gMonIcon_QuestionMark:: @ 8E5D5F0
@@ -3346,7 +3346,7 @@ gBerryCheckCircle_Gfx:: @ 8E78BB4
 	.incbin "graphics/interface/check_berry_circle.4bpp.lz"
 
 @ 8E78D00
-	.include "data/graphics/berries/graphics.s"
+	.include "data/graphics/berries/graphics.inc"
 
 	.align 2
 gBattleAnimSpritePalette_282:: @ 8E7E7D0
diff --git a/data/graphics/berries/graphics.s b/data/graphics/berries/graphics.inc
index 19207ee32..19207ee32 100644
--- a/data/graphics/berries/graphics.s
+++ b/data/graphics/berries/graphics.inc
diff --git a/data/graphics/berries/graphics_table.s b/data/graphics/berries/graphics_table.inc
index 78af1c48b..78af1c48b 100644
--- a/data/graphics/berries/graphics_table.s
+++ b/data/graphics/berries/graphics_table.inc
diff --git a/data/graphics/field_objects/base_oam.s b/data/graphics/field_objects/base_oam.inc
index 88a8ed058..88a8ed058 100644
--- a/data/graphics/field_objects/base_oam.s
+++ b/data/graphics/field_objects/base_oam.inc
diff --git a/data/graphics/field_objects/berry_tree_graphics_tables.s b/data/graphics/field_objects/berry_tree_graphics_tables.inc
index 925f35d19..925f35d19 100644
--- a/data/graphics/field_objects/berry_tree_graphics_tables.s
+++ b/data/graphics/field_objects/berry_tree_graphics_tables.inc
diff --git a/data/graphics/field_objects/field_effect_object_graphics.s b/data/graphics/field_objects/field_effect_object_graphics.inc
index 67865c4d0..67865c4d0 100644
--- a/data/graphics/field_objects/field_effect_object_graphics.s
+++ b/data/graphics/field_objects/field_effect_object_graphics.inc
diff --git a/data/graphics/field_objects/field_effect_object_template_pointers.s b/data/graphics/field_objects/field_effect_object_template_pointers.inc
index 278de275d..278de275d 100644
--- a/data/graphics/field_objects/field_effect_object_template_pointers.s
+++ b/data/graphics/field_objects/field_effect_object_template_pointers.inc
diff --git a/data/graphics/field_objects/field_effect_objects.s b/data/graphics/field_objects/field_effect_objects.inc
index c3a9585f4..c3a9585f4 100644
--- a/data/graphics/field_objects/field_effect_objects.s
+++ b/data/graphics/field_objects/field_effect_objects.inc
diff --git a/data/graphics/field_objects/map_object_anims.s b/data/graphics/field_objects/map_object_anims.inc
index 1c6614964..1c6614964 100644
--- a/data/graphics/field_objects/map_object_anims.s
+++ b/data/graphics/field_objects/map_object_anims.inc
diff --git a/data/graphics/field_objects/map_object_graphics.s b/data/graphics/field_objects/map_object_graphics.inc
index 5bf9ccc9c..5bf9ccc9c 100644
--- a/data/graphics/field_objects/map_object_graphics.s
+++ b/data/graphics/field_objects/map_object_graphics.inc
diff --git a/data/graphics/field_objects/map_object_graphics_info.s b/data/graphics/field_objects/map_object_graphics_info.inc
index c446904b7..c446904b7 100644
--- a/data/graphics/field_objects/map_object_graphics_info.s
+++ b/data/graphics/field_objects/map_object_graphics_info.inc
diff --git a/data/graphics/field_objects/map_object_graphics_info_pointers.s b/data/graphics/field_objects/map_object_graphics_info_pointers.inc
index 7b17f9a5c..7b17f9a5c 100644
--- a/data/graphics/field_objects/map_object_graphics_info_pointers.s
+++ b/data/graphics/field_objects/map_object_graphics_info_pointers.inc
diff --git a/data/graphics/field_objects/map_object_pic_tables.s b/data/graphics/field_objects/map_object_pic_tables.inc
index a1b549382..a1b549382 100644
--- a/data/graphics/field_objects/map_object_pic_tables.s
+++ b/data/graphics/field_objects/map_object_pic_tables.inc
diff --git a/data/graphics/field_objects/map_object_subsprites.s b/data/graphics/field_objects/map_object_subsprites.inc
index 801f40693..801f40693 100644
--- a/data/graphics/field_objects/map_object_subsprites.s
+++ b/data/graphics/field_objects/map_object_subsprites.inc
diff --git a/data/graphics/pokemon/back_pic_coords.s b/data/graphics/pokemon/back_pic_coords.inc
index 71c81a81b..71c81a81b 100644
--- a/data/graphics/pokemon/back_pic_coords.s
+++ b/data/graphics/pokemon/back_pic_coords.inc
diff --git a/data/graphics/pokemon/back_pic_table.s b/data/graphics/pokemon/back_pic_table.inc
index 339543701..339543701 100644
--- a/data/graphics/pokemon/back_pic_table.s
+++ b/data/graphics/pokemon/back_pic_table.inc
diff --git a/data/graphics/pokemon/circled_question_mark_graphics.s b/data/graphics/pokemon/circled_question_mark_graphics.inc
index 55b18e04d..55b18e04d 100644
--- a/data/graphics/pokemon/circled_question_mark_graphics.s
+++ b/data/graphics/pokemon/circled_question_mark_graphics.inc
diff --git a/data/graphics/pokemon/footprint_table.s b/data/graphics/pokemon/footprint_table.inc
index 675a3bce4..675a3bce4 100644
--- a/data/graphics/pokemon/footprint_table.s
+++ b/data/graphics/pokemon/footprint_table.inc
diff --git a/data/graphics/pokemon/front_pic_coords.s b/data/graphics/pokemon/front_pic_coords.inc
index bda4eac5d..bda4eac5d 100644
--- a/data/graphics/pokemon/front_pic_coords.s
+++ b/data/graphics/pokemon/front_pic_coords.inc
diff --git a/data/graphics/pokemon/front_pic_table.s b/data/graphics/pokemon/front_pic_table.inc
index 095c3d02a..095c3d02a 100644
--- a/data/graphics/pokemon/front_pic_table.s
+++ b/data/graphics/pokemon/front_pic_table.inc
diff --git a/data/graphics/pokemon/graphics.s b/data/graphics/pokemon/graphics.inc
index 8a4db9292..8a4db9292 100644
--- a/data/graphics/pokemon/graphics.s
+++ b/data/graphics/pokemon/graphics.inc
diff --git a/data/graphics/pokemon/icon_palette_indices.s b/data/graphics/pokemon/icon_palette_indices.inc
index f37ec2a7a..f37ec2a7a 100644
--- a/data/graphics/pokemon/icon_palette_indices.s
+++ b/data/graphics/pokemon/icon_palette_indices.inc
diff --git a/data/graphics/pokemon/icon_palette_table.s b/data/graphics/pokemon/icon_palette_table.inc
index d9da61ab2..d9da61ab2 100644
--- a/data/graphics/pokemon/icon_palette_table.s
+++ b/data/graphics/pokemon/icon_palette_table.inc
diff --git a/data/graphics/pokemon/icon_table.s b/data/graphics/pokemon/icon_table.inc
index eeb064208..eeb064208 100644
--- a/data/graphics/pokemon/icon_table.s
+++ b/data/graphics/pokemon/icon_table.inc
diff --git a/data/graphics/pokemon/palette_table.s b/data/graphics/pokemon/palette_table.inc
index f38884596..f38884596 100644
--- a/data/graphics/pokemon/palette_table.s
+++ b/data/graphics/pokemon/palette_table.inc
diff --git a/data/graphics/pokemon/shiny_palette_table.s b/data/graphics/pokemon/shiny_palette_table.inc
index 0de988408..0de988408 100644
--- a/data/graphics/pokemon/shiny_palette_table.s
+++ b/data/graphics/pokemon/shiny_palette_table.inc
diff --git a/data/graphics/trainers/back_pic_coords.s b/data/graphics/trainers/back_pic_coords.inc
index e1c0b0e60..e1c0b0e60 100644
--- a/data/graphics/trainers/back_pic_coords.s
+++ b/data/graphics/trainers/back_pic_coords.inc
diff --git a/data/graphics/trainers/back_pic_palette_table.s b/data/graphics/trainers/back_pic_palette_table.inc
index 143becca4..143becca4 100644
--- a/data/graphics/trainers/back_pic_palette_table.s
+++ b/data/graphics/trainers/back_pic_palette_table.inc
diff --git a/data/graphics/trainers/back_pic_table.s b/data/graphics/trainers/back_pic_table.inc
index c4c243c87..c4c243c87 100644
--- a/data/graphics/trainers/back_pic_table.s
+++ b/data/graphics/trainers/back_pic_table.inc
diff --git a/data/graphics/trainers/front_pic_coords.s b/data/graphics/trainers/front_pic_coords.inc
index c095febdb..c095febdb 100644
--- a/data/graphics/trainers/front_pic_coords.s
+++ b/data/graphics/trainers/front_pic_coords.inc
diff --git a/data/graphics/trainers/front_pic_palette_table.s b/data/graphics/trainers/front_pic_palette_table.inc
index d598d1a6f..d598d1a6f 100644
--- a/data/graphics/trainers/front_pic_palette_table.s
+++ b/data/graphics/trainers/front_pic_palette_table.inc
diff --git a/data/graphics/trainers/front_pic_table.s b/data/graphics/trainers/front_pic_table.inc
index 056647dcd..056647dcd 100644
--- a/data/graphics/trainers/front_pic_table.s
+++ b/data/graphics/trainers/front_pic_table.inc
diff --git a/data/graphics/trainers/graphics.s b/data/graphics/trainers/graphics.inc
index 09f34ca31..09f34ca31 100644
--- a/data/graphics/trainers/graphics.s
+++ b/data/graphics/trainers/graphics.inc
diff --git a/data/ingame_trades.s b/data/ingame_trades.inc
index f5258e26c..f5258e26c 100644
--- a/data/ingame_trades.s
+++ b/data/ingame_trades.inc
diff --git a/data/item_ball_scripts.s b/data/item_ball_scripts.inc
index ad4386990..ad4386990 100644
--- a/data/item_ball_scripts.s
+++ b/data/item_ball_scripts.inc
diff --git a/data/item_effects.s b/data/item_effects.inc
index 7b05354c2..7b05354c2 100644
--- a/data/item_effects.s
+++ b/data/item_effects.inc
diff --git a/data/items.s b/data/items.inc
index 0074a6bfa..0074a6bfa 100644
--- a/data/items.s
+++ b/data/items.inc
diff --git a/data/landmarks.s b/data/landmarks.inc
index 455868d8c..455868d8c 100644
--- a/data/landmarks.s
+++ b/data/landmarks.inc
diff --git a/data/level_up_learnset_pointers.s b/data/level_up_learnset_pointers.inc
index 31055be5c..31055be5c 100644
--- a/data/level_up_learnset_pointers.s
+++ b/data/level_up_learnset_pointers.inc
diff --git a/data/level_up_learnsets.s b/data/level_up_learnsets.inc
index b2a445dda..b2a445dda 100644
--- a/data/level_up_learnsets.s
+++ b/data/level_up_learnsets.inc
diff --git a/data/maps/_assets.s b/data/maps/_assets.inc
index a9cc15869..a9cc15869 100644
--- a/data/maps/_assets.s
+++ b/data/maps/_assets.inc
diff --git a/data/maps/_groups.s b/data/maps/_groups.inc
index 478f03e86..478f03e86 100644
--- a/data/maps/_groups.s
+++ b/data/maps/_groups.inc
diff --git a/data/maps/attributes_table.s b/data/maps/attributes_table.inc
index 41b0df228..41b0df228 100644
--- a/data/maps/attributes_table.s
+++ b/data/maps/attributes_table.inc
diff --git a/data/maps/connections.s b/data/maps/connections.inc
index 9e5f3a5a5..9e5f3a5a5 100644
--- a/data/maps/connections.s
+++ b/data/maps/connections.inc
diff --git a/data/maps/events/AbandonedShip_CaptainsOffice.s b/data/maps/events/AbandonedShip_CaptainsOffice.inc
index e05bee18c..e05bee18c 100644
--- a/data/maps/events/AbandonedShip_CaptainsOffice.s
+++ b/data/maps/events/AbandonedShip_CaptainsOffice.inc
diff --git a/data/maps/events/AbandonedShip_Corridors_1F.s b/data/maps/events/AbandonedShip_Corridors_1F.inc
index 8a42d3204..8a42d3204 100644
--- a/data/maps/events/AbandonedShip_Corridors_1F.s
+++ b/data/maps/events/AbandonedShip_Corridors_1F.inc
diff --git a/data/maps/events/AbandonedShip_Corridors_B1F.s b/data/maps/events/AbandonedShip_Corridors_B1F.inc
index 7b50cf2fe..7b50cf2fe 100644
--- a/data/maps/events/AbandonedShip_Corridors_B1F.s
+++ b/data/maps/events/AbandonedShip_Corridors_B1F.inc
diff --git a/data/maps/events/AbandonedShip_Deck.s b/data/maps/events/AbandonedShip_Deck.inc
index 6988f8568..6988f8568 100644
--- a/data/maps/events/AbandonedShip_Deck.s
+++ b/data/maps/events/AbandonedShip_Deck.inc
diff --git a/data/maps/events/AbandonedShip_HiddenFloorCorridors.s b/data/maps/events/AbandonedShip_HiddenFloorCorridors.inc
index e5f17046d..e5f17046d 100644
--- a/data/maps/events/AbandonedShip_HiddenFloorCorridors.s
+++ b/data/maps/events/AbandonedShip_HiddenFloorCorridors.inc
diff --git a/data/maps/events/AbandonedShip_HiddenFloorRooms.s b/data/maps/events/AbandonedShip_HiddenFloorRooms.inc
index e110e051d..e110e051d 100644
--- a/data/maps/events/AbandonedShip_HiddenFloorRooms.s
+++ b/data/maps/events/AbandonedShip_HiddenFloorRooms.inc
diff --git a/data/maps/events/AbandonedShip_Room_B1F.s b/data/maps/events/AbandonedShip_Room_B1F.inc
index 9213f3e98..9213f3e98 100644
--- a/data/maps/events/AbandonedShip_Room_B1F.s
+++ b/data/maps/events/AbandonedShip_Room_B1F.inc
diff --git a/data/maps/events/AbandonedShip_Rooms2_1F.s b/data/maps/events/AbandonedShip_Rooms2_1F.inc
index 842f972fa..842f972fa 100644
--- a/data/maps/events/AbandonedShip_Rooms2_1F.s
+++ b/data/maps/events/AbandonedShip_Rooms2_1F.inc
diff --git a/data/maps/events/AbandonedShip_Rooms2_B1F.s b/data/maps/events/AbandonedShip_Rooms2_B1F.inc
index 2ad55a5e9..2ad55a5e9 100644
--- a/data/maps/events/AbandonedShip_Rooms2_B1F.s
+++ b/data/maps/events/AbandonedShip_Rooms2_B1F.inc
diff --git a/data/maps/events/AbandonedShip_Rooms_1F.s b/data/maps/events/AbandonedShip_Rooms_1F.inc
index 90578df28..90578df28 100644
--- a/data/maps/events/AbandonedShip_Rooms_1F.s
+++ b/data/maps/events/AbandonedShip_Rooms_1F.inc
diff --git a/data/maps/events/AbandonedShip_Rooms_B1F.s b/data/maps/events/AbandonedShip_Rooms_B1F.inc
index 692883bec..692883bec 100644
--- a/data/maps/events/AbandonedShip_Rooms_B1F.s
+++ b/data/maps/events/AbandonedShip_Rooms_B1F.inc
diff --git a/data/maps/events/AbandonedShip_Underwater1.s b/data/maps/events/AbandonedShip_Underwater1.inc
index 9a4634860..9a4634860 100644
--- a/data/maps/events/AbandonedShip_Underwater1.s
+++ b/data/maps/events/AbandonedShip_Underwater1.inc
diff --git a/data/maps/events/AbandonedShip_Underwater2.s b/data/maps/events/AbandonedShip_Underwater2.inc
index a3a181773..a3a181773 100644
--- a/data/maps/events/AbandonedShip_Underwater2.s
+++ b/data/maps/events/AbandonedShip_Underwater2.inc
diff --git a/data/maps/events/AncientTomb.s b/data/maps/events/AncientTomb.inc
index 1f527288b..1f527288b 100644
--- a/data/maps/events/AncientTomb.s
+++ b/data/maps/events/AncientTomb.inc
diff --git a/data/maps/events/AquaHideout_1F.s b/data/maps/events/AquaHideout_1F.inc
index 5c59bbf12..5c59bbf12 100644
--- a/data/maps/events/AquaHideout_1F.s
+++ b/data/maps/events/AquaHideout_1F.inc
diff --git a/data/maps/events/AquaHideout_B1F.s b/data/maps/events/AquaHideout_B1F.inc
index 742761833..742761833 100644
--- a/data/maps/events/AquaHideout_B1F.s
+++ b/data/maps/events/AquaHideout_B1F.inc
diff --git a/data/maps/events/AquaHideout_B2F.s b/data/maps/events/AquaHideout_B2F.inc
index d2cce8ab9..d2cce8ab9 100644
--- a/data/maps/events/AquaHideout_B2F.s
+++ b/data/maps/events/AquaHideout_B2F.inc
diff --git a/data/maps/events/BattleTower_BattleRoom.s b/data/maps/events/BattleTower_BattleRoom.inc
index dda5621b6..dda5621b6 100644
--- a/data/maps/events/BattleTower_BattleRoom.s
+++ b/data/maps/events/BattleTower_BattleRoom.inc
diff --git a/data/maps/events/BattleTower_Corridor.s b/data/maps/events/BattleTower_Corridor.inc
index 33b5a779c..33b5a779c 100644
--- a/data/maps/events/BattleTower_Corridor.s
+++ b/data/maps/events/BattleTower_Corridor.inc
diff --git a/data/maps/events/BattleTower_Elevator.s b/data/maps/events/BattleTower_Elevator.inc
index 7594028b6..7594028b6 100644
--- a/data/maps/events/BattleTower_Elevator.s
+++ b/data/maps/events/BattleTower_Elevator.inc
diff --git a/data/maps/events/BattleTower_Lobby.s b/data/maps/events/BattleTower_Lobby.inc
index 6d4e15f7a..6d4e15f7a 100644
--- a/data/maps/events/BattleTower_Lobby.s
+++ b/data/maps/events/BattleTower_Lobby.inc
diff --git a/data/maps/events/BattleTower_Outside.s b/data/maps/events/BattleTower_Outside.inc
index 04085c346..04085c346 100644
--- a/data/maps/events/BattleTower_Outside.s
+++ b/data/maps/events/BattleTower_Outside.inc
diff --git a/data/maps/events/CaveOfOrigin_1F.s b/data/maps/events/CaveOfOrigin_1F.inc
index 43b0b615d..43b0b615d 100644
--- a/data/maps/events/CaveOfOrigin_1F.s
+++ b/data/maps/events/CaveOfOrigin_1F.inc
diff --git a/data/maps/events/CaveOfOrigin_B1F.s b/data/maps/events/CaveOfOrigin_B1F.inc
index 0a3df0655..0a3df0655 100644
--- a/data/maps/events/CaveOfOrigin_B1F.s
+++ b/data/maps/events/CaveOfOrigin_B1F.inc
diff --git a/data/maps/events/CaveOfOrigin_B2F.s b/data/maps/events/CaveOfOrigin_B2F.inc
index 9c04629f0..9c04629f0 100644
--- a/data/maps/events/CaveOfOrigin_B2F.s
+++ b/data/maps/events/CaveOfOrigin_B2F.inc
diff --git a/data/maps/events/CaveOfOrigin_B3F.s b/data/maps/events/CaveOfOrigin_B3F.inc
index 0d0b44eea..0d0b44eea 100644
--- a/data/maps/events/CaveOfOrigin_B3F.s
+++ b/data/maps/events/CaveOfOrigin_B3F.inc
diff --git a/data/maps/events/CaveOfOrigin_B4F.s b/data/maps/events/CaveOfOrigin_B4F.inc
index 3b4beb038..3b4beb038 100644
--- a/data/maps/events/CaveOfOrigin_B4F.s
+++ b/data/maps/events/CaveOfOrigin_B4F.inc
diff --git a/data/maps/events/CaveOfOrigin_Entrance.s b/data/maps/events/CaveOfOrigin_Entrance.inc
index 4e61e3d82..4e61e3d82 100644
--- a/data/maps/events/CaveOfOrigin_Entrance.s
+++ b/data/maps/events/CaveOfOrigin_Entrance.inc
diff --git a/data/maps/events/DesertRuins.s b/data/maps/events/DesertRuins.inc
index 849c7f729..849c7f729 100644
--- a/data/maps/events/DesertRuins.s
+++ b/data/maps/events/DesertRuins.inc
diff --git a/data/maps/events/DewfordTown.s b/data/maps/events/DewfordTown.inc
index 8a5fc1fed..8a5fc1fed 100644
--- a/data/maps/events/DewfordTown.s
+++ b/data/maps/events/DewfordTown.inc
diff --git a/data/maps/events/DewfordTown_Gym.s b/data/maps/events/DewfordTown_Gym.inc
index 2e36395c1..2e36395c1 100644
--- a/data/maps/events/DewfordTown_Gym.s
+++ b/data/maps/events/DewfordTown_Gym.inc
diff --git a/data/maps/events/DewfordTown_Hall.s b/data/maps/events/DewfordTown_Hall.inc
index d58fbfbd4..d58fbfbd4 100644
--- a/data/maps/events/DewfordTown_Hall.s
+++ b/data/maps/events/DewfordTown_Hall.inc
diff --git a/data/maps/events/DewfordTown_House1.s b/data/maps/events/DewfordTown_House1.inc
index 9bed6ac7a..9bed6ac7a 100644
--- a/data/maps/events/DewfordTown_House1.s
+++ b/data/maps/events/DewfordTown_House1.inc
diff --git a/data/maps/events/DewfordTown_House2.s b/data/maps/events/DewfordTown_House2.inc
index eae9ff28e..eae9ff28e 100644
--- a/data/maps/events/DewfordTown_House2.s
+++ b/data/maps/events/DewfordTown_House2.inc
diff --git a/data/maps/events/DewfordTown_PokemonCenter_1F.s b/data/maps/events/DewfordTown_PokemonCenter_1F.inc
index a870483b3..a870483b3 100644
--- a/data/maps/events/DewfordTown_PokemonCenter_1F.s
+++ b/data/maps/events/DewfordTown_PokemonCenter_1F.inc
diff --git a/data/maps/events/DewfordTown_PokemonCenter_2F.s b/data/maps/events/DewfordTown_PokemonCenter_2F.inc
index 0d17672de..0d17672de 100644
--- a/data/maps/events/DewfordTown_PokemonCenter_2F.s
+++ b/data/maps/events/DewfordTown_PokemonCenter_2F.inc
diff --git a/data/maps/events/DoubleBattleColosseum.s b/data/maps/events/DoubleBattleColosseum.inc
index f6142c4b4..f6142c4b4 100644
--- a/data/maps/events/DoubleBattleColosseum.s
+++ b/data/maps/events/DoubleBattleColosseum.inc
diff --git a/data/maps/events/EverGrandeCity.s b/data/maps/events/EverGrandeCity.inc
index 41fd48f06..41fd48f06 100644
--- a/data/maps/events/EverGrandeCity.s
+++ b/data/maps/events/EverGrandeCity.inc
diff --git a/data/maps/events/EverGrandeCity_ChampionsRoom.s b/data/maps/events/EverGrandeCity_ChampionsRoom.inc
index 5d97fe89c..5d97fe89c 100644
--- a/data/maps/events/EverGrandeCity_ChampionsRoom.s
+++ b/data/maps/events/EverGrandeCity_ChampionsRoom.inc
diff --git a/data/maps/events/EverGrandeCity_Corridor1.s b/data/maps/events/EverGrandeCity_Corridor1.inc
index df9176426..df9176426 100644
--- a/data/maps/events/EverGrandeCity_Corridor1.s
+++ b/data/maps/events/EverGrandeCity_Corridor1.inc
diff --git a/data/maps/events/EverGrandeCity_Corridor2.s b/data/maps/events/EverGrandeCity_Corridor2.inc
index 35dfa181c..35dfa181c 100644
--- a/data/maps/events/EverGrandeCity_Corridor2.s
+++ b/data/maps/events/EverGrandeCity_Corridor2.inc
diff --git a/data/maps/events/EverGrandeCity_Corridor3.s b/data/maps/events/EverGrandeCity_Corridor3.inc
index daf135a5f..daf135a5f 100644
--- a/data/maps/events/EverGrandeCity_Corridor3.s
+++ b/data/maps/events/EverGrandeCity_Corridor3.inc
diff --git a/data/maps/events/EverGrandeCity_Corridor4.s b/data/maps/events/EverGrandeCity_Corridor4.inc
index 55757ea4c..55757ea4c 100644
--- a/data/maps/events/EverGrandeCity_Corridor4.s
+++ b/data/maps/events/EverGrandeCity_Corridor4.inc
diff --git a/data/maps/events/EverGrandeCity_Corridor5.s b/data/maps/events/EverGrandeCity_Corridor5.inc
index bd07dd7e0..bd07dd7e0 100644
--- a/data/maps/events/EverGrandeCity_Corridor5.s
+++ b/data/maps/events/EverGrandeCity_Corridor5.inc
diff --git a/data/maps/events/EverGrandeCity_DrakesRoom.s b/data/maps/events/EverGrandeCity_DrakesRoom.inc
index a925ffed8..a925ffed8 100644
--- a/data/maps/events/EverGrandeCity_DrakesRoom.s
+++ b/data/maps/events/EverGrandeCity_DrakesRoom.inc
diff --git a/data/maps/events/EverGrandeCity_GlaciasRoom.s b/data/maps/events/EverGrandeCity_GlaciasRoom.inc
index 806cfe7e1..806cfe7e1 100644
--- a/data/maps/events/EverGrandeCity_GlaciasRoom.s
+++ b/data/maps/events/EverGrandeCity_GlaciasRoom.inc
diff --git a/data/maps/events/EverGrandeCity_HallOfFame.s b/data/maps/events/EverGrandeCity_HallOfFame.inc
index 1860ee397..1860ee397 100644
--- a/data/maps/events/EverGrandeCity_HallOfFame.s
+++ b/data/maps/events/EverGrandeCity_HallOfFame.inc
diff --git a/data/maps/events/EverGrandeCity_PhoebesRoom.s b/data/maps/events/EverGrandeCity_PhoebesRoom.inc
index aab61bcf4..aab61bcf4 100644
--- a/data/maps/events/EverGrandeCity_PhoebesRoom.s
+++ b/data/maps/events/EverGrandeCity_PhoebesRoom.inc
diff --git a/data/maps/events/EverGrandeCity_PokemonCenter_1F.s b/data/maps/events/EverGrandeCity_PokemonCenter_1F.inc
index 25aee1300..25aee1300 100644
--- a/data/maps/events/EverGrandeCity_PokemonCenter_1F.s
+++ b/data/maps/events/EverGrandeCity_PokemonCenter_1F.inc
diff --git a/data/maps/events/EverGrandeCity_PokemonCenter_2F.s b/data/maps/events/EverGrandeCity_PokemonCenter_2F.inc
index 2bc94cdcc..2bc94cdcc 100644
--- a/data/maps/events/EverGrandeCity_PokemonCenter_2F.s
+++ b/data/maps/events/EverGrandeCity_PokemonCenter_2F.inc
diff --git a/data/maps/events/EverGrandeCity_PokemonLeague.s b/data/maps/events/EverGrandeCity_PokemonLeague.inc
index d60761727..d60761727 100644
--- a/data/maps/events/EverGrandeCity_PokemonLeague.s
+++ b/data/maps/events/EverGrandeCity_PokemonLeague.inc
diff --git a/data/maps/events/EverGrandeCity_SidneysRoom.s b/data/maps/events/EverGrandeCity_SidneysRoom.inc
index ff370d4ef..ff370d4ef 100644
--- a/data/maps/events/EverGrandeCity_SidneysRoom.s
+++ b/data/maps/events/EverGrandeCity_SidneysRoom.inc
diff --git a/data/maps/events/FallarborTown.s b/data/maps/events/FallarborTown.inc
index 2d69688e7..2d69688e7 100644
--- a/data/maps/events/FallarborTown.s
+++ b/data/maps/events/FallarborTown.inc
diff --git a/data/maps/events/FallarborTown_ContestHall.s b/data/maps/events/FallarborTown_ContestHall.inc
index 93b43eccc..93b43eccc 100644
--- a/data/maps/events/FallarborTown_ContestHall.s
+++ b/data/maps/events/FallarborTown_ContestHall.inc
diff --git a/data/maps/events/FallarborTown_ContestLobby.s b/data/maps/events/FallarborTown_ContestLobby.inc
index af7ca5ed1..af7ca5ed1 100644
--- a/data/maps/events/FallarborTown_ContestLobby.s
+++ b/data/maps/events/FallarborTown_ContestLobby.inc
diff --git a/data/maps/events/FallarborTown_House1.s b/data/maps/events/FallarborTown_House1.inc
index d4cd3e0c9..d4cd3e0c9 100644
--- a/data/maps/events/FallarborTown_House1.s
+++ b/data/maps/events/FallarborTown_House1.inc
diff --git a/data/maps/events/FallarborTown_House2.s b/data/maps/events/FallarborTown_House2.inc
index 0b1c64162..0b1c64162 100644
--- a/data/maps/events/FallarborTown_House2.s
+++ b/data/maps/events/FallarborTown_House2.inc
diff --git a/data/maps/events/FallarborTown_Mart.s b/data/maps/events/FallarborTown_Mart.inc
index 584b70447..584b70447 100644
--- a/data/maps/events/FallarborTown_Mart.s
+++ b/data/maps/events/FallarborTown_Mart.inc
diff --git a/data/maps/events/FallarborTown_PokemonCenter_1F.s b/data/maps/events/FallarborTown_PokemonCenter_1F.inc
index 16f90af9d..16f90af9d 100644
--- a/data/maps/events/FallarborTown_PokemonCenter_1F.s
+++ b/data/maps/events/FallarborTown_PokemonCenter_1F.inc
diff --git a/data/maps/events/FallarborTown_PokemonCenter_2F.s b/data/maps/events/FallarborTown_PokemonCenter_2F.inc
index 05ea78f75..05ea78f75 100644
--- a/data/maps/events/FallarborTown_PokemonCenter_2F.s
+++ b/data/maps/events/FallarborTown_PokemonCenter_2F.inc
diff --git a/data/maps/events/FieryPath.s b/data/maps/events/FieryPath.inc
index 01b7b3efe..01b7b3efe 100644
--- a/data/maps/events/FieryPath.s
+++ b/data/maps/events/FieryPath.inc
diff --git a/data/maps/events/FortreeCity.s b/data/maps/events/FortreeCity.inc
index 437852d25..437852d25 100644
--- a/data/maps/events/FortreeCity.s
+++ b/data/maps/events/FortreeCity.inc
diff --git a/data/maps/events/FortreeCity_DecorationShop.s b/data/maps/events/FortreeCity_DecorationShop.inc
index cc9894b5c..cc9894b5c 100644
--- a/data/maps/events/FortreeCity_DecorationShop.s
+++ b/data/maps/events/FortreeCity_DecorationShop.inc
diff --git a/data/maps/events/FortreeCity_Gym.s b/data/maps/events/FortreeCity_Gym.inc
index ad983f81b..ad983f81b 100644
--- a/data/maps/events/FortreeCity_Gym.s
+++ b/data/maps/events/FortreeCity_Gym.inc
diff --git a/data/maps/events/FortreeCity_House1.s b/data/maps/events/FortreeCity_House1.inc
index ff383b464..ff383b464 100644
--- a/data/maps/events/FortreeCity_House1.s
+++ b/data/maps/events/FortreeCity_House1.inc
diff --git a/data/maps/events/FortreeCity_House2.s b/data/maps/events/FortreeCity_House2.inc
index 3b0943b2e..3b0943b2e 100644
--- a/data/maps/events/FortreeCity_House2.s
+++ b/data/maps/events/FortreeCity_House2.inc
diff --git a/data/maps/events/FortreeCity_House3.s b/data/maps/events/FortreeCity_House3.inc
index b0b5a7412..b0b5a7412 100644
--- a/data/maps/events/FortreeCity_House3.s
+++ b/data/maps/events/FortreeCity_House3.inc
diff --git a/data/maps/events/FortreeCity_House4.s b/data/maps/events/FortreeCity_House4.inc
index 8b85660c7..8b85660c7 100644
--- a/data/maps/events/FortreeCity_House4.s
+++ b/data/maps/events/FortreeCity_House4.inc
diff --git a/data/maps/events/FortreeCity_House5.s b/data/maps/events/FortreeCity_House5.inc
index ffaa59e69..ffaa59e69 100644
--- a/data/maps/events/FortreeCity_House5.s
+++ b/data/maps/events/FortreeCity_House5.inc
diff --git a/data/maps/events/FortreeCity_Mart.s b/data/maps/events/FortreeCity_Mart.inc
index 5d1996fc2..5d1996fc2 100644
--- a/data/maps/events/FortreeCity_Mart.s
+++ b/data/maps/events/FortreeCity_Mart.inc
diff --git a/data/maps/events/FortreeCity_PokemonCenter_1F.s b/data/maps/events/FortreeCity_PokemonCenter_1F.inc
index bd7877e24..bd7877e24 100644
--- a/data/maps/events/FortreeCity_PokemonCenter_1F.s
+++ b/data/maps/events/FortreeCity_PokemonCenter_1F.inc
diff --git a/data/maps/events/FortreeCity_PokemonCenter_2F.s b/data/maps/events/FortreeCity_PokemonCenter_2F.inc
index b6a10428c..b6a10428c 100644
--- a/data/maps/events/FortreeCity_PokemonCenter_2F.s
+++ b/data/maps/events/FortreeCity_PokemonCenter_2F.inc
diff --git a/data/maps/events/GraniteCave_1F.s b/data/maps/events/GraniteCave_1F.inc
index 760c1b0e9..760c1b0e9 100644
--- a/data/maps/events/GraniteCave_1F.s
+++ b/data/maps/events/GraniteCave_1F.inc
diff --git a/data/maps/events/GraniteCave_B1F.s b/data/maps/events/GraniteCave_B1F.inc
index 2bfd8257d..2bfd8257d 100644
--- a/data/maps/events/GraniteCave_B1F.s
+++ b/data/maps/events/GraniteCave_B1F.inc
diff --git a/data/maps/events/GraniteCave_B2F.s b/data/maps/events/GraniteCave_B2F.inc
index 49c0bace0..49c0bace0 100644
--- a/data/maps/events/GraniteCave_B2F.s
+++ b/data/maps/events/GraniteCave_B2F.inc
diff --git a/data/maps/events/GraniteCave_StevensRoom.s b/data/maps/events/GraniteCave_StevensRoom.inc
index 2e4d9cd30..2e4d9cd30 100644
--- a/data/maps/events/GraniteCave_StevensRoom.s
+++ b/data/maps/events/GraniteCave_StevensRoom.inc
diff --git a/data/maps/events/InsideOfTruck.s b/data/maps/events/InsideOfTruck.inc
index faf7a5274..faf7a5274 100644
--- a/data/maps/events/InsideOfTruck.s
+++ b/data/maps/events/InsideOfTruck.inc
diff --git a/data/maps/events/IslandCave.s b/data/maps/events/IslandCave.inc
index a3fbc959a..a3fbc959a 100644
--- a/data/maps/events/IslandCave.s
+++ b/data/maps/events/IslandCave.inc
diff --git a/data/maps/events/JaggedPass.s b/data/maps/events/JaggedPass.inc
index 245871e9b..245871e9b 100644
--- a/data/maps/events/JaggedPass.s
+++ b/data/maps/events/JaggedPass.inc
diff --git a/data/maps/events/LavaridgeTown.s b/data/maps/events/LavaridgeTown.inc
index 47dd5ab4a..47dd5ab4a 100644
--- a/data/maps/events/LavaridgeTown.s
+++ b/data/maps/events/LavaridgeTown.inc
diff --git a/data/maps/events/LavaridgeTown_Gym_1F.s b/data/maps/events/LavaridgeTown_Gym_1F.inc
index add699f5d..add699f5d 100644
--- a/data/maps/events/LavaridgeTown_Gym_1F.s
+++ b/data/maps/events/LavaridgeTown_Gym_1F.inc
diff --git a/data/maps/events/LavaridgeTown_Gym_B1F.s b/data/maps/events/LavaridgeTown_Gym_B1F.inc
index 4cff944bc..4cff944bc 100644
--- a/data/maps/events/LavaridgeTown_Gym_B1F.s
+++ b/data/maps/events/LavaridgeTown_Gym_B1F.inc
diff --git a/data/maps/events/LavaridgeTown_HerbShop.s b/data/maps/events/LavaridgeTown_HerbShop.inc
index cb04b19d4..cb04b19d4 100644
--- a/data/maps/events/LavaridgeTown_HerbShop.s
+++ b/data/maps/events/LavaridgeTown_HerbShop.inc
diff --git a/data/maps/events/LavaridgeTown_House.s b/data/maps/events/LavaridgeTown_House.inc
index feb226cd0..feb226cd0 100644
--- a/data/maps/events/LavaridgeTown_House.s
+++ b/data/maps/events/LavaridgeTown_House.inc
diff --git a/data/maps/events/LavaridgeTown_Mart.s b/data/maps/events/LavaridgeTown_Mart.inc
index 8a07501f7..8a07501f7 100644
--- a/data/maps/events/LavaridgeTown_Mart.s
+++ b/data/maps/events/LavaridgeTown_Mart.inc
diff --git a/data/maps/events/LavaridgeTown_PokemonCenter_1F.s b/data/maps/events/LavaridgeTown_PokemonCenter_1F.inc
index dac3d4a72..dac3d4a72 100644
--- a/data/maps/events/LavaridgeTown_PokemonCenter_1F.s
+++ b/data/maps/events/LavaridgeTown_PokemonCenter_1F.inc
diff --git a/data/maps/events/LavaridgeTown_PokemonCenter_2F.s b/data/maps/events/LavaridgeTown_PokemonCenter_2F.inc
index 3ef0517b1..3ef0517b1 100644
--- a/data/maps/events/LavaridgeTown_PokemonCenter_2F.s
+++ b/data/maps/events/LavaridgeTown_PokemonCenter_2F.inc
diff --git a/data/maps/events/LilycoveCity.s b/data/maps/events/LilycoveCity.inc
index a356e2b9e..a356e2b9e 100644
--- a/data/maps/events/LilycoveCity.s
+++ b/data/maps/events/LilycoveCity.inc
diff --git a/data/maps/events/LilycoveCity_ContestHall.s b/data/maps/events/LilycoveCity_ContestHall.inc
index 4246afd33..4246afd33 100644
--- a/data/maps/events/LilycoveCity_ContestHall.s
+++ b/data/maps/events/LilycoveCity_ContestHall.inc
diff --git a/data/maps/events/LilycoveCity_ContestLobby.s b/data/maps/events/LilycoveCity_ContestLobby.inc
index 2e41e6e49..2e41e6e49 100644
--- a/data/maps/events/LilycoveCity_ContestLobby.s
+++ b/data/maps/events/LilycoveCity_ContestLobby.inc
diff --git a/data/maps/events/LilycoveCity_CoveLilyMotel_1F.s b/data/maps/events/LilycoveCity_CoveLilyMotel_1F.inc
index 31bd1c94f..31bd1c94f 100644
--- a/data/maps/events/LilycoveCity_CoveLilyMotel_1F.s
+++ b/data/maps/events/LilycoveCity_CoveLilyMotel_1F.inc
diff --git a/data/maps/events/LilycoveCity_CoveLilyMotel_2F.s b/data/maps/events/LilycoveCity_CoveLilyMotel_2F.inc
index 2117774f0..2117774f0 100644
--- a/data/maps/events/LilycoveCity_CoveLilyMotel_2F.s
+++ b/data/maps/events/LilycoveCity_CoveLilyMotel_2F.inc
diff --git a/data/maps/events/LilycoveCity_DepartmentStoreElevator.s b/data/maps/events/LilycoveCity_DepartmentStoreElevator.inc
index 896a96649..896a96649 100644
--- a/data/maps/events/LilycoveCity_DepartmentStoreElevator.s
+++ b/data/maps/events/LilycoveCity_DepartmentStoreElevator.inc
diff --git a/data/maps/events/LilycoveCity_DepartmentStoreRooftop.s b/data/maps/events/LilycoveCity_DepartmentStoreRooftop.inc
index ac72a87c1..ac72a87c1 100644
--- a/data/maps/events/LilycoveCity_DepartmentStoreRooftop.s
+++ b/data/maps/events/LilycoveCity_DepartmentStoreRooftop.inc
diff --git a/data/maps/events/LilycoveCity_DepartmentStore_1F.s b/data/maps/events/LilycoveCity_DepartmentStore_1F.inc
index 28bc93a75..28bc93a75 100644
--- a/data/maps/events/LilycoveCity_DepartmentStore_1F.s
+++ b/data/maps/events/LilycoveCity_DepartmentStore_1F.inc
diff --git a/data/maps/events/LilycoveCity_DepartmentStore_2F.s b/data/maps/events/LilycoveCity_DepartmentStore_2F.inc
index fc8872103..fc8872103 100644
--- a/data/maps/events/LilycoveCity_DepartmentStore_2F.s
+++ b/data/maps/events/LilycoveCity_DepartmentStore_2F.inc
diff --git a/data/maps/events/LilycoveCity_DepartmentStore_3F.s b/data/maps/events/LilycoveCity_DepartmentStore_3F.inc
index bf3d1647f..bf3d1647f 100644
--- a/data/maps/events/LilycoveCity_DepartmentStore_3F.s
+++ b/data/maps/events/LilycoveCity_DepartmentStore_3F.inc
diff --git a/data/maps/events/LilycoveCity_DepartmentStore_4F.s b/data/maps/events/LilycoveCity_DepartmentStore_4F.inc
index 007cc8bf4..007cc8bf4 100644
--- a/data/maps/events/LilycoveCity_DepartmentStore_4F.s
+++ b/data/maps/events/LilycoveCity_DepartmentStore_4F.inc
diff --git a/data/maps/events/LilycoveCity_DepartmentStore_5F.s b/data/maps/events/LilycoveCity_DepartmentStore_5F.inc
index 85cf2431f..85cf2431f 100644
--- a/data/maps/events/LilycoveCity_DepartmentStore_5F.s
+++ b/data/maps/events/LilycoveCity_DepartmentStore_5F.inc
diff --git a/data/maps/events/LilycoveCity_EmptyMap.s b/data/maps/events/LilycoveCity_EmptyMap.inc
index 906453882..906453882 100644
--- a/data/maps/events/LilycoveCity_EmptyMap.s
+++ b/data/maps/events/LilycoveCity_EmptyMap.inc
diff --git a/data/maps/events/LilycoveCity_Harbor.s b/data/maps/events/LilycoveCity_Harbor.inc
index 5682ada0e..5682ada0e 100644
--- a/data/maps/events/LilycoveCity_Harbor.s
+++ b/data/maps/events/LilycoveCity_Harbor.inc
diff --git a/data/maps/events/LilycoveCity_House1.s b/data/maps/events/LilycoveCity_House1.inc
index cdae83007..cdae83007 100644
--- a/data/maps/events/LilycoveCity_House1.s
+++ b/data/maps/events/LilycoveCity_House1.inc
diff --git a/data/maps/events/LilycoveCity_House2.s b/data/maps/events/LilycoveCity_House2.inc
index 50b44e253..50b44e253 100644
--- a/data/maps/events/LilycoveCity_House2.s
+++ b/data/maps/events/LilycoveCity_House2.inc
diff --git a/data/maps/events/LilycoveCity_House3.s b/data/maps/events/LilycoveCity_House3.inc
index 43a1068f1..43a1068f1 100644
--- a/data/maps/events/LilycoveCity_House3.s
+++ b/data/maps/events/LilycoveCity_House3.inc
diff --git a/data/maps/events/LilycoveCity_House4.s b/data/maps/events/LilycoveCity_House4.inc
index 88522497d..88522497d 100644
--- a/data/maps/events/LilycoveCity_House4.s
+++ b/data/maps/events/LilycoveCity_House4.inc
diff --git a/data/maps/events/LilycoveCity_LilycoveMuseum_1F.s b/data/maps/events/LilycoveCity_LilycoveMuseum_1F.inc
index 983736d73..983736d73 100644
--- a/data/maps/events/LilycoveCity_LilycoveMuseum_1F.s
+++ b/data/maps/events/LilycoveCity_LilycoveMuseum_1F.inc
diff --git a/data/maps/events/LilycoveCity_LilycoveMuseum_2F.s b/data/maps/events/LilycoveCity_LilycoveMuseum_2F.inc
index 98c1aa9cd..98c1aa9cd 100644
--- a/data/maps/events/LilycoveCity_LilycoveMuseum_2F.s
+++ b/data/maps/events/LilycoveCity_LilycoveMuseum_2F.inc
diff --git a/data/maps/events/LilycoveCity_MoveDeletersHouse.s b/data/maps/events/LilycoveCity_MoveDeletersHouse.inc
index 563052712..563052712 100644
--- a/data/maps/events/LilycoveCity_MoveDeletersHouse.s
+++ b/data/maps/events/LilycoveCity_MoveDeletersHouse.inc
diff --git a/data/maps/events/LilycoveCity_PokemonCenter_1F.s b/data/maps/events/LilycoveCity_PokemonCenter_1F.inc
index c33a07b6a..c33a07b6a 100644
--- a/data/maps/events/LilycoveCity_PokemonCenter_1F.s
+++ b/data/maps/events/LilycoveCity_PokemonCenter_1F.inc
diff --git a/data/maps/events/LilycoveCity_PokemonCenter_2F.s b/data/maps/events/LilycoveCity_PokemonCenter_2F.inc
index 736ef1151..736ef1151 100644
--- a/data/maps/events/LilycoveCity_PokemonCenter_2F.s
+++ b/data/maps/events/LilycoveCity_PokemonCenter_2F.inc
diff --git a/data/maps/events/LilycoveCity_PokemonTrainerFanClub.s b/data/maps/events/LilycoveCity_PokemonTrainerFanClub.inc
index 38007b34f..38007b34f 100644
--- a/data/maps/events/LilycoveCity_PokemonTrainerFanClub.s
+++ b/data/maps/events/LilycoveCity_PokemonTrainerFanClub.inc
diff --git a/data/maps/events/LilycoveCity_UnusedMart.s b/data/maps/events/LilycoveCity_UnusedMart.inc
index 1eefb6a8f..1eefb6a8f 100644
--- a/data/maps/events/LilycoveCity_UnusedMart.s
+++ b/data/maps/events/LilycoveCity_UnusedMart.inc
diff --git a/data/maps/events/LinkContestRoom1.s b/data/maps/events/LinkContestRoom1.inc
index 6c1e09430..6c1e09430 100644
--- a/data/maps/events/LinkContestRoom1.s
+++ b/data/maps/events/LinkContestRoom1.inc
diff --git a/data/maps/events/LinkContestRoom2.s b/data/maps/events/LinkContestRoom2.inc
index 562a96523..562a96523 100644
--- a/data/maps/events/LinkContestRoom2.s
+++ b/data/maps/events/LinkContestRoom2.inc
diff --git a/data/maps/events/LinkContestRoom3.s b/data/maps/events/LinkContestRoom3.inc
index 8c93f28c9..8c93f28c9 100644
--- a/data/maps/events/LinkContestRoom3.s
+++ b/data/maps/events/LinkContestRoom3.inc
diff --git a/data/maps/events/LinkContestRoom4.s b/data/maps/events/LinkContestRoom4.inc
index a5e455811..a5e455811 100644
--- a/data/maps/events/LinkContestRoom4.s
+++ b/data/maps/events/LinkContestRoom4.inc
diff --git a/data/maps/events/LinkContestRoom5.s b/data/maps/events/LinkContestRoom5.inc
index f0f8fa508..f0f8fa508 100644
--- a/data/maps/events/LinkContestRoom5.s
+++ b/data/maps/events/LinkContestRoom5.inc
diff --git a/data/maps/events/LinkContestRoom6.s b/data/maps/events/LinkContestRoom6.inc
index a8fd4962f..a8fd4962f 100644
--- a/data/maps/events/LinkContestRoom6.s
+++ b/data/maps/events/LinkContestRoom6.inc
diff --git a/data/maps/events/LittlerootTown.s b/data/maps/events/LittlerootTown.inc
index 62a564821..62a564821 100644
--- a/data/maps/events/LittlerootTown.s
+++ b/data/maps/events/LittlerootTown.inc
diff --git a/data/maps/events/LittlerootTown_BrendansHouse_1F.s b/data/maps/events/LittlerootTown_BrendansHouse_1F.inc
index f60a59018..f60a59018 100644
--- a/data/maps/events/LittlerootTown_BrendansHouse_1F.s
+++ b/data/maps/events/LittlerootTown_BrendansHouse_1F.inc
diff --git a/data/maps/events/LittlerootTown_BrendansHouse_2F.s b/data/maps/events/LittlerootTown_BrendansHouse_2F.inc
index a28a2d0d1..a28a2d0d1 100644
--- a/data/maps/events/LittlerootTown_BrendansHouse_2F.s
+++ b/data/maps/events/LittlerootTown_BrendansHouse_2F.inc
diff --git a/data/maps/events/LittlerootTown_MaysHouse_1F.s b/data/maps/events/LittlerootTown_MaysHouse_1F.inc
index d5874624b..d5874624b 100644
--- a/data/maps/events/LittlerootTown_MaysHouse_1F.s
+++ b/data/maps/events/LittlerootTown_MaysHouse_1F.inc
diff --git a/data/maps/events/LittlerootTown_MaysHouse_2F.s b/data/maps/events/LittlerootTown_MaysHouse_2F.inc
index 3a3656287..3a3656287 100644
--- a/data/maps/events/LittlerootTown_MaysHouse_2F.s
+++ b/data/maps/events/LittlerootTown_MaysHouse_2F.inc
diff --git a/data/maps/events/LittlerootTown_ProfessorBirchsLab.s b/data/maps/events/LittlerootTown_ProfessorBirchsLab.inc
index cbc1e4154..cbc1e4154 100644
--- a/data/maps/events/LittlerootTown_ProfessorBirchsLab.s
+++ b/data/maps/events/LittlerootTown_ProfessorBirchsLab.inc
diff --git a/data/maps/events/MagmaHideout_1F.s b/data/maps/events/MagmaHideout_1F.inc
index b90e53ff8..b90e53ff8 100644
--- a/data/maps/events/MagmaHideout_1F.s
+++ b/data/maps/events/MagmaHideout_1F.inc
diff --git a/data/maps/events/MagmaHideout_B1F.s b/data/maps/events/MagmaHideout_B1F.inc
index c9f1101cc..c9f1101cc 100644
--- a/data/maps/events/MagmaHideout_B1F.s
+++ b/data/maps/events/MagmaHideout_B1F.inc
diff --git a/data/maps/events/MagmaHideout_B2F.s b/data/maps/events/MagmaHideout_B2F.inc
index 258592732..258592732 100644
--- a/data/maps/events/MagmaHideout_B2F.s
+++ b/data/maps/events/MagmaHideout_B2F.inc
diff --git a/data/maps/events/MauvilleCity.s b/data/maps/events/MauvilleCity.inc
index 4d228a92c..4d228a92c 100644
--- a/data/maps/events/MauvilleCity.s
+++ b/data/maps/events/MauvilleCity.inc
diff --git a/data/maps/events/MauvilleCity_BikeShop.s b/data/maps/events/MauvilleCity_BikeShop.inc
index 6c064a1f7..6c064a1f7 100644
--- a/data/maps/events/MauvilleCity_BikeShop.s
+++ b/data/maps/events/MauvilleCity_BikeShop.inc
diff --git a/data/maps/events/MauvilleCity_GameCorner.s b/data/maps/events/MauvilleCity_GameCorner.inc
index ed8549079..ed8549079 100644
--- a/data/maps/events/MauvilleCity_GameCorner.s
+++ b/data/maps/events/MauvilleCity_GameCorner.inc
diff --git a/data/maps/events/MauvilleCity_Gym.s b/data/maps/events/MauvilleCity_Gym.inc
index 4a9ee563f..4a9ee563f 100644
--- a/data/maps/events/MauvilleCity_Gym.s
+++ b/data/maps/events/MauvilleCity_Gym.inc
diff --git a/data/maps/events/MauvilleCity_House1.s b/data/maps/events/MauvilleCity_House1.inc
index 12d6d8cc8..12d6d8cc8 100644
--- a/data/maps/events/MauvilleCity_House1.s
+++ b/data/maps/events/MauvilleCity_House1.inc
diff --git a/data/maps/events/MauvilleCity_House2.s b/data/maps/events/MauvilleCity_House2.inc
index 9feaafe2c..9feaafe2c 100644
--- a/data/maps/events/MauvilleCity_House2.s
+++ b/data/maps/events/MauvilleCity_House2.inc
diff --git a/data/maps/events/MauvilleCity_Mart.s b/data/maps/events/MauvilleCity_Mart.inc
index 05951f578..05951f578 100644
--- a/data/maps/events/MauvilleCity_Mart.s
+++ b/data/maps/events/MauvilleCity_Mart.inc
diff --git a/data/maps/events/MauvilleCity_PokemonCenter_1F.s b/data/maps/events/MauvilleCity_PokemonCenter_1F.inc
index 0f8e80d5c..0f8e80d5c 100644
--- a/data/maps/events/MauvilleCity_PokemonCenter_1F.s
+++ b/data/maps/events/MauvilleCity_PokemonCenter_1F.inc
diff --git a/data/maps/events/MauvilleCity_PokemonCenter_2F.s b/data/maps/events/MauvilleCity_PokemonCenter_2F.inc
index dbd55e499..dbd55e499 100644
--- a/data/maps/events/MauvilleCity_PokemonCenter_2F.s
+++ b/data/maps/events/MauvilleCity_PokemonCenter_2F.inc
diff --git a/data/maps/events/MeteorFalls_1F_1R.s b/data/maps/events/MeteorFalls_1F_1R.inc
index 1178bf543..1178bf543 100644
--- a/data/maps/events/MeteorFalls_1F_1R.s
+++ b/data/maps/events/MeteorFalls_1F_1R.inc
diff --git a/data/maps/events/MeteorFalls_1F_2R.s b/data/maps/events/MeteorFalls_1F_2R.inc
index 549620aa9..549620aa9 100644
--- a/data/maps/events/MeteorFalls_1F_2R.s
+++ b/data/maps/events/MeteorFalls_1F_2R.inc
diff --git a/data/maps/events/MeteorFalls_B1F_1R.s b/data/maps/events/MeteorFalls_B1F_1R.inc
index 796e31cd2..796e31cd2 100644
--- a/data/maps/events/MeteorFalls_B1F_1R.s
+++ b/data/maps/events/MeteorFalls_B1F_1R.inc
diff --git a/data/maps/events/MeteorFalls_B1F_2R.s b/data/maps/events/MeteorFalls_B1F_2R.inc
index abdad1f03..abdad1f03 100644
--- a/data/maps/events/MeteorFalls_B1F_2R.s
+++ b/data/maps/events/MeteorFalls_B1F_2R.inc
diff --git a/data/maps/events/MossdeepCity.s b/data/maps/events/MossdeepCity.inc
index b73bc64f3..b73bc64f3 100644
--- a/data/maps/events/MossdeepCity.s
+++ b/data/maps/events/MossdeepCity.inc
diff --git a/data/maps/events/MossdeepCity_GameCorner_1F.s b/data/maps/events/MossdeepCity_GameCorner_1F.inc
index 99350c4b0..99350c4b0 100644
--- a/data/maps/events/MossdeepCity_GameCorner_1F.s
+++ b/data/maps/events/MossdeepCity_GameCorner_1F.inc
diff --git a/data/maps/events/MossdeepCity_GameCorner_B1F.s b/data/maps/events/MossdeepCity_GameCorner_B1F.inc
index 98c843f52..98c843f52 100644
--- a/data/maps/events/MossdeepCity_GameCorner_B1F.s
+++ b/data/maps/events/MossdeepCity_GameCorner_B1F.inc
diff --git a/data/maps/events/MossdeepCity_Gym.s b/data/maps/events/MossdeepCity_Gym.inc
index d80237a3a..d80237a3a 100644
--- a/data/maps/events/MossdeepCity_Gym.s
+++ b/data/maps/events/MossdeepCity_Gym.inc
diff --git a/data/maps/events/MossdeepCity_House1.s b/data/maps/events/MossdeepCity_House1.inc
index 251440343..251440343 100644
--- a/data/maps/events/MossdeepCity_House1.s
+++ b/data/maps/events/MossdeepCity_House1.inc
diff --git a/data/maps/events/MossdeepCity_House2.s b/data/maps/events/MossdeepCity_House2.inc
index 31ef3ab7b..31ef3ab7b 100644
--- a/data/maps/events/MossdeepCity_House2.s
+++ b/data/maps/events/MossdeepCity_House2.inc
diff --git a/data/maps/events/MossdeepCity_House3.s b/data/maps/events/MossdeepCity_House3.inc
index b1503decc..b1503decc 100644
--- a/data/maps/events/MossdeepCity_House3.s
+++ b/data/maps/events/MossdeepCity_House3.inc
diff --git a/data/maps/events/MossdeepCity_House4.s b/data/maps/events/MossdeepCity_House4.inc
index dc0fdfed8..dc0fdfed8 100644
--- a/data/maps/events/MossdeepCity_House4.s
+++ b/data/maps/events/MossdeepCity_House4.inc
diff --git a/data/maps/events/MossdeepCity_Mart.s b/data/maps/events/MossdeepCity_Mart.inc
index 80514f1f8..80514f1f8 100644
--- a/data/maps/events/MossdeepCity_Mart.s
+++ b/data/maps/events/MossdeepCity_Mart.inc
diff --git a/data/maps/events/MossdeepCity_PokemonCenter_1F.s b/data/maps/events/MossdeepCity_PokemonCenter_1F.inc
index d7cf07f6a..d7cf07f6a 100644
--- a/data/maps/events/MossdeepCity_PokemonCenter_1F.s
+++ b/data/maps/events/MossdeepCity_PokemonCenter_1F.inc
diff --git a/data/maps/events/MossdeepCity_PokemonCenter_2F.s b/data/maps/events/MossdeepCity_PokemonCenter_2F.inc
index 337467351..337467351 100644
--- a/data/maps/events/MossdeepCity_PokemonCenter_2F.s
+++ b/data/maps/events/MossdeepCity_PokemonCenter_2F.inc
diff --git a/data/maps/events/MossdeepCity_SpaceCenter_1F.s b/data/maps/events/MossdeepCity_SpaceCenter_1F.inc
index d79459eb8..d79459eb8 100644
--- a/data/maps/events/MossdeepCity_SpaceCenter_1F.s
+++ b/data/maps/events/MossdeepCity_SpaceCenter_1F.inc
diff --git a/data/maps/events/MossdeepCity_SpaceCenter_2F.s b/data/maps/events/MossdeepCity_SpaceCenter_2F.inc
index 2dc4f843a..2dc4f843a 100644
--- a/data/maps/events/MossdeepCity_SpaceCenter_2F.s
+++ b/data/maps/events/MossdeepCity_SpaceCenter_2F.inc
diff --git a/data/maps/events/MossdeepCity_StevensHouse.s b/data/maps/events/MossdeepCity_StevensHouse.inc
index ce240d81f..ce240d81f 100644
--- a/data/maps/events/MossdeepCity_StevensHouse.s
+++ b/data/maps/events/MossdeepCity_StevensHouse.inc
diff --git a/data/maps/events/MtChimney.s b/data/maps/events/MtChimney.inc
index 468edda1d..468edda1d 100644
--- a/data/maps/events/MtChimney.s
+++ b/data/maps/events/MtChimney.inc
diff --git a/data/maps/events/MtChimney_CableCarStation.s b/data/maps/events/MtChimney_CableCarStation.inc
index db4eef0fa..db4eef0fa 100644
--- a/data/maps/events/MtChimney_CableCarStation.s
+++ b/data/maps/events/MtChimney_CableCarStation.inc
diff --git a/data/maps/events/MtPyre_1F.s b/data/maps/events/MtPyre_1F.inc
index 3f4263f9e..3f4263f9e 100644
--- a/data/maps/events/MtPyre_1F.s
+++ b/data/maps/events/MtPyre_1F.inc
diff --git a/data/maps/events/MtPyre_2F.s b/data/maps/events/MtPyre_2F.inc
index 320be57af..320be57af 100644
--- a/data/maps/events/MtPyre_2F.s
+++ b/data/maps/events/MtPyre_2F.inc
diff --git a/data/maps/events/MtPyre_3F.s b/data/maps/events/MtPyre_3F.inc
index ba5428cb2..ba5428cb2 100644
--- a/data/maps/events/MtPyre_3F.s
+++ b/data/maps/events/MtPyre_3F.inc
diff --git a/data/maps/events/MtPyre_4F.s b/data/maps/events/MtPyre_4F.inc
index c54b36645..c54b36645 100644
--- a/data/maps/events/MtPyre_4F.s
+++ b/data/maps/events/MtPyre_4F.inc
diff --git a/data/maps/events/MtPyre_5F.s b/data/maps/events/MtPyre_5F.inc
index 73b97a40d..73b97a40d 100644
--- a/data/maps/events/MtPyre_5F.s
+++ b/data/maps/events/MtPyre_5F.inc
diff --git a/data/maps/events/MtPyre_6F.s b/data/maps/events/MtPyre_6F.inc
index 70228bc42..70228bc42 100644
--- a/data/maps/events/MtPyre_6F.s
+++ b/data/maps/events/MtPyre_6F.inc
diff --git a/data/maps/events/MtPyre_Exterior.s b/data/maps/events/MtPyre_Exterior.inc
index ac372a2f0..ac372a2f0 100644
--- a/data/maps/events/MtPyre_Exterior.s
+++ b/data/maps/events/MtPyre_Exterior.inc
diff --git a/data/maps/events/MtPyre_Summit.s b/data/maps/events/MtPyre_Summit.inc
index 4f5047765..4f5047765 100644
--- a/data/maps/events/MtPyre_Summit.s
+++ b/data/maps/events/MtPyre_Summit.inc
diff --git a/data/maps/events/NewMauville_Entrance.s b/data/maps/events/NewMauville_Entrance.inc
index 482ff83ca..482ff83ca 100644
--- a/data/maps/events/NewMauville_Entrance.s
+++ b/data/maps/events/NewMauville_Entrance.inc
diff --git a/data/maps/events/NewMauville_Inside.s b/data/maps/events/NewMauville_Inside.inc
index a7384520d..a7384520d 100644
--- a/data/maps/events/NewMauville_Inside.s
+++ b/data/maps/events/NewMauville_Inside.inc
diff --git a/data/maps/events/OldaleTown.s b/data/maps/events/OldaleTown.inc
index a09a08fe2..a09a08fe2 100644
--- a/data/maps/events/OldaleTown.s
+++ b/data/maps/events/OldaleTown.inc
diff --git a/data/maps/events/OldaleTown_House1.s b/data/maps/events/OldaleTown_House1.inc
index 16f29b00e..16f29b00e 100644
--- a/data/maps/events/OldaleTown_House1.s
+++ b/data/maps/events/OldaleTown_House1.inc
diff --git a/data/maps/events/OldaleTown_House2.s b/data/maps/events/OldaleTown_House2.inc
index 904291576..904291576 100644
--- a/data/maps/events/OldaleTown_House2.s
+++ b/data/maps/events/OldaleTown_House2.inc
diff --git a/data/maps/events/OldaleTown_Mart.s b/data/maps/events/OldaleTown_Mart.inc
index a06ece505..a06ece505 100644
--- a/data/maps/events/OldaleTown_Mart.s
+++ b/data/maps/events/OldaleTown_Mart.inc
diff --git a/data/maps/events/OldaleTown_PokemonCenter_1F.s b/data/maps/events/OldaleTown_PokemonCenter_1F.inc
index 161baec86..161baec86 100644
--- a/data/maps/events/OldaleTown_PokemonCenter_1F.s
+++ b/data/maps/events/OldaleTown_PokemonCenter_1F.inc
diff --git a/data/maps/events/OldaleTown_PokemonCenter_2F.s b/data/maps/events/OldaleTown_PokemonCenter_2F.inc
index e2675bb14..e2675bb14 100644
--- a/data/maps/events/OldaleTown_PokemonCenter_2F.s
+++ b/data/maps/events/OldaleTown_PokemonCenter_2F.inc
diff --git a/data/maps/events/PacifidlogTown.s b/data/maps/events/PacifidlogTown.inc
index 1823e9afd..1823e9afd 100644
--- a/data/maps/events/PacifidlogTown.s
+++ b/data/maps/events/PacifidlogTown.inc
diff --git a/data/maps/events/PacifidlogTown_House1.s b/data/maps/events/PacifidlogTown_House1.inc
index 233fa7604..233fa7604 100644
--- a/data/maps/events/PacifidlogTown_House1.s
+++ b/data/maps/events/PacifidlogTown_House1.inc
diff --git a/data/maps/events/PacifidlogTown_House2.s b/data/maps/events/PacifidlogTown_House2.inc
index aa1940d29..aa1940d29 100644
--- a/data/maps/events/PacifidlogTown_House2.s
+++ b/data/maps/events/PacifidlogTown_House2.inc
diff --git a/data/maps/events/PacifidlogTown_House3.s b/data/maps/events/PacifidlogTown_House3.inc
index 80ab8d7f5..80ab8d7f5 100644
--- a/data/maps/events/PacifidlogTown_House3.s
+++ b/data/maps/events/PacifidlogTown_House3.inc
diff --git a/data/maps/events/PacifidlogTown_House4.s b/data/maps/events/PacifidlogTown_House4.inc
index a7dd1469b..a7dd1469b 100644
--- a/data/maps/events/PacifidlogTown_House4.s
+++ b/data/maps/events/PacifidlogTown_House4.inc
diff --git a/data/maps/events/PacifidlogTown_House5.s b/data/maps/events/PacifidlogTown_House5.inc
index 963a319cf..963a319cf 100644
--- a/data/maps/events/PacifidlogTown_House5.s
+++ b/data/maps/events/PacifidlogTown_House5.inc
diff --git a/data/maps/events/PacifidlogTown_PokemonCenter_1F.s b/data/maps/events/PacifidlogTown_PokemonCenter_1F.inc
index 432ba616d..432ba616d 100644
--- a/data/maps/events/PacifidlogTown_PokemonCenter_1F.s
+++ b/data/maps/events/PacifidlogTown_PokemonCenter_1F.inc
diff --git a/data/maps/events/PacifidlogTown_PokemonCenter_2F.s b/data/maps/events/PacifidlogTown_PokemonCenter_2F.inc
index f4110623f..f4110623f 100644
--- a/data/maps/events/PacifidlogTown_PokemonCenter_2F.s
+++ b/data/maps/events/PacifidlogTown_PokemonCenter_2F.inc
diff --git a/data/maps/events/PetalburgCity.s b/data/maps/events/PetalburgCity.inc
index 4c36c49ab..4c36c49ab 100644
--- a/data/maps/events/PetalburgCity.s
+++ b/data/maps/events/PetalburgCity.inc
diff --git a/data/maps/events/PetalburgCity_Gym.s b/data/maps/events/PetalburgCity_Gym.inc
index 47205e253..47205e253 100644
--- a/data/maps/events/PetalburgCity_Gym.s
+++ b/data/maps/events/PetalburgCity_Gym.inc
diff --git a/data/maps/events/PetalburgCity_House1.s b/data/maps/events/PetalburgCity_House1.inc
index 2d6a28056..2d6a28056 100644
--- a/data/maps/events/PetalburgCity_House1.s
+++ b/data/maps/events/PetalburgCity_House1.inc
diff --git a/data/maps/events/PetalburgCity_House2.s b/data/maps/events/PetalburgCity_House2.inc
index 0797b9bab..0797b9bab 100644
--- a/data/maps/events/PetalburgCity_House2.s
+++ b/data/maps/events/PetalburgCity_House2.inc
diff --git a/data/maps/events/PetalburgCity_Mart.s b/data/maps/events/PetalburgCity_Mart.inc
index 2fbed4b9d..2fbed4b9d 100644
--- a/data/maps/events/PetalburgCity_Mart.s
+++ b/data/maps/events/PetalburgCity_Mart.inc
diff --git a/data/maps/events/PetalburgCity_PokemonCenter_1F.s b/data/maps/events/PetalburgCity_PokemonCenter_1F.inc
index 5fb3186e5..5fb3186e5 100644
--- a/data/maps/events/PetalburgCity_PokemonCenter_1F.s
+++ b/data/maps/events/PetalburgCity_PokemonCenter_1F.inc
diff --git a/data/maps/events/PetalburgCity_PokemonCenter_2F.s b/data/maps/events/PetalburgCity_PokemonCenter_2F.inc
index eab3d7dd5..eab3d7dd5 100644
--- a/data/maps/events/PetalburgCity_PokemonCenter_2F.s
+++ b/data/maps/events/PetalburgCity_PokemonCenter_2F.inc
diff --git a/data/maps/events/PetalburgCity_WallysHouse.s b/data/maps/events/PetalburgCity_WallysHouse.inc
index 724b84f0f..724b84f0f 100644
--- a/data/maps/events/PetalburgCity_WallysHouse.s
+++ b/data/maps/events/PetalburgCity_WallysHouse.inc
diff --git a/data/maps/events/PetalburgWoods.s b/data/maps/events/PetalburgWoods.inc
index 0ec69c1a2..0ec69c1a2 100644
--- a/data/maps/events/PetalburgWoods.s
+++ b/data/maps/events/PetalburgWoods.inc
diff --git a/data/maps/events/RecordCorner.s b/data/maps/events/RecordCorner.inc
index 7062f61ea..7062f61ea 100644
--- a/data/maps/events/RecordCorner.s
+++ b/data/maps/events/RecordCorner.inc
diff --git a/data/maps/events/Route101.s b/data/maps/events/Route101.inc
index bad4e3ba9..bad4e3ba9 100644
--- a/data/maps/events/Route101.s
+++ b/data/maps/events/Route101.inc
diff --git a/data/maps/events/Route102.s b/data/maps/events/Route102.inc
index 9cf97de4b..9cf97de4b 100644
--- a/data/maps/events/Route102.s
+++ b/data/maps/events/Route102.inc
diff --git a/data/maps/events/Route103.s b/data/maps/events/Route103.inc
index 01640eb65..01640eb65 100644
--- a/data/maps/events/Route103.s
+++ b/data/maps/events/Route103.inc
diff --git a/data/maps/events/Route104.s b/data/maps/events/Route104.inc
index da4b5ffc1..da4b5ffc1 100644
--- a/data/maps/events/Route104.s
+++ b/data/maps/events/Route104.inc
diff --git a/data/maps/events/Route104_MrBrineysHouse.s b/data/maps/events/Route104_MrBrineysHouse.inc
index d8b2ff252..d8b2ff252 100644
--- a/data/maps/events/Route104_MrBrineysHouse.s
+++ b/data/maps/events/Route104_MrBrineysHouse.inc
diff --git a/data/maps/events/Route104_PrettyPetalFlowerShop.s b/data/maps/events/Route104_PrettyPetalFlowerShop.inc
index 0c540e940..0c540e940 100644
--- a/data/maps/events/Route104_PrettyPetalFlowerShop.s
+++ b/data/maps/events/Route104_PrettyPetalFlowerShop.inc
diff --git a/data/maps/events/Route104_Prototype.s b/data/maps/events/Route104_Prototype.inc
index 6748fe0ed..6748fe0ed 100644
--- a/data/maps/events/Route104_Prototype.s
+++ b/data/maps/events/Route104_Prototype.inc
diff --git a/data/maps/events/Route104_PrototypePrettyPetalFlowerShop.s b/data/maps/events/Route104_PrototypePrettyPetalFlowerShop.inc
index 96cac1e71..96cac1e71 100644
--- a/data/maps/events/Route104_PrototypePrettyPetalFlowerShop.s
+++ b/data/maps/events/Route104_PrototypePrettyPetalFlowerShop.inc
diff --git a/data/maps/events/Route105.s b/data/maps/events/Route105.inc
index 5f7f6c13d..5f7f6c13d 100644
--- a/data/maps/events/Route105.s
+++ b/data/maps/events/Route105.inc
diff --git a/data/maps/events/Route106.s b/data/maps/events/Route106.inc
index 51c093fe5..51c093fe5 100644
--- a/data/maps/events/Route106.s
+++ b/data/maps/events/Route106.inc
diff --git a/data/maps/events/Route107.s b/data/maps/events/Route107.inc
index 363414c2f..363414c2f 100644
--- a/data/maps/events/Route107.s
+++ b/data/maps/events/Route107.inc
diff --git a/data/maps/events/Route108.s b/data/maps/events/Route108.inc
index 1f49a1e0c..1f49a1e0c 100644
--- a/data/maps/events/Route108.s
+++ b/data/maps/events/Route108.inc
diff --git a/data/maps/events/Route109.s b/data/maps/events/Route109.inc
index 511579650..511579650 100644
--- a/data/maps/events/Route109.s
+++ b/data/maps/events/Route109.inc
diff --git a/data/maps/events/Route109_SeashoreHouse.s b/data/maps/events/Route109_SeashoreHouse.inc
index 5036df1e7..5036df1e7 100644
--- a/data/maps/events/Route109_SeashoreHouse.s
+++ b/data/maps/events/Route109_SeashoreHouse.inc
diff --git a/data/maps/events/Route110.s b/data/maps/events/Route110.inc
index 4ece25549..4ece25549 100644
--- a/data/maps/events/Route110.s
+++ b/data/maps/events/Route110.inc
diff --git a/data/maps/events/Route110_SeasideCyclingRoadNorthEntrance.s b/data/maps/events/Route110_SeasideCyclingRoadNorthEntrance.inc
index e1ca6b4de..e1ca6b4de 100644
--- a/data/maps/events/Route110_SeasideCyclingRoadNorthEntrance.s
+++ b/data/maps/events/Route110_SeasideCyclingRoadNorthEntrance.inc
diff --git a/data/maps/events/Route110_SeasideCyclingRoadSouthEntrance.s b/data/maps/events/Route110_SeasideCyclingRoadSouthEntrance.inc
index 24ae3600f..24ae3600f 100644
--- a/data/maps/events/Route110_SeasideCyclingRoadSouthEntrance.s
+++ b/data/maps/events/Route110_SeasideCyclingRoadSouthEntrance.inc
diff --git a/data/maps/events/Route110_TrickHouseCorridor.s b/data/maps/events/Route110_TrickHouseCorridor.inc
index 105701e55..105701e55 100644
--- a/data/maps/events/Route110_TrickHouseCorridor.s
+++ b/data/maps/events/Route110_TrickHouseCorridor.inc
diff --git a/data/maps/events/Route110_TrickHouseEnd.s b/data/maps/events/Route110_TrickHouseEnd.inc
index f050e3270..f050e3270 100644
--- a/data/maps/events/Route110_TrickHouseEnd.s
+++ b/data/maps/events/Route110_TrickHouseEnd.inc
diff --git a/data/maps/events/Route110_TrickHouseEntrance.s b/data/maps/events/Route110_TrickHouseEntrance.inc
index a1f67bd3d..a1f67bd3d 100644
--- a/data/maps/events/Route110_TrickHouseEntrance.s
+++ b/data/maps/events/Route110_TrickHouseEntrance.inc
diff --git a/data/maps/events/Route110_TrickHousePuzzle1.s b/data/maps/events/Route110_TrickHousePuzzle1.inc
index 7e282f0e8..7e282f0e8 100644
--- a/data/maps/events/Route110_TrickHousePuzzle1.s
+++ b/data/maps/events/Route110_TrickHousePuzzle1.inc
diff --git a/data/maps/events/Route110_TrickHousePuzzle2.s b/data/maps/events/Route110_TrickHousePuzzle2.inc
index d77fd66a1..d77fd66a1 100644
--- a/data/maps/events/Route110_TrickHousePuzzle2.s
+++ b/data/maps/events/Route110_TrickHousePuzzle2.inc
diff --git a/data/maps/events/Route110_TrickHousePuzzle3.s b/data/maps/events/Route110_TrickHousePuzzle3.inc
index b7a902a54..b7a902a54 100644
--- a/data/maps/events/Route110_TrickHousePuzzle3.s
+++ b/data/maps/events/Route110_TrickHousePuzzle3.inc
diff --git a/data/maps/events/Route110_TrickHousePuzzle4.s b/data/maps/events/Route110_TrickHousePuzzle4.inc
index ac3e152a2..ac3e152a2 100644
--- a/data/maps/events/Route110_TrickHousePuzzle4.s
+++ b/data/maps/events/Route110_TrickHousePuzzle4.inc
diff --git a/data/maps/events/Route110_TrickHousePuzzle5.s b/data/maps/events/Route110_TrickHousePuzzle5.inc
index be38ef452..be38ef452 100644
--- a/data/maps/events/Route110_TrickHousePuzzle5.s
+++ b/data/maps/events/Route110_TrickHousePuzzle5.inc
diff --git a/data/maps/events/Route110_TrickHousePuzzle6.s b/data/maps/events/Route110_TrickHousePuzzle6.inc
index 1e6c7869b..1e6c7869b 100644
--- a/data/maps/events/Route110_TrickHousePuzzle6.s
+++ b/data/maps/events/Route110_TrickHousePuzzle6.inc
diff --git a/data/maps/events/Route110_TrickHousePuzzle7.s b/data/maps/events/Route110_TrickHousePuzzle7.inc
index d5e4f14af..d5e4f14af 100644
--- a/data/maps/events/Route110_TrickHousePuzzle7.s
+++ b/data/maps/events/Route110_TrickHousePuzzle7.inc
diff --git a/data/maps/events/Route110_TrickHousePuzzle8.s b/data/maps/events/Route110_TrickHousePuzzle8.inc
index accb0b3a2..accb0b3a2 100644
--- a/data/maps/events/Route110_TrickHousePuzzle8.s
+++ b/data/maps/events/Route110_TrickHousePuzzle8.inc
diff --git a/data/maps/events/Route111.s b/data/maps/events/Route111.inc
index 9eeed5ede..9eeed5ede 100644
--- a/data/maps/events/Route111.s
+++ b/data/maps/events/Route111.inc
diff --git a/data/maps/events/Route111_OldLadysRestStop.s b/data/maps/events/Route111_OldLadysRestStop.inc
index c295aa0c9..c295aa0c9 100644
--- a/data/maps/events/Route111_OldLadysRestStop.s
+++ b/data/maps/events/Route111_OldLadysRestStop.inc
diff --git a/data/maps/events/Route111_WinstrateFamilysHouse.s b/data/maps/events/Route111_WinstrateFamilysHouse.inc
index 8cb265965..8cb265965 100644
--- a/data/maps/events/Route111_WinstrateFamilysHouse.s
+++ b/data/maps/events/Route111_WinstrateFamilysHouse.inc
diff --git a/data/maps/events/Route112.s b/data/maps/events/Route112.inc
index f6dfcfbe5..f6dfcfbe5 100644
--- a/data/maps/events/Route112.s
+++ b/data/maps/events/Route112.inc
diff --git a/data/maps/events/Route112_CableCarStation.s b/data/maps/events/Route112_CableCarStation.inc
index 6ca18059b..6ca18059b 100644
--- a/data/maps/events/Route112_CableCarStation.s
+++ b/data/maps/events/Route112_CableCarStation.inc
diff --git a/data/maps/events/Route113.s b/data/maps/events/Route113.inc
index ee145eb76..ee145eb76 100644
--- a/data/maps/events/Route113.s
+++ b/data/maps/events/Route113.inc
diff --git a/data/maps/events/Route113_GlassWorkshop.s b/data/maps/events/Route113_GlassWorkshop.inc
index 68b47709d..68b47709d 100644
--- a/data/maps/events/Route113_GlassWorkshop.s
+++ b/data/maps/events/Route113_GlassWorkshop.inc
diff --git a/data/maps/events/Route114.s b/data/maps/events/Route114.inc
index a2d948d33..a2d948d33 100644
--- a/data/maps/events/Route114.s
+++ b/data/maps/events/Route114.inc
diff --git a/data/maps/events/Route114_FossilManiacsHouse.s b/data/maps/events/Route114_FossilManiacsHouse.inc
index f7bf465e9..f7bf465e9 100644
--- a/data/maps/events/Route114_FossilManiacsHouse.s
+++ b/data/maps/events/Route114_FossilManiacsHouse.inc
diff --git a/data/maps/events/Route114_FossilManiacsTunnel.s b/data/maps/events/Route114_FossilManiacsTunnel.inc
index 89c231d7e..89c231d7e 100644
--- a/data/maps/events/Route114_FossilManiacsTunnel.s
+++ b/data/maps/events/Route114_FossilManiacsTunnel.inc
diff --git a/data/maps/events/Route114_LanettesHouse.s b/data/maps/events/Route114_LanettesHouse.inc
index e62f6e0ad..e62f6e0ad 100644
--- a/data/maps/events/Route114_LanettesHouse.s
+++ b/data/maps/events/Route114_LanettesHouse.inc
diff --git a/data/maps/events/Route115.s b/data/maps/events/Route115.inc
index cba3c3e7d..cba3c3e7d 100644
--- a/data/maps/events/Route115.s
+++ b/data/maps/events/Route115.inc
diff --git a/data/maps/events/Route116.s b/data/maps/events/Route116.inc
index 18717be4e..18717be4e 100644
--- a/data/maps/events/Route116.s
+++ b/data/maps/events/Route116.inc
diff --git a/data/maps/events/Route116_TunnelersRestHouse.s b/data/maps/events/Route116_TunnelersRestHouse.inc
index 4e4553567..4e4553567 100644
--- a/data/maps/events/Route116_TunnelersRestHouse.s
+++ b/data/maps/events/Route116_TunnelersRestHouse.inc
diff --git a/data/maps/events/Route117.s b/data/maps/events/Route117.inc
index b53e3de57..b53e3de57 100644
--- a/data/maps/events/Route117.s
+++ b/data/maps/events/Route117.inc
diff --git a/data/maps/events/Route117_PokemonDayCare.s b/data/maps/events/Route117_PokemonDayCare.inc
index 69ede9610..69ede9610 100644
--- a/data/maps/events/Route117_PokemonDayCare.s
+++ b/data/maps/events/Route117_PokemonDayCare.inc
diff --git a/data/maps/events/Route118.s b/data/maps/events/Route118.inc
index f912b6fbd..f912b6fbd 100644
--- a/data/maps/events/Route118.s
+++ b/data/maps/events/Route118.inc
diff --git a/data/maps/events/Route119.s b/data/maps/events/Route119.inc
index 966ae6058..966ae6058 100644
--- a/data/maps/events/Route119.s
+++ b/data/maps/events/Route119.inc
diff --git a/data/maps/events/Route119_House.s b/data/maps/events/Route119_House.inc
index 45267ca0e..45267ca0e 100644
--- a/data/maps/events/Route119_House.s
+++ b/data/maps/events/Route119_House.inc
diff --git a/data/maps/events/Route119_WeatherInstitute_1F.s b/data/maps/events/Route119_WeatherInstitute_1F.inc
index 1472fb569..1472fb569 100644
--- a/data/maps/events/Route119_WeatherInstitute_1F.s
+++ b/data/maps/events/Route119_WeatherInstitute_1F.inc
diff --git a/data/maps/events/Route119_WeatherInstitute_2F.s b/data/maps/events/Route119_WeatherInstitute_2F.inc
index d2dbce24d..d2dbce24d 100644
--- a/data/maps/events/Route119_WeatherInstitute_2F.s
+++ b/data/maps/events/Route119_WeatherInstitute_2F.inc
diff --git a/data/maps/events/Route120.s b/data/maps/events/Route120.inc
index 43a67ee99..43a67ee99 100644
--- a/data/maps/events/Route120.s
+++ b/data/maps/events/Route120.inc
diff --git a/data/maps/events/Route121.s b/data/maps/events/Route121.inc
index 514f51349..514f51349 100644
--- a/data/maps/events/Route121.s
+++ b/data/maps/events/Route121.inc
diff --git a/data/maps/events/Route121_SafariZoneEntrance.s b/data/maps/events/Route121_SafariZoneEntrance.inc
index c3880d4b3..c3880d4b3 100644
--- a/data/maps/events/Route121_SafariZoneEntrance.s
+++ b/data/maps/events/Route121_SafariZoneEntrance.inc
diff --git a/data/maps/events/Route122.s b/data/maps/events/Route122.inc
index 217c28ee1..217c28ee1 100644
--- a/data/maps/events/Route122.s
+++ b/data/maps/events/Route122.inc
diff --git a/data/maps/events/Route123.s b/data/maps/events/Route123.inc
index 6b97bafe5..6b97bafe5 100644
--- a/data/maps/events/Route123.s
+++ b/data/maps/events/Route123.inc
diff --git a/data/maps/events/Route123_BerryMastersHouse.s b/data/maps/events/Route123_BerryMastersHouse.inc
index 183e19415..183e19415 100644
--- a/data/maps/events/Route123_BerryMastersHouse.s
+++ b/data/maps/events/Route123_BerryMastersHouse.inc
diff --git a/data/maps/events/Route124.s b/data/maps/events/Route124.inc
index 83db7f24b..83db7f24b 100644
--- a/data/maps/events/Route124.s
+++ b/data/maps/events/Route124.inc
diff --git a/data/maps/events/Route125.s b/data/maps/events/Route125.inc
index 0c7d12643..0c7d12643 100644
--- a/data/maps/events/Route125.s
+++ b/data/maps/events/Route125.inc
diff --git a/data/maps/events/Route126.s b/data/maps/events/Route126.inc
index 50d1dca52..50d1dca52 100644
--- a/data/maps/events/Route126.s
+++ b/data/maps/events/Route126.inc
diff --git a/data/maps/events/Route127.s b/data/maps/events/Route127.inc
index b3744194e..b3744194e 100644
--- a/data/maps/events/Route127.s
+++ b/data/maps/events/Route127.inc
diff --git a/data/maps/events/Route128.s b/data/maps/events/Route128.inc
index 74f99d02c..74f99d02c 100644
--- a/data/maps/events/Route128.s
+++ b/data/maps/events/Route128.inc
diff --git a/data/maps/events/Route129.s b/data/maps/events/Route129.inc
index 10716b557..10716b557 100644
--- a/data/maps/events/Route129.s
+++ b/data/maps/events/Route129.inc
diff --git a/data/maps/events/Route130.s b/data/maps/events/Route130.inc
index f2c72ef2d..f2c72ef2d 100644
--- a/data/maps/events/Route130.s
+++ b/data/maps/events/Route130.inc
diff --git a/data/maps/events/Route131.s b/data/maps/events/Route131.inc
index ed1a33768..ed1a33768 100644
--- a/data/maps/events/Route131.s
+++ b/data/maps/events/Route131.inc
diff --git a/data/maps/events/Route132.s b/data/maps/events/Route132.inc
index b19e96363..b19e96363 100644
--- a/data/maps/events/Route132.s
+++ b/data/maps/events/Route132.inc
diff --git a/data/maps/events/Route133.s b/data/maps/events/Route133.inc
index 1461293e8..1461293e8 100644
--- a/data/maps/events/Route133.s
+++ b/data/maps/events/Route133.inc
diff --git a/data/maps/events/Route134.s b/data/maps/events/Route134.inc
index a8d2eb030..a8d2eb030 100644
--- a/data/maps/events/Route134.s
+++ b/data/maps/events/Route134.inc
diff --git a/data/maps/events/RustboroCity.s b/data/maps/events/RustboroCity.inc
index 4bbf0a6a2..4bbf0a6a2 100644
--- a/data/maps/events/RustboroCity.s
+++ b/data/maps/events/RustboroCity.inc
diff --git a/data/maps/events/RustboroCity_CuttersHouse.s b/data/maps/events/RustboroCity_CuttersHouse.inc
index b38fc9afe..b38fc9afe 100644
--- a/data/maps/events/RustboroCity_CuttersHouse.s
+++ b/data/maps/events/RustboroCity_CuttersHouse.inc
diff --git a/data/maps/events/RustboroCity_DevonCorp_1F.s b/data/maps/events/RustboroCity_DevonCorp_1F.inc
index 72437229c..72437229c 100644
--- a/data/maps/events/RustboroCity_DevonCorp_1F.s
+++ b/data/maps/events/RustboroCity_DevonCorp_1F.inc
diff --git a/data/maps/events/RustboroCity_DevonCorp_2F.s b/data/maps/events/RustboroCity_DevonCorp_2F.inc
index 3ca57bf10..3ca57bf10 100644
--- a/data/maps/events/RustboroCity_DevonCorp_2F.s
+++ b/data/maps/events/RustboroCity_DevonCorp_2F.inc
diff --git a/data/maps/events/RustboroCity_DevonCorp_3F.s b/data/maps/events/RustboroCity_DevonCorp_3F.inc
index f0f8fadec..f0f8fadec 100644
--- a/data/maps/events/RustboroCity_DevonCorp_3F.s
+++ b/data/maps/events/RustboroCity_DevonCorp_3F.inc
diff --git a/data/maps/events/RustboroCity_Flat1_1F.s b/data/maps/events/RustboroCity_Flat1_1F.inc
index 9c637f0fb..9c637f0fb 100644
--- a/data/maps/events/RustboroCity_Flat1_1F.s
+++ b/data/maps/events/RustboroCity_Flat1_1F.inc
diff --git a/data/maps/events/RustboroCity_Flat1_2F.s b/data/maps/events/RustboroCity_Flat1_2F.inc
index 2d1d187e9..2d1d187e9 100644
--- a/data/maps/events/RustboroCity_Flat1_2F.s
+++ b/data/maps/events/RustboroCity_Flat1_2F.inc
diff --git a/data/maps/events/RustboroCity_Flat2_1F.s b/data/maps/events/RustboroCity_Flat2_1F.inc
index bd9f4904e..bd9f4904e 100644
--- a/data/maps/events/RustboroCity_Flat2_1F.s
+++ b/data/maps/events/RustboroCity_Flat2_1F.inc
diff --git a/data/maps/events/RustboroCity_Flat2_2F.s b/data/maps/events/RustboroCity_Flat2_2F.inc
index 988e3797d..988e3797d 100644
--- a/data/maps/events/RustboroCity_Flat2_2F.s
+++ b/data/maps/events/RustboroCity_Flat2_2F.inc
diff --git a/data/maps/events/RustboroCity_Flat2_3F.s b/data/maps/events/RustboroCity_Flat2_3F.inc
index 3c09ce553..3c09ce553 100644
--- a/data/maps/events/RustboroCity_Flat2_3F.s
+++ b/data/maps/events/RustboroCity_Flat2_3F.inc
diff --git a/data/maps/events/RustboroCity_Gym.s b/data/maps/events/RustboroCity_Gym.inc
index cfe9f420d..cfe9f420d 100644
--- a/data/maps/events/RustboroCity_Gym.s
+++ b/data/maps/events/RustboroCity_Gym.inc
diff --git a/data/maps/events/RustboroCity_House1.s b/data/maps/events/RustboroCity_House1.inc
index 8e1cb1c7e..8e1cb1c7e 100644
--- a/data/maps/events/RustboroCity_House1.s
+++ b/data/maps/events/RustboroCity_House1.inc
diff --git a/data/maps/events/RustboroCity_House2.s b/data/maps/events/RustboroCity_House2.inc
index 33159faa4..33159faa4 100644
--- a/data/maps/events/RustboroCity_House2.s
+++ b/data/maps/events/RustboroCity_House2.inc
diff --git a/data/maps/events/RustboroCity_House3.s b/data/maps/events/RustboroCity_House3.inc
index 696350f00..696350f00 100644
--- a/data/maps/events/RustboroCity_House3.s
+++ b/data/maps/events/RustboroCity_House3.inc
diff --git a/data/maps/events/RustboroCity_Mart.s b/data/maps/events/RustboroCity_Mart.inc
index 3949dcd2e..3949dcd2e 100644
--- a/data/maps/events/RustboroCity_Mart.s
+++ b/data/maps/events/RustboroCity_Mart.inc
diff --git a/data/maps/events/RustboroCity_PokemonCenter_1F.s b/data/maps/events/RustboroCity_PokemonCenter_1F.inc
index a0e7a3f76..a0e7a3f76 100644
--- a/data/maps/events/RustboroCity_PokemonCenter_1F.s
+++ b/data/maps/events/RustboroCity_PokemonCenter_1F.inc
diff --git a/data/maps/events/RustboroCity_PokemonCenter_2F.s b/data/maps/events/RustboroCity_PokemonCenter_2F.inc
index c75817126..c75817126 100644
--- a/data/maps/events/RustboroCity_PokemonCenter_2F.s
+++ b/data/maps/events/RustboroCity_PokemonCenter_2F.inc
diff --git a/data/maps/events/RustboroCity_PokemonSchool.s b/data/maps/events/RustboroCity_PokemonSchool.inc
index 5ae481bad..5ae481bad 100644
--- a/data/maps/events/RustboroCity_PokemonSchool.s
+++ b/data/maps/events/RustboroCity_PokemonSchool.inc
diff --git a/data/maps/events/RusturfTunnel.s b/data/maps/events/RusturfTunnel.inc
index 490afda7b..490afda7b 100644
--- a/data/maps/events/RusturfTunnel.s
+++ b/data/maps/events/RusturfTunnel.inc
diff --git a/data/maps/events/SSTidalCorridor.s b/data/maps/events/SSTidalCorridor.inc
index b7eb1eb8f..b7eb1eb8f 100644
--- a/data/maps/events/SSTidalCorridor.s
+++ b/data/maps/events/SSTidalCorridor.inc
diff --git a/data/maps/events/SSTidalLowerDeck.s b/data/maps/events/SSTidalLowerDeck.inc
index 6e8530c36..6e8530c36 100644
--- a/data/maps/events/SSTidalLowerDeck.s
+++ b/data/maps/events/SSTidalLowerDeck.inc
diff --git a/data/maps/events/SSTidalRooms.s b/data/maps/events/SSTidalRooms.inc
index 0ffe1cbe7..0ffe1cbe7 100644
--- a/data/maps/events/SSTidalRooms.s
+++ b/data/maps/events/SSTidalRooms.inc
diff --git a/data/maps/events/SafariZone_Northeast.s b/data/maps/events/SafariZone_Northeast.inc
index 30921f095..30921f095 100644
--- a/data/maps/events/SafariZone_Northeast.s
+++ b/data/maps/events/SafariZone_Northeast.inc
diff --git a/data/maps/events/SafariZone_Northwest.s b/data/maps/events/SafariZone_Northwest.inc
index 0a1846b29..0a1846b29 100644
--- a/data/maps/events/SafariZone_Northwest.s
+++ b/data/maps/events/SafariZone_Northwest.inc
diff --git a/data/maps/events/SafariZone_RestHouse.s b/data/maps/events/SafariZone_RestHouse.inc
index d6de3f747..d6de3f747 100644
--- a/data/maps/events/SafariZone_RestHouse.s
+++ b/data/maps/events/SafariZone_RestHouse.inc
diff --git a/data/maps/events/SafariZone_Southeast.s b/data/maps/events/SafariZone_Southeast.inc
index d67f018ab..d67f018ab 100644
--- a/data/maps/events/SafariZone_Southeast.s
+++ b/data/maps/events/SafariZone_Southeast.inc
diff --git a/data/maps/events/SafariZone_Southwest.s b/data/maps/events/SafariZone_Southwest.inc
index 4f7f21de5..4f7f21de5 100644
--- a/data/maps/events/SafariZone_Southwest.s
+++ b/data/maps/events/SafariZone_Southwest.inc
diff --git a/data/maps/events/ScorchedSlab.s b/data/maps/events/ScorchedSlab.inc
index 4b6625b52..4b6625b52 100644
--- a/data/maps/events/ScorchedSlab.s
+++ b/data/maps/events/ScorchedSlab.inc
diff --git a/data/maps/events/SeafloorCavern_Entrance.s b/data/maps/events/SeafloorCavern_Entrance.inc
index a7f08532c..a7f08532c 100644
--- a/data/maps/events/SeafloorCavern_Entrance.s
+++ b/data/maps/events/SeafloorCavern_Entrance.inc
diff --git a/data/maps/events/SeafloorCavern_Room1.s b/data/maps/events/SeafloorCavern_Room1.inc
index 1e791f884..1e791f884 100644
--- a/data/maps/events/SeafloorCavern_Room1.s
+++ b/data/maps/events/SeafloorCavern_Room1.inc
diff --git a/data/maps/events/SeafloorCavern_Room2.s b/data/maps/events/SeafloorCavern_Room2.inc
index 3dbe5e8a7..3dbe5e8a7 100644
--- a/data/maps/events/SeafloorCavern_Room2.s
+++ b/data/maps/events/SeafloorCavern_Room2.inc
diff --git a/data/maps/events/SeafloorCavern_Room3.s b/data/maps/events/SeafloorCavern_Room3.inc
index 98e6066f2..98e6066f2 100644
--- a/data/maps/events/SeafloorCavern_Room3.s
+++ b/data/maps/events/SeafloorCavern_Room3.inc
diff --git a/data/maps/events/SeafloorCavern_Room4.s b/data/maps/events/SeafloorCavern_Room4.inc
index 3233123b3..3233123b3 100644
--- a/data/maps/events/SeafloorCavern_Room4.s
+++ b/data/maps/events/SeafloorCavern_Room4.inc
diff --git a/data/maps/events/SeafloorCavern_Room5.s b/data/maps/events/SeafloorCavern_Room5.inc
index 0ebd46a56..0ebd46a56 100644
--- a/data/maps/events/SeafloorCavern_Room5.s
+++ b/data/maps/events/SeafloorCavern_Room5.inc
diff --git a/data/maps/events/SeafloorCavern_Room6.s b/data/maps/events/SeafloorCavern_Room6.inc
index 9055af75b..9055af75b 100644
--- a/data/maps/events/SeafloorCavern_Room6.s
+++ b/data/maps/events/SeafloorCavern_Room6.inc
diff --git a/data/maps/events/SeafloorCavern_Room7.s b/data/maps/events/SeafloorCavern_Room7.inc
index 7125027fd..7125027fd 100644
--- a/data/maps/events/SeafloorCavern_Room7.s
+++ b/data/maps/events/SeafloorCavern_Room7.inc
diff --git a/data/maps/events/SeafloorCavern_Room8.s b/data/maps/events/SeafloorCavern_Room8.inc
index 610937753..610937753 100644
--- a/data/maps/events/SeafloorCavern_Room8.s
+++ b/data/maps/events/SeafloorCavern_Room8.inc
diff --git a/data/maps/events/SeafloorCavern_Room9.s b/data/maps/events/SeafloorCavern_Room9.inc
index 2fccd4fec..2fccd4fec 100644
--- a/data/maps/events/SeafloorCavern_Room9.s
+++ b/data/maps/events/SeafloorCavern_Room9.inc
diff --git a/data/maps/events/SealedChamber_InnerRoom.s b/data/maps/events/SealedChamber_InnerRoom.inc
index 260de2dd9..260de2dd9 100644
--- a/data/maps/events/SealedChamber_InnerRoom.s
+++ b/data/maps/events/SealedChamber_InnerRoom.inc
diff --git a/data/maps/events/SealedChamber_OuterRoom.s b/data/maps/events/SealedChamber_OuterRoom.inc
index 5251d401a..5251d401a 100644
--- a/data/maps/events/SealedChamber_OuterRoom.s
+++ b/data/maps/events/SealedChamber_OuterRoom.inc
diff --git a/data/maps/events/SecretBase_BlueCave1.s b/data/maps/events/SecretBase_BlueCave1.inc
index 25bab40da..25bab40da 100644
--- a/data/maps/events/SecretBase_BlueCave1.s
+++ b/data/maps/events/SecretBase_BlueCave1.inc
diff --git a/data/maps/events/SecretBase_BlueCave2.s b/data/maps/events/SecretBase_BlueCave2.inc
index a7eac24a4..a7eac24a4 100644
--- a/data/maps/events/SecretBase_BlueCave2.s
+++ b/data/maps/events/SecretBase_BlueCave2.inc
diff --git a/data/maps/events/SecretBase_BlueCave3.s b/data/maps/events/SecretBase_BlueCave3.inc
index 202c2bc4e..202c2bc4e 100644
--- a/data/maps/events/SecretBase_BlueCave3.s
+++ b/data/maps/events/SecretBase_BlueCave3.inc
diff --git a/data/maps/events/SecretBase_BlueCave4.s b/data/maps/events/SecretBase_BlueCave4.inc
index 2975c0b37..2975c0b37 100644
--- a/data/maps/events/SecretBase_BlueCave4.s
+++ b/data/maps/events/SecretBase_BlueCave4.inc
diff --git a/data/maps/events/SecretBase_BrownCave1.s b/data/maps/events/SecretBase_BrownCave1.inc
index 31e2d0117..31e2d0117 100644
--- a/data/maps/events/SecretBase_BrownCave1.s
+++ b/data/maps/events/SecretBase_BrownCave1.inc
diff --git a/data/maps/events/SecretBase_BrownCave2.s b/data/maps/events/SecretBase_BrownCave2.inc
index 93f9a3c03..93f9a3c03 100644
--- a/data/maps/events/SecretBase_BrownCave2.s
+++ b/data/maps/events/SecretBase_BrownCave2.inc
diff --git a/data/maps/events/SecretBase_BrownCave3.s b/data/maps/events/SecretBase_BrownCave3.inc
index 5aa5aed7a..5aa5aed7a 100644
--- a/data/maps/events/SecretBase_BrownCave3.s
+++ b/data/maps/events/SecretBase_BrownCave3.inc
diff --git a/data/maps/events/SecretBase_BrownCave4.s b/data/maps/events/SecretBase_BrownCave4.inc
index fc66e8fb5..fc66e8fb5 100644
--- a/data/maps/events/SecretBase_BrownCave4.s
+++ b/data/maps/events/SecretBase_BrownCave4.inc
diff --git a/data/maps/events/SecretBase_RedCave1.s b/data/maps/events/SecretBase_RedCave1.inc
index dbc8c7593..dbc8c7593 100644
--- a/data/maps/events/SecretBase_RedCave1.s
+++ b/data/maps/events/SecretBase_RedCave1.inc
diff --git a/data/maps/events/SecretBase_RedCave2.s b/data/maps/events/SecretBase_RedCave2.inc
index 910b2c074..910b2c074 100644
--- a/data/maps/events/SecretBase_RedCave2.s
+++ b/data/maps/events/SecretBase_RedCave2.inc
diff --git a/data/maps/events/SecretBase_RedCave3.s b/data/maps/events/SecretBase_RedCave3.inc
index 8745b272f..8745b272f 100644
--- a/data/maps/events/SecretBase_RedCave3.s
+++ b/data/maps/events/SecretBase_RedCave3.inc
diff --git a/data/maps/events/SecretBase_RedCave4.s b/data/maps/events/SecretBase_RedCave4.inc
index 60928ef5c..60928ef5c 100644
--- a/data/maps/events/SecretBase_RedCave4.s
+++ b/data/maps/events/SecretBase_RedCave4.inc
diff --git a/data/maps/events/SecretBase_Shrub1.s b/data/maps/events/SecretBase_Shrub1.inc
index 17c2f2530..17c2f2530 100644
--- a/data/maps/events/SecretBase_Shrub1.s
+++ b/data/maps/events/SecretBase_Shrub1.inc
diff --git a/data/maps/events/SecretBase_Shrub2.s b/data/maps/events/SecretBase_Shrub2.inc
index 6b973e730..6b973e730 100644
--- a/data/maps/events/SecretBase_Shrub2.s
+++ b/data/maps/events/SecretBase_Shrub2.inc
diff --git a/data/maps/events/SecretBase_Shrub3.s b/data/maps/events/SecretBase_Shrub3.inc
index 12e2c7c81..12e2c7c81 100644
--- a/data/maps/events/SecretBase_Shrub3.s
+++ b/data/maps/events/SecretBase_Shrub3.inc
diff --git a/data/maps/events/SecretBase_Shrub4.s b/data/maps/events/SecretBase_Shrub4.inc
index bd3b94522..bd3b94522 100644
--- a/data/maps/events/SecretBase_Shrub4.s
+++ b/data/maps/events/SecretBase_Shrub4.inc
diff --git a/data/maps/events/SecretBase_Tree1.s b/data/maps/events/SecretBase_Tree1.inc
index 465a0d2be..465a0d2be 100644
--- a/data/maps/events/SecretBase_Tree1.s
+++ b/data/maps/events/SecretBase_Tree1.inc
diff --git a/data/maps/events/SecretBase_Tree2.s b/data/maps/events/SecretBase_Tree2.inc
index d780ed779..d780ed779 100644
--- a/data/maps/events/SecretBase_Tree2.s
+++ b/data/maps/events/SecretBase_Tree2.inc
diff --git a/data/maps/events/SecretBase_Tree3.s b/data/maps/events/SecretBase_Tree3.inc
index 0c8888764..0c8888764 100644
--- a/data/maps/events/SecretBase_Tree3.s
+++ b/data/maps/events/SecretBase_Tree3.inc
diff --git a/data/maps/events/SecretBase_Tree4.s b/data/maps/events/SecretBase_Tree4.inc
index 675ee1b8e..675ee1b8e 100644
--- a/data/maps/events/SecretBase_Tree4.s
+++ b/data/maps/events/SecretBase_Tree4.inc
diff --git a/data/maps/events/SecretBase_YellowCave1.s b/data/maps/events/SecretBase_YellowCave1.inc
index 8c6999f9b..8c6999f9b 100644
--- a/data/maps/events/SecretBase_YellowCave1.s
+++ b/data/maps/events/SecretBase_YellowCave1.inc
diff --git a/data/maps/events/SecretBase_YellowCave2.s b/data/maps/events/SecretBase_YellowCave2.inc
index 8825836bf..8825836bf 100644
--- a/data/maps/events/SecretBase_YellowCave2.s
+++ b/data/maps/events/SecretBase_YellowCave2.inc
diff --git a/data/maps/events/SecretBase_YellowCave3.s b/data/maps/events/SecretBase_YellowCave3.inc
index a88e44190..a88e44190 100644
--- a/data/maps/events/SecretBase_YellowCave3.s
+++ b/data/maps/events/SecretBase_YellowCave3.inc
diff --git a/data/maps/events/SecretBase_YellowCave4.s b/data/maps/events/SecretBase_YellowCave4.inc
index 0280e088a..0280e088a 100644
--- a/data/maps/events/SecretBase_YellowCave4.s
+++ b/data/maps/events/SecretBase_YellowCave4.inc
diff --git a/data/maps/events/ShoalCave_HighTideEntranceRoom.s b/data/maps/events/ShoalCave_HighTideEntranceRoom.inc
index c7225843f..c7225843f 100644
--- a/data/maps/events/ShoalCave_HighTideEntranceRoom.s
+++ b/data/maps/events/ShoalCave_HighTideEntranceRoom.inc
diff --git a/data/maps/events/ShoalCave_HighTideInnerRoom.s b/data/maps/events/ShoalCave_HighTideInnerRoom.inc
index e7951742a..e7951742a 100644
--- a/data/maps/events/ShoalCave_HighTideInnerRoom.s
+++ b/data/maps/events/ShoalCave_HighTideInnerRoom.inc
diff --git a/data/maps/events/ShoalCave_LowTideEntranceRoom.s b/data/maps/events/ShoalCave_LowTideEntranceRoom.inc
index a9381d0c4..a9381d0c4 100644
--- a/data/maps/events/ShoalCave_LowTideEntranceRoom.s
+++ b/data/maps/events/ShoalCave_LowTideEntranceRoom.inc
diff --git a/data/maps/events/ShoalCave_LowTideIceRoom.s b/data/maps/events/ShoalCave_LowTideIceRoom.inc
index 2d5958a37..2d5958a37 100644
--- a/data/maps/events/ShoalCave_LowTideIceRoom.s
+++ b/data/maps/events/ShoalCave_LowTideIceRoom.inc
diff --git a/data/maps/events/ShoalCave_LowTideInnerRoom.s b/data/maps/events/ShoalCave_LowTideInnerRoom.inc
index 954c4c5e9..954c4c5e9 100644
--- a/data/maps/events/ShoalCave_LowTideInnerRoom.s
+++ b/data/maps/events/ShoalCave_LowTideInnerRoom.inc
diff --git a/data/maps/events/ShoalCave_LowTideLowerRoom.s b/data/maps/events/ShoalCave_LowTideLowerRoom.inc
index a1770b5bb..a1770b5bb 100644
--- a/data/maps/events/ShoalCave_LowTideLowerRoom.s
+++ b/data/maps/events/ShoalCave_LowTideLowerRoom.inc
diff --git a/data/maps/events/ShoalCave_LowTideStairsRoom.s b/data/maps/events/ShoalCave_LowTideStairsRoom.inc
index 878b1fca0..878b1fca0 100644
--- a/data/maps/events/ShoalCave_LowTideStairsRoom.s
+++ b/data/maps/events/ShoalCave_LowTideStairsRoom.inc
diff --git a/data/maps/events/SingleBattleColosseum.s b/data/maps/events/SingleBattleColosseum.inc
index 1d4b51476..1d4b51476 100644
--- a/data/maps/events/SingleBattleColosseum.s
+++ b/data/maps/events/SingleBattleColosseum.inc
diff --git a/data/maps/events/SkyPillar_1F.s b/data/maps/events/SkyPillar_1F.inc
index eaf7fa955..eaf7fa955 100644
--- a/data/maps/events/SkyPillar_1F.s
+++ b/data/maps/events/SkyPillar_1F.inc
diff --git a/data/maps/events/SkyPillar_2F.s b/data/maps/events/SkyPillar_2F.inc
index ffd0d7d25..ffd0d7d25 100644
--- a/data/maps/events/SkyPillar_2F.s
+++ b/data/maps/events/SkyPillar_2F.inc
diff --git a/data/maps/events/SkyPillar_3F.s b/data/maps/events/SkyPillar_3F.inc
index c34440ab7..c34440ab7 100644
--- a/data/maps/events/SkyPillar_3F.s
+++ b/data/maps/events/SkyPillar_3F.inc
diff --git a/data/maps/events/SkyPillar_4F.s b/data/maps/events/SkyPillar_4F.inc
index 77586a25a..77586a25a 100644
--- a/data/maps/events/SkyPillar_4F.s
+++ b/data/maps/events/SkyPillar_4F.inc
diff --git a/data/maps/events/SkyPillar_5F.s b/data/maps/events/SkyPillar_5F.inc
index 7c4ea5a97..7c4ea5a97 100644
--- a/data/maps/events/SkyPillar_5F.s
+++ b/data/maps/events/SkyPillar_5F.inc
diff --git a/data/maps/events/SkyPillar_Entrance.s b/data/maps/events/SkyPillar_Entrance.inc
index d27442989..d27442989 100644
--- a/data/maps/events/SkyPillar_Entrance.s
+++ b/data/maps/events/SkyPillar_Entrance.inc
diff --git a/data/maps/events/SkyPillar_Outside.s b/data/maps/events/SkyPillar_Outside.inc
index 05ffe4df8..05ffe4df8 100644
--- a/data/maps/events/SkyPillar_Outside.s
+++ b/data/maps/events/SkyPillar_Outside.inc
diff --git a/data/maps/events/SkyPillar_Top.s b/data/maps/events/SkyPillar_Top.inc
index 6c9d8abc6..6c9d8abc6 100644
--- a/data/maps/events/SkyPillar_Top.s
+++ b/data/maps/events/SkyPillar_Top.inc
diff --git a/data/maps/events/SlateportCity.s b/data/maps/events/SlateportCity.inc
index bef2bf0d9..bef2bf0d9 100644
--- a/data/maps/events/SlateportCity.s
+++ b/data/maps/events/SlateportCity.inc
diff --git a/data/maps/events/SlateportCity_ContestHall.s b/data/maps/events/SlateportCity_ContestHall.inc
index ae3e4ea7b..ae3e4ea7b 100644
--- a/data/maps/events/SlateportCity_ContestHall.s
+++ b/data/maps/events/SlateportCity_ContestHall.inc
diff --git a/data/maps/events/SlateportCity_ContestLobby.s b/data/maps/events/SlateportCity_ContestLobby.inc
index 74a8bc131..74a8bc131 100644
--- a/data/maps/events/SlateportCity_ContestLobby.s
+++ b/data/maps/events/SlateportCity_ContestLobby.inc
diff --git a/data/maps/events/SlateportCity_Harbor.s b/data/maps/events/SlateportCity_Harbor.inc
index 3fbbd72c2..3fbbd72c2 100644
--- a/data/maps/events/SlateportCity_Harbor.s
+++ b/data/maps/events/SlateportCity_Harbor.inc
diff --git a/data/maps/events/SlateportCity_House1.s b/data/maps/events/SlateportCity_House1.inc
index 3379b7fef..3379b7fef 100644
--- a/data/maps/events/SlateportCity_House1.s
+++ b/data/maps/events/SlateportCity_House1.inc
diff --git a/data/maps/events/SlateportCity_House2.s b/data/maps/events/SlateportCity_House2.inc
index a147ec7ce..a147ec7ce 100644
--- a/data/maps/events/SlateportCity_House2.s
+++ b/data/maps/events/SlateportCity_House2.inc
diff --git a/data/maps/events/SlateportCity_Mart.s b/data/maps/events/SlateportCity_Mart.inc
index 54072eccc..54072eccc 100644
--- a/data/maps/events/SlateportCity_Mart.s
+++ b/data/maps/events/SlateportCity_Mart.inc
diff --git a/data/maps/events/SlateportCity_OceanicMuseum_1F.s b/data/maps/events/SlateportCity_OceanicMuseum_1F.inc
index 9756d6745..9756d6745 100644
--- a/data/maps/events/SlateportCity_OceanicMuseum_1F.s
+++ b/data/maps/events/SlateportCity_OceanicMuseum_1F.inc
diff --git a/data/maps/events/SlateportCity_OceanicMuseum_2F.s b/data/maps/events/SlateportCity_OceanicMuseum_2F.inc
index a081e15d3..a081e15d3 100644
--- a/data/maps/events/SlateportCity_OceanicMuseum_2F.s
+++ b/data/maps/events/SlateportCity_OceanicMuseum_2F.inc
diff --git a/data/maps/events/SlateportCity_PokemonCenter_1F.s b/data/maps/events/SlateportCity_PokemonCenter_1F.inc
index dfd38dc51..dfd38dc51 100644
--- a/data/maps/events/SlateportCity_PokemonCenter_1F.s
+++ b/data/maps/events/SlateportCity_PokemonCenter_1F.inc
diff --git a/data/maps/events/SlateportCity_PokemonCenter_2F.s b/data/maps/events/SlateportCity_PokemonCenter_2F.inc
index db723fa33..db723fa33 100644
--- a/data/maps/events/SlateportCity_PokemonCenter_2F.s
+++ b/data/maps/events/SlateportCity_PokemonCenter_2F.inc
diff --git a/data/maps/events/SlateportCity_PokemonFanClub.s b/data/maps/events/SlateportCity_PokemonFanClub.inc
index 8003a3439..8003a3439 100644
--- a/data/maps/events/SlateportCity_PokemonFanClub.s
+++ b/data/maps/events/SlateportCity_PokemonFanClub.inc
diff --git a/data/maps/events/SlateportCity_SternsShipyard_1F.s b/data/maps/events/SlateportCity_SternsShipyard_1F.inc
index 38d14fa4e..38d14fa4e 100644
--- a/data/maps/events/SlateportCity_SternsShipyard_1F.s
+++ b/data/maps/events/SlateportCity_SternsShipyard_1F.inc
diff --git a/data/maps/events/SlateportCity_SternsShipyard_2F.s b/data/maps/events/SlateportCity_SternsShipyard_2F.inc
index cd26ed1cc..cd26ed1cc 100644
--- a/data/maps/events/SlateportCity_SternsShipyard_2F.s
+++ b/data/maps/events/SlateportCity_SternsShipyard_2F.inc
diff --git a/data/maps/events/SootopolisCity.s b/data/maps/events/SootopolisCity.inc
index a93db6a93..a93db6a93 100644
--- a/data/maps/events/SootopolisCity.s
+++ b/data/maps/events/SootopolisCity.inc
diff --git a/data/maps/events/SootopolisCity_Gym_1F.s b/data/maps/events/SootopolisCity_Gym_1F.inc
index 88707692e..88707692e 100644
--- a/data/maps/events/SootopolisCity_Gym_1F.s
+++ b/data/maps/events/SootopolisCity_Gym_1F.inc
diff --git a/data/maps/events/SootopolisCity_Gym_B1F.s b/data/maps/events/SootopolisCity_Gym_B1F.inc
index 44827aaf5..44827aaf5 100644
--- a/data/maps/events/SootopolisCity_Gym_B1F.s
+++ b/data/maps/events/SootopolisCity_Gym_B1F.inc
diff --git a/data/maps/events/SootopolisCity_House1.s b/data/maps/events/SootopolisCity_House1.inc
index bddda2d88..bddda2d88 100644
--- a/data/maps/events/SootopolisCity_House1.s
+++ b/data/maps/events/SootopolisCity_House1.inc
diff --git a/data/maps/events/SootopolisCity_House2.s b/data/maps/events/SootopolisCity_House2.inc
index 01cf77ddb..01cf77ddb 100644
--- a/data/maps/events/SootopolisCity_House2.s
+++ b/data/maps/events/SootopolisCity_House2.inc
diff --git a/data/maps/events/SootopolisCity_House3.s b/data/maps/events/SootopolisCity_House3.inc
index dfae0f969..dfae0f969 100644
--- a/data/maps/events/SootopolisCity_House3.s
+++ b/data/maps/events/SootopolisCity_House3.inc
diff --git a/data/maps/events/SootopolisCity_House4.s b/data/maps/events/SootopolisCity_House4.inc
index 766dbc682..766dbc682 100644
--- a/data/maps/events/SootopolisCity_House4.s
+++ b/data/maps/events/SootopolisCity_House4.inc
diff --git a/data/maps/events/SootopolisCity_House5.s b/data/maps/events/SootopolisCity_House5.inc
index 499bc26de..499bc26de 100644
--- a/data/maps/events/SootopolisCity_House5.s
+++ b/data/maps/events/SootopolisCity_House5.inc
diff --git a/data/maps/events/SootopolisCity_House6.s b/data/maps/events/SootopolisCity_House6.inc
index 9fcb17f50..9fcb17f50 100644
--- a/data/maps/events/SootopolisCity_House6.s
+++ b/data/maps/events/SootopolisCity_House6.inc
diff --git a/data/maps/events/SootopolisCity_House7.s b/data/maps/events/SootopolisCity_House7.inc
index d23992a32..d23992a32 100644
--- a/data/maps/events/SootopolisCity_House7.s
+++ b/data/maps/events/SootopolisCity_House7.inc
diff --git a/data/maps/events/SootopolisCity_House8.s b/data/maps/events/SootopolisCity_House8.inc
index 4fd384f2b..4fd384f2b 100644
--- a/data/maps/events/SootopolisCity_House8.s
+++ b/data/maps/events/SootopolisCity_House8.inc
diff --git a/data/maps/events/SootopolisCity_Mart.s b/data/maps/events/SootopolisCity_Mart.inc
index 144a2b79b..144a2b79b 100644
--- a/data/maps/events/SootopolisCity_Mart.s
+++ b/data/maps/events/SootopolisCity_Mart.inc
diff --git a/data/maps/events/SootopolisCity_PokemonCenter_1F.s b/data/maps/events/SootopolisCity_PokemonCenter_1F.inc
index c69ebb84c..c69ebb84c 100644
--- a/data/maps/events/SootopolisCity_PokemonCenter_1F.s
+++ b/data/maps/events/SootopolisCity_PokemonCenter_1F.inc
diff --git a/data/maps/events/SootopolisCity_PokemonCenter_2F.s b/data/maps/events/SootopolisCity_PokemonCenter_2F.inc
index 217185c78..217185c78 100644
--- a/data/maps/events/SootopolisCity_PokemonCenter_2F.s
+++ b/data/maps/events/SootopolisCity_PokemonCenter_2F.inc
diff --git a/data/maps/events/SouthernIsland_Exterior.s b/data/maps/events/SouthernIsland_Exterior.inc
index 062b72d1f..062b72d1f 100644
--- a/data/maps/events/SouthernIsland_Exterior.s
+++ b/data/maps/events/SouthernIsland_Exterior.inc
diff --git a/data/maps/events/SouthernIsland_Interior.s b/data/maps/events/SouthernIsland_Interior.inc
index 77073fc85..77073fc85 100644
--- a/data/maps/events/SouthernIsland_Interior.s
+++ b/data/maps/events/SouthernIsland_Interior.inc
diff --git a/data/maps/events/TradeCenter.s b/data/maps/events/TradeCenter.inc
index 8c5ff5578..8c5ff5578 100644
--- a/data/maps/events/TradeCenter.s
+++ b/data/maps/events/TradeCenter.inc
diff --git a/data/maps/events/Underwater1.s b/data/maps/events/Underwater1.inc
index e67181a50..e67181a50 100644
--- a/data/maps/events/Underwater1.s
+++ b/data/maps/events/Underwater1.inc
diff --git a/data/maps/events/Underwater2.s b/data/maps/events/Underwater2.inc
index a9ecbd465..a9ecbd465 100644
--- a/data/maps/events/Underwater2.s
+++ b/data/maps/events/Underwater2.inc
diff --git a/data/maps/events/Underwater3.s b/data/maps/events/Underwater3.inc
index 1e0925650..1e0925650 100644
--- a/data/maps/events/Underwater3.s
+++ b/data/maps/events/Underwater3.inc
diff --git a/data/maps/events/Underwater4.s b/data/maps/events/Underwater4.inc
index 711131621..711131621 100644
--- a/data/maps/events/Underwater4.s
+++ b/data/maps/events/Underwater4.inc
diff --git a/data/maps/events/Underwater_Route134.s b/data/maps/events/Underwater_Route134.inc
index f6c734112..f6c734112 100644
--- a/data/maps/events/Underwater_Route134.s
+++ b/data/maps/events/Underwater_Route134.inc
diff --git a/data/maps/events/Underwater_SeafloorCavern.s b/data/maps/events/Underwater_SeafloorCavern.inc
index e06e0a498..e06e0a498 100644
--- a/data/maps/events/Underwater_SeafloorCavern.s
+++ b/data/maps/events/Underwater_SeafloorCavern.inc
diff --git a/data/maps/events/Underwater_SealedChamber.s b/data/maps/events/Underwater_SealedChamber.inc
index 867527aaf..867527aaf 100644
--- a/data/maps/events/Underwater_SealedChamber.s
+++ b/data/maps/events/Underwater_SealedChamber.inc
diff --git a/data/maps/events/Underwater_SootopolisCity.s b/data/maps/events/Underwater_SootopolisCity.inc
index fb48a32fb..fb48a32fb 100644
--- a/data/maps/events/Underwater_SootopolisCity.s
+++ b/data/maps/events/Underwater_SootopolisCity.inc
diff --git a/data/maps/events/UnknownMap_25_29.s b/data/maps/events/UnknownMap_25_29.inc
index 5f3412382..5f3412382 100644
--- a/data/maps/events/UnknownMap_25_29.s
+++ b/data/maps/events/UnknownMap_25_29.inc
diff --git a/data/maps/events/UnknownMap_25_30.s b/data/maps/events/UnknownMap_25_30.inc
index 8ce359a0b..8ce359a0b 100644
--- a/data/maps/events/UnknownMap_25_30.s
+++ b/data/maps/events/UnknownMap_25_30.inc
diff --git a/data/maps/events/UnknownMap_25_31.s b/data/maps/events/UnknownMap_25_31.inc
index f2eabe57f..f2eabe57f 100644
--- a/data/maps/events/UnknownMap_25_31.s
+++ b/data/maps/events/UnknownMap_25_31.inc
diff --git a/data/maps/events/UnknownMap_25_32.s b/data/maps/events/UnknownMap_25_32.inc
index aa0435850..aa0435850 100644
--- a/data/maps/events/UnknownMap_25_32.s
+++ b/data/maps/events/UnknownMap_25_32.inc
diff --git a/data/maps/events/UnknownMap_25_33.s b/data/maps/events/UnknownMap_25_33.inc
index db91b6ef5..db91b6ef5 100644
--- a/data/maps/events/UnknownMap_25_33.s
+++ b/data/maps/events/UnknownMap_25_33.inc
diff --git a/data/maps/events/UnknownMap_25_34.s b/data/maps/events/UnknownMap_25_34.inc
index f3778b3eb..f3778b3eb 100644
--- a/data/maps/events/UnknownMap_25_34.s
+++ b/data/maps/events/UnknownMap_25_34.inc
diff --git a/data/maps/events/VerdanturfTown.s b/data/maps/events/VerdanturfTown.inc
index 1d40f7f53..1d40f7f53 100644
--- a/data/maps/events/VerdanturfTown.s
+++ b/data/maps/events/VerdanturfTown.inc
diff --git a/data/maps/events/VerdanturfTown_ContestHall.s b/data/maps/events/VerdanturfTown_ContestHall.inc
index 36f4d58e4..36f4d58e4 100644
--- a/data/maps/events/VerdanturfTown_ContestHall.s
+++ b/data/maps/events/VerdanturfTown_ContestHall.inc
diff --git a/data/maps/events/VerdanturfTown_ContestLobby.s b/data/maps/events/VerdanturfTown_ContestLobby.inc
index ec9d88d71..ec9d88d71 100644
--- a/data/maps/events/VerdanturfTown_ContestLobby.s
+++ b/data/maps/events/VerdanturfTown_ContestLobby.inc
diff --git a/data/maps/events/VerdanturfTown_FriendshipRatersHouse.s b/data/maps/events/VerdanturfTown_FriendshipRatersHouse.inc
index 6ec948511..6ec948511 100644
--- a/data/maps/events/VerdanturfTown_FriendshipRatersHouse.s
+++ b/data/maps/events/VerdanturfTown_FriendshipRatersHouse.inc
diff --git a/data/maps/events/VerdanturfTown_House.s b/data/maps/events/VerdanturfTown_House.inc
index 91a54684b..91a54684b 100644
--- a/data/maps/events/VerdanturfTown_House.s
+++ b/data/maps/events/VerdanturfTown_House.inc
diff --git a/data/maps/events/VerdanturfTown_Mart.s b/data/maps/events/VerdanturfTown_Mart.inc
index 90e1cf014..90e1cf014 100644
--- a/data/maps/events/VerdanturfTown_Mart.s
+++ b/data/maps/events/VerdanturfTown_Mart.inc
diff --git a/data/maps/events/VerdanturfTown_PokemonCenter_1F.s b/data/maps/events/VerdanturfTown_PokemonCenter_1F.inc
index 3db30796c..3db30796c 100644
--- a/data/maps/events/VerdanturfTown_PokemonCenter_1F.s
+++ b/data/maps/events/VerdanturfTown_PokemonCenter_1F.inc
diff --git a/data/maps/events/VerdanturfTown_PokemonCenter_2F.s b/data/maps/events/VerdanturfTown_PokemonCenter_2F.inc
index 89f02e31f..89f02e31f 100644
--- a/data/maps/events/VerdanturfTown_PokemonCenter_2F.s
+++ b/data/maps/events/VerdanturfTown_PokemonCenter_2F.inc
diff --git a/data/maps/events/VerdanturfTown_WandasHouse.s b/data/maps/events/VerdanturfTown_WandasHouse.inc
index 5d0f3e572..5d0f3e572 100644
--- a/data/maps/events/VerdanturfTown_WandasHouse.s
+++ b/data/maps/events/VerdanturfTown_WandasHouse.inc
diff --git a/data/maps/events/VictoryRoad_1F.s b/data/maps/events/VictoryRoad_1F.inc
index f3f8dcad6..f3f8dcad6 100644
--- a/data/maps/events/VictoryRoad_1F.s
+++ b/data/maps/events/VictoryRoad_1F.inc
diff --git a/data/maps/events/VictoryRoad_B1F.s b/data/maps/events/VictoryRoad_B1F.inc
index a4f778c4d..a4f778c4d 100644
--- a/data/maps/events/VictoryRoad_B1F.s
+++ b/data/maps/events/VictoryRoad_B1F.inc
diff --git a/data/maps/events/VictoryRoad_B2F.s b/data/maps/events/VictoryRoad_B2F.inc
index b4aa07e59..b4aa07e59 100644
--- a/data/maps/events/VictoryRoad_B2F.s
+++ b/data/maps/events/VictoryRoad_B2F.inc
diff --git a/data/maps/headers.s b/data/maps/headers.inc
index 71b2936d7..71b2936d7 100644
--- a/data/maps/headers.s
+++ b/data/maps/headers.inc
diff --git a/data/mon_pokeblock_anims.s b/data/mon_pokeblock_anims.inc
index d8df29c1d..d8df29c1d 100644
--- a/data/mon_pokeblock_anims.s
+++ b/data/mon_pokeblock_anims.inc
diff --git a/data/multichoice.s b/data/multichoice.inc
index 256038c23..256038c23 100644
--- a/data/multichoice.s
+++ b/data/multichoice.inc
diff --git a/data/nature_stat_table.s b/data/nature_stat_table.inc
index e09d41a43..e09d41a43 100644
--- a/data/nature_stat_table.s
+++ b/data/nature_stat_table.inc
diff --git a/data/pokedex_entries.s b/data/pokedex_entries.inc
index f1c206e3c..f1c206e3c 100644
--- a/data/pokedex_entries.s
+++ b/data/pokedex_entries.inc
diff --git a/data/pokedex_orders.s b/data/pokedex_orders.inc
index db1cf7e07..db1cf7e07 100644
--- a/data/pokedex_orders.s
+++ b/data/pokedex_orders.inc
diff --git a/data/region_map_locations.s b/data/region_map_locations.inc
index 389b5aa0c..389b5aa0c 100644
--- a/data/region_map_locations.s
+++ b/data/region_map_locations.inc
diff --git a/data/region_map_sections.s b/data/region_map_sections.inc
index 6336eac0e..6336eac0e 100644
--- a/data/region_map_sections.s
+++ b/data/region_map_sections.inc
diff --git a/data/script_cmd_table.s b/data/script_cmd_table.inc
index a68f2ca8d..a68f2ca8d 100644
--- a/data/script_cmd_table.s
+++ b/data/script_cmd_table.inc
diff --git a/data/scripts/bard.s b/data/scripts/bard.inc
index a30045fc8..a30045fc8 100644
--- a/data/scripts/bard.s
+++ b/data/scripts/bard.inc
diff --git a/data/scripts/berry_tree.s b/data/scripts/berry_tree.inc
index f6d98689e..f6d98689e 100644
--- a/data/scripts/berry_tree.s
+++ b/data/scripts/berry_tree.inc
diff --git a/data/scripts/cable_club.s b/data/scripts/cable_club.inc
index 32bb55a08..32bb55a08 100644
--- a/data/scripts/cable_club.s
+++ b/data/scripts/cable_club.inc
diff --git a/data/scripts/contest_hall.s b/data/scripts/contest_hall.inc
index 14e684cb9..14e684cb9 100644
--- a/data/scripts/contest_hall.s
+++ b/data/scripts/contest_hall.inc
diff --git a/data/scripts/day_care.s b/data/scripts/day_care.inc
index 1e248ba9f..1e248ba9f 100644
--- a/data/scripts/day_care.s
+++ b/data/scripts/day_care.inc
diff --git a/data/scripts/gabby_and_ty.s b/data/scripts/gabby_and_ty.inc
index f008e892b..f008e892b 100644
--- a/data/scripts/gabby_and_ty.s
+++ b/data/scripts/gabby_and_ty.inc
diff --git a/data/scripts/giddy.s b/data/scripts/giddy.inc
index 3cd57ad6e..3cd57ad6e 100644
--- a/data/scripts/giddy.s
+++ b/data/scripts/giddy.inc
diff --git a/data/scripts/hipster.s b/data/scripts/hipster.inc
index 833bb1605..833bb1605 100644
--- a/data/scripts/hipster.s
+++ b/data/scripts/hipster.inc
diff --git a/data/scripts/magma_chimney.s b/data/scripts/magma_chimney.inc
index a2f4f67b7..a2f4f67b7 100644
--- a/data/scripts/magma_chimney.s
+++ b/data/scripts/magma_chimney.inc
diff --git a/data/scripts/magma_summit.s b/data/scripts/magma_summit.inc
index ac71b038f..ac71b038f 100644
--- a/data/scripts/magma_summit.s
+++ b/data/scripts/magma_summit.inc
diff --git a/data/scripts/maps/AbandonedShip_CaptainsOffice.s b/data/scripts/maps/AbandonedShip_CaptainsOffice.inc
index cf525003e..cf525003e 100644
--- a/data/scripts/maps/AbandonedShip_CaptainsOffice.s
+++ b/data/scripts/maps/AbandonedShip_CaptainsOffice.inc
diff --git a/data/scripts/maps/AbandonedShip_Corridors_1F.s b/data/scripts/maps/AbandonedShip_Corridors_1F.inc
index 0c7278f3b..0c7278f3b 100644
--- a/data/scripts/maps/AbandonedShip_Corridors_1F.s
+++ b/data/scripts/maps/AbandonedShip_Corridors_1F.inc
diff --git a/data/scripts/maps/AbandonedShip_Corridors_B1F.s b/data/scripts/maps/AbandonedShip_Corridors_B1F.inc
index e6b6a8f3d..e6b6a8f3d 100644
--- a/data/scripts/maps/AbandonedShip_Corridors_B1F.s
+++ b/data/scripts/maps/AbandonedShip_Corridors_B1F.inc
diff --git a/data/scripts/maps/AbandonedShip_Deck.s b/data/scripts/maps/AbandonedShip_Deck.inc
index 49f837744..49f837744 100644
--- a/data/scripts/maps/AbandonedShip_Deck.s
+++ b/data/scripts/maps/AbandonedShip_Deck.inc
diff --git a/data/scripts/maps/AbandonedShip_HiddenFloorCorridors.s b/data/scripts/maps/AbandonedShip_HiddenFloorCorridors.inc
index 4b634106a..4b634106a 100644
--- a/data/scripts/maps/AbandonedShip_HiddenFloorCorridors.s
+++ b/data/scripts/maps/AbandonedShip_HiddenFloorCorridors.inc
diff --git a/data/scripts/maps/AbandonedShip_HiddenFloorRooms.s b/data/scripts/maps/AbandonedShip_HiddenFloorRooms.inc
index 5e90673fe..5e90673fe 100644
--- a/data/scripts/maps/AbandonedShip_HiddenFloorRooms.s
+++ b/data/scripts/maps/AbandonedShip_HiddenFloorRooms.inc
diff --git a/data/scripts/maps/AbandonedShip_Room_B1F.s b/data/scripts/maps/AbandonedShip_Room_B1F.inc
index 4cdc8bbd1..4cdc8bbd1 100644
--- a/data/scripts/maps/AbandonedShip_Room_B1F.s
+++ b/data/scripts/maps/AbandonedShip_Room_B1F.inc
diff --git a/data/scripts/maps/AbandonedShip_Rooms2_1F.s b/data/scripts/maps/AbandonedShip_Rooms2_1F.inc
index b2525d62e..b2525d62e 100644
--- a/data/scripts/maps/AbandonedShip_Rooms2_1F.s
+++ b/data/scripts/maps/AbandonedShip_Rooms2_1F.inc
diff --git a/data/scripts/maps/AbandonedShip_Rooms2_B1F.s b/data/scripts/maps/AbandonedShip_Rooms2_B1F.inc
index 0c8f3ffc9..0c8f3ffc9 100644
--- a/data/scripts/maps/AbandonedShip_Rooms2_B1F.s
+++ b/data/scripts/maps/AbandonedShip_Rooms2_B1F.inc
diff --git a/data/scripts/maps/AbandonedShip_Rooms_1F.s b/data/scripts/maps/AbandonedShip_Rooms_1F.inc
index c5f9ad3f5..c5f9ad3f5 100644
--- a/data/scripts/maps/AbandonedShip_Rooms_1F.s
+++ b/data/scripts/maps/AbandonedShip_Rooms_1F.inc
diff --git a/data/scripts/maps/AbandonedShip_Rooms_B1F.s b/data/scripts/maps/AbandonedShip_Rooms_B1F.inc
index 44b8c5f20..44b8c5f20 100644
--- a/data/scripts/maps/AbandonedShip_Rooms_B1F.s
+++ b/data/scripts/maps/AbandonedShip_Rooms_B1F.inc
diff --git a/data/scripts/maps/AbandonedShip_Underwater1.s b/data/scripts/maps/AbandonedShip_Underwater1.inc
index 71d903682..71d903682 100644
--- a/data/scripts/maps/AbandonedShip_Underwater1.s
+++ b/data/scripts/maps/AbandonedShip_Underwater1.inc
diff --git a/data/scripts/maps/AbandonedShip_Underwater2.s b/data/scripts/maps/AbandonedShip_Underwater2.inc
index f7b434c07..f7b434c07 100644
--- a/data/scripts/maps/AbandonedShip_Underwater2.s
+++ b/data/scripts/maps/AbandonedShip_Underwater2.inc
diff --git a/data/scripts/maps/AncientTomb.s b/data/scripts/maps/AncientTomb.inc
index f8eba6a9d..f8eba6a9d 100644
--- a/data/scripts/maps/AncientTomb.s
+++ b/data/scripts/maps/AncientTomb.inc
diff --git a/data/scripts/maps/AquaHideout_1F.s b/data/scripts/maps/AquaHideout_1F.inc
index cc1ad33b1..cc1ad33b1 100644
--- a/data/scripts/maps/AquaHideout_1F.s
+++ b/data/scripts/maps/AquaHideout_1F.inc
diff --git a/data/scripts/maps/AquaHideout_B1F.s b/data/scripts/maps/AquaHideout_B1F.inc
index 969d590e3..969d590e3 100644
--- a/data/scripts/maps/AquaHideout_B1F.s
+++ b/data/scripts/maps/AquaHideout_B1F.inc
diff --git a/data/scripts/maps/AquaHideout_B2F.s b/data/scripts/maps/AquaHideout_B2F.inc
index 845b755b7..845b755b7 100644
--- a/data/scripts/maps/AquaHideout_B2F.s
+++ b/data/scripts/maps/AquaHideout_B2F.inc
diff --git a/data/scripts/maps/BattleTower_BattleRoom.s b/data/scripts/maps/BattleTower_BattleRoom.inc
index d991b8853..d991b8853 100644
--- a/data/scripts/maps/BattleTower_BattleRoom.s
+++ b/data/scripts/maps/BattleTower_BattleRoom.inc
diff --git a/data/scripts/maps/BattleTower_Corridor.s b/data/scripts/maps/BattleTower_Corridor.inc
index 4ccf2028c..4ccf2028c 100644
--- a/data/scripts/maps/BattleTower_Corridor.s
+++ b/data/scripts/maps/BattleTower_Corridor.inc
diff --git a/data/scripts/maps/BattleTower_Elevator.s b/data/scripts/maps/BattleTower_Elevator.inc
index 7a79cc4e9..7a79cc4e9 100644
--- a/data/scripts/maps/BattleTower_Elevator.s
+++ b/data/scripts/maps/BattleTower_Elevator.inc
diff --git a/data/scripts/maps/BattleTower_Lobby.s b/data/scripts/maps/BattleTower_Lobby.inc
index cee3d7cec..cee3d7cec 100644
--- a/data/scripts/maps/BattleTower_Lobby.s
+++ b/data/scripts/maps/BattleTower_Lobby.inc
diff --git a/data/scripts/maps/BattleTower_Outside.s b/data/scripts/maps/BattleTower_Outside.inc
index 02c4e0c6f..02c4e0c6f 100644
--- a/data/scripts/maps/BattleTower_Outside.s
+++ b/data/scripts/maps/BattleTower_Outside.inc
diff --git a/data/scripts/maps/CaveOfOrigin_1F.s b/data/scripts/maps/CaveOfOrigin_1F.inc
index 7fd365b36..7fd365b36 100644
--- a/data/scripts/maps/CaveOfOrigin_1F.s
+++ b/data/scripts/maps/CaveOfOrigin_1F.inc
diff --git a/data/scripts/maps/CaveOfOrigin_B1F.s b/data/scripts/maps/CaveOfOrigin_B1F.inc
index 9603ae83b..9603ae83b 100644
--- a/data/scripts/maps/CaveOfOrigin_B1F.s
+++ b/data/scripts/maps/CaveOfOrigin_B1F.inc
diff --git a/data/scripts/maps/CaveOfOrigin_B2F.s b/data/scripts/maps/CaveOfOrigin_B2F.inc
index 6b3a55648..6b3a55648 100644
--- a/data/scripts/maps/CaveOfOrigin_B2F.s
+++ b/data/scripts/maps/CaveOfOrigin_B2F.inc
diff --git a/data/scripts/maps/CaveOfOrigin_B3F.s b/data/scripts/maps/CaveOfOrigin_B3F.inc
index 8e61048d2..8e61048d2 100644
--- a/data/scripts/maps/CaveOfOrigin_B3F.s
+++ b/data/scripts/maps/CaveOfOrigin_B3F.inc
diff --git a/data/scripts/maps/CaveOfOrigin_B4F.s b/data/scripts/maps/CaveOfOrigin_B4F.inc
index e9f23ff5a..e9f23ff5a 100644
--- a/data/scripts/maps/CaveOfOrigin_B4F.s
+++ b/data/scripts/maps/CaveOfOrigin_B4F.inc
diff --git a/data/scripts/maps/CaveOfOrigin_Entrance.s b/data/scripts/maps/CaveOfOrigin_Entrance.inc
index 68f91e0bd..68f91e0bd 100644
--- a/data/scripts/maps/CaveOfOrigin_Entrance.s
+++ b/data/scripts/maps/CaveOfOrigin_Entrance.inc
diff --git a/data/scripts/maps/DesertRuins.s b/data/scripts/maps/DesertRuins.inc
index d5787d792..d5787d792 100644
--- a/data/scripts/maps/DesertRuins.s
+++ b/data/scripts/maps/DesertRuins.inc
diff --git a/data/scripts/maps/DewfordTown.s b/data/scripts/maps/DewfordTown.inc
index 8ca2eb3df..8ca2eb3df 100644
--- a/data/scripts/maps/DewfordTown.s
+++ b/data/scripts/maps/DewfordTown.inc
diff --git a/data/scripts/maps/DewfordTown_Gym.s b/data/scripts/maps/DewfordTown_Gym.inc
index 51d4f44ba..51d4f44ba 100644
--- a/data/scripts/maps/DewfordTown_Gym.s
+++ b/data/scripts/maps/DewfordTown_Gym.inc
diff --git a/data/scripts/maps/DewfordTown_Hall.s b/data/scripts/maps/DewfordTown_Hall.inc
index 0b25e0aba..0b25e0aba 100644
--- a/data/scripts/maps/DewfordTown_Hall.s
+++ b/data/scripts/maps/DewfordTown_Hall.inc
diff --git a/data/scripts/maps/DewfordTown_House1.s b/data/scripts/maps/DewfordTown_House1.inc
index 40e06357c..40e06357c 100644
--- a/data/scripts/maps/DewfordTown_House1.s
+++ b/data/scripts/maps/DewfordTown_House1.inc
diff --git a/data/scripts/maps/DewfordTown_House2.s b/data/scripts/maps/DewfordTown_House2.inc
index 529f8bb24..529f8bb24 100644
--- a/data/scripts/maps/DewfordTown_House2.s
+++ b/data/scripts/maps/DewfordTown_House2.inc
diff --git a/data/scripts/maps/DewfordTown_PokemonCenter_1F.s b/data/scripts/maps/DewfordTown_PokemonCenter_1F.inc
index 96c198ae5..96c198ae5 100644
--- a/data/scripts/maps/DewfordTown_PokemonCenter_1F.s
+++ b/data/scripts/maps/DewfordTown_PokemonCenter_1F.inc
diff --git a/data/scripts/maps/DewfordTown_PokemonCenter_2F.s b/data/scripts/maps/DewfordTown_PokemonCenter_2F.inc
index 554c9ef6b..554c9ef6b 100644
--- a/data/scripts/maps/DewfordTown_PokemonCenter_2F.s
+++ b/data/scripts/maps/DewfordTown_PokemonCenter_2F.inc
diff --git a/data/scripts/maps/DoubleBattleColosseum.s b/data/scripts/maps/DoubleBattleColosseum.inc
index 9bc33e6bd..9bc33e6bd 100644
--- a/data/scripts/maps/DoubleBattleColosseum.s
+++ b/data/scripts/maps/DoubleBattleColosseum.inc
diff --git a/data/scripts/maps/EverGrandeCity.s b/data/scripts/maps/EverGrandeCity.inc
index 9b6d2a8b7..9b6d2a8b7 100644
--- a/data/scripts/maps/EverGrandeCity.s
+++ b/data/scripts/maps/EverGrandeCity.inc
diff --git a/data/scripts/maps/EverGrandeCity_ChampionsRoom.s b/data/scripts/maps/EverGrandeCity_ChampionsRoom.inc
index 0e5dc21b0..0e5dc21b0 100644
--- a/data/scripts/maps/EverGrandeCity_ChampionsRoom.s
+++ b/data/scripts/maps/EverGrandeCity_ChampionsRoom.inc
diff --git a/data/scripts/maps/EverGrandeCity_Corridor1.s b/data/scripts/maps/EverGrandeCity_Corridor1.inc
index 499ad673f..499ad673f 100644
--- a/data/scripts/maps/EverGrandeCity_Corridor1.s
+++ b/data/scripts/maps/EverGrandeCity_Corridor1.inc
diff --git a/data/scripts/maps/EverGrandeCity_Corridor2.s b/data/scripts/maps/EverGrandeCity_Corridor2.inc
index 692de1ed9..692de1ed9 100644
--- a/data/scripts/maps/EverGrandeCity_Corridor2.s
+++ b/data/scripts/maps/EverGrandeCity_Corridor2.inc
diff --git a/data/scripts/maps/EverGrandeCity_Corridor3.s b/data/scripts/maps/EverGrandeCity_Corridor3.inc
index f8ed19669..f8ed19669 100644
--- a/data/scripts/maps/EverGrandeCity_Corridor3.s
+++ b/data/scripts/maps/EverGrandeCity_Corridor3.inc
diff --git a/data/scripts/maps/EverGrandeCity_Corridor4.s b/data/scripts/maps/EverGrandeCity_Corridor4.inc
index 616a25ec5..616a25ec5 100644
--- a/data/scripts/maps/EverGrandeCity_Corridor4.s
+++ b/data/scripts/maps/EverGrandeCity_Corridor4.inc
diff --git a/data/scripts/maps/EverGrandeCity_Corridor5.s b/data/scripts/maps/EverGrandeCity_Corridor5.inc
index 783b03aec..783b03aec 100644
--- a/data/scripts/maps/EverGrandeCity_Corridor5.s
+++ b/data/scripts/maps/EverGrandeCity_Corridor5.inc
diff --git a/data/scripts/maps/EverGrandeCity_DrakesRoom.s b/data/scripts/maps/EverGrandeCity_DrakesRoom.inc
index c16bd544f..c16bd544f 100644
--- a/data/scripts/maps/EverGrandeCity_DrakesRoom.s
+++ b/data/scripts/maps/EverGrandeCity_DrakesRoom.inc
diff --git a/data/scripts/maps/EverGrandeCity_GlaciasRoom.s b/data/scripts/maps/EverGrandeCity_GlaciasRoom.inc
index 039b2a772..039b2a772 100644
--- a/data/scripts/maps/EverGrandeCity_GlaciasRoom.s
+++ b/data/scripts/maps/EverGrandeCity_GlaciasRoom.inc
diff --git a/data/scripts/maps/EverGrandeCity_HallOfFame.s b/data/scripts/maps/EverGrandeCity_HallOfFame.inc
index 2e7099110..2e7099110 100644
--- a/data/scripts/maps/EverGrandeCity_HallOfFame.s
+++ b/data/scripts/maps/EverGrandeCity_HallOfFame.inc
diff --git a/data/scripts/maps/EverGrandeCity_PhoebesRoom.s b/data/scripts/maps/EverGrandeCity_PhoebesRoom.inc
index 7e8ee131a..7e8ee131a 100644
--- a/data/scripts/maps/EverGrandeCity_PhoebesRoom.s
+++ b/data/scripts/maps/EverGrandeCity_PhoebesRoom.inc
diff --git a/data/scripts/maps/EverGrandeCity_PokemonCenter_1F.s b/data/scripts/maps/EverGrandeCity_PokemonCenter_1F.inc
index 7c0b8b0a4..7c0b8b0a4 100644
--- a/data/scripts/maps/EverGrandeCity_PokemonCenter_1F.s
+++ b/data/scripts/maps/EverGrandeCity_PokemonCenter_1F.inc
diff --git a/data/scripts/maps/EverGrandeCity_PokemonCenter_2F.s b/data/scripts/maps/EverGrandeCity_PokemonCenter_2F.inc
index 9941e17e4..9941e17e4 100644
--- a/data/scripts/maps/EverGrandeCity_PokemonCenter_2F.s
+++ b/data/scripts/maps/EverGrandeCity_PokemonCenter_2F.inc
diff --git a/data/scripts/maps/EverGrandeCity_PokemonLeague.s b/data/scripts/maps/EverGrandeCity_PokemonLeague.inc
index bfb3cdc1b..bfb3cdc1b 100644
--- a/data/scripts/maps/EverGrandeCity_PokemonLeague.s
+++ b/data/scripts/maps/EverGrandeCity_PokemonLeague.inc
diff --git a/data/scripts/maps/EverGrandeCity_SidneysRoom.s b/data/scripts/maps/EverGrandeCity_SidneysRoom.inc
index 84a6c3fdc..84a6c3fdc 100644
--- a/data/scripts/maps/EverGrandeCity_SidneysRoom.s
+++ b/data/scripts/maps/EverGrandeCity_SidneysRoom.inc
diff --git a/data/scripts/maps/FallarborTown.s b/data/scripts/maps/FallarborTown.inc
index a48be5b24..a48be5b24 100644
--- a/data/scripts/maps/FallarborTown.s
+++ b/data/scripts/maps/FallarborTown.inc
diff --git a/data/scripts/maps/FallarborTown_ContestHall.s b/data/scripts/maps/FallarborTown_ContestHall.inc
index e3fcfd9bc..e3fcfd9bc 100644
--- a/data/scripts/maps/FallarborTown_ContestHall.s
+++ b/data/scripts/maps/FallarborTown_ContestHall.inc
diff --git a/data/scripts/maps/FallarborTown_ContestLobby.s b/data/scripts/maps/FallarborTown_ContestLobby.inc
index 9bbd48722..9bbd48722 100644
--- a/data/scripts/maps/FallarborTown_ContestLobby.s
+++ b/data/scripts/maps/FallarborTown_ContestLobby.inc
diff --git a/data/scripts/maps/FallarborTown_House1.s b/data/scripts/maps/FallarborTown_House1.inc
index 8a44cdcfb..8a44cdcfb 100644
--- a/data/scripts/maps/FallarborTown_House1.s
+++ b/data/scripts/maps/FallarborTown_House1.inc
diff --git a/data/scripts/maps/FallarborTown_House2.s b/data/scripts/maps/FallarborTown_House2.inc
index 179f281af..179f281af 100644
--- a/data/scripts/maps/FallarborTown_House2.s
+++ b/data/scripts/maps/FallarborTown_House2.inc
diff --git a/data/scripts/maps/FallarborTown_Mart.s b/data/scripts/maps/FallarborTown_Mart.inc
index 4b66546e8..4b66546e8 100644
--- a/data/scripts/maps/FallarborTown_Mart.s
+++ b/data/scripts/maps/FallarborTown_Mart.inc
diff --git a/data/scripts/maps/FallarborTown_PokemonCenter_1F.s b/data/scripts/maps/FallarborTown_PokemonCenter_1F.inc
index 636cac8f1..636cac8f1 100644
--- a/data/scripts/maps/FallarborTown_PokemonCenter_1F.s
+++ b/data/scripts/maps/FallarborTown_PokemonCenter_1F.inc
diff --git a/data/scripts/maps/FallarborTown_PokemonCenter_2F.s b/data/scripts/maps/FallarborTown_PokemonCenter_2F.inc
index 148b22531..148b22531 100644
--- a/data/scripts/maps/FallarborTown_PokemonCenter_2F.s
+++ b/data/scripts/maps/FallarborTown_PokemonCenter_2F.inc
diff --git a/data/scripts/maps/FieryPath.s b/data/scripts/maps/FieryPath.inc
index bd984ad20..bd984ad20 100644
--- a/data/scripts/maps/FieryPath.s
+++ b/data/scripts/maps/FieryPath.inc
diff --git a/data/scripts/maps/FortreeCity.s b/data/scripts/maps/FortreeCity.inc
index 7f9d5ae12..7f9d5ae12 100644
--- a/data/scripts/maps/FortreeCity.s
+++ b/data/scripts/maps/FortreeCity.inc
diff --git a/data/scripts/maps/FortreeCity_DecorationShop.s b/data/scripts/maps/FortreeCity_DecorationShop.inc
index c9d9fdd4e..c9d9fdd4e 100644
--- a/data/scripts/maps/FortreeCity_DecorationShop.s
+++ b/data/scripts/maps/FortreeCity_DecorationShop.inc
diff --git a/data/scripts/maps/FortreeCity_Gym.s b/data/scripts/maps/FortreeCity_Gym.inc
index 1bf6b0825..1bf6b0825 100644
--- a/data/scripts/maps/FortreeCity_Gym.s
+++ b/data/scripts/maps/FortreeCity_Gym.inc
diff --git a/data/scripts/maps/FortreeCity_House1.s b/data/scripts/maps/FortreeCity_House1.inc
index 0ae6e3fbd..0ae6e3fbd 100644
--- a/data/scripts/maps/FortreeCity_House1.s
+++ b/data/scripts/maps/FortreeCity_House1.inc
diff --git a/data/scripts/maps/FortreeCity_House2.s b/data/scripts/maps/FortreeCity_House2.inc
index ea4aad3d8..ea4aad3d8 100644
--- a/data/scripts/maps/FortreeCity_House2.s
+++ b/data/scripts/maps/FortreeCity_House2.inc
diff --git a/data/scripts/maps/FortreeCity_House3.s b/data/scripts/maps/FortreeCity_House3.inc
index f5d11ffa7..f5d11ffa7 100644
--- a/data/scripts/maps/FortreeCity_House3.s
+++ b/data/scripts/maps/FortreeCity_House3.inc
diff --git a/data/scripts/maps/FortreeCity_House4.s b/data/scripts/maps/FortreeCity_House4.inc
index 33d0ed1ae..33d0ed1ae 100644
--- a/data/scripts/maps/FortreeCity_House4.s
+++ b/data/scripts/maps/FortreeCity_House4.inc
diff --git a/data/scripts/maps/FortreeCity_House5.s b/data/scripts/maps/FortreeCity_House5.inc
index 1144a8e81..1144a8e81 100644
--- a/data/scripts/maps/FortreeCity_House5.s
+++ b/data/scripts/maps/FortreeCity_House5.inc
diff --git a/data/scripts/maps/FortreeCity_Mart.s b/data/scripts/maps/FortreeCity_Mart.inc
index 9e5f34ff9..9e5f34ff9 100644
--- a/data/scripts/maps/FortreeCity_Mart.s
+++ b/data/scripts/maps/FortreeCity_Mart.inc
diff --git a/data/scripts/maps/FortreeCity_PokemonCenter_1F.s b/data/scripts/maps/FortreeCity_PokemonCenter_1F.inc
index 148324abf..148324abf 100644
--- a/data/scripts/maps/FortreeCity_PokemonCenter_1F.s
+++ b/data/scripts/maps/FortreeCity_PokemonCenter_1F.inc
diff --git a/data/scripts/maps/FortreeCity_PokemonCenter_2F.s b/data/scripts/maps/FortreeCity_PokemonCenter_2F.inc
index 3019dbbc0..3019dbbc0 100644
--- a/data/scripts/maps/FortreeCity_PokemonCenter_2F.s
+++ b/data/scripts/maps/FortreeCity_PokemonCenter_2F.inc
diff --git a/data/scripts/maps/GraniteCave_1F.s b/data/scripts/maps/GraniteCave_1F.inc
index 59aaa2fc3..59aaa2fc3 100644
--- a/data/scripts/maps/GraniteCave_1F.s
+++ b/data/scripts/maps/GraniteCave_1F.inc
diff --git a/data/scripts/maps/GraniteCave_B1F.s b/data/scripts/maps/GraniteCave_B1F.inc
index 240de1d98..240de1d98 100644
--- a/data/scripts/maps/GraniteCave_B1F.s
+++ b/data/scripts/maps/GraniteCave_B1F.inc
diff --git a/data/scripts/maps/GraniteCave_B2F.s b/data/scripts/maps/GraniteCave_B2F.inc
index 54e1150f1..54e1150f1 100644
--- a/data/scripts/maps/GraniteCave_B2F.s
+++ b/data/scripts/maps/GraniteCave_B2F.inc
diff --git a/data/scripts/maps/GraniteCave_StevensRoom.s b/data/scripts/maps/GraniteCave_StevensRoom.inc
index 895241406..895241406 100644
--- a/data/scripts/maps/GraniteCave_StevensRoom.s
+++ b/data/scripts/maps/GraniteCave_StevensRoom.inc
diff --git a/data/scripts/maps/InsideOfTruck.s b/data/scripts/maps/InsideOfTruck.inc
index 0c26f0f88..0c26f0f88 100644
--- a/data/scripts/maps/InsideOfTruck.s
+++ b/data/scripts/maps/InsideOfTruck.inc
diff --git a/data/scripts/maps/IslandCave.s b/data/scripts/maps/IslandCave.inc
index b52b13b5a..b52b13b5a 100644
--- a/data/scripts/maps/IslandCave.s
+++ b/data/scripts/maps/IslandCave.inc
diff --git a/data/scripts/maps/JaggedPass.s b/data/scripts/maps/JaggedPass.inc
index 3ae0882c5..3ae0882c5 100644
--- a/data/scripts/maps/JaggedPass.s
+++ b/data/scripts/maps/JaggedPass.inc
diff --git a/data/scripts/maps/LavaridgeTown.s b/data/scripts/maps/LavaridgeTown.inc
index a71bd4854..a71bd4854 100644
--- a/data/scripts/maps/LavaridgeTown.s
+++ b/data/scripts/maps/LavaridgeTown.inc
diff --git a/data/scripts/maps/LavaridgeTown_Gym_1F.s b/data/scripts/maps/LavaridgeTown_Gym_1F.inc
index 57506bdb6..57506bdb6 100644
--- a/data/scripts/maps/LavaridgeTown_Gym_1F.s
+++ b/data/scripts/maps/LavaridgeTown_Gym_1F.inc
diff --git a/data/scripts/maps/LavaridgeTown_Gym_B1F.s b/data/scripts/maps/LavaridgeTown_Gym_B1F.inc
index 58178722c..58178722c 100644
--- a/data/scripts/maps/LavaridgeTown_Gym_B1F.s
+++ b/data/scripts/maps/LavaridgeTown_Gym_B1F.inc
diff --git a/data/scripts/maps/LavaridgeTown_HerbShop.s b/data/scripts/maps/LavaridgeTown_HerbShop.inc
index 6ff103ce3..6ff103ce3 100644
--- a/data/scripts/maps/LavaridgeTown_HerbShop.s
+++ b/data/scripts/maps/LavaridgeTown_HerbShop.inc
diff --git a/data/scripts/maps/LavaridgeTown_House.s b/data/scripts/maps/LavaridgeTown_House.inc
index 944427bb6..944427bb6 100644
--- a/data/scripts/maps/LavaridgeTown_House.s
+++ b/data/scripts/maps/LavaridgeTown_House.inc
diff --git a/data/scripts/maps/LavaridgeTown_Mart.s b/data/scripts/maps/LavaridgeTown_Mart.inc
index 4f28e16b0..4f28e16b0 100644
--- a/data/scripts/maps/LavaridgeTown_Mart.s
+++ b/data/scripts/maps/LavaridgeTown_Mart.inc
diff --git a/data/scripts/maps/LavaridgeTown_PokemonCenter_1F.s b/data/scripts/maps/LavaridgeTown_PokemonCenter_1F.inc
index c0762bcc3..c0762bcc3 100644
--- a/data/scripts/maps/LavaridgeTown_PokemonCenter_1F.s
+++ b/data/scripts/maps/LavaridgeTown_PokemonCenter_1F.inc
diff --git a/data/scripts/maps/LavaridgeTown_PokemonCenter_2F.s b/data/scripts/maps/LavaridgeTown_PokemonCenter_2F.inc
index daaeb0b93..daaeb0b93 100644
--- a/data/scripts/maps/LavaridgeTown_PokemonCenter_2F.s
+++ b/data/scripts/maps/LavaridgeTown_PokemonCenter_2F.inc
diff --git a/data/scripts/maps/LilycoveCity.s b/data/scripts/maps/LilycoveCity.inc
index ae36e33b5..ae36e33b5 100644
--- a/data/scripts/maps/LilycoveCity.s
+++ b/data/scripts/maps/LilycoveCity.inc
diff --git a/data/scripts/maps/LilycoveCity_ContestHall.s b/data/scripts/maps/LilycoveCity_ContestHall.inc
index 3601cb455..3601cb455 100644
--- a/data/scripts/maps/LilycoveCity_ContestHall.s
+++ b/data/scripts/maps/LilycoveCity_ContestHall.inc
diff --git a/data/scripts/maps/LilycoveCity_ContestLobby.s b/data/scripts/maps/LilycoveCity_ContestLobby.inc
index ed12473b9..ed12473b9 100644
--- a/data/scripts/maps/LilycoveCity_ContestLobby.s
+++ b/data/scripts/maps/LilycoveCity_ContestLobby.inc
diff --git a/data/scripts/maps/LilycoveCity_CoveLilyMotel_1F.s b/data/scripts/maps/LilycoveCity_CoveLilyMotel_1F.inc
index 95945a595..95945a595 100644
--- a/data/scripts/maps/LilycoveCity_CoveLilyMotel_1F.s
+++ b/data/scripts/maps/LilycoveCity_CoveLilyMotel_1F.inc
diff --git a/data/scripts/maps/LilycoveCity_CoveLilyMotel_2F.s b/data/scripts/maps/LilycoveCity_CoveLilyMotel_2F.inc
index d2a86e0a5..d2a86e0a5 100644
--- a/data/scripts/maps/LilycoveCity_CoveLilyMotel_2F.s
+++ b/data/scripts/maps/LilycoveCity_CoveLilyMotel_2F.inc
diff --git a/data/scripts/maps/LilycoveCity_DepartmentStoreElevator.s b/data/scripts/maps/LilycoveCity_DepartmentStoreElevator.inc
index c82cc6428..c82cc6428 100644
--- a/data/scripts/maps/LilycoveCity_DepartmentStoreElevator.s
+++ b/data/scripts/maps/LilycoveCity_DepartmentStoreElevator.inc
diff --git a/data/scripts/maps/LilycoveCity_DepartmentStoreRooftop.s b/data/scripts/maps/LilycoveCity_DepartmentStoreRooftop.inc
index f84c84201..f84c84201 100644
--- a/data/scripts/maps/LilycoveCity_DepartmentStoreRooftop.s
+++ b/data/scripts/maps/LilycoveCity_DepartmentStoreRooftop.inc
diff --git a/data/scripts/maps/LilycoveCity_DepartmentStore_1F.s b/data/scripts/maps/LilycoveCity_DepartmentStore_1F.inc
index 325c56330..325c56330 100644
--- a/data/scripts/maps/LilycoveCity_DepartmentStore_1F.s
+++ b/data/scripts/maps/LilycoveCity_DepartmentStore_1F.inc
diff --git a/data/scripts/maps/LilycoveCity_DepartmentStore_2F.s b/data/scripts/maps/LilycoveCity_DepartmentStore_2F.inc
index e54883714..e54883714 100644
--- a/data/scripts/maps/LilycoveCity_DepartmentStore_2F.s
+++ b/data/scripts/maps/LilycoveCity_DepartmentStore_2F.inc
diff --git a/data/scripts/maps/LilycoveCity_DepartmentStore_3F.s b/data/scripts/maps/LilycoveCity_DepartmentStore_3F.inc
index e669cef7f..e669cef7f 100644
--- a/data/scripts/maps/LilycoveCity_DepartmentStore_3F.s
+++ b/data/scripts/maps/LilycoveCity_DepartmentStore_3F.inc
diff --git a/data/scripts/maps/LilycoveCity_DepartmentStore_4F.s b/data/scripts/maps/LilycoveCity_DepartmentStore_4F.inc
index 994b3b63f..994b3b63f 100644
--- a/data/scripts/maps/LilycoveCity_DepartmentStore_4F.s
+++ b/data/scripts/maps/LilycoveCity_DepartmentStore_4F.inc
diff --git a/data/scripts/maps/LilycoveCity_DepartmentStore_5F.s b/data/scripts/maps/LilycoveCity_DepartmentStore_5F.inc
index 0bef8866a..0bef8866a 100644
--- a/data/scripts/maps/LilycoveCity_DepartmentStore_5F.s
+++ b/data/scripts/maps/LilycoveCity_DepartmentStore_5F.inc
diff --git a/data/scripts/maps/LilycoveCity_EmptyMap.s b/data/scripts/maps/LilycoveCity_EmptyMap.inc
index 16d025174..16d025174 100644
--- a/data/scripts/maps/LilycoveCity_EmptyMap.s
+++ b/data/scripts/maps/LilycoveCity_EmptyMap.inc
diff --git a/data/scripts/maps/LilycoveCity_Harbor.s b/data/scripts/maps/LilycoveCity_Harbor.inc
index 2f4e4352e..2f4e4352e 100644
--- a/data/scripts/maps/LilycoveCity_Harbor.s
+++ b/data/scripts/maps/LilycoveCity_Harbor.inc
diff --git a/data/scripts/maps/LilycoveCity_House1.s b/data/scripts/maps/LilycoveCity_House1.inc
index 3dae362c1..3dae362c1 100644
--- a/data/scripts/maps/LilycoveCity_House1.s
+++ b/data/scripts/maps/LilycoveCity_House1.inc
diff --git a/data/scripts/maps/LilycoveCity_House2.s b/data/scripts/maps/LilycoveCity_House2.inc
index 75780667d..75780667d 100644
--- a/data/scripts/maps/LilycoveCity_House2.s
+++ b/data/scripts/maps/LilycoveCity_House2.inc
diff --git a/data/scripts/maps/LilycoveCity_House3.s b/data/scripts/maps/LilycoveCity_House3.inc
index 51e4988b3..51e4988b3 100644
--- a/data/scripts/maps/LilycoveCity_House3.s
+++ b/data/scripts/maps/LilycoveCity_House3.inc
diff --git a/data/scripts/maps/LilycoveCity_House4.s b/data/scripts/maps/LilycoveCity_House4.inc
index 13bc95dfa..13bc95dfa 100644
--- a/data/scripts/maps/LilycoveCity_House4.s
+++ b/data/scripts/maps/LilycoveCity_House4.inc
diff --git a/data/scripts/maps/LilycoveCity_LilycoveMuseum_1F.s b/data/scripts/maps/LilycoveCity_LilycoveMuseum_1F.inc
index a481f9c32..a481f9c32 100644
--- a/data/scripts/maps/LilycoveCity_LilycoveMuseum_1F.s
+++ b/data/scripts/maps/LilycoveCity_LilycoveMuseum_1F.inc
diff --git a/data/scripts/maps/LilycoveCity_LilycoveMuseum_2F.s b/data/scripts/maps/LilycoveCity_LilycoveMuseum_2F.inc
index 2e6d6698f..2e6d6698f 100644
--- a/data/scripts/maps/LilycoveCity_LilycoveMuseum_2F.s
+++ b/data/scripts/maps/LilycoveCity_LilycoveMuseum_2F.inc
diff --git a/data/scripts/maps/LilycoveCity_MoveDeletersHouse.s b/data/scripts/maps/LilycoveCity_MoveDeletersHouse.inc
index c9b026060..c9b026060 100644
--- a/data/scripts/maps/LilycoveCity_MoveDeletersHouse.s
+++ b/data/scripts/maps/LilycoveCity_MoveDeletersHouse.inc
diff --git a/data/scripts/maps/LilycoveCity_PokemonCenter_1F.s b/data/scripts/maps/LilycoveCity_PokemonCenter_1F.inc
index 5809e28c8..5809e28c8 100644
--- a/data/scripts/maps/LilycoveCity_PokemonCenter_1F.s
+++ b/data/scripts/maps/LilycoveCity_PokemonCenter_1F.inc
diff --git a/data/scripts/maps/LilycoveCity_PokemonCenter_2F.s b/data/scripts/maps/LilycoveCity_PokemonCenter_2F.inc
index e4554e49c..e4554e49c 100644
--- a/data/scripts/maps/LilycoveCity_PokemonCenter_2F.s
+++ b/data/scripts/maps/LilycoveCity_PokemonCenter_2F.inc
diff --git a/data/scripts/maps/LilycoveCity_PokemonTrainerFanClub.s b/data/scripts/maps/LilycoveCity_PokemonTrainerFanClub.inc
index 9ac66f98e..9ac66f98e 100644
--- a/data/scripts/maps/LilycoveCity_PokemonTrainerFanClub.s
+++ b/data/scripts/maps/LilycoveCity_PokemonTrainerFanClub.inc
diff --git a/data/scripts/maps/LilycoveCity_UnusedMart.s b/data/scripts/maps/LilycoveCity_UnusedMart.inc
index 2e7ff450f..2e7ff450f 100644
--- a/data/scripts/maps/LilycoveCity_UnusedMart.s
+++ b/data/scripts/maps/LilycoveCity_UnusedMart.inc
diff --git a/data/scripts/maps/LinkContestRoom1.s b/data/scripts/maps/LinkContestRoom1.inc
index 2709f558c..2709f558c 100644
--- a/data/scripts/maps/LinkContestRoom1.s
+++ b/data/scripts/maps/LinkContestRoom1.inc
diff --git a/data/scripts/maps/LinkContestRoom2.s b/data/scripts/maps/LinkContestRoom2.inc
index f61e3fae6..f61e3fae6 100644
--- a/data/scripts/maps/LinkContestRoom2.s
+++ b/data/scripts/maps/LinkContestRoom2.inc
diff --git a/data/scripts/maps/LinkContestRoom3.s b/data/scripts/maps/LinkContestRoom3.inc
index 5a34f848a..5a34f848a 100644
--- a/data/scripts/maps/LinkContestRoom3.s
+++ b/data/scripts/maps/LinkContestRoom3.inc
diff --git a/data/scripts/maps/LinkContestRoom4.s b/data/scripts/maps/LinkContestRoom4.inc
index bf6539bdd..bf6539bdd 100644
--- a/data/scripts/maps/LinkContestRoom4.s
+++ b/data/scripts/maps/LinkContestRoom4.inc
diff --git a/data/scripts/maps/LinkContestRoom5.s b/data/scripts/maps/LinkContestRoom5.inc
index d3cd5d64b..d3cd5d64b 100644
--- a/data/scripts/maps/LinkContestRoom5.s
+++ b/data/scripts/maps/LinkContestRoom5.inc
diff --git a/data/scripts/maps/LinkContestRoom6.s b/data/scripts/maps/LinkContestRoom6.inc
index 26296ece6..26296ece6 100644
--- a/data/scripts/maps/LinkContestRoom6.s
+++ b/data/scripts/maps/LinkContestRoom6.inc
diff --git a/data/scripts/maps/LittlerootTown.s b/data/scripts/maps/LittlerootTown.inc
index 81692acc5..81692acc5 100644
--- a/data/scripts/maps/LittlerootTown.s
+++ b/data/scripts/maps/LittlerootTown.inc
diff --git a/data/scripts/maps/LittlerootTown_BrendansHouse_1F.s b/data/scripts/maps/LittlerootTown_BrendansHouse_1F.inc
index 9816734d0..9816734d0 100644
--- a/data/scripts/maps/LittlerootTown_BrendansHouse_1F.s
+++ b/data/scripts/maps/LittlerootTown_BrendansHouse_1F.inc
diff --git a/data/scripts/maps/LittlerootTown_BrendansHouse_2F.s b/data/scripts/maps/LittlerootTown_BrendansHouse_2F.inc
index 4f121118a..4f121118a 100644
--- a/data/scripts/maps/LittlerootTown_BrendansHouse_2F.s
+++ b/data/scripts/maps/LittlerootTown_BrendansHouse_2F.inc
diff --git a/data/scripts/maps/LittlerootTown_MaysHouse_1F.s b/data/scripts/maps/LittlerootTown_MaysHouse_1F.inc
index 2b9ad42ef..2b9ad42ef 100644
--- a/data/scripts/maps/LittlerootTown_MaysHouse_1F.s
+++ b/data/scripts/maps/LittlerootTown_MaysHouse_1F.inc
diff --git a/data/scripts/maps/LittlerootTown_MaysHouse_2F.s b/data/scripts/maps/LittlerootTown_MaysHouse_2F.inc
index 7871940ca..7871940ca 100644
--- a/data/scripts/maps/LittlerootTown_MaysHouse_2F.s
+++ b/data/scripts/maps/LittlerootTown_MaysHouse_2F.inc
diff --git a/data/scripts/maps/LittlerootTown_ProfessorBirchsLab.s b/data/scripts/maps/LittlerootTown_ProfessorBirchsLab.inc
index 94aeadfa6..94aeadfa6 100644
--- a/data/scripts/maps/LittlerootTown_ProfessorBirchsLab.s
+++ b/data/scripts/maps/LittlerootTown_ProfessorBirchsLab.inc
diff --git a/data/scripts/maps/MagmaHideout_1F.s b/data/scripts/maps/MagmaHideout_1F.inc
index f5b535f71..f5b535f71 100644
--- a/data/scripts/maps/MagmaHideout_1F.s
+++ b/data/scripts/maps/MagmaHideout_1F.inc
diff --git a/data/scripts/maps/MagmaHideout_B1F.s b/data/scripts/maps/MagmaHideout_B1F.inc
index 0304181fb..0304181fb 100644
--- a/data/scripts/maps/MagmaHideout_B1F.s
+++ b/data/scripts/maps/MagmaHideout_B1F.inc
diff --git a/data/scripts/maps/MagmaHideout_B2F.s b/data/scripts/maps/MagmaHideout_B2F.inc
index 222297ef7..222297ef7 100644
--- a/data/scripts/maps/MagmaHideout_B2F.s
+++ b/data/scripts/maps/MagmaHideout_B2F.inc
diff --git a/data/scripts/maps/MauvilleCity.s b/data/scripts/maps/MauvilleCity.inc
index 1b2827f2a..1b2827f2a 100644
--- a/data/scripts/maps/MauvilleCity.s
+++ b/data/scripts/maps/MauvilleCity.inc
diff --git a/data/scripts/maps/MauvilleCity_BikeShop.s b/data/scripts/maps/MauvilleCity_BikeShop.inc
index cb3b8505b..cb3b8505b 100644
--- a/data/scripts/maps/MauvilleCity_BikeShop.s
+++ b/data/scripts/maps/MauvilleCity_BikeShop.inc
diff --git a/data/scripts/maps/MauvilleCity_GameCorner.s b/data/scripts/maps/MauvilleCity_GameCorner.inc
index a0aab4238..a0aab4238 100644
--- a/data/scripts/maps/MauvilleCity_GameCorner.s
+++ b/data/scripts/maps/MauvilleCity_GameCorner.inc
diff --git a/data/scripts/maps/MauvilleCity_Gym.s b/data/scripts/maps/MauvilleCity_Gym.inc
index 9abac00d7..9abac00d7 100644
--- a/data/scripts/maps/MauvilleCity_Gym.s
+++ b/data/scripts/maps/MauvilleCity_Gym.inc
diff --git a/data/scripts/maps/MauvilleCity_House1.s b/data/scripts/maps/MauvilleCity_House1.inc
index 48ee31be5..48ee31be5 100644
--- a/data/scripts/maps/MauvilleCity_House1.s
+++ b/data/scripts/maps/MauvilleCity_House1.inc
diff --git a/data/scripts/maps/MauvilleCity_House2.s b/data/scripts/maps/MauvilleCity_House2.inc
index 8a73af034..8a73af034 100644
--- a/data/scripts/maps/MauvilleCity_House2.s
+++ b/data/scripts/maps/MauvilleCity_House2.inc
diff --git a/data/scripts/maps/MauvilleCity_Mart.s b/data/scripts/maps/MauvilleCity_Mart.inc
index fac5906ad..fac5906ad 100644
--- a/data/scripts/maps/MauvilleCity_Mart.s
+++ b/data/scripts/maps/MauvilleCity_Mart.inc
diff --git a/data/scripts/maps/MauvilleCity_PokemonCenter_1F.s b/data/scripts/maps/MauvilleCity_PokemonCenter_1F.inc
index b943b9c8f..b943b9c8f 100644
--- a/data/scripts/maps/MauvilleCity_PokemonCenter_1F.s
+++ b/data/scripts/maps/MauvilleCity_PokemonCenter_1F.inc
diff --git a/data/scripts/maps/MauvilleCity_PokemonCenter_2F.s b/data/scripts/maps/MauvilleCity_PokemonCenter_2F.inc
index e85e80308..e85e80308 100644
--- a/data/scripts/maps/MauvilleCity_PokemonCenter_2F.s
+++ b/data/scripts/maps/MauvilleCity_PokemonCenter_2F.inc
diff --git a/data/scripts/maps/MeteorFalls_1F_1R.s b/data/scripts/maps/MeteorFalls_1F_1R.inc
index 3e7155955..3e7155955 100644
--- a/data/scripts/maps/MeteorFalls_1F_1R.s
+++ b/data/scripts/maps/MeteorFalls_1F_1R.inc
diff --git a/data/scripts/maps/MeteorFalls_1F_2R.s b/data/scripts/maps/MeteorFalls_1F_2R.inc
index 6c239043d..6c239043d 100644
--- a/data/scripts/maps/MeteorFalls_1F_2R.s
+++ b/data/scripts/maps/MeteorFalls_1F_2R.inc
diff --git a/data/scripts/maps/MeteorFalls_B1F_1R.s b/data/scripts/maps/MeteorFalls_B1F_1R.inc
index 57d458b23..57d458b23 100644
--- a/data/scripts/maps/MeteorFalls_B1F_1R.s
+++ b/data/scripts/maps/MeteorFalls_B1F_1R.inc
diff --git a/data/scripts/maps/MeteorFalls_B1F_2R.s b/data/scripts/maps/MeteorFalls_B1F_2R.inc
index 514e60966..514e60966 100644
--- a/data/scripts/maps/MeteorFalls_B1F_2R.s
+++ b/data/scripts/maps/MeteorFalls_B1F_2R.inc
diff --git a/data/scripts/maps/MossdeepCity.s b/data/scripts/maps/MossdeepCity.inc
index ddb317364..ddb317364 100644
--- a/data/scripts/maps/MossdeepCity.s
+++ b/data/scripts/maps/MossdeepCity.inc
diff --git a/data/scripts/maps/MossdeepCity_GameCorner_1F.s b/data/scripts/maps/MossdeepCity_GameCorner_1F.inc
index c56adb1f3..c56adb1f3 100644
--- a/data/scripts/maps/MossdeepCity_GameCorner_1F.s
+++ b/data/scripts/maps/MossdeepCity_GameCorner_1F.inc
diff --git a/data/scripts/maps/MossdeepCity_GameCorner_B1F.s b/data/scripts/maps/MossdeepCity_GameCorner_B1F.inc
index a733093f9..a733093f9 100644
--- a/data/scripts/maps/MossdeepCity_GameCorner_B1F.s
+++ b/data/scripts/maps/MossdeepCity_GameCorner_B1F.inc
diff --git a/data/scripts/maps/MossdeepCity_Gym.s b/data/scripts/maps/MossdeepCity_Gym.inc
index 192f9e396..192f9e396 100644
--- a/data/scripts/maps/MossdeepCity_Gym.s
+++ b/data/scripts/maps/MossdeepCity_Gym.inc
diff --git a/data/scripts/maps/MossdeepCity_House1.s b/data/scripts/maps/MossdeepCity_House1.inc
index d83e49643..d83e49643 100644
--- a/data/scripts/maps/MossdeepCity_House1.s
+++ b/data/scripts/maps/MossdeepCity_House1.inc
diff --git a/data/scripts/maps/MossdeepCity_House2.s b/data/scripts/maps/MossdeepCity_House2.inc
index f3d07b64e..f3d07b64e 100644
--- a/data/scripts/maps/MossdeepCity_House2.s
+++ b/data/scripts/maps/MossdeepCity_House2.inc
diff --git a/data/scripts/maps/MossdeepCity_House3.s b/data/scripts/maps/MossdeepCity_House3.inc
index fd97ee598..fd97ee598 100644
--- a/data/scripts/maps/MossdeepCity_House3.s
+++ b/data/scripts/maps/MossdeepCity_House3.inc
diff --git a/data/scripts/maps/MossdeepCity_House4.s b/data/scripts/maps/MossdeepCity_House4.inc
index bc8f44400..bc8f44400 100644
--- a/data/scripts/maps/MossdeepCity_House4.s
+++ b/data/scripts/maps/MossdeepCity_House4.inc
diff --git a/data/scripts/maps/MossdeepCity_Mart.s b/data/scripts/maps/MossdeepCity_Mart.inc
index d1e861b99..d1e861b99 100644
--- a/data/scripts/maps/MossdeepCity_Mart.s
+++ b/data/scripts/maps/MossdeepCity_Mart.inc
diff --git a/data/scripts/maps/MossdeepCity_PokemonCenter_1F.s b/data/scripts/maps/MossdeepCity_PokemonCenter_1F.inc
index 988608ffd..988608ffd 100644
--- a/data/scripts/maps/MossdeepCity_PokemonCenter_1F.s
+++ b/data/scripts/maps/MossdeepCity_PokemonCenter_1F.inc
diff --git a/data/scripts/maps/MossdeepCity_PokemonCenter_2F.s b/data/scripts/maps/MossdeepCity_PokemonCenter_2F.inc
index a88147c08..a88147c08 100644
--- a/data/scripts/maps/MossdeepCity_PokemonCenter_2F.s
+++ b/data/scripts/maps/MossdeepCity_PokemonCenter_2F.inc
diff --git a/data/scripts/maps/MossdeepCity_SpaceCenter_1F.s b/data/scripts/maps/MossdeepCity_SpaceCenter_1F.inc
index 3b3a7f083..3b3a7f083 100644
--- a/data/scripts/maps/MossdeepCity_SpaceCenter_1F.s
+++ b/data/scripts/maps/MossdeepCity_SpaceCenter_1F.inc
diff --git a/data/scripts/maps/MossdeepCity_SpaceCenter_2F.s b/data/scripts/maps/MossdeepCity_SpaceCenter_2F.inc
index 97467f4e5..97467f4e5 100644
--- a/data/scripts/maps/MossdeepCity_SpaceCenter_2F.s
+++ b/data/scripts/maps/MossdeepCity_SpaceCenter_2F.inc
diff --git a/data/scripts/maps/MossdeepCity_StevensHouse.s b/data/scripts/maps/MossdeepCity_StevensHouse.inc
index d4477bd39..d4477bd39 100644
--- a/data/scripts/maps/MossdeepCity_StevensHouse.s
+++ b/data/scripts/maps/MossdeepCity_StevensHouse.inc
diff --git a/data/scripts/maps/MtChimney.s b/data/scripts/maps/MtChimney.inc
index b7a43328b..b7a43328b 100644
--- a/data/scripts/maps/MtChimney.s
+++ b/data/scripts/maps/MtChimney.inc
diff --git a/data/scripts/maps/MtChimney_CableCarStation.s b/data/scripts/maps/MtChimney_CableCarStation.inc
index c00914f2e..c00914f2e 100644
--- a/data/scripts/maps/MtChimney_CableCarStation.s
+++ b/data/scripts/maps/MtChimney_CableCarStation.inc
diff --git a/data/scripts/maps/MtPyre_1F.s b/data/scripts/maps/MtPyre_1F.inc
index 805c4a8d3..805c4a8d3 100644
--- a/data/scripts/maps/MtPyre_1F.s
+++ b/data/scripts/maps/MtPyre_1F.inc
diff --git a/data/scripts/maps/MtPyre_2F.s b/data/scripts/maps/MtPyre_2F.inc
index c44251af7..c44251af7 100644
--- a/data/scripts/maps/MtPyre_2F.s
+++ b/data/scripts/maps/MtPyre_2F.inc
diff --git a/data/scripts/maps/MtPyre_3F.s b/data/scripts/maps/MtPyre_3F.inc
index ea8bda7b5..ea8bda7b5 100644
--- a/data/scripts/maps/MtPyre_3F.s
+++ b/data/scripts/maps/MtPyre_3F.inc
diff --git a/data/scripts/maps/MtPyre_4F.s b/data/scripts/maps/MtPyre_4F.inc
index e1ebac7c1..e1ebac7c1 100644
--- a/data/scripts/maps/MtPyre_4F.s
+++ b/data/scripts/maps/MtPyre_4F.inc
diff --git a/data/scripts/maps/MtPyre_5F.s b/data/scripts/maps/MtPyre_5F.inc
index 9adb249f0..9adb249f0 100644
--- a/data/scripts/maps/MtPyre_5F.s
+++ b/data/scripts/maps/MtPyre_5F.inc
diff --git a/data/scripts/maps/MtPyre_6F.s b/data/scripts/maps/MtPyre_6F.inc
index 3729079bb..3729079bb 100644
--- a/data/scripts/maps/MtPyre_6F.s
+++ b/data/scripts/maps/MtPyre_6F.inc
diff --git a/data/scripts/maps/MtPyre_Exterior.s b/data/scripts/maps/MtPyre_Exterior.inc
index efffc7c3b..efffc7c3b 100644
--- a/data/scripts/maps/MtPyre_Exterior.s
+++ b/data/scripts/maps/MtPyre_Exterior.inc
diff --git a/data/scripts/maps/MtPyre_Summit.s b/data/scripts/maps/MtPyre_Summit.inc
index e352ac30e..e352ac30e 100644
--- a/data/scripts/maps/MtPyre_Summit.s
+++ b/data/scripts/maps/MtPyre_Summit.inc
diff --git a/data/scripts/maps/NewMauville_Entrance.s b/data/scripts/maps/NewMauville_Entrance.inc
index dc5885939..dc5885939 100644
--- a/data/scripts/maps/NewMauville_Entrance.s
+++ b/data/scripts/maps/NewMauville_Entrance.inc
diff --git a/data/scripts/maps/NewMauville_Inside.s b/data/scripts/maps/NewMauville_Inside.inc
index 29c42e460..29c42e460 100644
--- a/data/scripts/maps/NewMauville_Inside.s
+++ b/data/scripts/maps/NewMauville_Inside.inc
diff --git a/data/scripts/maps/OldaleTown.s b/data/scripts/maps/OldaleTown.inc
index 68ed80949..68ed80949 100644
--- a/data/scripts/maps/OldaleTown.s
+++ b/data/scripts/maps/OldaleTown.inc
diff --git a/data/scripts/maps/OldaleTown_House1.s b/data/scripts/maps/OldaleTown_House1.inc
index 1e519a737..1e519a737 100644
--- a/data/scripts/maps/OldaleTown_House1.s
+++ b/data/scripts/maps/OldaleTown_House1.inc
diff --git a/data/scripts/maps/OldaleTown_House2.s b/data/scripts/maps/OldaleTown_House2.inc
index 57a9ab8ac..57a9ab8ac 100644
--- a/data/scripts/maps/OldaleTown_House2.s
+++ b/data/scripts/maps/OldaleTown_House2.inc
diff --git a/data/scripts/maps/OldaleTown_Mart.s b/data/scripts/maps/OldaleTown_Mart.inc
index 3f4994890..3f4994890 100644
--- a/data/scripts/maps/OldaleTown_Mart.s
+++ b/data/scripts/maps/OldaleTown_Mart.inc
diff --git a/data/scripts/maps/OldaleTown_PokemonCenter_1F.s b/data/scripts/maps/OldaleTown_PokemonCenter_1F.inc
index 4ba96ddc8..4ba96ddc8 100644
--- a/data/scripts/maps/OldaleTown_PokemonCenter_1F.s
+++ b/data/scripts/maps/OldaleTown_PokemonCenter_1F.inc
diff --git a/data/scripts/maps/OldaleTown_PokemonCenter_2F.s b/data/scripts/maps/OldaleTown_PokemonCenter_2F.inc
index 622f50c29..622f50c29 100644
--- a/data/scripts/maps/OldaleTown_PokemonCenter_2F.s
+++ b/data/scripts/maps/OldaleTown_PokemonCenter_2F.inc
diff --git a/data/scripts/maps/PacifidlogTown.s b/data/scripts/maps/PacifidlogTown.inc
index c7cfb08df..c7cfb08df 100644
--- a/data/scripts/maps/PacifidlogTown.s
+++ b/data/scripts/maps/PacifidlogTown.inc
diff --git a/data/scripts/maps/PacifidlogTown_House1.s b/data/scripts/maps/PacifidlogTown_House1.inc
index 4b3586a16..4b3586a16 100644
--- a/data/scripts/maps/PacifidlogTown_House1.s
+++ b/data/scripts/maps/PacifidlogTown_House1.inc
diff --git a/data/scripts/maps/PacifidlogTown_House2.s b/data/scripts/maps/PacifidlogTown_House2.inc
index b95a41ceb..b95a41ceb 100644
--- a/data/scripts/maps/PacifidlogTown_House2.s
+++ b/data/scripts/maps/PacifidlogTown_House2.inc
diff --git a/data/scripts/maps/PacifidlogTown_House3.s b/data/scripts/maps/PacifidlogTown_House3.inc
index 7ee815f07..7ee815f07 100644
--- a/data/scripts/maps/PacifidlogTown_House3.s
+++ b/data/scripts/maps/PacifidlogTown_House3.inc
diff --git a/data/scripts/maps/PacifidlogTown_House4.s b/data/scripts/maps/PacifidlogTown_House4.inc
index e48644beb..e48644beb 100644
--- a/data/scripts/maps/PacifidlogTown_House4.s
+++ b/data/scripts/maps/PacifidlogTown_House4.inc
diff --git a/data/scripts/maps/PacifidlogTown_House5.s b/data/scripts/maps/PacifidlogTown_House5.inc
index f20de28df..f20de28df 100644
--- a/data/scripts/maps/PacifidlogTown_House5.s
+++ b/data/scripts/maps/PacifidlogTown_House5.inc
diff --git a/data/scripts/maps/PacifidlogTown_PokemonCenter_1F.s b/data/scripts/maps/PacifidlogTown_PokemonCenter_1F.inc
index 973f80a55..973f80a55 100644
--- a/data/scripts/maps/PacifidlogTown_PokemonCenter_1F.s
+++ b/data/scripts/maps/PacifidlogTown_PokemonCenter_1F.inc
diff --git a/data/scripts/maps/PacifidlogTown_PokemonCenter_2F.s b/data/scripts/maps/PacifidlogTown_PokemonCenter_2F.inc
index 2bff37736..2bff37736 100644
--- a/data/scripts/maps/PacifidlogTown_PokemonCenter_2F.s
+++ b/data/scripts/maps/PacifidlogTown_PokemonCenter_2F.inc
diff --git a/data/scripts/maps/PetalburgCity.s b/data/scripts/maps/PetalburgCity.inc
index 3667eb3cf..3667eb3cf 100644
--- a/data/scripts/maps/PetalburgCity.s
+++ b/data/scripts/maps/PetalburgCity.inc
diff --git a/data/scripts/maps/PetalburgCity_Gym.s b/data/scripts/maps/PetalburgCity_Gym.inc
index 9c6802e28..9c6802e28 100644
--- a/data/scripts/maps/PetalburgCity_Gym.s
+++ b/data/scripts/maps/PetalburgCity_Gym.inc
diff --git a/data/scripts/maps/PetalburgCity_House1.s b/data/scripts/maps/PetalburgCity_House1.inc
index 7a3b7c1b1..7a3b7c1b1 100644
--- a/data/scripts/maps/PetalburgCity_House1.s
+++ b/data/scripts/maps/PetalburgCity_House1.inc
diff --git a/data/scripts/maps/PetalburgCity_House2.s b/data/scripts/maps/PetalburgCity_House2.inc
index 4cc1325a2..4cc1325a2 100644
--- a/data/scripts/maps/PetalburgCity_House2.s
+++ b/data/scripts/maps/PetalburgCity_House2.inc
diff --git a/data/scripts/maps/PetalburgCity_Mart.s b/data/scripts/maps/PetalburgCity_Mart.inc
index 2eac03cac..2eac03cac 100644
--- a/data/scripts/maps/PetalburgCity_Mart.s
+++ b/data/scripts/maps/PetalburgCity_Mart.inc
diff --git a/data/scripts/maps/PetalburgCity_PokemonCenter_1F.s b/data/scripts/maps/PetalburgCity_PokemonCenter_1F.inc
index 09d414dcb..09d414dcb 100644
--- a/data/scripts/maps/PetalburgCity_PokemonCenter_1F.s
+++ b/data/scripts/maps/PetalburgCity_PokemonCenter_1F.inc
diff --git a/data/scripts/maps/PetalburgCity_PokemonCenter_2F.s b/data/scripts/maps/PetalburgCity_PokemonCenter_2F.inc
index a95823736..a95823736 100644
--- a/data/scripts/maps/PetalburgCity_PokemonCenter_2F.s
+++ b/data/scripts/maps/PetalburgCity_PokemonCenter_2F.inc
diff --git a/data/scripts/maps/PetalburgCity_WallysHouse.s b/data/scripts/maps/PetalburgCity_WallysHouse.inc
index e8ac407dc..e8ac407dc 100644
--- a/data/scripts/maps/PetalburgCity_WallysHouse.s
+++ b/data/scripts/maps/PetalburgCity_WallysHouse.inc
diff --git a/data/scripts/maps/PetalburgWoods.s b/data/scripts/maps/PetalburgWoods.inc
index 8d6946bcd..8d6946bcd 100644
--- a/data/scripts/maps/PetalburgWoods.s
+++ b/data/scripts/maps/PetalburgWoods.inc
diff --git a/data/scripts/maps/RecordCorner.s b/data/scripts/maps/RecordCorner.inc
index 8a2c1db22..8a2c1db22 100644
--- a/data/scripts/maps/RecordCorner.s
+++ b/data/scripts/maps/RecordCorner.inc
diff --git a/data/scripts/maps/Route101.s b/data/scripts/maps/Route101.inc
index 944473e96..944473e96 100644
--- a/data/scripts/maps/Route101.s
+++ b/data/scripts/maps/Route101.inc
diff --git a/data/scripts/maps/Route102.s b/data/scripts/maps/Route102.inc
index 70d25eace..70d25eace 100644
--- a/data/scripts/maps/Route102.s
+++ b/data/scripts/maps/Route102.inc
diff --git a/data/scripts/maps/Route103.s b/data/scripts/maps/Route103.inc
index f47f5a824..f47f5a824 100644
--- a/data/scripts/maps/Route103.s
+++ b/data/scripts/maps/Route103.inc
diff --git a/data/scripts/maps/Route104.s b/data/scripts/maps/Route104.inc
index bb98b023d..bb98b023d 100644
--- a/data/scripts/maps/Route104.s
+++ b/data/scripts/maps/Route104.inc
diff --git a/data/scripts/maps/Route104_MrBrineysHouse.s b/data/scripts/maps/Route104_MrBrineysHouse.inc
index 5c6704e67..5c6704e67 100644
--- a/data/scripts/maps/Route104_MrBrineysHouse.s
+++ b/data/scripts/maps/Route104_MrBrineysHouse.inc
diff --git a/data/scripts/maps/Route104_PrettyPetalFlowerShop.s b/data/scripts/maps/Route104_PrettyPetalFlowerShop.inc
index 02842c62d..02842c62d 100644
--- a/data/scripts/maps/Route104_PrettyPetalFlowerShop.s
+++ b/data/scripts/maps/Route104_PrettyPetalFlowerShop.inc
diff --git a/data/scripts/maps/Route104_Prototype.s b/data/scripts/maps/Route104_Prototype.inc
index 184127187..184127187 100644
--- a/data/scripts/maps/Route104_Prototype.s
+++ b/data/scripts/maps/Route104_Prototype.inc
diff --git a/data/scripts/maps/Route104_PrototypePrettyPetalFlowerShop.s b/data/scripts/maps/Route104_PrototypePrettyPetalFlowerShop.inc
index f979ab60b..f979ab60b 100644
--- a/data/scripts/maps/Route104_PrototypePrettyPetalFlowerShop.s
+++ b/data/scripts/maps/Route104_PrototypePrettyPetalFlowerShop.inc
diff --git a/data/scripts/maps/Route105.s b/data/scripts/maps/Route105.inc
index c71e2ce05..c71e2ce05 100644
--- a/data/scripts/maps/Route105.s
+++ b/data/scripts/maps/Route105.inc
diff --git a/data/scripts/maps/Route106.s b/data/scripts/maps/Route106.inc
index 1889eb4d7..1889eb4d7 100644
--- a/data/scripts/maps/Route106.s
+++ b/data/scripts/maps/Route106.inc
diff --git a/data/scripts/maps/Route107.s b/data/scripts/maps/Route107.inc
index ef3407265..ef3407265 100644
--- a/data/scripts/maps/Route107.s
+++ b/data/scripts/maps/Route107.inc
diff --git a/data/scripts/maps/Route108.s b/data/scripts/maps/Route108.inc
index 2e40c882d..2e40c882d 100644
--- a/data/scripts/maps/Route108.s
+++ b/data/scripts/maps/Route108.inc
diff --git a/data/scripts/maps/Route109.s b/data/scripts/maps/Route109.inc
index 343a8cab9..343a8cab9 100644
--- a/data/scripts/maps/Route109.s
+++ b/data/scripts/maps/Route109.inc
diff --git a/data/scripts/maps/Route109_SeashoreHouse.s b/data/scripts/maps/Route109_SeashoreHouse.inc
index e1d9c380b..e1d9c380b 100644
--- a/data/scripts/maps/Route109_SeashoreHouse.s
+++ b/data/scripts/maps/Route109_SeashoreHouse.inc
diff --git a/data/scripts/maps/Route110.s b/data/scripts/maps/Route110.inc
index 55c8f67df..55c8f67df 100644
--- a/data/scripts/maps/Route110.s
+++ b/data/scripts/maps/Route110.inc
diff --git a/data/scripts/maps/Route110_SeasideCyclingRoadNorthEntrance.s b/data/scripts/maps/Route110_SeasideCyclingRoadNorthEntrance.inc
index 0dbd5dfc4..0dbd5dfc4 100644
--- a/data/scripts/maps/Route110_SeasideCyclingRoadNorthEntrance.s
+++ b/data/scripts/maps/Route110_SeasideCyclingRoadNorthEntrance.inc
diff --git a/data/scripts/maps/Route110_SeasideCyclingRoadSouthEntrance.s b/data/scripts/maps/Route110_SeasideCyclingRoadSouthEntrance.inc
index 96fb13f2b..96fb13f2b 100644
--- a/data/scripts/maps/Route110_SeasideCyclingRoadSouthEntrance.s
+++ b/data/scripts/maps/Route110_SeasideCyclingRoadSouthEntrance.inc
diff --git a/data/scripts/maps/Route110_TrickHouseCorridor.s b/data/scripts/maps/Route110_TrickHouseCorridor.inc
index 7b3d93118..7b3d93118 100644
--- a/data/scripts/maps/Route110_TrickHouseCorridor.s
+++ b/data/scripts/maps/Route110_TrickHouseCorridor.inc
diff --git a/data/scripts/maps/Route110_TrickHouseEnd.s b/data/scripts/maps/Route110_TrickHouseEnd.inc
index d2b2eaefb..d2b2eaefb 100644
--- a/data/scripts/maps/Route110_TrickHouseEnd.s
+++ b/data/scripts/maps/Route110_TrickHouseEnd.inc
diff --git a/data/scripts/maps/Route110_TrickHouseEntrance.s b/data/scripts/maps/Route110_TrickHouseEntrance.inc
index 434794b2f..434794b2f 100644
--- a/data/scripts/maps/Route110_TrickHouseEntrance.s
+++ b/data/scripts/maps/Route110_TrickHouseEntrance.inc
diff --git a/data/scripts/maps/Route110_TrickHousePuzzle1.s b/data/scripts/maps/Route110_TrickHousePuzzle1.inc
index 6b6d45af2..6b6d45af2 100644
--- a/data/scripts/maps/Route110_TrickHousePuzzle1.s
+++ b/data/scripts/maps/Route110_TrickHousePuzzle1.inc
diff --git a/data/scripts/maps/Route110_TrickHousePuzzle2.s b/data/scripts/maps/Route110_TrickHousePuzzle2.inc
index 183431bfc..183431bfc 100644
--- a/data/scripts/maps/Route110_TrickHousePuzzle2.s
+++ b/data/scripts/maps/Route110_TrickHousePuzzle2.inc
diff --git a/data/scripts/maps/Route110_TrickHousePuzzle3.s b/data/scripts/maps/Route110_TrickHousePuzzle3.inc
index b533dbbe5..b533dbbe5 100644
--- a/data/scripts/maps/Route110_TrickHousePuzzle3.s
+++ b/data/scripts/maps/Route110_TrickHousePuzzle3.inc
diff --git a/data/scripts/maps/Route110_TrickHousePuzzle4.s b/data/scripts/maps/Route110_TrickHousePuzzle4.inc
index 89d5e45c3..89d5e45c3 100644
--- a/data/scripts/maps/Route110_TrickHousePuzzle4.s
+++ b/data/scripts/maps/Route110_TrickHousePuzzle4.inc
diff --git a/data/scripts/maps/Route110_TrickHousePuzzle5.s b/data/scripts/maps/Route110_TrickHousePuzzle5.inc
index cd5d2fbb9..cd5d2fbb9 100644
--- a/data/scripts/maps/Route110_TrickHousePuzzle5.s
+++ b/data/scripts/maps/Route110_TrickHousePuzzle5.inc
diff --git a/data/scripts/maps/Route110_TrickHousePuzzle6.s b/data/scripts/maps/Route110_TrickHousePuzzle6.inc
index 56d350871..56d350871 100644
--- a/data/scripts/maps/Route110_TrickHousePuzzle6.s
+++ b/data/scripts/maps/Route110_TrickHousePuzzle6.inc
diff --git a/data/scripts/maps/Route110_TrickHousePuzzle7.s b/data/scripts/maps/Route110_TrickHousePuzzle7.inc
index 1276562d0..1276562d0 100644
--- a/data/scripts/maps/Route110_TrickHousePuzzle7.s
+++ b/data/scripts/maps/Route110_TrickHousePuzzle7.inc
diff --git a/data/scripts/maps/Route110_TrickHousePuzzle8.s b/data/scripts/maps/Route110_TrickHousePuzzle8.inc
index a31c868be..a31c868be 100644
--- a/data/scripts/maps/Route110_TrickHousePuzzle8.s
+++ b/data/scripts/maps/Route110_TrickHousePuzzle8.inc
diff --git a/data/scripts/maps/Route111.s b/data/scripts/maps/Route111.inc
index 10b34cf5f..10b34cf5f 100644
--- a/data/scripts/maps/Route111.s
+++ b/data/scripts/maps/Route111.inc
diff --git a/data/scripts/maps/Route111_OldLadysRestStop.s b/data/scripts/maps/Route111_OldLadysRestStop.inc
index 107026a4b..107026a4b 100644
--- a/data/scripts/maps/Route111_OldLadysRestStop.s
+++ b/data/scripts/maps/Route111_OldLadysRestStop.inc
diff --git a/data/scripts/maps/Route111_WinstrateFamilysHouse.s b/data/scripts/maps/Route111_WinstrateFamilysHouse.inc
index 3eb514ad2..3eb514ad2 100644
--- a/data/scripts/maps/Route111_WinstrateFamilysHouse.s
+++ b/data/scripts/maps/Route111_WinstrateFamilysHouse.inc
diff --git a/data/scripts/maps/Route112.s b/data/scripts/maps/Route112.inc
index c2ad14a02..c2ad14a02 100644
--- a/data/scripts/maps/Route112.s
+++ b/data/scripts/maps/Route112.inc
diff --git a/data/scripts/maps/Route112_CableCarStation.s b/data/scripts/maps/Route112_CableCarStation.inc
index 3e5f75929..3e5f75929 100644
--- a/data/scripts/maps/Route112_CableCarStation.s
+++ b/data/scripts/maps/Route112_CableCarStation.inc
diff --git a/data/scripts/maps/Route113.s b/data/scripts/maps/Route113.inc
index c07f537d1..c07f537d1 100644
--- a/data/scripts/maps/Route113.s
+++ b/data/scripts/maps/Route113.inc
diff --git a/data/scripts/maps/Route113_GlassWorkshop.s b/data/scripts/maps/Route113_GlassWorkshop.inc
index d59942472..d59942472 100644
--- a/data/scripts/maps/Route113_GlassWorkshop.s
+++ b/data/scripts/maps/Route113_GlassWorkshop.inc
diff --git a/data/scripts/maps/Route114.s b/data/scripts/maps/Route114.inc
index 33e89be70..33e89be70 100644
--- a/data/scripts/maps/Route114.s
+++ b/data/scripts/maps/Route114.inc
diff --git a/data/scripts/maps/Route114_FossilManiacsHouse.s b/data/scripts/maps/Route114_FossilManiacsHouse.inc
index 50305dc04..50305dc04 100644
--- a/data/scripts/maps/Route114_FossilManiacsHouse.s
+++ b/data/scripts/maps/Route114_FossilManiacsHouse.inc
diff --git a/data/scripts/maps/Route114_FossilManiacsTunnel.s b/data/scripts/maps/Route114_FossilManiacsTunnel.inc
index 7986a0436..7986a0436 100644
--- a/data/scripts/maps/Route114_FossilManiacsTunnel.s
+++ b/data/scripts/maps/Route114_FossilManiacsTunnel.inc
diff --git a/data/scripts/maps/Route114_LanettesHouse.s b/data/scripts/maps/Route114_LanettesHouse.inc
index ff8a1c565..ff8a1c565 100644
--- a/data/scripts/maps/Route114_LanettesHouse.s
+++ b/data/scripts/maps/Route114_LanettesHouse.inc
diff --git a/data/scripts/maps/Route115.s b/data/scripts/maps/Route115.inc
index e2c00f6fc..e2c00f6fc 100644
--- a/data/scripts/maps/Route115.s
+++ b/data/scripts/maps/Route115.inc
diff --git a/data/scripts/maps/Route116.s b/data/scripts/maps/Route116.inc
index c563dce46..c563dce46 100644
--- a/data/scripts/maps/Route116.s
+++ b/data/scripts/maps/Route116.inc
diff --git a/data/scripts/maps/Route116_TunnelersRestHouse.s b/data/scripts/maps/Route116_TunnelersRestHouse.inc
index d141fae37..d141fae37 100644
--- a/data/scripts/maps/Route116_TunnelersRestHouse.s
+++ b/data/scripts/maps/Route116_TunnelersRestHouse.inc
diff --git a/data/scripts/maps/Route117.s b/data/scripts/maps/Route117.inc
index 8c738ffff..8c738ffff 100644
--- a/data/scripts/maps/Route117.s
+++ b/data/scripts/maps/Route117.inc
diff --git a/data/scripts/maps/Route117_PokemonDayCare.s b/data/scripts/maps/Route117_PokemonDayCare.inc
index 2a3ee79e1..2a3ee79e1 100644
--- a/data/scripts/maps/Route117_PokemonDayCare.s
+++ b/data/scripts/maps/Route117_PokemonDayCare.inc
diff --git a/data/scripts/maps/Route118.s b/data/scripts/maps/Route118.inc
index 4d739ce68..4d739ce68 100644
--- a/data/scripts/maps/Route118.s
+++ b/data/scripts/maps/Route118.inc
diff --git a/data/scripts/maps/Route119.s b/data/scripts/maps/Route119.inc
index 1ccc972bb..1ccc972bb 100644
--- a/data/scripts/maps/Route119.s
+++ b/data/scripts/maps/Route119.inc
diff --git a/data/scripts/maps/Route119_House.s b/data/scripts/maps/Route119_House.inc
index 6395e40eb..6395e40eb 100644
--- a/data/scripts/maps/Route119_House.s
+++ b/data/scripts/maps/Route119_House.inc
diff --git a/data/scripts/maps/Route119_WeatherInstitute_1F.s b/data/scripts/maps/Route119_WeatherInstitute_1F.inc
index 36314a59f..36314a59f 100644
--- a/data/scripts/maps/Route119_WeatherInstitute_1F.s
+++ b/data/scripts/maps/Route119_WeatherInstitute_1F.inc
diff --git a/data/scripts/maps/Route119_WeatherInstitute_2F.s b/data/scripts/maps/Route119_WeatherInstitute_2F.inc
index 37f8e9ec6..37f8e9ec6 100644
--- a/data/scripts/maps/Route119_WeatherInstitute_2F.s
+++ b/data/scripts/maps/Route119_WeatherInstitute_2F.inc
diff --git a/data/scripts/maps/Route120.s b/data/scripts/maps/Route120.inc
index ada773ffd..ada773ffd 100644
--- a/data/scripts/maps/Route120.s
+++ b/data/scripts/maps/Route120.inc
diff --git a/data/scripts/maps/Route121.s b/data/scripts/maps/Route121.inc
index 54912b0bc..54912b0bc 100644
--- a/data/scripts/maps/Route121.s
+++ b/data/scripts/maps/Route121.inc
diff --git a/data/scripts/maps/Route121_SafariZoneEntrance.s b/data/scripts/maps/Route121_SafariZoneEntrance.inc
index 2056bc328..2056bc328 100644
--- a/data/scripts/maps/Route121_SafariZoneEntrance.s
+++ b/data/scripts/maps/Route121_SafariZoneEntrance.inc
diff --git a/data/scripts/maps/Route122.s b/data/scripts/maps/Route122.inc
index 4c4e49aa1..4c4e49aa1 100644
--- a/data/scripts/maps/Route122.s
+++ b/data/scripts/maps/Route122.inc
diff --git a/data/scripts/maps/Route123.s b/data/scripts/maps/Route123.inc
index e9248c230..e9248c230 100644
--- a/data/scripts/maps/Route123.s
+++ b/data/scripts/maps/Route123.inc
diff --git a/data/scripts/maps/Route123_BerryMastersHouse.s b/data/scripts/maps/Route123_BerryMastersHouse.inc
index 9290f845d..9290f845d 100644
--- a/data/scripts/maps/Route123_BerryMastersHouse.s
+++ b/data/scripts/maps/Route123_BerryMastersHouse.inc
diff --git a/data/scripts/maps/Route124.s b/data/scripts/maps/Route124.inc
index ea288daa0..ea288daa0 100644
--- a/data/scripts/maps/Route124.s
+++ b/data/scripts/maps/Route124.inc
diff --git a/data/scripts/maps/Route124_DivingTreasureHuntersHouse.s b/data/scripts/maps/Route124_DivingTreasureHuntersHouse.inc
index e1049c8be..e1049c8be 100644
--- a/data/scripts/maps/Route124_DivingTreasureHuntersHouse.s
+++ b/data/scripts/maps/Route124_DivingTreasureHuntersHouse.inc
diff --git a/data/scripts/maps/Route125.s b/data/scripts/maps/Route125.inc
index 0059fe6aa..0059fe6aa 100644
--- a/data/scripts/maps/Route125.s
+++ b/data/scripts/maps/Route125.inc
diff --git a/data/scripts/maps/Route126.s b/data/scripts/maps/Route126.inc
index f3d1a77f9..f3d1a77f9 100644
--- a/data/scripts/maps/Route126.s
+++ b/data/scripts/maps/Route126.inc
diff --git a/data/scripts/maps/Route127.s b/data/scripts/maps/Route127.inc
index b4461b253..b4461b253 100644
--- a/data/scripts/maps/Route127.s
+++ b/data/scripts/maps/Route127.inc
diff --git a/data/scripts/maps/Route128.s b/data/scripts/maps/Route128.inc
index 28317c4e3..28317c4e3 100644
--- a/data/scripts/maps/Route128.s
+++ b/data/scripts/maps/Route128.inc
diff --git a/data/scripts/maps/Route129.s b/data/scripts/maps/Route129.inc
index ea43c5eab..ea43c5eab 100644
--- a/data/scripts/maps/Route129.s
+++ b/data/scripts/maps/Route129.inc
diff --git a/data/scripts/maps/Route130.s b/data/scripts/maps/Route130.inc
index 38818dba3..38818dba3 100644
--- a/data/scripts/maps/Route130.s
+++ b/data/scripts/maps/Route130.inc
diff --git a/data/scripts/maps/Route131.s b/data/scripts/maps/Route131.inc
index 81cb7dc02..81cb7dc02 100644
--- a/data/scripts/maps/Route131.s
+++ b/data/scripts/maps/Route131.inc
diff --git a/data/scripts/maps/Route132.s b/data/scripts/maps/Route132.inc
index 642330fd4..642330fd4 100644
--- a/data/scripts/maps/Route132.s
+++ b/data/scripts/maps/Route132.inc
diff --git a/data/scripts/maps/Route133.s b/data/scripts/maps/Route133.inc
index 78bec4141..78bec4141 100644
--- a/data/scripts/maps/Route133.s
+++ b/data/scripts/maps/Route133.inc
diff --git a/data/scripts/maps/Route134.s b/data/scripts/maps/Route134.inc
index b1f77fac1..b1f77fac1 100644
--- a/data/scripts/maps/Route134.s
+++ b/data/scripts/maps/Route134.inc
diff --git a/data/scripts/maps/RustboroCity.s b/data/scripts/maps/RustboroCity.inc
index c338e8b67..c338e8b67 100644
--- a/data/scripts/maps/RustboroCity.s
+++ b/data/scripts/maps/RustboroCity.inc
diff --git a/data/scripts/maps/RustboroCity_CuttersHouse.s b/data/scripts/maps/RustboroCity_CuttersHouse.inc
index d400de1ef..d400de1ef 100644
--- a/data/scripts/maps/RustboroCity_CuttersHouse.s
+++ b/data/scripts/maps/RustboroCity_CuttersHouse.inc
diff --git a/data/scripts/maps/RustboroCity_DevonCorp_1F.s b/data/scripts/maps/RustboroCity_DevonCorp_1F.inc
index 97a59257f..97a59257f 100644
--- a/data/scripts/maps/RustboroCity_DevonCorp_1F.s
+++ b/data/scripts/maps/RustboroCity_DevonCorp_1F.inc
diff --git a/data/scripts/maps/RustboroCity_DevonCorp_2F.s b/data/scripts/maps/RustboroCity_DevonCorp_2F.inc
index e35015b3e..e35015b3e 100644
--- a/data/scripts/maps/RustboroCity_DevonCorp_2F.s
+++ b/data/scripts/maps/RustboroCity_DevonCorp_2F.inc
diff --git a/data/scripts/maps/RustboroCity_DevonCorp_3F.s b/data/scripts/maps/RustboroCity_DevonCorp_3F.inc
index 2b749c873..2b749c873 100644
--- a/data/scripts/maps/RustboroCity_DevonCorp_3F.s
+++ b/data/scripts/maps/RustboroCity_DevonCorp_3F.inc
diff --git a/data/scripts/maps/RustboroCity_Flat1_1F.s b/data/scripts/maps/RustboroCity_Flat1_1F.inc
index dbbdf22b7..dbbdf22b7 100644
--- a/data/scripts/maps/RustboroCity_Flat1_1F.s
+++ b/data/scripts/maps/RustboroCity_Flat1_1F.inc
diff --git a/data/scripts/maps/RustboroCity_Flat1_2F.s b/data/scripts/maps/RustboroCity_Flat1_2F.inc
index 53672bb42..53672bb42 100644
--- a/data/scripts/maps/RustboroCity_Flat1_2F.s
+++ b/data/scripts/maps/RustboroCity_Flat1_2F.inc
diff --git a/data/scripts/maps/RustboroCity_Flat2_1F.s b/data/scripts/maps/RustboroCity_Flat2_1F.inc
index 5aa91d5d1..5aa91d5d1 100644
--- a/data/scripts/maps/RustboroCity_Flat2_1F.s
+++ b/data/scripts/maps/RustboroCity_Flat2_1F.inc
diff --git a/data/scripts/maps/RustboroCity_Flat2_2F.s b/data/scripts/maps/RustboroCity_Flat2_2F.inc
index d6e0c92b3..d6e0c92b3 100644
--- a/data/scripts/maps/RustboroCity_Flat2_2F.s
+++ b/data/scripts/maps/RustboroCity_Flat2_2F.inc
diff --git a/data/scripts/maps/RustboroCity_Flat2_3F.s b/data/scripts/maps/RustboroCity_Flat2_3F.inc
index d3b05b5bf..d3b05b5bf 100644
--- a/data/scripts/maps/RustboroCity_Flat2_3F.s
+++ b/data/scripts/maps/RustboroCity_Flat2_3F.inc
diff --git a/data/scripts/maps/RustboroCity_Gym.s b/data/scripts/maps/RustboroCity_Gym.inc
index e4f91f82e..e4f91f82e 100644
--- a/data/scripts/maps/RustboroCity_Gym.s
+++ b/data/scripts/maps/RustboroCity_Gym.inc
diff --git a/data/scripts/maps/RustboroCity_House1.s b/data/scripts/maps/RustboroCity_House1.inc
index a10d7b69e..a10d7b69e 100644
--- a/data/scripts/maps/RustboroCity_House1.s
+++ b/data/scripts/maps/RustboroCity_House1.inc
diff --git a/data/scripts/maps/RustboroCity_House2.s b/data/scripts/maps/RustboroCity_House2.inc
index b448065f4..b448065f4 100644
--- a/data/scripts/maps/RustboroCity_House2.s
+++ b/data/scripts/maps/RustboroCity_House2.inc
diff --git a/data/scripts/maps/RustboroCity_House3.s b/data/scripts/maps/RustboroCity_House3.inc
index 0e81ed158..0e81ed158 100644
--- a/data/scripts/maps/RustboroCity_House3.s
+++ b/data/scripts/maps/RustboroCity_House3.inc
diff --git a/data/scripts/maps/RustboroCity_Mart.s b/data/scripts/maps/RustboroCity_Mart.inc
index 6b4ff3a77..6b4ff3a77 100644
--- a/data/scripts/maps/RustboroCity_Mart.s
+++ b/data/scripts/maps/RustboroCity_Mart.inc
diff --git a/data/scripts/maps/RustboroCity_PokemonCenter_1F.s b/data/scripts/maps/RustboroCity_PokemonCenter_1F.inc
index 896e8e220..896e8e220 100644
--- a/data/scripts/maps/RustboroCity_PokemonCenter_1F.s
+++ b/data/scripts/maps/RustboroCity_PokemonCenter_1F.inc
diff --git a/data/scripts/maps/RustboroCity_PokemonCenter_2F.s b/data/scripts/maps/RustboroCity_PokemonCenter_2F.inc
index d0ffc5435..d0ffc5435 100644
--- a/data/scripts/maps/RustboroCity_PokemonCenter_2F.s
+++ b/data/scripts/maps/RustboroCity_PokemonCenter_2F.inc
diff --git a/data/scripts/maps/RustboroCity_PokemonSchool.s b/data/scripts/maps/RustboroCity_PokemonSchool.inc
index 8b037a3e7..8b037a3e7 100644
--- a/data/scripts/maps/RustboroCity_PokemonSchool.s
+++ b/data/scripts/maps/RustboroCity_PokemonSchool.inc
diff --git a/data/scripts/maps/RusturfTunnel.s b/data/scripts/maps/RusturfTunnel.inc
index 129bef7c9..129bef7c9 100644
--- a/data/scripts/maps/RusturfTunnel.s
+++ b/data/scripts/maps/RusturfTunnel.inc
diff --git a/data/scripts/maps/SSTidalCorridor.s b/data/scripts/maps/SSTidalCorridor.inc
index ff4857852..ff4857852 100644
--- a/data/scripts/maps/SSTidalCorridor.s
+++ b/data/scripts/maps/SSTidalCorridor.inc
diff --git a/data/scripts/maps/SSTidalLowerDeck.s b/data/scripts/maps/SSTidalLowerDeck.inc
index e91c20625..e91c20625 100644
--- a/data/scripts/maps/SSTidalLowerDeck.s
+++ b/data/scripts/maps/SSTidalLowerDeck.inc
diff --git a/data/scripts/maps/SSTidalRooms.s b/data/scripts/maps/SSTidalRooms.inc
index 4d588cd46..4d588cd46 100644
--- a/data/scripts/maps/SSTidalRooms.s
+++ b/data/scripts/maps/SSTidalRooms.inc
diff --git a/data/scripts/maps/SafariZone_Northeast.s b/data/scripts/maps/SafariZone_Northeast.inc
index 11e14da0f..11e14da0f 100644
--- a/data/scripts/maps/SafariZone_Northeast.s
+++ b/data/scripts/maps/SafariZone_Northeast.inc
diff --git a/data/scripts/maps/SafariZone_Northwest.s b/data/scripts/maps/SafariZone_Northwest.inc
index f17b7078d..f17b7078d 100644
--- a/data/scripts/maps/SafariZone_Northwest.s
+++ b/data/scripts/maps/SafariZone_Northwest.inc
diff --git a/data/scripts/maps/SafariZone_RestHouse.s b/data/scripts/maps/SafariZone_RestHouse.inc
index edaee1580..edaee1580 100644
--- a/data/scripts/maps/SafariZone_RestHouse.s
+++ b/data/scripts/maps/SafariZone_RestHouse.inc
diff --git a/data/scripts/maps/SafariZone_Southeast.s b/data/scripts/maps/SafariZone_Southeast.inc
index 196efbb35..196efbb35 100644
--- a/data/scripts/maps/SafariZone_Southeast.s
+++ b/data/scripts/maps/SafariZone_Southeast.inc
diff --git a/data/scripts/maps/SafariZone_Southwest.s b/data/scripts/maps/SafariZone_Southwest.inc
index 51bffeeab..51bffeeab 100644
--- a/data/scripts/maps/SafariZone_Southwest.s
+++ b/data/scripts/maps/SafariZone_Southwest.inc
diff --git a/data/scripts/maps/ScorchedSlab.s b/data/scripts/maps/ScorchedSlab.inc
index 112289083..112289083 100644
--- a/data/scripts/maps/ScorchedSlab.s
+++ b/data/scripts/maps/ScorchedSlab.inc
diff --git a/data/scripts/maps/SeafloorCavern_Entrance.s b/data/scripts/maps/SeafloorCavern_Entrance.inc
index 0bf99d2ad..0bf99d2ad 100644
--- a/data/scripts/maps/SeafloorCavern_Entrance.s
+++ b/data/scripts/maps/SeafloorCavern_Entrance.inc
diff --git a/data/scripts/maps/SeafloorCavern_Room1.s b/data/scripts/maps/SeafloorCavern_Room1.inc
index 6478efac1..6478efac1 100644
--- a/data/scripts/maps/SeafloorCavern_Room1.s
+++ b/data/scripts/maps/SeafloorCavern_Room1.inc
diff --git a/data/scripts/maps/SeafloorCavern_Room2.s b/data/scripts/maps/SeafloorCavern_Room2.inc
index b4507c8b9..b4507c8b9 100644
--- a/data/scripts/maps/SeafloorCavern_Room2.s
+++ b/data/scripts/maps/SeafloorCavern_Room2.inc
diff --git a/data/scripts/maps/SeafloorCavern_Room3.s b/data/scripts/maps/SeafloorCavern_Room3.inc
index 2ff8c4b26..2ff8c4b26 100644
--- a/data/scripts/maps/SeafloorCavern_Room3.s
+++ b/data/scripts/maps/SeafloorCavern_Room3.inc
diff --git a/data/scripts/maps/SeafloorCavern_Room4.s b/data/scripts/maps/SeafloorCavern_Room4.inc
index cbed797c0..cbed797c0 100644
--- a/data/scripts/maps/SeafloorCavern_Room4.s
+++ b/data/scripts/maps/SeafloorCavern_Room4.inc
diff --git a/data/scripts/maps/SeafloorCavern_Room5.s b/data/scripts/maps/SeafloorCavern_Room5.inc
index 79b65c2e6..79b65c2e6 100644
--- a/data/scripts/maps/SeafloorCavern_Room5.s
+++ b/data/scripts/maps/SeafloorCavern_Room5.inc
diff --git a/data/scripts/maps/SeafloorCavern_Room6.s b/data/scripts/maps/SeafloorCavern_Room6.inc
index 3ebeae07f..3ebeae07f 100644
--- a/data/scripts/maps/SeafloorCavern_Room6.s
+++ b/data/scripts/maps/SeafloorCavern_Room6.inc
diff --git a/data/scripts/maps/SeafloorCavern_Room7.s b/data/scripts/maps/SeafloorCavern_Room7.inc
index acad96ad0..acad96ad0 100644
--- a/data/scripts/maps/SeafloorCavern_Room7.s
+++ b/data/scripts/maps/SeafloorCavern_Room7.inc
diff --git a/data/scripts/maps/SeafloorCavern_Room8.s b/data/scripts/maps/SeafloorCavern_Room8.inc
index 117f9e6b5..117f9e6b5 100644
--- a/data/scripts/maps/SeafloorCavern_Room8.s
+++ b/data/scripts/maps/SeafloorCavern_Room8.inc
diff --git a/data/scripts/maps/SeafloorCavern_Room9.s b/data/scripts/maps/SeafloorCavern_Room9.inc
index ff8592f7d..ff8592f7d 100644
--- a/data/scripts/maps/SeafloorCavern_Room9.s
+++ b/data/scripts/maps/SeafloorCavern_Room9.inc
diff --git a/data/scripts/maps/SealedChamber_InnerRoom.s b/data/scripts/maps/SealedChamber_InnerRoom.inc
index 16d4c7003..16d4c7003 100644
--- a/data/scripts/maps/SealedChamber_InnerRoom.s
+++ b/data/scripts/maps/SealedChamber_InnerRoom.inc
diff --git a/data/scripts/maps/SealedChamber_OuterRoom.s b/data/scripts/maps/SealedChamber_OuterRoom.inc
index 83ca4e4df..83ca4e4df 100644
--- a/data/scripts/maps/SealedChamber_OuterRoom.s
+++ b/data/scripts/maps/SealedChamber_OuterRoom.inc
diff --git a/data/scripts/maps/SecretBase_BlueCave1.s b/data/scripts/maps/SecretBase_BlueCave1.inc
index bca6bee55..bca6bee55 100644
--- a/data/scripts/maps/SecretBase_BlueCave1.s
+++ b/data/scripts/maps/SecretBase_BlueCave1.inc
diff --git a/data/scripts/maps/SecretBase_BlueCave2.s b/data/scripts/maps/SecretBase_BlueCave2.inc
index 4fc579fb9..4fc579fb9 100644
--- a/data/scripts/maps/SecretBase_BlueCave2.s
+++ b/data/scripts/maps/SecretBase_BlueCave2.inc
diff --git a/data/scripts/maps/SecretBase_BlueCave3.s b/data/scripts/maps/SecretBase_BlueCave3.inc
index 0a8199f19..0a8199f19 100644
--- a/data/scripts/maps/SecretBase_BlueCave3.s
+++ b/data/scripts/maps/SecretBase_BlueCave3.inc
diff --git a/data/scripts/maps/SecretBase_BlueCave4.s b/data/scripts/maps/SecretBase_BlueCave4.inc
index 72c1e9612..72c1e9612 100644
--- a/data/scripts/maps/SecretBase_BlueCave4.s
+++ b/data/scripts/maps/SecretBase_BlueCave4.inc
diff --git a/data/scripts/maps/SecretBase_BrownCave1.s b/data/scripts/maps/SecretBase_BrownCave1.inc
index ddbf182e4..ddbf182e4 100644
--- a/data/scripts/maps/SecretBase_BrownCave1.s
+++ b/data/scripts/maps/SecretBase_BrownCave1.inc
diff --git a/data/scripts/maps/SecretBase_BrownCave2.s b/data/scripts/maps/SecretBase_BrownCave2.inc
index 06dcb6335..06dcb6335 100644
--- a/data/scripts/maps/SecretBase_BrownCave2.s
+++ b/data/scripts/maps/SecretBase_BrownCave2.inc
diff --git a/data/scripts/maps/SecretBase_BrownCave3.s b/data/scripts/maps/SecretBase_BrownCave3.inc
index a0a85dc11..a0a85dc11 100644
--- a/data/scripts/maps/SecretBase_BrownCave3.s
+++ b/data/scripts/maps/SecretBase_BrownCave3.inc
diff --git a/data/scripts/maps/SecretBase_BrownCave4.s b/data/scripts/maps/SecretBase_BrownCave4.inc
index 12d931e9e..12d931e9e 100644
--- a/data/scripts/maps/SecretBase_BrownCave4.s
+++ b/data/scripts/maps/SecretBase_BrownCave4.inc
diff --git a/data/scripts/maps/SecretBase_RedCave1.s b/data/scripts/maps/SecretBase_RedCave1.inc
index 77b99daec..77b99daec 100644
--- a/data/scripts/maps/SecretBase_RedCave1.s
+++ b/data/scripts/maps/SecretBase_RedCave1.inc
diff --git a/data/scripts/maps/SecretBase_RedCave2.s b/data/scripts/maps/SecretBase_RedCave2.inc
index 735d386fc..735d386fc 100644
--- a/data/scripts/maps/SecretBase_RedCave2.s
+++ b/data/scripts/maps/SecretBase_RedCave2.inc
diff --git a/data/scripts/maps/SecretBase_RedCave3.s b/data/scripts/maps/SecretBase_RedCave3.inc
index c9b72ca30..c9b72ca30 100644
--- a/data/scripts/maps/SecretBase_RedCave3.s
+++ b/data/scripts/maps/SecretBase_RedCave3.inc
diff --git a/data/scripts/maps/SecretBase_RedCave4.s b/data/scripts/maps/SecretBase_RedCave4.inc
index 6d2402f03..6d2402f03 100644
--- a/data/scripts/maps/SecretBase_RedCave4.s
+++ b/data/scripts/maps/SecretBase_RedCave4.inc
diff --git a/data/scripts/maps/SecretBase_Shrub1.s b/data/scripts/maps/SecretBase_Shrub1.inc
index 79116a0cf..79116a0cf 100644
--- a/data/scripts/maps/SecretBase_Shrub1.s
+++ b/data/scripts/maps/SecretBase_Shrub1.inc
diff --git a/data/scripts/maps/SecretBase_Shrub2.s b/data/scripts/maps/SecretBase_Shrub2.inc
index 49835f7f3..49835f7f3 100644
--- a/data/scripts/maps/SecretBase_Shrub2.s
+++ b/data/scripts/maps/SecretBase_Shrub2.inc
diff --git a/data/scripts/maps/SecretBase_Shrub3.s b/data/scripts/maps/SecretBase_Shrub3.inc
index 0aeb7bdf9..0aeb7bdf9 100644
--- a/data/scripts/maps/SecretBase_Shrub3.s
+++ b/data/scripts/maps/SecretBase_Shrub3.inc
diff --git a/data/scripts/maps/SecretBase_Shrub4.s b/data/scripts/maps/SecretBase_Shrub4.inc
index f131b308d..f131b308d 100644
--- a/data/scripts/maps/SecretBase_Shrub4.s
+++ b/data/scripts/maps/SecretBase_Shrub4.inc
diff --git a/data/scripts/maps/SecretBase_Tree1.s b/data/scripts/maps/SecretBase_Tree1.inc
index 7345c3bbb..7345c3bbb 100644
--- a/data/scripts/maps/SecretBase_Tree1.s
+++ b/data/scripts/maps/SecretBase_Tree1.inc
diff --git a/data/scripts/maps/SecretBase_Tree2.s b/data/scripts/maps/SecretBase_Tree2.inc
index 0f2976a8c..0f2976a8c 100644
--- a/data/scripts/maps/SecretBase_Tree2.s
+++ b/data/scripts/maps/SecretBase_Tree2.inc
diff --git a/data/scripts/maps/SecretBase_Tree3.s b/data/scripts/maps/SecretBase_Tree3.inc
index cb80b0d25..cb80b0d25 100644
--- a/data/scripts/maps/SecretBase_Tree3.s
+++ b/data/scripts/maps/SecretBase_Tree3.inc
diff --git a/data/scripts/maps/SecretBase_Tree4.s b/data/scripts/maps/SecretBase_Tree4.inc
index 0a6771740..0a6771740 100644
--- a/data/scripts/maps/SecretBase_Tree4.s
+++ b/data/scripts/maps/SecretBase_Tree4.inc
diff --git a/data/scripts/maps/SecretBase_YellowCave1.s b/data/scripts/maps/SecretBase_YellowCave1.inc
index b76a5f44e..b76a5f44e 100644
--- a/data/scripts/maps/SecretBase_YellowCave1.s
+++ b/data/scripts/maps/SecretBase_YellowCave1.inc
diff --git a/data/scripts/maps/SecretBase_YellowCave2.s b/data/scripts/maps/SecretBase_YellowCave2.inc
index 0bc1fc354..0bc1fc354 100644
--- a/data/scripts/maps/SecretBase_YellowCave2.s
+++ b/data/scripts/maps/SecretBase_YellowCave2.inc
diff --git a/data/scripts/maps/SecretBase_YellowCave3.s b/data/scripts/maps/SecretBase_YellowCave3.inc
index 137f04316..137f04316 100644
--- a/data/scripts/maps/SecretBase_YellowCave3.s
+++ b/data/scripts/maps/SecretBase_YellowCave3.inc
diff --git a/data/scripts/maps/SecretBase_YellowCave4.s b/data/scripts/maps/SecretBase_YellowCave4.inc
index 4ccbc2f0e..4ccbc2f0e 100644
--- a/data/scripts/maps/SecretBase_YellowCave4.s
+++ b/data/scripts/maps/SecretBase_YellowCave4.inc
diff --git a/data/scripts/maps/ShoalCave_HighTideEntranceRoom.s b/data/scripts/maps/ShoalCave_HighTideEntranceRoom.inc
index ae1f2c279..ae1f2c279 100644
--- a/data/scripts/maps/ShoalCave_HighTideEntranceRoom.s
+++ b/data/scripts/maps/ShoalCave_HighTideEntranceRoom.inc
diff --git a/data/scripts/maps/ShoalCave_HighTideInnerRoom.s b/data/scripts/maps/ShoalCave_HighTideInnerRoom.inc
index 9b47c97e7..9b47c97e7 100644
--- a/data/scripts/maps/ShoalCave_HighTideInnerRoom.s
+++ b/data/scripts/maps/ShoalCave_HighTideInnerRoom.inc
diff --git a/data/scripts/maps/ShoalCave_LowTideEntranceRoom.s b/data/scripts/maps/ShoalCave_LowTideEntranceRoom.inc
index 9b822a473..9b822a473 100644
--- a/data/scripts/maps/ShoalCave_LowTideEntranceRoom.s
+++ b/data/scripts/maps/ShoalCave_LowTideEntranceRoom.inc
diff --git a/data/scripts/maps/ShoalCave_LowTideIceRoom.s b/data/scripts/maps/ShoalCave_LowTideIceRoom.inc
index 311ff2126..311ff2126 100644
--- a/data/scripts/maps/ShoalCave_LowTideIceRoom.s
+++ b/data/scripts/maps/ShoalCave_LowTideIceRoom.inc
diff --git a/data/scripts/maps/ShoalCave_LowTideInnerRoom.s b/data/scripts/maps/ShoalCave_LowTideInnerRoom.inc
index eab522a1f..eab522a1f 100644
--- a/data/scripts/maps/ShoalCave_LowTideInnerRoom.s
+++ b/data/scripts/maps/ShoalCave_LowTideInnerRoom.inc
diff --git a/data/scripts/maps/ShoalCave_LowTideLowerRoom.s b/data/scripts/maps/ShoalCave_LowTideLowerRoom.inc
index dfcd5b83f..dfcd5b83f 100644
--- a/data/scripts/maps/ShoalCave_LowTideLowerRoom.s
+++ b/data/scripts/maps/ShoalCave_LowTideLowerRoom.inc
diff --git a/data/scripts/maps/ShoalCave_LowTideStairsRoom.s b/data/scripts/maps/ShoalCave_LowTideStairsRoom.inc
index 584a57818..584a57818 100644
--- a/data/scripts/maps/ShoalCave_LowTideStairsRoom.s
+++ b/data/scripts/maps/ShoalCave_LowTideStairsRoom.inc
diff --git a/data/scripts/maps/SingleBattleColosseum.s b/data/scripts/maps/SingleBattleColosseum.inc
index d3f2bdcaf..d3f2bdcaf 100644
--- a/data/scripts/maps/SingleBattleColosseum.s
+++ b/data/scripts/maps/SingleBattleColosseum.inc
diff --git a/data/scripts/maps/SkyPillar_1F.s b/data/scripts/maps/SkyPillar_1F.inc
index aa6c117da..aa6c117da 100644
--- a/data/scripts/maps/SkyPillar_1F.s
+++ b/data/scripts/maps/SkyPillar_1F.inc
diff --git a/data/scripts/maps/SkyPillar_2F.s b/data/scripts/maps/SkyPillar_2F.inc
index 62cb389f2..62cb389f2 100644
--- a/data/scripts/maps/SkyPillar_2F.s
+++ b/data/scripts/maps/SkyPillar_2F.inc
diff --git a/data/scripts/maps/SkyPillar_3F.s b/data/scripts/maps/SkyPillar_3F.inc
index 2dc97fc9c..2dc97fc9c 100644
--- a/data/scripts/maps/SkyPillar_3F.s
+++ b/data/scripts/maps/SkyPillar_3F.inc
diff --git a/data/scripts/maps/SkyPillar_4F.s b/data/scripts/maps/SkyPillar_4F.inc
index 5e1f7f4e6..5e1f7f4e6 100644
--- a/data/scripts/maps/SkyPillar_4F.s
+++ b/data/scripts/maps/SkyPillar_4F.inc
diff --git a/data/scripts/maps/SkyPillar_5F.s b/data/scripts/maps/SkyPillar_5F.inc
index 64e6d0f38..64e6d0f38 100644
--- a/data/scripts/maps/SkyPillar_5F.s
+++ b/data/scripts/maps/SkyPillar_5F.inc
diff --git a/data/scripts/maps/SkyPillar_Entrance.s b/data/scripts/maps/SkyPillar_Entrance.inc
index 7a3927332..7a3927332 100644
--- a/data/scripts/maps/SkyPillar_Entrance.s
+++ b/data/scripts/maps/SkyPillar_Entrance.inc
diff --git a/data/scripts/maps/SkyPillar_Outside.s b/data/scripts/maps/SkyPillar_Outside.inc
index 51e6a4e83..51e6a4e83 100644
--- a/data/scripts/maps/SkyPillar_Outside.s
+++ b/data/scripts/maps/SkyPillar_Outside.inc
diff --git a/data/scripts/maps/SkyPillar_Top.s b/data/scripts/maps/SkyPillar_Top.inc
index b28d89d93..b28d89d93 100644
--- a/data/scripts/maps/SkyPillar_Top.s
+++ b/data/scripts/maps/SkyPillar_Top.inc
diff --git a/data/scripts/maps/SlateportCity.s b/data/scripts/maps/SlateportCity.inc
index 19f9af2eb..19f9af2eb 100644
--- a/data/scripts/maps/SlateportCity.s
+++ b/data/scripts/maps/SlateportCity.inc
diff --git a/data/scripts/maps/SlateportCity_ContestHall.s b/data/scripts/maps/SlateportCity_ContestHall.inc
index 559719583..559719583 100644
--- a/data/scripts/maps/SlateportCity_ContestHall.s
+++ b/data/scripts/maps/SlateportCity_ContestHall.inc
diff --git a/data/scripts/maps/SlateportCity_ContestLobby.s b/data/scripts/maps/SlateportCity_ContestLobby.inc
index 46b595034..46b595034 100644
--- a/data/scripts/maps/SlateportCity_ContestLobby.s
+++ b/data/scripts/maps/SlateportCity_ContestLobby.inc
diff --git a/data/scripts/maps/SlateportCity_Harbor.s b/data/scripts/maps/SlateportCity_Harbor.inc
index d65d28877..d65d28877 100644
--- a/data/scripts/maps/SlateportCity_Harbor.s
+++ b/data/scripts/maps/SlateportCity_Harbor.inc
diff --git a/data/scripts/maps/SlateportCity_House1.s b/data/scripts/maps/SlateportCity_House1.inc
index 936d520dd..936d520dd 100644
--- a/data/scripts/maps/SlateportCity_House1.s
+++ b/data/scripts/maps/SlateportCity_House1.inc
diff --git a/data/scripts/maps/SlateportCity_House2.s b/data/scripts/maps/SlateportCity_House2.inc
index 2d50f0851..2d50f0851 100644
--- a/data/scripts/maps/SlateportCity_House2.s
+++ b/data/scripts/maps/SlateportCity_House2.inc
diff --git a/data/scripts/maps/SlateportCity_Mart.s b/data/scripts/maps/SlateportCity_Mart.inc
index 730afe6d4..730afe6d4 100644
--- a/data/scripts/maps/SlateportCity_Mart.s
+++ b/data/scripts/maps/SlateportCity_Mart.inc
diff --git a/data/scripts/maps/SlateportCity_OceanicMuseum_1F.s b/data/scripts/maps/SlateportCity_OceanicMuseum_1F.inc
index 0bfeb4f5a..0bfeb4f5a 100644
--- a/data/scripts/maps/SlateportCity_OceanicMuseum_1F.s
+++ b/data/scripts/maps/SlateportCity_OceanicMuseum_1F.inc
diff --git a/data/scripts/maps/SlateportCity_OceanicMuseum_2F.s b/data/scripts/maps/SlateportCity_OceanicMuseum_2F.inc
index 57bfbbd03..57bfbbd03 100644
--- a/data/scripts/maps/SlateportCity_OceanicMuseum_2F.s
+++ b/data/scripts/maps/SlateportCity_OceanicMuseum_2F.inc
diff --git a/data/scripts/maps/SlateportCity_PokemonCenter_1F.s b/data/scripts/maps/SlateportCity_PokemonCenter_1F.inc
index c550a6850..c550a6850 100644
--- a/data/scripts/maps/SlateportCity_PokemonCenter_1F.s
+++ b/data/scripts/maps/SlateportCity_PokemonCenter_1F.inc
diff --git a/data/scripts/maps/SlateportCity_PokemonCenter_2F.s b/data/scripts/maps/SlateportCity_PokemonCenter_2F.inc
index 98782b24d..98782b24d 100644
--- a/data/scripts/maps/SlateportCity_PokemonCenter_2F.s
+++ b/data/scripts/maps/SlateportCity_PokemonCenter_2F.inc
diff --git a/data/scripts/maps/SlateportCity_PokemonFanClub.s b/data/scripts/maps/SlateportCity_PokemonFanClub.inc
index 8f0323f77..8f0323f77 100644
--- a/data/scripts/maps/SlateportCity_PokemonFanClub.s
+++ b/data/scripts/maps/SlateportCity_PokemonFanClub.inc
diff --git a/data/scripts/maps/SlateportCity_SternsShipyard_1F.s b/data/scripts/maps/SlateportCity_SternsShipyard_1F.inc
index 4c0596d29..4c0596d29 100644
--- a/data/scripts/maps/SlateportCity_SternsShipyard_1F.s
+++ b/data/scripts/maps/SlateportCity_SternsShipyard_1F.inc
diff --git a/data/scripts/maps/SlateportCity_SternsShipyard_2F.s b/data/scripts/maps/SlateportCity_SternsShipyard_2F.inc
index df9227dd3..df9227dd3 100644
--- a/data/scripts/maps/SlateportCity_SternsShipyard_2F.s
+++ b/data/scripts/maps/SlateportCity_SternsShipyard_2F.inc
diff --git a/data/scripts/maps/SootopolisCity.s b/data/scripts/maps/SootopolisCity.inc
index 3d9c2dc93..3d9c2dc93 100644
--- a/data/scripts/maps/SootopolisCity.s
+++ b/data/scripts/maps/SootopolisCity.inc
diff --git a/data/scripts/maps/SootopolisCity_Gym_1F.s b/data/scripts/maps/SootopolisCity_Gym_1F.inc
index e28ab4547..e28ab4547 100644
--- a/data/scripts/maps/SootopolisCity_Gym_1F.s
+++ b/data/scripts/maps/SootopolisCity_Gym_1F.inc
diff --git a/data/scripts/maps/SootopolisCity_Gym_B1F.s b/data/scripts/maps/SootopolisCity_Gym_B1F.inc
index e54970701..e54970701 100644
--- a/data/scripts/maps/SootopolisCity_Gym_B1F.s
+++ b/data/scripts/maps/SootopolisCity_Gym_B1F.inc
diff --git a/data/scripts/maps/SootopolisCity_House1.s b/data/scripts/maps/SootopolisCity_House1.inc
index 604f04c4f..604f04c4f 100644
--- a/data/scripts/maps/SootopolisCity_House1.s
+++ b/data/scripts/maps/SootopolisCity_House1.inc
diff --git a/data/scripts/maps/SootopolisCity_House2.s b/data/scripts/maps/SootopolisCity_House2.inc
index 409a871a8..409a871a8 100644
--- a/data/scripts/maps/SootopolisCity_House2.s
+++ b/data/scripts/maps/SootopolisCity_House2.inc
diff --git a/data/scripts/maps/SootopolisCity_House3.s b/data/scripts/maps/SootopolisCity_House3.inc
index 88e35730e..88e35730e 100644
--- a/data/scripts/maps/SootopolisCity_House3.s
+++ b/data/scripts/maps/SootopolisCity_House3.inc
diff --git a/data/scripts/maps/SootopolisCity_House4.s b/data/scripts/maps/SootopolisCity_House4.inc
index ee3bfe61b..ee3bfe61b 100644
--- a/data/scripts/maps/SootopolisCity_House4.s
+++ b/data/scripts/maps/SootopolisCity_House4.inc
diff --git a/data/scripts/maps/SootopolisCity_House5.s b/data/scripts/maps/SootopolisCity_House5.inc
index 26e5c7d5c..26e5c7d5c 100644
--- a/data/scripts/maps/SootopolisCity_House5.s
+++ b/data/scripts/maps/SootopolisCity_House5.inc
diff --git a/data/scripts/maps/SootopolisCity_House6.s b/data/scripts/maps/SootopolisCity_House6.inc
index cccfa78ee..cccfa78ee 100644
--- a/data/scripts/maps/SootopolisCity_House6.s
+++ b/data/scripts/maps/SootopolisCity_House6.inc
diff --git a/data/scripts/maps/SootopolisCity_House7.s b/data/scripts/maps/SootopolisCity_House7.inc
index a9b06b176..a9b06b176 100644
--- a/data/scripts/maps/SootopolisCity_House7.s
+++ b/data/scripts/maps/SootopolisCity_House7.inc
diff --git a/data/scripts/maps/SootopolisCity_House8.s b/data/scripts/maps/SootopolisCity_House8.inc
index c52965124..c52965124 100644
--- a/data/scripts/maps/SootopolisCity_House8.s
+++ b/data/scripts/maps/SootopolisCity_House8.inc
diff --git a/data/scripts/maps/SootopolisCity_Mart.s b/data/scripts/maps/SootopolisCity_Mart.inc
index 9f37f9d0b..9f37f9d0b 100644
--- a/data/scripts/maps/SootopolisCity_Mart.s
+++ b/data/scripts/maps/SootopolisCity_Mart.inc
diff --git a/data/scripts/maps/SootopolisCity_PokemonCenter_1F.s b/data/scripts/maps/SootopolisCity_PokemonCenter_1F.inc
index 29cc06584..29cc06584 100644
--- a/data/scripts/maps/SootopolisCity_PokemonCenter_1F.s
+++ b/data/scripts/maps/SootopolisCity_PokemonCenter_1F.inc
diff --git a/data/scripts/maps/SootopolisCity_PokemonCenter_2F.s b/data/scripts/maps/SootopolisCity_PokemonCenter_2F.inc
index 0547e666f..0547e666f 100644
--- a/data/scripts/maps/SootopolisCity_PokemonCenter_2F.s
+++ b/data/scripts/maps/SootopolisCity_PokemonCenter_2F.inc
diff --git a/data/scripts/maps/SouthernIsland_Exterior.s b/data/scripts/maps/SouthernIsland_Exterior.inc
index 9723647cd..9723647cd 100644
--- a/data/scripts/maps/SouthernIsland_Exterior.s
+++ b/data/scripts/maps/SouthernIsland_Exterior.inc
diff --git a/data/scripts/maps/SouthernIsland_Interior.s b/data/scripts/maps/SouthernIsland_Interior.inc
index d3b944f29..d3b944f29 100644
--- a/data/scripts/maps/SouthernIsland_Interior.s
+++ b/data/scripts/maps/SouthernIsland_Interior.inc
diff --git a/data/scripts/maps/TradeCenter.s b/data/scripts/maps/TradeCenter.inc
index dadb3e875..dadb3e875 100644
--- a/data/scripts/maps/TradeCenter.s
+++ b/data/scripts/maps/TradeCenter.inc
diff --git a/data/scripts/maps/Underwater1.s b/data/scripts/maps/Underwater1.inc
index ab2e910fe..ab2e910fe 100644
--- a/data/scripts/maps/Underwater1.s
+++ b/data/scripts/maps/Underwater1.inc
diff --git a/data/scripts/maps/Underwater2.s b/data/scripts/maps/Underwater2.inc
index cf60a2b34..cf60a2b34 100644
--- a/data/scripts/maps/Underwater2.s
+++ b/data/scripts/maps/Underwater2.inc
diff --git a/data/scripts/maps/Underwater3.s b/data/scripts/maps/Underwater3.inc
index c34b07b1c..c34b07b1c 100644
--- a/data/scripts/maps/Underwater3.s
+++ b/data/scripts/maps/Underwater3.inc
diff --git a/data/scripts/maps/Underwater4.s b/data/scripts/maps/Underwater4.inc
index 0d2256e07..0d2256e07 100644
--- a/data/scripts/maps/Underwater4.s
+++ b/data/scripts/maps/Underwater4.inc
diff --git a/data/scripts/maps/Underwater_Route134.s b/data/scripts/maps/Underwater_Route134.inc
index ee79f9799..ee79f9799 100644
--- a/data/scripts/maps/Underwater_Route134.s
+++ b/data/scripts/maps/Underwater_Route134.inc
diff --git a/data/scripts/maps/Underwater_SeafloorCavern.s b/data/scripts/maps/Underwater_SeafloorCavern.inc
index c879ec609..c879ec609 100644
--- a/data/scripts/maps/Underwater_SeafloorCavern.s
+++ b/data/scripts/maps/Underwater_SeafloorCavern.inc
diff --git a/data/scripts/maps/Underwater_SealedChamber.s b/data/scripts/maps/Underwater_SealedChamber.inc
index d7e7aabcb..d7e7aabcb 100644
--- a/data/scripts/maps/Underwater_SealedChamber.s
+++ b/data/scripts/maps/Underwater_SealedChamber.inc
diff --git a/data/scripts/maps/Underwater_SootopolisCity.s b/data/scripts/maps/Underwater_SootopolisCity.inc
index 624c2c83e..624c2c83e 100644
--- a/data/scripts/maps/Underwater_SootopolisCity.s
+++ b/data/scripts/maps/Underwater_SootopolisCity.inc
diff --git a/data/scripts/maps/UnknownMap_25_29.s b/data/scripts/maps/UnknownMap_25_29.inc
index a62e0c9f3..a62e0c9f3 100644
--- a/data/scripts/maps/UnknownMap_25_29.s
+++ b/data/scripts/maps/UnknownMap_25_29.inc
diff --git a/data/scripts/maps/UnknownMap_25_30.s b/data/scripts/maps/UnknownMap_25_30.inc
index 70a1f0ac2..70a1f0ac2 100644
--- a/data/scripts/maps/UnknownMap_25_30.s
+++ b/data/scripts/maps/UnknownMap_25_30.inc
diff --git a/data/scripts/maps/UnknownMap_25_31.s b/data/scripts/maps/UnknownMap_25_31.inc
index 44c67cab5..44c67cab5 100644
--- a/data/scripts/maps/UnknownMap_25_31.s
+++ b/data/scripts/maps/UnknownMap_25_31.inc
diff --git a/data/scripts/maps/UnknownMap_25_32.s b/data/scripts/maps/UnknownMap_25_32.inc
index 485a626e6..485a626e6 100644
--- a/data/scripts/maps/UnknownMap_25_32.s
+++ b/data/scripts/maps/UnknownMap_25_32.inc
diff --git a/data/scripts/maps/UnknownMap_25_33.s b/data/scripts/maps/UnknownMap_25_33.inc
index 68feb9cc6..68feb9cc6 100644
--- a/data/scripts/maps/UnknownMap_25_33.s
+++ b/data/scripts/maps/UnknownMap_25_33.inc
diff --git a/data/scripts/maps/UnknownMap_25_34.s b/data/scripts/maps/UnknownMap_25_34.inc
index f4f1fe61c..f4f1fe61c 100644
--- a/data/scripts/maps/UnknownMap_25_34.s
+++ b/data/scripts/maps/UnknownMap_25_34.inc
diff --git a/data/scripts/maps/VerdanturfTown.s b/data/scripts/maps/VerdanturfTown.inc
index 610643823..610643823 100644
--- a/data/scripts/maps/VerdanturfTown.s
+++ b/data/scripts/maps/VerdanturfTown.inc
diff --git a/data/scripts/maps/VerdanturfTown_ContestHall.s b/data/scripts/maps/VerdanturfTown_ContestHall.inc
index 380385a88..380385a88 100644
--- a/data/scripts/maps/VerdanturfTown_ContestHall.s
+++ b/data/scripts/maps/VerdanturfTown_ContestHall.inc
diff --git a/data/scripts/maps/VerdanturfTown_ContestLobby.s b/data/scripts/maps/VerdanturfTown_ContestLobby.inc
index 7033e4fb1..7033e4fb1 100644
--- a/data/scripts/maps/VerdanturfTown_ContestLobby.s
+++ b/data/scripts/maps/VerdanturfTown_ContestLobby.inc
diff --git a/data/scripts/maps/VerdanturfTown_FriendshipRatersHouse.s b/data/scripts/maps/VerdanturfTown_FriendshipRatersHouse.inc
index 2dc2e1355..2dc2e1355 100644
--- a/data/scripts/maps/VerdanturfTown_FriendshipRatersHouse.s
+++ b/data/scripts/maps/VerdanturfTown_FriendshipRatersHouse.inc
diff --git a/data/scripts/maps/VerdanturfTown_House.s b/data/scripts/maps/VerdanturfTown_House.inc
index 45a22ae93..45a22ae93 100644
--- a/data/scripts/maps/VerdanturfTown_House.s
+++ b/data/scripts/maps/VerdanturfTown_House.inc
diff --git a/data/scripts/maps/VerdanturfTown_Mart.s b/data/scripts/maps/VerdanturfTown_Mart.inc
index 4227dc8b1..4227dc8b1 100644
--- a/data/scripts/maps/VerdanturfTown_Mart.s
+++ b/data/scripts/maps/VerdanturfTown_Mart.inc
diff --git a/data/scripts/maps/VerdanturfTown_PokemonCenter_1F.s b/data/scripts/maps/VerdanturfTown_PokemonCenter_1F.inc
index e0fee3fb8..e0fee3fb8 100644
--- a/data/scripts/maps/VerdanturfTown_PokemonCenter_1F.s
+++ b/data/scripts/maps/VerdanturfTown_PokemonCenter_1F.inc
diff --git a/data/scripts/maps/VerdanturfTown_PokemonCenter_2F.s b/data/scripts/maps/VerdanturfTown_PokemonCenter_2F.inc
index ec52d45a7..ec52d45a7 100644
--- a/data/scripts/maps/VerdanturfTown_PokemonCenter_2F.s
+++ b/data/scripts/maps/VerdanturfTown_PokemonCenter_2F.inc
diff --git a/data/scripts/maps/VerdanturfTown_WandasHouse.s b/data/scripts/maps/VerdanturfTown_WandasHouse.inc
index 80bd6151d..80bd6151d 100644
--- a/data/scripts/maps/VerdanturfTown_WandasHouse.s
+++ b/data/scripts/maps/VerdanturfTown_WandasHouse.inc
diff --git a/data/scripts/maps/VictoryRoad_1F.s b/data/scripts/maps/VictoryRoad_1F.inc
index b1f6e732b..b1f6e732b 100644
--- a/data/scripts/maps/VictoryRoad_1F.s
+++ b/data/scripts/maps/VictoryRoad_1F.inc
diff --git a/data/scripts/maps/VictoryRoad_B1F.s b/data/scripts/maps/VictoryRoad_B1F.inc
index e07cd4286..e07cd4286 100644
--- a/data/scripts/maps/VictoryRoad_B1F.s
+++ b/data/scripts/maps/VictoryRoad_B1F.inc
diff --git a/data/scripts/maps/VictoryRoad_B2F.s b/data/scripts/maps/VictoryRoad_B2F.inc
index 6b8fe2569..6b8fe2569 100644
--- a/data/scripts/maps/VictoryRoad_B2F.s
+++ b/data/scripts/maps/VictoryRoad_B2F.inc
diff --git a/data/scripts/mystery_event_club.s b/data/scripts/mystery_event_club.inc
index 15d4b2a40..15d4b2a40 100644
--- a/data/scripts/mystery_event_club.s
+++ b/data/scripts/mystery_event_club.inc
diff --git a/data/scripts/players_house.s b/data/scripts/players_house.inc
index 9db432c2c..9db432c2c 100644
--- a/data/scripts/players_house.s
+++ b/data/scripts/players_house.inc
diff --git a/data/scripts/pokeblocks.s b/data/scripts/pokeblocks.inc
index 2cb283173..2cb283173 100644
--- a/data/scripts/pokeblocks.s
+++ b/data/scripts/pokeblocks.inc
diff --git a/data/scripts/safari_zone.s b/data/scripts/safari_zone.inc
index c8d519038..c8d519038 100644
--- a/data/scripts/safari_zone.s
+++ b/data/scripts/safari_zone.inc
diff --git a/data/scripts/secret_power_tm.s b/data/scripts/secret_power_tm.inc
index 629125030..629125030 100644
--- a/data/scripts/secret_power_tm.s
+++ b/data/scripts/secret_power_tm.inc
diff --git a/data/scripts/storyteller.s b/data/scripts/storyteller.inc
index c44480e2f..c44480e2f 100644
--- a/data/scripts/storyteller.s
+++ b/data/scripts/storyteller.inc
diff --git a/data/scripts/trader.s b/data/scripts/trader.inc
index b3a302516..b3a302516 100644
--- a/data/scripts/trader.s
+++ b/data/scripts/trader.inc
diff --git a/data/scripts/tv.s b/data/scripts/tv.inc
index 2b317e725..2b317e725 100644
--- a/data/scripts/tv.s
+++ b/data/scripts/tv.inc
diff --git a/data/sine_degree_table.s b/data/sine_degree_table.inc
index a9cf05b62..a9cf05b62 100644
--- a/data/sine_degree_table.s
+++ b/data/sine_degree_table.inc
diff --git a/data/sine_table.s b/data/sine_table.inc
index fd1a5da72..fd1a5da72 100644
--- a/data/sine_table.s
+++ b/data/sine_table.inc
diff --git a/data/sound_data.s b/data/sound_data.s
index d9dc459ed..cd33950e1 100644
--- a/data/sound_data.s
+++ b/data/sound_data.s
@@ -1,13 +1,13 @@
 	.section .rodata
 
-	.include "asm/macros/m4a.s"
-	.include "asm/macros/music_voice.s"
+	.include "asm/macros/m4a.inc"
+	.include "asm/macros/music_voice.inc"
 
-	.include "sound/voice_groups.s"
-	.include "sound/keysplit_tables.s"
-	.include "sound/programmable_wave_data.s"
-	.include "sound/music_player_table.s"
-	.include "sound/song_table.s"
-	.include "sound/direct_sound_data.s"
+	.include "sound/voice_groups.inc"
+	.include "sound/keysplit_tables.inc"
+	.include "sound/programmable_wave_data.inc"
+	.include "sound/music_player_table.inc"
+	.include "sound/song_table.inc"
+	.include "sound/direct_sound_data.inc"
 
 	.align 2
diff --git a/data/specials.s b/data/specials.inc
index b7ac9ad90..b7ac9ad90 100644
--- a/data/specials.s
+++ b/data/specials.inc
diff --git a/data/species_id_conversion_tables.s b/data/species_id_conversion_tables.inc
index 88725d2bd..88725d2bd 100644
--- a/data/species_id_conversion_tables.s
+++ b/data/species_id_conversion_tables.inc
diff --git a/data/spinda_spot_graphics.s b/data/spinda_spot_graphics.inc
index 3316a5639..3316a5639 100644
--- a/data/spinda_spot_graphics.s
+++ b/data/spinda_spot_graphics.inc
diff --git a/data/text/ability_descriptions.s b/data/text/ability_descriptions.inc
index a57225a50..a57225a50 100644
--- a/data/text/ability_descriptions.s
+++ b/data/text/ability_descriptions.inc
diff --git a/data/text/ability_names.s b/data/text/ability_names.inc
index ec0265fda..ec0265fda 100644
--- a/data/text/ability_names.s
+++ b/data/text/ability_names.inc
diff --git a/data/text/aqua_awakening.s b/data/text/aqua_awakening.inc
index bfe2d1d01..bfe2d1d01 100644
--- a/data/text/aqua_awakening.s
+++ b/data/text/aqua_awakening.inc
diff --git a/data/text/aqua_chimney.s b/data/text/aqua_chimney.inc
index 2c8d94a0b..2c8d94a0b 100644
--- a/data/text/aqua_chimney.s
+++ b/data/text/aqua_chimney.inc
diff --git a/data/text/aqua_settled.s b/data/text/aqua_settled.inc
index 13f503c41..13f503c41 100644
--- a/data/text/aqua_settled.s
+++ b/data/text/aqua_settled.inc
diff --git a/data/text/aqua_summit.s b/data/text/aqua_summit.inc
index 696ef0084..696ef0084 100644
--- a/data/text/aqua_summit.s
+++ b/data/text/aqua_summit.inc
diff --git a/data/text/barboach.s b/data/text/barboach.inc
index b78603286..b78603286 100644
--- a/data/text/barboach.s
+++ b/data/text/barboach.inc
diff --git a/data/text/bard.s b/data/text/bard.inc
index edf4942f6..edf4942f6 100644
--- a/data/text/bard.s
+++ b/data/text/bard.inc
diff --git a/data/text/battle_strings.s b/data/text/battle_strings.inc
index b4542b1b9..b4542b1b9 100644
--- a/data/text/battle_strings.s
+++ b/data/text/battle_strings.inc
diff --git a/data/text/berries.s b/data/text/berries.inc
index 8a5abad2c..8a5abad2c 100644
--- a/data/text/berries.s
+++ b/data/text/berries.inc
diff --git a/data/text/berry_descriptions.s b/data/text/berry_descriptions.inc
index ace0cff17..ace0cff17 100644
--- a/data/text/berry_descriptions.s
+++ b/data/text/berry_descriptions.inc
diff --git a/data/text/berry_tree.s b/data/text/berry_tree.inc
index 4ffbf51c4..4ffbf51c4 100644
--- a/data/text/berry_tree.s
+++ b/data/text/berry_tree.inc
diff --git a/data/text/birch_speech.s b/data/text/birch_speech.inc
index be9c03588..be9c03588 100644
--- a/data/text/birch_speech.s
+++ b/data/text/birch_speech.inc
diff --git a/data/text/braille.s b/data/text/braille.inc
index 66b6438a6..66b6438a6 100644
--- a/data/text/braille.s
+++ b/data/text/braille.inc
diff --git a/data/text/cable_club.s b/data/text/cable_club.inc
index 1d3c7fd92..1d3c7fd92 100644
--- a/data/text/cable_club.s
+++ b/data/text/cable_club.inc
diff --git a/data/text/contest_hall.s b/data/text/contest_hall.inc
index 3a8682208..3a8682208 100644
--- a/data/text/contest_hall.s
+++ b/data/text/contest_hall.inc
diff --git a/data/text/contest_strings.s b/data/text/contest_strings.inc
index 4c4f37fc4..4c4f37fc4 100644
--- a/data/text/contest_strings.s
+++ b/data/text/contest_strings.inc
diff --git a/data/text/credits.s b/data/text/credits.inc
index 2f7aa5478..2f7aa5478 100644
--- a/data/text/credits.s
+++ b/data/text/credits.inc
diff --git a/data/text/day_care.s b/data/text/day_care.inc
index 8f8e31266..8f8e31266 100644
--- a/data/text/day_care.s
+++ b/data/text/day_care.inc
diff --git a/data/text/easy_chat/group_name_strings.s b/data/text/easy_chat/group_name_strings.inc
index 1113c4072..1113c4072 100644
--- a/data/text/easy_chat/group_name_strings.s
+++ b/data/text/easy_chat/group_name_strings.inc
diff --git a/data/text/easy_chat/group_name_table.s b/data/text/easy_chat/group_name_table.inc
index 7c1bfa575..7c1bfa575 100644
--- a/data/text/easy_chat/group_name_table.s
+++ b/data/text/easy_chat/group_name_table.inc
diff --git a/data/text/easy_chat/group_orders.s b/data/text/easy_chat/group_orders.inc
index d08f70a2a..d08f70a2a 100644
--- a/data/text/easy_chat/group_orders.s
+++ b/data/text/easy_chat/group_orders.inc
diff --git a/data/text/easy_chat/group_sizes.s b/data/text/easy_chat/group_sizes.inc
index ee89beed2..ee89beed2 100644
--- a/data/text/easy_chat/group_sizes.s
+++ b/data/text/easy_chat/group_sizes.inc
diff --git a/data/text/easy_chat/group_words.s b/data/text/easy_chat/group_words.inc
index b45b767b8..b45b767b8 100644
--- a/data/text/easy_chat/group_words.s
+++ b/data/text/easy_chat/group_words.inc
diff --git a/data/text/easy_chat/words_by_letter.s b/data/text/easy_chat/words_by_letter.inc
index 86fba988e..86fba988e 100644
--- a/data/text/easy_chat/words_by_letter.s
+++ b/data/text/easy_chat/words_by_letter.inc
diff --git a/data/text/eon_ticket.s b/data/text/eon_ticket.inc
index 0da9317af..0da9317af 100644
--- a/data/text/eon_ticket.s
+++ b/data/text/eon_ticket.inc
diff --git a/data/text/giddy.s b/data/text/giddy.inc
index 040ef2ae5..040ef2ae5 100644
--- a/data/text/giddy.s
+++ b/data/text/giddy.inc
diff --git a/data/text/gift_ribbon_descriptions.s b/data/text/gift_ribbon_descriptions.inc
index 798d291b9..798d291b9 100644
--- a/data/text/gift_ribbon_descriptions.s
+++ b/data/text/gift_ribbon_descriptions.inc
diff --git a/data/text/hipster.s b/data/text/hipster.inc
index a30943d3a..a30943d3a 100644
--- a/data/text/hipster.s
+++ b/data/text/hipster.inc
diff --git a/data/text/item_descriptions.s b/data/text/item_descriptions.inc
index 6fda439b0..6fda439b0 100644
--- a/data/text/item_descriptions.s
+++ b/data/text/item_descriptions.inc
diff --git a/data/text/landmarks.s b/data/text/landmarks.inc
index 72d5398bd..72d5398bd 100644
--- a/data/text/landmarks.s
+++ b/data/text/landmarks.inc
diff --git a/data/text/lottery_corner.s b/data/text/lottery_corner.inc
index 6fb3f1e91..6fb3f1e91 100644
--- a/data/text/lottery_corner.s
+++ b/data/text/lottery_corner.inc
diff --git a/data/text/magma_awakening.s b/data/text/magma_awakening.inc
index c64b35543..c64b35543 100644
--- a/data/text/magma_awakening.s
+++ b/data/text/magma_awakening.inc
diff --git a/data/text/magma_chimney.s b/data/text/magma_chimney.inc
index cdfde2ef2..cdfde2ef2 100644
--- a/data/text/magma_chimney.s
+++ b/data/text/magma_chimney.inc
diff --git a/data/text/magma_settled.s b/data/text/magma_settled.inc
index 073f6540f..073f6540f 100644
--- a/data/text/magma_settled.s
+++ b/data/text/magma_settled.inc
diff --git a/data/text/magma_summit.s b/data/text/magma_summit.inc
index 8e17fe87d..8e17fe87d 100644
--- a/data/text/magma_summit.s
+++ b/data/text/magma_summit.inc
diff --git a/data/text/maps/AbandonedShip_CaptainsOffice.s b/data/text/maps/AbandonedShip_CaptainsOffice.inc
index bdd2057c4..bdd2057c4 100644
--- a/data/text/maps/AbandonedShip_CaptainsOffice.s
+++ b/data/text/maps/AbandonedShip_CaptainsOffice.inc
diff --git a/data/text/maps/AbandonedShip_Corridors_1F.s b/data/text/maps/AbandonedShip_Corridors_1F.inc
index 2df1c32b2..2df1c32b2 100644
--- a/data/text/maps/AbandonedShip_Corridors_1F.s
+++ b/data/text/maps/AbandonedShip_Corridors_1F.inc
diff --git a/data/text/maps/AbandonedShip_Corridors_B1F.s b/data/text/maps/AbandonedShip_Corridors_B1F.inc
index 887a6c11a..887a6c11a 100644
--- a/data/text/maps/AbandonedShip_Corridors_B1F.s
+++ b/data/text/maps/AbandonedShip_Corridors_B1F.inc
diff --git a/data/text/maps/AbandonedShip_HiddenFloorCorridors.s b/data/text/maps/AbandonedShip_HiddenFloorCorridors.inc
index 4e7c2014f..4e7c2014f 100644
--- a/data/text/maps/AbandonedShip_HiddenFloorCorridors.s
+++ b/data/text/maps/AbandonedShip_HiddenFloorCorridors.inc
diff --git a/data/text/maps/AbandonedShip_HiddenFloorRooms.s b/data/text/maps/AbandonedShip_HiddenFloorRooms.inc
index 1be9f8f02..1be9f8f02 100644
--- a/data/text/maps/AbandonedShip_HiddenFloorRooms.s
+++ b/data/text/maps/AbandonedShip_HiddenFloorRooms.inc
diff --git a/data/text/maps/AbandonedShip_Rooms2_1F.s b/data/text/maps/AbandonedShip_Rooms2_1F.inc
index 3acf542fc..3acf542fc 100644
--- a/data/text/maps/AbandonedShip_Rooms2_1F.s
+++ b/data/text/maps/AbandonedShip_Rooms2_1F.inc
diff --git a/data/text/maps/AbandonedShip_Rooms2_B1F.s b/data/text/maps/AbandonedShip_Rooms2_B1F.inc
index 11e505abd..11e505abd 100644
--- a/data/text/maps/AbandonedShip_Rooms2_B1F.s
+++ b/data/text/maps/AbandonedShip_Rooms2_B1F.inc
diff --git a/data/text/maps/AbandonedShip_Rooms_1F.s b/data/text/maps/AbandonedShip_Rooms_1F.inc
index 67b67ca4c..67b67ca4c 100644
--- a/data/text/maps/AbandonedShip_Rooms_1F.s
+++ b/data/text/maps/AbandonedShip_Rooms_1F.inc
diff --git a/data/text/maps/AbandonedShip_Rooms_B1F.s b/data/text/maps/AbandonedShip_Rooms_B1F.inc
index 45df47d60..45df47d60 100644
--- a/data/text/maps/AbandonedShip_Rooms_B1F.s
+++ b/data/text/maps/AbandonedShip_Rooms_B1F.inc
diff --git a/data/text/maps/AquaHideout_1F.s b/data/text/maps/AquaHideout_1F.inc
index 6c003d308..6c003d308 100644
--- a/data/text/maps/AquaHideout_1F.s
+++ b/data/text/maps/AquaHideout_1F.inc
diff --git a/data/text/maps/AquaHideout_B1F.s b/data/text/maps/AquaHideout_B1F.inc
index 605a98b8b..605a98b8b 100644
--- a/data/text/maps/AquaHideout_B1F.s
+++ b/data/text/maps/AquaHideout_B1F.inc
diff --git a/data/text/maps/AquaHideout_B2F.s b/data/text/maps/AquaHideout_B2F.inc
index f4b7dd035..f4b7dd035 100644
--- a/data/text/maps/AquaHideout_B2F.s
+++ b/data/text/maps/AquaHideout_B2F.inc
diff --git a/data/text/maps/BattleTower_BattleRoom.s b/data/text/maps/BattleTower_BattleRoom.inc
index 9f72d8971..9f72d8971 100644
--- a/data/text/maps/BattleTower_BattleRoom.s
+++ b/data/text/maps/BattleTower_BattleRoom.inc
diff --git a/data/text/maps/BattleTower_Lobby.s b/data/text/maps/BattleTower_Lobby.inc
index db94f1bce..db94f1bce 100644
--- a/data/text/maps/BattleTower_Lobby.s
+++ b/data/text/maps/BattleTower_Lobby.inc
diff --git a/data/text/maps/BattleTower_Outside.s b/data/text/maps/BattleTower_Outside.inc
index 934ebca36..934ebca36 100644
--- a/data/text/maps/BattleTower_Outside.s
+++ b/data/text/maps/BattleTower_Outside.inc
diff --git a/data/text/maps/DewfordTown.s b/data/text/maps/DewfordTown.inc
index efdbfbff6..efdbfbff6 100644
--- a/data/text/maps/DewfordTown.s
+++ b/data/text/maps/DewfordTown.inc
diff --git a/data/text/maps/DewfordTown_Gym.s b/data/text/maps/DewfordTown_Gym.inc
index 24d90ec6c..24d90ec6c 100644
--- a/data/text/maps/DewfordTown_Gym.s
+++ b/data/text/maps/DewfordTown_Gym.inc
diff --git a/data/text/maps/DewfordTown_Hall.s b/data/text/maps/DewfordTown_Hall.inc
index 6b9f4337e..6b9f4337e 100644
--- a/data/text/maps/DewfordTown_Hall.s
+++ b/data/text/maps/DewfordTown_Hall.inc
diff --git a/data/text/maps/DewfordTown_House1.s b/data/text/maps/DewfordTown_House1.inc
index d004acf7f..d004acf7f 100644
--- a/data/text/maps/DewfordTown_House1.s
+++ b/data/text/maps/DewfordTown_House1.inc
diff --git a/data/text/maps/DewfordTown_House2.s b/data/text/maps/DewfordTown_House2.inc
index b37456112..b37456112 100644
--- a/data/text/maps/DewfordTown_House2.s
+++ b/data/text/maps/DewfordTown_House2.inc
diff --git a/data/text/maps/DewfordTown_PokemonCenter_1F.s b/data/text/maps/DewfordTown_PokemonCenter_1F.inc
index 9c4a6f41c..9c4a6f41c 100644
--- a/data/text/maps/DewfordTown_PokemonCenter_1F.s
+++ b/data/text/maps/DewfordTown_PokemonCenter_1F.inc
diff --git a/data/text/maps/EverGrandeCity.s b/data/text/maps/EverGrandeCity.inc
index f468bf3b7..f468bf3b7 100644
--- a/data/text/maps/EverGrandeCity.s
+++ b/data/text/maps/EverGrandeCity.inc
diff --git a/data/text/maps/EverGrandeCity_ChampionsRoom.s b/data/text/maps/EverGrandeCity_ChampionsRoom.inc
index c7c63e208..c7c63e208 100644
--- a/data/text/maps/EverGrandeCity_ChampionsRoom.s
+++ b/data/text/maps/EverGrandeCity_ChampionsRoom.inc
diff --git a/data/text/maps/EverGrandeCity_DrakesRoom.s b/data/text/maps/EverGrandeCity_DrakesRoom.inc
index ed89c22bf..ed89c22bf 100644
--- a/data/text/maps/EverGrandeCity_DrakesRoom.s
+++ b/data/text/maps/EverGrandeCity_DrakesRoom.inc
diff --git a/data/text/maps/EverGrandeCity_GlaciasRoom.s b/data/text/maps/EverGrandeCity_GlaciasRoom.inc
index 88fa1e664..88fa1e664 100644
--- a/data/text/maps/EverGrandeCity_GlaciasRoom.s
+++ b/data/text/maps/EverGrandeCity_GlaciasRoom.inc
diff --git a/data/text/maps/EverGrandeCity_HallOfFame.s b/data/text/maps/EverGrandeCity_HallOfFame.inc
index c684dcb72..c684dcb72 100644
--- a/data/text/maps/EverGrandeCity_HallOfFame.s
+++ b/data/text/maps/EverGrandeCity_HallOfFame.inc
diff --git a/data/text/maps/EverGrandeCity_PhoebesRoom.s b/data/text/maps/EverGrandeCity_PhoebesRoom.inc
index e77a7d31a..e77a7d31a 100644
--- a/data/text/maps/EverGrandeCity_PhoebesRoom.s
+++ b/data/text/maps/EverGrandeCity_PhoebesRoom.inc
diff --git a/data/text/maps/EverGrandeCity_PokemonCenter_1F.s b/data/text/maps/EverGrandeCity_PokemonCenter_1F.inc
index 18594308a..18594308a 100644
--- a/data/text/maps/EverGrandeCity_PokemonCenter_1F.s
+++ b/data/text/maps/EverGrandeCity_PokemonCenter_1F.inc
diff --git a/data/text/maps/EverGrandeCity_PokemonLeague.s b/data/text/maps/EverGrandeCity_PokemonLeague.inc
index 89971022c..89971022c 100644
--- a/data/text/maps/EverGrandeCity_PokemonLeague.s
+++ b/data/text/maps/EverGrandeCity_PokemonLeague.inc
diff --git a/data/text/maps/EverGrandeCity_SidneysRoom.s b/data/text/maps/EverGrandeCity_SidneysRoom.inc
index 84d1dddf5..84d1dddf5 100644
--- a/data/text/maps/EverGrandeCity_SidneysRoom.s
+++ b/data/text/maps/EverGrandeCity_SidneysRoom.inc
diff --git a/data/text/maps/FallarborTown.s b/data/text/maps/FallarborTown.inc
index 1483272de..1483272de 100644
--- a/data/text/maps/FallarborTown.s
+++ b/data/text/maps/FallarborTown.inc
diff --git a/data/text/maps/FallarborTown_ContestHall.s b/data/text/maps/FallarborTown_ContestHall.inc
index 5db8766c5..5db8766c5 100644
--- a/data/text/maps/FallarborTown_ContestHall.s
+++ b/data/text/maps/FallarborTown_ContestHall.inc
diff --git a/data/text/maps/FallarborTown_ContestLobby.s b/data/text/maps/FallarborTown_ContestLobby.inc
index 5d4305f8c..5d4305f8c 100644
--- a/data/text/maps/FallarborTown_ContestLobby.s
+++ b/data/text/maps/FallarborTown_ContestLobby.inc
diff --git a/data/text/maps/FallarborTown_House1.s b/data/text/maps/FallarborTown_House1.inc
index c882bc9b7..c882bc9b7 100644
--- a/data/text/maps/FallarborTown_House1.s
+++ b/data/text/maps/FallarborTown_House1.inc
diff --git a/data/text/maps/FallarborTown_House2.s b/data/text/maps/FallarborTown_House2.inc
index de6d63fad..de6d63fad 100644
--- a/data/text/maps/FallarborTown_House2.s
+++ b/data/text/maps/FallarborTown_House2.inc
diff --git a/data/text/maps/FallarborTown_Mart.s b/data/text/maps/FallarborTown_Mart.inc
index bc8b3fb32..bc8b3fb32 100644
--- a/data/text/maps/FallarborTown_Mart.s
+++ b/data/text/maps/FallarborTown_Mart.inc
diff --git a/data/text/maps/FallarborTown_PokemonCenter_1F.s b/data/text/maps/FallarborTown_PokemonCenter_1F.inc
index a626ff1e9..a626ff1e9 100644
--- a/data/text/maps/FallarborTown_PokemonCenter_1F.s
+++ b/data/text/maps/FallarborTown_PokemonCenter_1F.inc
diff --git a/data/text/maps/FortreeCity.s b/data/text/maps/FortreeCity.inc
index 8640fada7..8640fada7 100644
--- a/data/text/maps/FortreeCity.s
+++ b/data/text/maps/FortreeCity.inc
diff --git a/data/text/maps/FortreeCity_DecorationShop.s b/data/text/maps/FortreeCity_DecorationShop.inc
index 7809f10ff..7809f10ff 100644
--- a/data/text/maps/FortreeCity_DecorationShop.s
+++ b/data/text/maps/FortreeCity_DecorationShop.inc
diff --git a/data/text/maps/FortreeCity_Gym.s b/data/text/maps/FortreeCity_Gym.inc
index 036cacd50..036cacd50 100644
--- a/data/text/maps/FortreeCity_Gym.s
+++ b/data/text/maps/FortreeCity_Gym.inc
diff --git a/data/text/maps/FortreeCity_House1.s b/data/text/maps/FortreeCity_House1.inc
index 0d94fcd27..0d94fcd27 100644
--- a/data/text/maps/FortreeCity_House1.s
+++ b/data/text/maps/FortreeCity_House1.inc
diff --git a/data/text/maps/FortreeCity_House2.s b/data/text/maps/FortreeCity_House2.inc
index 8b78e1ae8..8b78e1ae8 100644
--- a/data/text/maps/FortreeCity_House2.s
+++ b/data/text/maps/FortreeCity_House2.inc
diff --git a/data/text/maps/FortreeCity_House3.s b/data/text/maps/FortreeCity_House3.inc
index 6b0b254f6..6b0b254f6 100644
--- a/data/text/maps/FortreeCity_House3.s
+++ b/data/text/maps/FortreeCity_House3.inc
diff --git a/data/text/maps/FortreeCity_House4.s b/data/text/maps/FortreeCity_House4.inc
index 9389ec4aa..9389ec4aa 100644
--- a/data/text/maps/FortreeCity_House4.s
+++ b/data/text/maps/FortreeCity_House4.inc
diff --git a/data/text/maps/FortreeCity_House5.s b/data/text/maps/FortreeCity_House5.inc
index 711b9579e..711b9579e 100644
--- a/data/text/maps/FortreeCity_House5.s
+++ b/data/text/maps/FortreeCity_House5.inc
diff --git a/data/text/maps/FortreeCity_Mart.s b/data/text/maps/FortreeCity_Mart.inc
index c8c2c4f0f..c8c2c4f0f 100644
--- a/data/text/maps/FortreeCity_Mart.s
+++ b/data/text/maps/FortreeCity_Mart.inc
diff --git a/data/text/maps/FortreeCity_PokemonCenter_1F.s b/data/text/maps/FortreeCity_PokemonCenter_1F.inc
index d5ffb8a61..d5ffb8a61 100644
--- a/data/text/maps/FortreeCity_PokemonCenter_1F.s
+++ b/data/text/maps/FortreeCity_PokemonCenter_1F.inc
diff --git a/data/text/maps/GraniteCave_1F.s b/data/text/maps/GraniteCave_1F.inc
index 3344f76d9..3344f76d9 100644
--- a/data/text/maps/GraniteCave_1F.s
+++ b/data/text/maps/GraniteCave_1F.inc
diff --git a/data/text/maps/GraniteCave_StevensRoom.s b/data/text/maps/GraniteCave_StevensRoom.inc
index 873acea22..873acea22 100644
--- a/data/text/maps/GraniteCave_StevensRoom.s
+++ b/data/text/maps/GraniteCave_StevensRoom.inc
diff --git a/data/text/maps/InsideOfTruck.s b/data/text/maps/InsideOfTruck.inc
index 19166c481..19166c481 100644
--- a/data/text/maps/InsideOfTruck.s
+++ b/data/text/maps/InsideOfTruck.inc
diff --git a/data/text/maps/JaggedPass.s b/data/text/maps/JaggedPass.inc
index 23216b12b..23216b12b 100644
--- a/data/text/maps/JaggedPass.s
+++ b/data/text/maps/JaggedPass.inc
diff --git a/data/text/maps/LavaridgeTown.s b/data/text/maps/LavaridgeTown.inc
index 308548510..308548510 100644
--- a/data/text/maps/LavaridgeTown.s
+++ b/data/text/maps/LavaridgeTown.inc
diff --git a/data/text/maps/LavaridgeTown_Gym_1F.s b/data/text/maps/LavaridgeTown_Gym_1F.inc
index 87ec05632..87ec05632 100644
--- a/data/text/maps/LavaridgeTown_Gym_1F.s
+++ b/data/text/maps/LavaridgeTown_Gym_1F.inc
diff --git a/data/text/maps/LavaridgeTown_HerbShop.s b/data/text/maps/LavaridgeTown_HerbShop.inc
index 893d3399f..893d3399f 100644
--- a/data/text/maps/LavaridgeTown_HerbShop.s
+++ b/data/text/maps/LavaridgeTown_HerbShop.inc
diff --git a/data/text/maps/LavaridgeTown_House.s b/data/text/maps/LavaridgeTown_House.inc
index 9710d9398..9710d9398 100644
--- a/data/text/maps/LavaridgeTown_House.s
+++ b/data/text/maps/LavaridgeTown_House.inc
diff --git a/data/text/maps/LavaridgeTown_Mart.s b/data/text/maps/LavaridgeTown_Mart.inc
index db79bd321..db79bd321 100644
--- a/data/text/maps/LavaridgeTown_Mart.s
+++ b/data/text/maps/LavaridgeTown_Mart.inc
diff --git a/data/text/maps/LavaridgeTown_PokemonCenter_1F.s b/data/text/maps/LavaridgeTown_PokemonCenter_1F.inc
index c66d6df8a..c66d6df8a 100644
--- a/data/text/maps/LavaridgeTown_PokemonCenter_1F.s
+++ b/data/text/maps/LavaridgeTown_PokemonCenter_1F.inc
diff --git a/data/text/maps/LilycoveCity.s b/data/text/maps/LilycoveCity.inc
index 0f9b45c1d..0f9b45c1d 100644
--- a/data/text/maps/LilycoveCity.s
+++ b/data/text/maps/LilycoveCity.inc
diff --git a/data/text/maps/LilycoveCity_ContestHall.s b/data/text/maps/LilycoveCity_ContestHall.inc
index 96507b770..96507b770 100644
--- a/data/text/maps/LilycoveCity_ContestHall.s
+++ b/data/text/maps/LilycoveCity_ContestHall.inc
diff --git a/data/text/maps/LilycoveCity_ContestLobby.s b/data/text/maps/LilycoveCity_ContestLobby.inc
index d173519e8..d173519e8 100644
--- a/data/text/maps/LilycoveCity_ContestLobby.s
+++ b/data/text/maps/LilycoveCity_ContestLobby.inc
diff --git a/data/text/maps/LilycoveCity_CoveLilyMotel_1F.s b/data/text/maps/LilycoveCity_CoveLilyMotel_1F.inc
index 7d6e4942f..7d6e4942f 100644
--- a/data/text/maps/LilycoveCity_CoveLilyMotel_1F.s
+++ b/data/text/maps/LilycoveCity_CoveLilyMotel_1F.inc
diff --git a/data/text/maps/LilycoveCity_CoveLilyMotel_2F.s b/data/text/maps/LilycoveCity_CoveLilyMotel_2F.inc
index 0306db9e9..0306db9e9 100644
--- a/data/text/maps/LilycoveCity_CoveLilyMotel_2F.s
+++ b/data/text/maps/LilycoveCity_CoveLilyMotel_2F.inc
diff --git a/data/text/maps/LilycoveCity_DepartmentStoreRooftop.s b/data/text/maps/LilycoveCity_DepartmentStoreRooftop.inc
index 62eb03bc1..62eb03bc1 100644
--- a/data/text/maps/LilycoveCity_DepartmentStoreRooftop.s
+++ b/data/text/maps/LilycoveCity_DepartmentStoreRooftop.inc
diff --git a/data/text/maps/LilycoveCity_DepartmentStore_1F.s b/data/text/maps/LilycoveCity_DepartmentStore_1F.inc
index 45cf3686d..45cf3686d 100644
--- a/data/text/maps/LilycoveCity_DepartmentStore_1F.s
+++ b/data/text/maps/LilycoveCity_DepartmentStore_1F.inc
diff --git a/data/text/maps/LilycoveCity_DepartmentStore_2F.s b/data/text/maps/LilycoveCity_DepartmentStore_2F.inc
index e9a52bbee..e9a52bbee 100644
--- a/data/text/maps/LilycoveCity_DepartmentStore_2F.s
+++ b/data/text/maps/LilycoveCity_DepartmentStore_2F.inc
diff --git a/data/text/maps/LilycoveCity_DepartmentStore_3F.s b/data/text/maps/LilycoveCity_DepartmentStore_3F.inc
index 8777fd1f3..8777fd1f3 100644
--- a/data/text/maps/LilycoveCity_DepartmentStore_3F.s
+++ b/data/text/maps/LilycoveCity_DepartmentStore_3F.inc
diff --git a/data/text/maps/LilycoveCity_DepartmentStore_4F.s b/data/text/maps/LilycoveCity_DepartmentStore_4F.inc
index b26962a8f..b26962a8f 100644
--- a/data/text/maps/LilycoveCity_DepartmentStore_4F.s
+++ b/data/text/maps/LilycoveCity_DepartmentStore_4F.inc
diff --git a/data/text/maps/LilycoveCity_DepartmentStore_5F.s b/data/text/maps/LilycoveCity_DepartmentStore_5F.inc
index 8b1d81c2e..8b1d81c2e 100644
--- a/data/text/maps/LilycoveCity_DepartmentStore_5F.s
+++ b/data/text/maps/LilycoveCity_DepartmentStore_5F.inc
diff --git a/data/text/maps/LilycoveCity_Harbor.s b/data/text/maps/LilycoveCity_Harbor.inc
index 0f31f697b..0f31f697b 100644
--- a/data/text/maps/LilycoveCity_Harbor.s
+++ b/data/text/maps/LilycoveCity_Harbor.inc
diff --git a/data/text/maps/LilycoveCity_House1.s b/data/text/maps/LilycoveCity_House1.inc
index a937ff64d..a937ff64d 100644
--- a/data/text/maps/LilycoveCity_House1.s
+++ b/data/text/maps/LilycoveCity_House1.inc
diff --git a/data/text/maps/LilycoveCity_House2.s b/data/text/maps/LilycoveCity_House2.inc
index 0e037a65f..0e037a65f 100644
--- a/data/text/maps/LilycoveCity_House2.s
+++ b/data/text/maps/LilycoveCity_House2.inc
diff --git a/data/text/maps/LilycoveCity_House3.s b/data/text/maps/LilycoveCity_House3.inc
index 03db4920f..03db4920f 100644
--- a/data/text/maps/LilycoveCity_House3.s
+++ b/data/text/maps/LilycoveCity_House3.inc
diff --git a/data/text/maps/LilycoveCity_House4.s b/data/text/maps/LilycoveCity_House4.inc
index ebfd5ae71..ebfd5ae71 100644
--- a/data/text/maps/LilycoveCity_House4.s
+++ b/data/text/maps/LilycoveCity_House4.inc
diff --git a/data/text/maps/LilycoveCity_LilycoveMuseum_1F.s b/data/text/maps/LilycoveCity_LilycoveMuseum_1F.inc
index b60e0e50d..b60e0e50d 100644
--- a/data/text/maps/LilycoveCity_LilycoveMuseum_1F.s
+++ b/data/text/maps/LilycoveCity_LilycoveMuseum_1F.inc
diff --git a/data/text/maps/LilycoveCity_LilycoveMuseum_2F.s b/data/text/maps/LilycoveCity_LilycoveMuseum_2F.inc
index 067cc335f..067cc335f 100644
--- a/data/text/maps/LilycoveCity_LilycoveMuseum_2F.s
+++ b/data/text/maps/LilycoveCity_LilycoveMuseum_2F.inc
diff --git a/data/text/maps/LilycoveCity_MoveDeletersHouse.s b/data/text/maps/LilycoveCity_MoveDeletersHouse.inc
index 1e2181aca..1e2181aca 100644
--- a/data/text/maps/LilycoveCity_MoveDeletersHouse.s
+++ b/data/text/maps/LilycoveCity_MoveDeletersHouse.inc
diff --git a/data/text/maps/LilycoveCity_PokemonCenter_1F.s b/data/text/maps/LilycoveCity_PokemonCenter_1F.inc
index c0cbb7436..c0cbb7436 100644
--- a/data/text/maps/LilycoveCity_PokemonCenter_1F.s
+++ b/data/text/maps/LilycoveCity_PokemonCenter_1F.inc
diff --git a/data/text/maps/LilycoveCity_PokemonTrainerFanClub.s b/data/text/maps/LilycoveCity_PokemonTrainerFanClub.inc
index fbfbf4353..fbfbf4353 100644
--- a/data/text/maps/LilycoveCity_PokemonTrainerFanClub.s
+++ b/data/text/maps/LilycoveCity_PokemonTrainerFanClub.inc
diff --git a/data/text/maps/LittlerootTown.s b/data/text/maps/LittlerootTown.inc
index 1e23d584f..1e23d584f 100644
--- a/data/text/maps/LittlerootTown.s
+++ b/data/text/maps/LittlerootTown.inc
diff --git a/data/text/maps/LittlerootTown_BrendansHouse_1F.s b/data/text/maps/LittlerootTown_BrendansHouse_1F.inc
index 888fc8973..888fc8973 100644
--- a/data/text/maps/LittlerootTown_BrendansHouse_1F.s
+++ b/data/text/maps/LittlerootTown_BrendansHouse_1F.inc
diff --git a/data/text/maps/LittlerootTown_BrendansHouse_2F.s b/data/text/maps/LittlerootTown_BrendansHouse_2F.inc
index 06206caaa..06206caaa 100644
--- a/data/text/maps/LittlerootTown_BrendansHouse_2F.s
+++ b/data/text/maps/LittlerootTown_BrendansHouse_2F.inc
diff --git a/data/text/maps/LittlerootTown_MaysHouse_1F.s b/data/text/maps/LittlerootTown_MaysHouse_1F.inc
index aef905854..aef905854 100644
--- a/data/text/maps/LittlerootTown_MaysHouse_1F.s
+++ b/data/text/maps/LittlerootTown_MaysHouse_1F.inc
diff --git a/data/text/maps/LittlerootTown_MaysHouse_2F.s b/data/text/maps/LittlerootTown_MaysHouse_2F.inc
index 313095c8d..313095c8d 100644
--- a/data/text/maps/LittlerootTown_MaysHouse_2F.s
+++ b/data/text/maps/LittlerootTown_MaysHouse_2F.inc
diff --git a/data/text/maps/LittlerootTown_ProfessorBirchsLab.s b/data/text/maps/LittlerootTown_ProfessorBirchsLab.inc
index dd470ef08..dd470ef08 100644
--- a/data/text/maps/LittlerootTown_ProfessorBirchsLab.s
+++ b/data/text/maps/LittlerootTown_ProfessorBirchsLab.inc
diff --git a/data/text/maps/MauvilleCity.s b/data/text/maps/MauvilleCity.inc
index 8080d10d9..8080d10d9 100644
--- a/data/text/maps/MauvilleCity.s
+++ b/data/text/maps/MauvilleCity.inc
diff --git a/data/text/maps/MauvilleCity_BikeShop.s b/data/text/maps/MauvilleCity_BikeShop.inc
index 3fbdffc09..3fbdffc09 100644
--- a/data/text/maps/MauvilleCity_BikeShop.s
+++ b/data/text/maps/MauvilleCity_BikeShop.inc
diff --git a/data/text/maps/MauvilleCity_GameCorner.s b/data/text/maps/MauvilleCity_GameCorner.inc
index f367c3cf2..f367c3cf2 100644
--- a/data/text/maps/MauvilleCity_GameCorner.s
+++ b/data/text/maps/MauvilleCity_GameCorner.inc
diff --git a/data/text/maps/MauvilleCity_Gym.s b/data/text/maps/MauvilleCity_Gym.inc
index 5ae43f880..5ae43f880 100644
--- a/data/text/maps/MauvilleCity_Gym.s
+++ b/data/text/maps/MauvilleCity_Gym.inc
diff --git a/data/text/maps/MauvilleCity_House1.s b/data/text/maps/MauvilleCity_House1.inc
index c5eec210e..c5eec210e 100644
--- a/data/text/maps/MauvilleCity_House1.s
+++ b/data/text/maps/MauvilleCity_House1.inc
diff --git a/data/text/maps/MauvilleCity_House2.s b/data/text/maps/MauvilleCity_House2.inc
index 50cdf1fa7..50cdf1fa7 100644
--- a/data/text/maps/MauvilleCity_House2.s
+++ b/data/text/maps/MauvilleCity_House2.inc
diff --git a/data/text/maps/MauvilleCity_Mart.s b/data/text/maps/MauvilleCity_Mart.inc
index 6b8f6c002..6b8f6c002 100644
--- a/data/text/maps/MauvilleCity_Mart.s
+++ b/data/text/maps/MauvilleCity_Mart.inc
diff --git a/data/text/maps/MauvilleCity_PokemonCenter_1F.s b/data/text/maps/MauvilleCity_PokemonCenter_1F.inc
index c4287cda3..c4287cda3 100644
--- a/data/text/maps/MauvilleCity_PokemonCenter_1F.s
+++ b/data/text/maps/MauvilleCity_PokemonCenter_1F.inc
diff --git a/data/text/maps/MauvilleCity_PokemonCenter_2F.s b/data/text/maps/MauvilleCity_PokemonCenter_2F.inc
index 1e67948a5..1e67948a5 100644
--- a/data/text/maps/MauvilleCity_PokemonCenter_2F.s
+++ b/data/text/maps/MauvilleCity_PokemonCenter_2F.inc
diff --git a/data/text/maps/MeteorFalls_1F_1R.s b/data/text/maps/MeteorFalls_1F_1R.inc
index ad19e3e0b..ad19e3e0b 100644
--- a/data/text/maps/MeteorFalls_1F_1R.s
+++ b/data/text/maps/MeteorFalls_1F_1R.inc
diff --git a/data/text/maps/MeteorFalls_1F_2R.s b/data/text/maps/MeteorFalls_1F_2R.inc
index 35b60d662..35b60d662 100644
--- a/data/text/maps/MeteorFalls_1F_2R.s
+++ b/data/text/maps/MeteorFalls_1F_2R.inc
diff --git a/data/text/maps/MossdeepCity.s b/data/text/maps/MossdeepCity.inc
index 9bdcf3b3c..9bdcf3b3c 100644
--- a/data/text/maps/MossdeepCity.s
+++ b/data/text/maps/MossdeepCity.inc
diff --git a/data/text/maps/MossdeepCity_GameCorner_1F.s b/data/text/maps/MossdeepCity_GameCorner_1F.inc
index 7324999c8..7324999c8 100644
--- a/data/text/maps/MossdeepCity_GameCorner_1F.s
+++ b/data/text/maps/MossdeepCity_GameCorner_1F.inc
diff --git a/data/text/maps/MossdeepCity_GameCorner_B1F.s b/data/text/maps/MossdeepCity_GameCorner_B1F.inc
index 8b1378917..8b1378917 100644
--- a/data/text/maps/MossdeepCity_GameCorner_B1F.s
+++ b/data/text/maps/MossdeepCity_GameCorner_B1F.inc
diff --git a/data/text/maps/MossdeepCity_Gym.s b/data/text/maps/MossdeepCity_Gym.inc
index 5ff5f6554..5ff5f6554 100644
--- a/data/text/maps/MossdeepCity_Gym.s
+++ b/data/text/maps/MossdeepCity_Gym.inc
diff --git a/data/text/maps/MossdeepCity_House1.s b/data/text/maps/MossdeepCity_House1.inc
index 0572ba260..0572ba260 100644
--- a/data/text/maps/MossdeepCity_House1.s
+++ b/data/text/maps/MossdeepCity_House1.inc
diff --git a/data/text/maps/MossdeepCity_House2.s b/data/text/maps/MossdeepCity_House2.inc
index ae4b11cb6..ae4b11cb6 100644
--- a/data/text/maps/MossdeepCity_House2.s
+++ b/data/text/maps/MossdeepCity_House2.inc
diff --git a/data/text/maps/MossdeepCity_House3.s b/data/text/maps/MossdeepCity_House3.inc
index 270457172..270457172 100644
--- a/data/text/maps/MossdeepCity_House3.s
+++ b/data/text/maps/MossdeepCity_House3.inc
diff --git a/data/text/maps/MossdeepCity_House4.s b/data/text/maps/MossdeepCity_House4.inc
index e612a8018..e612a8018 100644
--- a/data/text/maps/MossdeepCity_House4.s
+++ b/data/text/maps/MossdeepCity_House4.inc
diff --git a/data/text/maps/MossdeepCity_Mart.s b/data/text/maps/MossdeepCity_Mart.inc
index cdce8c48c..cdce8c48c 100644
--- a/data/text/maps/MossdeepCity_Mart.s
+++ b/data/text/maps/MossdeepCity_Mart.inc
diff --git a/data/text/maps/MossdeepCity_PokemonCenter_1F.s b/data/text/maps/MossdeepCity_PokemonCenter_1F.inc
index 5f345613e..5f345613e 100644
--- a/data/text/maps/MossdeepCity_PokemonCenter_1F.s
+++ b/data/text/maps/MossdeepCity_PokemonCenter_1F.inc
diff --git a/data/text/maps/MossdeepCity_PokemonCenter_2F.s b/data/text/maps/MossdeepCity_PokemonCenter_2F.inc
index 66bba2421..66bba2421 100644
--- a/data/text/maps/MossdeepCity_PokemonCenter_2F.s
+++ b/data/text/maps/MossdeepCity_PokemonCenter_2F.inc
diff --git a/data/text/maps/MossdeepCity_SpaceCenter_1F.s b/data/text/maps/MossdeepCity_SpaceCenter_1F.inc
index a94d343bc..a94d343bc 100644
--- a/data/text/maps/MossdeepCity_SpaceCenter_1F.s
+++ b/data/text/maps/MossdeepCity_SpaceCenter_1F.inc
diff --git a/data/text/maps/MossdeepCity_SpaceCenter_2F.s b/data/text/maps/MossdeepCity_SpaceCenter_2F.inc
index 0c8159423..0c8159423 100644
--- a/data/text/maps/MossdeepCity_SpaceCenter_2F.s
+++ b/data/text/maps/MossdeepCity_SpaceCenter_2F.inc
diff --git a/data/text/maps/MossdeepCity_StevensHouse.s b/data/text/maps/MossdeepCity_StevensHouse.inc
index 6f5b9b9b8..6f5b9b9b8 100644
--- a/data/text/maps/MossdeepCity_StevensHouse.s
+++ b/data/text/maps/MossdeepCity_StevensHouse.inc
diff --git a/data/text/maps/MtChimney.s b/data/text/maps/MtChimney.inc
index 8641bde00..8641bde00 100644
--- a/data/text/maps/MtChimney.s
+++ b/data/text/maps/MtChimney.inc
diff --git a/data/text/maps/MtChimney_CableCarStation.s b/data/text/maps/MtChimney_CableCarStation.inc
index 03e2f7a2a..03e2f7a2a 100644
--- a/data/text/maps/MtChimney_CableCarStation.s
+++ b/data/text/maps/MtChimney_CableCarStation.inc
diff --git a/data/text/maps/MtPyre_1F.s b/data/text/maps/MtPyre_1F.inc
index 84e1cef07..84e1cef07 100644
--- a/data/text/maps/MtPyre_1F.s
+++ b/data/text/maps/MtPyre_1F.inc
diff --git a/data/text/maps/MtPyre_2F.s b/data/text/maps/MtPyre_2F.inc
index 28c57d0ba..28c57d0ba 100644
--- a/data/text/maps/MtPyre_2F.s
+++ b/data/text/maps/MtPyre_2F.inc
diff --git a/data/text/maps/MtPyre_3F.s b/data/text/maps/MtPyre_3F.inc
index c714c97a0..c714c97a0 100644
--- a/data/text/maps/MtPyre_3F.s
+++ b/data/text/maps/MtPyre_3F.inc
diff --git a/data/text/maps/MtPyre_4F.s b/data/text/maps/MtPyre_4F.inc
index 275b6f5ac..275b6f5ac 100644
--- a/data/text/maps/MtPyre_4F.s
+++ b/data/text/maps/MtPyre_4F.inc
diff --git a/data/text/maps/MtPyre_5F.s b/data/text/maps/MtPyre_5F.inc
index c70211067..c70211067 100644
--- a/data/text/maps/MtPyre_5F.s
+++ b/data/text/maps/MtPyre_5F.inc
diff --git a/data/text/maps/MtPyre_6F.s b/data/text/maps/MtPyre_6F.inc
index 711c87570..711c87570 100644
--- a/data/text/maps/MtPyre_6F.s
+++ b/data/text/maps/MtPyre_6F.inc
diff --git a/data/text/maps/NewMauville_Entrance.s b/data/text/maps/NewMauville_Entrance.inc
index 36739ec3e..36739ec3e 100644
--- a/data/text/maps/NewMauville_Entrance.s
+++ b/data/text/maps/NewMauville_Entrance.inc
diff --git a/data/text/maps/NewMauville_Inside.s b/data/text/maps/NewMauville_Inside.inc
index c18354294..c18354294 100644
--- a/data/text/maps/NewMauville_Inside.s
+++ b/data/text/maps/NewMauville_Inside.inc
diff --git a/data/text/maps/OldaleTown.s b/data/text/maps/OldaleTown.inc
index 2d0b31a44..2d0b31a44 100644
--- a/data/text/maps/OldaleTown.s
+++ b/data/text/maps/OldaleTown.inc
diff --git a/data/text/maps/OldaleTown_House1.s b/data/text/maps/OldaleTown_House1.inc
index 943003b97..943003b97 100644
--- a/data/text/maps/OldaleTown_House1.s
+++ b/data/text/maps/OldaleTown_House1.inc
diff --git a/data/text/maps/OldaleTown_House2.s b/data/text/maps/OldaleTown_House2.inc
index 54a6547b4..54a6547b4 100644
--- a/data/text/maps/OldaleTown_House2.s
+++ b/data/text/maps/OldaleTown_House2.inc
diff --git a/data/text/maps/OldaleTown_Mart.s b/data/text/maps/OldaleTown_Mart.inc
index 5abb0cb9b..5abb0cb9b 100644
--- a/data/text/maps/OldaleTown_Mart.s
+++ b/data/text/maps/OldaleTown_Mart.inc
diff --git a/data/text/maps/OldaleTown_PokemonCenter_1F.s b/data/text/maps/OldaleTown_PokemonCenter_1F.inc
index 4fa7f4d9b..4fa7f4d9b 100644
--- a/data/text/maps/OldaleTown_PokemonCenter_1F.s
+++ b/data/text/maps/OldaleTown_PokemonCenter_1F.inc
diff --git a/data/text/maps/PacifidlogTown.s b/data/text/maps/PacifidlogTown.inc
index f598c566a..f598c566a 100644
--- a/data/text/maps/PacifidlogTown.s
+++ b/data/text/maps/PacifidlogTown.inc
diff --git a/data/text/maps/PacifidlogTown_House1.s b/data/text/maps/PacifidlogTown_House1.inc
index 5d2f5a2c9..5d2f5a2c9 100644
--- a/data/text/maps/PacifidlogTown_House1.s
+++ b/data/text/maps/PacifidlogTown_House1.inc
diff --git a/data/text/maps/PacifidlogTown_House2.s b/data/text/maps/PacifidlogTown_House2.inc
index 5c669dc98..5c669dc98 100644
--- a/data/text/maps/PacifidlogTown_House2.s
+++ b/data/text/maps/PacifidlogTown_House2.inc
diff --git a/data/text/maps/PacifidlogTown_House3.s b/data/text/maps/PacifidlogTown_House3.inc
index 1aabc9578..1aabc9578 100644
--- a/data/text/maps/PacifidlogTown_House3.s
+++ b/data/text/maps/PacifidlogTown_House3.inc
diff --git a/data/text/maps/PacifidlogTown_House4.s b/data/text/maps/PacifidlogTown_House4.inc
index 3ca9e5cca..3ca9e5cca 100644
--- a/data/text/maps/PacifidlogTown_House4.s
+++ b/data/text/maps/PacifidlogTown_House4.inc
diff --git a/data/text/maps/PacifidlogTown_House5.s b/data/text/maps/PacifidlogTown_House5.inc
index 5fc9ca5c5..5fc9ca5c5 100644
--- a/data/text/maps/PacifidlogTown_House5.s
+++ b/data/text/maps/PacifidlogTown_House5.inc
diff --git a/data/text/maps/PacifidlogTown_PokemonCenter_1F.s b/data/text/maps/PacifidlogTown_PokemonCenter_1F.inc
index 9f87c6a54..9f87c6a54 100644
--- a/data/text/maps/PacifidlogTown_PokemonCenter_1F.s
+++ b/data/text/maps/PacifidlogTown_PokemonCenter_1F.inc
diff --git a/data/text/maps/PetalburgCity.s b/data/text/maps/PetalburgCity.inc
index fbe00df96..fbe00df96 100644
--- a/data/text/maps/PetalburgCity.s
+++ b/data/text/maps/PetalburgCity.inc
diff --git a/data/text/maps/PetalburgCity_Gym.s b/data/text/maps/PetalburgCity_Gym.inc
index bbd072564..bbd072564 100644
--- a/data/text/maps/PetalburgCity_Gym.s
+++ b/data/text/maps/PetalburgCity_Gym.inc
diff --git a/data/text/maps/PetalburgCity_House1.s b/data/text/maps/PetalburgCity_House1.inc
index d41fadd1f..d41fadd1f 100644
--- a/data/text/maps/PetalburgCity_House1.s
+++ b/data/text/maps/PetalburgCity_House1.inc
diff --git a/data/text/maps/PetalburgCity_House2.s b/data/text/maps/PetalburgCity_House2.inc
index 426dac360..426dac360 100644
--- a/data/text/maps/PetalburgCity_House2.s
+++ b/data/text/maps/PetalburgCity_House2.inc
diff --git a/data/text/maps/PetalburgCity_Mart.s b/data/text/maps/PetalburgCity_Mart.inc
index d6fcc6fff..d6fcc6fff 100644
--- a/data/text/maps/PetalburgCity_Mart.s
+++ b/data/text/maps/PetalburgCity_Mart.inc
diff --git a/data/text/maps/PetalburgCity_PokemonCenter_1F.s b/data/text/maps/PetalburgCity_PokemonCenter_1F.inc
index 1c4689672..1c4689672 100644
--- a/data/text/maps/PetalburgCity_PokemonCenter_1F.s
+++ b/data/text/maps/PetalburgCity_PokemonCenter_1F.inc
diff --git a/data/text/maps/PetalburgCity_WallysHouse.s b/data/text/maps/PetalburgCity_WallysHouse.inc
index 888dfbc91..888dfbc91 100644
--- a/data/text/maps/PetalburgCity_WallysHouse.s
+++ b/data/text/maps/PetalburgCity_WallysHouse.inc
diff --git a/data/text/maps/PetalburgWoods.s b/data/text/maps/PetalburgWoods.inc
index 21a04dcc8..21a04dcc8 100644
--- a/data/text/maps/PetalburgWoods.s
+++ b/data/text/maps/PetalburgWoods.inc
diff --git a/data/text/maps/Route101.s b/data/text/maps/Route101.inc
index 3bfa1ef6e..3bfa1ef6e 100644
--- a/data/text/maps/Route101.s
+++ b/data/text/maps/Route101.inc
diff --git a/data/text/maps/Route102.s b/data/text/maps/Route102.inc
index cf367edc2..cf367edc2 100644
--- a/data/text/maps/Route102.s
+++ b/data/text/maps/Route102.inc
diff --git a/data/text/maps/Route103.s b/data/text/maps/Route103.inc
index ebdedea82..ebdedea82 100644
--- a/data/text/maps/Route103.s
+++ b/data/text/maps/Route103.inc
diff --git a/data/text/maps/Route104.s b/data/text/maps/Route104.inc
index 95f70a7ec..95f70a7ec 100644
--- a/data/text/maps/Route104.s
+++ b/data/text/maps/Route104.inc
diff --git a/data/text/maps/Route104_MrBrineysHouse.s b/data/text/maps/Route104_MrBrineysHouse.inc
index 37fd0c0e1..37fd0c0e1 100644
--- a/data/text/maps/Route104_MrBrineysHouse.s
+++ b/data/text/maps/Route104_MrBrineysHouse.inc
diff --git a/data/text/maps/Route104_Prototype.s b/data/text/maps/Route104_Prototype.inc
index 7ce19f609..7ce19f609 100644
--- a/data/text/maps/Route104_Prototype.s
+++ b/data/text/maps/Route104_Prototype.inc
diff --git a/data/text/maps/Route104_PrototypePrettyPetalFlowerShop.s b/data/text/maps/Route104_PrototypePrettyPetalFlowerShop.inc
index 3ec76ff55..3ec76ff55 100644
--- a/data/text/maps/Route104_PrototypePrettyPetalFlowerShop.s
+++ b/data/text/maps/Route104_PrototypePrettyPetalFlowerShop.inc
diff --git a/data/text/maps/Route105.s b/data/text/maps/Route105.inc
index 8b1378917..8b1378917 100644
--- a/data/text/maps/Route105.s
+++ b/data/text/maps/Route105.inc
diff --git a/data/text/maps/Route106.s b/data/text/maps/Route106.inc
index 38e92c65d..38e92c65d 100644
--- a/data/text/maps/Route106.s
+++ b/data/text/maps/Route106.inc
diff --git a/data/text/maps/Route107.s b/data/text/maps/Route107.inc
index 8b1378917..8b1378917 100644
--- a/data/text/maps/Route107.s
+++ b/data/text/maps/Route107.inc
diff --git a/data/text/maps/Route108.s b/data/text/maps/Route108.inc
index 8b1378917..8b1378917 100644
--- a/data/text/maps/Route108.s
+++ b/data/text/maps/Route108.inc
diff --git a/data/text/maps/Route109.s b/data/text/maps/Route109.inc
index a86efa2c4..a86efa2c4 100644
--- a/data/text/maps/Route109.s
+++ b/data/text/maps/Route109.inc
diff --git a/data/text/maps/Route109_SeashoreHouse.s b/data/text/maps/Route109_SeashoreHouse.inc
index ebd6f05e5..ebd6f05e5 100644
--- a/data/text/maps/Route109_SeashoreHouse.s
+++ b/data/text/maps/Route109_SeashoreHouse.inc
diff --git a/data/text/maps/Route110.s b/data/text/maps/Route110.inc
index 78be8d595..78be8d595 100644
--- a/data/text/maps/Route110.s
+++ b/data/text/maps/Route110.inc
diff --git a/data/text/maps/Route110_SeasideCyclingRoadNorthEntrance.s b/data/text/maps/Route110_SeasideCyclingRoadNorthEntrance.inc
index 8d5a0433e..8d5a0433e 100644
--- a/data/text/maps/Route110_SeasideCyclingRoadNorthEntrance.s
+++ b/data/text/maps/Route110_SeasideCyclingRoadNorthEntrance.inc
diff --git a/data/text/maps/Route110_SeasideCyclingRoadSouthEntrance.s b/data/text/maps/Route110_SeasideCyclingRoadSouthEntrance.inc
index 77bf90751..77bf90751 100644
--- a/data/text/maps/Route110_SeasideCyclingRoadSouthEntrance.s
+++ b/data/text/maps/Route110_SeasideCyclingRoadSouthEntrance.inc
diff --git a/data/text/maps/Route110_TrickHouseEnd.s b/data/text/maps/Route110_TrickHouseEnd.inc
index 03f2252fd..03f2252fd 100644
--- a/data/text/maps/Route110_TrickHouseEnd.s
+++ b/data/text/maps/Route110_TrickHouseEnd.inc
diff --git a/data/text/maps/Route110_TrickHouseEntrance.s b/data/text/maps/Route110_TrickHouseEntrance.inc
index fe39a4441..fe39a4441 100644
--- a/data/text/maps/Route110_TrickHouseEntrance.s
+++ b/data/text/maps/Route110_TrickHouseEntrance.inc
diff --git a/data/text/maps/Route110_TrickHousePuzzle1.s b/data/text/maps/Route110_TrickHousePuzzle1.inc
index 84208ead5..84208ead5 100644
--- a/data/text/maps/Route110_TrickHousePuzzle1.s
+++ b/data/text/maps/Route110_TrickHousePuzzle1.inc
diff --git a/data/text/maps/Route110_TrickHousePuzzle2.s b/data/text/maps/Route110_TrickHousePuzzle2.inc
index cb64f04d8..cb64f04d8 100644
--- a/data/text/maps/Route110_TrickHousePuzzle2.s
+++ b/data/text/maps/Route110_TrickHousePuzzle2.inc
diff --git a/data/text/maps/Route110_TrickHousePuzzle3.s b/data/text/maps/Route110_TrickHousePuzzle3.inc
index 01287a068..01287a068 100644
--- a/data/text/maps/Route110_TrickHousePuzzle3.s
+++ b/data/text/maps/Route110_TrickHousePuzzle3.inc
diff --git a/data/text/maps/Route110_TrickHousePuzzle4.s b/data/text/maps/Route110_TrickHousePuzzle4.inc
index 293e5ab93..293e5ab93 100644
--- a/data/text/maps/Route110_TrickHousePuzzle4.s
+++ b/data/text/maps/Route110_TrickHousePuzzle4.inc
diff --git a/data/text/maps/Route110_TrickHousePuzzle5.s b/data/text/maps/Route110_TrickHousePuzzle5.inc
index 8cddc3f65..8cddc3f65 100644
--- a/data/text/maps/Route110_TrickHousePuzzle5.s
+++ b/data/text/maps/Route110_TrickHousePuzzle5.inc
diff --git a/data/text/maps/Route110_TrickHousePuzzle6.s b/data/text/maps/Route110_TrickHousePuzzle6.inc
index 7fb5aa914..7fb5aa914 100644
--- a/data/text/maps/Route110_TrickHousePuzzle6.s
+++ b/data/text/maps/Route110_TrickHousePuzzle6.inc
diff --git a/data/text/maps/Route110_TrickHousePuzzle7.s b/data/text/maps/Route110_TrickHousePuzzle7.inc
index e8ce4b3a4..e8ce4b3a4 100644
--- a/data/text/maps/Route110_TrickHousePuzzle7.s
+++ b/data/text/maps/Route110_TrickHousePuzzle7.inc
diff --git a/data/text/maps/Route110_TrickHousePuzzle8.s b/data/text/maps/Route110_TrickHousePuzzle8.inc
index 8b0025bfb..8b0025bfb 100644
--- a/data/text/maps/Route110_TrickHousePuzzle8.s
+++ b/data/text/maps/Route110_TrickHousePuzzle8.inc
diff --git a/data/text/maps/Route111.s b/data/text/maps/Route111.inc
index 24bcc1008..24bcc1008 100644
--- a/data/text/maps/Route111.s
+++ b/data/text/maps/Route111.inc
diff --git a/data/text/maps/Route111_OldLadysRestStop.s b/data/text/maps/Route111_OldLadysRestStop.inc
index aeef47a32..aeef47a32 100644
--- a/data/text/maps/Route111_OldLadysRestStop.s
+++ b/data/text/maps/Route111_OldLadysRestStop.inc
diff --git a/data/text/maps/Route111_WinstrateFamilysHouse.s b/data/text/maps/Route111_WinstrateFamilysHouse.inc
index e1986320b..e1986320b 100644
--- a/data/text/maps/Route111_WinstrateFamilysHouse.s
+++ b/data/text/maps/Route111_WinstrateFamilysHouse.inc
diff --git a/data/text/maps/Route112.s b/data/text/maps/Route112.inc
index c967c562c..c967c562c 100644
--- a/data/text/maps/Route112.s
+++ b/data/text/maps/Route112.inc
diff --git a/data/text/maps/Route112_CableCarStation.s b/data/text/maps/Route112_CableCarStation.inc
index 245172542..245172542 100644
--- a/data/text/maps/Route112_CableCarStation.s
+++ b/data/text/maps/Route112_CableCarStation.inc
diff --git a/data/text/maps/Route113.s b/data/text/maps/Route113.inc
index 2ce41fda9..2ce41fda9 100644
--- a/data/text/maps/Route113.s
+++ b/data/text/maps/Route113.inc
diff --git a/data/text/maps/Route113_GlassWorkshop.s b/data/text/maps/Route113_GlassWorkshop.inc
index 2923255a4..2923255a4 100644
--- a/data/text/maps/Route113_GlassWorkshop.s
+++ b/data/text/maps/Route113_GlassWorkshop.inc
diff --git a/data/text/maps/Route114.s b/data/text/maps/Route114.inc
index 9a46954da..9a46954da 100644
--- a/data/text/maps/Route114.s
+++ b/data/text/maps/Route114.inc
diff --git a/data/text/maps/Route114_FossilManiacsHouse.s b/data/text/maps/Route114_FossilManiacsHouse.inc
index 4515a161a..4515a161a 100644
--- a/data/text/maps/Route114_FossilManiacsHouse.s
+++ b/data/text/maps/Route114_FossilManiacsHouse.inc
diff --git a/data/text/maps/Route114_FossilManiacsTunnel.s b/data/text/maps/Route114_FossilManiacsTunnel.inc
index cbcd6172d..cbcd6172d 100644
--- a/data/text/maps/Route114_FossilManiacsTunnel.s
+++ b/data/text/maps/Route114_FossilManiacsTunnel.inc
diff --git a/data/text/maps/Route114_LanettesHouse.s b/data/text/maps/Route114_LanettesHouse.inc
index 5d6747895..5d6747895 100644
--- a/data/text/maps/Route114_LanettesHouse.s
+++ b/data/text/maps/Route114_LanettesHouse.inc
diff --git a/data/text/maps/Route115.s b/data/text/maps/Route115.inc
index f5fc22b0d..f5fc22b0d 100644
--- a/data/text/maps/Route115.s
+++ b/data/text/maps/Route115.inc
diff --git a/data/text/maps/Route116.s b/data/text/maps/Route116.inc
index 64694199d..64694199d 100644
--- a/data/text/maps/Route116.s
+++ b/data/text/maps/Route116.inc
diff --git a/data/text/maps/Route116_TunnelersRestHouse.s b/data/text/maps/Route116_TunnelersRestHouse.inc
index d777ff0c8..d777ff0c8 100644
--- a/data/text/maps/Route116_TunnelersRestHouse.s
+++ b/data/text/maps/Route116_TunnelersRestHouse.inc
diff --git a/data/text/maps/Route117.s b/data/text/maps/Route117.inc
index deadb8f5d..deadb8f5d 100644
--- a/data/text/maps/Route117.s
+++ b/data/text/maps/Route117.inc
diff --git a/data/text/maps/Route118.s b/data/text/maps/Route118.inc
index 649efe3f0..649efe3f0 100644
--- a/data/text/maps/Route118.s
+++ b/data/text/maps/Route118.inc
diff --git a/data/text/maps/Route119.s b/data/text/maps/Route119.inc
index 489ca053d..489ca053d 100644
--- a/data/text/maps/Route119.s
+++ b/data/text/maps/Route119.inc
diff --git a/data/text/maps/Route119_House.s b/data/text/maps/Route119_House.inc
index fe069c1ed..fe069c1ed 100644
--- a/data/text/maps/Route119_House.s
+++ b/data/text/maps/Route119_House.inc
diff --git a/data/text/maps/Route119_WeatherInstitute_1F.s b/data/text/maps/Route119_WeatherInstitute_1F.inc
index 1f7fff794..1f7fff794 100644
--- a/data/text/maps/Route119_WeatherInstitute_1F.s
+++ b/data/text/maps/Route119_WeatherInstitute_1F.inc
diff --git a/data/text/maps/Route119_WeatherInstitute_2F.s b/data/text/maps/Route119_WeatherInstitute_2F.inc
index f2854f6d0..f2854f6d0 100644
--- a/data/text/maps/Route119_WeatherInstitute_2F.s
+++ b/data/text/maps/Route119_WeatherInstitute_2F.inc
diff --git a/data/text/maps/Route120.s b/data/text/maps/Route120.inc
index adaf369b1..adaf369b1 100644
--- a/data/text/maps/Route120.s
+++ b/data/text/maps/Route120.inc
diff --git a/data/text/maps/Route121.s b/data/text/maps/Route121.inc
index 7861b1744..7861b1744 100644
--- a/data/text/maps/Route121.s
+++ b/data/text/maps/Route121.inc
diff --git a/data/text/maps/Route123.s b/data/text/maps/Route123.inc
index 911915f9e..911915f9e 100644
--- a/data/text/maps/Route123.s
+++ b/data/text/maps/Route123.inc
diff --git a/data/text/maps/Route123_BerryMastersHouse.s b/data/text/maps/Route123_BerryMastersHouse.inc
index 8b1378917..8b1378917 100644
--- a/data/text/maps/Route123_BerryMastersHouse.s
+++ b/data/text/maps/Route123_BerryMastersHouse.inc
diff --git a/data/text/maps/Route124.s b/data/text/maps/Route124.inc
index 6f33d40b7..6f33d40b7 100644
--- a/data/text/maps/Route124.s
+++ b/data/text/maps/Route124.inc
diff --git a/data/text/maps/Route124_DivingTreasureHuntersHouse.s b/data/text/maps/Route124_DivingTreasureHuntersHouse.inc
index 3eda96254..3eda96254 100644
--- a/data/text/maps/Route124_DivingTreasureHuntersHouse.s
+++ b/data/text/maps/Route124_DivingTreasureHuntersHouse.inc
diff --git a/data/text/maps/Route128.s b/data/text/maps/Route128.inc
index da813609b..da813609b 100644
--- a/data/text/maps/Route128.s
+++ b/data/text/maps/Route128.inc
diff --git a/data/text/maps/RustboroCity.s b/data/text/maps/RustboroCity.inc
index 4f2954f35..4f2954f35 100644
--- a/data/text/maps/RustboroCity.s
+++ b/data/text/maps/RustboroCity.inc
diff --git a/data/text/maps/RustboroCity_CuttersHouse.s b/data/text/maps/RustboroCity_CuttersHouse.inc
index 8b4c237f5..8b4c237f5 100644
--- a/data/text/maps/RustboroCity_CuttersHouse.s
+++ b/data/text/maps/RustboroCity_CuttersHouse.inc
diff --git a/data/text/maps/RustboroCity_DevonCorp_1F.s b/data/text/maps/RustboroCity_DevonCorp_1F.inc
index 209fd049c..209fd049c 100644
--- a/data/text/maps/RustboroCity_DevonCorp_1F.s
+++ b/data/text/maps/RustboroCity_DevonCorp_1F.inc
diff --git a/data/text/maps/RustboroCity_DevonCorp_2F.s b/data/text/maps/RustboroCity_DevonCorp_2F.inc
index a6a6bb6c2..a6a6bb6c2 100644
--- a/data/text/maps/RustboroCity_DevonCorp_2F.s
+++ b/data/text/maps/RustboroCity_DevonCorp_2F.inc
diff --git a/data/text/maps/RustboroCity_DevonCorp_3F.s b/data/text/maps/RustboroCity_DevonCorp_3F.inc
index c868a4836..c868a4836 100644
--- a/data/text/maps/RustboroCity_DevonCorp_3F.s
+++ b/data/text/maps/RustboroCity_DevonCorp_3F.inc
diff --git a/data/text/maps/RustboroCity_Flat1_1F.s b/data/text/maps/RustboroCity_Flat1_1F.inc
index 4721931e4..4721931e4 100644
--- a/data/text/maps/RustboroCity_Flat1_1F.s
+++ b/data/text/maps/RustboroCity_Flat1_1F.inc
diff --git a/data/text/maps/RustboroCity_Flat1_2F.s b/data/text/maps/RustboroCity_Flat1_2F.inc
index 7ddb678bf..7ddb678bf 100644
--- a/data/text/maps/RustboroCity_Flat1_2F.s
+++ b/data/text/maps/RustboroCity_Flat1_2F.inc
diff --git a/data/text/maps/RustboroCity_Flat2_1F.s b/data/text/maps/RustboroCity_Flat2_1F.inc
index d949a0ab8..d949a0ab8 100644
--- a/data/text/maps/RustboroCity_Flat2_1F.s
+++ b/data/text/maps/RustboroCity_Flat2_1F.inc
diff --git a/data/text/maps/RustboroCity_Flat2_2F.s b/data/text/maps/RustboroCity_Flat2_2F.inc
index 8a3d52fda..8a3d52fda 100644
--- a/data/text/maps/RustboroCity_Flat2_2F.s
+++ b/data/text/maps/RustboroCity_Flat2_2F.inc
diff --git a/data/text/maps/RustboroCity_Flat2_3F.s b/data/text/maps/RustboroCity_Flat2_3F.inc
index 9f95ce92e..9f95ce92e 100644
--- a/data/text/maps/RustboroCity_Flat2_3F.s
+++ b/data/text/maps/RustboroCity_Flat2_3F.inc
diff --git a/data/text/maps/RustboroCity_Gym.s b/data/text/maps/RustboroCity_Gym.inc
index 7bb737097..7bb737097 100644
--- a/data/text/maps/RustboroCity_Gym.s
+++ b/data/text/maps/RustboroCity_Gym.inc
diff --git a/data/text/maps/RustboroCity_House1.s b/data/text/maps/RustboroCity_House1.inc
index 6427aa326..6427aa326 100644
--- a/data/text/maps/RustboroCity_House1.s
+++ b/data/text/maps/RustboroCity_House1.inc
diff --git a/data/text/maps/RustboroCity_House2.s b/data/text/maps/RustboroCity_House2.inc
index 7a1d9c706..7a1d9c706 100644
--- a/data/text/maps/RustboroCity_House2.s
+++ b/data/text/maps/RustboroCity_House2.inc
diff --git a/data/text/maps/RustboroCity_House3.s b/data/text/maps/RustboroCity_House3.inc
index 43a3f6ff0..43a3f6ff0 100644
--- a/data/text/maps/RustboroCity_House3.s
+++ b/data/text/maps/RustboroCity_House3.inc
diff --git a/data/text/maps/RustboroCity_Mart.s b/data/text/maps/RustboroCity_Mart.inc
index f11395b68..f11395b68 100644
--- a/data/text/maps/RustboroCity_Mart.s
+++ b/data/text/maps/RustboroCity_Mart.inc
diff --git a/data/text/maps/RustboroCity_PokemonCenter_1F.s b/data/text/maps/RustboroCity_PokemonCenter_1F.inc
index 0265f0363..0265f0363 100644
--- a/data/text/maps/RustboroCity_PokemonCenter_1F.s
+++ b/data/text/maps/RustboroCity_PokemonCenter_1F.inc
diff --git a/data/text/maps/RustboroCity_PokemonSchool.s b/data/text/maps/RustboroCity_PokemonSchool.inc
index e12349bd2..e12349bd2 100644
--- a/data/text/maps/RustboroCity_PokemonSchool.s
+++ b/data/text/maps/RustboroCity_PokemonSchool.inc
diff --git a/data/text/maps/RusturfTunnel.s b/data/text/maps/RusturfTunnel.inc
index 3403808fd..3403808fd 100644
--- a/data/text/maps/RusturfTunnel.s
+++ b/data/text/maps/RusturfTunnel.inc
diff --git a/data/text/maps/SSTidalCorridor.s b/data/text/maps/SSTidalCorridor.inc
index 530ff6c55..530ff6c55 100644
--- a/data/text/maps/SSTidalCorridor.s
+++ b/data/text/maps/SSTidalCorridor.inc
diff --git a/data/text/maps/SSTidalLowerDeck.s b/data/text/maps/SSTidalLowerDeck.inc
index 2c54d743c..2c54d743c 100644
--- a/data/text/maps/SSTidalLowerDeck.s
+++ b/data/text/maps/SSTidalLowerDeck.inc
diff --git a/data/text/maps/SSTidalRooms.s b/data/text/maps/SSTidalRooms.inc
index a0f9000d3..a0f9000d3 100644
--- a/data/text/maps/SSTidalRooms.s
+++ b/data/text/maps/SSTidalRooms.inc
diff --git a/data/text/maps/SeafloorCavern_Room1.s b/data/text/maps/SeafloorCavern_Room1.inc
index da6e207ae..da6e207ae 100644
--- a/data/text/maps/SeafloorCavern_Room1.s
+++ b/data/text/maps/SeafloorCavern_Room1.inc
diff --git a/data/text/maps/SeafloorCavern_Room3.s b/data/text/maps/SeafloorCavern_Room3.inc
index 07187b142..07187b142 100644
--- a/data/text/maps/SeafloorCavern_Room3.s
+++ b/data/text/maps/SeafloorCavern_Room3.inc
diff --git a/data/text/maps/SeafloorCavern_Room4.s b/data/text/maps/SeafloorCavern_Room4.inc
index ca0600450..ca0600450 100644
--- a/data/text/maps/SeafloorCavern_Room4.s
+++ b/data/text/maps/SeafloorCavern_Room4.inc
diff --git a/data/text/maps/SecretBase_RedCave1.s b/data/text/maps/SecretBase_RedCave1.inc
index efb2c8fdb..efb2c8fdb 100644
--- a/data/text/maps/SecretBase_RedCave1.s
+++ b/data/text/maps/SecretBase_RedCave1.inc
diff --git a/data/text/maps/ShoalCave_LowTideEntranceRoom.s b/data/text/maps/ShoalCave_LowTideEntranceRoom.inc
index 8b1378917..8b1378917 100644
--- a/data/text/maps/ShoalCave_LowTideEntranceRoom.s
+++ b/data/text/maps/ShoalCave_LowTideEntranceRoom.inc
diff --git a/data/text/maps/ShoalCave_LowTideInnerRoom.s b/data/text/maps/ShoalCave_LowTideInnerRoom.inc
index 8b1378917..8b1378917 100644
--- a/data/text/maps/ShoalCave_LowTideInnerRoom.s
+++ b/data/text/maps/ShoalCave_LowTideInnerRoom.inc
diff --git a/data/text/maps/ShoalCave_LowTideLowerRoom.s b/data/text/maps/ShoalCave_LowTideLowerRoom.inc
index c9d4337de..c9d4337de 100644
--- a/data/text/maps/ShoalCave_LowTideLowerRoom.s
+++ b/data/text/maps/ShoalCave_LowTideLowerRoom.inc
diff --git a/data/text/maps/ShoalCave_LowTideStairsRoom.s b/data/text/maps/ShoalCave_LowTideStairsRoom.inc
index 8b1378917..8b1378917 100644
--- a/data/text/maps/ShoalCave_LowTideStairsRoom.s
+++ b/data/text/maps/ShoalCave_LowTideStairsRoom.inc
diff --git a/data/text/maps/SlateportCity.s b/data/text/maps/SlateportCity.inc
index 3ff5d51bf..3ff5d51bf 100644
--- a/data/text/maps/SlateportCity.s
+++ b/data/text/maps/SlateportCity.inc
diff --git a/data/text/maps/SlateportCity_ContestHall.s b/data/text/maps/SlateportCity_ContestHall.inc
index 6199157fb..6199157fb 100644
--- a/data/text/maps/SlateportCity_ContestHall.s
+++ b/data/text/maps/SlateportCity_ContestHall.inc
diff --git a/data/text/maps/SlateportCity_ContestLobby.s b/data/text/maps/SlateportCity_ContestLobby.inc
index 7c32cd8ac..7c32cd8ac 100644
--- a/data/text/maps/SlateportCity_ContestLobby.s
+++ b/data/text/maps/SlateportCity_ContestLobby.inc
diff --git a/data/text/maps/SlateportCity_Harbor.s b/data/text/maps/SlateportCity_Harbor.inc
index 187dfe07c..187dfe07c 100644
--- a/data/text/maps/SlateportCity_Harbor.s
+++ b/data/text/maps/SlateportCity_Harbor.inc
diff --git a/data/text/maps/SlateportCity_House1.s b/data/text/maps/SlateportCity_House1.inc
index c711aec2f..c711aec2f 100644
--- a/data/text/maps/SlateportCity_House1.s
+++ b/data/text/maps/SlateportCity_House1.inc
diff --git a/data/text/maps/SlateportCity_House2.s b/data/text/maps/SlateportCity_House2.inc
index c3d8346bc..c3d8346bc 100644
--- a/data/text/maps/SlateportCity_House2.s
+++ b/data/text/maps/SlateportCity_House2.inc
diff --git a/data/text/maps/SlateportCity_Mart.s b/data/text/maps/SlateportCity_Mart.inc
index b5243d406..b5243d406 100644
--- a/data/text/maps/SlateportCity_Mart.s
+++ b/data/text/maps/SlateportCity_Mart.inc
diff --git a/data/text/maps/SlateportCity_OceanicMuseum_1F.s b/data/text/maps/SlateportCity_OceanicMuseum_1F.inc
index 0d3d1eec6..0d3d1eec6 100644
--- a/data/text/maps/SlateportCity_OceanicMuseum_1F.s
+++ b/data/text/maps/SlateportCity_OceanicMuseum_1F.inc
diff --git a/data/text/maps/SlateportCity_OceanicMuseum_2F.s b/data/text/maps/SlateportCity_OceanicMuseum_2F.inc
index a3c624f0c..a3c624f0c 100644
--- a/data/text/maps/SlateportCity_OceanicMuseum_2F.s
+++ b/data/text/maps/SlateportCity_OceanicMuseum_2F.inc
diff --git a/data/text/maps/SlateportCity_PokemonCenter_1F.s b/data/text/maps/SlateportCity_PokemonCenter_1F.inc
index 2a87ffa93..2a87ffa93 100644
--- a/data/text/maps/SlateportCity_PokemonCenter_1F.s
+++ b/data/text/maps/SlateportCity_PokemonCenter_1F.inc
diff --git a/data/text/maps/SlateportCity_PokemonFanClub.s b/data/text/maps/SlateportCity_PokemonFanClub.inc
index eab516c2b..eab516c2b 100644
--- a/data/text/maps/SlateportCity_PokemonFanClub.s
+++ b/data/text/maps/SlateportCity_PokemonFanClub.inc
diff --git a/data/text/maps/SlateportCity_SternsShipyard_1F.s b/data/text/maps/SlateportCity_SternsShipyard_1F.inc
index 8a08a15ae..8a08a15ae 100644
--- a/data/text/maps/SlateportCity_SternsShipyard_1F.s
+++ b/data/text/maps/SlateportCity_SternsShipyard_1F.inc
diff --git a/data/text/maps/SlateportCity_SternsShipyard_2F.s b/data/text/maps/SlateportCity_SternsShipyard_2F.inc
index 0bf4e27e0..0bf4e27e0 100644
--- a/data/text/maps/SlateportCity_SternsShipyard_2F.s
+++ b/data/text/maps/SlateportCity_SternsShipyard_2F.inc
diff --git a/data/text/maps/SootopolisCity.s b/data/text/maps/SootopolisCity.inc
index cc89d86bd..cc89d86bd 100644
--- a/data/text/maps/SootopolisCity.s
+++ b/data/text/maps/SootopolisCity.inc
diff --git a/data/text/maps/SootopolisCity_Gym_1F.s b/data/text/maps/SootopolisCity_Gym_1F.inc
index 1047a5326..1047a5326 100644
--- a/data/text/maps/SootopolisCity_Gym_1F.s
+++ b/data/text/maps/SootopolisCity_Gym_1F.inc
diff --git a/data/text/maps/SootopolisCity_Gym_B1F.s b/data/text/maps/SootopolisCity_Gym_B1F.inc
index 8b1378917..8b1378917 100644
--- a/data/text/maps/SootopolisCity_Gym_B1F.s
+++ b/data/text/maps/SootopolisCity_Gym_B1F.inc
diff --git a/data/text/maps/SootopolisCity_House1.s b/data/text/maps/SootopolisCity_House1.inc
index 78e8454e5..78e8454e5 100644
--- a/data/text/maps/SootopolisCity_House1.s
+++ b/data/text/maps/SootopolisCity_House1.inc
diff --git a/data/text/maps/SootopolisCity_House2.s b/data/text/maps/SootopolisCity_House2.inc
index e132b20f7..e132b20f7 100644
--- a/data/text/maps/SootopolisCity_House2.s
+++ b/data/text/maps/SootopolisCity_House2.inc
diff --git a/data/text/maps/SootopolisCity_House3.s b/data/text/maps/SootopolisCity_House3.inc
index b67e0a4dc..b67e0a4dc 100644
--- a/data/text/maps/SootopolisCity_House3.s
+++ b/data/text/maps/SootopolisCity_House3.inc
diff --git a/data/text/maps/SootopolisCity_House4.s b/data/text/maps/SootopolisCity_House4.inc
index 277e2e060..277e2e060 100644
--- a/data/text/maps/SootopolisCity_House4.s
+++ b/data/text/maps/SootopolisCity_House4.inc
diff --git a/data/text/maps/SootopolisCity_House5.s b/data/text/maps/SootopolisCity_House5.inc
index c5887ffe2..c5887ffe2 100644
--- a/data/text/maps/SootopolisCity_House5.s
+++ b/data/text/maps/SootopolisCity_House5.inc
diff --git a/data/text/maps/SootopolisCity_House6.s b/data/text/maps/SootopolisCity_House6.inc
index c8547b412..c8547b412 100644
--- a/data/text/maps/SootopolisCity_House6.s
+++ b/data/text/maps/SootopolisCity_House6.inc
diff --git a/data/text/maps/SootopolisCity_House7.s b/data/text/maps/SootopolisCity_House7.inc
index 756a96a1b..756a96a1b 100644
--- a/data/text/maps/SootopolisCity_House7.s
+++ b/data/text/maps/SootopolisCity_House7.inc
diff --git a/data/text/maps/SootopolisCity_House8.s b/data/text/maps/SootopolisCity_House8.inc
index 4efc111cc..4efc111cc 100644
--- a/data/text/maps/SootopolisCity_House8.s
+++ b/data/text/maps/SootopolisCity_House8.inc
diff --git a/data/text/maps/SootopolisCity_Mart.s b/data/text/maps/SootopolisCity_Mart.inc
index 858d1530d..858d1530d 100644
--- a/data/text/maps/SootopolisCity_Mart.s
+++ b/data/text/maps/SootopolisCity_Mart.inc
diff --git a/data/text/maps/SootopolisCity_PokemonCenter_1F.s b/data/text/maps/SootopolisCity_PokemonCenter_1F.inc
index fd078ad0c..fd078ad0c 100644
--- a/data/text/maps/SootopolisCity_PokemonCenter_1F.s
+++ b/data/text/maps/SootopolisCity_PokemonCenter_1F.inc
diff --git a/data/text/maps/SouthernIsland_Exterior.s b/data/text/maps/SouthernIsland_Exterior.inc
index 8b1378917..8b1378917 100644
--- a/data/text/maps/SouthernIsland_Exterior.s
+++ b/data/text/maps/SouthernIsland_Exterior.inc
diff --git a/data/text/maps/SouthernIsland_Interior.s b/data/text/maps/SouthernIsland_Interior.inc
index 8b1378917..8b1378917 100644
--- a/data/text/maps/SouthernIsland_Interior.s
+++ b/data/text/maps/SouthernIsland_Interior.inc
diff --git a/data/text/maps/Underwater_SeafloorCavern.s b/data/text/maps/Underwater_SeafloorCavern.inc
index 8df6cb492..8df6cb492 100644
--- a/data/text/maps/Underwater_SeafloorCavern.s
+++ b/data/text/maps/Underwater_SeafloorCavern.inc
diff --git a/data/text/maps/VerdanturfTown.s b/data/text/maps/VerdanturfTown.inc
index a3ccdd34e..a3ccdd34e 100644
--- a/data/text/maps/VerdanturfTown.s
+++ b/data/text/maps/VerdanturfTown.inc
diff --git a/data/text/maps/VerdanturfTown_ContestHall.s b/data/text/maps/VerdanturfTown_ContestHall.inc
index 2bf97f1de..2bf97f1de 100644
--- a/data/text/maps/VerdanturfTown_ContestHall.s
+++ b/data/text/maps/VerdanturfTown_ContestHall.inc
diff --git a/data/text/maps/VerdanturfTown_ContestLobby.s b/data/text/maps/VerdanturfTown_ContestLobby.inc
index 2f9121c52..2f9121c52 100644
--- a/data/text/maps/VerdanturfTown_ContestLobby.s
+++ b/data/text/maps/VerdanturfTown_ContestLobby.inc
diff --git a/data/text/maps/VerdanturfTown_FriendshipRatersHouse.s b/data/text/maps/VerdanturfTown_FriendshipRatersHouse.inc
index e6e7f9730..e6e7f9730 100644
--- a/data/text/maps/VerdanturfTown_FriendshipRatersHouse.s
+++ b/data/text/maps/VerdanturfTown_FriendshipRatersHouse.inc
diff --git a/data/text/maps/VerdanturfTown_House.s b/data/text/maps/VerdanturfTown_House.inc
index 8db1656ee..8db1656ee 100644
--- a/data/text/maps/VerdanturfTown_House.s
+++ b/data/text/maps/VerdanturfTown_House.inc
diff --git a/data/text/maps/VerdanturfTown_Mart.s b/data/text/maps/VerdanturfTown_Mart.inc
index fbd655f08..fbd655f08 100644
--- a/data/text/maps/VerdanturfTown_Mart.s
+++ b/data/text/maps/VerdanturfTown_Mart.inc
diff --git a/data/text/maps/VerdanturfTown_PokemonCenter_1F.s b/data/text/maps/VerdanturfTown_PokemonCenter_1F.inc
index e79898ead..e79898ead 100644
--- a/data/text/maps/VerdanturfTown_PokemonCenter_1F.s
+++ b/data/text/maps/VerdanturfTown_PokemonCenter_1F.inc
diff --git a/data/text/maps/VerdanturfTown_WandasHouse.s b/data/text/maps/VerdanturfTown_WandasHouse.inc
index d8aae2958..d8aae2958 100644
--- a/data/text/maps/VerdanturfTown_WandasHouse.s
+++ b/data/text/maps/VerdanturfTown_WandasHouse.inc
diff --git a/data/text/maps/VictoryRoad_1F.s b/data/text/maps/VictoryRoad_1F.inc
index 2f52e5cd4..2f52e5cd4 100644
--- a/data/text/maps/VictoryRoad_1F.s
+++ b/data/text/maps/VictoryRoad_1F.inc
diff --git a/data/text/maps/VictoryRoad_B1F.s b/data/text/maps/VictoryRoad_B1F.inc
index d820a5c31..d820a5c31 100644
--- a/data/text/maps/VictoryRoad_B1F.s
+++ b/data/text/maps/VictoryRoad_B1F.inc
diff --git a/data/text/maps/VictoryRoad_B2F.s b/data/text/maps/VictoryRoad_B2F.inc
index 760a732ff..760a732ff 100644
--- a/data/text/maps/VictoryRoad_B2F.s
+++ b/data/text/maps/VictoryRoad_B2F.inc
diff --git a/data/text/move_descriptions.s b/data/text/move_descriptions.inc
index 29e325ad7..29e325ad7 100644
--- a/data/text/move_descriptions.s
+++ b/data/text/move_descriptions.inc
diff --git a/data/text/move_names.s b/data/text/move_names.inc
index e4895646c..e4895646c 100644
--- a/data/text/move_names.s
+++ b/data/text/move_names.inc
diff --git a/data/text/mystery_event_club.s b/data/text/mystery_event_club.inc
index cfe8c4947..cfe8c4947 100644
--- a/data/text/mystery_event_club.s
+++ b/data/text/mystery_event_club.inc
diff --git a/data/text/nature_names.s b/data/text/nature_names.inc
index f191f80ba..f191f80ba 100644
--- a/data/text/nature_names.s
+++ b/data/text/nature_names.inc
diff --git a/data/text/pokeblocks.s b/data/text/pokeblocks.inc
index e73a74cc0..e73a74cc0 100644
--- a/data/text/pokeblocks.s
+++ b/data/text/pokeblocks.inc
diff --git a/data/text/pokedex_rating.s b/data/text/pokedex_rating.inc
index d816799b6..d816799b6 100644
--- a/data/text/pokedex_rating.s
+++ b/data/text/pokedex_rating.inc
diff --git a/data/text/ribbon_descriptions.s b/data/text/ribbon_descriptions.inc
index ebbfc34ff..ebbfc34ff 100644
--- a/data/text/ribbon_descriptions.s
+++ b/data/text/ribbon_descriptions.inc
diff --git a/data/text/roulette.s b/data/text/roulette.inc
index f228cf779..f228cf779 100644
--- a/data/text/roulette.s
+++ b/data/text/roulette.inc
diff --git a/data/text/safari_zone.s b/data/text/safari_zone.inc
index 34966b9d1..34966b9d1 100644
--- a/data/text/safari_zone.s
+++ b/data/text/safari_zone.inc
diff --git a/data/text/save.s b/data/text/save.inc
index c35432540..c35432540 100644
--- a/data/text/save.s
+++ b/data/text/save.inc
diff --git a/data/text/secret_power_tm.s b/data/text/secret_power_tm.inc
index 88e9bc2e8..88e9bc2e8 100644
--- a/data/text/secret_power_tm.s
+++ b/data/text/secret_power_tm.inc
diff --git a/data/text/shoal_cave.s b/data/text/shoal_cave.inc
index c786e1f4a..c786e1f4a 100644
--- a/data/text/shoal_cave.s
+++ b/data/text/shoal_cave.inc
diff --git a/data/text/song_names.s b/data/text/song_names.inc
index 29fad36e1..29fad36e1 100644
--- a/data/text/song_names.s
+++ b/data/text/song_names.inc
diff --git a/data/text/species_names.s b/data/text/species_names.inc
index 8a387eb38..8a387eb38 100644
--- a/data/text/species_names.s
+++ b/data/text/species_names.inc
diff --git a/data/text/storyteller.s b/data/text/storyteller.inc
index 3cfa8a698..3cfa8a698 100644
--- a/data/text/storyteller.s
+++ b/data/text/storyteller.inc
diff --git a/data/text/surf.s b/data/text/surf.inc
index e9e3e9026..e9e3e9026 100644
--- a/data/text/surf.s
+++ b/data/text/surf.inc
diff --git a/data/text/trader.s b/data/text/trader.inc
index dba63bcf8..dba63bcf8 100644
--- a/data/text/trader.s
+++ b/data/text/trader.inc
diff --git a/data/text/trainer_class_names.s b/data/text/trainer_class_names.inc
index 8678a29a6..8678a29a6 100644
--- a/data/text/trainer_class_names.s
+++ b/data/text/trainer_class_names.inc
diff --git a/data/text/trainer_eye_descriptions.s b/data/text/trainer_eye_descriptions.inc
index c0b3f2399..c0b3f2399 100644
--- a/data/text/trainer_eye_descriptions.s
+++ b/data/text/trainer_eye_descriptions.inc
diff --git a/data/text/trainers.s b/data/text/trainers.inc
index 1bdd5be29..1bdd5be29 100644
--- a/data/text/trainers.s
+++ b/data/text/trainers.inc
diff --git a/data/text/tv.s b/data/text/tv.inc
index d2cc1a6fa..d2cc1a6fa 100644
--- a/data/text/tv.s
+++ b/data/text/tv.inc
diff --git a/data/text/type_names.s b/data/text/type_names.inc
index 83e85e1e1..83e85e1e1 100644
--- a/data/text/type_names.s
+++ b/data/text/type_names.inc
diff --git a/data/tilesets/graphics.s b/data/tilesets/graphics.inc
index 17f59459b..17f59459b 100644
--- a/data/tilesets/graphics.s
+++ b/data/tilesets/graphics.inc
diff --git a/data/tilesets/headers.s b/data/tilesets/headers.inc
index 69e11ac20..69e11ac20 100644
--- a/data/tilesets/headers.s
+++ b/data/tilesets/headers.inc
diff --git a/data/tilesets/metatiles.s b/data/tilesets/metatiles.inc
index 6a13d3f72..6a13d3f72 100644
--- a/data/tilesets/metatiles.s
+++ b/data/tilesets/metatiles.inc
diff --git a/data/tm_hm_learnsets.s b/data/tm_hm_learnsets.inc
index be4522310..be4522310 100644
--- a/data/tm_hm_learnsets.s
+++ b/data/tm_hm_learnsets.inc
diff --git a/data/trainer_class_index_tables.s b/data/trainer_class_index_tables.inc
index 25762e510..25762e510 100644
--- a/data/trainer_class_index_tables.s
+++ b/data/trainer_class_index_tables.inc
diff --git a/data/trainer_eye_trainers.s b/data/trainer_eye_trainers.inc
index 3628ea598..3628ea598 100644
--- a/data/trainer_eye_trainers.s
+++ b/data/trainer_eye_trainers.inc
diff --git a/data/trainer_money.s b/data/trainer_money.inc
index 95da92fea..95da92fea 100644
--- a/data/trainer_money.s
+++ b/data/trainer_money.inc
diff --git a/data/trainer_parties.s b/data/trainer_parties.inc
index b9eff1839..b9eff1839 100644
--- a/data/trainer_parties.s
+++ b/data/trainer_parties.inc
diff --git a/data/trainers.s b/data/trainers.inc
index 8e80cd77f..8e80cd77f 100644
--- a/data/trainers.s
+++ b/data/trainers.inc
diff --git a/data/type_effectiveness.s b/data/type_effectiveness.inc
index d0272d9e9..d0272d9e9 100644
--- a/data/type_effectiveness.s
+++ b/data/type_effectiveness.inc
diff --git a/data/wild_mons.s b/data/wild_mons.inc
index b30bc847d..b30bc847d 100644
--- a/data/wild_mons.s
+++ b/data/wild_mons.inc
diff --git a/sound/direct_sound_data.s b/sound/direct_sound_data.inc
index 71e92f9ee..71e92f9ee 100644
--- a/sound/direct_sound_data.s
+++ b/sound/direct_sound_data.inc
diff --git a/sound/keysplit_tables.s b/sound/keysplit_tables.inc
index 1dabf3c55..1dabf3c55 100644
--- a/sound/keysplit_tables.s
+++ b/sound/keysplit_tables.inc
diff --git a/sound/music_player_table.s b/sound/music_player_table.inc
index eadcfc90a..eadcfc90a 100644
--- a/sound/music_player_table.s
+++ b/sound/music_player_table.inc
diff --git a/sound/programmable_wave_data.s b/sound/programmable_wave_data.inc
index 7a60ed5a7..7a60ed5a7 100644
--- a/sound/programmable_wave_data.s
+++ b/sound/programmable_wave_data.inc
diff --git a/sound/song_table.s b/sound/song_table.inc
index 14f811b08..14f811b08 100644
--- a/sound/song_table.s
+++ b/sound/song_table.inc
diff --git a/sound/voice_groups.s b/sound/voice_groups.inc
index f250a394c..f250a394c 100644
--- a/sound/voice_groups.s
+++ b/sound/voice_groups.inc