English as proper default

2026-08-27 13:11:04 -05:00 · 2024-07-04 23:26:01 -04:00
parent 1b2d56c775
commit e26a0629ae
414 changed files with 9811 additions and 9766 deletions
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -80,19 +80,19 @@ jobs:
          GAME_LANGUAGE: ITALIAN
        run: make -j${nproc}

-      #- name: Spanish Compare
-      #  env:
-      #    MODERN: 0
-      #    COMPARE: 0 # Once all assets are ready, set to 1 instead
-      #    GAME_LANGUAGE: SPANISH
-      #  run: make -j${nproc}
+      - name: Spanish Compare
+        env:
+          MODERN: 0
+          COMPARE: 0 # Once all assets are ready, set to 1 instead
+          GAME_LANGUAGE: SPANISH
+        run: make -j${nproc}

-      #- name: Spanish Modern
-      #  env:
-      #    MODERN: 1
-      #    COMPARE: 0
-      #    GAME_LANGUAGE: SPANISH
-      #  run: make -j${nproc}
+      - name: Spanish Modern
+        env:
+          MODERN: 1
+          COMPARE: 0
+          GAME_LANGUAGE: SPANISH
+        run: make -j${nproc}

      - name: Move symfiles
        if: ${{ github.event_name == 'push' }}
--- a/2
+++ b/2
@@ -469,11 +469,9 @@ compare_all:
 	@$(MAKE) GAME_LANGUAGE=ENGLISH
 	@$(MAKE) GAME_LANGUAGE=FRENCH
 	@$(MAKE) GAME_LANGUAGE=ITALIAN
-	@$(MAKE) GAME_LANGUAGE=SPANISH
 	@$(SHA1) rom.sha1
 	@$(SHA1) rom_fr.sha1
 	@$(SHA1) rom_it.sha1
-	@$(SHA1) rom_es.sha1

 # Use modern compilers to build rom. Will not match with original ROMs.
 modern:     ; @$(MAKE) GAME_LANGUAGE=ENGLISH MODERN=1
--- a/data/event_scripts.s
+++ b/data/event_scripts.s
@@ -826,17 +826,6 @@ Common_EventScript_PlayerHandedOverTheItem::
 	.include "data/scripts/movement.inc"
 	.include "data/scripts/check_furniture.inc"

-.ifdef ENGLISH
-	.include "data/text/record_mix.inc"
-	.include "data/text/pc.inc"
-	.include "data/text/pkmn_center_nurse.inc"
-	.include "data/text/mart_clerk.inc"
-	.include "data/text/obtain_item.inc"
-	.include "data/text/general.inc"
-	.include "data/text/pc_transfer.inc"
-	.include "data/text/questionnaire.inc"
-	.include "data/text/abnormal_weather.inc"
-.else
 .ifdef FRENCH
 	.include "data/text/french/record_mix.inc"
 	.include "data/text/french/pc.inc"
@@ -869,7 +858,16 @@ Common_EventScript_PlayerHandedOverTheItem::
 	.include "data/text/spanish/pc_transfer.inc"
 	.include "data/text/spanish/questionnaire.inc"
 	.include "data/text/spanish/abnormal_weather.inc"
-.endif
+.else
+	.include "data/text/record_mix.inc"
+	.include "data/text/pc.inc"
+	.include "data/text/pkmn_center_nurse.inc"
+	.include "data/text/mart_clerk.inc"
+	.include "data/text/obtain_item.inc"
+	.include "data/text/general.inc"
+	.include "data/text/pc_transfer.inc"
+	.include "data/text/questionnaire.inc"
+	.include "data/text/abnormal_weather.inc"
 .endif
 .endif
 .endif
--- a/data/maps/AbandonedShip_CaptainsOffice/scripts.inc
+++ b/data/maps/AbandonedShip_CaptainsOffice/scripts.inc
@@ -22,9 +22,6 @@ AbandonedShip_CaptainsOffice_EventScript_ThisIsSSCactus::
 	release
 	end

-.ifdef ENGLISH
-	.include "data/maps/AbandonedShip_CaptainsOffice/text.inc"
-.else
 .ifdef FRENCH
 	.include "data/maps/AbandonedShip_CaptainsOffice/text_fr.inc"
 .else
@@ -33,7 +30,8 @@ AbandonedShip_CaptainsOffice_EventScript_ThisIsSSCactus::
 .else
 .ifdef SPANISH
 	.include "data/maps/AbandonedShip_CaptainsOffice/text_es.inc"
-.endif
+.else
+	.include "data/maps/AbandonedShip_CaptainsOffice/text.inc"
 .endif
 .endif
 .endif
--- a/data/maps/AbandonedShip_Corridors_1F/scripts.inc
+++ b/data/maps/AbandonedShip_Corridors_1F/scripts.inc
@@ -10,9 +10,6 @@ AbandonedShip_Corridors_1F_EventScript_Charlie::
 	msgbox AbandonedShip_Corridors_1F_Text_CharliePostBattle, MSGBOX_AUTOCLOSE
 	end

-.ifdef ENGLISH
-	.include "data/maps/AbandonedShip_Corridors_1F/text.inc"
-.else
 .ifdef FRENCH
 	.include "data/maps/AbandonedShip_Corridors_1F/text_fr.inc"
 .else
@@ -21,7 +18,8 @@ AbandonedShip_Corridors_1F_EventScript_Charlie::
 .else
 .ifdef SPANISH
 	.include "data/maps/AbandonedShip_Corridors_1F/text_es.inc"
-.endif
+.else
+	.include "data/maps/AbandonedShip_Corridors_1F/text.inc"
 .endif
 .endif
 .endif
--- a/data/maps/AbandonedShip_Corridors_B1F/scripts.inc
+++ b/data/maps/AbandonedShip_Corridors_B1F/scripts.inc
@@ -53,9 +53,6 @@ AbandonedShip_Corridors_B1F_EventScript_Duncan::
 	msgbox AbandonedShip_Corridors_B1F_Text_DuncanPostBattle, MSGBOX_AUTOCLOSE
 	end

-.ifdef ENGLISH
-	.include "data/maps/AbandonedShip_Corridors_B1F/text.inc"
-.else
 .ifdef FRENCH
 	.include "data/maps/AbandonedShip_Corridors_B1F/text_fr.inc"
 .else
@@ -64,7 +61,8 @@ AbandonedShip_Corridors_B1F_EventScript_Duncan::
 .else
 .ifdef SPANISH
 	.include "data/maps/AbandonedShip_Corridors_B1F/text_es.inc"
-.endif
+.else
+	.include "data/maps/AbandonedShip_Corridors_B1F/text.inc"
 .endif
 .endif
 .endif
--- a/data/maps/AbandonedShip_HiddenFloorCorridors/scripts.inc
+++ b/data/maps/AbandonedShip_HiddenFloorCorridors/scripts.inc
@@ -131,9 +131,6 @@ AbandonedShip_HiddenFloorCorridors_EventScript_TheDoorIsOpen::
 	releaseall
 	end

-.ifdef ENGLISH
-	.include "data/maps/AbandonedShip_HiddenFloorCorridors/text.inc"
-.else
 .ifdef FRENCH
 	.include "data/maps/AbandonedShip_HiddenFloorCorridors/text_fr.inc"
 .else
@@ -142,7 +139,8 @@ AbandonedShip_HiddenFloorCorridors_EventScript_TheDoorIsOpen::
 .else
 .ifdef SPANISH
 	.include "data/maps/AbandonedShip_HiddenFloorCorridors/text_es.inc"
-.endif
+.else
+	.include "data/maps/AbandonedShip_HiddenFloorCorridors/text.inc"
 .endif
 .endif
 .endif
--- a/data/maps/AbandonedShip_HiddenFloorRooms/scripts.inc
+++ b/data/maps/AbandonedShip_HiddenFloorRooms/scripts.inc
@@ -111,9 +111,6 @@ AbandonedShip_HiddenFloorRooms_EventScript_Trash::
 	releaseall
 	end

-.ifdef ENGLISH
-	.include "data/maps/AbandonedShip_HiddenFloorRooms/text.inc"
-.else
 .ifdef FRENCH
 	.include "data/maps/AbandonedShip_HiddenFloorRooms/text_fr.inc"
 .else
@@ -122,7 +119,8 @@ AbandonedShip_HiddenFloorRooms_EventScript_Trash::
 .else
 .ifdef SPANISH
 	.include "data/maps/AbandonedShip_HiddenFloorRooms/text_es.inc"
-.endif
+.else
+	.include "data/maps/AbandonedShip_HiddenFloorRooms/text.inc"
 .endif
 .endif
 .endif
--- a/data/maps/AbandonedShip_Rooms2_1F/scripts.inc
+++ b/data/maps/AbandonedShip_Rooms2_1F/scripts.inc
@@ -49,9 +49,6 @@ AbandonedShip_Rooms2_1F_EventScript_Garrison::
 	msgbox AbandonedShip_Rooms2_1F_Text_GarrisonPostBattle, MSGBOX_AUTOCLOSE
 	end

-.ifdef ENGLISH
-	.include "data/maps/AbandonedShip_Rooms2_1F/text.inc"
-.else
 .ifdef FRENCH
 	.include "data/maps/AbandonedShip_Rooms2_1F/text_fr.inc"
 .else
@@ -60,7 +57,8 @@ AbandonedShip_Rooms2_1F_EventScript_Garrison::
 .else
 .ifdef SPANISH
 	.include "data/maps/AbandonedShip_Rooms2_1F/text_es.inc"
-.endif
+.else
+	.include "data/maps/AbandonedShip_Rooms2_1F/text.inc"
 .endif
 .endif
 .endif
--- a/data/maps/AbandonedShip_Rooms2_B1F/scripts.inc
+++ b/data/maps/AbandonedShip_Rooms2_B1F/scripts.inc
@@ -5,9 +5,6 @@ AbandonedShip_Rooms2_B1F_EventScript_Camper::
 	msgbox AbandonedShip_Rooms2_B1F_Text_PerfectPlaceToGoExploring, MSGBOX_NPC
 	end

-.ifdef ENGLISH
-	.include "data/maps/AbandonedShip_Rooms2_B1F/text.inc"
-.else
 .ifdef FRENCH
 	.include "data/maps/AbandonedShip_Rooms2_B1F/text_fr.inc"
 .else
@@ -16,7 +13,8 @@ AbandonedShip_Rooms2_B1F_EventScript_Camper::
 .else
 .ifdef SPANISH
 	.include "data/maps/AbandonedShip_Rooms2_B1F/text_es.inc"
-.endif
+.else
+	.include "data/maps/AbandonedShip_Rooms2_B1F/text.inc"
 .endif
 .endif
 .endif
--- a/data/maps/AbandonedShip_Rooms_1F/scripts.inc
+++ b/data/maps/AbandonedShip_Rooms_1F/scripts.inc
@@ -31,9 +31,6 @@ AbandonedShip_Rooms_1F_EventScript_ThaliaRematch::
 	msgbox AbandonedShip_Rooms_1F_Text_ThaliaPostRematch, MSGBOX_AUTOCLOSE
 	end

-.ifdef ENGLISH
-	.include "data/maps/AbandonedShip_Rooms_1F/text.inc"
-.else
 .ifdef FRENCH
 	.include "data/maps/AbandonedShip_Rooms_1F/text_fr.inc"
 .else
@@ -42,7 +39,8 @@ AbandonedShip_Rooms_1F_EventScript_ThaliaRematch::
 .else
 .ifdef SPANISH
 	.include "data/maps/AbandonedShip_Rooms_1F/text_es.inc"
-.endif
+.else
+	.include "data/maps/AbandonedShip_Rooms_1F/text.inc"
 .endif
 .endif
 .endif
--- a/data/maps/AbandonedShip_Rooms_B1F/scripts.inc
+++ b/data/maps/AbandonedShip_Rooms_B1F/scripts.inc
@@ -10,9 +10,6 @@ AbandonedShip_Rooms_B1F_EventScript_FatMan::
 	msgbox AbandonedShip_Rooms_B1F_Text_GettingQueasy, MSGBOX_NPC
 	end

