diff options
| author | YamaArashi <shadow962@live.com> | 2016-07-05 01:43:01 -0700 |
|---|---|---|
| committer | YamaArashi <shadow962@live.com> | 2016-07-05 01:43:01 -0700 |
| commit | 86b7c742692565a5eb9b5824378b3e2c74f555c5 (patch) | |
| tree | 7a292ae2b2be6ebbe26419c5ac74a26cba0851d2 /data/text | |
| parent | 1465509725e20d73dc5959e8aaf82cfe36321838 (diff) | |
remove empty lines at eof
Diffstat (limited to 'data/text')
230 files changed, 0 insertions, 230 deletions
diff --git a/data/text/berry_descriptions.s b/data/text/berry_descriptions.s index bc72188c8..ace0cff17 100644 --- a/data/text/berry_descriptions.s +++ b/data/text/berry_descriptions.s @@ -255,4 +255,3 @@ gBerryDescriptionPart1_Enigma: @ 83CD288 gBerryDescriptionPart2_Enigma: @ 83CD2A6 .string "Appears to have the power of stars.$" - diff --git a/data/text/maps/AbandonedShip_CaptainsOffice.s b/data/text/maps/AbandonedShip_CaptainsOffice.s index 69d09ed99..bdd2057c4 100644 --- a/data/text/maps/AbandonedShip_CaptainsOffice.s +++ b/data/text/maps/AbandonedShip_CaptainsOffice.s @@ -14,4 +14,3 @@ AbandonedShip_CaptainsOffice_Text_198D00:: @ 8198D00 AbandonedShip_CaptainsOffice_Text_198D7B:: @ 8198D7B .string "This ship is called S.S. CACTUS.\n" .string "It seems to be from an earlier era.$" - diff --git a/data/text/maps/AbandonedShip_Corridors_1F.s b/data/text/maps/AbandonedShip_Corridors_1F.s index 9a96e04f9..2df1c32b2 100644 --- a/data/text/maps/AbandonedShip_Corridors_1F.s +++ b/data/text/maps/AbandonedShip_Corridors_1F.s @@ -12,4 +12,3 @@ AbandonedShip_Corridors_1F_Text_198493:: @ 8198493 AbandonedShip_Corridors_1F_Text_1984D8:: @ 81984D8 .string "Isn’t it fun here?\n" .string "I get excited just being here!$" - diff --git a/data/text/maps/AbandonedShip_HiddenFloorCorridors.s b/data/text/maps/AbandonedShip_HiddenFloorCorridors.s index 8e43b2462..4e7c2014f 100644 --- a/data/text/maps/AbandonedShip_HiddenFloorCorridors.s +++ b/data/text/maps/AbandonedShip_HiddenFloorCorridors.s @@ -1,3 +1,2 @@ AbandonedShip_HiddenFloorCorridors_Text_1986EC:: @ 81986EC .string "The door is open.$" - diff --git a/data/text/maps/AbandonedShip_Rooms2_1F.s b/data/text/maps/AbandonedShip_Rooms2_1F.s index d7fce3236..3acf542fc 100644 --- a/data/text/maps/AbandonedShip_Rooms2_1F.s +++ b/data/text/maps/AbandonedShip_Rooms2_1F.s @@ -68,4 +68,3 @@ AbandonedShip_Rooms2_1F_Text_198BEA:: @ 8198BEA AbandonedShip_Rooms2_1F_Text_198C40:: @ 8198C40 .string "LOIS: Don’t you have two POKéMON?\n" .string "We’ll have to battle another time!$" - diff --git a/data/text/maps/AbandonedShip_Rooms2_B1F.s b/data/text/maps/AbandonedShip_Rooms2_B1F.s index 7e868b335..11e505abd 100644 --- a/data/text/maps/AbandonedShip_Rooms2_B1F.s +++ b/data/text/maps/AbandonedShip_Rooms2_B1F.s @@ -3,4 +3,3 @@ AbandonedShip_Rooms2_B1F_Text_198759:: @ 8198759 .string "It’s exciting here!\p" .string "I bet there’re amazing treasures on\n" .string "board.$" - diff --git a/data/text/maps/AbandonedShip_Rooms_1F.s b/data/text/maps/AbandonedShip_Rooms_1F.s index f6e5c729f..67b67ca4c 100644 --- a/data/text/maps/AbandonedShip_Rooms_1F.s +++ b/data/text/maps/AbandonedShip_Rooms_1F.s @@ -3,4 +3,3 @@ AbandonedShip_Rooms_1F_Text_19850A:: @ 819850A .string "taking a look around.\p" .string "Hmhm...\n" .string "There appear to be other cabins...$" - diff --git a/data/text/maps/AbandonedShip_Rooms_B1F.s b/data/text/maps/AbandonedShip_Rooms_B1F.s index 9ecf30a2b..45df47d60 100644 --- a/data/text/maps/AbandonedShip_Rooms_B1F.s +++ b/data/text/maps/AbandonedShip_Rooms_B1F.s @@ -3,4 +3,3 @@ AbandonedShip_Rooms_B1F_Text_1986FE:: @ 81986FE .string "I’m getting queasy just being aboard\n" .string "this ship...\p" .string "It’s not even moving, but...$" - diff --git a/data/text/maps/AquaHideout_1F.s b/data/text/maps/AquaHideout_1F.s index f5539e687..6c003d308 100644 --- a/data/text/maps/AquaHideout_1F.s +++ b/data/text/maps/AquaHideout_1F.s @@ -49,4 +49,3 @@ AquaHideout_1F_Text_196E28:: @ 8196E28 AquaHideout_1F_Text_196E3D:: @ 8196E3D .string "I took the loss for the TEAM, but\n" .string "I did my job...$" - diff --git a/data/text/maps/AquaHideout_B1F.s b/data/text/maps/AquaHideout_B1F.s index f62c08e76..605a98b8b 100644 --- a/data/text/maps/AquaHideout_B1F.s +++ b/data/text/maps/AquaHideout_B1F.s @@ -37,4 +37,3 @@ AquaHideout_B1F_Text_197040:: @ 8197040 AquaHideout_B1F_Text_197056:: @ 8197056 .string "If you scurry too much, other TEAM\n" .string "{EVIL_TEAM} members might get you.$" - diff --git a/data/text/maps/AquaHideout_B2F.s b/data/text/maps/AquaHideout_B2F.s index 230afe36c..f4b7dd035 100644 --- a/data/text/maps/AquaHideout_B2F.s +++ b/data/text/maps/AquaHideout_B2F.s @@ -56,4 +56,3 @@ AquaHideout_B2F_Text_1973C0:: @ 81973C0 .string "where I put the MASTER BALL.\p" .string "If I fail to guard it, our BOSS will\n" .string "chew me out...$" - diff --git a/data/text/maps/BattleTower_BattleRoom.s b/data/text/maps/BattleTower_BattleRoom.s index f78ffcc81..9f72d8971 100644 --- a/data/text/maps/BattleTower_BattleRoom.s +++ b/data/text/maps/BattleTower_BattleRoom.s @@ -13,4 +13,3 @@ BattleTower_BattleRoom_Text_19AD3C:: @ 819AD3C BattleTower_BattleRoom_Text_19AD66:: @ 819AD66 .string "Would you like to cancel your BATTLE\n" .string "ROOM challenge?$" - diff --git a/data/text/maps/BattleTower_Lobby.s b/data/text/maps/BattleTower_Lobby.s index 832041e86..db94f1bce 100644 --- a/data/text/maps/BattleTower_Lobby.s +++ b/data/text/maps/BattleTower_Lobby.s @@ -190,4 +190,3 @@ BattleTower_Lobby_Text_19AC55:: @ 819AC55 .string "seeing your magnificent performance.\p" .string "It makes the building of the BATTLE\n" .string "TOWER all worthwhile!$" - diff --git a/data/text/maps/BattleTower_Outside.s b/data/text/maps/BattleTower_Outside.s index ef8be00de..934ebca36 100644 --- a/data/text/maps/BattleTower_Outside.s +++ b/data/text/maps/BattleTower_Outside.s @@ -46,4 +46,3 @@ BattleTower_Outside_Text_199ED4:: @ 8199ED4 .string "Gee, there’re a lot of tough-looking\n" .string "TRAINERS here.\l" .string "I’m not good enough to enter yet...$" - diff --git a/data/text/maps/DewfordTown_Gym.s b/data/text/maps/DewfordTown_Gym.s index 904e6c338..24d90ec6c 100644 --- a/data/text/maps/DewfordTown_Gym.s +++ b/data/text/maps/DewfordTown_Gym.s @@ -105,4 +105,3 @@ DewfordTown_Gym_Text_175490:: @ 8175490 .string "DEWFORD TOWN POKéMON GYM\p" .string "BRAWLY’S CERTIFIED TRAINERS:\n" .string "{PLAYER}$" - diff --git a/data/text/maps/DewfordTown_Hall.s b/data/text/maps/DewfordTown_Hall.s index 6023984a4..6b9f4337e 100644 --- a/data/text/maps/DewfordTown_Hall.s +++ b/data/text/maps/DewfordTown_Hall.s @@ -181,4 +181,3 @@ DewfordTown_Hall_Text_175EBE:: @ 8175EBE .string "But POKéMON with the\n" .string "“{STR_VAR_1}”\l" .string "move are in, too.$" - diff --git a/data/text/maps/DewfordTown_House1.s b/data/text/maps/DewfordTown_House1.s index 8f6324636..d004acf7f 100644 --- a/data/text/maps/DewfordTown_House1.s +++ b/data/text/maps/DewfordTown_House1.s @@ -12,4 +12,3 @@ DewfordTown_House1_Text_174C0D:: @ 8174C0D DewfordTown_House1_Text_174CC8:: @ 8174CC8 .string "ZIGZAGOON: Guguuh!$" - diff --git a/data/text/maps/DewfordTown_House2.s b/data/text/maps/DewfordTown_House2.s index daa41a12c..b37456112 100644 --- a/data/text/maps/DewfordTown_House2.s +++ b/data/text/maps/DewfordTown_House2.s @@ -26,4 +26,3 @@ DewfordTown_House2_Text_1760C8:: @ 81760C8 .string "heard about BRAWLY?\p" .string "He’s so cool...\n" .string "Everyone idolizes him.$" - diff --git a/data/text/maps/DewfordTown_PokemonCenter_1F.s b/data/text/maps/DewfordTown_PokemonCenter_1F.s index de56f404e..9c4a6f41c 100644 --- a/data/text/maps/DewfordTown_PokemonCenter_1F.s +++ b/data/text/maps/DewfordTown_PokemonCenter_1F.s @@ -8,4 +8,3 @@ DewfordTown_PokemonCenter_1F_Text_174D32:: @ 8174D32 .string "Even if a POKéMON faints and can’t\n" .string "battle, it can still use a move learned\l" .string "from a Hidden Machine, HM.$" - diff --git a/data/text/maps/EverGrandeCity.s b/data/text/maps/EverGrandeCity.s index 31e53ef90..f468bf3b7 100644 --- a/data/text/maps/EverGrandeCity.s +++ b/data/text/maps/EverGrandeCity.s @@ -9,4 +9,3 @@ EverGrandeCity_Text_16A787:: @ 816A787 .string "EVER GRANDE CITY\p" .string "“The paradise of flowers, the sea,\n" .string "and POKéMON.”$" - diff --git a/data/text/maps/EverGrandeCity_ChampionsRoom.s b/data/text/maps/EverGrandeCity_ChampionsRoom.s index 82ccb7e4f..c7c63e208 100644 --- a/data/text/maps/EverGrandeCity_ChampionsRoom.s +++ b/data/text/maps/EverGrandeCity_ChampionsRoom.s @@ -98,4 +98,3 @@ EverGrandeCity_ChampionsRoom_Text_191675:: @ 8191675 .string "It can’t be helped if that’s the rule.\p" .string "{PLAYER}, way to go!\n" .string "Congratulations!$" - diff --git a/data/text/maps/EverGrandeCity_DrakesRoom.s b/data/text/maps/EverGrandeCity_DrakesRoom.s index d3c83c885..ed89c22bf 100644 --- a/data/text/maps/EverGrandeCity_DrakesRoom.s +++ b/data/text/maps/EverGrandeCity_DrakesRoom.s @@ -26,4 +26,3 @@ EverGrandeCity_DrakesRoom_Text_190E5D:: @ 8190E5D .string "TRAINERS and grow strong.\p" .string "Go! Go onwards!\n" .string "The CHAMPION is waiting!$" - diff --git a/data/text/maps/EverGrandeCity_GlaciasRoom.s b/data/text/maps/EverGrandeCity_GlaciasRoom.s index a25070dca..88fa1e664 100644 --- a/data/text/maps/EverGrandeCity_GlaciasRoom.s +++ b/data/text/maps/EverGrandeCity_GlaciasRoom.s @@ -20,4 +20,3 @@ EverGrandeCity_GlaciasRoom_Text_190C8F:: @ 8190C8F .string "Advance to the next room.\p" .string "And there, confirm the truly fearsome\n" .string "side of the POKéMON LEAGUE.$" - diff --git a/data/text/maps/EverGrandeCity_HallOfFame.s b/data/text/maps/EverGrandeCity_HallOfFame.s index 5b6701471..c684dcb72 100644 --- a/data/text/maps/EverGrandeCity_HallOfFame.s +++ b/data/text/maps/EverGrandeCity_HallOfFame.s @@ -11,4 +11,3 @@ EverGrandeCity_HallOfFame_Text_1918D7:: @ 81918D7 .string "name as a TRAINER who triumphed over\l" .string "the POKéMON LEAGUE, and the names of\l" .string "the partners who battled with you.$" - diff --git a/data/text/maps/EverGrandeCity_PhoebesRoom.s b/data/text/maps/EverGrandeCity_PhoebesRoom.s index 047390a95..e77a7d31a 100644 --- a/data/text/maps/EverGrandeCity_PhoebesRoom.s +++ b/data/text/maps/EverGrandeCity_PhoebesRoom.s @@ -21,4 +21,3 @@ EverGrandeCity_PhoebesRoom_Text_190A2A:: @ 8190A2A .string "Yup, I’d like to see how far your bond\n" .string "will carry you.\p" .string "Go ahead, move on to the next room.$" - diff --git a/data/text/maps/EverGrandeCity_PokemonCenter_1F.s b/data/text/maps/EverGrandeCity_PokemonCenter_1F.s index 767e24696..18594308a 100644 --- a/data/text/maps/EverGrandeCity_PokemonCenter_1F.s +++ b/data/text/maps/EverGrandeCity_PokemonCenter_1F.s @@ -10,4 +10,3 @@ EverGrandeCity_PokemonCenter_1F_Text_1919EF:: @ 81919EF .string "traveled in life...\p" .string "Believe in your POKéMON and give it\n" .string "your very best!$" - diff --git a/data/text/maps/EverGrandeCity_PokemonLeague.s b/data/text/maps/EverGrandeCity_PokemonLeague.s index 3d5c5fa1f..89971022c 100644 --- a/data/text/maps/EverGrandeCity_PokemonLeague.s +++ b/data/text/maps/EverGrandeCity_PokemonLeague.s @@ -13,4 +13,3 @@ EverGrandeCity_PokemonLeague_Text_19179C:: @ 819179C EverGrandeCity_PokemonLeague_Text_191804:: @ 8191804 .string "TRAINER! Believe in yourself and your\n" .string "POKéMON, and go forth!$" - diff --git a/data/text/maps/EverGrandeCity_SidneysRoom.s b/data/text/maps/EverGrandeCity_SidneysRoom.s index 6ec9f3327..84d1dddf5 100644 --- a/data/text/maps/EverGrandeCity_SidneysRoom.s +++ b/data/text/maps/EverGrandeCity_SidneysRoom.s @@ -18,4 +18,3 @@ EverGrandeCity_SidneysRoom_Text_19086D:: @ 819086D .string "You’ve got what it takes to go far.\n" .string "Now, go on to the next room and enjoy\l" .string "your next battle!$" - diff --git a/data/text/maps/FallarborTown.s b/data/text/maps/FallarborTown.s index 6bb2b38e0..1483272de 100644 --- a/data/text/maps/FallarborTown.s +++ b/data/text/maps/FallarborTown.s @@ -39,4 +39,3 @@ FallarborTown_Text_16CA83:: @ 816CA83 FallarborTown_Text_16CAB9:: @ 816CAB9 .string "MOVE TUTOR’S HOUSE\n" .string "“New moves taught to POKéMON.”$" - diff --git a/data/text/maps/FallarborTown_ContestHall.s b/data/text/maps/FallarborTown_ContestHall.s index a9ff40989..5db8766c5 100644 --- a/data/text/maps/FallarborTown_ContestHall.s +++ b/data/text/maps/FallarborTown_ContestHall.s @@ -19,4 +19,3 @@ FallarborTown_ContestHall_Text_177437:: @ 8177437 FallarborTown_ContestHall_Text_1774B1:: @ 81774B1 .string "POKéMON CONTESTS\n" .string "SUPER RANK STAGE!$" - diff --git a/data/text/maps/FallarborTown_ContestLobby.s b/data/text/maps/FallarborTown_ContestLobby.s index 58a1116d1..5d4305f8c 100644 --- a/data/text/maps/FallarborTown_ContestLobby.s +++ b/data/text/maps/FallarborTown_ContestLobby.s @@ -21,4 +21,3 @@ FallarborTown_ContestLobby_Text_1772D8:: @ 81772D8 .string "Hello! Congratulations!\p" .string "I’ve put up a sketch of your POKéMON\n" .string "right here for everyone to see!$" - diff --git a/data/text/maps/FallarborTown_House1.s b/data/text/maps/FallarborTown_House1.s index d01357fa2..c882bc9b7 100644 --- a/data/text/maps/FallarborTown_House1.s +++ b/data/text/maps/FallarborTown_House1.s @@ -49,4 +49,3 @@ FallarborTown_House1_Text_177A7C:: @ 8177A7C FallarborTown_House1_Text_177ABB:: @ 8177ABB .string "Look at PROF. COZMO...\n" .string "He’s so happy! I think it’s cute.$" - diff --git a/data/text/maps/FallarborTown_House2.s b/data/text/maps/FallarborTown_House2.s index 32f430dd9..de6d63fad 100644 --- a/data/text/maps/FallarborTown_House2.s +++ b/data/text/maps/FallarborTown_House2.s @@ -36,4 +36,3 @@ FallarborTown_House2_Text_177CEF:: @ 8177CEF FallarborTown_House2_Text_177D33:: @ 8177D33 .string "Hunh? There isn’t a single move that\n" .string "I can teach an EGG.$" - diff --git a/data/text/maps/FallarborTown_Mart.s b/data/text/maps/FallarborTown_Mart.s index a83d94a9f..bc8b3fb32 100644 --- a/data/text/maps/FallarborTown_Mart.s +++ b/data/text/maps/FallarborTown_Mart.s @@ -14,4 +14,3 @@ FallarborTown_Mart_Text_1770E2:: @ 81770E2 .string "This NUGGET I found here...\n" .string "I suppose I’ll have to sell it, seeing\l" .string "as how it has no other use.$" - diff --git a/data/text/maps/FallarborTown_PokemonCenter_1F.s b/data/text/maps/FallarborTown_PokemonCenter_1F.s index 8c3f8886e..a626ff1e9 100644 --- a/data/text/maps/FallarborTown_PokemonCenter_1F.s +++ b/data/text/maps/FallarborTown_PokemonCenter_1F.s @@ -25,4 +25,3 @@ FallarborTown_PokemonCenter_1F_Text_1776F5:: @ 81776F5 .string "In the fields of FALLARBOR, we plant\n" .string "seedlings of hardy trees that thrive\l" .string "even in volcanic ash.$" - diff --git a/data/text/maps/FortreeCity.s b/data/text/maps/FortreeCity.s index 873c61066..8640fada7 100644 --- a/data/text/maps/FortreeCity.s +++ b/data/text/maps/FortreeCity.s @@ -60,4 +60,3 @@ FortreeCity_Text_167969:: @ 8167969 .string "LEADER: WINONA\p" .string "“The bird user taking flight into\n" .string "the world.”$" - diff --git a/data/text/maps/FortreeCity_DecorationShop.s b/data/text/maps/FortreeCity_DecorationShop.s index d977d0e35..7809f10ff 100644 --- a/data/text/maps/FortreeCity_DecorationShop.s +++ b/data/text/maps/FortreeCity_DecorationShop.s @@ -10,4 +10,3 @@ FortreeCity_DecorationShop_Text_186AD6:: @ 8186AD6 .string "If I don’t, when I decorate my\n" .string "SECRET BASE, my DOLLS will get\l" .string "dirty or poked with splinters.$" - diff --git a/data/text/maps/FortreeCity_Gym.s b/data/text/maps/FortreeCity_Gym.s index 1c8d5c55d..036cacd50 100644 --- a/data/text/maps/FortreeCity_Gym.s +++ b/data/text/maps/FortreeCity_Gym.s @@ -114,4 +114,3 @@ FortreeCity_Gym_Text_185FEE:: @ 8185FEE .string "FORTREE CITY POKéMON GYM\p" .string "WINONA’S CERTIFIED TRAINERS:\n" .string "{PLAYER}$" - diff --git a/data/text/maps/FortreeCity_House1.s b/data/text/maps/FortreeCity_House1.s index 605d9a842..0d94fcd27 100644 --- a/data/text/maps/FortreeCity_House1.s +++ b/data/text/maps/FortreeCity_House1.s @@ -33,4 +33,3 @@ FortreeCity_House1_Text_18582A:: @ 818582A FortreeCity_House1_Text_185888:: @ 8185888 .string "ZIGZAGOON: Gumomoh?$" - diff --git a/data/text/maps/FortreeCity_House2.s b/data/text/maps/FortreeCity_House2.s index 60ee2442f..8b78e1ae8 100644 --- a/data/text/maps/FortreeCity_House2.s +++ b/data/text/maps/FortreeCity_House2.s @@ -43,4 +43,3 @@ UnknownString_8186585: @ 8186585 .string "this city.\p" .string "That’s why I use FLY to instantly go to\n" .string "any city I’ve visited.$" - diff --git a/data/text/maps/FortreeCity_House3.s b/data/text/maps/FortreeCity_House3.s index a4705366d..6b0b254f6 100644 --- a/data/text/maps/FortreeCity_House3.s +++ b/data/text/maps/FortreeCity_House3.s @@ -15,4 +15,3 @@ FortreeCity_House3_Text_186745:: @ 8186745 .string "... ... ... ... ... ...\p" .string "Oh, it’s called a POKéDEX?\n" .string "It’s really awesome!$" - diff --git a/data/text/maps/FortreeCity_House4.s b/data/text/maps/FortreeCity_House4.s index 7673409b8..9389ec4aa 100644 --- a/data/text/maps/FortreeCity_House4.s +++ b/data/text/maps/FortreeCity_House4.s @@ -28,4 +28,3 @@ FortreeCity_House4_Text_186924:: @ 8186924 FortreeCity_House4_Text_18695C:: @ 818695C .string "WINGULL: Pihyoh!$" - diff --git a/data/text/maps/FortreeCity_House5.s b/data/text/maps/FortreeCity_House5.s index 4d35b3a7b..711b9579e 100644 --- a/data/text/maps/FortreeCity_House5.s +++ b/data/text/maps/FortreeCity_House5.s @@ -11,4 +11,3 @@ FortreeCity_House5_Text_1869D6:: @ 81869D6 FortreeCity_House5_Text_186A4F:: @ 8186A4F .string "ZIGZAGOON: Bufuu!$" - diff --git a/data/text/maps/FortreeCity_Mart.s b/data/text/maps/FortreeCity_Mart.s index 9f12492a1..c8c2c4f0f 100644 --- a/data/text/maps/FortreeCity_Mart.s +++ b/data/text/maps/FortreeCity_Mart.s @@ -13,4 +13,3 @@ FortreeCity_Mart_Text_186251:: @ 8186251 FortreeCity_Mart_Text_1862CA:: @ 81862CA .string "A RARE CANDY makes a POKéMON grow\n" .string "immediately by one level.$" - diff --git a/data/text/maps/FortreeCity_PokemonCenter_1F.s b/data/text/maps/FortreeCity_PokemonCenter_1F.s index 7ce6d3c3f..d5ffb8a61 100644 --- a/data/text/maps/FortreeCity_PokemonCenter_1F.s +++ b/data/text/maps/FortreeCity_PokemonCenter_1F.s @@ -20,4 +20,3 @@ FortreeCity_PokemonCenter_1F_Text_186138:: @ 8186138 .string "rematch with you.\p" .string "Isn’t it great?\n" .string "You have to hand it to DEVON!$" - diff --git a/data/text/maps/GraniteCave_1F.s b/data/text/maps/GraniteCave_1F.s index a2f1257fb..3344f76d9 100644 --- a/data/text/maps/GraniteCave_1F.s +++ b/data/text/maps/GraniteCave_1F.s @@ -17,4 +17,3 @@ GraniteCave_1F_Text_194A3E:: @ 8194A3E .string "of caves.\p" .string "But, to use it, you need the GYM BADGE\n" .string "from DEWFORD’s POKéMON GYM.$" - diff --git a/data/text/maps/GraniteCave_StevensRoom.s b/data/text/maps/GraniteCave_StevensRoom.s index 78e74a984..873acea22 100644 --- a/data/text/maps/GraniteCave_StevensRoom.s +++ b/data/text/maps/GraniteCave_StevensRoom.s @@ -31,4 +31,3 @@ GraniteCave_StevensRoom_Text_194C8D:: @ 8194C8D GraniteCave_StevensRoom_Text_194D43:: @ 8194D43 .string "Oh, your BAG is full...\n" .string "That’s too bad, then.$" - diff --git a/data/text/maps/InsideOfTruck.s b/data/text/maps/InsideOfTruck.s index e4d4ada90..19166c481 100644 --- a/data/text/maps/InsideOfTruck.s +++ b/data/text/maps/InsideOfTruck.s @@ -2,4 +2,3 @@ InsideOfTruck_Text_198FAD:: @ 8198FAD .string "The box is printed with a POKéMON logo.\p" .string "It’s a POKéMON brand moving and\n" .string "delivery service.$" - diff --git a/data/text/maps/JaggedPass.s b/data/text/maps/JaggedPass.s index 9c9798959..23216b12b 100644 --- a/data/text/maps/JaggedPass.s +++ b/data/text/maps/JaggedPass.s @@ -61,4 +61,3 @@ JaggedPass_Text_1960E2:: @ 81960E2 JaggedPass_Text_196118:: @ 8196118 .string "I should get an ACRO BIKE from RYDEL\n" .string "in MAUVILLE CITY...$" - diff --git a/data/text/maps/LavaridgeTown.s b/data/text/maps/LavaridgeTown.s index dbd5fde24..308548510 100644 --- a/data/text/maps/LavaridgeTown.s +++ b/data/text/maps/LavaridgeTown.s @@ -127,4 +127,3 @@ LavaridgeTown_Text_16C77C:: @ 816C77C LavaridgeTown_Text_16C7CF:: @ 816C7CF .string "POKéMON HERB SHOP\n" .string "“Bitter taste - better cure!”$" - diff --git a/data/text/maps/LavaridgeTown_Gym_1F.s b/data/text/maps/LavaridgeTown_Gym_1F.s index 1a59a31da..87ec05632 100644 --- a/data/text/maps/LavaridgeTown_Gym_1F.s +++ b/data/text/maps/LavaridgeTown_Gym_1F.s @@ -138,4 +138,3 @@ LavaridgeTown_Gym_1F_Text_176CCA:: @ 8176CCA .string "LAVARIDGE TOWN POKéMON GYM\p" .string "FLANNERY’S CERTIFIED TRAINERS:\n" .string "{PLAYER}$" - diff --git a/data/text/maps/LavaridgeTown_HerbShop.s b/data/text/maps/LavaridgeTown_HerbShop.s index e3f3dd526..893d3399f 100644 --- a/data/text/maps/LavaridgeTown_HerbShop.s +++ b/data/text/maps/LavaridgeTown_HerbShop.s @@ -20,4 +20,3 @@ LavaridgeTown_HerbShop_Text_1762A3:: @ 81762A3 .string "Herbal medicine works impressively well.\n" .string "But your POKéMON will dislike you for it.\l" .string "It must be horribly bitter!$" - diff --git a/data/text/maps/LavaridgeTown_House.s b/data/text/maps/LavaridgeTown_House.s index 7bd77210a..9710d9398 100644 --- a/data/text/maps/LavaridgeTown_House.s +++ b/data/text/maps/LavaridgeTown_House.s @@ -6,4 +6,3 @@ LavaridgeTown_House_Text_176D07:: @ 8176D07 LavaridgeTown_House_Text_176D94:: @ 8176D94 .string "ZIGZAGOON: Pshoo!$" - diff --git a/data/text/maps/LavaridgeTown_Mart.s b/data/text/maps/LavaridgeTown_Mart.s index 1f04a0dd8..db79bd321 100644 --- a/data/text/maps/LavaridgeTown_Mart.s +++ b/data/text/maps/LavaridgeTown_Mart.s @@ -8,4 +8,3 @@ LavaridgeTown_Mart_Text_176E1A:: @ 8176E1A .string "On MT. CHIMNEY’s peak, there’s a local\n" .string "specialty that you can buy only there.\p" .string "Give it to a POKéMON - it will be elated.$" - diff --git a/data/text/maps/LavaridgeTown_PokemonCenter_1F.s b/data/text/maps/LavaridgeTown_PokemonCenter_1F.s index 6585b5219..c66d6df8a 100644 --- a/data/text/maps/LavaridgeTown_PokemonCenter_1F.s +++ b/data/text/maps/LavaridgeTown_PokemonCenter_1F.s @@ -15,4 +15,3 @@ LavaridgeTown_PokemonCenter_1F_Text_176F7A:: @ 8176F7A .string "the hot springs from here.\p" .string "If POKéMON are getting rest, so too\n" .string "should their TRAINERS.$" - diff --git a/data/text/maps/LilycoveCity.s b/data/text/maps/LilycoveCity.s index 8ff35d572..0f9b45c1d 100644 --- a/data/text/maps/LilycoveCity.s +++ b/data/text/maps/LilycoveCity.s @@ -299,4 +299,3 @@ LilycoveCity_Text_168FF3:: @ 8168FF3 LilycoveCity_Text_169072:: @ 8169072 .string "MOVE DELETER’S HOUSE\p" .string "“Unwanted POKéMON moves deleted.”$" - diff --git a/data/text/maps/LilycoveCity_ContestHall.s b/data/text/maps/LilycoveCity_ContestHall.s index 99131eb71..96507b770 100644 --- a/data/text/maps/LilycoveCity_ContestHall.s +++ b/data/text/maps/LilycoveCity_ContestHall.s @@ -204,4 +204,3 @@ LilycoveCity_ContestHall_Text_189F5C:: @ 8189F5C UnknownString_8189F93: @ 8189F93 .string "TOUGHNESS CONTEST STAGE\n" .string "BE THRILLED BY TOUGH POKéMON!$" - diff --git a/data/text/maps/LilycoveCity_CoveLilyMotel_1F.s b/data/text/maps/LilycoveCity_CoveLilyMotel_1F.s index 0ecfd290b..7d6e4942f 100644 --- a/data/text/maps/LilycoveCity_CoveLilyMotel_1F.s +++ b/data/text/maps/LilycoveCity_CoveLilyMotel_1F.s @@ -51,4 +51,3 @@ LilycoveCity_CoveLilyMotel_1F_Text_186F09:: @ 8186F09 .string "guess they must make games.\p" .string "Uh-oh, I’d better get working on\n" .string "their dinner!$" - diff --git a/data/text/maps/LilycoveCity_CoveLilyMotel_2F.s b/data/text/maps/LilycoveCity_CoveLilyMotel_2F.s index 4aac25329..0306db9e9 100644 --- a/data/text/maps/LilycoveCity_CoveLilyMotel_2F.s +++ b/data/text/maps/LilycoveCity_CoveLilyMotel_2F.s @@ -43,4 +43,3 @@ LilycoveCity_CoveLilyMotel_2F_Text_1872D4:: @ 81872D4 .string "people will challenge you.\p" .string "That’s why I never leave home without\n" .string "my GAME BOY ADVANCE.$" - diff --git a/data/text/maps/LilycoveCity_DepartmentStoreRooftop.s b/data/text/maps/LilycoveCity_DepartmentStoreRooftop.s index cc788cb16..62eb03bc1 100644 --- a/data/text/maps/LilycoveCity_DepartmentStoreRooftop.s +++ b/data/text/maps/LilycoveCity_DepartmentStoreRooftop.s @@ -31,4 +31,3 @@ LilycoveCity_DepartmentStoreRooftop_Text_18C7AF:: @ 818C7AF LilycoveCity_DepartmentStoreRooftop_Text_18C7C3:: @ 818C7C3 .string "Decided against buying a drink.$" - diff --git a/data/text/maps/LilycoveCity_DepartmentStore_1F.s b/data/text/maps/LilycoveCity_DepartmentStore_1F.s index b4f34f2c3..45cf3686d 100644 --- a/data/text/maps/LilycoveCity_DepartmentStore_1F.s +++ b/data/text/maps/LilycoveCity_DepartmentStore_1F.s @@ -25,4 +25,3 @@ LilycoveCity_DepartmentStore_1F_Text_18C0D9:: @ 818C0D9 .string "4F: TM CORNER\p" .string "5F: POKé DOLL FLOOR\p" .string "ROOFTOP: ROOFTOP PLAZA$" - diff --git a/data/text/maps/LilycoveCity_DepartmentStore_2F.s b/data/text/maps/LilycoveCity_DepartmentStore_2F.s index 3b4271ca7..e9a52bbee 100644 --- a/data/text/maps/LilycoveCity_DepartmentStore_2F.s +++ b/data/text/maps/LilycoveCity_DepartmentStore_2F.s @@ -13,4 +13,3 @@ LilycoveCity_DepartmentStore_2F_Text_18C1D9:: @ 818C1D9 UnknownString_818C21A: @ 818C21A .string "FOR YOUR TRAVELING COMPANIONS\n" .string "2F: TRAINER’S ZONE$" - diff --git a/data/text/maps/LilycoveCity_DepartmentStore_3F.s b/data/text/maps/LilycoveCity_DepartmentStore_3F.s index baecfcecf..8777fd1f3 100644 --- a/data/text/maps/LilycoveCity_DepartmentStore_3F.s +++ b/data/text/maps/LilycoveCity_DepartmentStore_3F.s @@ -17,4 +17,3 @@ LilycoveCity_DepartmentStore_3F_Text_18C32E:: @ 818C32E UnknownString_818C363: @ 818C363 .string "ESSENTIALS FOR UNBEATABLE TRAINERS\n" .string "3F: BATTLE COLLECTION$" - diff --git a/data/text/maps/LilycoveCity_DepartmentStore_4F.s b/data/text/maps/LilycoveCity_DepartmentStore_4F.s index 7cfa099ea..b26962a8f 100644 --- a/data/text/maps/LilycoveCity_DepartmentStore_4F.s +++ b/data/text/maps/LilycoveCity_DepartmentStore_4F.s @@ -18,4 +18,3 @@ LilycoveCity_DepartmentStore_4F_Text_18C481:: @ 818C481 UnknownString_818C4CE: @ 818C4CE .string "A SHORTCUT TO POKéMON LEAGUE\n" .string "4F: TM CORNER$" - diff --git a/data/text/maps/LilycoveCity_DepartmentStore_5F.s b/data/text/maps/LilycoveCity_DepartmentStore_5F.s index c1e3975cb..8b1d81c2e 100644 --- a/data/text/maps/LilycoveCity_DepartmentStore_5F.s +++ b/data/text/maps/LilycoveCity_DepartmentStore_5F.s @@ -15,4 +15,3 @@ LilycoveCity_DepartmentStore_5F_Text_18C59F:: @ 818C59F UnknownString_818C5FA: @ 818C5FA .string "ADORABLE FRIENDS\n" .string "5F: POKé DOLL FLOOR$" - diff --git a/data/text/maps/LilycoveCity_Harbor.s b/data/text/maps/LilycoveCity_Harbor.s index 8b30a1ec0..0f31f697b 100644 --- a/data/text/maps/LilycoveCity_Harbor.s +++ b/data/text/maps/LilycoveCity_Harbor.s @@ -47,4 +47,3 @@ LilycoveCity_Harbor_Text_18B58E:: @ 818B58E .string "The folks at the SHIPYARD in SLATEPORT\n" .string "must’ve worked extra hard.\p" .string "Well, it’s my turn to get busy now!$" - diff --git a/data/text/maps/LilycoveCity_House1.s b/data/text/maps/LilycoveCity_House1.s index b70a063ee..a937ff64d 100644 --- a/data/text/maps/LilycoveCity_House1.s +++ b/data/text/maps/LilycoveCity_House1.s @@ -6,4 +6,3 @@ LilycoveCity_House1_Text_18B7B0:: @ 818B7B0 LilycoveCity_House1_Text_18B82B:: @ 818B82B .string "KECLEON: Ruroro?$" - diff --git a/data/text/maps/LilycoveCity_House2.s b/data/text/maps/LilycoveCity_House2.s index c50013bf8..0e037a65f 100644 --- a/data/text/maps/LilycoveCity_House2.s +++ b/data/text/maps/LilycoveCity_House2.s @@ -7,4 +7,3 @@ LilycoveCity_House2_Text_18B883:: @ 818B883 .string "Yawn...\p" .string "Sleep is essential for good health...\n" .string "Sleep and regain health...$" - diff --git a/data/text/maps/LilycoveCity_House3.s b/data/text/maps/LilycoveCity_House3.s index bb20e610f..03db4920f 100644 --- a/data/text/maps/LilycoveCity_House3.s +++ b/data/text/maps/LilycoveCity_House3.s @@ -66,4 +66,3 @@ LilycoveCity_House3_Text_18BE8E:: @ 818BE8E .string "I want to brag about how tough my\n" .string "POKéMON is, so we’re going to enter a\l" .string "CONTEST together.$" - diff --git a/data/text/maps/LilycoveCity_House4.s b/data/text/maps/LilycoveCity_House4.s index 62b00b418..ebfd5ae71 100644 --- a/data/text/maps/LilycoveCity_House4.s +++ b/data/text/maps/LilycoveCity_House4.s @@ -7,4 +7,3 @@ LilycoveCity_House4_Text_18BF4E:: @ 818BF4E .string "There’s a deep underwater trench\n" .string "between MOSSDEEP and SOOTOPOLIS.\p" .string "That’s what someone told me, anyway.$" - diff --git a/data/text/maps/LilycoveCity_LilycoveMuseum_1F.s b/data/text/maps/LilycoveCity_LilycoveMuseum_1F.s index c8770999f..b60e0e50d 100644 --- a/data/text/maps/LilycoveCity_LilycoveMuseum_1F.s +++ b/data/text/maps/LilycoveCity_LilycoveMuseum_1F.s @@ -128,4 +128,3 @@ LilycoveCity_LilycoveMuseum_1F_Text_187B7F:: @ 8187B7F .string "No, great for the HOENN region!\p" .string "This is what I’ve heard - a lone TRAINER\n" .string "procured all the paintings upstairs.$" - diff --git a/data/text/maps/LilycoveCity_LilycoveMuseum_2F.s b/data/text/maps/LilycoveCity_LilycoveMuseum_2F.s index 65d4f6700..067cc335f 100644 --- a/data/text/maps/LilycoveCity_LilycoveMuseum_2F.s +++ b/data/text/maps/LilycoveCity_LilycoveMuseum_2F.s @@ -112,4 +112,3 @@ LilycoveCity_LilycoveMuseum_2F_Text_188423:: @ 8188423 .string "These paintings are of your POKéMON.\p" .string "Isn’t that just the ultimate joy for\n" .string "a TRAINER?$" - diff --git a/data/text/maps/LilycoveCity_MoveDeletersHouse.s b/data/text/maps/LilycoveCity_MoveDeletersHouse.s index 532aa6cc4..1e2181aca 100644 --- a/data/text/maps/LilycoveCity_MoveDeletersHouse.s +++ b/data/text/maps/LilycoveCity_MoveDeletersHouse.s @@ -30,4 +30,3 @@ LilycoveCity_MoveDeletersHouse_Text_18B757:: @ 818B757 LilycoveCity_MoveDeletersHouse_Text_18B78C:: @ 818B78C .string "What?\n" .string "No EGG should know any moves.$" - diff --git a/data/text/maps/LilycoveCity_PokemonCenter_1F.s b/data/text/maps/LilycoveCity_PokemonCenter_1F.s index b9a43f2e1..c0cbb7436 100644 --- a/data/text/maps/LilycoveCity_PokemonCenter_1F.s +++ b/data/text/maps/LilycoveCity_PokemonCenter_1F.s @@ -24,4 +24,3 @@ UnknownString_818A168: @ 818A168 .string "but it is convenient.\p" .string "Just one of these can cure any\n" .string "POKéMON status problem.$" - diff --git a/data/text/maps/LilycoveCity_PokemonTrainerFanClub.s b/data/text/maps/LilycoveCity_PokemonTrainerFanClub.s index c40892c52..fbfbf4353 100644 --- a/data/text/maps/LilycoveCity_PokemonTrainerFanClub.s +++ b/data/text/maps/LilycoveCity_PokemonTrainerFanClub.s @@ -249,4 +249,3 @@ LilycoveCity_PokemonTrainerFanClub_Text_18B24F:: @ 818B24F .string "True strength is...!\n" .string "... ...\p" .string "Actually, I have no idea, either.$" - diff --git a/data/text/maps/LittlerootTown.s b/data/text/maps/LittlerootTown.s index 7ae7cf9af..1e23d584f 100644 --- a/data/text/maps/LittlerootTown.s +++ b/data/text/maps/LittlerootTown.s @@ -92,4 +92,3 @@ LittlerootTown_Text_16AEA1:: @ 816AEA1 LittlerootTown_Text_16AEAC:: @ 816AEAC .string "PROF. BIRCH’S HOUSE$" - diff --git a/data/text/maps/LittlerootTown_BrendansHouse_2F.s b/data/text/maps/LittlerootTown_BrendansHouse_2F.s index e12500ca9..06206caaa 100644 --- a/data/text/maps/LittlerootTown_BrendansHouse_2F.s +++ b/data/text/maps/LittlerootTown_BrendansHouse_2F.s @@ -36,4 +36,3 @@ LittlerootTown_BrendansHouse_2F_Text_17306C:: @ 817306C .string "It’s a Nintendo GameCube.\p" .string "A Game Boy Advance is connected to\n" .string "serve as the Controller.$" - diff --git a/data/text/maps/LittlerootTown_ProfessorBirchsLab.s b/data/text/maps/LittlerootTown_ProfessorBirchsLab.s index eef8370b2..dd470ef08 100644 --- a/data/text/maps/LittlerootTown_ProfessorBirchsLab.s +++ b/data/text/maps/LittlerootTown_ProfessorBirchsLab.s @@ -161,4 +161,3 @@ LittlerootTown_ProfessorBirchsLab_Text_174724:: @ 8174724 LittlerootTown_ProfessorBirchsLab_Text_174748:: @ 8174748 .string "It’s a book that’s too hard to read.$" - diff --git a/data/text/maps/MauvilleCity.s b/data/text/maps/MauvilleCity.s index f72dd5be1..8080d10d9 100644 --- a/data/text/maps/MauvilleCity.s +++ b/data/text/maps/MauvilleCity.s @@ -172,4 +172,3 @@ MauvilleCity_Text_16674A:: @ 816674A MauvilleCity_Text_166879:: @ 8166879 .string "Hi, have you been checking out TVs?$" - diff --git a/data/text/maps/MauvilleCity_BikeShop.s b/data/text/maps/MauvilleCity_BikeShop.s index 3bdb594b9..3fbdffc09 100644 --- a/data/text/maps/MauvilleCity_BikeShop.s +++ b/data/text/maps/MauvilleCity_BikeShop.s @@ -142,4 +142,3 @@ MauvilleCity_BikeShop_Text_181A3D:: @ 8181A3D .string "Press it backwards to make the BIKE\n" .string "change directions while jumping.\p" .string "Want to read a different page?$" - diff --git a/data/text/maps/MauvilleCity_GameCorner.s b/data/text/maps/MauvilleCity_GameCorner.s index 00eb1368c..f367c3cf2 100644 --- a/data/text/maps/MauvilleCity_GameCorner.s +++ b/data/text/maps/MauvilleCity_GameCorner.s @@ -145,4 +145,3 @@ MauvilleCity_GameCorner_Text_1822F4:: @ 81822F4 MauvilleCity_GameCorner_Text_182420:: @ 8182420 .string "You can’t play if you don’t have a\n" .string "COIN CASE.$" - diff --git a/data/text/maps/MauvilleCity_Gym.s b/data/text/maps/MauvilleCity_Gym.s index c143e2281..5ae43f880 100644 --- a/data/text/maps/MauvilleCity_Gym.s +++ b/data/text/maps/MauvilleCity_Gym.s @@ -114,4 +114,3 @@ MauvilleCity_Gym_Text_180F64:: @ 8180F64 .string "MAUVILLE CITY POKéMON GYM\p" .string "WATTSON’S CERTIFIED TRAINERS:\n" .string "{PLAYER}$" - diff --git a/data/text/maps/MauvilleCity_House1.s b/data/text/maps/MauvilleCity_House1.s index 60f44c47d..c5eec210e 100644 --- a/data/text/maps/MauvilleCity_House1.s +++ b/data/text/maps/MauvilleCity_House1.s @@ -14,4 +14,3 @@ MauvilleCity_House1_Text_181B64:: @ 8181B64 MauvilleCity_House1_Text_181BF6:: @ 8181BF6 .string "Oh, yes, if you smash a rock, a POKéMON\n" .string "could come flying out.$" - diff --git a/data/text/maps/MauvilleCity_House2.s b/data/text/maps/MauvilleCity_House2.s index 8d2053b33..50cdf1fa7 100644 --- a/data/text/maps/MauvilleCity_House2.s +++ b/data/text/maps/MauvilleCity_House2.s @@ -20,4 +20,3 @@ MauvilleCity_House2_Text_182578:: @ 8182578 .string "Oh, that’s disappointing.\p" .string "A COIN CASE is needed for the\n" .string "GAME CORNER.$" - diff --git a/data/text/maps/MauvilleCity_Mart.s b/data/text/maps/MauvilleCity_Mart.s index 63d02b551..6b8f6c002 100644 --- a/data/text/maps/MauvilleCity_Mart.s +++ b/data/text/maps/MauvilleCity_Mart.s @@ -11,4 +11,3 @@ MauvilleCity_Mart_Text_18287F:: @ 818287F .string "instead...\p" .string "The TRAINER’s decisions determine how\n" .string "battles turn out, I think.$" - diff --git a/data/text/maps/MauvilleCity_PokemonCenter_1F.s b/data/text/maps/MauvilleCity_PokemonCenter_1F.s index 797dc87d5..c4287cda3 100644 --- a/data/text/maps/MauvilleCity_PokemonCenter_1F.s +++ b/data/text/maps/MauvilleCity_PokemonCenter_1F.s @@ -16,4 +16,3 @@ MauvilleCity_PokemonCenter_1F_Text_1826A6:: @ 81826A6 .string "the POKéMON CENTER.\p" .string "I don’t know what it’s about, but it\n" .string "sounds fun. I’ll go check it out!$" - diff --git a/data/text/maps/MauvilleCity_PokemonCenter_2F.s b/data/text/maps/MauvilleCity_PokemonCenter_2F.s index 68296bb2d..1e67948a5 100644 --- a/data/text/maps/MauvilleCity_PokemonCenter_2F.s +++ b/data/text/maps/MauvilleCity_PokemonCenter_2F.s @@ -5,4 +5,3 @@ MauvilleCity_PokemonCenter_2F_Text_182724:: @ 8182724 .string "for everyone to see.\p" .string "It’s embarrassing if you lose more\n" .string "often than you win...$" - diff --git a/data/text/maps/MeteorFalls_1F_1R.s b/data/text/maps/MeteorFalls_1F_1R.s index 9a52b6833..ad19e3e0b 100644 --- a/data/text/maps/MeteorFalls_1F_1R.s +++ b/data/text/maps/MeteorFalls_1F_1R.s @@ -91,4 +91,3 @@ MeteorFalls_1F_1R_Text_19396A:: @ 819396A .string "PROF. COZMO: That TEAM {EVIL_TEAM}...\p" .string "What are they going to do with that\n" .string "METEORITE at MT. CHIMNEY?$" - diff --git a/data/text/maps/MeteorFalls_1F_2R.s b/data/text/maps/MeteorFalls_1F_2R.s index a260ce9ef..35b60d662 100644 --- a/data/text/maps/MeteorFalls_1F_2R.s +++ b/data/text/maps/MeteorFalls_1F_2R.s @@ -111,4 +111,3 @@ MeteorFalls_1F_2R_Text_1940DF:: @ 81940DF .string "TRAINER?\p" .string "If you’d care to battle with us, you’ll\n" .string "have to come back with more POKéMON.$" - diff --git a/data/text/maps/MossdeepCity_Gym.s b/data/text/maps/MossdeepCity_Gym.s index 4bb63b01a..5ff5f6554 100644 --- a/data/text/maps/MossdeepCity_Gym.s +++ b/data/text/maps/MossdeepCity_Gym.s @@ -166,4 +166,3 @@ MossdeepCity_Gym_Text_18D424:: @ 818D424 .string "MOSSDEEP CITY POKéMON GYM\p" .string "LIZA AND TATE’S CERTIFIED TRAINERS:\n" .string "{PLAYER}$" - diff --git a/data/text/maps/MossdeepCity_House1.s b/data/text/maps/MossdeepCity_House1.s index 81a6194bd..0572ba260 100644 --- a/data/text/maps/MossdeepCity_House1.s +++ b/data/text/maps/MossdeepCity_House1.s @@ -15,4 +15,3 @@ MossdeepCity_House1_Text_18D4C0:: @ 818D4C0 MossdeepCity_House1_Text_18D4F1:: @ 818D4F1 .string "My husband can tell what kind of\n" .string "{POKEBLOCK}S a POKéMON likes at a glance.$" - diff --git a/data/text/maps/MossdeepCity_House2.s b/data/text/maps/MossdeepCity_House2.s index 74bf1fa22..ae4b11cb6 100644 --- a/data/text/maps/MossdeepCity_House2.s +++ b/data/text/maps/MossdeepCity_House2.s @@ -12,4 +12,3 @@ MossdeepCity_House2_Text_18D596:: @ 818D596 MossdeepCity_House2_Text_18D61E:: @ 818D61E .string "WINGULL: Pihyoh!$" - diff --git a/data/text/maps/MossdeepCity_House3.s b/data/text/maps/MossdeepCity_House3.s index e4b8779ce..270457172 100644 --- a/data/text/maps/MossdeepCity_House3.s +++ b/data/text/maps/MossdeepCity_House3.s @@ -21,4 +21,3 @@ MossdeepCity_House3_Text_18DA26:: @ 818DA26 MossdeepCity_House3_Text_18DA44:: @ 818DA44 .string "Go after the seafloor POKéMON with\n" .string "your SUPER ROD.$" - diff --git a/data/text/maps/MossdeepCity_House4.s b/data/text/maps/MossdeepCity_House4.s index ab9106da6..e612a8018 100644 --- a/data/text/maps/MossdeepCity_House4.s +++ b/data/text/maps/MossdeepCity_House4.s @@ -17,4 +17,3 @@ MossdeepCity_House4_Text_18E1A7:: @ 818E1A7 MossdeepCity_House4_Text_18E1E1:: @ 818E1E1 .string "DELCATTY: Miyaan?$" - diff --git a/data/text/maps/MossdeepCity_Mart.s b/data/text/maps/MossdeepCity_Mart.s index fec3149ce..cdce8c48c 100644 --- a/data/text/maps/MossdeepCity_Mart.s +++ b/data/text/maps/MossdeepCity_Mart.s @@ -17,4 +17,3 @@ MossdeepCity_Mart_Text_18D841:: @ 818D841 .string "BUG-type and WATER-type POKéMON.\p" .string "A DIVE BALL works best on POKéMON at\n" .string "the bottom of the sea.$" - diff --git a/data/text/maps/MossdeepCity_PokemonCenter_1F.s b/data/text/maps/MossdeepCity_PokemonCenter_1F.s index d9f42b3a1..5f345613e 100644 --- a/data/text/maps/MossdeepCity_PokemonCenter_1F.s +++ b/data/text/maps/MossdeepCity_PokemonCenter_1F.s @@ -8,4 +8,3 @@ MossdeepCity_PokemonCenter_1F_Text_18D69A:: @ 818D69A .string "Depending on the special abilities of\n" .string "POKéMON, some moves might change\l" .string "or not work at all.$" - diff --git a/data/text/maps/MossdeepCity_PokemonCenter_2F.s b/data/text/maps/MossdeepCity_PokemonCenter_2F.s index 486d36d76..66bba2421 100644 --- a/data/text/maps/MossdeepCity_PokemonCenter_2F.s +++ b/data/text/maps/MossdeepCity_PokemonCenter_2F.s @@ -2,4 +2,3 @@ MossdeepCity_PokemonCenter_2F_Text_18D6F5:: @ 818D6F5 .string "If I win a whole lot of link battles\n" .string "and show everyone how good I am,\l" .string "I might get a fan following!$" - diff --git a/data/text/maps/MossdeepCity_SpaceCenter_1F.s b/data/text/maps/MossdeepCity_SpaceCenter_1F.s index 23f544099..a94d343bc 100644 --- a/data/text/maps/MossdeepCity_SpaceCenter_1F.s +++ b/data/text/maps/MossdeepCity_SpaceCenter_1F.s @@ -31,4 +31,3 @@ MossdeepCity_SpaceCenter_1F_Text_18E427:: @ 818E427 .string "A giant chunk of metal bursts through\n" .string "the skies and flies into space...\p" .string "It boggles my mind!$" - diff --git a/data/text/maps/MossdeepCity_SpaceCenter_2F.s b/data/text/maps/MossdeepCity_SpaceCenter_2F.s index fdaf8d0a5..0c8159423 100644 --- a/data/text/maps/MossdeepCity_SpaceCenter_2F.s +++ b/data/text/maps/MossdeepCity_SpaceCenter_2F.s @@ -13,4 +13,3 @@ MossdeepCity_SpaceCenter_2F_Text_18E4EE:: @ 818E4EE MossdeepCity_SpaceCenter_2F_Text_18E564:: @ 818E564 .string "I wish ordinary people could go into\n" .string "space one day...$" - diff --git a/data/text/maps/MossdeepCity_StevensHouse.s b/data/text/maps/MossdeepCity_StevensHouse.s index b05b557b8..6f5b9b9b8 100644 --- a/data/text/maps/MossdeepCity_StevensHouse.s +++ b/data/text/maps/MossdeepCity_StevensHouse.s @@ -81,4 +81,3 @@ MossdeepCity_StevensHouse_Text_18DF1A:: @ 818DF1A MossdeepCity_StevensHouse_Text_18E0A3:: @ 818E0A3 .string "It’s a collection of rare rocks and\n" .string "stones assembled by STEVEN.$" - diff --git a/data/text/maps/MtChimney.s b/data/text/maps/MtChimney.s index 3c033fe0c..8641bde00 100644 --- a/data/text/maps/MtChimney.s +++ b/data/text/maps/MtChimney.s @@ -105,4 +105,3 @@ MtChimney_Text_195D5C:: @ 8195D5C .string "I’ll have to take another dip in the\n" .string "hot springs. Want to join me?\p" .string "Just joking!$" - diff --git a/data/text/maps/MtPyre_1F.s b/data/text/maps/MtPyre_1F.s index ff17f173e..84e1cef07 100644 --- a/data/text/maps/MtPyre_1F.s +++ b/data/text/maps/MtPyre_1F.s @@ -17,4 +17,3 @@ MtPyre_1F_Text_196218:: @ 8196218 MtPyre_1F_Text_196283:: @ 8196283 .string "This is the final resting place of my\n" .string "ZIGZAGOON. I cherished it...$" - diff --git a/data/text/maps/MtPyre_2F.s b/data/text/maps/MtPyre_2F.s index f98b916d5..28c57d0ba 100644 --- a/data/text/maps/MtPyre_2F.s +++ b/data/text/maps/MtPyre_2F.s @@ -61,4 +61,3 @@ MtPyre_2F_Text_1966BE:: @ 81966BE MtPyre_2F_Text_1966E7:: @ 81966E7 .string "People don’t come here often, so\n" .string "I thought there’d be rare POKéMON.$" - diff --git a/data/text/maps/MtPyre_3F.s b/data/text/maps/MtPyre_3F.s index 3eb54cc99..c714c97a0 100644 --- a/data/text/maps/MtPyre_3F.s +++ b/data/text/maps/MtPyre_3F.s @@ -25,4 +25,3 @@ MtPyre_3F_Text_196842:: @ 8196842 .string "I’ve got to keep working toward the\n" .string "summit...\p" .string "Go, me!$" - diff --git a/data/text/maps/MtPyre_4F.s b/data/text/maps/MtPyre_4F.s index e1f539cdc..275b6f5ac 100644 --- a/data/text/maps/MtPyre_4F.s +++ b/data/text/maps/MtPyre_4F.s @@ -9,4 +9,3 @@ MtPyre_4F_Text_1968D0:: @ 81968D0 MtPyre_4F_Text_1968EE:: @ 81968EE .string "Until I improve, my teacher, who rests\n" .string "here, will never find true peace...$" - diff --git a/data/text/maps/MtPyre_5F.s b/data/text/maps/MtPyre_5F.s index 9830042f9..c70211067 100644 --- a/data/text/maps/MtPyre_5F.s +++ b/data/text/maps/MtPyre_5F.s @@ -12,4 +12,3 @@ MtPyre_5F_Text_1969AC:: @ 81969AC .string "I can’t leave...\p" .string "Stay...\n" .string "Won’t you stay with me?$" - diff --git a/data/text/maps/MtPyre_6F.s b/data/text/maps/MtPyre_6F.s index de30577bc..711c87570 100644 --- a/data/text/maps/MtPyre_6F.s +++ b/data/text/maps/MtPyre_6F.s @@ -19,4 +19,3 @@ MtPyre_6F_Text_196AB1:: @ 8196AB1 MtPyre_6F_Text_196AC9:: @ 8196AC9 .string "The POKéMON at rest here...\n" .string "Sometimes, they play...$" - diff --git a/data/text/maps/NewMauville_Entrance.s b/data/text/maps/NewMauville_Entrance.s index 070e9cdec..36739ec3e 100644 --- a/data/text/maps/NewMauville_Entrance.s +++ b/data/text/maps/NewMauville_Entrance.s @@ -7,4 +7,3 @@ NewMauville_Entrance_Text_1982D4:: @ 81982D4 NewMauville_Entrance_Text_1982EA:: @ 81982EA .string "{PLAYER} used the BASEMENT KEY.\p" .string "The door opened!$" - diff --git a/data/text/maps/NewMauville_Inside.s b/data/text/maps/NewMauville_Inside.s index 982e1a004..c18354294 100644 --- a/data/text/maps/NewMauville_Inside.s +++ b/data/text/maps/NewMauville_Inside.s @@ -14,4 +14,3 @@ NewMauville_Inside_Text_1983B1:: @ 81983B1 .string "... ... ... ... ... ... ... ...\p" .string "The generator appears to have\n" .string "stopped...$" - diff --git a/data/text/maps/OldaleTown.s b/data/text/maps/OldaleTown.s index 349d9b480..2d0b31a44 100644 --- a/data/text/maps/OldaleTown.s +++ b/data/text/maps/OldaleTown.s @@ -53,4 +53,3 @@ OldaleTown_Text_16B1BE:: @ 816B1BE OldaleTown_Text_16B20E:: @ 816B20E .string "OLDALE TOWN\n" .string "“Where things start off scarce.”$" - diff --git a/data/text/maps/OldaleTown_House1.s b/data/text/maps/OldaleTown_House1.s index f153339eb..943003b97 100644 --- a/data/text/maps/OldaleTown_House1.s +++ b/data/text/maps/OldaleTown_House1.s @@ -5,4 +5,3 @@ OldaleTown_House1_Text_17476D:: @ 817476D .string "party, try switching around the order\l" .string "of your POKéMON.\p" .string "It could give you an advantage.$" - diff --git a/data/text/maps/OldaleTown_House2.s b/data/text/maps/OldaleTown_House2.s index a4cb72254..54a6547b4 100644 --- a/data/text/maps/OldaleTown_House2.s +++ b/data/text/maps/OldaleTown_House2.s @@ -6,4 +6,3 @@ OldaleTown_House2_Text_17487B:: @ 817487B .string "If the POKéMON with you become\n" .string "stronger, you’ll be able to go farther\l" .string "away from here.$" - diff --git a/data/text/maps/OldaleTown_Mart.s b/data/text/maps/OldaleTown_Mart.s index 71e0a0513..5abb0cb9b 100644 --- a/data/text/maps/OldaleTown_Mart.s +++ b/data/text/maps/OldaleTown_Mart.s @@ -11,4 +11,3 @@ OldaleTown_Mart_Text_174B10:: @ 8174B10 .string "and faints, it won’t be able to battle.\p" .string "To prevent your POKéMON from fainting,\n" .string "restore its HP with a POTION.$" - diff --git a/data/text/maps/OldaleTown_PokemonCenter_1F.s b/data/text/maps/OldaleTown_PokemonCenter_1F.s index 5b3f1f674..4fa7f4d9b 100644 --- a/data/text/maps/OldaleTown_PokemonCenter_1F.s +++ b/data/text/maps/OldaleTown_PokemonCenter_1F.s @@ -20,4 +20,3 @@ OldaleTown_PokemonCenter_1F_Text_174A2E:: @ 8174A2E .string "The POKéMON CABLE CLUB on the second\n" .string "floor was built recently.\p" .string "I traded POKéMON right away.$" - diff --git a/data/text/maps/PacifidlogTown.s b/data/text/maps/PacifidlogTown.s index 9f67efa9e..f598c566a 100644 --- a/data/text/maps/PacifidlogTown.s +++ b/data/text/maps/PacifidlogTown.s @@ -17,4 +17,3 @@ PacifidlogTown_Text_16D0CE:: @ 816D0CE .string "PACIFIDLOG TOWN\p" .string "“Where the morning sun smiles upon\n" .string "the waters.”$" - diff --git a/data/text/maps/PacifidlogTown_House1.s b/data/text/maps/PacifidlogTown_House1.s index 7c3e3afd4..5d2f5a2c9 100644 --- a/data/text/maps/PacifidlogTown_House1.s +++ b/data/text/maps/PacifidlogTown_House1.s @@ -11,4 +11,3 @@ PacifidlogTown_House1_Text_17906A:: @ 817906A .string "“Six dots open three doors.”\p" .string "Grandpa used to say that, but I don’t\n" .string "know what he meant.$" - diff --git a/data/text/maps/PacifidlogTown_House2.s b/data/text/maps/PacifidlogTown_House2.s index 0e56cea1c..5c669dc98 100644 --- a/data/text/maps/PacifidlogTown_House2.s +++ b/data/text/maps/PacifidlogTown_House2.s @@ -52,4 +52,3 @@ PacifidlogTown_House2_Text_1793CC:: @ 81793CC PacifidlogTown_House2_Text_1793DD:: @ 81793DD .string "It doesn’t appear to like the TRAINER\n" .string "very much.$" - diff --git a/data/text/maps/PacifidlogTown_House3.s b/data/text/maps/PacifidlogTown_House3.s index 0dba3cca4..1aabc9578 100644 --- a/data/text/maps/PacifidlogTown_House3.s +++ b/data/text/maps/PacifidlogTown_House3.s @@ -25,4 +25,3 @@ PacifidlogTown_House3_Text_179541:: @ 8179541 .string "Did you get to meet a lot of different\n" .string "POKéMON?\p" .string "I wish I was like you.$" - diff --git a/data/text/maps/PacifidlogTown_House4.s b/data/text/maps/PacifidlogTown_House4.s index a5cb340f8..3ca9e5cca 100644 --- a/data/text/maps/PacifidlogTown_House4.s +++ b/data/text/maps/PacifidlogTown_House4.s @@ -21,4 +21,3 @@ PacifidlogTown_House4_Text_17968C:: @ 817968C .string "You have to come from somewhere.\p" .string "Oh! Wait! You’re not going to say you\n" .string "were born at the bottom of the sea?$" - diff --git a/data/text/maps/PacifidlogTown_House5.s b/data/text/maps/PacifidlogTown_House5.s index ece3aca2e..5fc9ca5c5 100644 --- a/data/text/maps/PacifidlogTown_House5.s +++ b/data/text/maps/PacifidlogTown_House5.s @@ -12,4 +12,3 @@ PacifidlogTown_House5_Text_179765:: @ 8179765 .string "that make mirages appear.\p" .string "Or is it really appearing and\n" .string "disappearing?$" - diff --git a/data/text/maps/PacifidlogTown_PokemonCenter_1F.s b/data/text/maps/PacifidlogTown_PokemonCenter_1F.s index 6ded1de17..9f87c6a54 100644 --- a/data/text/maps/PacifidlogTown_PokemonCenter_1F.s +++ b/data/text/maps/PacifidlogTown_PokemonCenter_1F.s @@ -15,4 +15,3 @@ PacifidlogTown_PokemonCenter_1F_Text_178ED9:: @ 8178ED9 .string "I understand that they lived that way\n" .string "because they were searching for\l" .string "something.$" - diff --git a/data/text/maps/PetalburgCity.s b/data/text/maps/PetalburgCity.s index 62b4423dc..fbe00df96 100644 --- a/data/text/maps/PetalburgCity.s +++ b/data/text/maps/PetalburgCity.s @@ -42,4 +42,3 @@ PetalburgCity_Text_164602:: @ 8164602 PetalburgCity_Text_164634:: @ 8164634 .string "WALLY’S HOUSE$" - diff --git a/data/text/maps/PetalburgCity_Gym.s b/data/text/maps/PetalburgCity_Gym.s index 715229880..bbd072564 100644 --- a/data/text/maps/PetalburgCity_Gym.s +++ b/data/text/maps/PetalburgCity_Gym.s @@ -409,4 +409,3 @@ PetalburgCity_Gym_Text_17BAC0:: @ 817BAC0 .string "PETALBURG CITY POKéMON GYM\p" .string "NORMAN’S CERTIFIED TRAINERS:\n" .string "{PLAYER}$" - diff --git a/data/text/maps/PetalburgCity_House1.s b/data/text/maps/PetalburgCity_House1.s index c1cb09305..d41fadd1f 100644 --- a/data/text/maps/PetalburgCity_House1.s +++ b/data/text/maps/PetalburgCity_House1.s @@ -14,4 +14,3 @@ PetalburgCity_House1_Text_17BB4A:: @ 817BB4A .string "And, sometimes, even get a little\n" .string "homesick...\p" .string "It must be fabulous to travel!$" - diff --git a/data/text/maps/PetalburgCity_House2.s b/data/text/maps/PetalburgCity_House2.s index b0eec582c..426dac360 100644 --- a/data/text/maps/PetalburgCity_House2.s +++ b/data/text/maps/PetalburgCity_House2.s @@ -10,4 +10,3 @@ PetalburgCity_House2_Text_17BCB1:: @ 817BCB1 .string "How would I put it?\p" .string "I just got the feeling that he\n" .string "lives for POKéMON.$" - diff --git a/data/text/maps/PetalburgCity_Mart.s b/data/text/maps/PetalburgCity_Mart.s index 42dd9f329..d6fcc6fff 100644 --- a/data/text/maps/PetalburgCity_Mart.s +++ b/data/text/maps/PetalburgCity_Mart.s @@ -15,4 +15,3 @@ PetalburgCity_Mart_Text_17C0BC:: @ 817C0BC .string "If you walk around with a poisoned\n" .string "POKéMON, it will lose HP until it faints.\l" .string "Take some ANTIDOTES with you.$" - diff --git a/data/text/maps/PetalburgCity_PokemonCenter_1F.s b/data/text/maps/PetalburgCity_PokemonCenter_1F.s index 63a203107..1c4689672 100644 --- a/data/text/maps/PetalburgCity_PokemonCenter_1F.s +++ b/data/text/maps/PetalburgCity_PokemonCenter_1F.s @@ -37,4 +37,3 @@ PetalburgCity_PokemonCenter_1F_Text_17BF73:: @ 817BF73 .string "It’s strong against the FIRE type.\p" .string "But, it’s weak against GRASS-type\n" .string "and ELECTRIC-type POKéMON.$" - diff --git a/data/text/maps/PetalburgCity_WallysHouse.s b/data/text/maps/PetalburgCity_WallysHouse.s index 7a4e50ec8..888dfbc91 100644 --- a/data/text/maps/PetalburgCity_WallysHouse.s +++ b/data/text/maps/PetalburgCity_WallysHouse.s @@ -70,4 +70,3 @@ PetalburgCity_WallysHouse_Text_179D12:: @ 8179D12 .string "he’s surprisingly strong-willed.\p" .string "I’m sure that he’ll come back safe\n" .string "and sound one day!$" - diff --git a/data/text/maps/PetalburgWoods.s b/data/text/maps/PetalburgWoods.s index 6305d32c2..21a04dcc8 100644 --- a/data/text/maps/PetalburgWoods.s +++ b/data/text/maps/PetalburgWoods.s @@ -143,4 +143,3 @@ PetalburgWoods_Text_1956A6:: @ 81956A6 .string "make moves during battle.\p" .string "If a POKéMON runs out of PP, it must be\n" .string "taken to a POKéMON CENTER.$" - diff --git a/data/text/maps/Route101.s b/data/text/maps/Route101.s index 1897cce4e..3bfa1ef6e 100644 --- a/data/text/maps/Route101.s +++ b/data/text/maps/Route101.s @@ -37,4 +37,3 @@ Route101_Text_16D2CB:: @ 816D2CB Route101_Text_16D349:: @ 816D349 .string "ROUTE 101\n" .string "{0x79} OLDALE TOWN$" - diff --git a/data/text/maps/Route103.s b/data/text/maps/Route103.s index 97ad26169..ebdedea82 100644 --- a/data/text/maps/Route103.s +++ b/data/text/maps/Route103.s @@ -62,4 +62,3 @@ Route103_Text_16D996:: @ 816D996 Route103_Text_16D9FB:: @ 816D9FB .string "ROUTE 103\n" .string "{0x7A} OLDALE TOWN$" - diff --git a/data/text/maps/Route104_MrBrineysHouse.s b/data/text/maps/Route104_MrBrineysHouse.s index f75c7a8a2..37fd0c0e1 100644 --- a/data/text/maps/Route104_MrBrineysHouse.s +++ b/data/text/maps/Route104_MrBrineysHouse.s @@ -65,4 +65,3 @@ UnknownString_8191F4F: @ 8191F4F Route104_MrBrineysHouse_Text_191FB9:: @ 8191FB9 .string "PEEKO: Pii pihyoroo!$" - diff --git a/data/text/maps/Route104_Prototype.s b/data/text/maps/Route104_Prototype.s index 59a71018f..7ce19f609 100644 --- a/data/text/maps/Route104_Prototype.s +++ b/data/text/maps/Route104_Prototype.s @@ -113,4 +113,3 @@ Route104_Prototype_Text_19B3DE:: @ 819B3DE Route104_Prototype_Text_19B3FF:: @ 819B3FF .string "May all POKéMON battles be bright,\n" .string "fun, and ferocious!$" - diff --git a/data/text/maps/Route104_PrototypePrettyPetalFlowerShop.s b/data/text/maps/Route104_PrototypePrettyPetalFlowerShop.s index 0c3af5f1f..3ec76ff55 100644 --- a/data/text/maps/Route104_PrototypePrettyPetalFlowerShop.s +++ b/data/text/maps/Route104_PrototypePrettyPetalFlowerShop.s @@ -4,4 +4,3 @@ Route104_PrototypePrettyPetalFlowerShop_Text_19B436:: @ 819B436 .string "They said it was for preparations.\p" .string "In the autumn, we’re going to start\n" .string "a flower shop. Please wait for it!$" - diff --git a/data/text/maps/Route109_SeashoreHouse.s b/data/text/maps/Route109_SeashoreHouse.s index 59823f02c..ebd6f05e5 100644 --- a/data/text/maps/Route109_SeashoreHouse.s +++ b/data/text/maps/Route109_SeashoreHouse.s @@ -90,4 +90,3 @@ Route109_SeashoreHouse_Text_19B9E5:: @ 819B9E5 .string "If one of my POKéMON knew the move\n" .string "for carrying me across water on its\l" .string "back, I could get rid of this inner tube.$" - diff --git a/data/text/maps/Route110.s b/data/text/maps/Route110.s index 29fefe53e..78be8d595 100644 --- a/data/text/maps/Route110.s +++ b/data/text/maps/Route110.s @@ -234,4 +234,3 @@ UnknownString_816F68A: @ 816F68A UnknownString_816F6CF: @ 816F6CF .string "I’m going to look for red BERRIES to\n" .string "make RED {POKEBLOCK}S.$" - diff --git a/data/text/maps/Route110_TrickHouseEnd.s b/data/text/maps/Route110_TrickHouseEnd.s index 9d8086d26..03f2252fd 100644 --- a/data/text/maps/Route110_TrickHouseEnd.s +++ b/data/text/maps/Route110_TrickHouseEnd.s @@ -108,4 +108,3 @@ UnknownString_819CAD1: @ 819CAD1 .string "“TRICK MASTER is fabulous.”\n" .string "... ... ... ... ... ... ... ...\p" .string "The lock clicked open!$" - diff --git a/data/text/maps/Route110_TrickHouseEntrance.s b/data/text/maps/Route110_TrickHouseEntrance.s index 83f11ea5f..fe39a4441 100644 --- a/data/text/maps/Route110_TrickHouseEntrance.s +++ b/data/text/maps/Route110_TrickHouseEntrance.s @@ -109,4 +109,3 @@ Route110_TrickHouseEntrance_Text_19C17E:: @ 819C17E Route110_TrickHouseEntrance_Text_19C18D:: @ 819C18D .string "YOUR PC STATUS: FULL AGAIN.\n" .string "MEAN, YOU ARE.$" - diff --git a/data/text/maps/Route110_TrickHousePuzzle2.s b/data/text/maps/Route110_TrickHousePuzzle2.s index 3b923be21..cb64f04d8 100644 --- a/data/text/maps/Route110_TrickHousePuzzle2.s +++ b/data/text/maps/Route110_TrickHousePuzzle2.s @@ -37,4 +37,3 @@ UnknownString_819CEF9: @ 819CEF9 .string "“TRICK MASTER is coveted.”\n" .string "... ... ... ... ... ... ... ...\p" .string "The lock clicked open!$" - diff --git a/data/text/maps/Route110_TrickHousePuzzle3.s b/data/text/maps/Route110_TrickHousePuzzle3.s index 9daf76b7d..01287a068 100644 --- a/data/text/maps/Route110_TrickHousePuzzle3.s +++ b/data/text/maps/Route110_TrickHousePuzzle3.s @@ -39,4 +39,3 @@ UnknownString_819D164: @ 819D164 .string "“TRICK MASTER is cool.”\n" .string "... ... ... ... ... ... ... ...\p" .string "The lock clicked open!$" - diff --git a/data/text/maps/Route110_TrickHousePuzzle4.s b/data/text/maps/Route110_TrickHousePuzzle4.s index ffb2cef06..293e5ab93 100644 --- a/data/text/maps/Route110_TrickHousePuzzle4.s +++ b/data/text/maps/Route110_TrickHousePuzzle4.s @@ -38,4 +38,3 @@ UnknownString_819D3A5: @ 819D3A5 .string "“TRICK MASTER is a genius.”\n" .string "... ... ... ... ... ... ... ...\p" .string "The lock clicked open!$" - diff --git a/data/text/maps/Route110_TrickHousePuzzle5.s b/data/text/maps/Route110_TrickHousePuzzle5.s index 586349a6a..8cddc3f65 100644 --- a/data/text/maps/Route110_TrickHousePuzzle5.s +++ b/data/text/maps/Route110_TrickHousePuzzle5.s @@ -139,4 +139,3 @@ UnknownString_819DC0A: @ 819DC0A .string "“TRICK MASTER is my life.”\n" .string "... ... ... ... ... ... ... ...\p" .string "The lock clicked open!$" - diff --git a/data/text/maps/Route110_TrickHousePuzzle6.s b/data/text/maps/Route110_TrickHousePuzzle6.s index 4261a2797..7fb5aa914 100644 --- a/data/text/maps/Route110_TrickHousePuzzle6.s +++ b/data/text/maps/Route110_TrickHousePuzzle6.s @@ -40,4 +40,3 @@ UnknownString_819DE8D: @ 819DE8D .string "“TRICK MASTER is huggable.”\n" .string "... ... ... ... ... ... ... ...\p" .string "The lock clicked open!$" - diff --git a/data/text/maps/Route110_TrickHousePuzzle7.s b/data/text/maps/Route110_TrickHousePuzzle7.s index 7dcfd169c..e8ce4b3a4 100644 --- a/data/text/maps/Route110_TrickHousePuzzle7.s +++ b/data/text/maps/Route110_TrickHousePuzzle7.s @@ -40,4 +40,3 @@ UnknownString_819E0FF: @ 819E0FF .string "“TRICK MASTER I love.”\n" .string "... ... ... ... ... ... ... ...\p" .string "The lock clicked open!$" - diff --git a/data/text/maps/Route110_TrickHousePuzzle8.s b/data/text/maps/Route110_TrickHousePuzzle8.s index fa5173969..8b0025bfb 100644 --- a/data/text/maps/Route110_TrickHousePuzzle8.s +++ b/data/text/maps/Route110_TrickHousePuzzle8.s @@ -32,4 +32,3 @@ Route110_TrickHousePuzzle8_Text_19E2C1:: @ 819E2C1 Route110_TrickHousePuzzle8_Text_19E2EE:: @ 819E2EE .string "Seeing someone like you should please\n" .string "the TRICK MASTER.$" - diff --git a/data/text/maps/Route111.s b/data/text/maps/Route111.s index 35ed597cb..24bcc1008 100644 --- a/data/text/maps/Route111.s +++ b/data/text/maps/Route111.s @@ -117,4 +117,3 @@ Route111_Text_16FD55:: @ 816FD55 .string "“SPECIAL ATTACK.”\p" .string "Likewise, SP. DEF stands for “SPECIAL\n" .string "DEFENSE.”$" - diff --git a/data/text/maps/Route111_OldLadysRestStop.s b/data/text/maps/Route111_OldLadysRestStop.s index 05823893d..aeef47a32 100644 --- a/data/text/maps/Route111_OldLadysRestStop.s +++ b/data/text/maps/Route111_OldLadysRestStop.s @@ -17,4 +17,3 @@ Route111_OldLadysRestStop_Text_19244D:: @ 819244D Route111_OldLadysRestStop_Text_1924C6:: @ 81924C6 .string "Is that so?\n" .string "You don’t need to be shy about it.$" - diff --git a/data/text/maps/Route111_WinstrateFamilysHouse.s b/data/text/maps/Route111_WinstrateFamilysHouse.s index a2fb85041..e1986320b 100644 --- a/data/text/maps/Route111_WinstrateFamilysHouse.s +++ b/data/text/maps/Route111_WinstrateFamilysHouse.s @@ -41,4 +41,3 @@ Route111_WinstrateFamilysHouse_Text_192334:: @ 8192334 .string "POKéMON LEAGUE CHAMPION by now.\p" .string "Knowing my grandson, he could be the\n" .string "CHAMPION already!$" - diff --git a/data/text/maps/Route112.s b/data/text/maps/Route112.s index 5171aecaa..c967c562c 100644 --- a/data/text/maps/Route112.s +++ b/data/text/maps/Route112.s @@ -25,4 +25,3 @@ Route112_Text_16FF19:: @ 816FF19 Route112_Text_16FF64:: @ 816FF64 .string "ROUTE 112\n" .string "{0x7B} LAVARIDGE TOWN$" - diff --git a/data/text/maps/Route112_CableCarStation.s b/data/text/maps/Route112_CableCarStation.s index f7167299c..245172542 100644 --- a/data/text/maps/Route112_CableCarStation.s +++ b/data/text/maps/Route112_CableCarStation.s @@ -7,4 +7,3 @@ UnknownString_8192532: @ 8192532 Route112_CableCarStation_Text_192548:: @ 8192548 .string "Please ride with us another time.$" - diff --git a/data/text/maps/Route113.s b/data/text/maps/Route113.s index 8ececd771..2ce41fda9 100644 --- a/data/text/maps/Route113.s +++ b/data/text/maps/Route113.s @@ -28,4 +28,3 @@ Route113_Text_170096:: @ 8170096 Route113_Text_17011D:: @ 817011D .string "GLASS WORKSHOP\n" .string "“Turning Volcanic Ash into Glass Items”$" - diff --git a/data/text/maps/Route113_GlassWorkshop.s b/data/text/maps/Route113_GlassWorkshop.s index e80f72d0e..2923255a4 100644 --- a/data/text/maps/Route113_GlassWorkshop.s +++ b/data/text/maps/Route113_GlassWorkshop.s @@ -84,4 +84,3 @@ Route113_GlassWorkshop_Text_19EB3B:: @ 819EB3B .string "It’s fun to blow a glass flute while my\n" .string "boss is talking.\p" .string "Huff-huff! Puff-puff!$" - diff --git a/data/text/maps/Route114.s b/data/text/maps/Route114.s index 5190cac0c..9a46954da 100644 --- a/data/text/maps/Route114.s +++ b/data/text/maps/Route114.s @@ -21,4 +21,3 @@ Route114_Text_17022E:: @ 817022E Route114_Text_170263:: @ 8170263 .string "LANETTE’S HOUSE$" - diff --git a/data/text/maps/Route114_FossilManiacsHouse.s b/data/text/maps/Route114_FossilManiacsHouse.s index af2cb7c6a..4515a161a 100644 --- a/data/text/maps/Route114_FossilManiacsHouse.s +++ b/data/text/maps/Route114_FossilManiacsHouse.s @@ -19,4 +19,3 @@ Route114_FossilManiacsHouse_Text_192729:: @ 8192729 .string "HOW RAIN SHAPES THE LAND...\l" .string "STONES, SOIL, AND ROCK...\p" .string "It’s crammed with books.$" - diff --git a/data/text/maps/Route114_FossilManiacsTunnel.s b/data/text/maps/Route114_FossilManiacsTunnel.s index 03b30ada6..cbcd6172d 100644 --- a/data/text/maps/Route114_FossilManiacsTunnel.s +++ b/data/text/maps/Route114_FossilManiacsTunnel.s @@ -24,4 +24,3 @@ Route114_FossilManiacsTunnel_Text_1928DE:: @ 81928DE Route114_FossilManiacsTunnel_Text_1929DC:: @ 81929DC .string "FOSSILS are so... Wonderful...\n" .string "It’s so dreamy...$" - diff --git a/data/text/maps/Route114_LanettesHouse.s b/data/text/maps/Route114_LanettesHouse.s index 35ec3e86b..5d6747895 100644 --- a/data/text/maps/Route114_LanettesHouse.s +++ b/data/text/maps/Route114_LanettesHouse.s @@ -54,4 +54,3 @@ Route114_LanettesHouse_Text_192DC1:: @ 8192DC1 .string "research in Storage Systems.\p" .string "“From BILL\n" .string "... ... ... ... ... ... ... ...”$" - diff --git a/data/text/maps/Route115.s b/data/text/maps/Route115.s index 8e88c74dd..f5fc22b0d 100644 --- a/data/text/maps/Route115.s +++ b/data/text/maps/Route115.s @@ -11,4 +11,3 @@ Route115_Text_1702E7:: @ 81702E7 Route115_Text_170301:: @ 8170301 .string "METEOR FALLS\n" .string "FALLARBOR TOWN THROUGH HERE$" - diff --git a/data/text/maps/Route116.s b/data/text/maps/Route116.s index 9106aa1a4..64694199d 100644 --- a/data/text/maps/Route116.s +++ b/data/text/maps/Route116.s @@ -117,4 +117,3 @@ Route116_Text_170B7D:: @ 8170B7D .string "placed in the appropriate POCKETS.\p" .string "No TRAINER can afford to be without\n" .string "a BAG of their own.$" - diff --git a/data/text/maps/Route116_TunnelersRestHouse.s b/data/text/maps/Route116_TunnelersRestHouse.s index ea6f0e97b..d777ff0c8 100644 --- a/data/text/maps/Route116_TunnelersRestHouse.s +++ b/data/text/maps/Route116_TunnelersRestHouse.s @@ -29,4 +29,3 @@ Route116_TunnelersRestHouse_Text_1931C1:: @ 81931C1 .string "has gone through!\p" .string "Sometimes, if you hope strongly enough,\n" .string "dreams do come true.$" - diff --git a/data/text/maps/Route117.s b/data/text/maps/Route117.s index 37482d51a..deadb8f5d 100644 --- a/data/text/maps/Route117.s +++ b/data/text/maps/Route117.s @@ -23,4 +23,3 @@ Route117_Text_170D1E:: @ 8170D1E Route117_Text_170D38:: @ 8170D38 .string "POKéMON DAY CARE\n" .string "“Let us raise your POKéMON.”$" - diff --git a/data/text/maps/Route118.s b/data/text/maps/Route118.s index f6636cada..649efe3f0 100644 --- a/data/text/maps/Route118.s +++ b/data/text/maps/Route118.s @@ -53,4 +53,3 @@ Route118_Text_17108B:: @ 817108B Route118_Text_1710A5:: @ 81710A5 .string "ROUTE 118\n" .string "{0x79} ROUTE 119$" - diff --git a/data/text/maps/Route119.s b/data/text/maps/Route119.s index 6df6f5e79..489ca053d 100644 --- a/data/text/maps/Route119.s +++ b/data/text/maps/Route119.s @@ -100,4 +100,3 @@ Route119_Text_171774:: @ 8171774 .string "Pick your favorite items and create\n" .string "your very own SECRET BASE exactly the\l" .string "way you want.$" - diff --git a/data/text/maps/Route119_House.s b/data/text/maps/Route119_House.s index df5b32895..fe069c1ed 100644 --- a/data/text/maps/Route119_House.s +++ b/data/text/maps/Route119_House.s @@ -7,4 +7,3 @@ Route119_House_Text_19F371:: @ 819F371 Route119_House_Text_19F406:: @ 819F406 .string "WINGULL: Pihyo?$" - diff --git a/data/text/maps/Route119_WeatherInstitute_1F.s b/data/text/maps/Route119_WeatherInstitute_1F.s index 30dc66a17..1f7fff794 100644 --- a/data/text/maps/Route119_WeatherInstitute_1F.s +++ b/data/text/maps/Route119_WeatherInstitute_1F.s @@ -52,4 +52,3 @@ Route119_WeatherInstitute_1F_Text_19EE25:: @ 819EE25 Route119_WeatherInstitute_1F_Text_19EE8B:: @ 819EE8B .string "There’s a bed...\n" .string "Let’s take a rest.$" - diff --git a/data/text/maps/Route119_WeatherInstitute_2F.s b/data/text/maps/Route119_WeatherInstitute_2F.s index 3b00452a7..f2854f6d0 100644 --- a/data/text/maps/Route119_WeatherInstitute_2F.s +++ b/data/text/maps/Route119_WeatherInstitute_2F.s @@ -69,4 +69,3 @@ Route119_WeatherInstitute_2F_Text_19F2FE:: @ 819F2FE .string "I’ve been researching rain for many\n" .string "years, but it’s ridiculous to think that\l" .string "humans can freely change the weather.$" - diff --git a/data/text/maps/Route121.s b/data/text/maps/Route121.s index f62d91b5c..7861b1744 100644 --- a/data/text/maps/Route121.s +++ b/data/text/maps/Route121.s @@ -15,4 +15,3 @@ Route121_Text_171D0C:: @ 8171D0C Route121_Text_171D5B:: @ 8171D5B .string "“Filled with rare POKéMON!”\n" .string "SAFARI ZONE$" - diff --git a/data/text/maps/Route123.s b/data/text/maps/Route123.s index bebe88f83..911915f9e 100644 --- a/data/text/maps/Route123.s +++ b/data/text/maps/Route123.s @@ -23,4 +23,3 @@ Route123_Text_171E8E:: @ 8171E8E Route123_Text_171EBC:: @ 8171EBC .string "BERRY MASTER’S HOUSE$" - diff --git a/data/text/maps/Route124.s b/data/text/maps/Route124.s index 26b76cc2a..6f33d40b7 100644 --- a/data/text/maps/Route124.s +++ b/data/text/maps/Route124.s @@ -1,3 +1,2 @@ Route124_Text_171ED1:: @ 8171ED1 .string "HUNTER’S HOUSE$" - diff --git a/data/text/maps/Route124_DivingTreasureHuntersHouse.s b/data/text/maps/Route124_DivingTreasureHuntersHouse.s index 84ce7168b..3eda96254 100644 --- a/data/text/maps/Route124_DivingTreasureHuntersHouse.s +++ b/data/text/maps/Route124_DivingTreasureHuntersHouse.s @@ -51,4 +51,3 @@ Route124_DivingTreasureHuntersHouse_Text_19F6C5:: @ 819F6C5 .string " BLUE SHARD {0x7B}{0x7C} WATER STONE\p" .string "Wanted item Trade item\n" .string " GREEN SHARD {0x7B}{0x7C} LEAF STONE$" - diff --git a/data/text/maps/Route128.s b/data/text/maps/Route128.s index c20f32770..da813609b 100644 --- a/data/text/maps/Route128.s +++ b/data/text/maps/Route128.s @@ -63,4 +63,3 @@ Route128_Text_1723BE:: @ 81723BE .string "but don’t do anything reckless.\p" .string "Okay.\n" .string "I’m going to SOOTOPOLIS.$" - diff --git a/data/text/maps/RustboroCity.s b/data/text/maps/RustboroCity.s index f2c9a2f57..4f2954f35 100644 --- a/data/text/maps/RustboroCity.s +++ b/data/text/maps/RustboroCity.s @@ -176,4 +176,3 @@ RustboroCity_Text_167525:: @ 8167525 RustboroCity_Text_167568:: @ 8167568 .string "CUTTER’S HOUSE$" - diff --git a/data/text/maps/RustboroCity_CuttersHouse.s b/data/text/maps/RustboroCity_CuttersHouse.s index dc0c394c1..8b4c237f5 100644 --- a/data/text/maps/RustboroCity_CuttersHouse.s +++ b/data/text/maps/RustboroCity_CuttersHouse.s @@ -25,4 +25,3 @@ RustboroCity_CuttersHouse_Text_1852B3:: @ 81852B3 .string "RUSTBORO, my dad helped out.\p" .string "He made his POKéMON use CUT to clear\n" .string "the land of trees.$" - diff --git a/data/text/maps/RustboroCity_DevonCorp_1F.s b/data/text/maps/RustboroCity_DevonCorp_1F.s index 09f130ea8..209fd049c 100644 --- a/data/text/maps/RustboroCity_DevonCorp_1F.s +++ b/data/text/maps/RustboroCity_DevonCorp_1F.s @@ -36,4 +36,3 @@ RustboroCity_DevonCorp_1F_Text_182B2D:: @ 8182B2D RustboroCity_DevonCorp_1F_Text_182B5A:: @ 8182B5A .string "Hi, there!\n" .string "You’re always welcome here!$" - diff --git a/data/text/maps/RustboroCity_DevonCorp_2F.s b/data/text/maps/RustboroCity_DevonCorp_2F.s index de37c8266..a6a6bb6c2 100644 --- a/data/text/maps/RustboroCity_DevonCorp_2F.s +++ b/data/text/maps/RustboroCity_DevonCorp_2F.s @@ -86,4 +86,3 @@ RustboroCity_DevonCorp_2F_Text_18319E:: @ 818319E RustboroCity_DevonCorp_2F_Text_1831C8:: @ 81831C8 .string "Uh-oh, you’ve got too many POKéMON.\n" .string "You have no room for this one.$" - diff --git a/data/text/maps/RustboroCity_DevonCorp_3F.s b/data/text/maps/RustboroCity_DevonCorp_3F.s index 011513d8d..c868a4836 100644 --- a/data/text/maps/RustboroCity_DevonCorp_3F.s +++ b/data/text/maps/RustboroCity_DevonCorp_3F.s @@ -96,4 +96,3 @@ RustboroCity_DevonCorp_3F_Text_1839A3:: @ 81839A3 RustboroCity_DevonCorp_3F_Text_183A04:: @ 8183A04 .string "It’s a collection of rare rocks and\n" .string "stones assembled by the PRESIDENT.$" - diff --git a/data/text/maps/RustboroCity_Flat1_1F.s b/data/text/maps/RustboroCity_Flat1_1F.s index afd8384b7..4721931e4 100644 --- a/data/text/maps/RustboroCity_Flat1_1F.s +++ b/data/text/maps/RustboroCity_Flat1_1F.s @@ -4,4 +4,3 @@ RustboroCity_Flat1_1F_Text_184DB4:: @ 8184DB4 RustboroCity_Flat1_1F_Text_184DE9:: @ 8184DE9 .string "POKéMON are such strange creatures.$" - diff --git a/data/text/maps/RustboroCity_Flat1_2F.s b/data/text/maps/RustboroCity_Flat1_2F.s index 79553bf9c..7ddb678bf 100644 --- a/data/text/maps/RustboroCity_Flat1_2F.s +++ b/data/text/maps/RustboroCity_Flat1_2F.s @@ -6,4 +6,3 @@ RustboroCity_Flat1_2F_Text_184E0D:: @ 8184E0D .string "make for meals every day.\p" .string "It really isn’t easy coming up with\n" .string "meals every day.$" - diff --git a/data/text/maps/RustboroCity_Flat2_1F.s b/data/text/maps/RustboroCity_Flat2_1F.s index 9ae0b72d7..d949a0ab8 100644 --- a/data/text/maps/RustboroCity_Flat2_1F.s +++ b/data/text/maps/RustboroCity_Flat2_1F.s @@ -4,4 +4,3 @@ RustboroCity_Flat2_1F_Text_1853DD:: @ 81853DD RustboroCity_Flat2_1F_Text_185410:: @ 8185410 .string "SKITTY: Gyaaaah!$" - diff --git a/data/text/maps/RustboroCity_Flat2_2F.s b/data/text/maps/RustboroCity_Flat2_2F.s index 797b6f810..8a3d52fda 100644 --- a/data/text/maps/RustboroCity_Flat2_2F.s +++ b/data/text/maps/RustboroCity_Flat2_2F.s @@ -11,4 +11,3 @@ RustboroCity_Flat2_2F_Text_1854C4:: @ 81854C4 .string "My daddy’s working at the CORPORATION.\p" .string "When I grow up, I’m going to work for\n" .string "DEVON, too.$" - diff --git a/data/text/maps/RustboroCity_Flat2_3F.s b/data/text/maps/RustboroCity_Flat2_3F.s index bb05f1932..9f95ce92e 100644 --- a/data/text/maps/RustboroCity_Flat2_3F.s +++ b/data/text/maps/RustboroCity_Flat2_3F.s @@ -5,4 +5,3 @@ RustboroCity_Flat2_3F_Text_18551D:: @ 818551D RustboroCity_Flat2_3F_Text_18554D:: @ 818554D .string "I think the PRESIDENT’s son also\n" .string "collects rare stones.$" - diff --git a/data/text/maps/RustboroCity_Gym.s b/data/text/maps/RustboroCity_Gym.s index e87ecbd6e..7bb737097 100644 --- a/data/text/maps/RustboroCity_Gym.s +++ b/data/text/maps/RustboroCity_Gym.s @@ -109,4 +109,3 @@ RustboroCity_Gym_Text_1842E6:: @ 81842E6 .string "RUSTBORO CITY POKéMON GYM\p" .string "ROXANNE’S CERTIFIED TRAINERS:\n" .string "{PLAYER}$" - diff --git a/data/text/maps/RustboroCity_House1.s b/data/text/maps/RustboroCity_House1.s index 2835b8abe..6427aa326 100644 --- a/data/text/maps/RustboroCity_House1.s +++ b/data/text/maps/RustboroCity_House1.s @@ -25,4 +25,3 @@ RustboroCity_House1_Text_185020:: @ 8185020 .string "sorts of POKéMON and people.\p" .string "I find that fascinating, so I go to all\n" .string "sorts of places.$" - diff --git a/data/text/maps/RustboroCity_House2.s b/data/text/maps/RustboroCity_House2.s index fba2dc73c..7a1d9c706 100644 --- a/data/text/maps/RustboroCity_House2.s +++ b/data/text/maps/RustboroCity_House2.s @@ -7,4 +7,3 @@ RustboroCity_House2_Text_185388:: @ 8185388 .string "ROXANNE, the GYM LEADER, really knows\n" .string "a lot about POKéMON.\p" .string "She’s really strong, too!$" - diff --git a/data/text/maps/RustboroCity_House3.s b/data/text/maps/RustboroCity_House3.s index 69c64c3d4..43a3f6ff0 100644 --- a/data/text/maps/RustboroCity_House3.s +++ b/data/text/maps/RustboroCity_House3.s @@ -12,4 +12,3 @@ RustboroCity_House3_Text_1855FA:: @ 81855FA RustboroCity_House3_Text_18567D:: @ 818567D .string "PEKACHU: Peka!$" - diff --git a/data/text/maps/RustboroCity_Mart.s b/data/text/maps/RustboroCity_Mart.s index 48b5ea874..f11395b68 100644 --- a/data/text/maps/RustboroCity_Mart.s +++ b/data/text/maps/RustboroCity_Mart.s @@ -15,4 +15,3 @@ RustboroCity_Mart_Text_184D43:: @ 8184D43 .string "case I get lost in a cave.\p" .string "I just need to use it to get back to the\n" .string "entrance.$" - diff --git a/data/text/maps/RustboroCity_PokemonCenter_1F.s b/data/text/maps/RustboroCity_PokemonCenter_1F.s index be48ec5c8..0265f0363 100644 --- a/data/text/maps/RustboroCity_PokemonCenter_1F.s +++ b/data/text/maps/RustboroCity_PokemonCenter_1F.s @@ -14,4 +14,3 @@ RustboroCity_PokemonCenter_1F_Text_184C19:: @ 8184C19 .string "The man next door gave me an HM!\p" .string "I used it to teach my POKéMON how to\n" .string "CUT down skinny trees.$" - diff --git a/data/text/maps/RustboroCity_PokemonSchool.s b/data/text/maps/RustboroCity_PokemonSchool.s index a6cd855c4..e12349bd2 100644 --- a/data/text/maps/RustboroCity_PokemonSchool.s +++ b/data/text/maps/RustboroCity_PokemonSchool.s @@ -99,4 +99,3 @@ RustboroCity_PokemonSchool_Text_184A17:: @ 8184A17 .string "A TRAINER’s mission is to defeat the\n" .string "strong TRAINERS who await challengers\l" .string "in POKéMON GYMS.$" - diff --git a/data/text/maps/RusturfTunnel.s b/data/text/maps/RusturfTunnel.s index 4905383e0..3403808fd 100644 --- a/data/text/maps/RusturfTunnel.s +++ b/data/text/maps/RusturfTunnel.s @@ -103,4 +103,3 @@ RusturfTunnel_Text_1948C4:: @ 81948C4 .string "They halted development here to\n" .string "protect POKéMON, right?\l" .string "There’s a feel-good story!$" - diff --git a/data/text/maps/SSTidalLowerDeck.s b/data/text/maps/SSTidalLowerDeck.s index 8792f18d5..2c54d743c 100644 --- a/data/text/maps/SSTidalLowerDeck.s +++ b/data/text/maps/SSTidalLowerDeck.s @@ -23,4 +23,3 @@ SSTidalLowerDeck_Text_199508:: @ 8199508 .string "We’re the CLEANUP BROTHERS!\p" .string "The old one dumps the detergent,\n" .string "and the young one does the scrubbing!$" - diff --git a/data/text/maps/SeafloorCavern_Room1.s b/data/text/maps/SeafloorCavern_Room1.s index 7200026f6..da6e207ae 100644 --- a/data/text/maps/SeafloorCavern_Room1.s +++ b/data/text/maps/SeafloorCavern_Room1.s @@ -20,4 +20,3 @@ SeafloorCavern_Room1_Text_197589:: @ 8197589 .string "That submarine we jacked, man, it’s\n" .string "brutal as a ride.\l" .string "It’s way too tight in there!$" - diff --git a/data/text/maps/SeafloorCavern_Room3.s b/data/text/maps/SeafloorCavern_Room3.s index f23b5ab28..07187b142 100644 --- a/data/text/maps/SeafloorCavern_Room3.s +++ b/data/text/maps/SeafloorCavern_Room3.s @@ -22,4 +22,3 @@ SeafloorCavern_Room3_Text_197704:: @ 8197704 .string "You could have enjoyed the fabulous\n" .string "world our BOSS has promised to one\l" .string "of our own...$" - diff --git a/data/text/maps/SeafloorCavern_Room4.s b/data/text/maps/SeafloorCavern_Room4.s index 2dd1ac5bd..ca0600450 100644 --- a/data/text/maps/SeafloorCavern_Room4.s +++ b/data/text/maps/SeafloorCavern_Room4.s @@ -8,4 +8,3 @@ SeafloorCavern_Room4_Text_1977E2:: @ 81977E2 SeafloorCavern_Room4_Text_1977ED:: @ 81977ED .string "I can’t find the way out!\p" .string "I’m not afraid. Don’t get me wrong!$" - diff --git a/data/text/maps/SecretBase_RedCave1.s b/data/text/maps/SecretBase_RedCave1.s index 1258599b8..efb2c8fdb 100644 --- a/data/text/maps/SecretBase_RedCave1.s +++ b/data/text/maps/SecretBase_RedCave1.s @@ -1,3 +1,2 @@ SecretBase_RedCave1_Text_198F89:: @ 8198F89 .string "Want to make your SECRET BASE here?$" - diff --git a/data/text/maps/ShoalCave_LowTideLowerRoom.s b/data/text/maps/ShoalCave_LowTideLowerRoom.s index b59cb0378..c9d4337de 100644 --- a/data/text/maps/ShoalCave_LowTideLowerRoom.s +++ b/data/text/maps/ShoalCave_LowTideLowerRoom.s @@ -7,4 +7,3 @@ ShoalCave_LowTideLowerRoom_Text_198200:: @ 8198200 ShoalCave_LowTideLowerRoom_Text_1982A2:: @ 81982A2 .string "Everything starts with focus!$" - diff --git a/data/text/maps/SlateportCity.s b/data/text/maps/SlateportCity.s index bcad42f2d..3ff5d51bf 100644 --- a/data/text/maps/SlateportCity.s +++ b/data/text/maps/SlateportCity.s @@ -319,4 +319,3 @@ SlateportCity_Text_165B02:: @ 8165B02 SlateportCity_Text_165B48:: @ 8165B48 .string "NAME RATER’S HOUSE\n" .string "“POKéMON nicknames rated.”$" - diff --git a/data/text/maps/SlateportCity_ContestHall.s b/data/text/maps/SlateportCity_ContestHall.s index edc29d872..6199157fb 100644 --- a/data/text/maps/SlateportCity_ContestHall.s +++ b/data/text/maps/SlateportCity_ContestHall.s @@ -103,4 +103,3 @@ SlateportCity_ContestHall_Text_17D3F0:: @ 817D3F0 SlateportCity_ContestHall_Text_17D447:: @ 817D447 .string "POKéMON CONTESTS\n" .string "HYPER RANK STAGE!$" - diff --git a/data/text/maps/SlateportCity_ContestLobby.s b/data/text/maps/SlateportCity_ContestLobby.s index a4f42c1b0..7c32cd8ac 100644 --- a/data/text/maps/SlateportCity_ContestLobby.s +++ b/data/text/maps/SlateportCity_ContestLobby.s @@ -25,4 +25,3 @@ SlateportCity_ContestLobby_Text_17CAEC:: @ 817CAEC .string "poster of your POKéMON on the wall.\p" .string "It will have a portrait of your\n" .string "POKéMON and both your names.$" - diff --git a/data/text/maps/SlateportCity_Harbor.s b/data/text/maps/SlateportCity_Harbor.s index 06c82f94b..187dfe07c 100644 --- a/data/text/maps/SlateportCity_Harbor.s +++ b/data/text/maps/SlateportCity_Harbor.s @@ -146,4 +146,3 @@ SlateportCity_Harbor_Text_18046B:: @ 818046B SlateportCity_Harbor_Text_180491:: @ 8180491 .string "CAPT. STERN: Thanks, {PLAYER}{KUN}!\n" .string "This will help our research a lot!$" - diff --git a/data/text/maps/SlateportCity_House1.s b/data/text/maps/SlateportCity_House1.s index dad8b0c5b..c711aec2f 100644 --- a/data/text/maps/SlateportCity_House1.s +++ b/data/text/maps/SlateportCity_House1.s @@ -45,4 +45,3 @@ SlateportCity_House1_Text_17D6CC:: @ 817D6CC SlateportCity_House1_Text_17D752:: @ 817D752 .string "Now, now.\n" .string "That is merely an EGG!$" - diff --git a/data/text/maps/SlateportCity_House2.s b/data/text/maps/SlateportCity_House2.s index 8ae21ce9a..c3d8346bc 100644 --- a/data/text/maps/SlateportCity_House2.s +++ b/data/text/maps/SlateportCity_House2.s @@ -14,4 +14,3 @@ SlateportCity_House2_Text_180567:: @ 8180567 SlateportCity_House2_Text_1805CD:: @ 81805CD .string "Oh, a CONTEST PASS!\n" .string "You’re going to be a contestant?$" - diff --git a/data/text/maps/SlateportCity_Mart.s b/data/text/maps/SlateportCity_Mart.s index 336b32d9b..b5243d406 100644 --- a/data/text/maps/SlateportCity_Mart.s +++ b/data/text/maps/SlateportCity_Mart.s @@ -9,4 +9,3 @@ SlateportCity_Mart_Text_18079D:: @ 818079D .string "at catching POKéMON.\p" .string "With this, I should be able to get that\n" .string "elusive POKéMON...$" - diff --git a/data/text/maps/SlateportCity_OceanicMuseum_1F.s b/data/text/maps/SlateportCity_OceanicMuseum_1F.s index 7ef418d39..0d3d1eec6 100644 --- a/data/text/maps/SlateportCity_OceanicMuseum_1F.s +++ b/data/text/maps/SlateportCity_OceanicMuseum_1F.s @@ -155,4 +155,3 @@ SlateportCity_OceanicMuseum_1F_Text_17EC98:: @ 817EC98 .string "a glass dome.\p" .string "Maybe it’s for measuring the depth\n" .string "of something...$" - diff --git a/data/text/maps/SlateportCity_OceanicMuseum_2F.s b/data/text/maps/SlateportCity_OceanicMuseum_2F.s index 6644f780b..a3c624f0c 100644 --- a/data/text/maps/SlateportCity_OceanicMuseum_2F.s +++ b/data/text/maps/SlateportCity_OceanicMuseum_2F.s @@ -174,4 +174,3 @@ SlateportCity_OceanicMuseum_2F_Text_17F9C7:: @ 817F9C7 .string "“S.S. ANNE\p" .string "“A replica of the luxury liner that\n" .string "circles the globe.”$" - diff --git a/data/text/maps/SlateportCity_PokemonCenter_1F.s b/data/text/maps/SlateportCity_PokemonCenter_1F.s index 549cca714..2a87ffa93 100644 --- a/data/text/maps/SlateportCity_PokemonCenter_1F.s +++ b/data/text/maps/SlateportCity_PokemonCenter_1F.s @@ -11,4 +11,3 @@ SlateportCity_PokemonCenter_1F_Text_1806CB:: @ 81806CB .string "I trade POKéMON with my friends.\p" .string "If a traded POKéMON is holding an\n" .string "item, it makes me twice as happy!$" - diff --git a/data/text/maps/SlateportCity_PokemonFanClub.s b/data/text/maps/SlateportCity_PokemonFanClub.s index 5bb7c1aeb..eab516c2b 100644 --- a/data/text/maps/SlateportCity_PokemonFanClub.s +++ b/data/text/maps/SlateportCity_PokemonFanClub.s @@ -129,4 +129,3 @@ SlateportCity_PokemonFanClub_Text_17E164:: @ 817E164 SlateportCity_PokemonFanClub_Text_17E178:: @ 817E178 .string "AZUMARILL: Marimari?$" - diff --git a/data/text/maps/SlateportCity_SternsShipyard_1F.s b/data/text/maps/SlateportCity_SternsShipyard_1F.s index 35dbb3bee..8a08a15ae 100644 --- a/data/text/maps/SlateportCity_SternsShipyard_1F.s +++ b/data/text/maps/SlateportCity_SternsShipyard_1F.s @@ -77,4 +77,3 @@ SlateportCity_SternsShipyard_1F_Text_17C6BB:: @ 817C6BB SlateportCity_SternsShipyard_1F_Text_17C764:: @ 817C764 .string "I get seasick real easily.\n" .string "So I get to help out here instead.$" - diff --git a/data/text/maps/SlateportCity_SternsShipyard_2F.s b/data/text/maps/SlateportCity_SternsShipyard_2F.s index 8262216fc..0bf4e27e0 100644 --- a/data/text/maps/SlateportCity_SternsShipyard_2F.s +++ b/data/text/maps/SlateportCity_SternsShipyard_2F.s @@ -16,4 +16,3 @@ UnknownString_817C882: @ 817C882 .string "through there.\p" .string "You’d need substantial propulsion\n" .string "to plow through those waters...$" - diff --git a/data/text/maps/SootopolisCity.s b/data/text/maps/SootopolisCity.s index 3c2575b99..cc89d86bd 100644 --- a/data/text/maps/SootopolisCity.s +++ b/data/text/maps/SootopolisCity.s @@ -213,4 +213,3 @@ SootopolisCity_Text_16A711:: @ 816A711 .string "SOOTOPOLIS CITY\p" .string "“The mystical city where history\n" .string "slumbers.”$" - diff --git a/data/text/maps/SootopolisCity_House1.s b/data/text/maps/SootopolisCity_House1.s index 57ae71945..78e8454e5 100644 --- a/data/text/maps/SootopolisCity_House1.s +++ b/data/text/maps/SootopolisCity_House1.s @@ -10,4 +10,3 @@ SootopolisCity_House1_Text_18FA03:: @ 818FA03 SootopolisCity_House1_Text_18FA50:: @ 818FA50 .string "KECLEON: Puu puhyaah.$" - diff --git a/data/text/maps/SootopolisCity_House2.s b/data/text/maps/SootopolisCity_House2.s index 42ed0a803..e132b20f7 100644 --- a/data/text/maps/SootopolisCity_House2.s +++ b/data/text/maps/SootopolisCity_House2.s @@ -11,4 +11,3 @@ SootopolisCity_House2_Text_18FAAE:: @ 818FAAE SootopolisCity_House2_Text_18FB04:: @ 818FB04 .string "Is that so?\n" .string "Perhaps you ought to visit and see...$" - diff --git a/data/text/maps/SootopolisCity_House3.s b/data/text/maps/SootopolisCity_House3.s index 4bc270f16..b67e0a4dc 100644 --- a/data/text/maps/SootopolisCity_House3.s +++ b/data/text/maps/SootopolisCity_House3.s @@ -18,4 +18,3 @@ SootopolisCity_House3_Text_18FC1A:: @ 818FC1A .string "KANTO and JOHTO.\p" .string "It was really wild when I went to the\n" .string "TRAINER FAN CLUB in LILYCOVE.$" - diff --git a/data/text/maps/SootopolisCity_House4.s b/data/text/maps/SootopolisCity_House4.s index 5d49f5cf7..277e2e060 100644 --- a/data/text/maps/SootopolisCity_House4.s +++ b/data/text/maps/SootopolisCity_House4.s @@ -15,4 +15,3 @@ SootopolisCity_House4_Text_18FD41:: @ 818FD41 SootopolisCity_House4_Text_18FDD8:: @ 818FDD8 .string "AZUMARILL: Marurii.$" - diff --git a/data/text/maps/SootopolisCity_House5.s b/data/text/maps/SootopolisCity_House5.s index 9fca78e0f..c5887ffe2 100644 --- a/data/text/maps/SootopolisCity_House5.s +++ b/data/text/maps/SootopolisCity_House5.s @@ -6,4 +6,3 @@ SootopolisCity_House5_Text_18FDEC:: @ 818FDEC SootopolisCity_House5_Text_18FE7B:: @ 818FE7B .string "My big brother used to study the sea.$" - diff --git a/data/text/maps/SootopolisCity_House6.s b/data/text/maps/SootopolisCity_House6.s index 895719f84..c8547b412 100644 --- a/data/text/maps/SootopolisCity_House6.s +++ b/data/text/maps/SootopolisCity_House6.s @@ -17,4 +17,3 @@ SootopolisCity_House6_Text_18FF6D:: @ 818FF6D SootopolisCity_House6_Text_18FF95:: @ 818FF95 .string "I love plush DOLLS!$" - diff --git a/data/text/maps/SootopolisCity_House7.s b/data/text/maps/SootopolisCity_House7.s index 027ea91e5..756a96a1b 100644 --- a/data/text/maps/SootopolisCity_House7.s +++ b/data/text/maps/SootopolisCity_House7.s @@ -12,4 +12,3 @@ SootopolisCity_House7_Text_19005B:: @ 819005B .string "It seems as if the cave was made to\n" .string "keep something from getting out.\p" .string "Or am I just imagining things?$" - diff --git a/data/text/maps/SootopolisCity_House8.s b/data/text/maps/SootopolisCity_House8.s index cb1046272..4efc111cc 100644 --- a/data/text/maps/SootopolisCity_House8.s +++ b/data/text/maps/SootopolisCity_House8.s @@ -88,4 +88,3 @@ SootopolisCity_House8_Text_1906BE:: @ 81906BE .string "{STR_VAR_2}’s {STR_VAR_3}-inch colossus!\p" .string "A BARBOACH bigger than a SHROOMISH\n" .string "always wanted!$" - diff --git a/data/text/maps/SootopolisCity_Mart.s b/data/text/maps/SootopolisCity_Mart.s index e45624067..858d1530d 100644 --- a/data/text/maps/SootopolisCity_Mart.s +++ b/data/text/maps/SootopolisCity_Mart.s @@ -15,4 +15,3 @@ SootopolisCity_Mart_Text_18F8F2:: @ 818F8F2 SootopolisCity_Mart_Text_18F96B:: @ 818F96B .string "This weather...\n" .string "Did something awaken?$" - diff --git a/data/text/maps/SootopolisCity_PokemonCenter_1F.s b/data/text/maps/SootopolisCity_PokemonCenter_1F.s index e8a78c9b6..fd078ad0c 100644 --- a/data/text/maps/SootopolisCity_PokemonCenter_1F.s +++ b/data/text/maps/SootopolisCity_PokemonCenter_1F.s @@ -22,4 +22,3 @@ SootopolisCity_PokemonCenter_1F_Text_18F7EA:: @ 818F7EA SootopolisCity_PokemonCenter_1F_Text_18F860:: @ 818F860 .string "I don’t know why...\n" .string "But... I’m really scared...$" - diff --git a/data/text/maps/Underwater_SeafloorCavern.s b/data/text/maps/Underwater_SeafloorCavern.s index 80153230f..8df6cb492 100644 --- a/data/text/maps/Underwater_SeafloorCavern.s +++ b/data/text/maps/Underwater_SeafloorCavern.s @@ -5,4 +5,3 @@ Underwater_SeafloorCavern_Text_197435:: @ 8197435 .string "stole in SLATEPORT!\p" .string "TEAM {EVIL_TEAM} must have gone\n" .string "ashore here.$" - diff --git a/data/text/maps/VerdanturfTown.s b/data/text/maps/VerdanturfTown.s index 7cdd8b9bc..a3ccdd34e 100644 --- a/data/text/maps/VerdanturfTown.s +++ b/data/text/maps/VerdanturfTown.s @@ -60,4 +60,3 @@ VerdanturfTown_Text_16CF6D:: @ 816CF6D .string "“Linking RUSTBORO and VERDANTURF\p" .string "“The tunnel project has been\n" .string "canceled.”$" - diff --git a/data/text/maps/VerdanturfTown_ContestHall.s b/data/text/maps/VerdanturfTown_ContestHall.s index fda2a8022..2bf97f1de 100644 --- a/data/text/maps/VerdanturfTown_ContestHall.s +++ b/data/text/maps/VerdanturfTown_ContestHall.s @@ -24,4 +24,3 @@ VerdanturfTown_ContestHall_Text_178120:: @ 8178120 VerdanturfTown_ContestHall_Text_1781A5:: @ 81781A5 .string "POKéMON CONTESTS\n" .string "NORMAL RANK STAGE!$" - diff --git a/data/text/maps/VerdanturfTown_ContestLobby.s b/data/text/maps/VerdanturfTown_ContestLobby.s index 8c2240ba9..2f9121c52 100644 --- a/data/text/maps/VerdanturfTown_ContestLobby.s +++ b/data/text/maps/VerdanturfTown_ContestLobby.s @@ -26,4 +26,3 @@ VerdanturfTown_ContestLobby_Text_177ECD:: @ 8177ECD .string "theme, and make sure it has the\l" .string "right set of moves to match.\p" .string "That’s fundamental!$" - diff --git a/data/text/maps/VerdanturfTown_FriendshipRatersHouse.s b/data/text/maps/VerdanturfTown_FriendshipRatersHouse.s index 9d8e968b6..e6e7f9730 100644 --- a/data/text/maps/VerdanturfTown_FriendshipRatersHouse.s +++ b/data/text/maps/VerdanturfTown_FriendshipRatersHouse.s @@ -37,4 +37,3 @@ VerdanturfTown_FriendshipRatersHouse_Text_178C90:: @ 8178C90 VerdanturfTown_FriendshipRatersHouse_Text_178CFD:: @ 8178CFD .string "PIKACHU: Pika pika!$" - diff --git a/data/text/maps/VerdanturfTown_House.s b/data/text/maps/VerdanturfTown_House.s index 8cdb826c3..8db1656ee 100644 --- a/data/text/maps/VerdanturfTown_House.s +++ b/data/text/maps/VerdanturfTown_House.s @@ -11,4 +11,3 @@ VerdanturfTown_House_Text_178D8E:: @ 8178D8E .string "If you lose to any of them, you have\n" .string "to begin your challenge again from the\l" .string "first one.$" - diff --git a/data/text/maps/VerdanturfTown_Mart.s b/data/text/maps/VerdanturfTown_Mart.s index 6bdb54ecd..fbd655f08 100644 --- a/data/text/maps/VerdanturfTown_Mart.s +++ b/data/text/maps/VerdanturfTown_Mart.s @@ -15,4 +15,3 @@ VerdanturfTown_Mart_Text_1782C0:: @ 81782C0 .string "weakened POKéMON.\p" .string "VERDANTURF is the only place you can\n" .string "buy it.$" - diff --git a/data/text/maps/VerdanturfTown_PokemonCenter_1F.s b/data/text/maps/VerdanturfTown_PokemonCenter_1F.s index 950922b45..e79898ead 100644 --- a/data/text/maps/VerdanturfTown_PokemonCenter_1F.s +++ b/data/text/maps/VerdanturfTown_PokemonCenter_1F.s @@ -7,4 +7,3 @@ VerdanturfTown_PokemonCenter_1F_Text_178389:: @ 8178389 .string "Let me hazard a guess why you’re in\n" .string "VERDANTURF. The reason: CONTESTS.\p" .string "All CONTEST challenges originate here.$" - diff --git a/data/text/maps/VerdanturfTown_WandasHouse.s b/data/text/maps/VerdanturfTown_WandasHouse.s index 684a4c2a3..d8aae2958 100644 --- a/data/text/maps/VerdanturfTown_WandasHouse.s +++ b/data/text/maps/VerdanturfTown_WandasHouse.s @@ -81,4 +81,3 @@ VerdanturfTown_WandasHouse_Text_178A47:: @ 8178A47 .string "WALLY was in EVER GRANDE?\p" .string "His parents in PETALBURG would be\n" .string "astonished to hear that!$" - diff --git a/data/text/maps/VictoryRoad_1F.s b/data/text/maps/VictoryRoad_1F.s index d4aaa0943..2f52e5cd4 100644 --- a/data/text/maps/VictoryRoad_1F.s +++ b/data/text/maps/VictoryRoad_1F.s @@ -70,4 +70,3 @@ VictoryRoad_1F_Text_197C8D:: @ 8197C8D VictoryRoad_1F_Text_197CAF:: @ 8197CAF .string "You seem to have the potential for\n" .string "becoming the CHAMPION.$" - diff --git a/data/text/maps/VictoryRoad_B1F.s b/data/text/maps/VictoryRoad_B1F.s index 33a34b871..d820a5c31 100644 --- a/data/text/maps/VictoryRoad_B1F.s +++ b/data/text/maps/VictoryRoad_B1F.s @@ -33,4 +33,3 @@ VictoryRoad_B1F_Text_197EA6:: @ 8197EA6 VictoryRoad_B1F_Text_197EB6:: @ 8197EB6 .string "You’ll do fine, for sure!\n" .string "Your POKéMON are all eager to go!$" - diff --git a/data/text/maps/VictoryRoad_B2F.s b/data/text/maps/VictoryRoad_B2F.s index fe7477979..760a732ff 100644 --- a/data/text/maps/VictoryRoad_B2F.s +++ b/data/text/maps/VictoryRoad_B2F.s @@ -47,4 +47,3 @@ VictoryRoad_B2F_Text_1981A3:: @ 81981A3 VictoryRoad_B2F_Text_1981BA:: @ 81981BA .string "Gaze on your collected BADGES and\n" .string "remember the TRAINERS you’ve faced.$" - |