-.ifdef ENGLISH
-	.include "data/maps/AbandonedShip_Rooms_B1F/text.inc"
-.else
 .ifdef FRENCH
 	.include "data/maps/AbandonedShip_Rooms_B1F/text_fr.inc"
 .else
@@ -21,7 +18,8 @@ AbandonedShip_Rooms_B1F_EventScript_FatMan::
 .else
 .ifdef SPANISH
 	.include "data/maps/AbandonedShip_Rooms_B1F/text_es.inc"
-.endif
+.else
+	.include "data/maps/AbandonedShip_Rooms_B1F/text.inc"
 .endif
 .endif
 .endif
--- a/data/maps/AquaHideout_1F/scripts.inc
+++ b/data/maps/AquaHideout_1F/scripts.inc
@@ -50,9 +50,6 @@ AquaHideout_1F_EventScript_Grunt1Defeated::
 	release
 	end

-.ifdef ENGLISH
-	.include "data/maps/AquaHideout_1F/text.inc"
-.else
 .ifdef FRENCH
 	.include "data/maps/AquaHideout_1F/text_fr.inc"
 .else
@@ -61,7 +58,8 @@ AquaHideout_1F_EventScript_Grunt1Defeated::
 .else
 .ifdef SPANISH
 	.include "data/maps/AquaHideout_1F/text_es.inc"
-.endif
+.else
+	.include "data/maps/AquaHideout_1F/text.inc"
 .endif
 .endif
 .endif
--- a/data/maps/AquaHideout_B1F/scripts.inc
+++ b/data/maps/AquaHideout_B1F/scripts.inc
@@ -106,9 +106,6 @@ AquaHideout_B1F_EventScript_Grunt7::
 	msgbox AquaHideout_B1F_Text_Grunt7PostBattle, MSGBOX_AUTOCLOSE
 	end

-.ifdef ENGLISH
-	.include "data/maps/AquaHideout_B1F/text.inc"
-.else
 .ifdef FRENCH
 	.include "data/maps/AquaHideout_B1F/text_fr.inc"
 .else
@@ -117,7 +114,8 @@ AquaHideout_B1F_EventScript_Grunt7::
 .else
 .ifdef SPANISH
 	.include "data/maps/AquaHideout_B1F/text_es.inc"
-.endif
+.else
+	.include "data/maps/AquaHideout_B1F/text.inc"
 .endif
 .endif
 .endif
--- a/data/maps/AquaHideout_B2F/scripts.inc
+++ b/data/maps/AquaHideout_B2F/scripts.inc
@@ -89,9 +89,6 @@ AquaHideout_B2F_EventScript_Grunt8::
 	msgbox AquaHideout_B2F_Text_Grunt8PostBattle, MSGBOX_AUTOCLOSE
 	end

-.ifdef ENGLISH
-	.include "data/maps/AquaHideout_B2F/text.inc"
-.else
 .ifdef FRENCH
 	.include "data/maps/AquaHideout_B2F/text_fr.inc"
 .else
@@ -100,7 +97,8 @@ AquaHideout_B2F_EventScript_Grunt8::
 .else
 .ifdef SPANISH
 	.include "data/maps/AquaHideout_B2F/text_es.inc"
-.endif
+.else
+	.include "data/maps/AquaHideout_B2F/text.inc"
 .endif
 .endif
 .endif
--- a/data/maps/BattleFrontier_BattleArenaBattleRoom/scripts.inc
+++ b/data/maps/BattleFrontier_BattleArenaBattleRoom/scripts.inc
@@ -493,9 +493,6 @@ BattleFrontier_BattleArenaBattleRoom_Movement_GretaWalkBackToCenter:
 	walk_in_place_faster_left
 	step_end

-.ifdef ENGLISH
-	.include "data/maps/BattleFrontier_BattleArenaBattleRoom/text.inc"
-.else
 .ifdef FRENCH
 	.include "data/maps/BattleFrontier_BattleArenaBattleRoom/text_fr.inc"
 .else
@@ -504,7 +501,8 @@ BattleFrontier_BattleArenaBattleRoom_Movement_GretaWalkBackToCenter:
 .else
 .ifdef SPANISH
 	.include "data/maps/BattleFrontier_BattleArenaBattleRoom/text_es.inc"
-.endif
+.else
+	.include "data/maps/BattleFrontier_BattleArenaBattleRoom/text.inc"
 .endif
 .endif
 .endif
--- a/data/maps/BattleFrontier_BattleArenaCorridor/scripts.inc
+++ b/data/maps/BattleFrontier_BattleArenaCorridor/scripts.inc
@@ -86,9 +86,6 @@ BattleFrontier_BattleArenaCorridor_Movement_AttendantMoveOutOfWay:
 	walk_in_place_faster_down
 	step_end

-.ifdef ENGLISH
-	.include "data/maps/BattleFrontier_BattleArenaCorridor/text.inc"
-.else
 .ifdef FRENCH
 	.include "data/maps/BattleFrontier_BattleArenaCorridor/text_fr.inc"
 .else
@@ -97,7 +94,8 @@ BattleFrontier_BattleArenaCorridor_Movement_AttendantMoveOutOfWay:
 .else
 .ifdef SPANISH
 	.include "data/maps/BattleFrontier_BattleArenaCorridor/text_es.inc"
-.endif
+.else
+	.include "data/maps/BattleFrontier_BattleArenaCorridor/text.inc"
 .endif
 .endif
 .endif
--- a/data/maps/BattleFrontier_BattleArenaLobby/scripts.inc
+++ b/data/maps/BattleFrontier_BattleArenaLobby/scripts.inc
@@ -352,9 +352,6 @@ BattleFrontier_BattleArenaLobby_EventScript_ExitRules::
 	releaseall
 	end

-.ifdef ENGLISH
-	.include "data/maps/BattleFrontier_BattleArenaLobby/text.inc"
-.else
 .ifdef FRENCH
 	.include "data/maps/BattleFrontier_BattleArenaLobby/text_fr.inc"
 .else
@@ -363,7 +360,8 @@ BattleFrontier_BattleArenaLobby_EventScript_ExitRules::
 .else
 .ifdef SPANISH
 	.include "data/maps/BattleFrontier_BattleArenaLobby/text_es.inc"
-.endif
+.else
+	.include "data/maps/BattleFrontier_BattleArenaLobby/text.inc"
 .endif
 .endif
 .endif
--- a/data/maps/BattleFrontier_BattleDomeBattleRoom/scripts.inc
+++ b/data/maps/BattleFrontier_BattleDomeBattleRoom/scripts.inc
@@ -925,9 +925,6 @@ BattleFrontier_BattleDomeBattleRoom_Movement_RefereeExit:
 	walk_left
 	step_end

-.ifdef ENGLISH
-	.include "data/maps/BattleFrontier_BattleDomeBattleRoom/text.inc"
-.else
 .ifdef FRENCH
 	.include "data/maps/BattleFrontier_BattleDomeBattleRoom/text_fr.inc"
 .else
@@ -936,7 +933,8 @@ BattleFrontier_BattleDomeBattleRoom_Movement_RefereeExit:
 .else
 .ifdef SPANISH
 	.include "data/maps/BattleFrontier_BattleDomeBattleRoom/text_es.inc"
-.endif
+.else
+	.include "data/maps/BattleFrontier_BattleDomeBattleRoom/text.inc"
 .endif
 .endif
 .endif
--- a/data/maps/BattleFrontier_BattleDomeLobby/scripts.inc
+++ b/data/maps/BattleFrontier_BattleDomeLobby/scripts.inc
@@ -432,9 +432,6 @@ BattleFrontier_BattleDomeLobby_EventScript_ExitRules::
 	releaseall
 	end

-.ifdef ENGLISH
-	.include "data/maps/BattleFrontier_BattleDomeLobby/text.inc"
-.else
 .ifdef FRENCH
 	.include "data/maps/BattleFrontier_BattleDomeLobby/text_fr.inc"
 .else
@@ -443,7 +440,8 @@ BattleFrontier_BattleDomeLobby_EventScript_ExitRules::
 .else
 .ifdef SPANISH
 	.include "data/maps/BattleFrontier_BattleDomeLobby/text_es.inc"
-.endif
+.else
+	.include "data/maps/BattleFrontier_BattleDomeLobby/text.inc"
 .endif
 .endif
 .endif
--- a/data/maps/BattleFrontier_BattleDomePreBattleRoom/scripts.inc
+++ b/data/maps/BattleFrontier_BattleDomePreBattleRoom/scripts.inc
@@ -271,9 +271,6 @@ BattleFrontier_BattleDomePreBattleRoom_Movement_PlayerEnterDoor:
 	set_invisible
 	step_end

-.ifdef ENGLISH
-	.include "data/maps/BattleFrontier_BattleDomePreBattleRoom/text.inc"
-.else
 .ifdef FRENCH
 	.include "data/maps/BattleFrontier_BattleDomePreBattleRoom/text_fr.inc"
 .else
@@ -282,7 +279,8 @@ BattleFrontier_BattleDomePreBattleRoom_Movement_PlayerEnterDoor:
 .else
 .ifdef SPANISH
 	.include "data/maps/BattleFrontier_BattleDomePreBattleRoom/text_es.inc"
-.endif
+.else
+	.include "data/maps/BattleFrontier_BattleDomePreBattleRoom/text.inc"
 .endif
 .endif
 .endif
--- a/data/maps/BattleFrontier_BattleFactoryBattleRoom/scripts.inc
+++ b/data/maps/BattleFrontier_BattleFactoryBattleRoom/scripts.inc
@@ -250,9 +250,6 @@ BattleFrontier_BattleFactoryBattleRoom_EventScript_ScientistsFaceBattle::
 	waitmovement 0
 	return

-.ifdef ENGLISH
-	.include "data/maps/BattleFrontier_BattleFactoryBattleRoom/text.inc"
-.else
 .ifdef FRENCH
 	.include "data/maps/BattleFrontier_BattleFactoryBattleRoom/text_fr.inc"
 .else
@@ -261,7 +258,8 @@ BattleFrontier_BattleFactoryBattleRoom_EventScript_ScientistsFaceBattle::
 .else
 .ifdef SPANISH
 	.include "data/maps/BattleFrontier_BattleFactoryBattleRoom/text_es.inc"
-.endif
+.else
+	.include "data/maps/BattleFrontier_BattleFactoryBattleRoom/text.inc"
 .endif
 .endif
 .endif
--- a/data/maps/BattleFrontier_BattleFactoryLobby/scripts.inc
+++ b/data/maps/BattleFrontier_BattleFactoryLobby/scripts.inc
@@ -322,9 +322,6 @@ BattleFrontier_BattleFactoryLobby_EventScript_ExitRules::
 	releaseall
 	end

-.ifdef ENGLISH
-	.include "data/maps/BattleFrontier_BattleFactoryLobby/text.inc"
-.else
 .ifdef FRENCH
 	.include "data/maps/BattleFrontier_BattleFactoryLobby/text_fr.inc"
 .else
@@ -333,7 +330,8 @@ BattleFrontier_BattleFactoryLobby_EventScript_ExitRules::
 .else
 .ifdef SPANISH
 	.include "data/maps/BattleFrontier_BattleFactoryLobby/text_es.inc"
-.endif
+.else
+	.include "data/maps/BattleFrontier_BattleFactoryLobby/text.inc"
 .endif
 .endif
 .endif
--- a/data/maps/BattleFrontier_BattleFactoryPreBattleRoom/scripts.inc
+++ b/data/maps/BattleFrontier_BattleFactoryPreBattleRoom/scripts.inc
@@ -449,9 +449,6 @@ BattleFrontier_BattleFactoryPreBattleRoom_Movement_AttendantReturnToPlayer:
 	face_down
 	step_end

-.ifdef ENGLISH
-	.include "data/maps/BattleFrontier_BattleFactoryPreBattleRoom/text.inc"
-.else
 .ifdef FRENCH
 	.include "data/maps/BattleFrontier_BattleFactoryPreBattleRoom/text_fr.inc"
 .else
@@ -460,7 +457,8 @@ BattleFrontier_BattleFactoryPreBattleRoom_Movement_AttendantReturnToPlayer:
 .else
 .ifdef SPANISH
 	.include "data/maps/BattleFrontier_BattleFactoryPreBattleRoom/text_es.inc"
-.endif
+.else
+	.include "data/maps/BattleFrontier_BattleFactoryPreBattleRoom/text.inc"
 .endif
 .endif
 .endif
--- a/data/maps/BattleFrontier_BattlePalaceBattleRoom/scripts.inc
+++ b/data/maps/BattleFrontier_BattlePalaceBattleRoom/scripts.inc
@@ -447,9 +447,6 @@ BattleFrontier_BattlePalaceBattleRoom_Movement_SpenserEnter:
 	face_left
 	step_end

-.ifdef ENGLISH
-	.include "data/maps/BattleFrontier_BattlePalaceBattleRoom/text.inc"
-.else
 .ifdef FRENCH
 	.include "data/maps/BattleFrontier_BattlePalaceBattleRoom/text_fr.inc"
 .else
@@ -458,7 +455,8 @@ BattleFrontier_BattlePalaceBattleRoom_Movement_SpenserEnter:
 .else
 .ifdef SPANISH
 	.include "data/maps/BattleFrontier_BattlePalaceBattleRoom/text_es.inc"
-.endif
+.else
+	.include "data/maps/BattleFrontier_BattlePalaceBattleRoom/text.inc"
 .endif
 .endif
 .endif
--- a/data/maps/BattleFrontier_BattlePalaceCorridor/scripts.inc
+++ b/data/maps/BattleFrontier_BattlePalaceCorridor/scripts.inc
@@ -121,9 +121,6 @@ BattleFrontier_BattlePalaceCorridor_Movement_AttendantEnterBattleRoom:
 	set_invisible
 	step_end

-.ifdef ENGLISH
-	.include "data/maps/BattleFrontier_BattlePalaceCorridor/text.inc"
-.else
 .ifdef FRENCH
 	.include "data/maps/BattleFrontier_BattlePalaceCorridor/text_fr.inc"
 .else
@@ -132,7 +129,8 @@ BattleFrontier_BattlePalaceCorridor_Movement_AttendantEnterBattleRoom:
 .else
 .ifdef SPANISH
 	.include "data/maps/BattleFrontier_BattlePalaceCorridor/text_es.inc"
-.endif
+.else
+	.include "data/maps/BattleFrontier_BattlePalaceCorridor/text.inc"
 .endif
 .endif
 .endif
--- a/data/maps/BattleFrontier_BattlePalaceLobby/scripts.inc
+++ b/data/maps/BattleFrontier_BattlePalaceLobby/scripts.inc
@@ -374,9 +374,6 @@ BattleFrontier_BattlePalaceLobby_EventScript_ExitRules::
 	releaseall
 	end

-.ifdef ENGLISH
-	.include "data/maps/BattleFrontier_BattlePalaceLobby/text.inc"
-.else
 .ifdef FRENCH
 	.include "data/maps/BattleFrontier_BattlePalaceLobby/text_fr.inc"
 .else
@@ -385,7 +382,8 @@ BattleFrontier_BattlePalaceLobby_EventScript_ExitRules::
 .else
 .ifdef SPANISH
 	.include "data/maps/BattleFrontier_BattlePalaceLobby/text_es.inc"
-.endif
+.else
+	.include "data/maps/BattleFrontier_BattlePalaceLobby/text.inc"
 .endif
 .endif
 .endif
--- a/data/maps/BattleFrontier_BattlePikeCorridor/scripts.inc
+++ b/data/maps/BattleFrontier_BattlePikeCorridor/scripts.inc
@@ -56,9 +56,6 @@ BattleFrontier_BattlePikeCorridor_Movement_AttendantEnterCorridor:
 	face_down
 	step_end

-.ifdef ENGLISH
-	.include "data/maps/BattleFrontier_BattlePikeCorridor/text.inc"
-.else
 .ifdef FRENCH
 	.include "data/maps/BattleFrontier_BattlePikeCorridor/text_fr.inc"
 .else
@@ -67,7 +64,8 @@ BattleFrontier_BattlePikeCorridor_Movement_AttendantEnterCorridor:
 .else
 .ifdef SPANISH
 	.include "data/maps/BattleFrontier_BattlePikeCorridor/text_es.inc"
-.endif
+.else
+	.include "data/maps/BattleFrontier_BattlePikeCorridor/text.inc"
 .endif
 .endif
 .endif
--- a/data/maps/BattleFrontier_BattlePikeLobby/scripts.inc
+++ b/data/maps/BattleFrontier_BattlePikeLobby/scripts.inc
@@ -267,9 +267,6 @@ BattleFrontier_BattlePike_EventScript_CloseCurtain::
 	waitse
 	return

-.ifdef ENGLISH
-	.include "data/maps/BattleFrontier_BattlePikeLobby/text.inc"
-.else
 .ifdef FRENCH
 	.include "data/maps/BattleFrontier_BattlePikeLobby/text_fr.inc"
 .else
@@ -278,7 +275,8 @@ BattleFrontier_BattlePike_EventScript_CloseCurtain::
 .else
 .ifdef SPANISH
 	.include "data/maps/BattleFrontier_BattlePikeLobby/text_es.inc"
-.endif
+.else
+	.include "data/maps/BattleFrontier_BattlePikeLobby/text.inc"
 .endif
 .endif
 .endif
--- a/data/maps/BattleFrontier_BattlePikeRoomFinal/scripts.inc
+++ b/data/maps/BattleFrontier_BattlePikeRoomFinal/scripts.inc
@@ -36,9 +36,6 @@ BattleFrontier_BattlePikeRoomFinal_EventScript_TurnPlayerNorth::
 	turnobject OBJ_EVENT_ID_PLAYER, DIR_NORTH
 	end

-.ifdef ENGLISH
-	.include "data/maps/BattleFrontier_BattlePikeRoomFinal/text.inc"
-.else
 .ifdef FRENCH
 	.include "data/maps/BattleFrontier_BattlePikeRoomFinal/text_fr.inc"
 .else
@@ -47,7 +44,8 @@ BattleFrontier_BattlePikeRoomFinal_EventScript_TurnPlayerNorth::
 .else
 .ifdef SPANISH
 	.include "data/maps/BattleFrontier_BattlePikeRoomFinal/text_es.inc"
-.endif
+.else
+	.include "data/maps/BattleFrontier_BattlePikeRoomFinal/text.inc"
 .endif
 .endif
 .endif
--- a/data/maps/BattleFrontier_BattlePikeRoomNormal/scripts.inc
+++ b/data/maps/BattleFrontier_BattlePikeRoomNormal/scripts.inc
@@ -646,9 +646,6 @@ BattleFrontier_BattlePikeRoomNormal_Movement_CameraPanDown:
 	walk_down
 	step_end

-.ifdef ENGLISH
-	.include "data/maps/BattleFrontier_BattlePikeRoomNormal/text.inc"
-.else
 .ifdef FRENCH
 	.include "data/maps/BattleFrontier_BattlePikeRoomNormal/text_fr.inc"
 .else
@@ -657,7 +654,8 @@ BattleFrontier_BattlePikeRoomNormal_Movement_CameraPanDown:
 .else
 .ifdef SPANISH
 	.include "data/maps/BattleFrontier_BattlePikeRoomNormal/text_es.inc"
-.endif
+.else
+	.include "data/maps/BattleFrontier_BattlePikeRoomNormal/text.inc"
 .endif
 .endif
 .endif
--- a/data/maps/BattleFrontier_BattlePikeThreePathRoom/scripts.inc
+++ b/data/maps/BattleFrontier_BattlePikeThreePathRoom/scripts.inc
@@ -263,9 +263,6 @@ BattleFrontier_BattlePikeThreePathRoom_Movement_HintGiverReturnToPos:
 	face_down
 	step_end

-.ifdef ENGLISH
-	.include "data/maps/BattleFrontier_BattlePikeThreePathRoom/text.inc"
-.else
 .ifdef FRENCH
 	.include "data/maps/BattleFrontier_BattlePikeThreePathRoom/text_fr.inc"
 .else
@@ -274,7 +271,8 @@ BattleFrontier_BattlePikeThreePathRoom_Movement_HintGiverReturnToPos:
 .else
 .ifdef SPANISH
 	.include "data/maps/BattleFrontier_BattlePikeThreePathRoom/text_es.inc"
-.endif
+.else
+	.include "data/maps/BattleFrontier_BattlePikeThreePathRoom/text.inc"
 .endif
 .endif
 .endif
--- a/data/maps/BattleFrontier_BattlePyramidFloor/scripts.inc
+++ b/data/maps/BattleFrontier_BattlePyramidFloor/scripts.inc
@@ -124,9 +124,6 @@ BattlePyramid_FindItemBallEnd::
 BattlePyramid_Retire::
 	goto BattleFrontier_BattlePyramid_EventScript_WarpToLobbyLost

-.ifdef ENGLISH
-	.include "data/maps/BattleFrontier_BattlePyramidFloor/text.inc"
-.else
 .ifdef FRENCH
 	.include "data/maps/BattleFrontier_BattlePyramidFloor/text_fr.inc"
 .else
@@ -135,7 +132,8 @@ BattlePyramid_Retire::
 .else
 .ifdef SPANISH
 	.include "data/maps/BattleFrontier_BattlePyramidFloor/text_es.inc"
-.endif
+.else
+	.include "data/maps/BattleFrontier_BattlePyramidFloor/text.inc"
 .endif
 .endif
 .endif
--- a/data/maps/BattleFrontier_BattlePyramidLobby/scripts.inc
+++ b/data/maps/BattleFrontier_BattlePyramidLobby/scripts.inc
@@ -524,9 +524,6 @@ BattleFrontier_BattlePyramidLobby_EventScript_ExitRules::
 	releaseall
 	end

-.ifdef ENGLISH
-	.include "data/maps/BattleFrontier_BattlePyramidLobby/text.inc"
-.else
 .ifdef FRENCH
 	.include "data/maps/BattleFrontier_BattlePyramidLobby/text_fr.inc"
 .else
@@ -535,7 +532,8 @@ BattleFrontier_BattlePyramidLobby_EventScript_ExitRules::
 .else
 .ifdef SPANISH
 	.include "data/maps/BattleFrontier_BattlePyramidLobby/text_es.inc"
-.endif
+.else
+	.include "data/maps/BattleFrontier_BattlePyramidLobby/text.inc"
 .endif
 .endif
 .endif
--- a/data/maps/BattleFrontier_BattlePyramidTop/scripts.inc
+++ b/data/maps/BattleFrontier_BattlePyramidTop/scripts.inc
@@ -218,9 +218,6 @@ BattleFrontier_BattlePyramidTop_Movement_CameraPanUp:
 	delay_16
 	step_end

-.ifdef ENGLISH
-	.include "data/maps/BattleFrontier_BattlePyramidTop/text.inc"
-.else
 .ifdef FRENCH
 	.include "data/maps/BattleFrontier_BattlePyramidTop/text_fr.inc"
 .else
@@ -229,7 +226,8 @@ BattleFrontier_BattlePyramidTop_Movement_CameraPanUp:
 .else
 .ifdef SPANISH
 	.include "data/maps/BattleFrontier_BattlePyramidTop/text_es.inc"
-.endif
+.else
+	.include "data/maps/BattleFrontier_BattlePyramidTop/text.inc"
 .endif
 .endif
 .endif
--- a/data/maps/BattleFrontier_BattleTowerBattleRoom/scripts.inc
+++ b/data/maps/BattleFrontier_BattleTowerBattleRoom/scripts.inc
@@ -437,9 +437,6 @@ BattleFrontier_BattleTowerBattleRoom_EventScript_RetireChallenge::
 	goto BattleFrontier_BattleTower_EventScript_WarpToLobbyLost
 	end

-.ifdef ENGLISH
-	.include "data/maps/BattleFrontier_BattleTowerBattleRoom/text.inc"
-.else
 .ifdef FRENCH
 	.include "data/maps/BattleFrontier_BattleTowerBattleRoom/text_fr.inc"
 .else
@@ -448,7 +445,8 @@ BattleFrontier_BattleTowerBattleRoom_EventScript_RetireChallenge::
 .else
 .ifdef SPANISH
 	.include "data/maps/BattleFrontier_BattleTowerBattleRoom/text_es.inc"
-.endif
+.else
+	.include "data/maps/BattleFrontier_BattleTowerBattleRoom/text.inc"
 .endif
 .endif
 .endif
--- a/data/maps/BattleFrontier_BattleTowerLobby/scripts.inc
+++ b/data/maps/BattleFrontier_BattleTowerLobby/scripts.inc
@@ -910,9 +910,6 @@ BattleFrontier_BattleTowerLobby_EventScript_ExitRules::
 	releaseall
 	end

-.ifdef ENGLISH
-	.include "data/maps/BattleFrontier_BattleTowerLobby/text.inc"
-.else
 .ifdef FRENCH
 	.include "data/maps/BattleFrontier_BattleTowerLobby/text_fr.inc"
 .else
@@ -921,7 +918,8 @@ BattleFrontier_BattleTowerLobby_EventScript_ExitRules::
 .else
 .ifdef SPANISH
 	.include "data/maps/BattleFrontier_BattleTowerLobby/text_es.inc"
-.endif
+.else
+	.include "data/maps/BattleFrontier_BattleTowerLobby/text.inc"
 .endif
 .endif
 .endif
--- a/data/maps/BattleFrontier_BattleTowerMultiBattleRoom/scripts.inc
+++ b/data/maps/BattleFrontier_BattleTowerMultiBattleRoom/scripts.inc
@@ -452,9 +452,6 @@ BattleFrontier_BattleTowerMultiBattleRoom_Movement_WalkInPlaceLeft:
 	walk_in_place_left
 	step_end

-.ifdef ENGLISH
-	.include "data/maps/BattleFrontier_BattleTowerMultiBattleRoom/text.inc"
-.else
 .ifdef FRENCH
 	.include "data/maps/BattleFrontier_BattleTowerMultiBattleRoom/text_fr.inc"
 .else
@@ -463,7 +460,8 @@ BattleFrontier_BattleTowerMultiBattleRoom_Movement_WalkInPlaceLeft:
 .else
 .ifdef SPANISH
 	.include "data/maps/BattleFrontier_BattleTowerMultiBattleRoom/text_es.inc"
-.endif
+.else
+	.include "data/maps/BattleFrontier_BattleTowerMultiBattleRoom/text.inc"
 .endif
 .endif
 .endif
--- a/data/maps/BattleFrontier_BattleTowerMultiPartnerRoom/scripts.inc
+++ b/data/maps/BattleFrontier_BattleTowerMultiPartnerRoom/scripts.inc
@@ -278,9 +278,6 @@ BattleFrontier_BattleTowerMultiPartnerRoom_EventScript_Partner8::
 	goto BattleFrontier_BattleTowerMultiPartnerRoom_EventScript_TalkToPotentialPartner
 	end

-.ifdef ENGLISH
-	.include "data/maps/BattleFrontier_BattleTowerMultiPartnerRoom/text.inc"
-.else
 .ifdef FRENCH
 	.include "data/maps/BattleFrontier_BattleTowerMultiPartnerRoom/text_fr.inc"
 .else
@@ -289,7 +286,8 @@ BattleFrontier_BattleTowerMultiPartnerRoom_EventScript_Partner8::
 .else
 .ifdef SPANISH
 	.include "data/maps/BattleFrontier_BattleTowerMultiPartnerRoom/text_es.inc"
-.endif
+.else
+	.include "data/maps/BattleFrontier_BattleTowerMultiPartnerRoom/text.inc"
 .endif
 .endif
 .endif
--- a/data/maps/BattleFrontier_ExchangeServiceCorner/scripts.inc
+++ b/data/maps/BattleFrontier_ExchangeServiceCorner/scripts.inc
@@ -434,9 +434,6 @@ BattleFrontier_ExchangeServiceCorner_EventScript_Girl::
 	msgbox BattleFrontier_ExchangeServiceCorner_Text_MoreBattlePointsForRecord, MSGBOX_NPC
 	end

-.ifdef ENGLISH
-	.include "data/maps/BattleFrontier_ExchangeServiceCorner/text.inc"
-.else
 .ifdef FRENCH
 	.include "data/maps/BattleFrontier_ExchangeServiceCorner/text_fr.inc"
 .else
@@ -445,7 +442,8 @@ BattleFrontier_ExchangeServiceCorner_EventScript_Girl::
 .else
 .ifdef SPANISH
 	.include "data/maps/BattleFrontier_ExchangeServiceCorner/text_es.inc"
-.endif
+.else
+	.include "data/maps/BattleFrontier_ExchangeServiceCorner/text.inc"
 .endif
 .endif
 .endif
--- a/data/maps/BattleFrontier_Lounge1/scripts.inc
+++ b/data/maps/BattleFrontier_Lounge1/scripts.inc
@@ -150,9 +150,6 @@ BattleFrontier_Lounge1_EventScript_Boy2::
 	msgbox BattleFrontier_Lounge1_Text_DidntDoAnythingSpecialRaisingIt, MSGBOX_NPC
 	end

-.ifdef ENGLISH
-	.include "data/maps/BattleFrontier_Lounge1/text.inc"
-.else
 .ifdef FRENCH
 	.include "data/maps/BattleFrontier_Lounge1/text_fr.inc"
 .else
@@ -161,7 +158,8 @@ BattleFrontier_Lounge1_EventScript_Boy2::
 .else
 .ifdef SPANISH
 	.include "data/maps/BattleFrontier_Lounge1/text_es.inc"
-.endif
+.else
+	.include "data/maps/BattleFrontier_Lounge1/text.inc"
 .endif
 .endif
 .endif
--- a/data/maps/BattleFrontier_Lounge2/scripts.inc
+++ b/data/maps/BattleFrontier_Lounge2/scripts.inc
@@ -112,9 +112,6 @@ BattleFrontier_Lounge2_EventScript_TriathleteF::
 	msgbox BattleFrontier_Lounge2_Text_ThisPlaceIsScaringMe, MSGBOX_NPC
 	end

-.ifdef ENGLISH
-	.include "data/maps/BattleFrontier_Lounge2/text.inc"
-.else
 .ifdef FRENCH
 	.include "data/maps/BattleFrontier_Lounge2/text_fr.inc"
 .else
@@ -123,7 +120,8 @@ BattleFrontier_Lounge2_EventScript_TriathleteF::
 .else
 .ifdef SPANISH
 	.include "data/maps/BattleFrontier_Lounge2/text_es.inc"
-.endif
+.else
+	.include "data/maps/BattleFrontier_Lounge2/text.inc"
 .endif
 .endif
 .endif
--- a/data/maps/BattleFrontier_Lounge3/scripts.inc
+++ b/data/maps/BattleFrontier_Lounge3/scripts.inc
@@ -197,9 +197,6 @@ BattleFrontier_Lounge3_EventScript_FaceOriginalDirection::
 	release
 	end

-.ifdef ENGLISH
-	.include "data/maps/BattleFrontier_Lounge3/text.inc"
-.else
 .ifdef FRENCH
 	.include "data/maps/BattleFrontier_Lounge3/text_fr.inc"
 .else
@@ -208,7 +205,8 @@ BattleFrontier_Lounge3_EventScript_FaceOriginalDirection::
 .else
 .ifdef SPANISH
 	.include "data/maps/BattleFrontier_Lounge3/text_es.inc"
-.endif
+.else
+	.include "data/maps/BattleFrontier_Lounge3/text.inc"
 .endif
 .endif
 .endif
--- a/data/maps/BattleFrontier_Lounge4/scripts.inc
+++ b/data/maps/BattleFrontier_Lounge4/scripts.inc
@@ -13,9 +13,6 @@ BattleFrontier_Lounge4_EventScript_Man::
 	msgbox BattleFrontier_Lounge4_Text_NeedBreatherAfterBattles, MSGBOX_NPC
 	end

-.ifdef ENGLISH
-	.include "data/maps/BattleFrontier_Lounge4/text.inc"
-.else
 .ifdef FRENCH
 	.include "data/maps/BattleFrontier_Lounge4/text_fr.inc"
 .else
@@ -24,7 +21,8 @@ BattleFrontier_Lounge4_EventScript_Man::
 .else
 .ifdef SPANISH
 	.include "data/maps/BattleFrontier_Lounge4/text_es.inc"
-.endif
+.else
+	.include "data/maps/BattleFrontier_Lounge4/text.inc"
 .endif
 .endif
 .endif
--- a/data/maps/BattleFrontier_Lounge5/scripts.inc
+++ b/data/maps/BattleFrontier_Lounge5/scripts.inc
@@ -41,9 +41,6 @@ BattleFrontier_Lounge5_EventScript_LittleBoy::
 	msgbox BattleFrontier_Lounge5_Text_GirlPlaysAtRedHouseALot, MSGBOX_NPC
 	end

-.ifdef ENGLISH
-	.include "data/maps/BattleFrontier_Lounge5/text.inc"
-.else
 .ifdef FRENCH
 	.include "data/maps/BattleFrontier_Lounge5/text_fr.inc"
 .else
@@ -52,7 +49,8 @@ BattleFrontier_Lounge5_EventScript_LittleBoy::
 .else
 .ifdef SPANISH
 	.include "data/maps/BattleFrontier_Lounge5/text_es.inc"
-.endif
+.else
+	.include "data/maps/BattleFrontier_Lounge5/text.inc"
 .endif
 .endif
 .endif
--- a/data/maps/BattleFrontier_Lounge6/scripts.inc
+++ b/data/maps/BattleFrontier_Lounge6/scripts.inc
@@ -45,9 +45,6 @@ BattleFrontier_Lounge6_EventScript_TradeCompleted::
 	release
 	end

-.ifdef ENGLISH
-	.include "data/maps/BattleFrontier_Lounge6/text.inc"
-.else
 .ifdef FRENCH
 	.include "data/maps/BattleFrontier_Lounge6/text_fr.inc"
 .else
@@ -56,7 +53,8 @@ BattleFrontier_Lounge6_EventScript_TradeCompleted::
 .else
 .ifdef SPANISH
 	.include "data/maps/BattleFrontier_Lounge6/text_es.inc"
-.endif
+.else
+	.include "data/maps/BattleFrontier_Lounge6/text.inc"
 .endif
 .endif
 .endif
--- a/data/maps/BattleFrontier_Lounge7/scripts.inc
+++ b/data/maps/BattleFrontier_Lounge7/scripts.inc
@@ -287,9 +287,6 @@ BattleFrontier_Lounge7_EventScript_Gentleman::
 	msgbox BattleFrontier_Lounge7_Text_LadiesWereStrongAndBeautiful, MSGBOX_NPC
 	end

-.ifdef ENGLISH
-	.include "data/maps/BattleFrontier_Lounge7/text.inc"
-.else
 .ifdef FRENCH
 	.include "data/maps/BattleFrontier_Lounge7/text_fr.inc"
 .else
@@ -298,7 +295,8 @@ BattleFrontier_Lounge7_EventScript_Gentleman::
 .else
 .ifdef SPANISH
 	.include "data/maps/BattleFrontier_Lounge7/text_es.inc"
-.endif
+.else
+	.include "data/maps/BattleFrontier_Lounge7/text.inc"
 .endif
 .endif
 .endif
--- a/data/maps/BattleFrontier_Lounge8/scripts.inc
+++ b/data/maps/BattleFrontier_Lounge8/scripts.inc
@@ -13,9 +13,6 @@ BattleFrontier_Lounge8_EventScript_NinjaBoy::
 	msgbox BattleFrontier_Lounge8_Text_ToldMeIHaveTalentForBattling, MSGBOX_NPC
 	end

-.ifdef ENGLISH
-	.include "data/maps/BattleFrontier_Lounge8/text.inc"
-.else
 .ifdef FRENCH
 	.include "data/maps/BattleFrontier_Lounge8/text_fr.inc"
 .else
@@ -24,7 +21,8 @@ BattleFrontier_Lounge8_EventScript_NinjaBoy::
 .else
 .ifdef SPANISH
 	.include "data/maps/BattleFrontier_Lounge8/text_es.inc"
-.endif
+.else
+	.include "data/maps/BattleFrontier_Lounge8/text.inc"
 .endif
 .endif
 .endif
--- a/data/maps/BattleFrontier_Mart/scripts.inc
+++ b/data/maps/BattleFrontier_Mart/scripts.inc
@@ -48,9 +48,6 @@ BattleFrontier_Mart_EventScript_Boy::
 	msgbox BattleFrontier_Mart_Text_FacilitiesDontAllowItems, MSGBOX_NPC
 	end

-.ifdef ENGLISH
-	.include "data/maps/BattleFrontier_Mart/text.inc"
-.else
 .ifdef FRENCH
 	.include "data/maps/BattleFrontier_Mart/text_fr.inc"
 .else
@@ -59,7 +56,8 @@ BattleFrontier_Mart_EventScript_Boy::
 .else
 .ifdef SPANISH
 	.include "data/maps/BattleFrontier_Mart/text_es.inc"
-.endif
+.else
+	.include "data/maps/BattleFrontier_Mart/text.inc"
 .endif
 .endif
 .endif
--- a/data/maps/BattleFrontier_OutsideEast/scripts.inc
+++ b/data/maps/BattleFrontier_OutsideEast/scripts.inc
@@ -233,9 +233,6 @@ BattleFrontier_OutsideEast_EventScript_Camper::
 	msgbox BattleFrontier_OutsideEast_Text_StickyMonWithLongTail, MSGBOX_NPC
 	end

-.ifdef ENGLISH
-	.include "data/maps/BattleFrontier_OutsideEast/text.inc"
-.else
 .ifdef FRENCH
 	.include "data/maps/BattleFrontier_OutsideEast/text_fr.inc"
 .else
@@ -244,7 +241,8 @@ BattleFrontier_OutsideEast_EventScript_Camper::
 .else
 .ifdef SPANISH
 	.include "data/maps/BattleFrontier_OutsideEast/text_es.inc"
-.endif
+.else
+	.include "data/maps/BattleFrontier_OutsideEast/text.inc"
 .endif
 .endif
 .endif
--- a/data/maps/BattleFrontier_OutsideWest/scripts.inc
+++ b/data/maps/BattleFrontier_OutsideWest/scripts.inc
@@ -307,9 +307,6 @@ BattleFrontier_OutsideWest_EventScript_PokefanF::
 	msgbox BattleFrontier_OutsideWest_Text_MonWithLongTailInFrontier, MSGBOX_NPC
 	end

-.ifdef ENGLISH
-	.include "data/maps/BattleFrontier_OutsideWest/text.inc"
-.else
 .ifdef FRENCH
 	.include "data/maps/BattleFrontier_OutsideWest/text_fr.inc"
 .else
@@ -318,7 +315,8 @@ BattleFrontier_OutsideWest_EventScript_PokefanF::
 .else
 .ifdef SPANISH
 	.include "data/maps/BattleFrontier_OutsideWest/text_es.inc"
-.endif
+.else
+	.include "data/maps/BattleFrontier_OutsideWest/text.inc"
 .endif
 .endif
 .endif
--- a/data/maps/BattleFrontier_PokemonCenter_1F/scripts.inc
+++ b/data/maps/BattleFrontier_PokemonCenter_1F/scripts.inc
@@ -39,9 +39,6 @@ BattleFrontier_PokemonCenter_1F_EventScript_Skitty::
 	release
 	end

-.ifdef ENGLISH
-	.include "data/maps/BattleFrontier_PokemonCenter_1F/text.inc"
-.else
 .ifdef FRENCH
 	.include "data/maps/BattleFrontier_PokemonCenter_1F/text_fr.inc"
 .else
@@ -50,7 +47,8 @@ BattleFrontier_PokemonCenter_1F_EventScript_Skitty::
 .else
 .ifdef SPANISH
 	.include "data/maps/BattleFrontier_PokemonCenter_1F/text_es.inc"
-.endif
+.else
+	.include "data/maps/BattleFrontier_PokemonCenter_1F/text.inc"
 .endif
 .endif
 .endif
--- a/data/maps/BattleFrontier_RankingHall/scripts.inc
+++ b/data/maps/BattleFrontier_RankingHall/scripts.inc
@@ -100,9 +100,6 @@ BattleFrontier_RankingHall_EventScript_Boy::
 	msgbox BattleFrontier_RankingHall_Text_MyNamesNotUpThere, MSGBOX_NPC
 	end

-.ifdef ENGLISH
-	.include "data/maps/BattleFrontier_RankingHall/text.inc"
-.else
 .ifdef FRENCH
 	.include "data/maps/BattleFrontier_RankingHall/text_fr.inc"
 .else
@@ -111,7 +108,8 @@ BattleFrontier_RankingHall_EventScript_Boy::
 .else
 .ifdef SPANISH
 	.include "data/maps/BattleFrontier_RankingHall/text_es.inc"
-.endif
+.else
+	.include "data/maps/BattleFrontier_RankingHall/text.inc"
 .endif
 .endif
 .endif
--- a/data/maps/BattleFrontier_ReceptionGate/scripts.inc
+++ b/data/maps/BattleFrontier_ReceptionGate/scripts.inc
@@ -298,9 +298,6 @@ BattleFrontier_ReceptionGate_EventScript_ExitFrontierPassGuide::
 	release
 	end

-.ifdef ENGLISH
-	.include "data/maps/BattleFrontier_ReceptionGate/text.inc"
-.else
 .ifdef FRENCH
 	.include "data/maps/BattleFrontier_ReceptionGate/text_fr.inc"
 .else
@@ -309,7 +306,8 @@ BattleFrontier_ReceptionGate_EventScript_ExitFrontierPassGuide::
 .else
 .ifdef SPANISH
 	.include "data/maps/BattleFrontier_ReceptionGate/text_es.inc"
-.endif
+.else
+	.include "data/maps/BattleFrontier_ReceptionGate/text.inc"
 .endif
 .endif
 .endif
--- a/data/maps/BattleFrontier_ScottsHouse/scripts.inc
+++ b/data/maps/BattleFrontier_ScottsHouse/scripts.inc
@@ -211,9 +211,6 @@ BattleFrontier_ScottsHouse_EventScript_ScottFaceAwayWest::
 	waitmovement 0
 	return

-.ifdef ENGLISH
-	.include "data/maps/BattleFrontier_ScottsHouse/text.inc"
-.else
 .ifdef FRENCH
 	.include "data/maps/BattleFrontier_ScottsHouse/text_fr.inc"
 .else
@@ -222,7 +219,8 @@ BattleFrontier_ScottsHouse_EventScript_ScottFaceAwayWest::
 .else
 .ifdef SPANISH
 	.include "data/maps/BattleFrontier_ScottsHouse/text_es.inc"
-.endif
+.else
+	.include "data/maps/BattleFrontier_ScottsHouse/text.inc"
 .endif
 .endif
 .endif
--- a/data/maps/CaveOfOrigin_B1F/scripts.inc
+++ b/data/maps/CaveOfOrigin_B1F/scripts.inc
@@ -61,9 +61,6 @@ CaveOfOrigin_B1F_EventScript_AtSkyPillar::
 	release
 	end

-.ifdef ENGLISH
-	.include "data/maps/CaveOfOrigin_B1F/text.inc"
-.else
 .ifdef FRENCH
 	.include "data/maps/CaveOfOrigin_B1F/text_fr.inc"
 .else
@@ -72,7 +69,8 @@ CaveOfOrigin_B1F_EventScript_AtSkyPillar::
 .else
 .ifdef SPANISH
 	.include "data/maps/CaveOfOrigin_B1F/text_es.inc"
-.endif
+.else
+	.include "data/maps/CaveOfOrigin_B1F/text.inc"
 .endif
 .endif
 .endif
--- a/data/maps/DewfordTown/scripts.inc
+++ b/data/maps/DewfordTown/scripts.inc
@@ -638,9 +638,6 @@ DewfordTown_EventScript_PhraseNotTrendyEnough::
 	release
 	end

-.ifdef ENGLISH
-	.include "data/maps/DewfordTown/text.inc"
-.else
 .ifdef FRENCH
 	.include "data/maps/DewfordTown/text_fr.inc"
 .else
@@ -649,7 +646,8 @@ DewfordTown_EventScript_PhraseNotTrendyEnough::
 .else
 .ifdef SPANISH
 	.include "data/maps/DewfordTown/text_es.inc"
-.endif
+.else
+	.include "data/maps/DewfordTown/text.inc"
 .endif
 .endif
 .endif
--- a/data/maps/DewfordTown_Gym/scripts.inc
+++ b/data/maps/DewfordTown_Gym/scripts.inc
@@ -282,9 +282,6 @@ DewfordTown_Gym_EventScript_GymStatue::
 	releaseall
 	end

-.ifdef ENGLISH
-	.include "data/maps/DewfordTown_Gym/text.inc"
-.else
 .ifdef FRENCH
 	.include "data/maps/DewfordTown_Gym/text_fr.inc"
 .else
@@ -293,7 +290,8 @@ DewfordTown_Gym_EventScript_GymStatue::
 .else
 .ifdef SPANISH
 	.include "data/maps/DewfordTown_Gym/text_es.inc"
-.endif
+.else
+	.include "data/maps/DewfordTown_Gym/text.inc"
 .endif
 .endif
 .endif
--- a/data/maps/DewfordTown_Hall/scripts.inc
+++ b/data/maps/DewfordTown_Hall/scripts.inc
@@ -259,9 +259,6 @@ DewfordTown_Hall_EventScript_ReceivedSludgeBomb::
 	release
 	end

-.ifdef ENGLISH
-	.include "data/maps/DewfordTown_Hall/text.inc"
-.else
 .ifdef FRENCH
 	.include "data/maps/DewfordTown_Hall/text_fr.inc"
 .else
@@ -270,7 +267,8 @@ DewfordTown_Hall_EventScript_ReceivedSludgeBomb::
 .else
 .ifdef SPANISH
 	.include "data/maps/DewfordTown_Hall/text_es.inc"
-.endif
+.else
+	.include "data/maps/DewfordTown_Hall/text.inc"
 .endif
 .endif
 .endif
--- a/data/maps/DewfordTown_House1/scripts.inc
+++ b/data/maps/DewfordTown_House1/scripts.inc
@@ -19,9 +19,6 @@ DewfordTown_House1_EventScript_Zigzagoon::
 	release
 	end

-.ifdef ENGLISH
-	.include "data/maps/DewfordTown_House1/text.inc"
-.else
 .ifdef FRENCH
 	.include "data/maps/DewfordTown_House1/text_fr.inc"
 .else
@@ -30,7 +27,8 @@ DewfordTown_House1_EventScript_Zigzagoon::
 .else
 .ifdef SPANISH
 	.include "data/maps/DewfordTown_House1/text_es.inc"
-.endif
+.else
+	.include "data/maps/DewfordTown_House1/text.inc"
 .endif
 .endif
 .endif
--- a/data/maps/DewfordTown_House2/scripts.inc
+++ b/data/maps/DewfordTown_House2/scripts.inc
@@ -26,9 +26,6 @@ DewfordTown_House2_EventScript_Boy::
 	msgbox DewfordTown_House2_Text_BrawlySoCool, MSGBOX_NPC
 	end

-.ifdef ENGLISH
-	.include "data/maps/DewfordTown_House2/text.inc"
-.else
 .ifdef FRENCH
 	.include "data/maps/DewfordTown_House2/text_fr.inc"
 .else
@@ -37,7 +34,8 @@ DewfordTown_House2_EventScript_Boy::
 .else
 .ifdef SPANISH
 	.include "data/maps/DewfordTown_House2/text_es.inc"
-.endif
+.else
+	.include "data/maps/DewfordTown_House2/text.inc"
 .endif
 .endif
 .endif
--- a/data/maps/DewfordTown_PokemonCenter_1F/scripts.inc
+++ b/data/maps/DewfordTown_PokemonCenter_1F/scripts.inc
@@ -26,9 +26,6 @@ DewfordTown_PokemonCenter_1F_EventScript_Man::
 	msgbox DewfordTown_PokemonCenter_1F_Text_FaintedMonCanUseHM, MSGBOX_NPC
 	end

-.ifdef ENGLISH
-	.include "data/maps/DewfordTown_PokemonCenter_1F/text.inc"
-.else
 .ifdef FRENCH
 	.include "data/maps/DewfordTown_PokemonCenter_1F/text_fr.inc"
 .else
@@ -37,7 +34,8 @@ DewfordTown_PokemonCenter_1F_EventScript_Man::
 .else
 .ifdef SPANISH
 	.include "data/maps/DewfordTown_PokemonCenter_1F/text_es.inc"
-.endif
+.else
+	.include "data/maps/DewfordTown_PokemonCenter_1F/text.inc"
 .endif
 .endif
 .endif
--- a/data/maps/EverGrandeCity/scripts.inc
+++ b/data/maps/EverGrandeCity/scripts.inc
@@ -23,9 +23,6 @@ EverGrandeCity_EventScript_SetVisitedEverGrande::
 	setvar VAR_TEMP_1, 1
 	end

-.ifdef ENGLISH
-	.include "data/maps/EverGrandeCity/text.inc"
-.else
 .ifdef FRENCH
 	.include "data/maps/EverGrandeCity/text_fr.inc"
 .else
@@ -34,7 +31,8 @@ EverGrandeCity_EventScript_SetVisitedEverGrande::
 .else
 .ifdef SPANISH
 	.include "data/maps/EverGrandeCity/text_es.inc"
-.endif
+.else
+	.include "data/maps/EverGrandeCity/text.inc"
 .endif
 .endif
 .endif
--- a/data/maps/EverGrandeCity_ChampionsRoom/scripts.inc
+++ b/data/maps/EverGrandeCity_ChampionsRoom/scripts.inc
@@ -223,9 +223,6 @@ EverGrandeCity_ChampionsRoom_Movement_BirchArrives:
 	walk_in_place_faster_left
 	step_end

-.ifdef ENGLISH
-	.include "data/maps/EverGrandeCity_ChampionsRoom/text.inc"
-.else
 .ifdef FRENCH
 	.include "data/maps/EverGrandeCity_ChampionsRoom/text_fr.inc"
 .else
@@ -234,7 +231,8 @@ EverGrandeCity_ChampionsRoom_Movement_BirchArrives:
 .else
 .ifdef SPANISH
 	.include "data/maps/EverGrandeCity_ChampionsRoom/text_es.inc"
-.endif
+.else
+	.include "data/maps/EverGrandeCity_ChampionsRoom/text.inc"
 .endif
 .endif
 .endif
--- a/data/maps/EverGrandeCity_DrakesRoom/scripts.inc
+++ b/data/maps/EverGrandeCity_DrakesRoom/scripts.inc
@@ -61,9 +61,6 @@ EverGrandeCity_DrakesRoom_EventScript_Defeated::
 	release
 	end

-.ifdef ENGLISH
-	.include "data/maps/EverGrandeCity_DrakesRoom/text.inc"
-.else
 .ifdef FRENCH
 	.include "data/maps/EverGrandeCity_DrakesRoom/text_fr.inc"
 .else
@@ -72,7 +69,8 @@ EverGrandeCity_DrakesRoom_EventScript_Defeated::
 .else
 .ifdef SPANISH
 	.include "data/maps/EverGrandeCity_DrakesRoom/text_es.inc"
-.endif
+.else
+	.include "data/maps/EverGrandeCity_DrakesRoom/text.inc"
 .endif
 .endif
 .endif
--- a/data/maps/EverGrandeCity_GlaciasRoom/scripts.inc
+++ b/data/maps/EverGrandeCity_GlaciasRoom/scripts.inc
@@ -58,9 +58,6 @@ EverGrandeCity_GlaciasRoom_EventScript_Defeated::
 	release
 	end

-.ifdef ENGLISH
-	.include "data/maps/EverGrandeCity_GlaciasRoom/text.inc"
-.else
 .ifdef FRENCH
 	.include "data/maps/EverGrandeCity_GlaciasRoom/text_fr.inc"
 .else
@@ -69,7 +66,8 @@ EverGrandeCity_GlaciasRoom_EventScript_Defeated::
 .else
 .ifdef SPANISH
 	.include "data/maps/EverGrandeCity_GlaciasRoom/text_es.inc"
-.endif
+.else
+	.include "data/maps/EverGrandeCity_GlaciasRoom/text.inc"
 .endif
 .endif
 .endif
--- a/data/maps/EverGrandeCity_HallOfFame/scripts.inc
+++ b/data/maps/EverGrandeCity_HallOfFame/scripts.inc
@@ -83,9 +83,6 @@ EverGrandeCity_HallOfFame_Movement_WalkIntoHallOfFame2:
 	walk_up
 	step_end

-.ifdef ENGLISH
-	.include "data/maps/EverGrandeCity_HallOfFame/text.inc"
-.else
 .ifdef FRENCH
 	.include "data/maps/EverGrandeCity_HallOfFame/text_fr.inc"
 .else
@@ -94,7 +91,8 @@ EverGrandeCity_HallOfFame_Movement_WalkIntoHallOfFame2:
 .else
 .ifdef SPANISH
 	.include "data/maps/EverGrandeCity_HallOfFame/text_es.inc"
-.endif
+.else
+	.include "data/maps/EverGrandeCity_HallOfFame/text.inc"
 .endif
 .endif
 .endif
--- a/data/maps/EverGrandeCity_PhoebesRoom/scripts.inc
+++ b/data/maps/EverGrandeCity_PhoebesRoom/scripts.inc
@@ -58,9 +58,6 @@ EverGrandeCity_PhoebesRoom_EventScript_Defeated::
 	release
 	end

-.ifdef ENGLISH
-	.include "data/maps/EverGrandeCity_PhoebesRoom/text.inc"
-.else
 .ifdef FRENCH
 	.include "data/maps/EverGrandeCity_PhoebesRoom/text_fr.inc"
 .else
@@ -69,7 +66,8 @@ EverGrandeCity_PhoebesRoom_EventScript_Defeated::
 .else
 .ifdef SPANISH
 	.include "data/maps/EverGrandeCity_PhoebesRoom/text_es.inc"
-.endif
+.else
+	.include "data/maps/EverGrandeCity_PhoebesRoom/text.inc"
 .endif
 .endif
 .endif
--- a/data/maps/EverGrandeCity_PokemonCenter_1F/scripts.inc
+++ b/data/maps/EverGrandeCity_PokemonCenter_1F/scripts.inc
@@ -76,9 +76,6 @@ EverGrandeCity_PokemonCenter_1F_Movement_ScottExit:
 	walk_down
 	step_end

-.ifdef ENGLISH
-	.include "data/maps/EverGrandeCity_PokemonCenter_1F/text.inc"
-.else
 .ifdef FRENCH
 	.include "data/maps/EverGrandeCity_PokemonCenter_1F/text_fr.inc"
 .else
@@ -87,7 +84,8 @@ EverGrandeCity_PokemonCenter_1F_Movement_ScottExit:
 .else
 .ifdef SPANISH
 	.include "data/maps/EverGrandeCity_PokemonCenter_1F/text_es.inc"
-.endif
+.else
+	.include "data/maps/EverGrandeCity_PokemonCenter_1F/text.inc"
 .endif
 .endif
 .endif
--- a/data/maps/EverGrandeCity_PokemonLeague_1F/scripts.inc
+++ b/data/maps/EverGrandeCity_PokemonLeague_1F/scripts.inc
@@ -125,9 +125,6 @@ EverGrandeCity_PokemonLeague_1F_Movement_RightGuardOutOfWay:
 	walk_in_place_faster_down
 	step_end

-.ifdef ENGLISH
-	.include "data/maps/EverGrandeCity_PokemonLeague_1F/text.inc"
-.else
 .ifdef FRENCH
 	.include "data/maps/EverGrandeCity_PokemonLeague_1F/text_fr.inc"
 .else
@@ -136,7 +133,8 @@ EverGrandeCity_PokemonLeague_1F_Movement_RightGuardOutOfWay:
 .else
 .ifdef SPANISH
 	.include "data/maps/EverGrandeCity_PokemonLeague_1F/text_es.inc"
-.endif
+.else
+	.include "data/maps/EverGrandeCity_PokemonLeague_1F/text.inc"
 .endif
 .endif
 .endif
--- a/data/maps/EverGrandeCity_SidneysRoom/scripts.inc
+++ b/data/maps/EverGrandeCity_SidneysRoom/scripts.inc
@@ -64,9 +64,6 @@ EverGrandeCity_SidneysRoom_EventScript_Defeated::
 	release
 	end

-.ifdef ENGLISH
-	.include "data/maps/EverGrandeCity_SidneysRoom/text.inc"
-.else
 .ifdef FRENCH
 	.include "data/maps/EverGrandeCity_SidneysRoom/text_fr.inc"
 .else
@@ -75,7 +72,8 @@ EverGrandeCity_SidneysRoom_EventScript_Defeated::
 .else
 .ifdef SPANISH
 	.include "data/maps/EverGrandeCity_SidneysRoom/text_es.inc"
-.endif
+.else
+	.include "data/maps/EverGrandeCity_SidneysRoom/text.inc"
 .endif
 .endif
 .endif
--- a/data/maps/FallarborTown/scripts.inc
+++ b/data/maps/FallarborTown/scripts.inc
@@ -51,9 +51,6 @@ FallarborTown_EventScript_MoveTutorSign::
 	msgbox FallarborTown_Text_MoveTutorSign, MSGBOX_SIGN
 	end

-.ifdef ENGLISH
-	.include "data/maps/FallarborTown/text.inc"
-.else
 .ifdef FRENCH
 	.include "data/maps/FallarborTown/text_fr.inc"
 .else
@@ -62,7 +59,8 @@ FallarborTown_EventScript_MoveTutorSign::
 .else
 .ifdef SPANISH
 	.include "data/maps/FallarborTown/text_es.inc"
-.endif
+.else
+	.include "data/maps/FallarborTown/text.inc"
 .endif
 .endif
 .endif
--- a/data/maps/FallarborTown_BattleTentCorridor/scripts.inc
+++ b/data/maps/FallarborTown_BattleTentCorridor/scripts.inc
@@ -41,9 +41,6 @@ FallarborTown_BattleTentCorridor_Movement_AttendantEnterDoor:
 	set_invisible
 	step_end

-.ifdef ENGLISH
-	.include "data/maps/FallarborTown_BattleTentCorridor/text.inc"
-.else
 .ifdef FRENCH
 	.include "data/maps/FallarborTown_BattleTentCorridor/text_fr.inc"
 .else
@@ -52,7 +49,8 @@ FallarborTown_BattleTentCorridor_Movement_AttendantEnterDoor:
 .else
 .ifdef SPANISH
 	.include "data/maps/FallarborTown_BattleTentCorridor/text_es.inc"
-.endif
+.else
+	.include "data/maps/FallarborTown_BattleTentCorridor/text.inc"
 .endif
 .endif
 .endif
--- a/data/maps/FallarborTown_BattleTentLobby/scripts.inc
+++ b/data/maps/FallarborTown_BattleTentLobby/scripts.inc
@@ -302,9 +302,6 @@ FallarborTown_BattleTentLobby_EventScript_ExitRules::
 	releaseall
 	end

-.ifdef ENGLISH
-	.include "data/maps/FallarborTown_BattleTentLobby/text.inc"
-.else
 .ifdef FRENCH
 	.include "data/maps/FallarborTown_BattleTentLobby/text_fr.inc"
 .else
@@ -313,7 +310,8 @@ FallarborTown_BattleTentLobby_EventScript_ExitRules::
 .else
 .ifdef SPANISH
 	.include "data/maps/FallarborTown_BattleTentLobby/text_es.inc"
-.endif
+.else
+	.include "data/maps/FallarborTown_BattleTentLobby/text.inc"
 .endif
 .endif
 .endif
--- a/data/maps/FallarborTown_CozmosHouse/scripts.inc
+++ b/data/maps/FallarborTown_CozmosHouse/scripts.inc
@@ -64,9 +64,6 @@ FallarborTown_CozmosHouse_EventScript_CozmoIsHappy::
 	release
 	end

-.ifdef ENGLISH
-	.include "data/maps/FallarborTown_CozmosHouse/text.inc"
-.else
 .ifdef FRENCH
 	.include "data/maps/FallarborTown_CozmosHouse/text_fr.inc"
 .else
@@ -75,7 +72,8 @@ FallarborTown_CozmosHouse_EventScript_CozmoIsHappy::
 .else
 .ifdef SPANISH
 	.include "data/maps/FallarborTown_CozmosHouse/text_es.inc"
-.endif
+.else
+	.include "data/maps/FallarborTown_CozmosHouse/text.inc"
 .endif
 .endif
 .endif
--- a/data/maps/FallarborTown_Mart/scripts.inc
+++ b/data/maps/FallarborTown_Mart/scripts.inc
@@ -47,9 +47,6 @@ FallarborTown_Mart_EventScript_Skitty::
 	release
 	end

-.ifdef ENGLISH
-	.include "data/maps/FallarborTown_Mart/text.inc"
-.else
 .ifdef FRENCH
 	.include "data/maps/FallarborTown_Mart/text_fr.inc"
 .else
@@ -58,7 +55,8 @@ FallarborTown_Mart_EventScript_Skitty::
 .else
 .ifdef SPANISH
 	.include "data/maps/FallarborTown_Mart/text_es.inc"
-.endif
+.else
+	.include "data/maps/FallarborTown_Mart/text.inc"
 .endif
 .endif
 .endif
--- a/data/maps/FallarborTown_MoveRelearnersHouse/scripts.inc
+++ b/data/maps/FallarborTown_MoveRelearnersHouse/scripts.inc
@@ -58,9 +58,6 @@ FallarborTown_MoveRelearnersHouse_EventScript_ComeBackWithHeartScale::
 	releaseall
 	end

-.ifdef ENGLISH
-	.include "data/maps/FallarborTown_MoveRelearnersHouse/text.inc"
-.else
 .ifdef FRENCH
 	.include "data/maps/FallarborTown_MoveRelearnersHouse/text_fr.inc"
 .else
@@ -69,7 +66,8 @@ FallarborTown_MoveRelearnersHouse_EventScript_ComeBackWithHeartScale::
 .else
 .ifdef SPANISH
 	.include "data/maps/FallarborTown_MoveRelearnersHouse/text_es.inc"
-.endif
+.else
+	.include "data/maps/FallarborTown_MoveRelearnersHouse/text.inc"
 .endif
 .endif
 .endif
--- a/data/maps/FallarborTown_PokemonCenter_1F/scripts.inc
+++ b/data/maps/FallarborTown_PokemonCenter_1F/scripts.inc
@@ -84,9 +84,6 @@ FallarborTown_PokemonCenter_1F_Movement_LanetteExitWest:
 	delay_8
 	step_end

-.ifdef ENGLISH
-	.include "data/maps/FallarborTown_PokemonCenter_1F/text.inc"
-.else
 .ifdef FRENCH
 	.include "data/maps/FallarborTown_PokemonCenter_1F/text_fr.inc"
 .else
@@ -95,7 +92,8 @@ FallarborTown_PokemonCenter_1F_Movement_LanetteExitWest:
 .else
 .ifdef SPANISH
 	.include "data/maps/FallarborTown_PokemonCenter_1F/text_es.inc"
-.endif
+.else
+	.include "data/maps/FallarborTown_PokemonCenter_1F/text.inc"
 .endif
 .endif
 .endif
--- a/data/maps/FarawayIsland_Interior/scripts.inc
+++ b/data/maps/FarawayIsland_Interior/scripts.inc
@@ -185,9 +185,6 @@ FarawayIsland_Interior_EventScript_HideMewWhenGrassCut::
 	releaseall
 	end

-.ifdef ENGLISH
-	.include "data/maps/FarawayIsland_Interior/text.inc"
-.else
 .ifdef FRENCH
 	.include "data/maps/FarawayIsland_Interior/text_fr.inc"
 .else
@@ -196,7 +193,8 @@ FarawayIsland_Interior_EventScript_HideMewWhenGrassCut::
 .else
 .ifdef SPANISH
 	.include "data/maps/FarawayIsland_Interior/text_es.inc"
-.endif
+.else
+	.include "data/maps/FarawayIsland_Interior/text.inc"
 .endif
 .endif
 .endif
--- a/data/maps/FortreeCity/scripts.inc
+++ b/data/maps/FortreeCity/scripts.inc
@@ -87,9 +87,6 @@ FortreeCity_Movement_KecleonFlee:
 	walk_right
 	step_end

-.ifdef ENGLISH
-	.include "data/maps/FortreeCity/text.inc"
-.else
 .ifdef FRENCH
 	.include "data/maps/FortreeCity/text_fr.inc"
 .else
@@ -98,7 +95,8 @@ FortreeCity_Movement_KecleonFlee:
 .else
 .ifdef SPANISH
 	.include "data/maps/FortreeCity/text_es.inc"
-.endif
+.else
+	.include "data/maps/FortreeCity/text.inc"
 .endif
 .endif
 .endif
--- a/data/maps/FortreeCity_DecorationShop/scripts.inc
+++ b/data/maps/FortreeCity_DecorationShop/scripts.inc
@@ -57,9 +57,6 @@ FortreeCity_DecorationShop_PokemartDecor_Chairs:
 	release
 	end

-.ifdef ENGLISH
-	.include "data/maps/FortreeCity_DecorationShop/text.inc"
-.else
 .ifdef FRENCH
 	.include "data/maps/FortreeCity_DecorationShop/text_fr.inc"
 .else
@@ -68,7 +65,8 @@ FortreeCity_DecorationShop_PokemartDecor_Chairs:
 .else
 .ifdef SPANISH
 	.include "data/maps/FortreeCity_DecorationShop/text_es.inc"
-.endif
+.else
+	.include "data/maps/FortreeCity_DecorationShop/text.inc"
 .endif
 .endif
 .endif
--- a/data/maps/FortreeCity_Gym/scripts.inc
+++ b/data/maps/FortreeCity_Gym/scripts.inc
@@ -132,9 +132,6 @@ FortreeCity_Gym_EventScript_GymStatue::
 	releaseall
 	end

-.ifdef ENGLISH
-	.include "data/maps/FortreeCity_Gym/text.inc"
-.else
 .ifdef FRENCH
 	.include "data/maps/FortreeCity_Gym/text_fr.inc"
 .else
@@ -143,7 +140,8 @@ FortreeCity_Gym_EventScript_GymStatue::
 .else
 .ifdef SPANISH
 	.include "data/maps/FortreeCity_Gym/text_es.inc"
-.endif
+.else
+	.include "data/maps/FortreeCity_Gym/text.inc"
 .endif
 .endif
 .endif
--- a/data/maps/FortreeCity_House1/scripts.inc
+++ b/data/maps/FortreeCity_House1/scripts.inc
@@ -60,9 +60,6 @@ FortreeCity_House1_EventScript_Zigzagoon::
 	release
 	end

-.ifdef ENGLISH
-	.include "data/maps/FortreeCity_House1/text.inc"
-.else
 .ifdef FRENCH
 	.include "data/maps/FortreeCity_House1/text_fr.inc"
 .else
@@ -71,7 +68,8 @@ FortreeCity_House1_EventScript_Zigzagoon::
 .else
 .ifdef SPANISH
 	.include "data/maps/FortreeCity_House1/text_es.inc"
-.endif
+.else
+	.include "data/maps/FortreeCity_House1/text.inc"
 .endif
 .endif
 .endif
--- a/data/maps/FortreeCity_House2/scripts.inc
+++ b/data/maps/FortreeCity_House2/scripts.inc
@@ -41,9 +41,6 @@ FortreeCity_House2_EventScript_WrongGuess::
 	release
 	end

-.ifdef ENGLISH
-	.include "data/maps/FortreeCity_House2/text.inc"
-.else
 .ifdef FRENCH
 	.include "data/maps/FortreeCity_House2/text_fr.inc"
 .else
@@ -52,7 +49,8 @@ FortreeCity_House2_EventScript_WrongGuess::
 .else
 .ifdef SPANISH
 	.include "data/maps/FortreeCity_House2/text_es.inc"
-.endif
+.else
+	.include "data/maps/FortreeCity_House2/text.inc"
 .endif
 .endif
 .endif
--- a/data/maps/FortreeCity_House3/scripts.inc
+++ b/data/maps/FortreeCity_House3/scripts.inc
@@ -9,9 +9,6 @@ FortreeCity_House3_EventScript_SchoolKidM::
 	msgbox FortreeCity_House3_Text_OhYouHavePokedex, MSGBOX_NPC
 	end

-.ifdef ENGLISH
-	.include "data/maps/FortreeCity_House3/text.inc"
-.else
 .ifdef FRENCH
 	.include "data/maps/FortreeCity_House3/text_fr.inc"
 .else
@@ -20,7 +17,8 @@ FortreeCity_House3_EventScript_SchoolKidM::
 .else
 .ifdef SPANISH
 	.include "data/maps/FortreeCity_House3/text_es.inc"
-.endif
+.else
+	.include "data/maps/FortreeCity_House3/text.inc"
 .endif
 .endif
 .endif
--- a/data/maps/FortreeCity_House4/scripts.inc
+++ b/data/maps/FortreeCity_House4/scripts.inc
@@ -64,9 +64,6 @@ FortreeCity_House4_EventScript_Wingull::
 	release
 	end

-.ifdef ENGLISH
-	.include "data/maps/FortreeCity_House4/text.inc"
-.else
 .ifdef FRENCH
 	.include "data/maps/FortreeCity_House4/text_fr.inc"
 .else
@@ -75,7 +72,8 @@ FortreeCity_House4_EventScript_Wingull::
 .else
 .ifdef SPANISH
 	.include "data/maps/FortreeCity_House4/text_es.inc"
-.endif
+.else
+	.include "data/maps/FortreeCity_House4/text.inc"
 .endif
 .endif
 .endif
--- a/data/maps/FortreeCity_House5/scripts.inc
+++ b/data/maps/FortreeCity_House5/scripts.inc
@@ -19,9 +19,6 @@ FortreeCity_House5_EventScript_Zigzagoon::
 	release
 	end

-.ifdef ENGLISH
-	.include "data/maps/FortreeCity_House5/text.inc"
-.else
 .ifdef FRENCH
 	.include "data/maps/FortreeCity_House5/text_fr.inc"
 .else
@@ -30,7 +27,8 @@ FortreeCity_House5_EventScript_Zigzagoon::
 .else
 .ifdef SPANISH
 	.include "data/maps/FortreeCity_House5/text_es.inc"
-.endif
+.else
+	.include "data/maps/FortreeCity_House5/text.inc"
 .endif
 .endif
 .endif
--- a/data/maps/FortreeCity_Mart/scripts.inc
+++ b/data/maps/FortreeCity_Mart/scripts.inc
@@ -39,9 +39,6 @@ FortreeCity_Mart_EventScript_Boy::
 	msgbox FortreeCity_Mart_Text_RareCandyMakesMonGrow, MSGBOX_NPC
 	end

-.ifdef ENGLISH
-	.include "data/maps/FortreeCity_Mart/text.inc"
-.else
 .ifdef FRENCH
 	.include "data/maps/FortreeCity_Mart/text_fr.inc"
 .else
@@ -50,7 +47,8 @@ FortreeCity_Mart_EventScript_Boy::
 .else
 .ifdef SPANISH
 	.include "data/maps/FortreeCity_Mart/text_es.inc"
-.endif
+.else
+	.include "data/maps/FortreeCity_Mart/text.inc"
 .endif
 .endif
 .endif
--- a/data/maps/FortreeCity_PokemonCenter_1F/scripts.inc
+++ b/data/maps/FortreeCity_PokemonCenter_1F/scripts.inc
@@ -29,9 +29,6 @@ FortreeCity_PokemonCenter_1F_EventScript_Boy::
 	msgbox FortreeCity_PokemonCenter_1F_Text_DoYouKnowAboutPokenav, MSGBOX_NPC
 	end

-.ifdef ENGLISH
-	.include "data/maps/FortreeCity_PokemonCenter_1F/text.inc"
-.else
 .ifdef FRENCH
 	.include "data/maps/FortreeCity_PokemonCenter_1F/text_fr.inc"
 .else
@@ -40,7 +37,8 @@ FortreeCity_PokemonCenter_1F_EventScript_Boy::
 .else
 .ifdef SPANISH
 	.include "data/maps/FortreeCity_PokemonCenter_1F/text_es.inc"
-.endif
+.else
+	.include "data/maps/FortreeCity_PokemonCenter_1F/text.inc"
 .endif
 .endif
 .endif
--- a/data/maps/GraniteCave_1F/scripts.inc
+++ b/data/maps/GraniteCave_1F/scripts.inc
@@ -17,9 +17,6 @@ GraniteCave_1F_EventScript_ReceivedFlash::
 	release
 	end

-.ifdef ENGLISH
-	.include "data/maps/GraniteCave_1F/text.inc"
-.else
 .ifdef FRENCH
 	.include "data/maps/GraniteCave_1F/text_fr.inc"
 .else
@@ -28,7 +25,8 @@ GraniteCave_1F_EventScript_ReceivedFlash::
 .else
 .ifdef SPANISH
 	.include "data/maps/GraniteCave_1F/text_es.inc"
-.endif
+.else
+	.include "data/maps/GraniteCave_1F/text.inc"
 .endif
 .endif
 .endif
--- a/data/maps/GraniteCave_StevensRoom/scripts.inc
+++ b/data/maps/GraniteCave_StevensRoom/scripts.inc
@@ -81,9 +81,6 @@ GraniteCave_StevensRoom_Movement_StevenExitSouth:
 	delay_8
 	step_end

-.ifdef ENGLISH
-	.include "data/maps/GraniteCave_StevensRoom/text.inc"
-.else
 .ifdef FRENCH
 	.include "data/maps/GraniteCave_StevensRoom/text_fr.inc"
 .else
@@ -92,7 +89,8 @@ GraniteCave_StevensRoom_Movement_StevenExitSouth:
 .else
 .ifdef SPANISH
 	.include "data/maps/GraniteCave_StevensRoom/text_es.inc"
-.endif
+.else
+	.include "data/maps/GraniteCave_StevensRoom/text.inc"
 .endif
 .endif
 .endif
--- a/data/maps/InsideOfTruck/scripts.inc
+++ b/data/maps/InsideOfTruck/scripts.inc
@@ -51,9 +51,6 @@ InsideOfTruck_EventScript_MovingBox::
 	msgbox InsideOfTruck_Text_BoxPrintedWithMonLogo, MSGBOX_SIGN
 	end

-.ifdef ENGLISH
-	.include "data/maps/InsideOfTruck/text.inc"
-.else
 .ifdef FRENCH
 	.include "data/maps/InsideOfTruck/text_fr.inc"
 .else
@@ -62,7 +59,8 @@ InsideOfTruck_EventScript_MovingBox::
 .else
 .ifdef SPANISH
 	.include "data/maps/InsideOfTruck/text_es.inc"
-.endif
+.else
+	.include "data/maps/InsideOfTruck/text.inc"
 .endif
 .endif
 .endif
--- a/data/maps/JaggedPass/scripts.inc
+++ b/data/maps/JaggedPass/scripts.inc
@@ -149,9 +149,6 @@ JaggedPass_EventScript_Autumn::
 	msgbox JaggedPass_Text_AutumnPostBattle, MSGBOX_AUTOCLOSE
 	end

-.ifdef ENGLISH
-	.include "data/maps/JaggedPass/text.inc"
-.else
 .ifdef FRENCH
 	.include "data/maps/JaggedPass/text_fr.inc"
 .else
@@ -160,7 +157,8 @@ JaggedPass_EventScript_Autumn::
 .else
 .ifdef SPANISH
 	.include "data/maps/JaggedPass/text_es.inc"
-.endif
+.else
+	.include "data/maps/JaggedPass/text.inc"
 .endif
 .endif
 .endif
--- a/data/maps/LavaridgeTown/scripts.inc
+++ b/data/maps/LavaridgeTown/scripts.inc
@@ -276,9 +276,6 @@ LavaridgeTown_EventScript_HerbShopSign::
 	msgbox LavaridgeTown_Text_HerbShopSign, MSGBOX_SIGN
 	end

-.ifdef ENGLISH
-	.include "data/maps/LavaridgeTown/text.inc"
-.else
 .ifdef FRENCH
 	.include "data/maps/LavaridgeTown/text_fr.inc"
 .else
@@ -287,7 +284,8 @@ LavaridgeTown_EventScript_HerbShopSign::
 .else
 .ifdef SPANISH
 	.include "data/maps/LavaridgeTown/text_es.inc"
-.endif
+.else
+	.include "data/maps/LavaridgeTown/text.inc"
 .endif
 .endif
 .endif
--- a/data/maps/LavaridgeTown_Gym_1F/scripts.inc
+++ b/data/maps/LavaridgeTown_Gym_1F/scripts.inc
@@ -185,9 +185,6 @@ LavaridgeTown_Gym_1F_EventScript_GymStatue::
 	releaseall
 	end

-.ifdef ENGLISH
-	.include "data/maps/LavaridgeTown_Gym_1F/text.inc"
-.else
 .ifdef FRENCH
 	.include "data/maps/LavaridgeTown_Gym_1F/text_fr.inc"
 .else
@@ -196,7 +193,8 @@ LavaridgeTown_Gym_1F_EventScript_GymStatue::
 .else
 .ifdef SPANISH
 	.include "data/maps/LavaridgeTown_Gym_1F/text_es.inc"
-.endif
+.else
+	.include "data/maps/LavaridgeTown_Gym_1F/text.inc"
 .endif
 .endif
 .endif
--- a/data/maps/LavaridgeTown_HerbShop/scripts.inc
+++ b/data/maps/LavaridgeTown_HerbShop/scripts.inc
@@ -41,9 +41,6 @@ LavaridgeTown_HerbShop_EventScript_ExplainCharcoal::
 	release
 	end

-.ifdef ENGLISH
-	.include "data/maps/LavaridgeTown_HerbShop/text.inc"
-.else
 .ifdef FRENCH
 	.include "data/maps/LavaridgeTown_HerbShop/text_fr.inc"
 .else
@@ -52,7 +49,8 @@ LavaridgeTown_HerbShop_EventScript_ExplainCharcoal::
 .else
 .ifdef SPANISH
 	.include "data/maps/LavaridgeTown_HerbShop/text_es.inc"
-.endif
+.else
+	.include "data/maps/LavaridgeTown_HerbShop/text.inc"
 .endif
 .endif
 .endif
--- a/data/maps/LavaridgeTown_House/scripts.inc
+++ b/data/maps/LavaridgeTown_House/scripts.inc
@@ -15,9 +15,6 @@ LavaridgeTown_House_EventScript_Zigzagoon::
 	release
 	end

-.ifdef ENGLISH
-	.include "data/maps/LavaridgeTown_House/text.inc"
-.else
 .ifdef FRENCH
 	.include "data/maps/LavaridgeTown_House/text_fr.inc"
 .else
@@ -26,7 +23,8 @@ LavaridgeTown_House_EventScript_Zigzagoon::
 .else
 .ifdef SPANISH
 	.include "data/maps/LavaridgeTown_House/text_es.inc"
-.endif
+.else
+	.include "data/maps/LavaridgeTown_House/text.inc"
 .endif
 .endif
 .endif
--- a/data/maps/LavaridgeTown_Mart/scripts.inc
+++ b/data/maps/LavaridgeTown_Mart/scripts.inc
@@ -34,9 +34,6 @@ LavaridgeTown_Mart_EventScript_OldWoman::
 	msgbox LavaridgeTown_Mart_Text_LocalSpecialtyOnMtChimney, MSGBOX_NPC
 	end

-.ifdef ENGLISH
-	.include "data/maps/LavaridgeTown_Mart/text.inc"
-.else
 .ifdef FRENCH
 	.include "data/maps/LavaridgeTown_Mart/text_fr.inc"
 .else
@@ -45,7 +42,8 @@ LavaridgeTown_Mart_EventScript_OldWoman::
 .else
 .ifdef SPANISH
 	.include "data/maps/LavaridgeTown_Mart/text_es.inc"
-.endif
+.else
+	.include "data/maps/LavaridgeTown_Mart/text.inc"
 .endif
 .endif
 .endif
--- a/data/maps/LavaridgeTown_PokemonCenter_1F/scripts.inc
+++ b/data/maps/LavaridgeTown_PokemonCenter_1F/scripts.inc
@@ -30,9 +30,6 @@ LavaridgeTown_PokemonCenter_1F_EventScript_Gentleman::
 	msgbox LavaridgeTown_PokemonCenter_1F_Text_TrainersShouldRestToo, MSGBOX_NPC
 	end

-.ifdef ENGLISH
-	.include "data/maps/LavaridgeTown_PokemonCenter_1F/text.inc"
-.else
 .ifdef FRENCH
 	.include "data/maps/LavaridgeTown_PokemonCenter_1F/text_fr.inc"
 .else
@@ -41,7 +38,8 @@ LavaridgeTown_PokemonCenter_1F_EventScript_Gentleman::
 .else
 .ifdef SPANISH
 	.include "data/maps/LavaridgeTown_PokemonCenter_1F/text_es.inc"
-.endif
+.else
+	.include "data/maps/LavaridgeTown_PokemonCenter_1F/text.inc"
 .endif
 .endif
 .endif
--- a/data/maps/LilycoveCity/scripts.inc
+++ b/data/maps/LilycoveCity/scripts.inc
@@ -412,9 +412,6 @@ LilycoveCity_EventScript_DontKnowAboutBerryBlender::
 	msgbox LilycoveCity_Text_ExplainBerryBlender, MSGBOX_DEFAULT
 	return

-.ifdef ENGLISH
-	.include "data/maps/LilycoveCity/text.inc"
-.else
 .ifdef FRENCH
 	.include "data/maps/LilycoveCity/text_fr.inc"
 .else
@@ -423,7 +420,8 @@ LilycoveCity_EventScript_DontKnowAboutBerryBlender::
 .else
 .ifdef SPANISH
 	.include "data/maps/LilycoveCity/text_es.inc"
-.endif
+.else
+	.include "data/maps/LilycoveCity/text.inc"
 .endif
 .endif
 .endif
--- a/Show More
+++ b/Show More