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 | |
| parent | 1465509725e20d73dc5959e8aaf82cfe36321838 (diff) | |
remove empty lines at eof
1415 files changed, 0 insertions, 1415 deletions
diff --git a/data/contest_effects.s b/data/contest_effects.s index 27a9900e8..d53691cd8 100644 --- a/data/contest_effects.s +++ b/data/contest_effects.s @@ -288,4 +288,3 @@ gContestEffects: .byte 30 @ appeal .byte 0 @ jam .byte 0 @ padding - diff --git a/data/contest_moves.s b/data/contest_moves.s index dbb7c24f9..3b9630aba 100644 --- a/data/contest_moves.s +++ b/data/contest_moves.s @@ -2485,4 +2485,3 @@ gContestMoves: .byte 0 @ combo starter ID .byte COMBO_STARTER_CALM_MIND, 0, 0, 0 @ combo moves .byte 0 @ padding - diff --git a/data/maps/AbandonedShip_CaptainsOffice/header.s b/data/maps/AbandonedShip_CaptainsOffice/header.s index b6e5f4895..fa58f95f9 100644 --- a/data/maps/AbandonedShip_CaptainsOffice/header.s +++ b/data/maps/AbandonedShip_CaptainsOffice/header.s @@ -12,4 +12,3 @@ AbandonedShip_CaptainsOffice:: @ 8307454 .2byte 0 .byte 1 .byte 0 - diff --git a/data/maps/AbandonedShip_Corridors_1F/header.s b/data/maps/AbandonedShip_Corridors_1F/header.s index 84a9f8ecb..6d69374f1 100644 --- a/data/maps/AbandonedShip_Corridors_1F/header.s +++ b/data/maps/AbandonedShip_Corridors_1F/header.s @@ -12,4 +12,3 @@ AbandonedShip_Corridors_1F:: @ 8307374 .2byte 0 .byte 1 .byte 0 - diff --git a/data/maps/AbandonedShip_Corridors_B1F/header.s b/data/maps/AbandonedShip_Corridors_B1F/header.s index ae5418a2d..c691fea4f 100644 --- a/data/maps/AbandonedShip_Corridors_B1F/header.s +++ b/data/maps/AbandonedShip_Corridors_B1F/header.s @@ -12,4 +12,3 @@ AbandonedShip_Corridors_B1F:: @ 83073AC .2byte 0 .byte 1 .byte 0 - diff --git a/data/maps/AbandonedShip_Deck/header.s b/data/maps/AbandonedShip_Deck/header.s index 3573d6b3d..66adee677 100644 --- a/data/maps/AbandonedShip_Deck/header.s +++ b/data/maps/AbandonedShip_Deck/header.s @@ -12,4 +12,3 @@ AbandonedShip_Deck:: @ 8307358 .2byte 0 .byte 1 .byte 0 - diff --git a/data/maps/AbandonedShip_HiddenFloorCorridors/header.s b/data/maps/AbandonedShip_HiddenFloorCorridors/header.s index cce83595e..f0913dfae 100644 --- a/data/maps/AbandonedShip_HiddenFloorCorridors/header.s +++ b/data/maps/AbandonedShip_HiddenFloorCorridors/header.s @@ -12,4 +12,3 @@ AbandonedShip_HiddenFloorCorridors:: @ 830748C .2byte 0 .byte 1 .byte 0 - diff --git a/data/maps/AbandonedShip_HiddenFloorRooms/header.s b/data/maps/AbandonedShip_HiddenFloorRooms/header.s index bc9d2f425..a32bba09b 100644 --- a/data/maps/AbandonedShip_HiddenFloorRooms/header.s +++ b/data/maps/AbandonedShip_HiddenFloorRooms/header.s @@ -12,4 +12,3 @@ AbandonedShip_HiddenFloorRooms:: @ 83074A8 .2byte 0 .byte 0 .byte 0 - diff --git a/data/maps/AbandonedShip_Room_B1F/header.s b/data/maps/AbandonedShip_Room_B1F/header.s index f60789b9d..29166cd18 100644 --- a/data/maps/AbandonedShip_Room_B1F/header.s +++ b/data/maps/AbandonedShip_Room_B1F/header.s @@ -12,4 +12,3 @@ AbandonedShip_Room_B1F:: @ 830741C .2byte 0 .byte 1 .byte 0 - diff --git a/data/maps/AbandonedShip_Rooms2_1F/header.s b/data/maps/AbandonedShip_Rooms2_1F/header.s index a31aa342f..b92ea516d 100644 --- a/data/maps/AbandonedShip_Rooms2_1F/header.s +++ b/data/maps/AbandonedShip_Rooms2_1F/header.s @@ -12,4 +12,3 @@ AbandonedShip_Rooms2_1F:: @ 8307438 .2byte 0 .byte 1 .byte 0 - diff --git a/data/maps/AbandonedShip_Rooms2_B1F/header.s b/data/maps/AbandonedShip_Rooms2_B1F/header.s index f2214211a..ee72b282b 100644 --- a/data/maps/AbandonedShip_Rooms2_B1F/header.s +++ b/data/maps/AbandonedShip_Rooms2_B1F/header.s @@ -12,4 +12,3 @@ AbandonedShip_Rooms2_B1F:: @ 83073E4 .2byte 0 .byte 1 .byte 0 - diff --git a/data/maps/AbandonedShip_Rooms_1F/header.s b/data/maps/AbandonedShip_Rooms_1F/header.s index 709d5e359..ee232211a 100644 --- a/data/maps/AbandonedShip_Rooms_1F/header.s +++ b/data/maps/AbandonedShip_Rooms_1F/header.s @@ -12,4 +12,3 @@ AbandonedShip_Rooms_1F:: @ 8307390 .2byte 0 .byte 1 .byte 0 - diff --git a/data/maps/AbandonedShip_Rooms_B1F/header.s b/data/maps/AbandonedShip_Rooms_B1F/header.s index 51e0c04f6..f06962567 100644 --- a/data/maps/AbandonedShip_Rooms_B1F/header.s +++ b/data/maps/AbandonedShip_Rooms_B1F/header.s @@ -12,4 +12,3 @@ AbandonedShip_Rooms_B1F:: @ 83073C8 .2byte 0 .byte 1 .byte 0 - diff --git a/data/maps/AbandonedShip_Underwater1/header.s b/data/maps/AbandonedShip_Underwater1/header.s index e80ed1dd8..43bcad003 100644 --- a/data/maps/AbandonedShip_Underwater1/header.s +++ b/data/maps/AbandonedShip_Underwater1/header.s @@ -12,4 +12,3 @@ AbandonedShip_Underwater1:: @ 8307400 .2byte 0 .byte 1 .byte 0 - diff --git a/data/maps/AbandonedShip_Underwater2/header.s b/data/maps/AbandonedShip_Underwater2/header.s index f71a72aca..366653971 100644 --- a/data/maps/AbandonedShip_Underwater2/header.s +++ b/data/maps/AbandonedShip_Underwater2/header.s @@ -12,4 +12,3 @@ AbandonedShip_Underwater2:: @ 8307470 .2byte 0 .byte 1 .byte 0 - diff --git a/data/maps/AncientTomb/header.s b/data/maps/AncientTomb/header.s index 97c7ae8a8..98755054c 100644 --- a/data/maps/AncientTomb/header.s +++ b/data/maps/AncientTomb/header.s @@ -12,4 +12,3 @@ AncientTomb:: @ 83074E0 .2byte 0 .byte 1 .byte 0 - diff --git a/data/maps/AquaHideout_1F/header.s b/data/maps/AquaHideout_1F/header.s index 6f4e01a4d..e76caf1f4 100644 --- a/data/maps/AquaHideout_1F/header.s +++ b/data/maps/AquaHideout_1F/header.s @@ -12,4 +12,3 @@ AquaHideout_1F:: @ 8306FF4 .2byte 0 .byte 1 .byte 3 - diff --git a/data/maps/AquaHideout_B1F/header.s b/data/maps/AquaHideout_B1F/header.s index 5979c9b51..366d49129 100644 --- a/data/maps/AquaHideout_B1F/header.s +++ b/data/maps/AquaHideout_B1F/header.s @@ -12,4 +12,3 @@ AquaHideout_B1F:: @ 8307010 .2byte 0 .byte 1 .byte 3 - diff --git a/data/maps/AquaHideout_B2F/header.s b/data/maps/AquaHideout_B2F/header.s index bf6b2d8ea..df72c7e0e 100644 --- a/data/maps/AquaHideout_B2F/header.s +++ b/data/maps/AquaHideout_B2F/header.s @@ -12,4 +12,3 @@ AquaHideout_B2F:: @ 830702C .2byte 0 .byte 1 .byte 3 - diff --git a/data/maps/BattleTower_BattleRoom/header.s b/data/maps/BattleTower_BattleRoom/header.s index 62dc56a2c..21af266fd 100644 --- a/data/maps/BattleTower_BattleRoom/header.s +++ b/data/maps/BattleTower_BattleRoom/header.s @@ -12,4 +12,3 @@ BattleTower_BattleRoom:: @ 8307C88 .2byte 0 .byte 0 .byte 8 - diff --git a/data/maps/BattleTower_Corridor/header.s b/data/maps/BattleTower_Corridor/header.s index 1254251d7..98419af12 100644 --- a/data/maps/BattleTower_Corridor/header.s +++ b/data/maps/BattleTower_Corridor/header.s @@ -12,4 +12,3 @@ BattleTower_Corridor:: @ 8307C6C .2byte 0 .byte 0 .byte 0 - diff --git a/data/maps/BattleTower_Elevator/header.s b/data/maps/BattleTower_Elevator/header.s index 2f1b809a5..aa5ef1703 100644 --- a/data/maps/BattleTower_Elevator/header.s +++ b/data/maps/BattleTower_Elevator/header.s @@ -12,4 +12,3 @@ BattleTower_Elevator:: @ 8307C50 .2byte 0 .byte 0 .byte 0 - diff --git a/data/maps/BattleTower_Lobby/header.s b/data/maps/BattleTower_Lobby/header.s index eb4ab476c..6a4963c95 100644 --- a/data/maps/BattleTower_Lobby/header.s +++ b/data/maps/BattleTower_Lobby/header.s @@ -12,4 +12,3 @@ BattleTower_Lobby:: @ 8307C34 .2byte 0 .byte 0 .byte 0 - diff --git a/data/maps/BattleTower_Outside/header.s b/data/maps/BattleTower_Outside/header.s index ee7f2feec..d569b384a 100644 --- a/data/maps/BattleTower_Outside/header.s +++ b/data/maps/BattleTower_Outside/header.s @@ -12,4 +12,3 @@ BattleTower_Outside:: @ 8307C18 .2byte 0 .byte 1 .byte 0 - diff --git a/data/maps/CaveOfOrigin_1F/header.s b/data/maps/CaveOfOrigin_1F/header.s index c38b0948e..e19563cce 100644 --- a/data/maps/CaveOfOrigin_1F/header.s +++ b/data/maps/CaveOfOrigin_1F/header.s @@ -12,4 +12,3 @@ CaveOfOrigin_1F:: @ 8307198 .2byte 0 .byte 1 .byte 0 - diff --git a/data/maps/CaveOfOrigin_B1F/header.s b/data/maps/CaveOfOrigin_B1F/header.s index 1c6ba4ac7..d3b05c0fc 100644 --- a/data/maps/CaveOfOrigin_B1F/header.s +++ b/data/maps/CaveOfOrigin_B1F/header.s @@ -12,4 +12,3 @@ CaveOfOrigin_B1F:: @ 83071B4 .2byte 0 .byte 1 .byte 0 - diff --git a/data/maps/CaveOfOrigin_B2F/header.s b/data/maps/CaveOfOrigin_B2F/header.s index 79d236a0e..8ccf13e5c 100644 --- a/data/maps/CaveOfOrigin_B2F/header.s +++ b/data/maps/CaveOfOrigin_B2F/header.s @@ -12,4 +12,3 @@ CaveOfOrigin_B2F:: @ 83071D0 .2byte 0 .byte 1 .byte 0 - diff --git a/data/maps/CaveOfOrigin_B3F/header.s b/data/maps/CaveOfOrigin_B3F/header.s index b1284439c..1d76b682f 100644 --- a/data/maps/CaveOfOrigin_B3F/header.s +++ b/data/maps/CaveOfOrigin_B3F/header.s @@ -12,4 +12,3 @@ CaveOfOrigin_B3F:: @ 83071EC .2byte 0 .byte 1 .byte 0 - diff --git a/data/maps/CaveOfOrigin_B4F/header.s b/data/maps/CaveOfOrigin_B4F/header.s index a16f7f230..824954700 100644 --- a/data/maps/CaveOfOrigin_B4F/header.s +++ b/data/maps/CaveOfOrigin_B4F/header.s @@ -12,4 +12,3 @@ CaveOfOrigin_B4F:: @ 8307208 .2byte 0 .byte 1 .byte 0 - diff --git a/data/maps/CaveOfOrigin_Entrance/header.s b/data/maps/CaveOfOrigin_Entrance/header.s index 3aae1a042..88cb41ef5 100644 --- a/data/maps/CaveOfOrigin_Entrance/header.s +++ b/data/maps/CaveOfOrigin_Entrance/header.s @@ -12,4 +12,3 @@ CaveOfOrigin_Entrance:: @ 830717C .2byte 0 .byte 1 .byte 0 - diff --git a/data/maps/DesertRuins/header.s b/data/maps/DesertRuins/header.s index b9c665f95..f4c916820 100644 --- a/data/maps/DesertRuins/header.s +++ b/data/maps/DesertRuins/header.s @@ -12,4 +12,3 @@ DesertRuins:: @ 8306E18 .2byte 0 .byte 1 .byte 0 - diff --git a/data/maps/DewfordTown/connections.s b/data/maps/DewfordTown/connections.s index 68044f3b4..16ab11dc7 100644 --- a/data/maps/DewfordTown/connections.s +++ b/data/maps/DewfordTown/connections.s @@ -5,4 +5,3 @@ DewfordTown_MapConnectionsList:: @ 8308650 DewfordTown_MapConnections:: @ 8308668 .4byte 0x2 .4byte DewfordTown_MapConnectionsList - diff --git a/data/maps/DewfordTown/header.s b/data/maps/DewfordTown/header.s index 15493743c..5bb04f212 100644 --- a/data/maps/DewfordTown/header.s +++ b/data/maps/DewfordTown/header.s @@ -12,4 +12,3 @@ DewfordTown:: @ 830557C .2byte 0 .byte 1 .byte 0 - diff --git a/data/maps/DewfordTown_Gym/header.s b/data/maps/DewfordTown_Gym/header.s index 6a930f461..b581ed15a 100644 --- a/data/maps/DewfordTown_Gym/header.s +++ b/data/maps/DewfordTown_Gym/header.s @@ -12,4 +12,3 @@ DewfordTown_Gym:: @ 8305B9C .2byte 0 .byte 0 .byte 1 - diff --git a/data/maps/DewfordTown_Hall/header.s b/data/maps/DewfordTown_Hall/header.s index 8128a4e01..ce698589f 100644 --- a/data/maps/DewfordTown_Hall/header.s +++ b/data/maps/DewfordTown_Hall/header.s @@ -12,4 +12,3 @@ DewfordTown_Hall:: @ 8305BB8 .2byte 0 .byte 0 .byte 0 - diff --git a/data/maps/DewfordTown_House1/header.s b/data/maps/DewfordTown_House1/header.s index 0e0797571..509836b57 100644 --- a/data/maps/DewfordTown_House1/header.s +++ b/data/maps/DewfordTown_House1/header.s @@ -12,4 +12,3 @@ DewfordTown_House1:: @ 8305B48 .2byte 0 .byte 0 .byte 0 - diff --git a/data/maps/DewfordTown_House2/header.s b/data/maps/DewfordTown_House2/header.s index 5a18c98fd..3e789ff7e 100644 --- a/data/maps/DewfordTown_House2/header.s +++ b/data/maps/DewfordTown_House2/header.s @@ -12,4 +12,3 @@ DewfordTown_House2:: @ 8305BD4 .2byte 0 .byte 0 .byte 0 - diff --git a/data/maps/DewfordTown_PokemonCenter_1F/header.s b/data/maps/DewfordTown_PokemonCenter_1F/header.s index 79685a203..c88288f28 100644 --- a/data/maps/DewfordTown_PokemonCenter_1F/header.s +++ b/data/maps/DewfordTown_PokemonCenter_1F/header.s @@ -12,4 +12,3 @@ DewfordTown_PokemonCenter_1F:: @ 8305B64 .2byte 0 .byte 0 .byte 0 - diff --git a/data/maps/DewfordTown_PokemonCenter_2F/header.s b/data/maps/DewfordTown_PokemonCenter_2F/header.s index a4849e0b9..8e6f846fc 100644 --- a/data/maps/DewfordTown_PokemonCenter_2F/header.s +++ b/data/maps/DewfordTown_PokemonCenter_2F/header.s @@ -12,4 +12,3 @@ DewfordTown_PokemonCenter_2F:: @ 8305B80 .2byte 0 .byte 0 .byte 0 - diff --git a/data/maps/DoubleBattleColosseum/header.s b/data/maps/DoubleBattleColosseum/header.s index 8b34c1419..8a2db2709 100644 --- a/data/maps/DoubleBattleColosseum/header.s +++ b/data/maps/DoubleBattleColosseum/header.s @@ -12,4 +12,3 @@ DoubleBattleColosseum:: @ 83079CC .2byte 0 .byte 0 .byte 8 - diff --git a/data/maps/EverGrandeCity/connections.s b/data/maps/EverGrandeCity/connections.s index 538a910a8..bab4d0291 100644 --- a/data/maps/EverGrandeCity/connections.s +++ b/data/maps/EverGrandeCity/connections.s @@ -4,4 +4,3 @@ EverGrandeCity_MapConnectionsList:: @ 8308808 EverGrandeCity_MapConnections:: @ 8308814 .4byte 0x1 .4byte EverGrandeCity_MapConnectionsList - diff --git a/data/maps/EverGrandeCity/header.s b/data/maps/EverGrandeCity/header.s index da6f2d8e4..13eee4188 100644 --- a/data/maps/EverGrandeCity/header.s +++ b/data/maps/EverGrandeCity/header.s @@ -12,4 +12,3 @@ EverGrandeCity:: @ 8305528 .2byte 0 .byte 1 .byte 0 - diff --git a/data/maps/EverGrandeCity_ChampionsRoom/header.s b/data/maps/EverGrandeCity_ChampionsRoom/header.s index 1acd3ddce..1953c6a69 100644 --- a/data/maps/EverGrandeCity_ChampionsRoom/header.s +++ b/data/maps/EverGrandeCity_ChampionsRoom/header.s @@ -12,4 +12,3 @@ EverGrandeCity_ChampionsRoom:: @ 8306B08 .2byte 0 .byte 0 .byte 0 - diff --git a/data/maps/EverGrandeCity_Corridor1/header.s b/data/maps/EverGrandeCity_Corridor1/header.s index b765c17f1..37ee202bf 100644 --- a/data/maps/EverGrandeCity_Corridor1/header.s +++ b/data/maps/EverGrandeCity_Corridor1/header.s @@ -12,4 +12,3 @@ EverGrandeCity_Corridor1:: @ 8306B24 .2byte 0 .byte 0 .byte 0 - diff --git a/data/maps/EverGrandeCity_Corridor2/header.s b/data/maps/EverGrandeCity_Corridor2/header.s index d5cf8d773..efb2d7c83 100644 --- a/data/maps/EverGrandeCity_Corridor2/header.s +++ b/data/maps/EverGrandeCity_Corridor2/header.s @@ -12,4 +12,3 @@ EverGrandeCity_Corridor2:: @ 8306B40 .2byte 0 .byte 0 .byte 0 - diff --git a/data/maps/EverGrandeCity_Corridor3/header.s b/data/maps/EverGrandeCity_Corridor3/header.s index 8c51e8ec8..e53702275 100644 --- a/data/maps/EverGrandeCity_Corridor3/header.s +++ b/data/maps/EverGrandeCity_Corridor3/header.s @@ -12,4 +12,3 @@ EverGrandeCity_Corridor3:: @ 8306B5C .2byte 0 .byte 0 .byte 0 - diff --git a/data/maps/EverGrandeCity_Corridor4/header.s b/data/maps/EverGrandeCity_Corridor4/header.s index 43bec825d..cccaaeeb7 100644 --- a/data/maps/EverGrandeCity_Corridor4/header.s +++ b/data/maps/EverGrandeCity_Corridor4/header.s @@ -12,4 +12,3 @@ EverGrandeCity_Corridor4:: @ 8306B78 .2byte 0 .byte 0 .byte 0 - diff --git a/data/maps/EverGrandeCity_Corridor5/header.s b/data/maps/EverGrandeCity_Corridor5/header.s index 70881a526..0bdc7f61f 100644 --- a/data/maps/EverGrandeCity_Corridor5/header.s +++ b/data/maps/EverGrandeCity_Corridor5/header.s @@ -12,4 +12,3 @@ EverGrandeCity_Corridor5:: @ 8306B94 .2byte 0 .byte 0 .byte 0 - diff --git a/data/maps/EverGrandeCity_DrakesRoom/header.s b/data/maps/EverGrandeCity_DrakesRoom/header.s index a73b38430..7305222e9 100644 --- a/data/maps/EverGrandeCity_DrakesRoom/header.s +++ b/data/maps/EverGrandeCity_DrakesRoom/header.s @@ -12,4 +12,3 @@ EverGrandeCity_DrakesRoom:: @ 8306AEC .2byte 0 .byte 0 .byte 7 - diff --git a/data/maps/EverGrandeCity_GlaciasRoom/header.s b/data/maps/EverGrandeCity_GlaciasRoom/header.s index 2cbba4f16..7bcda408a 100644 --- a/data/maps/EverGrandeCity_GlaciasRoom/header.s +++ b/data/maps/EverGrandeCity_GlaciasRoom/header.s @@ -12,4 +12,3 @@ EverGrandeCity_GlaciasRoom:: @ 8306AD0 .2byte 0 .byte 0 .byte 6 - diff --git a/data/maps/EverGrandeCity_HallOfFame/header.s b/data/maps/EverGrandeCity_HallOfFame/header.s index 8cebf0ebe..1574fde12 100644 --- a/data/maps/EverGrandeCity_HallOfFame/header.s +++ b/data/maps/EverGrandeCity_HallOfFame/header.s @@ -12,4 +12,3 @@ EverGrandeCity_HallOfFame:: @ 8306BCC .2byte 0 .byte 0 .byte 0 - diff --git a/data/maps/EverGrandeCity_PhoebesRoom/header.s b/data/maps/EverGrandeCity_PhoebesRoom/header.s index e30513083..f97ab8f17 100644 --- a/data/maps/EverGrandeCity_PhoebesRoom/header.s +++ b/data/maps/EverGrandeCity_PhoebesRoom/header.s @@ -12,4 +12,3 @@ EverGrandeCity_PhoebesRoom:: @ 8306AB4 .2byte 0 .byte 0 .byte 5 - diff --git a/data/maps/EverGrandeCity_PokemonCenter_1F/header.s b/data/maps/EverGrandeCity_PokemonCenter_1F/header.s index fbd71fa4d..4cb93f7ec 100644 --- a/data/maps/EverGrandeCity_PokemonCenter_1F/header.s +++ b/data/maps/EverGrandeCity_PokemonCenter_1F/header.s @@ -12,4 +12,3 @@ EverGrandeCity_PokemonCenter_1F:: @ 8306BE8 .2byte 0 .byte 0 .byte 0 - diff --git a/data/maps/EverGrandeCity_PokemonCenter_2F/header.s b/data/maps/EverGrandeCity_PokemonCenter_2F/header.s index e27fc152c..01e0f8eff 100644 --- a/data/maps/EverGrandeCity_PokemonCenter_2F/header.s +++ b/data/maps/EverGrandeCity_PokemonCenter_2F/header.s @@ -12,4 +12,3 @@ EverGrandeCity_PokemonCenter_2F:: @ 8306C04 .2byte 0 .byte 0 .byte 0 - diff --git a/data/maps/EverGrandeCity_PokemonLeague/header.s b/data/maps/EverGrandeCity_PokemonLeague/header.s index fa685d20d..fd521dcb9 100644 --- a/data/maps/EverGrandeCity_PokemonLeague/header.s +++ b/data/maps/EverGrandeCity_PokemonLeague/header.s @@ -12,4 +12,3 @@ EverGrandeCity_PokemonLeague:: @ 8306BB0 .2byte 0 .byte 0 .byte 0 - diff --git a/data/maps/EverGrandeCity_SidneysRoom/header.s b/data/maps/EverGrandeCity_SidneysRoom/header.s index 508ff9984..1ac25f1e5 100644 --- a/data/maps/EverGrandeCity_SidneysRoom/header.s +++ b/data/maps/EverGrandeCity_SidneysRoom/header.s @@ -12,4 +12,3 @@ EverGrandeCity_SidneysRoom:: @ 8306A98 .2byte 0 .byte 0 .byte 4 - diff --git a/data/maps/FallarborTown/connections.s b/data/maps/FallarborTown/connections.s index 3c2c3ef20..b47858951 100644 --- a/data/maps/FallarborTown/connections.s +++ b/data/maps/FallarborTown/connections.s @@ -5,4 +5,3 @@ FallarborTown_MapConnectionsList:: @ 8308684 FallarborTown_MapConnections:: @ 830869C .4byte 0x2 .4byte FallarborTown_MapConnectionsList - diff --git a/data/maps/FallarborTown/header.s b/data/maps/FallarborTown/header.s index 7c447a1f8..952a7a5f2 100644 --- a/data/maps/FallarborTown/header.s +++ b/data/maps/FallarborTown/header.s @@ -12,4 +12,3 @@ FallarborTown:: @ 83055B4 .2byte 0 .byte 1 .byte 0 - diff --git a/data/maps/FallarborTown_ContestHall/header.s b/data/maps/FallarborTown_ContestHall/header.s index 7df9309a3..cb3367ba8 100644 --- a/data/maps/FallarborTown_ContestHall/header.s +++ b/data/maps/FallarborTown_ContestHall/header.s @@ -12,4 +12,3 @@ FallarborTown_ContestHall:: @ 8305CEC .2byte 0 .byte 0 .byte 0 - diff --git a/data/maps/FallarborTown_ContestLobby/header.s b/data/maps/FallarborTown_ContestLobby/header.s index bafc53026..be4a98950 100644 --- a/data/maps/FallarborTown_ContestLobby/header.s +++ b/data/maps/FallarborTown_ContestLobby/header.s @@ -12,4 +12,3 @@ FallarborTown_ContestLobby:: @ 8305CD0 .2byte 0 .byte 0 .byte 0 - diff --git a/data/maps/FallarborTown_House1/header.s b/data/maps/FallarborTown_House1/header.s index 7f947fa01..33dcfbe20 100644 --- a/data/maps/FallarborTown_House1/header.s +++ b/data/maps/FallarborTown_House1/header.s @@ -12,4 +12,3 @@ FallarborTown_House1:: @ 8305D40 .2byte 0 .byte 0 .byte 0 - diff --git a/data/maps/FallarborTown_House2/header.s b/data/maps/FallarborTown_House2/header.s index fd490c482..6e4a8276f 100644 --- a/data/maps/FallarborTown_House2/header.s +++ b/data/maps/FallarborTown_House2/header.s @@ -12,4 +12,3 @@ FallarborTown_House2:: @ 8305D5C .2byte 0 .byte 0 .byte 0 - diff --git a/data/maps/FallarborTown_Mart/header.s b/data/maps/FallarborTown_Mart/header.s index 6e6f49d1d..817bc23b0 100644 --- a/data/maps/FallarborTown_Mart/header.s +++ b/data/maps/FallarborTown_Mart/header.s @@ -12,4 +12,3 @@ FallarborTown_Mart:: @ 8305CB4 .2byte 0 .byte 0 .byte 0 - diff --git a/data/maps/FallarborTown_PokemonCenter_1F/header.s b/data/maps/FallarborTown_PokemonCenter_1F/header.s index a7e4e23f6..62d11d1c1 100644 --- a/data/maps/FallarborTown_PokemonCenter_1F/header.s +++ b/data/maps/FallarborTown_PokemonCenter_1F/header.s @@ -12,4 +12,3 @@ FallarborTown_PokemonCenter_1F:: @ 8305D08 .2byte 0 .byte 0 .byte 0 - diff --git a/data/maps/FallarborTown_PokemonCenter_2F/header.s b/data/maps/FallarborTown_PokemonCenter_2F/header.s index c168bf378..f82b32047 100644 --- a/data/maps/FallarborTown_PokemonCenter_2F/header.s +++ b/data/maps/FallarborTown_PokemonCenter_2F/header.s @@ -12,4 +12,3 @@ FallarborTown_PokemonCenter_2F:: @ 8305D24 .2byte 0 .byte 0 .byte 0 - diff --git a/data/maps/FieryPath/header.s b/data/maps/FieryPath/header.s index 95ec9f2e1..d515bb062 100644 --- a/data/maps/FieryPath/header.s +++ b/data/maps/FieryPath/header.s @@ -12,4 +12,3 @@ FieryPath:: @ 8306EF8 .2byte 0 .byte 1 .byte 0 - diff --git a/data/maps/FortreeCity/connections.s b/data/maps/FortreeCity/connections.s index bdd6f068e..12bf6cea7 100644 --- a/data/maps/FortreeCity/connections.s +++ b/data/maps/FortreeCity/connections.s @@ -5,4 +5,3 @@ FortreeCity_MapConnectionsList:: @ 8308794 FortreeCity_MapConnections:: @ 83087AC .4byte 0x2 .4byte FortreeCity_MapConnectionsList - diff --git a/data/maps/FortreeCity/header.s b/data/maps/FortreeCity/header.s index 2cf17c277..ccc81ae72 100644 --- a/data/maps/FortreeCity/header.s +++ b/data/maps/FortreeCity/header.s @@ -12,4 +12,3 @@ FortreeCity:: @ 83054B8 .2byte 0 .byte 1 .byte 0 - diff --git a/data/maps/FortreeCity_DecorationShop/header.s b/data/maps/FortreeCity_DecorationShop/header.s index be7e2af10..f2f8c058a 100644 --- a/data/maps/FortreeCity_DecorationShop/header.s +++ b/data/maps/FortreeCity_DecorationShop/header.s @@ -12,4 +12,3 @@ FortreeCity_DecorationShop:: @ 8306504 .2byte 0 .byte 0 .byte 0 - diff --git a/data/maps/FortreeCity_Gym/header.s b/data/maps/FortreeCity_Gym/header.s index 447839649..d0c1f5008 100644 --- a/data/maps/FortreeCity_Gym/header.s +++ b/data/maps/FortreeCity_Gym/header.s @@ -12,4 +12,3 @@ FortreeCity_Gym:: @ 8306424 .2byte 0 .byte 0 .byte 1 - diff --git a/data/maps/FortreeCity_House1/header.s b/data/maps/FortreeCity_House1/header.s index 74cd1d8d8..dff1bc7ec 100644 --- a/data/maps/FortreeCity_House1/header.s +++ b/data/maps/FortreeCity_House1/header.s @@ -12,4 +12,3 @@ FortreeCity_House1:: @ 8306408 .2byte 0 .byte 0 .byte 0 - diff --git a/data/maps/FortreeCity_House2/header.s b/data/maps/FortreeCity_House2/header.s index 9e612538c..255d6ae67 100644 --- a/data/maps/FortreeCity_House2/header.s +++ b/data/maps/FortreeCity_House2/header.s @@ -12,4 +12,3 @@ FortreeCity_House2:: @ 8306494 .2byte 0 .byte 0 .byte 0 - diff --git a/data/maps/FortreeCity_House3/header.s b/data/maps/FortreeCity_House3/header.s index 55899e69f..c88ef57ce 100644 --- a/data/maps/FortreeCity_House3/header.s +++ b/data/maps/FortreeCity_House3/header.s @@ -12,4 +12,3 @@ FortreeCity_House3:: @ 83064B0 .2byte 0 .byte 0 .byte 0 - diff --git a/data/maps/FortreeCity_House4/header.s b/data/maps/FortreeCity_House4/header.s index ae10fe254..fabd74e80 100644 --- a/data/maps/FortreeCity_House4/header.s +++ b/data/maps/FortreeCity_House4/header.s @@ -12,4 +12,3 @@ FortreeCity_House4:: @ 83064CC .2byte 0 .byte 0 .byte 0 - diff --git a/data/maps/FortreeCity_House5/header.s b/data/maps/FortreeCity_House5/header.s index de05c63c1..80368a28e 100644 --- a/data/maps/FortreeCity_House5/header.s +++ b/data/maps/FortreeCity_House5/header.s @@ -12,4 +12,3 @@ FortreeCity_House5:: @ 83064E8 .2byte 0 .byte 0 .byte 0 - diff --git a/data/maps/FortreeCity_Mart/header.s b/data/maps/FortreeCity_Mart/header.s index c256f26fa..2664b2489 100644 --- a/data/maps/FortreeCity_Mart/header.s +++ b/data/maps/FortreeCity_Mart/header.s @@ -12,4 +12,3 @@ FortreeCity_Mart:: @ 8306478 .2byte 0 .byte 0 .byte 0 - diff --git a/data/maps/FortreeCity_PokemonCenter_1F/header.s b/data/maps/FortreeCity_PokemonCenter_1F/header.s index 8a854db7e..0e1f89a65 100644 --- a/data/maps/FortreeCity_PokemonCenter_1F/header.s +++ b/data/maps/FortreeCity_PokemonCenter_1F/header.s @@ -12,4 +12,3 @@ FortreeCity_PokemonCenter_1F:: @ 8306440 .2byte 0 .byte 0 .byte 0 - diff --git a/data/maps/FortreeCity_PokemonCenter_2F/header.s b/data/maps/FortreeCity_PokemonCenter_2F/header.s index ff8f755be..798502754 100644 --- a/data/maps/FortreeCity_PokemonCenter_2F/header.s +++ b/data/maps/FortreeCity_PokemonCenter_2F/header.s @@ -12,4 +12,3 @@ FortreeCity_PokemonCenter_2F:: @ 830645C .2byte 0 .byte 0 .byte 0 - diff --git a/data/maps/GraniteCave_1F/header.s b/data/maps/GraniteCave_1F/header.s index cc5d9d7be..e4a362d11 100644 --- a/data/maps/GraniteCave_1F/header.s +++ b/data/maps/GraniteCave_1F/header.s @@ -12,4 +12,3 @@ GraniteCave_1F:: @ 8306E34 .2byte 0 .byte 1 .byte 0 - diff --git a/data/maps/GraniteCave_B1F/header.s b/data/maps/GraniteCave_B1F/header.s index 36796c3d7..3cc5dcf1e 100644 --- a/data/maps/GraniteCave_B1F/header.s +++ b/data/maps/GraniteCave_B1F/header.s @@ -12,4 +12,3 @@ GraniteCave_B1F:: @ 8306E50 .2byte 0 .byte 1 .byte 0 - diff --git a/data/maps/GraniteCave_B2F/header.s b/data/maps/GraniteCave_B2F/header.s index d2607c74d..bed072720 100644 --- a/data/maps/GraniteCave_B2F/header.s +++ b/data/maps/GraniteCave_B2F/header.s @@ -12,4 +12,3 @@ GraniteCave_B2F:: @ 8306E6C .2byte 0 .byte 1 .byte 0 - diff --git a/data/maps/GraniteCave_StevensRoom/header.s b/data/maps/GraniteCave_StevensRoom/header.s index a01baa172..52c40b121 100644 --- a/data/maps/GraniteCave_StevensRoom/header.s +++ b/data/maps/GraniteCave_StevensRoom/header.s @@ -12,4 +12,3 @@ GraniteCave_StevensRoom:: @ 8306E88 .2byte 0 .byte 1 .byte 0 - diff --git a/data/maps/InsideOfTruck/header.s b/data/maps/InsideOfTruck/header.s index 357b0d869..2f1ee1fc4 100644 --- a/data/maps/InsideOfTruck/header.s +++ b/data/maps/InsideOfTruck/header.s @@ -12,4 +12,3 @@ InsideOfTruck:: @ 8307B38 .2byte 0 .byte 0 .byte 0 - diff --git a/data/maps/IslandCave/header.s b/data/maps/IslandCave/header.s index 571442946..f60b76813 100644 --- a/data/maps/IslandCave/header.s +++ b/data/maps/IslandCave/header.s @@ -12,4 +12,3 @@ IslandCave:: @ 83074C4 .2byte 0 .byte 1 .byte 0 - diff --git a/data/maps/JaggedPass/header.s b/data/maps/JaggedPass/header.s index a1104305a..3f0fbc61f 100644 --- a/data/maps/JaggedPass/header.s +++ b/data/maps/JaggedPass/header.s @@ -12,4 +12,3 @@ JaggedPass:: @ 8306EDC .2byte 0 .byte 1 .byte 0 - diff --git a/data/maps/LavaridgeTown/connections.s b/data/maps/LavaridgeTown/connections.s index d54669994..2d9d66ec5 100644 --- a/data/maps/LavaridgeTown/connections.s +++ b/data/maps/LavaridgeTown/connections.s @@ -4,4 +4,3 @@ LavaridgeTown_MapConnectionsList:: @ 8308670 LavaridgeTown_MapConnections:: @ 830867C .4byte 0x1 .4byte LavaridgeTown_MapConnectionsList - diff --git a/data/maps/LavaridgeTown/header.s b/data/maps/LavaridgeTown/header.s index 478241605..fa9ba9ee7 100644 --- a/data/maps/LavaridgeTown/header.s +++ b/data/maps/LavaridgeTown/header.s @@ -12,4 +12,3 @@ LavaridgeTown:: @ 8305598 .2byte 0 .byte 1 .byte 0 - diff --git a/data/maps/LavaridgeTown_Gym_1F/header.s b/data/maps/LavaridgeTown_Gym_1F/header.s index 75540e29c..2051cd18d 100644 --- a/data/maps/LavaridgeTown_Gym_1F/header.s +++ b/data/maps/LavaridgeTown_Gym_1F/header.s @@ -12,4 +12,3 @@ LavaridgeTown_Gym_1F:: @ 8305C0C .2byte 0 .byte 0 .byte 1 - diff --git a/data/maps/LavaridgeTown_Gym_B1F/header.s b/data/maps/LavaridgeTown_Gym_B1F/header.s index 59d48f7ae..21fb9f56a 100644 --- a/data/maps/LavaridgeTown_Gym_B1F/header.s +++ b/data/maps/LavaridgeTown_Gym_B1F/header.s @@ -12,4 +12,3 @@ LavaridgeTown_Gym_B1F:: @ 8305C28 .2byte 0 .byte 0 .byte 1 - diff --git a/data/maps/LavaridgeTown_HerbShop/header.s b/data/maps/LavaridgeTown_HerbShop/header.s index 6272cc2f8..08a0c45ec 100644 --- a/data/maps/LavaridgeTown_HerbShop/header.s +++ b/data/maps/LavaridgeTown_HerbShop/header.s @@ -12,4 +12,3 @@ LavaridgeTown_HerbShop:: @ 8305BF0 .2byte 0 .byte 0 .byte 0 - diff --git a/data/maps/LavaridgeTown_House/header.s b/data/maps/LavaridgeTown_House/header.s index b8bf2725f..1973e43be 100644 --- a/data/maps/LavaridgeTown_House/header.s +++ b/data/maps/LavaridgeTown_House/header.s @@ -12,4 +12,3 @@ LavaridgeTown_House:: @ 8305C44 .2byte 0 .byte 0 .byte 0 - diff --git a/data/maps/LavaridgeTown_Mart/header.s b/data/maps/LavaridgeTown_Mart/header.s index a95261a76..8539aa534 100644 --- a/data/maps/LavaridgeTown_Mart/header.s +++ b/data/maps/LavaridgeTown_Mart/header.s @@ -12,4 +12,3 @@ LavaridgeTown_Mart:: @ 8305C60 .2byte 0 .byte 0 .byte 0 - diff --git a/data/maps/LavaridgeTown_PokemonCenter_1F/header.s b/data/maps/LavaridgeTown_PokemonCenter_1F/header.s index 0b4b2a46b..4d1a204dd 100644 --- a/data/maps/LavaridgeTown_PokemonCenter_1F/header.s +++ b/data/maps/LavaridgeTown_PokemonCenter_1F/header.s @@ -12,4 +12,3 @@ LavaridgeTown_PokemonCenter_1F:: @ 8305C7C .2byte 0 .byte 0 .byte 0 - diff --git a/data/maps/LavaridgeTown_PokemonCenter_2F/header.s b/data/maps/LavaridgeTown_PokemonCenter_2F/header.s index f717ba1f3..4de09efd1 100644 --- a/data/maps/LavaridgeTown_PokemonCenter_2F/header.s +++ b/data/maps/LavaridgeTown_PokemonCenter_2F/header.s @@ -12,4 +12,3 @@ LavaridgeTown_PokemonCenter_2F:: @ 8305C98 .2byte 0 .byte 0 .byte 0 - diff --git a/data/maps/LilycoveCity/connections.s b/data/maps/LilycoveCity/connections.s index 427cc98a6..ea9fb3442 100644 --- a/data/maps/LilycoveCity/connections.s +++ b/data/maps/LilycoveCity/connections.s @@ -5,4 +5,3 @@ LilycoveCity_MapConnectionsList:: @ 83087B4 LilycoveCity_MapConnections:: @ 83087CC .4byte 0x2 .4byte LilycoveCity_MapConnectionsList - diff --git a/data/maps/LilycoveCity/header.s b/data/maps/LilycoveCity/header.s index b4a9aa076..e364a422f 100644 --- a/data/maps/LilycoveCity/header.s +++ b/data/maps/LilycoveCity/header.s @@ -12,4 +12,3 @@ LilycoveCity:: @ 83054D4 .2byte 0 .byte 1 .byte 0 - diff --git a/data/maps/LilycoveCity_ContestHall/header.s b/data/maps/LilycoveCity_ContestHall/header.s index 2e1c85499..eaf143e2c 100644 --- a/data/maps/LilycoveCity_ContestHall/header.s +++ b/data/maps/LilycoveCity_ContestHall/header.s @@ -12,4 +12,3 @@ LilycoveCity_ContestHall:: @ 83065AC .2byte 0 .byte 0 .byte 0 - diff --git a/data/maps/LilycoveCity_ContestLobby/header.s b/data/maps/LilycoveCity_ContestLobby/header.s index 3d191a8a9..a9630d22e 100644 --- a/data/maps/LilycoveCity_ContestLobby/header.s +++ b/data/maps/LilycoveCity_ContestLobby/header.s @@ -12,4 +12,3 @@ LilycoveCity_ContestLobby:: @ 8306590 .2byte 0 .byte 0 .byte 0 - diff --git a/data/maps/LilycoveCity_CoveLilyMotel_1F/header.s b/data/maps/LilycoveCity_CoveLilyMotel_1F/header.s index eb9a12aab..1496cb162 100644 --- a/data/maps/LilycoveCity_CoveLilyMotel_1F/header.s +++ b/data/maps/LilycoveCity_CoveLilyMotel_1F/header.s @@ -12,4 +12,3 @@ LilycoveCity_CoveLilyMotel_1F:: @ 8306520 .2byte 0 .byte 0 .byte 0 - diff --git a/data/maps/LilycoveCity_CoveLilyMotel_2F/header.s b/data/maps/LilycoveCity_CoveLilyMotel_2F/header.s index f76f2e5a3..a136ffd06 100644 --- a/data/maps/LilycoveCity_CoveLilyMotel_2F/header.s +++ b/data/maps/LilycoveCity_CoveLilyMotel_2F/header.s @@ -12,4 +12,3 @@ LilycoveCity_CoveLilyMotel_2F:: @ 830653C .2byte 0 .byte 0 .byte 0 - diff --git a/data/maps/LilycoveCity_DepartmentStoreElevator/header.s b/data/maps/LilycoveCity_DepartmentStoreElevator/header.s index c71ca1926..8c3f029aa 100644 --- a/data/maps/LilycoveCity_DepartmentStoreElevator/header.s +++ b/data/maps/LilycoveCity_DepartmentStoreElevator/header.s @@ -12,4 +12,3 @@ LilycoveCity_DepartmentStoreElevator:: @ 83067A4 .2byte 0 .byte 0 .byte 0 - diff --git a/data/maps/LilycoveCity_DepartmentStoreRooftop/header.s b/data/maps/LilycoveCity_DepartmentStoreRooftop/header.s index 2fa2db369..3a55748b2 100644 --- a/data/maps/LilycoveCity_DepartmentStoreRooftop/header.s +++ b/data/maps/LilycoveCity_DepartmentStoreRooftop/header.s @@ -12,4 +12,3 @@ LilycoveCity_DepartmentStoreRooftop:: @ 8306788 .2byte 0 .byte 0 .byte 0 - diff --git a/data/maps/LilycoveCity_DepartmentStore_1F/header.s b/data/maps/LilycoveCity_DepartmentStore_1F/header.s index b60e12d91..2ee2bb677 100644 --- a/data/maps/LilycoveCity_DepartmentStore_1F/header.s +++ b/data/maps/LilycoveCity_DepartmentStore_1F/header.s @@ -12,4 +12,3 @@ LilycoveCity_DepartmentStore_1F:: @ 83066FC .2byte 0 .byte 0 .byte 0 - diff --git a/data/maps/LilycoveCity_DepartmentStore_2F/header.s b/data/maps/LilycoveCity_DepartmentStore_2F/header.s index 817af834a..ded2d806e 100644 --- a/data/maps/LilycoveCity_DepartmentStore_2F/header.s +++ b/data/maps/LilycoveCity_DepartmentStore_2F/header.s @@ -12,4 +12,3 @@ LilycoveCity_DepartmentStore_2F:: @ 8306718 .2byte 0 .byte 0 .byte 0 - diff --git a/data/maps/LilycoveCity_DepartmentStore_3F/header.s b/data/maps/LilycoveCity_DepartmentStore_3F/header.s index 088254e7a..3f9ad6257 100644 --- a/data/maps/LilycoveCity_DepartmentStore_3F/header.s +++ b/data/maps/LilycoveCity_DepartmentStore_3F/header.s @@ -12,4 +12,3 @@ LilycoveCity_DepartmentStore_3F:: @ 8306734 .2byte 0 .byte 0 .byte 0 - diff --git a/data/maps/LilycoveCity_DepartmentStore_4F/header.s b/data/maps/LilycoveCity_DepartmentStore_4F/header.s index 4cf4e2d11..65e02a8fd 100644 --- a/data/maps/LilycoveCity_DepartmentStore_4F/header.s +++ b/data/maps/LilycoveCity_DepartmentStore_4F/header.s @@ -12,4 +12,3 @@ LilycoveCity_DepartmentStore_4F:: @ 8306750 .2byte 0 .byte 0 .byte 0 - diff --git a/data/maps/LilycoveCity_DepartmentStore_5F/header.s b/data/maps/LilycoveCity_DepartmentStore_5F/header.s index 207d30369..fefdcb37b 100644 --- a/data/maps/LilycoveCity_DepartmentStore_5F/header.s +++ b/data/maps/LilycoveCity_DepartmentStore_5F/header.s @@ -12,4 +12,3 @@ LilycoveCity_DepartmentStore_5F:: @ 830676C .2byte 0 .byte 0 .byte 0 - diff --git a/data/maps/LilycoveCity_EmptyMap/header.s b/data/maps/LilycoveCity_EmptyMap/header.s index 4da5d01e9..f9fe3959d 100644 --- a/data/maps/LilycoveCity_EmptyMap/header.s +++ b/data/maps/LilycoveCity_EmptyMap/header.s @@ -12,4 +12,3 @@ LilycoveCity_EmptyMap:: @ 8306654 .2byte 0 .byte 0 .byte 0 - diff --git a/data/maps/LilycoveCity_Harbor/header.s b/data/maps/LilycoveCity_Harbor/header.s index cff946095..bac55f148 100644 --- a/data/maps/LilycoveCity_Harbor/header.s +++ b/data/maps/LilycoveCity_Harbor/header.s @@ -12,4 +12,3 @@ LilycoveCity_Harbor:: @ 8306638 .2byte 0 .byte 0 .byte 0 - diff --git a/data/maps/LilycoveCity_House1/header.s b/data/maps/LilycoveCity_House1/header.s index dd24c5902..47ca2617b 100644 --- a/data/maps/LilycoveCity_House1/header.s +++ b/data/maps/LilycoveCity_House1/header.s @@ -12,4 +12,3 @@ LilycoveCity_House1:: @ 830668C .2byte 0 .byte 0 .byte 0 - diff --git a/data/maps/LilycoveCity_House2/header.s b/data/maps/LilycoveCity_House2/header.s index 7a710e7cc..735a2375c 100644 --- a/data/maps/LilycoveCity_House2/header.s +++ b/data/maps/LilycoveCity_House2/header.s @@ -12,4 +12,3 @@ LilycoveCity_House2:: @ 83066A8 .2byte 0 .byte 0 .byte 0 - diff --git a/data/maps/LilycoveCity_House3/header.s b/data/maps/LilycoveCity_House3/header.s index d2bba39d2..63cd45911 100644 --- a/data/maps/LilycoveCity_House3/header.s +++ b/data/maps/LilycoveCity_House3/header.s @@ -12,4 +12,3 @@ LilycoveCity_House3:: @ 83066C4 .2byte 0 .byte 0 .byte 0 - diff --git a/data/maps/LilycoveCity_House4/header.s b/data/maps/LilycoveCity_House4/header.s index 32dc22b4e..6137fcc46 100644 --- a/data/maps/LilycoveCity_House4/header.s +++ b/data/maps/LilycoveCity_House4/header.s @@ -12,4 +12,3 @@ LilycoveCity_House4:: @ 83066E0 .2byte 0 .byte 0 .byte 0 - diff --git a/data/maps/LilycoveCity_LilycoveMuseum_1F/header.s b/data/maps/LilycoveCity_LilycoveMuseum_1F/header.s index 88586f5d2..45a6c3531 100644 --- a/data/maps/LilycoveCity_LilycoveMuseum_1F/header.s +++ b/data/maps/LilycoveCity_LilycoveMuseum_1F/header.s @@ -12,4 +12,3 @@ LilycoveCity_LilycoveMuseum_1F:: @ 8306558 .2byte 0 .byte 0 .byte 0 - diff --git a/data/maps/LilycoveCity_LilycoveMuseum_2F/header.s b/data/maps/LilycoveCity_LilycoveMuseum_2F/header.s index ecaf07df5..84ff93244 100644 --- a/data/maps/LilycoveCity_LilycoveMuseum_2F/header.s +++ b/data/maps/LilycoveCity_LilycoveMuseum_2F/header.s @@ -12,4 +12,3 @@ LilycoveCity_LilycoveMuseum_2F:: @ 8306574 .2byte 0 .byte 0 .byte 0 - diff --git a/data/maps/LilycoveCity_MoveDeletersHouse/header.s b/data/maps/LilycoveCity_MoveDeletersHouse/header.s index 749e90a72..338921b0c 100644 --- a/data/maps/LilycoveCity_MoveDeletersHouse/header.s +++ b/data/maps/LilycoveCity_MoveDeletersHouse/header.s @@ -12,4 +12,3 @@ LilycoveCity_MoveDeletersHouse:: @ 8306670 .2byte 0 .byte 0 .byte 0 - diff --git a/data/maps/LilycoveCity_PokemonCenter_1F/header.s b/data/maps/LilycoveCity_PokemonCenter_1F/header.s index 47fd186b2..21e5e11c9 100644 --- a/data/maps/LilycoveCity_PokemonCenter_1F/header.s +++ b/data/maps/LilycoveCity_PokemonCenter_1F/header.s @@ -12,4 +12,3 @@ LilycoveCity_PokemonCenter_1F:: @ 83065C8 .2byte 0 .byte 0 .byte 0 - diff --git a/data/maps/LilycoveCity_PokemonCenter_2F/header.s b/data/maps/LilycoveCity_PokemonCenter_2F/header.s index a30735e68..3dda04d36 100644 --- a/data/maps/LilycoveCity_PokemonCenter_2F/header.s +++ b/data/maps/LilycoveCity_PokemonCenter_2F/header.s @@ -12,4 +12,3 @@ LilycoveCity_PokemonCenter_2F:: @ 83065E4 .2byte 0 .byte 0 .byte 0 - diff --git a/data/maps/LilycoveCity_PokemonTrainerFanClub/header.s b/data/maps/LilycoveCity_PokemonTrainerFanClub/header.s index f67e967f1..deffd48d5 100644 --- a/data/maps/LilycoveCity_PokemonTrainerFanClub/header.s +++ b/data/maps/LilycoveCity_PokemonTrainerFanClub/header.s @@ -12,4 +12,3 @@ LilycoveCity_PokemonTrainerFanClub:: @ 830661C .2byte 0 .byte 0 .byte 0 - diff --git a/data/maps/LilycoveCity_UnusedMart/header.s b/data/maps/LilycoveCity_UnusedMart/header.s index 8fa55998c..8b22ea2a7 100644 --- a/data/maps/LilycoveCity_UnusedMart/header.s +++ b/data/maps/LilycoveCity_UnusedMart/header.s @@ -12,4 +12,3 @@ LilycoveCity_UnusedMart:: @ 8306600 .2byte 0 .byte 0 .byte 0 - diff --git a/data/maps/LinkContestRoom1/header.s b/data/maps/LinkContestRoom1/header.s index 67d8697e9..67d4b0994 100644 --- a/data/maps/LinkContestRoom1/header.s +++ b/data/maps/LinkContestRoom1/header.s @@ -12,4 +12,3 @@ LinkContestRoom1:: @ 83079E8 .2byte 0 .byte 0 .byte 0 - diff --git a/data/maps/LinkContestRoom2/header.s b/data/maps/LinkContestRoom2/header.s index 96f0388c0..a2a5831b1 100644 --- a/data/maps/LinkContestRoom2/header.s +++ b/data/maps/LinkContestRoom2/header.s @@ -12,4 +12,3 @@ LinkContestRoom2:: @ 8307AAC .2byte 0 .byte 0 .byte 0 - diff --git a/data/maps/LinkContestRoom3/header.s b/data/maps/LinkContestRoom3/header.s index 3643b39cb..156212502 100644 --- a/data/maps/LinkContestRoom3/header.s +++ b/data/maps/LinkContestRoom3/header.s @@ -12,4 +12,3 @@ LinkContestRoom3:: @ 8307AC8 .2byte 0 .byte 0 .byte 0 - diff --git a/data/maps/LinkContestRoom4/header.s b/data/maps/LinkContestRoom4/header.s index a656ab463..a931c7a6f 100644 --- a/data/maps/LinkContestRoom4/header.s +++ b/data/maps/LinkContestRoom4/header.s @@ -12,4 +12,3 @@ LinkContestRoom4:: @ 8307AE4 .2byte 0 .byte 0 .byte 0 - diff --git a/data/maps/LinkContestRoom5/header.s b/data/maps/LinkContestRoom5/header.s index 229b7b522..33e4b99e3 100644 --- a/data/maps/LinkContestRoom5/header.s +++ b/data/maps/LinkContestRoom5/header.s @@ -12,4 +12,3 @@ LinkContestRoom5:: @ 8307B00 .2byte 0 .byte 0 .byte 0 - diff --git a/data/maps/LinkContestRoom6/header.s b/data/maps/LinkContestRoom6/header.s index d3706c3c8..8aa8d5a7b 100644 --- a/data/maps/LinkContestRoom6/header.s +++ b/data/maps/LinkContestRoom6/header.s @@ -12,4 +12,3 @@ LinkContestRoom6:: @ 8307B1C .2byte 0 .byte 0 .byte 0 - diff --git a/data/maps/LittlerootTown/connections.s b/data/maps/LittlerootTown/connections.s index d0afc49bc..771124841 100644 --- a/data/maps/LittlerootTown/connections.s +++ b/data/maps/LittlerootTown/connections.s @@ -4,4 +4,3 @@ LittlerootTown_MapConnectionsList:: @ 8308610 LittlerootTown_MapConnections:: @ 830861C .4byte 0x1 .4byte LittlerootTown_MapConnectionsList - diff --git a/data/maps/LittlerootTown/header.s b/data/maps/LittlerootTown/header.s index 2b39145fc..dc70e474f 100644 --- a/data/maps/LittlerootTown/header.s +++ b/data/maps/LittlerootTown/header.s @@ -12,4 +12,3 @@ LittlerootTown:: @ 8305544 .2byte 0 .byte 1 .byte 0 - diff --git a/data/maps/LittlerootTown_BrendansHouse_1F/header.s b/data/maps/LittlerootTown_BrendansHouse_1F/header.s index 86d8440ad..553257c28 100644 --- a/data/maps/LittlerootTown_BrendansHouse_1F/header.s +++ b/data/maps/LittlerootTown_BrendansHouse_1F/header.s @@ -12,4 +12,3 @@ LittlerootTown_BrendansHouse_1F:: @ 8305A30 .2byte 0 .byte 0 .byte 0 - diff --git a/data/maps/LittlerootTown_BrendansHouse_2F/header.s b/data/maps/LittlerootTown_BrendansHouse_2F/header.s index 910d126c5..4c195fa1d 100644 --- a/data/maps/LittlerootTown_BrendansHouse_2F/header.s +++ b/data/maps/LittlerootTown_BrendansHouse_2F/header.s @@ -12,4 +12,3 @@ LittlerootTown_BrendansHouse_2F:: @ 8305A4C .2byte 0 .byte 0 .byte 0 - diff --git a/data/maps/LittlerootTown_MaysHouse_1F/header.s b/data/maps/LittlerootTown_MaysHouse_1F/header.s index 8105a0ba7..d89c99680 100644 --- a/data/maps/LittlerootTown_MaysHouse_1F/header.s +++ b/data/maps/LittlerootTown_MaysHouse_1F/header.s @@ -12,4 +12,3 @@ LittlerootTown_MaysHouse_1F:: @ 8305A68 .2byte 0 .byte 0 .byte 0 - diff --git a/data/maps/LittlerootTown_MaysHouse_2F/header.s b/data/maps/LittlerootTown_MaysHouse_2F/header.s index 0788bfc2e..6b2e72b77 100644 --- a/data/maps/LittlerootTown_MaysHouse_2F/header.s +++ b/data/maps/LittlerootTown_MaysHouse_2F/header.s @@ -12,4 +12,3 @@ LittlerootTown_MaysHouse_2F:: @ 8305A84 .2byte 0 .byte 0 .byte 0 - diff --git a/data/maps/LittlerootTown_ProfessorBirchsLab/header.s b/data/maps/LittlerootTown_ProfessorBirchsLab/header.s index c8e61bee7..669f3cdd2 100644 --- a/data/maps/LittlerootTown_ProfessorBirchsLab/header.s +++ b/data/maps/LittlerootTown_ProfessorBirchsLab/header.s @@ -12,4 +12,3 @@ LittlerootTown_ProfessorBirchsLab:: @ 8305AA0 .2byte 0 .byte 0 .byte 0 - diff --git a/data/maps/MagmaHideout_1F/header.s b/data/maps/MagmaHideout_1F/header.s index 38e543419..dd057a802 100644 --- a/data/maps/MagmaHideout_1F/header.s +++ b/data/maps/MagmaHideout_1F/header.s @@ -12,4 +12,3 @@ MagmaHideout_1F:: @ 8307588 .2byte 0 .byte 1 .byte 2 - diff --git a/data/maps/MagmaHideout_B1F/header.s b/data/maps/MagmaHideout_B1F/header.s index 20a62c8c8..1a61acd3b 100644 --- a/data/maps/MagmaHideout_B1F/header.s +++ b/data/maps/MagmaHideout_B1F/header.s @@ -12,4 +12,3 @@ MagmaHideout_B1F:: @ 83075A4 .2byte 0 .byte 1 .byte 2 - diff --git a/data/maps/MagmaHideout_B2F/header.s b/data/maps/MagmaHideout_B2F/header.s index 7cfd192dd..9e7ec2583 100644 --- a/data/maps/MagmaHideout_B2F/header.s +++ b/data/maps/MagmaHideout_B2F/header.s @@ -12,4 +12,3 @@ MagmaHideout_B2F:: @ 83075C0 .2byte 0 .byte 1 .byte 2 - diff --git a/data/maps/MauvilleCity/connections.s b/data/maps/MauvilleCity/connections.s index e71bc6d94..bea442a62 100644 --- a/data/maps/MauvilleCity/connections.s +++ b/data/maps/MauvilleCity/connections.s @@ -7,4 +7,3 @@ MauvilleCity_MapConnectionsList:: @ 8308730 MauvilleCity_MapConnections:: @ 8308760 .4byte 0x4 .4byte MauvilleCity_MapConnectionsList - diff --git a/data/maps/MauvilleCity/header.s b/data/maps/MauvilleCity/header.s index 0053e7ae4..350fb891d 100644 --- a/data/maps/MauvilleCity/header.s +++ b/data/maps/MauvilleCity/header.s @@ -12,4 +12,3 @@ MauvilleCity:: @ 8305480 .2byte 0 .byte 1 .byte 0 - diff --git a/data/maps/MauvilleCity_BikeShop/header.s b/data/maps/MauvilleCity_BikeShop/header.s index c0b88535c..89577e200 100644 --- a/data/maps/MauvilleCity_BikeShop/header.s +++ b/data/maps/MauvilleCity_BikeShop/header.s @@ -12,4 +12,3 @@ MauvilleCity_BikeShop:: @ 8306168 .2byte 0 .byte 0 .byte 0 - diff --git a/data/maps/MauvilleCity_GameCorner/header.s b/data/maps/MauvilleCity_GameCorner/header.s index 016e47e46..052b32314 100644 --- a/data/maps/MauvilleCity_GameCorner/header.s +++ b/data/maps/MauvilleCity_GameCorner/header.s @@ -12,4 +12,3 @@ MauvilleCity_GameCorner:: @ 83061A0 .2byte 0 .byte 0 .byte 0 - diff --git a/data/maps/MauvilleCity_Gym/header.s b/data/maps/MauvilleCity_Gym/header.s index addd97988..572978efc 100644 --- a/data/maps/MauvilleCity_Gym/header.s +++ b/data/maps/MauvilleCity_Gym/header.s @@ -12,4 +12,3 @@ MauvilleCity_Gym:: @ 830614C .2byte 0 .byte 0 .byte 1 - diff --git a/data/maps/MauvilleCity_House1/header.s b/data/maps/MauvilleCity_House1/header.s index ed2d2ba7e..2191d7996 100644 --- a/data/maps/MauvilleCity_House1/header.s +++ b/data/maps/MauvilleCity_House1/header.s @@ -12,4 +12,3 @@ MauvilleCity_House1:: @ 8306184 .2byte 0 .byte 0 .byte 0 - diff --git a/data/maps/MauvilleCity_House2/header.s b/data/maps/MauvilleCity_House2/header.s index 2b89cee19..ff6ea8f07 100644 --- a/data/maps/MauvilleCity_House2/header.s +++ b/data/maps/MauvilleCity_House2/header.s @@ -12,4 +12,3 @@ MauvilleCity_House2:: @ 83061BC .2byte 0 .byte 0 .byte 0 - diff --git a/data/maps/MauvilleCity_Mart/header.s b/data/maps/MauvilleCity_Mart/header.s index 1a412241e..9c0406e58 100644 --- a/data/maps/MauvilleCity_Mart/header.s +++ b/data/maps/MauvilleCity_Mart/header.s @@ -12,4 +12,3 @@ MauvilleCity_Mart:: @ 8306210 .2byte 0 .byte 0 .byte 0 - diff --git a/data/maps/MauvilleCity_PokemonCenter_1F/header.s b/data/maps/MauvilleCity_PokemonCenter_1F/header.s index ae3f11efd..05e5da891 100644 --- a/data/maps/MauvilleCity_PokemonCenter_1F/header.s +++ b/data/maps/MauvilleCity_PokemonCenter_1F/header.s @@ -12,4 +12,3 @@ MauvilleCity_PokemonCenter_1F:: @ 83061D8 .2byte 0 .byte 0 .byte 0 - diff --git a/data/maps/MauvilleCity_PokemonCenter_2F/header.s b/data/maps/MauvilleCity_PokemonCenter_2F/header.s index 6b192ed69..f54b76b56 100644 --- a/data/maps/MauvilleCity_PokemonCenter_2F/header.s +++ b/data/maps/MauvilleCity_PokemonCenter_2F/header.s @@ -12,4 +12,3 @@ MauvilleCity_PokemonCenter_2F:: @ 83061F4 .2byte 0 .byte 0 .byte 0 - diff --git a/data/maps/MeteorFalls_1F_1R/header.s b/data/maps/MeteorFalls_1F_1R/header.s index b1a0fc3aa..4ce27a74a 100644 --- a/data/maps/MeteorFalls_1F_1R/header.s +++ b/data/maps/MeteorFalls_1F_1R/header.s @@ -12,4 +12,3 @@ MeteorFalls_1F_1R:: @ 8306D70 .2byte 0 .byte 1 .byte 0 - diff --git a/data/maps/MeteorFalls_1F_2R/header.s b/data/maps/MeteorFalls_1F_2R/header.s index 060889f3b..96c97d12b 100644 --- a/data/maps/MeteorFalls_1F_2R/header.s +++ b/data/maps/MeteorFalls_1F_2R/header.s @@ -12,4 +12,3 @@ MeteorFalls_1F_2R:: @ 8306D8C .2byte 0 .byte 1 .byte 0 - diff --git a/data/maps/MeteorFalls_B1F_1R/header.s b/data/maps/MeteorFalls_B1F_1R/header.s index 1e83a15fb..75c28b630 100644 --- a/data/maps/MeteorFalls_B1F_1R/header.s +++ b/data/maps/MeteorFalls_B1F_1R/header.s @@ -12,4 +12,3 @@ MeteorFalls_B1F_1R:: @ 8306DA8 .2byte 0 .byte 1 .byte 0 - diff --git a/data/maps/MeteorFalls_B1F_2R/header.s b/data/maps/MeteorFalls_B1F_2R/header.s index 366a988ad..f375cbfe5 100644 --- a/data/maps/MeteorFalls_B1F_2R/header.s +++ b/data/maps/MeteorFalls_B1F_2R/header.s @@ -12,4 +12,3 @@ MeteorFalls_B1F_2R:: @ 8306DC4 .2byte 0 .byte 1 .byte 0 - diff --git a/data/maps/MossdeepCity/header.s b/data/maps/MossdeepCity/header.s index bd22da8f1..cc71e408d 100644 --- a/data/maps/MossdeepCity/header.s +++ b/data/maps/MossdeepCity/header.s @@ -12,4 +12,3 @@ MossdeepCity:: @ 83054F0 .2byte 0 .byte 1 .byte 0 - diff --git a/data/maps/MossdeepCity_GameCorner_1F/header.s b/data/maps/MossdeepCity_GameCorner_1F/header.s index ae519cbfc..6b8940fd2 100644 --- a/data/maps/MossdeepCity_GameCorner_1F/header.s +++ b/data/maps/MossdeepCity_GameCorner_1F/header.s @@ -12,4 +12,3 @@ MossdeepCity_GameCorner_1F:: @ 83068F4 .2byte 0 .byte 0 .byte 0 - diff --git a/data/maps/MossdeepCity_GameCorner_B1F/header.s b/data/maps/MossdeepCity_GameCorner_B1F/header.s index 04f65e51f..56b1c9a99 100644 --- a/data/maps/MossdeepCity_GameCorner_B1F/header.s +++ b/data/maps/MossdeepCity_GameCorner_B1F/header.s @@ -12,4 +12,3 @@ MossdeepCity_GameCorner_B1F:: @ 8306910 .2byte 0 .byte 0 .byte 0 - diff --git a/data/maps/MossdeepCity_Gym/header.s b/data/maps/MossdeepCity_Gym/header.s index 5028ace1c..b83acfa0b 100644 --- a/data/maps/MossdeepCity_Gym/header.s +++ b/data/maps/MossdeepCity_Gym/header.s @@ -12,4 +12,3 @@ MossdeepCity_Gym:: @ 83067C0 .2byte 0 .byte 0 .byte 1 - diff --git a/data/maps/MossdeepCity_House1/header.s b/data/maps/MossdeepCity_House1/header.s index 0ea5853d9..8ecdc33cc 100644 --- a/data/maps/MossdeepCity_House1/header.s +++ b/data/maps/MossdeepCity_House1/header.s @@ -12,4 +12,3 @@ MossdeepCity_House1:: @ 83067DC .2byte 0 .byte 0 .byte 0 - diff --git a/data/maps/MossdeepCity_House2/header.s b/data/maps/MossdeepCity_House2/header.s index 66a6e57d8..9e3716b94 100644 --- a/data/maps/MossdeepCity_House2/header.s +++ b/data/maps/MossdeepCity_House2/header.s @@ -12,4 +12,3 @@ MossdeepCity_House2:: @ 83067F8 .2byte 0 .byte 0 .byte 0 - diff --git a/data/maps/MossdeepCity_House3/header.s b/data/maps/MossdeepCity_House3/header.s index c6cc3ccf8..ff2c5a853 100644 --- a/data/maps/MossdeepCity_House3/header.s +++ b/data/maps/MossdeepCity_House3/header.s @@ -12,4 +12,3 @@ MossdeepCity_House3:: @ 8306868 .2byte 0 .byte 0 .byte 0 - diff --git a/data/maps/MossdeepCity_House4/header.s b/data/maps/MossdeepCity_House4/header.s index 14f4b7a53..66027ac4a 100644 --- a/data/maps/MossdeepCity_House4/header.s +++ b/data/maps/MossdeepCity_House4/header.s @@ -12,4 +12,3 @@ MossdeepCity_House4:: @ 83068A0 .2byte 0 .byte 0 .byte 0 - diff --git a/data/maps/MossdeepCity_Mart/header.s b/data/maps/MossdeepCity_Mart/header.s index d7097b352..398c52086 100644 --- a/data/maps/MossdeepCity_Mart/header.s +++ b/data/maps/MossdeepCity_Mart/header.s @@ -12,4 +12,3 @@ MossdeepCity_Mart:: @ 830684C .2byte 0 .byte 0 .byte 0 - diff --git a/data/maps/MossdeepCity_PokemonCenter_1F/header.s b/data/maps/MossdeepCity_PokemonCenter_1F/header.s index 5a7fa318b..636a03755 100644 --- a/data/maps/MossdeepCity_PokemonCenter_1F/header.s +++ b/data/maps/MossdeepCity_PokemonCenter_1F/header.s @@ -12,4 +12,3 @@ MossdeepCity_PokemonCenter_1F:: @ 8306814 .2byte 0 .byte 0 .byte 0 - diff --git a/data/maps/MossdeepCity_PokemonCenter_2F/header.s b/data/maps/MossdeepCity_PokemonCenter_2F/header.s index 8ac7f129a..47e859aac 100644 --- a/data/maps/MossdeepCity_PokemonCenter_2F/header.s +++ b/data/maps/MossdeepCity_PokemonCenter_2F/header.s @@ -12,4 +12,3 @@ MossdeepCity_PokemonCenter_2F:: @ 8306830 .2byte 0 .byte 0 .byte 0 - diff --git a/data/maps/MossdeepCity_SpaceCenter_1F/header.s b/data/maps/MossdeepCity_SpaceCenter_1F/header.s index f3f02f3fa..699741a45 100644 --- a/data/maps/MossdeepCity_SpaceCenter_1F/header.s +++ b/data/maps/MossdeepCity_SpaceCenter_1F/header.s @@ -12,4 +12,3 @@ MossdeepCity_SpaceCenter_1F:: @ 83068BC .2byte 0 .byte 0 .byte 0 - diff --git a/data/maps/MossdeepCity_SpaceCenter_2F/header.s b/data/maps/MossdeepCity_SpaceCenter_2F/header.s index 18646043d..824b8cc66 100644 --- a/data/maps/MossdeepCity_SpaceCenter_2F/header.s +++ b/data/maps/MossdeepCity_SpaceCenter_2F/header.s @@ -12,4 +12,3 @@ MossdeepCity_SpaceCenter_2F:: @ 83068D8 .2byte 0 .byte 0 .byte 0 - diff --git a/data/maps/MossdeepCity_StevensHouse/header.s b/data/maps/MossdeepCity_StevensHouse/header.s index 381c8f0c8..25892ad50 100644 --- a/data/maps/MossdeepCity_StevensHouse/header.s +++ b/data/maps/MossdeepCity_StevensHouse/header.s @@ -12,4 +12,3 @@ MossdeepCity_StevensHouse:: @ 8306884 .2byte 0 .byte 0 .byte 0 - diff --git a/data/maps/MtChimney/header.s b/data/maps/MtChimney/header.s index b80cbef95..597b1cf35 100644 --- a/data/maps/MtChimney/header.s +++ b/data/maps/MtChimney/header.s @@ -12,4 +12,3 @@ MtChimney:: @ 8306EC0 .2byte 0 .byte 1 .byte 0 - diff --git a/data/maps/MtChimney_CableCarStation/header.s b/data/maps/MtChimney_CableCarStation/header.s index 339430b73..f76c321cf 100644 --- a/data/maps/MtChimney_CableCarStation/header.s +++ b/data/maps/MtChimney_CableCarStation/header.s @@ -12,4 +12,3 @@ MtChimney_CableCarStation:: @ 8306CAC .2byte 0 .byte 0 .byte 0 - diff --git a/data/maps/MtPyre_1F/header.s b/data/maps/MtPyre_1F/header.s index 62678857c..52c690299 100644 --- a/data/maps/MtPyre_1F/header.s +++ b/data/maps/MtPyre_1F/header.s @@ -12,4 +12,3 @@ MtPyre_1F:: @ 8306F14 .2byte 0 .byte 1 .byte 0 - diff --git a/data/maps/MtPyre_2F/header.s b/data/maps/MtPyre_2F/header.s index c7ff3a070..757c8e2ac 100644 --- a/data/maps/MtPyre_2F/header.s +++ b/data/maps/MtPyre_2F/header.s @@ -12,4 +12,3 @@ MtPyre_2F:: @ 8306F30 .2byte 0 .byte 1 .byte 0 - diff --git a/data/maps/MtPyre_3F/header.s b/data/maps/MtPyre_3F/header.s index 8675269ff..2bb599ea5 100644 --- a/data/maps/MtPyre_3F/header.s +++ b/data/maps/MtPyre_3F/header.s @@ -12,4 +12,3 @@ MtPyre_3F:: @ 8306F4C .2byte 0 .byte 1 .byte 0 - diff --git a/data/maps/MtPyre_4F/header.s b/data/maps/MtPyre_4F/header.s index 0b2d38a46..b20121e25 100644 --- a/data/maps/MtPyre_4F/header.s +++ b/data/maps/MtPyre_4F/header.s @@ -12,4 +12,3 @@ MtPyre_4F:: @ 8306F68 .2byte 0 .byte 1 .byte 0 - diff --git a/data/maps/MtPyre_5F/header.s b/data/maps/MtPyre_5F/header.s index fffc9cc3d..dcd1f1e64 100644 --- a/data/maps/MtPyre_5F/header.s +++ b/data/maps/MtPyre_5F/header.s @@ -12,4 +12,3 @@ MtPyre_5F:: @ 8306F84 .2byte 0 .byte 1 .byte 0 - diff --git a/data/maps/MtPyre_6F/header.s b/data/maps/MtPyre_6F/header.s index 2c5978436..5ce5e1c3d 100644 --- a/data/maps/MtPyre_6F/header.s +++ b/data/maps/MtPyre_6F/header.s @@ -12,4 +12,3 @@ MtPyre_6F:: @ 8306FA0 .2byte 0 .byte 1 .byte 0 - diff --git a/data/maps/MtPyre_Exterior/header.s b/data/maps/MtPyre_Exterior/header.s index 3915e37f3..28575a62e 100644 --- a/data/maps/MtPyre_Exterior/header.s +++ b/data/maps/MtPyre_Exterior/header.s @@ -12,4 +12,3 @@ MtPyre_Exterior:: @ 8306FBC .2byte 0 .byte 1 .byte 0 - diff --git a/data/maps/MtPyre_Summit/header.s b/data/maps/MtPyre_Summit/header.s index 1016bb131..494656218 100644 --- a/data/maps/MtPyre_Summit/header.s +++ b/data/maps/MtPyre_Summit/header.s @@ -12,4 +12,3 @@ MtPyre_Summit:: @ 8306FD8 .2byte 0 .byte 1 .byte 0 - diff --git a/data/maps/NewMauville_Entrance/header.s b/data/maps/NewMauville_Entrance/header.s index a324ca2f9..f66bf901c 100644 --- a/data/maps/NewMauville_Entrance/header.s +++ b/data/maps/NewMauville_Entrance/header.s @@ -12,4 +12,3 @@ NewMauville_Entrance:: @ 8307320 .2byte 0 .byte 1 .byte 0 - diff --git a/data/maps/NewMauville_Inside/header.s b/data/maps/NewMauville_Inside/header.s index ccf0d4bc7..b528160b0 100644 --- a/data/maps/NewMauville_Inside/header.s +++ b/data/maps/NewMauville_Inside/header.s @@ -12,4 +12,3 @@ NewMauville_Inside:: @ 830733C .2byte 0 .byte 1 .byte 0 - diff --git a/data/maps/OldaleTown/connections.s b/data/maps/OldaleTown/connections.s index 755c20543..4515e33c3 100644 --- a/data/maps/OldaleTown/connections.s +++ b/data/maps/OldaleTown/connections.s @@ -6,4 +6,3 @@ OldaleTown_MapConnectionsList:: @ 8308624 OldaleTown_MapConnections:: @ 8308648 .4byte 0x3 .4byte OldaleTown_MapConnectionsList - diff --git a/data/maps/OldaleTown/header.s b/data/maps/OldaleTown/header.s index 334dc56dd..2b6333203 100644 --- a/data/maps/OldaleTown/header.s +++ b/data/maps/OldaleTown/header.s @@ -12,4 +12,3 @@ OldaleTown:: @ 8305560 .2byte 0 .byte 1 .byte 0 - diff --git a/data/maps/OldaleTown_House1/header.s b/data/maps/OldaleTown_House1/header.s index f5d370d01..5bff7d359 100644 --- a/data/maps/OldaleTown_House1/header.s +++ b/data/maps/OldaleTown_House1/header.s @@ -12,4 +12,3 @@ OldaleTown_House1:: @ 8305ABC .2byte 0 .byte 0 .byte 0 - diff --git a/data/maps/OldaleTown_House2/header.s b/data/maps/OldaleTown_House2/header.s index 8676d967d..0d92fc00b 100644 --- a/data/maps/OldaleTown_House2/header.s +++ b/data/maps/OldaleTown_House2/header.s @@ -12,4 +12,3 @@ OldaleTown_House2:: @ 8305AD8 .2byte 0 .byte 0 .byte 0 - diff --git a/data/maps/OldaleTown_Mart/header.s b/data/maps/OldaleTown_Mart/header.s index b8b6a7685..a8336dabd 100644 --- a/data/maps/OldaleTown_Mart/header.s +++ b/data/maps/OldaleTown_Mart/header.s @@ -12,4 +12,3 @@ OldaleTown_Mart:: @ 8305B2C .2byte 0 .byte 0 .byte 0 - diff --git a/data/maps/OldaleTown_PokemonCenter_1F/header.s b/data/maps/OldaleTown_PokemonCenter_1F/header.s index e112c3f22..c3cedf311 100644 --- a/data/maps/OldaleTown_PokemonCenter_1F/header.s +++ b/data/maps/OldaleTown_PokemonCenter_1F/header.s @@ -12,4 +12,3 @@ OldaleTown_PokemonCenter_1F:: @ 8305AF4 .2byte 0 .byte 0 .byte 0 - diff --git a/data/maps/OldaleTown_PokemonCenter_2F/header.s b/data/maps/OldaleTown_PokemonCenter_2F/header.s index b0a13038b..0448334f9 100644 --- a/data/maps/OldaleTown_PokemonCenter_2F/header.s +++ b/data/maps/OldaleTown_PokemonCenter_2F/header.s @@ -12,4 +12,3 @@ OldaleTown_PokemonCenter_2F:: @ 8305B10 .2byte 0 .byte 0 .byte 0 - diff --git a/data/maps/PacifidlogTown/connections.s b/data/maps/PacifidlogTown/connections.s index d0d2deb68..aff24c57a 100644 --- a/data/maps/PacifidlogTown/connections.s +++ b/data/maps/PacifidlogTown/connections.s @@ -5,4 +5,3 @@ PacifidlogTown_MapConnectionsList:: @ 83086C4 PacifidlogTown_MapConnections:: @ 83086DC .4byte 0x2 .4byte PacifidlogTown_MapConnectionsList - diff --git a/data/maps/PacifidlogTown/header.s b/data/maps/PacifidlogTown/header.s index 562fdcf5a..574ea3a68 100644 --- a/data/maps/PacifidlogTown/header.s +++ b/data/maps/PacifidlogTown/header.s @@ -12,4 +12,3 @@ PacifidlogTown:: @ 83055EC .2byte 0 .byte 1 .byte 0 - diff --git a/data/maps/PacifidlogTown_House1/header.s b/data/maps/PacifidlogTown_House1/header.s index 8ba2ddbb1..b80e3786b 100644 --- a/data/maps/PacifidlogTown_House1/header.s +++ b/data/maps/PacifidlogTown_House1/header.s @@ -12,4 +12,3 @@ PacifidlogTown_House1:: @ 8305E90 .2byte 0 .byte 0 .byte 0 - diff --git a/data/maps/PacifidlogTown_House2/header.s b/data/maps/PacifidlogTown_House2/header.s index ad383155d..9c3a409df 100644 --- a/data/maps/PacifidlogTown_House2/header.s +++ b/data/maps/PacifidlogTown_House2/header.s @@ -12,4 +12,3 @@ PacifidlogTown_House2:: @ 8305EAC .2byte 0 .byte 0 .byte 0 - diff --git a/data/maps/PacifidlogTown_House3/header.s b/data/maps/PacifidlogTown_House3/header.s index 3751a2a7d..1b0f9ac16 100644 --- a/data/maps/PacifidlogTown_House3/header.s +++ b/data/maps/PacifidlogTown_House3/header.s @@ -12,4 +12,3 @@ PacifidlogTown_House3:: @ 8305EC8 .2byte 0 .byte 0 .byte 0 - diff --git a/data/maps/PacifidlogTown_House4/header.s b/data/maps/PacifidlogTown_House4/header.s index 3a3740880..af0f1f64d 100644 --- a/data/maps/PacifidlogTown_House4/header.s +++ b/data/maps/PacifidlogTown_House4/header.s @@ -12,4 +12,3 @@ PacifidlogTown_House4:: @ 8305EE4 .2byte 0 .byte 0 .byte 0 - diff --git a/data/maps/PacifidlogTown_House5/header.s b/data/maps/PacifidlogTown_House5/header.s index db94eff6f..9006d5670 100644 --- a/data/maps/PacifidlogTown_House5/header.s +++ b/data/maps/PacifidlogTown_House5/header.s @@ -12,4 +12,3 @@ PacifidlogTown_House5:: @ 8305F00 .2byte 0 .byte 0 .byte 0 - diff --git a/data/maps/PacifidlogTown_PokemonCenter_1F/header.s b/data/maps/PacifidlogTown_PokemonCenter_1F/header.s index 141e95a10..63d71c2e2 100644 --- a/data/maps/PacifidlogTown_PokemonCenter_1F/header.s +++ b/data/maps/PacifidlogTown_PokemonCenter_1F/header.s @@ -12,4 +12,3 @@ PacifidlogTown_PokemonCenter_1F:: @ 8305E58 .2byte 0 .byte 0 .byte 0 - diff --git a/data/maps/PacifidlogTown_PokemonCenter_2F/header.s b/data/maps/PacifidlogTown_PokemonCenter_2F/header.s index 6f26cec35..0477b5f07 100644 --- a/data/maps/PacifidlogTown_PokemonCenter_2F/header.s +++ b/data/maps/PacifidlogTown_PokemonCenter_2F/header.s @@ -12,4 +12,3 @@ PacifidlogTown_PokemonCenter_2F:: @ 8305E74 .2byte 0 .byte 0 .byte 0 - diff --git a/data/maps/PetalburgCity/connections.s b/data/maps/PetalburgCity/connections.s index d4b725f2e..e74872a8f 100644 --- a/data/maps/PetalburgCity/connections.s +++ b/data/maps/PetalburgCity/connections.s @@ -5,4 +5,3 @@ PetalburgCity_MapConnectionsList:: @ 83086E4 PetalburgCity_MapConnections:: @ 83086FC .4byte 0x2 .4byte PetalburgCity_MapConnectionsList - diff --git a/data/maps/PetalburgCity/header.s b/data/maps/PetalburgCity/header.s index dbe89a607..c78bc59d6 100644 --- a/data/maps/PetalburgCity/header.s +++ b/data/maps/PetalburgCity/header.s @@ -12,4 +12,3 @@ PetalburgCity:: @ 8305448 .2byte 0 .byte 1 .byte 0 - diff --git a/data/maps/PetalburgCity_Gym/header.s b/data/maps/PetalburgCity_Gym/header.s index e48e5f57e..49832d900 100644 --- a/data/maps/PetalburgCity_Gym/header.s +++ b/data/maps/PetalburgCity_Gym/header.s @@ -12,4 +12,3 @@ PetalburgCity_Gym:: @ 8305F38 .2byte 0 .byte 0 .byte 1 - diff --git a/data/maps/PetalburgCity_House1/header.s b/data/maps/PetalburgCity_House1/header.s index 5139f7773..bf22508c8 100644 --- a/data/maps/PetalburgCity_House1/header.s +++ b/data/maps/PetalburgCity_House1/header.s @@ -12,4 +12,3 @@ PetalburgCity_House1:: @ 8305F54 .2byte 0 .byte 0 .byte 0 - diff --git a/data/maps/PetalburgCity_House2/header.s b/data/maps/PetalburgCity_House2/header.s index 01dcbff0c..ce18dd50d 100644 --- a/data/maps/PetalburgCity_House2/header.s +++ b/data/maps/PetalburgCity_House2/header.s @@ -12,4 +12,3 @@ PetalburgCity_House2:: @ 8305F70 .2byte 0 .byte 0 .byte 0 - diff --git a/data/maps/PetalburgCity_Mart/header.s b/data/maps/PetalburgCity_Mart/header.s index bda37818a..764c22f44 100644 --- a/data/maps/PetalburgCity_Mart/header.s +++ b/data/maps/PetalburgCity_Mart/header.s @@ -12,4 +12,3 @@ PetalburgCity_Mart:: @ 8305FC4 .2byte 0 .byte 0 .byte 0 - diff --git a/data/maps/PetalburgCity_PokemonCenter_1F/header.s b/data/maps/PetalburgCity_PokemonCenter_1F/header.s index 019057eb8..364158d8f 100644 --- a/data/maps/PetalburgCity_PokemonCenter_1F/header.s +++ b/data/maps/PetalburgCity_PokemonCenter_1F/header.s @@ -12,4 +12,3 @@ PetalburgCity_PokemonCenter_1F:: @ 8305F8C .2byte 0 .byte 0 .byte 0 - diff --git a/data/maps/PetalburgCity_PokemonCenter_2F/header.s b/data/maps/PetalburgCity_PokemonCenter_2F/header.s index cd1879ee6..f394640ce 100644 --- a/data/maps/PetalburgCity_PokemonCenter_2F/header.s +++ b/data/maps/PetalburgCity_PokemonCenter_2F/header.s @@ -12,4 +12,3 @@ PetalburgCity_PokemonCenter_2F:: @ 8305FA8 .2byte 0 .byte 0 .byte 0 - diff --git a/data/maps/PetalburgCity_WallysHouse/header.s b/data/maps/PetalburgCity_WallysHouse/header.s index 5619eecf6..6485ab1dd 100644 --- a/data/maps/PetalburgCity_WallysHouse/header.s +++ b/data/maps/PetalburgCity_WallysHouse/header.s @@ -12,4 +12,3 @@ PetalburgCity_WallysHouse:: @ 8305F1C .2byte 0 .byte 0 .byte 0 - diff --git a/data/maps/PetalburgWoods/header.s b/data/maps/PetalburgWoods/header.s index 5e47bd649..3dab3bdaa 100644 --- a/data/maps/PetalburgWoods/header.s +++ b/data/maps/PetalburgWoods/header.s @@ -12,4 +12,3 @@ PetalburgWoods:: @ 8306EA4 .2byte 0 .byte 1 .byte 0 - diff --git a/data/maps/RecordCorner/header.s b/data/maps/RecordCorner/header.s index c9296e1d3..f550cdbff 100644 --- a/data/maps/RecordCorner/header.s +++ b/data/maps/RecordCorner/header.s @@ -12,4 +12,3 @@ RecordCorner:: @ 83079B0 .2byte 0 .byte 0 .byte 0 - diff --git a/data/maps/Route101/connections.s b/data/maps/Route101/connections.s index 62f170762..48c904606 100644 --- a/data/maps/Route101/connections.s +++ b/data/maps/Route101/connections.s @@ -5,4 +5,3 @@ Route101_MapConnectionsList:: @ 830881C Route101_MapConnections:: @ 8308834 .4byte 0x2 .4byte Route101_MapConnectionsList - diff --git a/data/maps/Route101/header.s b/data/maps/Route101/header.s index b866083e4..1f74ee386 100644 --- a/data/maps/Route101/header.s +++ b/data/maps/Route101/header.s @@ -12,4 +12,3 @@ Route101:: @ 8305608 .2byte 0 .byte 1 .byte 0 - diff --git a/data/maps/Route102/connections.s b/data/maps/Route102/connections.s index a19220ac6..e09a253d0 100644 --- a/data/maps/Route102/connections.s +++ b/data/maps/Route102/connections.s @@ -5,4 +5,3 @@ Route102_MapConnectionsList:: @ 830883C Route102_MapConnections:: @ 8308854 .4byte 0x2 .4byte Route102_MapConnectionsList - diff --git a/data/maps/Route102/header.s b/data/maps/Route102/header.s index 4083cbf79..0686d9b67 100644 --- a/data/maps/Route102/header.s +++ b/data/maps/Route102/header.s @@ -12,4 +12,3 @@ Route102:: @ 8305624 .2byte 0 .byte 1 .byte 0 - diff --git a/data/maps/Route103/connections.s b/data/maps/Route103/connections.s index 90117e3df..5fd4660d1 100644 --- a/data/maps/Route103/connections.s +++ b/data/maps/Route103/connections.s @@ -5,4 +5,3 @@ Route103_MapConnectionsList:: @ 830885C Route103_MapConnections:: @ 8308874 .4byte 0x2 .4byte Route103_MapConnectionsList - diff --git a/data/maps/Route103/header.s b/data/maps/Route103/header.s index 2e5425184..aa9392261 100644 --- a/data/maps/Route103/header.s +++ b/data/maps/Route103/header.s @@ -12,4 +12,3 @@ Route103:: @ 8305640 .2byte 0 .byte 1 .byte 0 - diff --git a/data/maps/Route104/connections.s b/data/maps/Route104/connections.s index c394dfe0e..61cf71a8a 100644 --- a/data/maps/Route104/connections.s +++ b/data/maps/Route104/connections.s @@ -6,4 +6,3 @@ Route104_MapConnectionsList:: @ 830887C Route104_MapConnections:: @ 83088A0 .4byte 0x3 .4byte Route104_MapConnectionsList - diff --git a/data/maps/Route104/header.s b/data/maps/Route104/header.s index 22e965902..9e7908531 100644 --- a/data/maps/Route104/header.s +++ b/data/maps/Route104/header.s @@ -12,4 +12,3 @@ Route104:: @ 830565C .2byte 0 .byte 1 .byte 0 - diff --git a/data/maps/Route104_MrBrineysHouse/header.s b/data/maps/Route104_MrBrineysHouse/header.s index eb0ec5221..50914f60e 100644 --- a/data/maps/Route104_MrBrineysHouse/header.s +++ b/data/maps/Route104_MrBrineysHouse/header.s @@ -12,4 +12,3 @@ Route104_MrBrineysHouse:: @ 8306C20 .2byte 0 .byte 0 .byte 0 - diff --git a/data/maps/Route104_PrettyPetalFlowerShop/header.s b/data/maps/Route104_PrettyPetalFlowerShop/header.s index a0f60a52b..c4bdcb6a6 100644 --- a/data/maps/Route104_PrettyPetalFlowerShop/header.s +++ b/data/maps/Route104_PrettyPetalFlowerShop/header.s @@ -12,4 +12,3 @@ Route104_PrettyPetalFlowerShop:: @ 8306C3C .2byte 0 .byte 0 .byte 0 - diff --git a/data/maps/Route104_Prototype/header.s b/data/maps/Route104_Prototype/header.s index 9278842ae..1d3768712 100644 --- a/data/maps/Route104_Prototype/header.s +++ b/data/maps/Route104_Prototype/header.s @@ -12,4 +12,3 @@ Route104_Prototype:: @ 8307CF8 .2byte 0 .byte 1 .byte 0 - diff --git a/data/maps/Route104_PrototypePrettyPetalFlowerShop/header.s b/data/maps/Route104_PrototypePrettyPetalFlowerShop/header.s index a303e2568..4e98f97dd 100644 --- a/data/maps/Route104_PrototypePrettyPetalFlowerShop/header.s +++ b/data/maps/Route104_PrototypePrettyPetalFlowerShop/header.s @@ -12,4 +12,3 @@ Route104_PrototypePrettyPetalFlowerShop:: @ 8307D14 .2byte 0 .byte 1 .byte 0 - diff --git a/data/maps/Route105/connections.s b/data/maps/Route105/connections.s index af7d5d271..533d21a58 100644 --- a/data/maps/Route105/connections.s +++ b/data/maps/Route105/connections.s @@ -5,4 +5,3 @@ Route105_MapConnectionsList:: @ 83088A8 Route105_MapConnections:: @ 83088C0 .4byte 0x2 .4byte Route105_MapConnectionsList - diff --git a/data/maps/Route105/header.s b/data/maps/Route105/header.s index ad1e78934..e8af05d51 100644 --- a/data/maps/Route105/header.s +++ b/data/maps/Route105/header.s @@ -12,4 +12,3 @@ Route105:: @ 8305678 .2byte 0 .byte 1 .byte 0 - diff --git a/data/maps/Route106/connections.s b/data/maps/Route106/connections.s index 28acdb4d5..9fe753562 100644 --- a/data/maps/Route106/connections.s +++ b/data/maps/Route106/connections.s @@ -5,4 +5,3 @@ Route106_MapConnectionsList:: @ 83088C8 Route106_MapConnections:: @ 83088E0 .4byte 0x2 .4byte Route106_MapConnectionsList - diff --git a/data/maps/Route106/header.s b/data/maps/Route106/header.s index fba96d7f7..6ebcbbd0a 100644 --- a/data/maps/Route106/header.s +++ b/data/maps/Route106/header.s @@ -12,4 +12,3 @@ Route106:: @ 8305694 .2byte 0 .byte 1 .byte 0 - diff --git a/data/maps/Route107/connections.s b/data/maps/Route107/connections.s index 8b9ff8e35..6d7ec80f7 100644 --- a/data/maps/Route107/connections.s +++ b/data/maps/Route107/connections.s @@ -5,4 +5,3 @@ Route107_MapConnectionsList:: @ 83088E8 Route107_MapConnections:: @ 8308900 .4byte 0x2 .4byte Route107_MapConnectionsList - diff --git a/data/maps/Route107/header.s b/data/maps/Route107/header.s index efc38ee01..2b218dce5 100644 --- a/data/maps/Route107/header.s +++ b/data/maps/Route107/header.s @@ -12,4 +12,3 @@ Route107:: @ 83056B0 .2byte 0 .byte 1 .byte 0 - diff --git a/data/maps/Route108/connections.s b/data/maps/Route108/connections.s index 47a08d49e..ebc1fba52 100644 --- a/data/maps/Route108/connections.s +++ b/data/maps/Route108/connections.s @@ -5,4 +5,3 @@ Route108_MapConnectionsList:: @ 8308908 Route108_MapConnections:: @ 8308920 .4byte 0x2 .4byte Route108_MapConnectionsList - diff --git a/data/maps/Route108/header.s b/data/maps/Route108/header.s index 1456c7c5e..4038eb33b 100644 --- a/data/maps/Route108/header.s +++ b/data/maps/Route108/header.s @@ -12,4 +12,3 @@ Route108:: @ 83056CC .2byte 0 .byte 1 .byte 0 - diff --git a/data/maps/Route109/connections.s b/data/maps/Route109/connections.s index 6e05ad6d1..49d7299ef 100644 --- a/data/maps/Route109/connections.s +++ b/data/maps/Route109/connections.s @@ -5,4 +5,3 @@ Route109_MapConnectionsList:: @ 8308928 Route109_MapConnections:: @ 8308940 .4byte 0x2 .4byte Route109_MapConnectionsList - diff --git a/data/maps/Route109/header.s b/data/maps/Route109/header.s index 360afd7e0..0c48c680f 100644 --- a/data/maps/Route109/header.s +++ b/data/maps/Route109/header.s @@ -12,4 +12,3 @@ Route109:: @ 83056E8 .2byte 0 .byte 1 .byte 0 - diff --git a/data/maps/Route109_SeashoreHouse/header.s b/data/maps/Route109_SeashoreHouse/header.s index e3416d5d3..c64d90560 100644 --- a/data/maps/Route109_SeashoreHouse/header.s +++ b/data/maps/Route109_SeashoreHouse/header.s @@ -12,4 +12,3 @@ Route109_SeashoreHouse:: @ 8307D30 .2byte 0 .byte 0 .byte 0 - diff --git a/data/maps/Route110/connections.s b/data/maps/Route110/connections.s index 8db62595b..9ace83c42 100644 --- a/data/maps/Route110/connections.s +++ b/data/maps/Route110/connections.s @@ -6,4 +6,3 @@ Route110_MapConnectionsList:: @ 8308948 Route110_MapConnections:: @ 830896C .4byte 0x3 .4byte Route110_MapConnectionsList - diff --git a/data/maps/Route110/header.s b/data/maps/Route110/header.s index 1e52e049e..92f2a0f60 100644 --- a/data/maps/Route110/header.s +++ b/data/maps/Route110/header.s @@ -12,4 +12,3 @@ Route110:: @ 8305704 .2byte 0 .byte 1 .byte 0 - diff --git a/data/maps/Route110_SeasideCyclingRoadNorthEntrance/header.s b/data/maps/Route110_SeasideCyclingRoadNorthEntrance/header.s index d887837c1..a0e84e133 100644 --- a/data/maps/Route110_SeasideCyclingRoadNorthEntrance/header.s +++ b/data/maps/Route110_SeasideCyclingRoadNorthEntrance/header.s @@ -12,4 +12,3 @@ Route110_SeasideCyclingRoadNorthEntrance:: @ 8307E9C .2byte 0 .byte 0 .byte 0 - diff --git a/data/maps/Route110_SeasideCyclingRoadSouthEntrance/header.s b/data/maps/Route110_SeasideCyclingRoadSouthEntrance/header.s index 425dd5bfa..5435ddd6d 100644 --- a/data/maps/Route110_SeasideCyclingRoadSouthEntrance/header.s +++ b/data/maps/Route110_SeasideCyclingRoadSouthEntrance/header.s @@ -12,4 +12,3 @@ Route110_SeasideCyclingRoadSouthEntrance:: @ 8307E80 .2byte 0 .byte 0 .byte 0 - diff --git a/data/maps/Route110_TrickHouseCorridor/header.s b/data/maps/Route110_TrickHouseCorridor/header.s index 892f42635..a70401c4b 100644 --- a/data/maps/Route110_TrickHouseCorridor/header.s +++ b/data/maps/Route110_TrickHouseCorridor/header.s @@ -12,4 +12,3 @@ Route110_TrickHouseCorridor:: @ 8307D84 .2byte 0 .byte 0 .byte 0 - diff --git a/data/maps/Route110_TrickHouseEnd/header.s b/data/maps/Route110_TrickHouseEnd/header.s index bb6a7ebec..923d7f992 100644 --- a/data/maps/Route110_TrickHouseEnd/header.s +++ b/data/maps/Route110_TrickHouseEnd/header.s @@ -12,4 +12,3 @@ Route110_TrickHouseEnd:: @ 8307D68 .2byte 0 .byte 0 .byte 0 - diff --git a/data/maps/Route110_TrickHouseEntrance/header.s b/data/maps/Route110_TrickHouseEntrance/header.s index 58ec74e0e..f45f7d5f1 100644 --- a/data/maps/Route110_TrickHouseEntrance/header.s +++ b/data/maps/Route110_TrickHouseEntrance/header.s @@ -12,4 +12,3 @@ Route110_TrickHouseEntrance:: @ 8307D4C .2byte 0 .byte 0 .byte 0 - diff --git a/data/maps/Route110_TrickHousePuzzle1/header.s b/data/maps/Route110_TrickHousePuzzle1/header.s index f3a32d7ed..8c38972e9 100644 --- a/data/maps/Route110_TrickHousePuzzle1/header.s +++ b/data/maps/Route110_TrickHousePuzzle1/header.s @@ -12,4 +12,3 @@ Route110_TrickHousePuzzle1:: @ 8307DA0 .2byte 0 .byte 0 .byte 0 - diff --git a/data/maps/Route110_TrickHousePuzzle2/header.s b/data/maps/Route110_TrickHousePuzzle2/header.s index 2f7f3d519..43d407507 100644 --- a/data/maps/Route110_TrickHousePuzzle2/header.s +++ b/data/maps/Route110_TrickHousePuzzle2/header.s @@ -12,4 +12,3 @@ Route110_TrickHousePuzzle2:: @ 8307DBC .2byte 0 .byte 0 .byte 0 - diff --git a/data/maps/Route110_TrickHousePuzzle3/header.s b/data/maps/Route110_TrickHousePuzzle3/header.s index 52000d55a..440479123 100644 --- a/data/maps/Route110_TrickHousePuzzle3/header.s +++ b/data/maps/Route110_TrickHousePuzzle3/header.s @@ -12,4 +12,3 @@ Route110_TrickHousePuzzle3:: @ 8307DD8 .2byte 0 .byte 0 .byte 0 - diff --git a/data/maps/Route110_TrickHousePuzzle4/header.s b/data/maps/Route110_TrickHousePuzzle4/header.s index 6f8c508a0..0f4a509f4 100644 --- a/data/maps/Route110_TrickHousePuzzle4/header.s +++ b/data/maps/Route110_TrickHousePuzzle4/header.s @@ -12,4 +12,3 @@ Route110_TrickHousePuzzle4:: @ 8307DF4 .2byte 0 .byte 0 .byte 0 - diff --git a/data/maps/Route110_TrickHousePuzzle5/header.s b/data/maps/Route110_TrickHousePuzzle5/header.s index 350c5a9df..3a6e1d3d9 100644 --- a/data/maps/Route110_TrickHousePuzzle5/header.s +++ b/data/maps/Route110_TrickHousePuzzle5/header.s @@ -12,4 +12,3 @@ Route110_TrickHousePuzzle5:: @ 8307E10 .2byte 0 .byte 0 .byte 0 - diff --git a/data/maps/Route110_TrickHousePuzzle6/header.s b/data/maps/Route110_TrickHousePuzzle6/header.s index 5e82720a3..c85112658 100644 --- a/data/maps/Route110_TrickHousePuzzle6/header.s +++ b/data/maps/Route110_TrickHousePuzzle6/header.s @@ -12,4 +12,3 @@ Route110_TrickHousePuzzle6:: @ 8307E2C .2byte 0 .byte 0 .byte 0 - diff --git a/data/maps/Route110_TrickHousePuzzle7/header.s b/data/maps/Route110_TrickHousePuzzle7/header.s index b6856d605..57bcf842a 100644 --- a/data/maps/Route110_TrickHousePuzzle7/header.s +++ b/data/maps/Route110_TrickHousePuzzle7/header.s @@ -12,4 +12,3 @@ Route110_TrickHousePuzzle7:: @ 8307E48 .2byte 0 .byte 0 .byte 0 - diff --git a/data/maps/Route110_TrickHousePuzzle8/header.s b/data/maps/Route110_TrickHousePuzzle8/header.s index 843b6bcc5..8f533b4c2 100644 --- a/data/maps/Route110_TrickHousePuzzle8/header.s +++ b/data/maps/Route110_TrickHousePuzzle8/header.s @@ -12,4 +12,3 @@ Route110_TrickHousePuzzle8:: @ 8307E64 .2byte 0 .byte 0 .byte 0 - diff --git a/data/maps/Route111/connections.s b/data/maps/Route111/connections.s index 1557c2152..65e4effb9 100644 --- a/data/maps/Route111/connections.s +++ b/data/maps/Route111/connections.s @@ -6,4 +6,3 @@ Route111_MapConnectionsList:: @ 8308974 Route111_MapConnections:: @ 8308998 .4byte 0x3 .4byte Route111_MapConnectionsList - diff --git a/data/maps/Route111/header.s b/data/maps/Route111/header.s index 7eef11d53..7d9be0476 100644 --- a/data/maps/Route111/header.s +++ b/data/maps/Route111/header.s @@ -12,4 +12,3 @@ Route111:: @ 8305720 .2byte 0 .byte 1 .byte 0 - diff --git a/data/maps/Route111_OldLadysRestStop/header.s b/data/maps/Route111_OldLadysRestStop/header.s index 063278d11..23eeec456 100644 --- a/data/maps/Route111_OldLadysRestStop/header.s +++ b/data/maps/Route111_OldLadysRestStop/header.s @@ -12,4 +12,3 @@ Route111_OldLadysRestStop:: @ 8306C74 .2byte 0 .byte 0 .byte 0 - diff --git a/data/maps/Route111_WinstrateFamilysHouse/header.s b/data/maps/Route111_WinstrateFamilysHouse/header.s index 8192749e3..7df9a44d8 100644 --- a/data/maps/Route111_WinstrateFamilysHouse/header.s +++ b/data/maps/Route111_WinstrateFamilysHouse/header.s @@ -12,4 +12,3 @@ Route111_WinstrateFamilysHouse:: @ 8306C58 .2byte 0 .byte 0 .byte 0 - diff --git a/data/maps/Route112/connections.s b/data/maps/Route112/connections.s index 2af82c10a..e60248519 100644 --- a/data/maps/Route112/connections.s +++ b/data/maps/Route112/connections.s @@ -6,4 +6,3 @@ Route112_MapConnectionsList:: @ 83089A0 Route112_MapConnections:: @ 83089C4 .4byte 0x3 .4byte Route112_MapConnectionsList - diff --git a/data/maps/Route112/header.s b/data/maps/Route112/header.s index 4fcf92978..810701a97 100644 --- a/data/maps/Route112/header.s +++ b/data/maps/Route112/header.s @@ -12,4 +12,3 @@ Route112:: @ 830573C .2byte 0 .byte 1 .byte 0 - diff --git a/data/maps/Route112_CableCarStation/header.s b/data/maps/Route112_CableCarStation/header.s index b1afd17be..641e4664a 100644 --- a/data/maps/Route112_CableCarStation/header.s +++ b/data/maps/Route112_CableCarStation/header.s @@ -12,4 +12,3 @@ Route112_CableCarStation:: @ 8306C90 .2byte 0 .byte 0 .byte 0 - diff --git a/data/maps/Route113/connections.s b/data/maps/Route113/connections.s index 4225b9368..6aeecd35b 100644 --- a/data/maps/Route113/connections.s +++ b/data/maps/Route113/connections.s @@ -6,4 +6,3 @@ Route113_MapConnectionsList:: @ 83089CC Route113_MapConnections:: @ 83089F0 .4byte 0x3 .4byte Route113_MapConnectionsList - diff --git a/data/maps/Route113/header.s b/data/maps/Route113/header.s index 85f7bb551..eba978731 100644 --- a/data/maps/Route113/header.s +++ b/data/maps/Route113/header.s @@ -12,4 +12,3 @@ Route113:: @ 8305758 .2byte 0 .byte 1 .byte 0 - diff --git a/data/maps/Route113_GlassWorkshop/header.s b/data/maps/Route113_GlassWorkshop/header.s index c8d5445a6..b90b0c1d5 100644 --- a/data/maps/Route113_GlassWorkshop/header.s +++ b/data/maps/Route113_GlassWorkshop/header.s @@ -12,4 +12,3 @@ Route113_GlassWorkshop:: @ 8307EB8 .2byte 0 .byte 0 .byte 0 - diff --git a/data/maps/Route114/connections.s b/data/maps/Route114/connections.s index 274d7bcde..003a8bd90 100644 --- a/data/maps/Route114/connections.s +++ b/data/maps/Route114/connections.s @@ -5,4 +5,3 @@ Route114_MapConnectionsList:: @ 83089F8 Route114_MapConnections:: @ 8308A10 .4byte 0x2 .4byte Route114_MapConnectionsList - diff --git a/data/maps/Route114/header.s b/data/maps/Route114/header.s index 5a62d0062..b5db689c7 100644 --- a/data/maps/Route114/header.s +++ b/data/maps/Route114/header.s @@ -12,4 +12,3 @@ Route114:: @ 8305774 .2byte 0 .byte 1 .byte 0 - diff --git a/data/maps/Route114_FossilManiacsHouse/header.s b/data/maps/Route114_FossilManiacsHouse/header.s index 3e7554a35..103ba0168 100644 --- a/data/maps/Route114_FossilManiacsHouse/header.s +++ b/data/maps/Route114_FossilManiacsHouse/header.s @@ -12,4 +12,3 @@ Route114_FossilManiacsHouse:: @ 8306CC8 .2byte 0 .byte 0 .byte 0 - diff --git a/data/maps/Route114_FossilManiacsTunnel/header.s b/data/maps/Route114_FossilManiacsTunnel/header.s index 417b99bc7..8f5a9ba97 100644 --- a/data/maps/Route114_FossilManiacsTunnel/header.s +++ b/data/maps/Route114_FossilManiacsTunnel/header.s @@ -12,4 +12,3 @@ Route114_FossilManiacsTunnel:: @ 8306CE4 .2byte 0 .byte 0 .byte 0 - diff --git a/data/maps/Route114_LanettesHouse/header.s b/data/maps/Route114_LanettesHouse/header.s index 3b30dc25f..68ef2db79 100644 --- a/data/maps/Route114_LanettesHouse/header.s +++ b/data/maps/Route114_LanettesHouse/header.s @@ -12,4 +12,3 @@ Route114_LanettesHouse:: @ 8306D00 .2byte 0 .byte 0 .byte 0 - diff --git a/data/maps/Route115/connections.s b/data/maps/Route115/connections.s index 7d1e7228e..ec4999e8c 100644 --- a/data/maps/Route115/connections.s +++ b/data/maps/Route115/connections.s @@ -5,4 +5,3 @@ Route115_MapConnectionsList:: @ 8308A18 Route115_MapConnections:: @ 8308A30 .4byte 0x2 .4byte Route115_MapConnectionsList - diff --git a/data/maps/Route115/header.s b/data/maps/Route115/header.s index 0225c2e49..68432e76a 100644 --- a/data/maps/Route115/header.s +++ b/data/maps/Route115/header.s @@ -12,4 +12,3 @@ Route115:: @ 8305790 .2byte 0 .byte 1 .byte 0 - diff --git a/data/maps/Route116/connections.s b/data/maps/Route116/connections.s index 19e82aabc..af7df1392 100644 --- a/data/maps/Route116/connections.s +++ b/data/maps/Route116/connections.s @@ -5,4 +5,3 @@ Route116_MapConnectionsList:: @ 8308A38 Route116_MapConnections:: @ 8308A50 .4byte 0x2 .4byte Route116_MapConnectionsList - diff --git a/data/maps/Route116/header.s b/data/maps/Route116/header.s index 8c9d5baac..67f090c8c 100644 --- a/data/maps/Route116/header.s +++ b/data/maps/Route116/header.s @@ -12,4 +12,3 @@ Route116:: @ 83057AC .2byte 0 .byte 1 .byte 0 - diff --git a/data/maps/Route116_TunnelersRestHouse/header.s b/data/maps/Route116_TunnelersRestHouse/header.s index f3480c42d..8c2ab81b0 100644 --- a/data/maps/Route116_TunnelersRestHouse/header.s +++ b/data/maps/Route116_TunnelersRestHouse/header.s @@ -12,4 +12,3 @@ Route116_TunnelersRestHouse:: @ 8306D1C .2byte 0 .byte 0 .byte 0 - diff --git a/data/maps/Route117/connections.s b/data/maps/Route117/connections.s index bf5838ae3..044941f91 100644 --- a/data/maps/Route117/connections.s +++ b/data/maps/Route117/connections.s @@ -5,4 +5,3 @@ Route117_MapConnectionsList:: @ 8308A58 Route117_MapConnections:: @ 8308A70 .4byte 0x2 .4byte Route117_MapConnectionsList - diff --git a/data/maps/Route117/header.s b/data/maps/Route117/header.s index b94e65136..9beee6013 100644 --- a/data/maps/Route117/header.s +++ b/data/maps/Route117/header.s @@ -12,4 +12,3 @@ Route117:: @ 83057C8 .2byte 0 .byte 1 .byte 0 - diff --git a/data/maps/Route117_PokemonDayCare/header.s b/data/maps/Route117_PokemonDayCare/header.s index eda0fc27c..8e39b50a4 100644 --- a/data/maps/Route117_PokemonDayCare/header.s +++ b/data/maps/Route117_PokemonDayCare/header.s @@ -12,4 +12,3 @@ Route117_PokemonDayCare:: @ 8306D38 .2byte 0 .byte 0 .byte 0 - diff --git a/data/maps/Route118/connections.s b/data/maps/Route118/connections.s index a2d990d79..bf3fdbec1 100644 --- a/data/maps/Route118/connections.s +++ b/data/maps/Route118/connections.s @@ -6,4 +6,3 @@ Route118_MapConnectionsList:: @ 8308A78 Route118_MapConnections:: @ 8308A9C .4byte 0x3 .4byte Route118_MapConnectionsList - diff --git a/data/maps/Route118/header.s b/data/maps/Route118/header.s index ae5f1b16e..ab287c3b3 100644 --- a/data/maps/Route118/header.s +++ b/data/maps/Route118/header.s @@ -12,4 +12,3 @@ Route118:: @ 83057E4 .2byte 0 .byte 1 .byte 0 - diff --git a/data/maps/Route119/connections.s b/data/maps/Route119/connections.s index e76ee20b0..280b7a31b 100644 --- a/data/maps/Route119/connections.s +++ b/data/maps/Route119/connections.s @@ -5,4 +5,3 @@ Route119_MapConnectionsList:: @ 8308AA4 Route119_MapConnections:: @ 8308ABC .4byte 0x2 .4byte Route119_MapConnectionsList - diff --git a/data/maps/Route119/header.s b/data/maps/Route119/header.s index 91b7044ec..2e9bd74d6 100644 --- a/data/maps/Route119/header.s +++ b/data/maps/Route119/header.s @@ -12,4 +12,3 @@ Route119:: @ 8305800 .2byte 0 .byte 1 .byte 0 - diff --git a/data/maps/Route119_House/header.s b/data/maps/Route119_House/header.s index 9951fca69..b22291683 100644 --- a/data/maps/Route119_House/header.s +++ b/data/maps/Route119_House/header.s @@ -12,4 +12,3 @@ Route119_House:: @ 8307F28 .2byte 0 .byte 0 .byte 0 - diff --git a/data/maps/Route119_WeatherInstitute_1F/header.s b/data/maps/Route119_WeatherInstitute_1F/header.s index f3b012210..63c0bf769 100644 --- a/data/maps/Route119_WeatherInstitute_1F/header.s +++ b/data/maps/Route119_WeatherInstitute_1F/header.s @@ -12,4 +12,3 @@ Route119_WeatherInstitute_1F:: @ 8307EF0 .2byte 0 .byte 0 .byte 0 - diff --git a/data/maps/Route119_WeatherInstitute_2F/header.s b/data/maps/Route119_WeatherInstitute_2F/header.s index b5a60130b..d505d7241 100644 --- a/data/maps/Route119_WeatherInstitute_2F/header.s +++ b/data/maps/Route119_WeatherInstitute_2F/header.s @@ -12,4 +12,3 @@ Route119_WeatherInstitute_2F:: @ 8307F0C .2byte 0 .byte 0 .byte 0 - diff --git a/data/maps/Route120/connections.s b/data/maps/Route120/connections.s index 5df35b99d..085167f26 100644 --- a/data/maps/Route120/connections.s +++ b/data/maps/Route120/connections.s @@ -5,4 +5,3 @@ Route120_MapConnectionsList:: @ 8308AC4 Route120_MapConnections:: @ 8308ADC .4byte 0x2 .4byte Route120_MapConnectionsList - diff --git a/data/maps/Route120/header.s b/data/maps/Route120/header.s index 8711fab28..32e8cc656 100644 --- a/data/maps/Route120/header.s +++ b/data/maps/Route120/header.s @@ -12,4 +12,3 @@ Route120:: @ 830581C .2byte 0 .byte 1 .byte 0 - diff --git a/data/maps/Route121/connections.s b/data/maps/Route121/connections.s index d563294ad..fe4f3adaa 100644 --- a/data/maps/Route121/connections.s +++ b/data/maps/Route121/connections.s @@ -6,4 +6,3 @@ Route121_MapConnectionsList:: @ 8308AE4 Route121_MapConnections:: @ 8308B08 .4byte 0x3 .4byte Route121_MapConnectionsList - diff --git a/data/maps/Route121/header.s b/data/maps/Route121/header.s index 10f50d1b2..530c037a2 100644 --- a/data/maps/Route121/header.s +++ b/data/maps/Route121/header.s @@ -12,4 +12,3 @@ Route121:: @ 8305838 .2byte 0 .byte 1 .byte 0 - diff --git a/data/maps/Route121_SafariZoneEntrance/header.s b/data/maps/Route121_SafariZoneEntrance/header.s index 561634bcb..6c567c3ac 100644 --- a/data/maps/Route121_SafariZoneEntrance/header.s +++ b/data/maps/Route121_SafariZoneEntrance/header.s @@ -12,4 +12,3 @@ Route121_SafariZoneEntrance:: @ 8306D54 .2byte 0 .byte 0 .byte 0 - diff --git a/data/maps/Route122/connections.s b/data/maps/Route122/connections.s index ae4bc0daa..f072b14b5 100644 --- a/data/maps/Route122/connections.s +++ b/data/maps/Route122/connections.s @@ -5,4 +5,3 @@ Route122_MapConnectionsList:: @ 8308B10 Route122_MapConnections:: @ 8308B28 .4byte 0x2 .4byte Route122_MapConnectionsList - diff --git a/data/maps/Route122/header.s b/data/maps/Route122/header.s index 17d0add81..08aeccda0 100644 --- a/data/maps/Route122/header.s +++ b/data/maps/Route122/header.s @@ -12,4 +12,3 @@ Route122:: @ 8305854 .2byte 0 .byte 1 .byte 0 - diff --git a/data/maps/Route123/connections.s b/data/maps/Route123/connections.s index 638344d63..b801c33ed 100644 --- a/data/maps/Route123/connections.s +++ b/data/maps/Route123/connections.s @@ -5,4 +5,3 @@ Route123_MapConnectionsList:: @ 8308B30 Route123_MapConnections:: @ 8308B48 .4byte 0x2 .4byte Route123_MapConnectionsList - diff --git a/data/maps/Route123/header.s b/data/maps/Route123/header.s index ed097b769..d66753a00 100644 --- a/data/maps/Route123/header.s +++ b/data/maps/Route123/header.s @@ -12,4 +12,3 @@ Route123:: @ 8305870 .2byte 0 .byte 1 .byte 0 - diff --git a/data/maps/Route123_BerryMastersHouse/header.s b/data/maps/Route123_BerryMastersHouse/header.s index 6c9caf4d9..b9517e6d8 100644 --- a/data/maps/Route123_BerryMastersHouse/header.s +++ b/data/maps/Route123_BerryMastersHouse/header.s @@ -12,4 +12,3 @@ Route123_BerryMastersHouse:: @ 8307ED4 .2byte 0 .byte 0 .byte 0 - diff --git a/data/maps/Route124/connections.s b/data/maps/Route124/connections.s index f6523a172..4270fc865 100644 --- a/data/maps/Route124/connections.s +++ b/data/maps/Route124/connections.s @@ -8,4 +8,3 @@ Route124_MapConnectionsList:: @ 8308B50 Route124_MapConnections:: @ 8308B8C .4byte 0x5 .4byte Route124_MapConnectionsList - diff --git a/data/maps/Route124/header.s b/data/maps/Route124/header.s index 5dda168bb..ae48b524e 100644 --- a/data/maps/Route124/header.s +++ b/data/maps/Route124/header.s @@ -12,4 +12,3 @@ Route124:: @ 830588C .2byte 0 .byte 1 .byte 0 - diff --git a/data/maps/Route124_DivingTreasureHuntersHouse/header.s b/data/maps/Route124_DivingTreasureHuntersHouse/header.s index b30162418..1f56bceee 100644 --- a/data/maps/Route124_DivingTreasureHuntersHouse/header.s +++ b/data/maps/Route124_DivingTreasureHuntersHouse/header.s @@ -12,4 +12,3 @@ Route124_DivingTreasureHuntersHouse:: @ 8307F44 .2byte 0 .byte 0 .byte 0 - diff --git a/data/maps/Route125/connections.s b/data/maps/Route125/connections.s index d4d9d4baf..5703f3726 100644 --- a/data/maps/Route125/connections.s +++ b/data/maps/Route125/connections.s @@ -5,4 +5,3 @@ Route125_MapConnectionsList:: @ 8308B94 Route125_MapConnections:: @ 8308BAC .4byte 0x2 .4byte Route125_MapConnectionsList - diff --git a/data/maps/Route125/header.s b/data/maps/Route125/header.s index 47ca52df9..aa067185f 100644 --- a/data/maps/Route125/header.s +++ b/data/maps/Route125/header.s @@ -12,4 +12,3 @@ Route125:: @ 83058A8 .2byte 0 .byte 1 .byte 0 - diff --git a/data/maps/Route126/connections.s b/data/maps/Route126/connections.s index 808cd5a7e..82290ed35 100644 --- a/data/maps/Route126/connections.s +++ b/data/maps/Route126/connections.s @@ -6,4 +6,3 @@ Route126_MapConnectionsList:: @ 8308BB4 Route126_MapConnections:: @ 8308BD8 .4byte 0x3 .4byte Route126_MapConnectionsList - diff --git a/data/maps/Route126/header.s b/data/maps/Route126/header.s index 835b4972e..1b2b23004 100644 --- a/data/maps/Route126/header.s +++ b/data/maps/Route126/header.s @@ -12,4 +12,3 @@ Route126:: @ 83058C4 .2byte 0 .byte 1 .byte 0 - diff --git a/data/maps/Route127/connections.s b/data/maps/Route127/connections.s index 82871cfa1..9e702c28f 100644 --- a/data/maps/Route127/connections.s +++ b/data/maps/Route127/connections.s @@ -7,4 +7,3 @@ Route127_MapConnectionsList:: @ 8308BE0 Route127_MapConnections:: @ 8308C10 .4byte 0x4 .4byte Route127_MapConnectionsList - diff --git a/data/maps/Route127/header.s b/data/maps/Route127/header.s index ac84853c9..500c803f0 100644 --- a/data/maps/Route127/header.s +++ b/data/maps/Route127/header.s @@ -12,4 +12,3 @@ Route127:: @ 83058E0 .2byte 0 .byte 1 .byte 0 - diff --git a/data/maps/Route128/connections.s b/data/maps/Route128/connections.s index 58befb241..b0301dd4f 100644 --- a/data/maps/Route128/connections.s +++ b/data/maps/Route128/connections.s @@ -7,4 +7,3 @@ Route128_MapConnectionsList:: @ 8308C18 Route128_MapConnections:: @ 8308C48 .4byte 0x4 .4byte Route128_MapConnectionsList - diff --git a/data/maps/Route128/header.s b/data/maps/Route128/header.s index 800a64590..019f919d8 100644 --- a/data/maps/Route128/header.s +++ b/data/maps/Route128/header.s @@ -12,4 +12,3 @@ Route128:: @ 83058FC .2byte 0 .byte 1 .byte 0 - diff --git a/data/maps/Route129/connections.s b/data/maps/Route129/connections.s index 1c1644007..5c6ea1c5f 100644 --- a/data/maps/Route129/connections.s +++ b/data/maps/Route129/connections.s @@ -5,4 +5,3 @@ Route129_MapConnectionsList:: @ 8308C50 Route129_MapConnections:: @ 8308C68 .4byte 0x2 .4byte Route129_MapConnectionsList - diff --git a/data/maps/Route129/header.s b/data/maps/Route129/header.s index 7ee7b0489..bd192c6b0 100644 --- a/data/maps/Route129/header.s +++ b/data/maps/Route129/header.s @@ -12,4 +12,3 @@ Route129:: @ 8305918 .2byte 0 .byte 1 .byte 0 - diff --git a/data/maps/Route130/connections.s b/data/maps/Route130/connections.s index 255b3d27c..4d5bc66c3 100644 --- a/data/maps/Route130/connections.s +++ b/data/maps/Route130/connections.s @@ -5,4 +5,3 @@ Route130_MapConnectionsList:: @ 8308C70 Route130_MapConnections:: @ 8308C88 .4byte 0x2 .4byte Route130_MapConnectionsList - diff --git a/data/maps/Route130/header.s b/data/maps/Route130/header.s index 2446c9d05..cc6115ea4 100644 --- a/data/maps/Route130/header.s +++ b/data/maps/Route130/header.s @@ -12,4 +12,3 @@ Route130:: @ 8305934 .2byte 0 .byte 1 .byte 0 - diff --git a/data/maps/Route131/connections.s b/data/maps/Route131/connections.s index 77bd6dae2..66ef3c16c 100644 --- a/data/maps/Route131/connections.s +++ b/data/maps/Route131/connections.s @@ -5,4 +5,3 @@ Route131_MapConnectionsList:: @ 8308C90 Route131_MapConnections:: @ 8308CA8 .4byte 0x2 .4byte Route131_MapConnectionsList - diff --git a/data/maps/Route131/header.s b/data/maps/Route131/header.s index c204938bf..4a83dfc48 100644 --- a/data/maps/Route131/header.s +++ b/data/maps/Route131/header.s @@ -12,4 +12,3 @@ Route131:: @ 8305950 .2byte 0 .byte 1 .byte 0 - diff --git a/data/maps/Route132/connections.s b/data/maps/Route132/connections.s index db002a248..8ba11ce4f 100644 --- a/data/maps/Route132/connections.s +++ b/data/maps/Route132/connections.s @@ -5,4 +5,3 @@ Route132_MapConnectionsList:: @ 8308CB0 Route132_MapConnections:: @ 8308CC8 .4byte 0x2 .4byte Route132_MapConnectionsList - diff --git a/data/maps/Route132/header.s b/data/maps/Route132/header.s index ee0367c10..53f6e9f8f 100644 --- a/data/maps/Route132/header.s +++ b/data/maps/Route132/header.s @@ -12,4 +12,3 @@ Route132:: @ 830596C .2byte 0 .byte 1 .byte 0 - diff --git a/data/maps/Route133/connections.s b/data/maps/Route133/connections.s index 64c1be53e..594de50fe 100644 --- a/data/maps/Route133/connections.s +++ b/data/maps/Route133/connections.s @@ -5,4 +5,3 @@ Route133_MapConnectionsList:: @ 8308CD0 Route133_MapConnections:: @ 8308CE8 .4byte 0x2 .4byte Route133_MapConnectionsList - diff --git a/data/maps/Route133/header.s b/data/maps/Route133/header.s index 085d30dae..7d1b48d1c 100644 --- a/data/maps/Route133/header.s +++ b/data/maps/Route133/header.s @@ -12,4 +12,3 @@ Route133:: @ 8305988 .2byte 0 .byte 1 .byte 0 - diff --git a/data/maps/Route134/connections.s b/data/maps/Route134/connections.s index 0a3d95d9f..80c54c22e 100644 --- a/data/maps/Route134/connections.s +++ b/data/maps/Route134/connections.s @@ -5,4 +5,3 @@ Route134_MapConnectionsList:: @ 8308CF0 Route134_MapConnections:: @ 8308D08 .4byte 0x2 .4byte Route134_MapConnectionsList - diff --git a/data/maps/Route134/header.s b/data/maps/Route134/header.s index 914a0c1a9..7379892b8 100644 --- a/data/maps/Route134/header.s +++ b/data/maps/Route134/header.s @@ -12,4 +12,3 @@ Route134:: @ 83059A4 .2byte 0 .byte 1 .byte 0 - diff --git a/data/maps/RustboroCity/connections.s b/data/maps/RustboroCity/connections.s index 9c0a35a1f..35ea9b814 100644 --- a/data/maps/RustboroCity/connections.s +++ b/data/maps/RustboroCity/connections.s @@ -6,4 +6,3 @@ RustboroCity_MapConnectionsList:: @ 8308768 RustboroCity_MapConnections:: @ 830878C .4byte 0x3 .4byte RustboroCity_MapConnectionsList - diff --git a/data/maps/RustboroCity/header.s b/data/maps/RustboroCity/header.s index 1306fc1c8..d47f93c1d 100644 --- a/data/maps/RustboroCity/header.s +++ b/data/maps/RustboroCity/header.s @@ -12,4 +12,3 @@ RustboroCity:: @ 830549C .2byte 0 .byte 1 .byte 0 - diff --git a/data/maps/RustboroCity_CuttersHouse/header.s b/data/maps/RustboroCity_CuttersHouse/header.s index fbd6313f0..b7532c0ab 100644 --- a/data/maps/RustboroCity_CuttersHouse/header.s +++ b/data/maps/RustboroCity_CuttersHouse/header.s @@ -12,4 +12,3 @@ RustboroCity_CuttersHouse:: @ 8306360 .2byte 0 .byte 0 .byte 0 - diff --git a/data/maps/RustboroCity_DevonCorp_1F/header.s b/data/maps/RustboroCity_DevonCorp_1F/header.s index f2a5918ce..8f85508e6 100644 --- a/data/maps/RustboroCity_DevonCorp_1F/header.s +++ b/data/maps/RustboroCity_DevonCorp_1F/header.s @@ -12,4 +12,3 @@ RustboroCity_DevonCorp_1F:: @ 830622C .2byte 0 .byte 0 .byte 0 - diff --git a/data/maps/RustboroCity_DevonCorp_2F/header.s b/data/maps/RustboroCity_DevonCorp_2F/header.s index ed47a35b9..adc0ca3bf 100644 --- a/data/maps/RustboroCity_DevonCorp_2F/header.s +++ b/data/maps/RustboroCity_DevonCorp_2F/header.s @@ -12,4 +12,3 @@ RustboroCity_DevonCorp_2F:: @ 8306248 .2byte 0 .byte 0 .byte 0 - diff --git a/data/maps/RustboroCity_DevonCorp_3F/header.s b/data/maps/RustboroCity_DevonCorp_3F/header.s index b870716dd..bead1aec5 100644 --- a/data/maps/RustboroCity_DevonCorp_3F/header.s +++ b/data/maps/RustboroCity_DevonCorp_3F/header.s @@ -12,4 +12,3 @@ RustboroCity_DevonCorp_3F:: @ 8306264 .2byte 0 .byte 0 .byte 0 - diff --git a/data/maps/RustboroCity_Flat1_1F/header.s b/data/maps/RustboroCity_Flat1_1F/header.s index bbace0643..f61b4180e 100644 --- a/data/maps/RustboroCity_Flat1_1F/header.s +++ b/data/maps/RustboroCity_Flat1_1F/header.s @@ -12,4 +12,3 @@ RustboroCity_Flat1_1F:: @ 830630C .2byte 0 .byte 0 .byte 0 - diff --git a/data/maps/RustboroCity_Flat1_2F/header.s b/data/maps/RustboroCity_Flat1_2F/header.s index 2fc4e4e55..bcec29b82 100644 --- a/data/maps/RustboroCity_Flat1_2F/header.s +++ b/data/maps/RustboroCity_Flat1_2F/header.s @@ -12,4 +12,3 @@ RustboroCity_Flat1_2F:: @ 8306328 .2byte 0 .byte 0 .byte 0 - diff --git a/data/maps/RustboroCity_Flat2_1F/header.s b/data/maps/RustboroCity_Flat2_1F/header.s index f5fc03059..7ce84500f 100644 --- a/data/maps/RustboroCity_Flat2_1F/header.s +++ b/data/maps/RustboroCity_Flat2_1F/header.s @@ -12,4 +12,3 @@ RustboroCity_Flat2_1F:: @ 8306398 .2byte 0 .byte 0 .byte 0 - diff --git a/data/maps/RustboroCity_Flat2_2F/header.s b/data/maps/RustboroCity_Flat2_2F/header.s index 4ea6769f8..af43cce45 100644 --- a/data/maps/RustboroCity_Flat2_2F/header.s +++ b/data/maps/RustboroCity_Flat2_2F/header.s @@ -12,4 +12,3 @@ RustboroCity_Flat2_2F:: @ 83063B4 .2byte 0 .byte 0 .byte 0 - diff --git a/data/maps/RustboroCity_Flat2_3F/header.s b/data/maps/RustboroCity_Flat2_3F/header.s index ef58a464c..7309198e4 100644 --- a/data/maps/RustboroCity_Flat2_3F/header.s +++ b/data/maps/RustboroCity_Flat2_3F/header.s @@ -12,4 +12,3 @@ RustboroCity_Flat2_3F:: @ 83063D0 .2byte 0 .byte 0 .byte 0 - diff --git a/data/maps/RustboroCity_Gym/header.s b/data/maps/RustboroCity_Gym/header.s index f782fa055..42a1da28c 100644 --- a/data/maps/RustboroCity_Gym/header.s +++ b/data/maps/RustboroCity_Gym/header.s @@ -12,4 +12,3 @@ RustboroCity_Gym:: @ 8306280 .2byte 0 .byte 0 .byte 1 - diff --git a/data/maps/RustboroCity_House1/header.s b/data/maps/RustboroCity_House1/header.s index 8417edf89..4a4f2ff04 100644 --- a/data/maps/RustboroCity_House1/header.s +++ b/data/maps/RustboroCity_House1/header.s @@ -12,4 +12,3 @@ RustboroCity_House1:: @ 8306344 .2byte 0 .byte 0 .byte 0 - diff --git a/data/maps/RustboroCity_House2/header.s b/data/maps/RustboroCity_House2/header.s index a173262d3..648148734 100644 --- a/data/maps/RustboroCity_House2/header.s +++ b/data/maps/RustboroCity_House2/header.s @@ -12,4 +12,3 @@ RustboroCity_House2:: @ 830637C .2byte 0 .byte 0 .byte 0 - diff --git a/data/maps/RustboroCity_House3/header.s b/data/maps/RustboroCity_House3/header.s index 50843c2bf..eac488d84 100644 --- a/data/maps/RustboroCity_House3/header.s +++ b/data/maps/RustboroCity_House3/header.s @@ -12,4 +12,3 @@ RustboroCity_House3:: @ 83063EC .2byte 0 .byte 0 .byte 0 - diff --git a/data/maps/RustboroCity_Mart/header.s b/data/maps/RustboroCity_Mart/header.s index 94655edc7..ffb8e4d09 100644 --- a/data/maps/RustboroCity_Mart/header.s +++ b/data/maps/RustboroCity_Mart/header.s @@ -12,4 +12,3 @@ RustboroCity_Mart:: @ 83062F0 .2byte 0 .byte 0 .byte 0 - diff --git a/data/maps/RustboroCity_PokemonCenter_1F/header.s b/data/maps/RustboroCity_PokemonCenter_1F/header.s index a59009266..06aa2bc2f 100644 --- a/data/maps/RustboroCity_PokemonCenter_1F/header.s +++ b/data/maps/RustboroCity_PokemonCenter_1F/header.s @@ -12,4 +12,3 @@ RustboroCity_PokemonCenter_1F:: @ 83062B8 .2byte 0 .byte 0 .byte 0 - diff --git a/data/maps/RustboroCity_PokemonCenter_2F/header.s b/data/maps/RustboroCity_PokemonCenter_2F/header.s index 1ed59b227..7e4f1d4f8 100644 --- a/data/maps/RustboroCity_PokemonCenter_2F/header.s +++ b/data/maps/RustboroCity_PokemonCenter_2F/header.s @@ -12,4 +12,3 @@ RustboroCity_PokemonCenter_2F:: @ 83062D4 .2byte 0 .byte 0 .byte 0 - diff --git a/data/maps/RustboroCity_PokemonSchool/header.s b/data/maps/RustboroCity_PokemonSchool/header.s index 4cc3c080b..6b54f30d9 100644 --- a/data/maps/RustboroCity_PokemonSchool/header.s +++ b/data/maps/RustboroCity_PokemonSchool/header.s @@ -12,4 +12,3 @@ RustboroCity_PokemonSchool:: @ 830629C .2byte 0 .byte 0 .byte 0 - diff --git a/data/maps/RusturfTunnel/header.s b/data/maps/RusturfTunnel/header.s index 6d8e7fa4e..825762dcd 100644 --- a/data/maps/RusturfTunnel/header.s +++ b/data/maps/RusturfTunnel/header.s @@ -12,4 +12,3 @@ RusturfTunnel:: @ 8306DE0 .2byte 0 .byte 1 .byte 0 - diff --git a/data/maps/SSTidalCorridor/header.s b/data/maps/SSTidalCorridor/header.s index d67a82aaa..96cd31588 100644 --- a/data/maps/SSTidalCorridor/header.s +++ b/data/maps/SSTidalCorridor/header.s @@ -12,4 +12,3 @@ SSTidalCorridor:: @ 8307B54 .2byte 0 .byte 0 .byte 0 - diff --git a/data/maps/SSTidalLowerDeck/header.s b/data/maps/SSTidalLowerDeck/header.s index 53da475ec..2e42372d8 100644 --- a/data/maps/SSTidalLowerDeck/header.s +++ b/data/maps/SSTidalLowerDeck/header.s @@ -12,4 +12,3 @@ SSTidalLowerDeck:: @ 8307B70 .2byte 0 .byte 0 .byte 0 - diff --git a/data/maps/SSTidalRooms/header.s b/data/maps/SSTidalRooms/header.s index 39fe900c1..b71367c9c 100644 --- a/data/maps/SSTidalRooms/header.s +++ b/data/maps/SSTidalRooms/header.s @@ -12,4 +12,3 @@ SSTidalRooms:: @ 8307B8C .2byte 0 .byte 0 .byte 0 - diff --git a/data/maps/SafariZone_Northeast/connections.s b/data/maps/SafariZone_Northeast/connections.s index dcba64de1..833749a8e 100644 --- a/data/maps/SafariZone_Northeast/connections.s +++ b/data/maps/SafariZone_Northeast/connections.s @@ -5,4 +5,3 @@ SafariZone_Northeast_MapConnectionsList:: @ 8308DC8 SafariZone_Northeast_MapConnections:: @ 8308DE0 .4byte 0x2 .4byte SafariZone_Northeast_MapConnectionsList - diff --git a/data/maps/SafariZone_Northeast/header.s b/data/maps/SafariZone_Northeast/header.s index 1a9ad6a0e..3842c7d06 100644 --- a/data/maps/SafariZone_Northeast/header.s +++ b/data/maps/SafariZone_Northeast/header.s @@ -12,4 +12,3 @@ SafariZone_Northeast:: @ 8307BC4 .2byte 0 .byte 1 .byte 0 - diff --git a/data/maps/SafariZone_Northwest/connections.s b/data/maps/SafariZone_Northwest/connections.s index db8fbd19c..fc5c79480 100644 --- a/data/maps/SafariZone_Northwest/connections.s +++ b/data/maps/SafariZone_Northwest/connections.s @@ -5,4 +5,3 @@ SafariZone_Northwest_MapConnectionsList:: @ 8308DA8 SafariZone_Northwest_MapConnections:: @ 8308DC0 .4byte 0x2 .4byte SafariZone_Northwest_MapConnectionsList - diff --git a/data/maps/SafariZone_Northwest/header.s b/data/maps/SafariZone_Northwest/header.s index 1995a7ca5..eae357c4f 100644 --- a/data/maps/SafariZone_Northwest/header.s +++ b/data/maps/SafariZone_Northwest/header.s @@ -12,4 +12,3 @@ SafariZone_Northwest:: @ 8307BA8 .2byte 0 .byte 1 .byte 0 - diff --git a/data/maps/SafariZone_RestHouse/header.s b/data/maps/SafariZone_RestHouse/header.s index 9275f8cbf..1a9fdf1ea 100644 --- a/data/maps/SafariZone_RestHouse/header.s +++ b/data/maps/SafariZone_RestHouse/header.s @@ -12,4 +12,3 @@ SafariZone_RestHouse:: @ 8307CDC .2byte 0 .byte 0 .byte 0 - diff --git a/data/maps/SafariZone_Southeast/connections.s b/data/maps/SafariZone_Southeast/connections.s index ffe609503..1831c69fb 100644 --- a/data/maps/SafariZone_Southeast/connections.s +++ b/data/maps/SafariZone_Southeast/connections.s @@ -5,4 +5,3 @@ SafariZone_Southeast_MapConnectionsList:: @ 8308E08 SafariZone_Southeast_MapConnections:: @ 8308E20 .4byte 0x2 .4byte SafariZone_Southeast_MapConnectionsList - diff --git a/data/maps/SafariZone_Southeast/header.s b/data/maps/SafariZone_Southeast/header.s index 854b25d3b..54cc5c621 100644 --- a/data/maps/SafariZone_Southeast/header.s +++ b/data/maps/SafariZone_Southeast/header.s @@ -12,4 +12,3 @@ SafariZone_Southeast:: @ 8307BFC .2byte 0 .byte 1 .byte 0 - diff --git a/data/maps/SafariZone_Southwest/connections.s b/data/maps/SafariZone_Southwest/connections.s index 423ff05c0..48c65ccf3 100644 --- a/data/maps/SafariZone_Southwest/connections.s +++ b/data/maps/SafariZone_Southwest/connections.s @@ -5,4 +5,3 @@ SafariZone_Southwest_MapConnectionsList:: @ 8308DE8 SafariZone_Southwest_MapConnections:: @ 8308E00 .4byte 0x2 .4byte SafariZone_Southwest_MapConnectionsList - diff --git a/data/maps/SafariZone_Southwest/header.s b/data/maps/SafariZone_Southwest/header.s index ad1844d51..06a7f5336 100644 --- a/data/maps/SafariZone_Southwest/header.s +++ b/data/maps/SafariZone_Southwest/header.s @@ -12,4 +12,3 @@ SafariZone_Southwest:: @ 8307BE0 .2byte 0 .byte 1 .byte 0 - diff --git a/data/maps/ScorchedSlab/header.s b/data/maps/ScorchedSlab/header.s index 8043e870b..ac60d92ed 100644 --- a/data/maps/ScorchedSlab/header.s +++ b/data/maps/ScorchedSlab/header.s @@ -12,4 +12,3 @@ ScorchedSlab:: @ 830756C .2byte 0 .byte 1 .byte 0 - diff --git a/data/maps/SeafloorCavern_Entrance/header.s b/data/maps/SeafloorCavern_Entrance/header.s index 42f1dc55f..bf11411cf 100644 --- a/data/maps/SeafloorCavern_Entrance/header.s +++ b/data/maps/SeafloorCavern_Entrance/header.s @@ -12,4 +12,3 @@ SeafloorCavern_Entrance:: @ 8307064 .2byte 0 .byte 1 .byte 0 - diff --git a/data/maps/SeafloorCavern_Room1/header.s b/data/maps/SeafloorCavern_Room1/header.s index 642aa57b8..c366ec3da 100644 --- a/data/maps/SeafloorCavern_Room1/header.s +++ b/data/maps/SeafloorCavern_Room1/header.s @@ -12,4 +12,3 @@ SeafloorCavern_Room1:: @ 8307080 .2byte 0 .byte 1 .byte 0 - diff --git a/data/maps/SeafloorCavern_Room2/header.s b/data/maps/SeafloorCavern_Room2/header.s index 78bf99b95..d9cbc8b46 100644 --- a/data/maps/SeafloorCavern_Room2/header.s +++ b/data/maps/SeafloorCavern_Room2/header.s @@ -12,4 +12,3 @@ SeafloorCavern_Room2:: @ 830709C .2byte 0 .byte 1 .byte 0 - diff --git a/data/maps/SeafloorCavern_Room3/header.s b/data/maps/SeafloorCavern_Room3/header.s index 59b117b57..be6afcc9f 100644 --- a/data/maps/SeafloorCavern_Room3/header.s +++ b/data/maps/SeafloorCavern_Room3/header.s @@ -12,4 +12,3 @@ SeafloorCavern_Room3:: @ 83070B8 .2byte 0 .byte 1 .byte 0 - diff --git a/data/maps/SeafloorCavern_Room4/header.s b/data/maps/SeafloorCavern_Room4/header.s index ea04ec1a6..97c3f4198 100644 --- a/data/maps/SeafloorCavern_Room4/header.s +++ b/data/maps/SeafloorCavern_Room4/header.s @@ -12,4 +12,3 @@ SeafloorCavern_Room4:: @ 83070D4 .2byte 0 .byte 1 .byte 0 - diff --git a/data/maps/SeafloorCavern_Room5/header.s b/data/maps/SeafloorCavern_Room5/header.s index c459b89ac..1a326445c 100644 --- a/data/maps/SeafloorCavern_Room5/header.s +++ b/data/maps/SeafloorCavern_Room5/header.s @@ -12,4 +12,3 @@ SeafloorCavern_Room5:: @ 83070F0 .2byte 0 .byte 1 .byte 0 - diff --git a/data/maps/SeafloorCavern_Room6/header.s b/data/maps/SeafloorCavern_Room6/header.s index 483bc8e65..a3e3dbbba 100644 --- a/data/maps/SeafloorCavern_Room6/header.s +++ b/data/maps/SeafloorCavern_Room6/header.s @@ -12,4 +12,3 @@ SeafloorCavern_Room6:: @ 830710C .2byte 0 .byte 1 .byte 0 - diff --git a/data/maps/SeafloorCavern_Room7/header.s b/data/maps/SeafloorCavern_Room7/header.s index 7a2dc0b29..452197ecf 100644 --- a/data/maps/SeafloorCavern_Room7/header.s +++ b/data/maps/SeafloorCavern_Room7/header.s @@ -12,4 +12,3 @@ SeafloorCavern_Room7:: @ 8307128 .2byte 0 .byte 1 .byte 0 - diff --git a/data/maps/SeafloorCavern_Room8/header.s b/data/maps/SeafloorCavern_Room8/header.s index 5bcc23a31..450ddbfca 100644 --- a/data/maps/SeafloorCavern_Room8/header.s +++ b/data/maps/SeafloorCavern_Room8/header.s @@ -12,4 +12,3 @@ SeafloorCavern_Room8:: @ 8307144 .2byte 0 .byte 1 .byte 0 - diff --git a/data/maps/SeafloorCavern_Room9/header.s b/data/maps/SeafloorCavern_Room9/header.s index f0c00e733..3649c3c7c 100644 --- a/data/maps/SeafloorCavern_Room9/header.s +++ b/data/maps/SeafloorCavern_Room9/header.s @@ -12,4 +12,3 @@ SeafloorCavern_Room9:: @ 8307160 .2byte 0 .byte 1 .byte 0 - diff --git a/data/maps/SealedChamber_InnerRoom/header.s b/data/maps/SealedChamber_InnerRoom/header.s index 0e2ac4280..d60306249 100644 --- a/data/maps/SealedChamber_InnerRoom/header.s +++ b/data/maps/SealedChamber_InnerRoom/header.s @@ -12,4 +12,3 @@ SealedChamber_InnerRoom:: @ 8307550 .2byte 0 .byte 1 .byte 0 - diff --git a/data/maps/SealedChamber_OuterRoom/header.s b/data/maps/SealedChamber_OuterRoom/header.s index 29dc27666..e8bf52810 100644 --- a/data/maps/SealedChamber_OuterRoom/header.s +++ b/data/maps/SealedChamber_OuterRoom/header.s @@ -12,4 +12,3 @@ SealedChamber_OuterRoom:: @ 8307534 .2byte 0 .byte 1 .byte 0 - diff --git a/data/maps/SecretBase_BlueCave1/header.s b/data/maps/SecretBase_BlueCave1/header.s index 16a3d1735..38804ea6b 100644 --- a/data/maps/SecretBase_BlueCave1/header.s +++ b/data/maps/SecretBase_BlueCave1/header.s @@ -12,4 +12,3 @@ SecretBase_BlueCave1:: @ 8307710 .2byte 0 .byte 1 .byte 8 - diff --git a/data/maps/SecretBase_BlueCave2/header.s b/data/maps/SecretBase_BlueCave2/header.s index 2a7026586..3f65641c2 100644 --- a/data/maps/SecretBase_BlueCave2/header.s +++ b/data/maps/SecretBase_BlueCave2/header.s @@ -12,4 +12,3 @@ SecretBase_BlueCave2:: @ 83077B8 .2byte 0 .byte 1 .byte 8 - diff --git a/data/maps/SecretBase_BlueCave3/header.s b/data/maps/SecretBase_BlueCave3/header.s index 1dfbb4b99..a332f5744 100644 --- a/data/maps/SecretBase_BlueCave3/header.s +++ b/data/maps/SecretBase_BlueCave3/header.s @@ -12,4 +12,3 @@ SecretBase_BlueCave3:: @ 8307860 .2byte 0 .byte 1 .byte 8 - diff --git a/data/maps/SecretBase_BlueCave4/header.s b/data/maps/SecretBase_BlueCave4/header.s index 38486de2f..2df707f32 100644 --- a/data/maps/SecretBase_BlueCave4/header.s +++ b/data/maps/SecretBase_BlueCave4/header.s @@ -12,4 +12,3 @@ SecretBase_BlueCave4:: @ 8307908 .2byte 0 .byte 1 .byte 8 - diff --git a/data/maps/SecretBase_BrownCave1/header.s b/data/maps/SecretBase_BrownCave1/header.s index 839031e06..6b44b46d3 100644 --- a/data/maps/SecretBase_BrownCave1/header.s +++ b/data/maps/SecretBase_BrownCave1/header.s @@ -12,4 +12,3 @@ SecretBase_BrownCave1:: @ 83076F4 .2byte 0 .byte 1 .byte 8 - diff --git a/data/maps/SecretBase_BrownCave2/header.s b/data/maps/SecretBase_BrownCave2/header.s index f718dc706..7a2d87527 100644 --- a/data/maps/SecretBase_BrownCave2/header.s +++ b/data/maps/SecretBase_BrownCave2/header.s @@ -12,4 +12,3 @@ SecretBase_BrownCave2:: @ 830779C .2byte 0 .byte 1 .byte 8 - diff --git a/data/maps/SecretBase_BrownCave3/header.s b/data/maps/SecretBase_BrownCave3/header.s index 7cea2913d..cf9e68e17 100644 --- a/data/maps/SecretBase_BrownCave3/header.s +++ b/data/maps/SecretBase_BrownCave3/header.s @@ -12,4 +12,3 @@ SecretBase_BrownCave3:: @ 8307844 .2byte 0 .byte 1 .byte 8 - diff --git a/data/maps/SecretBase_BrownCave4/header.s b/data/maps/SecretBase_BrownCave4/header.s index f34cde172..33a72390a 100644 --- a/data/maps/SecretBase_BrownCave4/header.s +++ b/data/maps/SecretBase_BrownCave4/header.s @@ -12,4 +12,3 @@ SecretBase_BrownCave4:: @ 83078EC .2byte 0 .byte 1 .byte 8 - diff --git a/data/maps/SecretBase_RedCave1/header.s b/data/maps/SecretBase_RedCave1/header.s index 4eed1df11..c03bedb0f 100644 --- a/data/maps/SecretBase_RedCave1/header.s +++ b/data/maps/SecretBase_RedCave1/header.s @@ -12,4 +12,3 @@ SecretBase_RedCave1:: @ 83076D8 .2byte 0 .byte 1 .byte 8 - diff --git a/data/maps/SecretBase_RedCave2/header.s b/data/maps/SecretBase_RedCave2/header.s index 5768d3f1e..1dcbf967c 100644 --- a/data/maps/SecretBase_RedCave2/header.s +++ b/data/maps/SecretBase_RedCave2/header.s @@ -12,4 +12,3 @@ SecretBase_RedCave2:: @ 8307780 .2byte 0 .byte 1 .byte 8 - diff --git a/data/maps/SecretBase_RedCave3/header.s b/data/maps/SecretBase_RedCave3/header.s index 1f60200f9..584a1fbac 100644 --- a/data/maps/SecretBase_RedCave3/header.s +++ b/data/maps/SecretBase_RedCave3/header.s @@ -12,4 +12,3 @@ SecretBase_RedCave3:: @ 8307828 .2byte 0 .byte 1 .byte 8 - diff --git a/data/maps/SecretBase_RedCave4/header.s b/data/maps/SecretBase_RedCave4/header.s index 734f53a50..44d931749 100644 --- a/data/maps/SecretBase_RedCave4/header.s +++ b/data/maps/SecretBase_RedCave4/header.s @@ -12,4 +12,3 @@ SecretBase_RedCave4:: @ 83078D0 .2byte 0 .byte 1 .byte 8 - diff --git a/data/maps/SecretBase_Shrub1/header.s b/data/maps/SecretBase_Shrub1/header.s index ff810d323..f289f1c2c 100644 --- a/data/maps/SecretBase_Shrub1/header.s +++ b/data/maps/SecretBase_Shrub1/header.s @@ -12,4 +12,3 @@ SecretBase_Shrub1:: @ 8307764 .2byte 0 .byte 1 .byte 8 - diff --git a/data/maps/SecretBase_Shrub2/header.s b/data/maps/SecretBase_Shrub2/header.s index 1e952f99f..c4be880e2 100644 --- a/data/maps/SecretBase_Shrub2/header.s +++ b/data/maps/SecretBase_Shrub2/header.s @@ -12,4 +12,3 @@ SecretBase_Shrub2:: @ 830780C .2byte 0 .byte 1 .byte 8 - diff --git a/data/maps/SecretBase_Shrub3/header.s b/data/maps/SecretBase_Shrub3/header.s index 36d307fef..2fe1f5140 100644 --- a/data/maps/SecretBase_Shrub3/header.s +++ b/data/maps/SecretBase_Shrub3/header.s @@ -12,4 +12,3 @@ SecretBase_Shrub3:: @ 83078B4 .2byte 0 .byte 1 .byte 8 - diff --git a/data/maps/SecretBase_Shrub4/header.s b/data/maps/SecretBase_Shrub4/header.s index cb6add815..f61b24843 100644 --- a/data/maps/SecretBase_Shrub4/header.s +++ b/data/maps/SecretBase_Shrub4/header.s @@ -12,4 +12,3 @@ SecretBase_Shrub4:: @ 830795C .2byte 0 .byte 1 .byte 8 - diff --git a/data/maps/SecretBase_Tree1/header.s b/data/maps/SecretBase_Tree1/header.s index 537d6d90f..63cff3825 100644 --- a/data/maps/SecretBase_Tree1/header.s +++ b/data/maps/SecretBase_Tree1/header.s @@ -12,4 +12,3 @@ SecretBase_Tree1:: @ 8307748 .2byte 0 .byte 1 .byte 8 - diff --git a/data/maps/SecretBase_Tree2/header.s b/data/maps/SecretBase_Tree2/header.s index 9191a888d..5d7b38767 100644 --- a/data/maps/SecretBase_Tree2/header.s +++ b/data/maps/SecretBase_Tree2/header.s @@ -12,4 +12,3 @@ SecretBase_Tree2:: @ 83077F0 .2byte 0 .byte 1 .byte 8 - diff --git a/data/maps/SecretBase_Tree3/header.s b/data/maps/SecretBase_Tree3/header.s index 9fea32a6d..b1a4cfd21 100644 --- a/data/maps/SecretBase_Tree3/header.s +++ b/data/maps/SecretBase_Tree3/header.s @@ -12,4 +12,3 @@ SecretBase_Tree3:: @ 8307898 .2byte 0 .byte 1 .byte 8 - diff --git a/data/maps/SecretBase_Tree4/header.s b/data/maps/SecretBase_Tree4/header.s index b947e8c9d..4b03d2957 100644 --- a/data/maps/SecretBase_Tree4/header.s +++ b/data/maps/SecretBase_Tree4/header.s @@ -12,4 +12,3 @@ SecretBase_Tree4:: @ 8307940 .2byte 0 .byte 1 .byte 8 - diff --git a/data/maps/SecretBase_YellowCave1/header.s b/data/maps/SecretBase_YellowCave1/header.s index cd5f7c00c..755f1c924 100644 --- a/data/maps/SecretBase_YellowCave1/header.s +++ b/data/maps/SecretBase_YellowCave1/header.s @@ -12,4 +12,3 @@ SecretBase_YellowCave1:: @ 830772C .2byte 0 .byte 1 .byte 8 - diff --git a/data/maps/SecretBase_YellowCave2/header.s b/data/maps/SecretBase_YellowCave2/header.s index cf4ec5acc..0b0b71390 100644 --- a/data/maps/SecretBase_YellowCave2/header.s +++ b/data/maps/SecretBase_YellowCave2/header.s @@ -12,4 +12,3 @@ SecretBase_YellowCave2:: @ 83077D4 .2byte 0 .byte 1 .byte 8 - diff --git a/data/maps/SecretBase_YellowCave3/header.s b/data/maps/SecretBase_YellowCave3/header.s index 3d52fa563..8a6c13c35 100644 --- a/data/maps/SecretBase_YellowCave3/header.s +++ b/data/maps/SecretBase_YellowCave3/header.s @@ -12,4 +12,3 @@ SecretBase_YellowCave3:: @ 830787C .2byte 0 .byte 1 .byte 8 - diff --git a/data/maps/SecretBase_YellowCave4/header.s b/data/maps/SecretBase_YellowCave4/header.s index faffee591..e7bc2f713 100644 --- a/data/maps/SecretBase_YellowCave4/header.s +++ b/data/maps/SecretBase_YellowCave4/header.s @@ -12,4 +12,3 @@ SecretBase_YellowCave4:: @ 8307924 .2byte 0 .byte 1 .byte 8 - diff --git a/data/maps/ShoalCave_HighTideEntranceRoom/header.s b/data/maps/ShoalCave_HighTideEntranceRoom/header.s index 6e34199a2..0066bd93b 100644 --- a/data/maps/ShoalCave_HighTideEntranceRoom/header.s +++ b/data/maps/ShoalCave_HighTideEntranceRoom/header.s @@ -12,4 +12,3 @@ ShoalCave_HighTideEntranceRoom:: @ 83072E8 .2byte 0 .byte 1 .byte 0 - diff --git a/data/maps/ShoalCave_HighTideInnerRoom/header.s b/data/maps/ShoalCave_HighTideInnerRoom/header.s index d81d52893..816661cbb 100644 --- a/data/maps/ShoalCave_HighTideInnerRoom/header.s +++ b/data/maps/ShoalCave_HighTideInnerRoom/header.s @@ -12,4 +12,3 @@ ShoalCave_HighTideInnerRoom:: @ 8307304 .2byte 0 .byte 1 .byte 0 - diff --git a/data/maps/ShoalCave_LowTideEntranceRoom/header.s b/data/maps/ShoalCave_LowTideEntranceRoom/header.s index b8b65f64c..ba8d6d253 100644 --- a/data/maps/ShoalCave_LowTideEntranceRoom/header.s +++ b/data/maps/ShoalCave_LowTideEntranceRoom/header.s @@ -12,4 +12,3 @@ ShoalCave_LowTideEntranceRoom:: @ 8307278 .2byte 0 .byte 1 .byte 0 - diff --git a/data/maps/ShoalCave_LowTideIceRoom/header.s b/data/maps/ShoalCave_LowTideIceRoom/header.s index c84bd0ac8..45569d729 100644 --- a/data/maps/ShoalCave_LowTideIceRoom/header.s +++ b/data/maps/ShoalCave_LowTideIceRoom/header.s @@ -12,4 +12,3 @@ ShoalCave_LowTideIceRoom:: @ 8307684 .2byte 0 .byte 1 .byte 0 - diff --git a/data/maps/ShoalCave_LowTideInnerRoom/header.s b/data/maps/ShoalCave_LowTideInnerRoom/header.s index 2fc917e37..336e0fb85 100644 --- a/data/maps/ShoalCave_LowTideInnerRoom/header.s +++ b/data/maps/ShoalCave_LowTideInnerRoom/header.s @@ -12,4 +12,3 @@ ShoalCave_LowTideInnerRoom:: @ 8307294 .2byte 0 .byte 1 .byte 0 - diff --git a/data/maps/ShoalCave_LowTideLowerRoom/header.s b/data/maps/ShoalCave_LowTideLowerRoom/header.s index 425019148..83f4880b8 100644 --- a/data/maps/ShoalCave_LowTideLowerRoom/header.s +++ b/data/maps/ShoalCave_LowTideLowerRoom/header.s @@ -12,4 +12,3 @@ ShoalCave_LowTideLowerRoom:: @ 83072CC .2byte 0 .byte 1 .byte 0 - diff --git a/data/maps/ShoalCave_LowTideStairsRoom/header.s b/data/maps/ShoalCave_LowTideStairsRoom/header.s index 2b3ea0ba4..493b20d70 100644 --- a/data/maps/ShoalCave_LowTideStairsRoom/header.s +++ b/data/maps/ShoalCave_LowTideStairsRoom/header.s @@ -12,4 +12,3 @@ ShoalCave_LowTideStairsRoom:: @ 83072B0 .2byte 0 .byte 1 .byte 0 - diff --git a/data/maps/SingleBattleColosseum/header.s b/data/maps/SingleBattleColosseum/header.s index b1458e54f..b88c1871f 100644 --- a/data/maps/SingleBattleColosseum/header.s +++ b/data/maps/SingleBattleColosseum/header.s @@ -12,4 +12,3 @@ SingleBattleColosseum:: @ 8307978 .2byte 0 .byte 0 .byte 8 - diff --git a/data/maps/SkyPillar_1F/header.s b/data/maps/SkyPillar_1F/header.s index 82bbafe45..5615e0435 100644 --- a/data/maps/SkyPillar_1F/header.s +++ b/data/maps/SkyPillar_1F/header.s @@ -12,4 +12,3 @@ SkyPillar_1F:: @ 8307614 .2byte 0 .byte 1 .byte 0 - diff --git a/data/maps/SkyPillar_2F/header.s b/data/maps/SkyPillar_2F/header.s index b27955859..66f8370fb 100644 --- a/data/maps/SkyPillar_2F/header.s +++ b/data/maps/SkyPillar_2F/header.s @@ -12,4 +12,3 @@ SkyPillar_2F:: @ 8307630 .2byte 0 .byte 1 .byte 0 - diff --git a/data/maps/SkyPillar_3F/header.s b/data/maps/SkyPillar_3F/header.s index cd9aae845..d802e24b7 100644 --- a/data/maps/SkyPillar_3F/header.s +++ b/data/maps/SkyPillar_3F/header.s @@ -12,4 +12,3 @@ SkyPillar_3F:: @ 830764C .2byte 0 .byte 1 .byte 0 - diff --git a/data/maps/SkyPillar_4F/header.s b/data/maps/SkyPillar_4F/header.s index a07f93d26..13ec76ff3 100644 --- a/data/maps/SkyPillar_4F/header.s +++ b/data/maps/SkyPillar_4F/header.s @@ -12,4 +12,3 @@ SkyPillar_4F:: @ 8307668 .2byte 0 .byte 1 .byte 0 - diff --git a/data/maps/SkyPillar_5F/header.s b/data/maps/SkyPillar_5F/header.s index 0f525ceed..40ec34f4f 100644 --- a/data/maps/SkyPillar_5F/header.s +++ b/data/maps/SkyPillar_5F/header.s @@ -12,4 +12,3 @@ SkyPillar_5F:: @ 83076A0 .2byte 0 .byte 1 .byte 0 - diff --git a/data/maps/SkyPillar_Entrance/header.s b/data/maps/SkyPillar_Entrance/header.s index d6c85d434..0c939e3c1 100644 --- a/data/maps/SkyPillar_Entrance/header.s +++ b/data/maps/SkyPillar_Entrance/header.s @@ -12,4 +12,3 @@ SkyPillar_Entrance:: @ 83075DC .2byte 0 .byte 1 .byte 0 - diff --git a/data/maps/SkyPillar_Outside/header.s b/data/maps/SkyPillar_Outside/header.s index de2207fe5..8f33ab11a 100644 --- a/data/maps/SkyPillar_Outside/header.s +++ b/data/maps/SkyPillar_Outside/header.s @@ -12,4 +12,3 @@ SkyPillar_Outside:: @ 83075F8 .2byte 0 .byte 1 .byte 0 - diff --git a/data/maps/SkyPillar_Top/header.s b/data/maps/SkyPillar_Top/header.s index fef3ce3e2..3c2e00f24 100644 --- a/data/maps/SkyPillar_Top/header.s +++ b/data/maps/SkyPillar_Top/header.s @@ -12,4 +12,3 @@ SkyPillar_Top:: @ 83076BC .2byte 0 .byte 1 .byte 0 - diff --git a/data/maps/SlateportCity/connections.s b/data/maps/SlateportCity/connections.s index 1ccbb7d15..659e02a94 100644 --- a/data/maps/SlateportCity/connections.s +++ b/data/maps/SlateportCity/connections.s @@ -6,4 +6,3 @@ SlateportCity_MapConnectionsList:: @ 8308704 SlateportCity_MapConnections:: @ 8308728 .4byte 0x3 .4byte SlateportCity_MapConnectionsList - diff --git a/data/maps/SlateportCity/header.s b/data/maps/SlateportCity/header.s index c44092e65..fa955af6c 100644 --- a/data/maps/SlateportCity/header.s +++ b/data/maps/SlateportCity/header.s @@ -12,4 +12,3 @@ SlateportCity:: @ 8305464 .2byte 0 .byte 1 .byte 0 - diff --git a/data/maps/SlateportCity_ContestHall/header.s b/data/maps/SlateportCity_ContestHall/header.s index 7f0a884ff..ee9992dcd 100644 --- a/data/maps/SlateportCity_ContestHall/header.s +++ b/data/maps/SlateportCity_ContestHall/header.s @@ -12,4 +12,3 @@ SlateportCity_ContestHall:: @ 8306034 .2byte 0 .byte 0 .byte 0 - diff --git a/data/maps/SlateportCity_ContestLobby/header.s b/data/maps/SlateportCity_ContestLobby/header.s index 39dffacbf..f13a37da5 100644 --- a/data/maps/SlateportCity_ContestLobby/header.s +++ b/data/maps/SlateportCity_ContestLobby/header.s @@ -12,4 +12,3 @@ SlateportCity_ContestLobby:: @ 8306018 .2byte 0 .byte 0 .byte 0 - diff --git a/data/maps/SlateportCity_Harbor/header.s b/data/maps/SlateportCity_Harbor/header.s index 2f1e08407..645b5fc26 100644 --- a/data/maps/SlateportCity_Harbor/header.s +++ b/data/maps/SlateportCity_Harbor/header.s @@ -12,4 +12,3 @@ SlateportCity_Harbor:: @ 83060C0 .2byte 0 .byte 0 .byte 0 - diff --git a/data/maps/SlateportCity_House1/header.s b/data/maps/SlateportCity_House1/header.s index fbff176d8..e5234ad62 100644 --- a/data/maps/SlateportCity_House1/header.s +++ b/data/maps/SlateportCity_House1/header.s @@ -12,4 +12,3 @@ SlateportCity_House1:: @ 8306050 .2byte 0 .byte 0 .byte 0 - diff --git a/data/maps/SlateportCity_House2/header.s b/data/maps/SlateportCity_House2/header.s index 730fb9ec1..78c67b4d2 100644 --- a/data/maps/SlateportCity_House2/header.s +++ b/data/maps/SlateportCity_House2/header.s @@ -12,4 +12,3 @@ SlateportCity_House2:: @ 83060DC .2byte 0 .byte 0 .byte 0 - diff --git a/data/maps/SlateportCity_Mart/header.s b/data/maps/SlateportCity_Mart/header.s index 33d746d81..8f2ea7d2f 100644 --- a/data/maps/SlateportCity_Mart/header.s +++ b/data/maps/SlateportCity_Mart/header.s @@ -12,4 +12,3 @@ SlateportCity_Mart:: @ 8306130 .2byte 0 .byte 0 .byte 0 - diff --git a/data/maps/SlateportCity_OceanicMuseum_1F/header.s b/data/maps/SlateportCity_OceanicMuseum_1F/header.s index 3c8010f30..1b2b8f012 100644 --- a/data/maps/SlateportCity_OceanicMuseum_1F/header.s +++ b/data/maps/SlateportCity_OceanicMuseum_1F/header.s @@ -12,4 +12,3 @@ SlateportCity_OceanicMuseum_1F:: @ 8306088 .2byte 0 .byte 0 .byte 0 - diff --git a/data/maps/SlateportCity_OceanicMuseum_2F/header.s b/data/maps/SlateportCity_OceanicMuseum_2F/header.s index fabf1104e..f9c6b095a 100644 --- a/data/maps/SlateportCity_OceanicMuseum_2F/header.s +++ b/data/maps/SlateportCity_OceanicMuseum_2F/header.s @@ -12,4 +12,3 @@ SlateportCity_OceanicMuseum_2F:: @ 83060A4 .2byte 0 .byte 0 .byte 0 - diff --git a/data/maps/SlateportCity_PokemonCenter_1F/header.s b/data/maps/SlateportCity_PokemonCenter_1F/header.s index 411260dc8..5d9803150 100644 --- a/data/maps/SlateportCity_PokemonCenter_1F/header.s +++ b/data/maps/SlateportCity_PokemonCenter_1F/header.s @@ -12,4 +12,3 @@ SlateportCity_PokemonCenter_1F:: @ 83060F8 .2byte 0 .byte 0 .byte 0 - diff --git a/data/maps/SlateportCity_PokemonCenter_2F/header.s b/data/maps/SlateportCity_PokemonCenter_2F/header.s index 00172d0f9..2b46a3d59 100644 --- a/data/maps/SlateportCity_PokemonCenter_2F/header.s +++ b/data/maps/SlateportCity_PokemonCenter_2F/header.s @@ -12,4 +12,3 @@ SlateportCity_PokemonCenter_2F:: @ 8306114 .2byte 0 .byte 0 .byte 0 - diff --git a/data/maps/SlateportCity_PokemonFanClub/header.s b/data/maps/SlateportCity_PokemonFanClub/header.s index 12634f994..1f5a697be 100644 --- a/data/maps/SlateportCity_PokemonFanClub/header.s +++ b/data/maps/SlateportCity_PokemonFanClub/header.s @@ -12,4 +12,3 @@ SlateportCity_PokemonFanClub:: @ 830606C .2byte 0 .byte 0 .byte 0 - diff --git a/data/maps/SlateportCity_SternsShipyard_1F/header.s b/data/maps/SlateportCity_SternsShipyard_1F/header.s index 72d24c67b..3b25c7156 100644 --- a/data/maps/SlateportCity_SternsShipyard_1F/header.s +++ b/data/maps/SlateportCity_SternsShipyard_1F/header.s @@ -12,4 +12,3 @@ SlateportCity_SternsShipyard_1F:: @ 8305FE0 .2byte 0 .byte 0 .byte 0 - diff --git a/data/maps/SlateportCity_SternsShipyard_2F/header.s b/data/maps/SlateportCity_SternsShipyard_2F/header.s index 7093672d5..51b30bc7a 100644 --- a/data/maps/SlateportCity_SternsShipyard_2F/header.s +++ b/data/maps/SlateportCity_SternsShipyard_2F/header.s @@ -12,4 +12,3 @@ SlateportCity_SternsShipyard_2F:: @ 8305FFC .2byte 0 .byte 0 .byte 0 - diff --git a/data/maps/SootopolisCity/header.s b/data/maps/SootopolisCity/header.s index f8dcc52b1..031cad1ae 100644 --- a/data/maps/SootopolisCity/header.s +++ b/data/maps/SootopolisCity/header.s @@ -12,4 +12,3 @@ SootopolisCity:: @ 830550C .2byte 0 .byte 1 .byte 0 - diff --git a/data/maps/SootopolisCity_Gym_1F/header.s b/data/maps/SootopolisCity_Gym_1F/header.s index 04c88dc91..1340c63b0 100644 --- a/data/maps/SootopolisCity_Gym_1F/header.s +++ b/data/maps/SootopolisCity_Gym_1F/header.s @@ -12,4 +12,3 @@ SootopolisCity_Gym_1F:: @ 830692C .2byte 0 .byte 0 .byte 1 - diff --git a/data/maps/SootopolisCity_Gym_B1F/header.s b/data/maps/SootopolisCity_Gym_B1F/header.s index 33927d780..eb76e37c5 100644 --- a/data/maps/SootopolisCity_Gym_B1F/header.s +++ b/data/maps/SootopolisCity_Gym_B1F/header.s @@ -12,4 +12,3 @@ SootopolisCity_Gym_B1F:: @ 8306948 .2byte 0 .byte 0 .byte 1 - diff --git a/data/maps/SootopolisCity_House1/header.s b/data/maps/SootopolisCity_House1/header.s index a5e9515f4..b51fbf189 100644 --- a/data/maps/SootopolisCity_House1/header.s +++ b/data/maps/SootopolisCity_House1/header.s @@ -12,4 +12,3 @@ SootopolisCity_House1:: @ 83069B8 .2byte 0 .byte 0 .byte 0 - diff --git a/data/maps/SootopolisCity_House2/header.s b/data/maps/SootopolisCity_House2/header.s index ffe14bd60..e3860a6b3 100644 --- a/data/maps/SootopolisCity_House2/header.s +++ b/data/maps/SootopolisCity_House2/header.s @@ -12,4 +12,3 @@ SootopolisCity_House2:: @ 83069D4 .2byte 0 .byte 0 .byte 0 - diff --git a/data/maps/SootopolisCity_House3/header.s b/data/maps/SootopolisCity_House3/header.s index 9efaa48d5..6f1b628eb 100644 --- a/data/maps/SootopolisCity_House3/header.s +++ b/data/maps/SootopolisCity_House3/header.s @@ -12,4 +12,3 @@ SootopolisCity_House3:: @ 83069F0 .2byte 0 .byte 0 .byte 0 - diff --git a/data/maps/SootopolisCity_House4/header.s b/data/maps/SootopolisCity_House4/header.s index 03ba1b809..9ceb8e015 100644 --- a/data/maps/SootopolisCity_House4/header.s +++ b/data/maps/SootopolisCity_House4/header.s @@ -12,4 +12,3 @@ SootopolisCity_House4:: @ 8306A0C .2byte 0 .byte 0 .byte 0 - diff --git a/data/maps/SootopolisCity_House5/header.s b/data/maps/SootopolisCity_House5/header.s index b85197d68..fd245fdb5 100644 --- a/data/maps/SootopolisCity_House5/header.s +++ b/data/maps/SootopolisCity_House5/header.s @@ -12,4 +12,3 @@ SootopolisCity_House5:: @ 8306A28 .2byte 0 .byte 0 .byte 0 - diff --git a/data/maps/SootopolisCity_House6/header.s b/data/maps/SootopolisCity_House6/header.s index 0fdde3c15..c430f1053 100644 --- a/data/maps/SootopolisCity_House6/header.s +++ b/data/maps/SootopolisCity_House6/header.s @@ -12,4 +12,3 @@ SootopolisCity_House6:: @ 8306A44 .2byte 0 .byte 0 .byte 0 - diff --git a/data/maps/SootopolisCity_House7/header.s b/data/maps/SootopolisCity_House7/header.s index f89aadb3a..349759d09 100644 --- a/data/maps/SootopolisCity_House7/header.s +++ b/data/maps/SootopolisCity_House7/header.s @@ -12,4 +12,3 @@ SootopolisCity_House7:: @ 8306A60 .2byte 0 .byte 0 .byte 0 - diff --git a/data/maps/SootopolisCity_House8/header.s b/data/maps/SootopolisCity_House8/header.s index 7e4549c35..0e75ce398 100644 --- a/data/maps/SootopolisCity_House8/header.s +++ b/data/maps/SootopolisCity_House8/header.s @@ -12,4 +12,3 @@ SootopolisCity_House8:: @ 8306A7C .2byte 0 .byte 0 .byte 0 - diff --git a/data/maps/SootopolisCity_Mart/header.s b/data/maps/SootopolisCity_Mart/header.s index 737b1e315..72ac17601 100644 --- a/data/maps/SootopolisCity_Mart/header.s +++ b/data/maps/SootopolisCity_Mart/header.s @@ -12,4 +12,3 @@ SootopolisCity_Mart:: @ 830699C .2byte 0 .byte 0 .byte 0 - diff --git a/data/maps/SootopolisCity_PokemonCenter_1F/header.s b/data/maps/SootopolisCity_PokemonCenter_1F/header.s index e984a7058..f226fa0db 100644 --- a/data/maps/SootopolisCity_PokemonCenter_1F/header.s +++ b/data/maps/SootopolisCity_PokemonCenter_1F/header.s @@ -12,4 +12,3 @@ SootopolisCity_PokemonCenter_1F:: @ 8306964 .2byte 0 .byte 0 .byte 0 - diff --git a/data/maps/SootopolisCity_PokemonCenter_2F/header.s b/data/maps/SootopolisCity_PokemonCenter_2F/header.s index 04ea7184c..a7a4124d7 100644 --- a/data/maps/SootopolisCity_PokemonCenter_2F/header.s +++ b/data/maps/SootopolisCity_PokemonCenter_2F/header.s @@ -12,4 +12,3 @@ SootopolisCity_PokemonCenter_2F:: @ 8306980 .2byte 0 .byte 0 .byte 0 - diff --git a/data/maps/SouthernIsland_Exterior/header.s b/data/maps/SouthernIsland_Exterior/header.s index cca809d70..a4953b8c3 100644 --- a/data/maps/SouthernIsland_Exterior/header.s +++ b/data/maps/SouthernIsland_Exterior/header.s @@ -12,4 +12,3 @@ SouthernIsland_Exterior:: @ 8307CA4 .2byte 0 .byte 1 .byte 0 - diff --git a/data/maps/SouthernIsland_Interior/header.s b/data/maps/SouthernIsland_Interior/header.s index d4de36ff1..a9a63850e 100644 --- a/data/maps/SouthernIsland_Interior/header.s +++ b/data/maps/SouthernIsland_Interior/header.s @@ -12,4 +12,3 @@ SouthernIsland_Interior:: @ 8307CC0 .2byte 0 .byte 1 .byte 0 - diff --git a/data/maps/TradeCenter/header.s b/data/maps/TradeCenter/header.s index 245690ad6..0e9a83b16 100644 --- a/data/maps/TradeCenter/header.s +++ b/data/maps/TradeCenter/header.s @@ -12,4 +12,3 @@ TradeCenter:: @ 8307994 .2byte 0 .byte 0 .byte 0 - diff --git a/data/maps/Underwater1/connections.s b/data/maps/Underwater1/connections.s index f898dd6f7..96c6f61ff 100644 --- a/data/maps/Underwater1/connections.s +++ b/data/maps/Underwater1/connections.s @@ -5,4 +5,3 @@ Underwater1_MapConnectionsList:: @ 8308D10 Underwater1_MapConnections:: @ 8308D28 .4byte 0x2 .4byte Underwater1_MapConnectionsList - diff --git a/data/maps/Underwater1/header.s b/data/maps/Underwater1/header.s index 6941ac85a..f45ee7621 100644 --- a/data/maps/Underwater1/header.s +++ b/data/maps/Underwater1/header.s @@ -12,4 +12,3 @@ Underwater1:: @ 83059C0 .2byte 0 .byte 1 .byte 0 - diff --git a/data/maps/Underwater2/connections.s b/data/maps/Underwater2/connections.s index 80f305b4d..9aca4b1cf 100644 --- a/data/maps/Underwater2/connections.s +++ b/data/maps/Underwater2/connections.s @@ -6,4 +6,3 @@ Underwater2_MapConnectionsList:: @ 8308D30 Underwater2_MapConnections:: @ 8308D54 .4byte 0x3 .4byte Underwater2_MapConnectionsList - diff --git a/data/maps/Underwater2/header.s b/data/maps/Underwater2/header.s index 887c465be..b1dbc13ca 100644 --- a/data/maps/Underwater2/header.s +++ b/data/maps/Underwater2/header.s @@ -12,4 +12,3 @@ Underwater2:: @ 83059DC .2byte 0 .byte 1 .byte 0 - diff --git a/data/maps/Underwater3/connections.s b/data/maps/Underwater3/connections.s index bcc435893..1b57eb6ce 100644 --- a/data/maps/Underwater3/connections.s +++ b/data/maps/Underwater3/connections.s @@ -6,4 +6,3 @@ Underwater3_MapConnectionsList:: @ 8308D5C Underwater3_MapConnections:: @ 8308D80 .4byte 0x3 .4byte Underwater3_MapConnectionsList - diff --git a/data/maps/Underwater3/header.s b/data/maps/Underwater3/header.s index 88ce8253d..97fa5e3af 100644 --- a/data/maps/Underwater3/header.s +++ b/data/maps/Underwater3/header.s @@ -12,4 +12,3 @@ Underwater3:: @ 83059F8 .2byte 0 .byte 1 .byte 0 - diff --git a/data/maps/Underwater4/connections.s b/data/maps/Underwater4/connections.s index a2e01faf3..ed7346c86 100644 --- a/data/maps/Underwater4/connections.s +++ b/data/maps/Underwater4/connections.s @@ -5,4 +5,3 @@ Underwater4_MapConnectionsList:: @ 8308D88 Underwater4_MapConnections:: @ 8308DA0 .4byte 0x2 .4byte Underwater4_MapConnectionsList - diff --git a/data/maps/Underwater4/header.s b/data/maps/Underwater4/header.s index d8624334e..f77f787cd 100644 --- a/data/maps/Underwater4/header.s +++ b/data/maps/Underwater4/header.s @@ -12,4 +12,3 @@ Underwater4:: @ 8305A14 .2byte 0 .byte 1 .byte 0 - diff --git a/data/maps/Underwater_Route134/header.s b/data/maps/Underwater_Route134/header.s index e6e1240ec..8d63e07ca 100644 --- a/data/maps/Underwater_Route134/header.s +++ b/data/maps/Underwater_Route134/header.s @@ -12,4 +12,3 @@ Underwater_Route134:: @ 83074FC .2byte 0 .byte 1 .byte 0 - diff --git a/data/maps/Underwater_SeafloorCavern/header.s b/data/maps/Underwater_SeafloorCavern/header.s index f2abedf3a..a97092503 100644 --- a/data/maps/Underwater_SeafloorCavern/header.s +++ b/data/maps/Underwater_SeafloorCavern/header.s @@ -12,4 +12,3 @@ Underwater_SeafloorCavern:: @ 8307048 .2byte 0 .byte 1 .byte 0 - diff --git a/data/maps/Underwater_SealedChamber/header.s b/data/maps/Underwater_SealedChamber/header.s index d0cca5ac5..82c4aa247 100644 --- a/data/maps/Underwater_SealedChamber/header.s +++ b/data/maps/Underwater_SealedChamber/header.s @@ -12,4 +12,3 @@ Underwater_SealedChamber:: @ 8307518 .2byte 0 .byte 1 .byte 0 - diff --git a/data/maps/Underwater_SootopolisCity/header.s b/data/maps/Underwater_SootopolisCity/header.s index 675354732..45952ef31 100644 --- a/data/maps/Underwater_SootopolisCity/header.s +++ b/data/maps/Underwater_SootopolisCity/header.s @@ -12,4 +12,3 @@ Underwater_SootopolisCity:: @ 8306DFC .2byte 0 .byte 1 .byte 0 - diff --git a/data/maps/UnknownMap_25_29/header.s b/data/maps/UnknownMap_25_29/header.s index e255354ec..e374b01b9 100644 --- a/data/maps/UnknownMap_25_29/header.s +++ b/data/maps/UnknownMap_25_29/header.s @@ -12,4 +12,3 @@ UnknownMap_25_29:: @ 8307A04 .2byte 0 .byte 0 .byte 0 - diff --git a/data/maps/UnknownMap_25_30/header.s b/data/maps/UnknownMap_25_30/header.s index 965cb5601..944f176c7 100644 --- a/data/maps/UnknownMap_25_30/header.s +++ b/data/maps/UnknownMap_25_30/header.s @@ -12,4 +12,3 @@ UnknownMap_25_30:: @ 8307A20 .2byte 0 .byte 0 .byte 0 - diff --git a/data/maps/UnknownMap_25_31/header.s b/data/maps/UnknownMap_25_31/header.s index 88791a122..53f848a22 100644 --- a/data/maps/UnknownMap_25_31/header.s +++ b/data/maps/UnknownMap_25_31/header.s @@ -12,4 +12,3 @@ UnknownMap_25_31:: @ 8307A3C .2byte 0 .byte 0 .byte 0 - diff --git a/data/maps/UnknownMap_25_32/header.s b/data/maps/UnknownMap_25_32/header.s index 2447edb10..024e18dcb 100644 --- a/data/maps/UnknownMap_25_32/header.s +++ b/data/maps/UnknownMap_25_32/header.s @@ -12,4 +12,3 @@ UnknownMap_25_32:: @ 8307A58 .2byte 0 .byte 0 .byte 0 - diff --git a/data/maps/UnknownMap_25_33/header.s b/data/maps/UnknownMap_25_33/header.s index 1236ec9d1..ed0e5949d 100644 --- a/data/maps/UnknownMap_25_33/header.s +++ b/data/maps/UnknownMap_25_33/header.s @@ -12,4 +12,3 @@ UnknownMap_25_33:: @ 8307A74 .2byte 0 .byte 0 .byte 0 - diff --git a/data/maps/UnknownMap_25_34/header.s b/data/maps/UnknownMap_25_34/header.s index 69a090f05..5bf079b9d 100644 --- a/data/maps/UnknownMap_25_34/header.s +++ b/data/maps/UnknownMap_25_34/header.s @@ -12,4 +12,3 @@ UnknownMap_25_34:: @ 8307A90 .2byte 0 .byte 0 .byte 0 - diff --git a/data/maps/VerdanturfTown/connections.s b/data/maps/VerdanturfTown/connections.s index f2b6b7767..b5bd990bc 100644 --- a/data/maps/VerdanturfTown/connections.s +++ b/data/maps/VerdanturfTown/connections.s @@ -5,4 +5,3 @@ VerdanturfTown_MapConnectionsList:: @ 83086A4 VerdanturfTown_MapConnections:: @ 83086BC .4byte 0x2 .4byte VerdanturfTown_MapConnectionsList - diff --git a/data/maps/VerdanturfTown/header.s b/data/maps/VerdanturfTown/header.s index c2a02a8f5..a1b78bffa 100644 --- a/data/maps/VerdanturfTown/header.s +++ b/data/maps/VerdanturfTown/header.s @@ -12,4 +12,3 @@ VerdanturfTown:: @ 83055D0 .2byte 0 .byte 1 .byte 0 - diff --git a/data/maps/VerdanturfTown_ContestHall/header.s b/data/maps/VerdanturfTown_ContestHall/header.s index 2394e9648..e9db05aa6 100644 --- a/data/maps/VerdanturfTown_ContestHall/header.s +++ b/data/maps/VerdanturfTown_ContestHall/header.s @@ -12,4 +12,3 @@ VerdanturfTown_ContestHall:: @ 8305D94 .2byte 0 .byte 0 .byte 0 - diff --git a/data/maps/VerdanturfTown_ContestLobby/header.s b/data/maps/VerdanturfTown_ContestLobby/header.s index b3b3a0272..1cc278802 100644 --- a/data/maps/VerdanturfTown_ContestLobby/header.s +++ b/data/maps/VerdanturfTown_ContestLobby/header.s @@ -12,4 +12,3 @@ VerdanturfTown_ContestLobby:: @ 8305D78 .2byte 0 .byte 0 .byte 0 - diff --git a/data/maps/VerdanturfTown_FriendshipRatersHouse/header.s b/data/maps/VerdanturfTown_FriendshipRatersHouse/header.s index 8b7040e9f..81a460b8a 100644 --- a/data/maps/VerdanturfTown_FriendshipRatersHouse/header.s +++ b/data/maps/VerdanturfTown_FriendshipRatersHouse/header.s @@ -12,4 +12,3 @@ VerdanturfTown_FriendshipRatersHouse:: @ 8305E20 .2byte 0 .byte 0 .byte 0 - diff --git a/data/maps/VerdanturfTown_House/header.s b/data/maps/VerdanturfTown_House/header.s index d6c0aa37c..94f779ddc 100644 --- a/data/maps/VerdanturfTown_House/header.s +++ b/data/maps/VerdanturfTown_House/header.s @@ -12,4 +12,3 @@ VerdanturfTown_House:: @ 8305E3C .2byte 0 .byte 0 .byte 0 - diff --git a/data/maps/VerdanturfTown_Mart/header.s b/data/maps/VerdanturfTown_Mart/header.s index bea481cc0..8deafb2d3 100644 --- a/data/maps/VerdanturfTown_Mart/header.s +++ b/data/maps/VerdanturfTown_Mart/header.s @@ -12,4 +12,3 @@ VerdanturfTown_Mart:: @ 8305DB0 .2byte 0 .byte 0 .byte 0 - diff --git a/data/maps/VerdanturfTown_PokemonCenter_1F/header.s b/data/maps/VerdanturfTown_PokemonCenter_1F/header.s index e77090aa4..739f16fce 100644 --- a/data/maps/VerdanturfTown_PokemonCenter_1F/header.s +++ b/data/maps/VerdanturfTown_PokemonCenter_1F/header.s @@ -12,4 +12,3 @@ VerdanturfTown_PokemonCenter_1F:: @ 8305DCC .2byte 0 .byte 0 .byte 0 - diff --git a/data/maps/VerdanturfTown_PokemonCenter_2F/header.s b/data/maps/VerdanturfTown_PokemonCenter_2F/header.s index d3550c240..9e61645dc 100644 --- a/data/maps/VerdanturfTown_PokemonCenter_2F/header.s +++ b/data/maps/VerdanturfTown_PokemonCenter_2F/header.s @@ -12,4 +12,3 @@ VerdanturfTown_PokemonCenter_2F:: @ 8305DE8 .2byte 0 .byte 0 .byte 0 - diff --git a/data/maps/VerdanturfTown_WandasHouse/header.s b/data/maps/VerdanturfTown_WandasHouse/header.s index 5e5a697f5..99438c19b 100644 --- a/data/maps/VerdanturfTown_WandasHouse/header.s +++ b/data/maps/VerdanturfTown_WandasHouse/header.s @@ -12,4 +12,3 @@ VerdanturfTown_WandasHouse:: @ 8305E04 .2byte 0 .byte 0 .byte 0 - diff --git a/data/maps/VictoryRoad_1F/header.s b/data/maps/VictoryRoad_1F/header.s index e4b62cdd5..d0446cbd7 100644 --- a/data/maps/VictoryRoad_1F/header.s +++ b/data/maps/VictoryRoad_1F/header.s @@ -12,4 +12,3 @@ VictoryRoad_1F:: @ 8307224 .2byte 0 .byte 1 .byte 0 - diff --git a/data/maps/VictoryRoad_B1F/header.s b/data/maps/VictoryRoad_B1F/header.s index 40f7a58e4..7d1d01f08 100644 --- a/data/maps/VictoryRoad_B1F/header.s +++ b/data/maps/VictoryRoad_B1F/header.s @@ -12,4 +12,3 @@ VictoryRoad_B1F:: @ 8307240 .2byte 0 .byte 1 .byte 0 - diff --git a/data/maps/VictoryRoad_B2F/header.s b/data/maps/VictoryRoad_B2F/header.s index fa9047510..7014ef865 100644 --- a/data/maps/VictoryRoad_B2F/header.s +++ b/data/maps/VictoryRoad_B2F/header.s @@ -12,4 +12,3 @@ VictoryRoad_B2F:: @ 830725C .2byte 0 .byte 1 .byte 0 - diff --git a/data/maps/_assets.s b/data/maps/_assets.s index 1297bbd69..9a3b742eb 100644 --- a/data/maps/_assets.s +++ b/data/maps/_assets.s @@ -4703,4 +4703,3 @@ SkyPillar_Top_MapAttributes:: @ 8304F00 .4byte SkyPillar_Top_MapBlockdata .4byte gTileset_General .4byte gTileset_Pacifidlog - diff --git a/data/maps/_groups.s b/data/maps/_groups.s index e4ea931f6..e7a96f23a 100644 --- a/data/maps/_groups.s +++ b/data/maps/_groups.s @@ -459,4 +459,3 @@ gMapGroup32:: @ 8308578 gMapGroup33:: @ 8308584 .4byte Route124_DivingTreasureHuntersHouse - diff --git a/data/maps/events/AbandonedShip_CaptainsOffice.s b/data/maps/events/AbandonedShip_CaptainsOffice.s index ab3cdc682..e05bee18c 100644 --- a/data/maps/events/AbandonedShip_CaptainsOffice.s +++ b/data/maps/events/AbandonedShip_CaptainsOffice.s @@ -8,4 +8,3 @@ AbandonedShip_CaptainsOffice_MapWarps:: @ 838E48C AbandonedShip_CaptainsOffice_MapEvents:: @ 838E49C map_events AbandonedShip_CaptainsOffice_MapObjects, AbandonedShip_CaptainsOffice_MapWarps, 0x0, 0x0 - diff --git a/data/maps/events/AbandonedShip_Corridors_1F.s b/data/maps/events/AbandonedShip_Corridors_1F.s index 35218874f..8a42d3204 100644 --- a/data/maps/events/AbandonedShip_Corridors_1F.s +++ b/data/maps/events/AbandonedShip_Corridors_1F.s @@ -18,4 +18,3 @@ AbandonedShip_Corridors_1F_MapWarps:: @ 838E150 AbandonedShip_Corridors_1F_MapEvents:: @ 838E1B0 map_events AbandonedShip_Corridors_1F_MapObjects, AbandonedShip_Corridors_1F_MapWarps, 0x0, 0x0 - diff --git a/data/maps/events/AbandonedShip_Corridors_B1F.s b/data/maps/events/AbandonedShip_Corridors_B1F.s index 42766d63d..7b50cf2fe 100644 --- a/data/maps/events/AbandonedShip_Corridors_B1F.s +++ b/data/maps/events/AbandonedShip_Corridors_B1F.s @@ -17,4 +17,3 @@ AbandonedShip_Corridors_B1F_MapBGEvents:: @ 838E2A8 AbandonedShip_Corridors_B1F_MapEvents:: @ 838E2B4 map_events AbandonedShip_Corridors_B1F_MapObjects, AbandonedShip_Corridors_B1F_MapWarps, 0x0, AbandonedShip_Corridors_B1F_MapBGEvents - diff --git a/data/maps/events/AbandonedShip_Deck.s b/data/maps/events/AbandonedShip_Deck.s index 5246e92ae..6988f8568 100644 --- a/data/maps/events/AbandonedShip_Deck.s +++ b/data/maps/events/AbandonedShip_Deck.s @@ -7,4 +7,3 @@ AbandonedShip_Deck_MapWarps:: @ 838E0E4 AbandonedShip_Deck_MapEvents:: @ 838E10C map_events 0x0, AbandonedShip_Deck_MapWarps, 0x0, 0x0 - diff --git a/data/maps/events/AbandonedShip_HiddenFloorCorridors.s b/data/maps/events/AbandonedShip_HiddenFloorCorridors.s index 8f60ea32a..e5f17046d 100644 --- a/data/maps/events/AbandonedShip_HiddenFloorCorridors.s +++ b/data/maps/events/AbandonedShip_HiddenFloorCorridors.s @@ -14,4 +14,3 @@ AbandonedShip_HiddenFloorCorridors_MapBGEvents:: @ 838E4FC AbandonedShip_HiddenFloorCorridors_MapEvents:: @ 838E52C map_events 0x0, AbandonedShip_HiddenFloorCorridors_MapWarps, 0x0, AbandonedShip_HiddenFloorCorridors_MapBGEvents - diff --git a/data/maps/events/AbandonedShip_HiddenFloorRooms.s b/data/maps/events/AbandonedShip_HiddenFloorRooms.s index 2a5bb2ecc..e110e051d 100644 --- a/data/maps/events/AbandonedShip_HiddenFloorRooms.s +++ b/data/maps/events/AbandonedShip_HiddenFloorRooms.s @@ -29,4 +29,3 @@ AbandonedShip_HiddenFloorRooms_MapBGEvents:: @ 838E5E8 AbandonedShip_HiddenFloorRooms_MapEvents:: @ 838E660 map_events AbandonedShip_HiddenFloorRooms_MapObjects, AbandonedShip_HiddenFloorRooms_MapWarps, 0x0, AbandonedShip_HiddenFloorRooms_MapBGEvents - diff --git a/data/maps/events/AbandonedShip_Room_B1F.s b/data/maps/events/AbandonedShip_Room_B1F.s index 27b93348a..9213f3e98 100644 --- a/data/maps/events/AbandonedShip_Room_B1F.s +++ b/data/maps/events/AbandonedShip_Room_B1F.s @@ -7,4 +7,3 @@ AbandonedShip_Room_B1F_MapWarps:: @ 838E3C4 AbandonedShip_Room_B1F_MapEvents:: @ 838E3D4 map_events AbandonedShip_Room_B1F_MapObjects, AbandonedShip_Room_B1F_MapWarps, 0x0, 0x0 - diff --git a/data/maps/events/AbandonedShip_Rooms2_1F.s b/data/maps/events/AbandonedShip_Rooms2_1F.s index 82f981e3c..842f972fa 100644 --- a/data/maps/events/AbandonedShip_Rooms2_1F.s +++ b/data/maps/events/AbandonedShip_Rooms2_1F.s @@ -10,4 +10,3 @@ AbandonedShip_Rooms2_1F_MapWarps:: @ 838E430 AbandonedShip_Rooms2_1F_MapEvents:: @ 838E448 map_events AbandonedShip_Rooms2_1F_MapObjects, AbandonedShip_Rooms2_1F_MapWarps, 0x0, 0x0 - diff --git a/data/maps/events/AbandonedShip_Rooms2_B1F.s b/data/maps/events/AbandonedShip_Rooms2_B1F.s index 23a7751aa..2ad55a5e9 100644 --- a/data/maps/events/AbandonedShip_Rooms2_B1F.s +++ b/data/maps/events/AbandonedShip_Rooms2_B1F.s @@ -10,4 +10,3 @@ AbandonedShip_Rooms2_B1F_MapWarps:: @ 838E354 AbandonedShip_Rooms2_B1F_MapEvents:: @ 838E374 map_events AbandonedShip_Rooms2_B1F_MapObjects, AbandonedShip_Rooms2_B1F_MapWarps, 0x0, 0x0 - diff --git a/data/maps/events/AbandonedShip_Rooms_1F.s b/data/maps/events/AbandonedShip_Rooms_1F.s index f1d37bafd..90578df28 100644 --- a/data/maps/events/AbandonedShip_Rooms_1F.s +++ b/data/maps/events/AbandonedShip_Rooms_1F.s @@ -12,4 +12,3 @@ AbandonedShip_Rooms_1F_MapWarps:: @ 838E1F4 AbandonedShip_Rooms_1F_MapEvents:: @ 838E224 map_events AbandonedShip_Rooms_1F_MapObjects, AbandonedShip_Rooms_1F_MapWarps, 0x0, 0x0 - diff --git a/data/maps/events/AbandonedShip_Rooms_B1F.s b/data/maps/events/AbandonedShip_Rooms_B1F.s index 8d7264820..692883bec 100644 --- a/data/maps/events/AbandonedShip_Rooms_B1F.s +++ b/data/maps/events/AbandonedShip_Rooms_B1F.s @@ -9,4 +9,3 @@ AbandonedShip_Rooms_B1F_MapWarps:: @ 838E2F8 AbandonedShip_Rooms_B1F_MapEvents:: @ 838E310 map_events AbandonedShip_Rooms_B1F_MapObjects, AbandonedShip_Rooms_B1F_MapWarps, 0x0, 0x0 - diff --git a/data/maps/events/AbandonedShip_Underwater1.s b/data/maps/events/AbandonedShip_Underwater1.s index c6e7adf24..9a4634860 100644 --- a/data/maps/events/AbandonedShip_Underwater1.s +++ b/data/maps/events/AbandonedShip_Underwater1.s @@ -4,4 +4,3 @@ AbandonedShip_Underwater1_MapWarps:: @ 838E388 AbandonedShip_Underwater1_MapEvents:: @ 838E398 map_events 0x0, AbandonedShip_Underwater1_MapWarps, 0x0, 0x0 - diff --git a/data/maps/events/AbandonedShip_Underwater2.s b/data/maps/events/AbandonedShip_Underwater2.s index d6bb65101..a3a181773 100644 --- a/data/maps/events/AbandonedShip_Underwater2.s +++ b/data/maps/events/AbandonedShip_Underwater2.s @@ -3,4 +3,3 @@ AbandonedShip_Underwater2_MapWarps:: @ 838E4B0 AbandonedShip_Underwater2_MapEvents:: @ 838E4B8 map_events 0x0, AbandonedShip_Underwater2_MapWarps, 0x0, 0x0 - diff --git a/data/maps/events/AncientTomb.s b/data/maps/events/AncientTomb.s index d3a5b2051..1f527288b 100644 --- a/data/maps/events/AncientTomb.s +++ b/data/maps/events/AncientTomb.s @@ -13,4 +13,3 @@ AncientTomb_MapBGEvents:: @ 838E70C AncientTomb_MapEvents:: @ 838E730 map_events AncientTomb_MapObjects, AncientTomb_MapWarps, 0x0, AncientTomb_MapBGEvents - diff --git a/data/maps/events/AquaHideout_1F.s b/data/maps/events/AquaHideout_1F.s index c23236788..5c59bbf12 100644 --- a/data/maps/events/AquaHideout_1F.s +++ b/data/maps/events/AquaHideout_1F.s @@ -10,4 +10,3 @@ AquaHideout_1F_MapWarps:: @ 838CD54 AquaHideout_1F_MapEvents:: @ 838CD6C map_events AquaHideout_1F_MapObjects, AquaHideout_1F_MapWarps, 0x0, 0x0 - diff --git a/data/maps/events/AquaHideout_B1F.s b/data/maps/events/AquaHideout_B1F.s index 7f1235a81..742761833 100644 --- a/data/maps/events/AquaHideout_B1F.s +++ b/data/maps/events/AquaHideout_B1F.s @@ -37,4 +37,3 @@ AquaHideout_B1F_MapWarps:: @ 838CE40 AquaHideout_B1F_MapEvents:: @ 838CF08 map_events AquaHideout_B1F_MapObjects, AquaHideout_B1F_MapWarps, 0x0, 0x0 - diff --git a/data/maps/events/AquaHideout_B2F.s b/data/maps/events/AquaHideout_B2F.s index 112e431fe..d2cce8ab9 100644 --- a/data/maps/events/AquaHideout_B2F.s +++ b/data/maps/events/AquaHideout_B2F.s @@ -23,4 +23,3 @@ AquaHideout_B2F_MapCoordEvents:: @ 838CFE4 AquaHideout_B2F_MapEvents:: @ 838D004 map_events AquaHideout_B2F_MapObjects, AquaHideout_B2F_MapWarps, AquaHideout_B2F_MapCoordEvents, 0x0 - diff --git a/data/maps/events/BattleTower_BattleRoom.s b/data/maps/events/BattleTower_BattleRoom.s index 161bf8a2f..dda5621b6 100644 --- a/data/maps/events/BattleTower_BattleRoom.s +++ b/data/maps/events/BattleTower_BattleRoom.s @@ -8,4 +8,3 @@ BattleTower_BattleRoom_MapWarps:: @ 8391DDC BattleTower_BattleRoom_MapEvents:: @ 8391DEC map_events BattleTower_BattleRoom_MapObjects, BattleTower_BattleRoom_MapWarps, 0x0, 0x0 - diff --git a/data/maps/events/BattleTower_Corridor.s b/data/maps/events/BattleTower_Corridor.s index 07f7b23f5..33b5a779c 100644 --- a/data/maps/events/BattleTower_Corridor.s +++ b/data/maps/events/BattleTower_Corridor.s @@ -3,4 +3,3 @@ BattleTower_Corridor_MapObjects:: @ 8391D80 BattleTower_Corridor_MapEvents:: @ 8391D98 map_events BattleTower_Corridor_MapObjects, 0x0, 0x0, 0x0 - diff --git a/data/maps/events/BattleTower_Elevator.s b/data/maps/events/BattleTower_Elevator.s index 37e14df01..7594028b6 100644 --- a/data/maps/events/BattleTower_Elevator.s +++ b/data/maps/events/BattleTower_Elevator.s @@ -3,4 +3,3 @@ BattleTower_Elevator_MapObjects:: @ 8391D54 BattleTower_Elevator_MapEvents:: @ 8391D6C map_events BattleTower_Elevator_MapObjects, 0x0, 0x0, 0x0 - diff --git a/data/maps/events/BattleTower_Lobby.s b/data/maps/events/BattleTower_Lobby.s index a61e6eaa7..6d4e15f7a 100644 --- a/data/maps/events/BattleTower_Lobby.s +++ b/data/maps/events/BattleTower_Lobby.s @@ -16,4 +16,3 @@ BattleTower_Lobby_MapBGEvents:: @ 8391D34 BattleTower_Lobby_MapEvents:: @ 8391D40 map_events BattleTower_Lobby_MapObjects, BattleTower_Lobby_MapWarps, 0x0, BattleTower_Lobby_MapBGEvents - diff --git a/data/maps/events/BattleTower_Outside.s b/data/maps/events/BattleTower_Outside.s index 5ffb86b0a..04085c346 100644 --- a/data/maps/events/BattleTower_Outside.s +++ b/data/maps/events/BattleTower_Outside.s @@ -13,4 +13,3 @@ BattleTower_Outside_MapBGEvents:: @ 8391C6C BattleTower_Outside_MapEvents:: @ 8391C78 map_events BattleTower_Outside_MapObjects, BattleTower_Outside_MapWarps, 0x0, BattleTower_Outside_MapBGEvents - diff --git a/data/maps/events/CaveOfOrigin_1F.s b/data/maps/events/CaveOfOrigin_1F.s index 8e97e7761..43b0b615d 100644 --- a/data/maps/events/CaveOfOrigin_1F.s +++ b/data/maps/events/CaveOfOrigin_1F.s @@ -9,4 +9,3 @@ CaveOfOrigin_1F_MapCoordEvents:: @ 838D728 CaveOfOrigin_1F_MapEvents:: @ 838D758 map_events 0x0, CaveOfOrigin_1F_MapWarps, CaveOfOrigin_1F_MapCoordEvents, 0x0 - diff --git a/data/maps/events/CaveOfOrigin_B1F.s b/data/maps/events/CaveOfOrigin_B1F.s index 733582664..0a3df0655 100644 --- a/data/maps/events/CaveOfOrigin_B1F.s +++ b/data/maps/events/CaveOfOrigin_B1F.s @@ -9,4 +9,3 @@ CaveOfOrigin_B1F_MapCoordEvents:: @ 838D77C CaveOfOrigin_B1F_MapEvents:: @ 838D7AC map_events 0x0, CaveOfOrigin_B1F_MapWarps, CaveOfOrigin_B1F_MapCoordEvents, 0x0 - diff --git a/data/maps/events/CaveOfOrigin_B2F.s b/data/maps/events/CaveOfOrigin_B2F.s index 90f1d2681..9c04629f0 100644 --- a/data/maps/events/CaveOfOrigin_B2F.s +++ b/data/maps/events/CaveOfOrigin_B2F.s @@ -9,4 +9,3 @@ CaveOfOrigin_B2F_MapCoordEvents:: @ 838D7D0 CaveOfOrigin_B2F_MapEvents:: @ 838D800 map_events 0x0, CaveOfOrigin_B2F_MapWarps, CaveOfOrigin_B2F_MapCoordEvents, 0x0 - diff --git a/data/maps/events/CaveOfOrigin_B3F.s b/data/maps/events/CaveOfOrigin_B3F.s index 774164c52..0d0b44eea 100644 --- a/data/maps/events/CaveOfOrigin_B3F.s +++ b/data/maps/events/CaveOfOrigin_B3F.s @@ -12,4 +12,3 @@ CaveOfOrigin_B3F_MapCoordEvents:: @ 838D83C CaveOfOrigin_B3F_MapEvents:: @ 838D86C map_events CaveOfOrigin_B3F_MapObjects, CaveOfOrigin_B3F_MapWarps, CaveOfOrigin_B3F_MapCoordEvents, 0x0 - diff --git a/data/maps/events/CaveOfOrigin_B4F.s b/data/maps/events/CaveOfOrigin_B4F.s index 353ef25b9..3b4beb038 100644 --- a/data/maps/events/CaveOfOrigin_B4F.s +++ b/data/maps/events/CaveOfOrigin_B4F.s @@ -11,4 +11,3 @@ CaveOfOrigin_B4F_MapCoordEvents:: @ 838D8A0 CaveOfOrigin_B4F_MapEvents:: @ 838D8D0 map_events CaveOfOrigin_B4F_MapObjects, CaveOfOrigin_B4F_MapWarps, CaveOfOrigin_B4F_MapCoordEvents, 0x0 - diff --git a/data/maps/events/CaveOfOrigin_Entrance.s b/data/maps/events/CaveOfOrigin_Entrance.s index 8adbba9d4..4e61e3d82 100644 --- a/data/maps/events/CaveOfOrigin_Entrance.s +++ b/data/maps/events/CaveOfOrigin_Entrance.s @@ -4,4 +4,3 @@ CaveOfOrigin_Entrance_MapWarps:: @ 838D6F4 CaveOfOrigin_Entrance_MapEvents:: @ 838D704 map_events 0x0, CaveOfOrigin_Entrance_MapWarps, 0x0, 0x0 - diff --git a/data/maps/events/DesertRuins.s b/data/maps/events/DesertRuins.s index 2e0508adb..849c7f729 100644 --- a/data/maps/events/DesertRuins.s +++ b/data/maps/events/DesertRuins.s @@ -13,4 +13,3 @@ DesertRuins_MapBGEvents:: @ 838BEEC DesertRuins_MapEvents:: @ 838BF10 map_events DesertRuins_MapObjects, DesertRuins_MapWarps, 0x0, DesertRuins_MapBGEvents - diff --git a/data/maps/events/DewfordTown.s b/data/maps/events/DewfordTown.s index 77b2a72e9..8a5fc1fed 100644 --- a/data/maps/events/DewfordTown.s +++ b/data/maps/events/DewfordTown.s @@ -21,4 +21,3 @@ DewfordTown_MapBGEvents:: @ 8380C28 DewfordTown_MapEvents:: @ 8380C64 map_events DewfordTown_MapObjects, DewfordTown_MapWarps, 0x0, DewfordTown_MapBGEvents - diff --git a/data/maps/events/DewfordTown_Gym.s b/data/maps/events/DewfordTown_Gym.s index 0eb8606bb..2e36395c1 100644 --- a/data/maps/events/DewfordTown_Gym.s +++ b/data/maps/events/DewfordTown_Gym.s @@ -17,4 +17,3 @@ DewfordTown_Gym_MapBGEvents:: @ 8386044 DewfordTown_Gym_MapEvents:: @ 8386074 map_events DewfordTown_Gym_MapObjects, DewfordTown_Gym_MapWarps, 0x0, DewfordTown_Gym_MapBGEvents - diff --git a/data/maps/events/DewfordTown_Hall.s b/data/maps/events/DewfordTown_Hall.s index 1aa3b84fb..d58fbfbd4 100644 --- a/data/maps/events/DewfordTown_Hall.s +++ b/data/maps/events/DewfordTown_Hall.s @@ -19,4 +19,3 @@ DewfordTown_Hall_MapBGEvents:: @ 8386170 DewfordTown_Hall_MapEvents:: @ 8386188 map_events DewfordTown_Hall_MapObjects, DewfordTown_Hall_MapWarps, 0x0, DewfordTown_Hall_MapBGEvents - diff --git a/data/maps/events/DewfordTown_House1.s b/data/maps/events/DewfordTown_House1.s index 2faf40276..9bed6ac7a 100644 --- a/data/maps/events/DewfordTown_House1.s +++ b/data/maps/events/DewfordTown_House1.s @@ -9,4 +9,3 @@ DewfordTown_House1_MapWarps:: @ 8385EA0 DewfordTown_House1_MapEvents:: @ 8385EB0 map_events DewfordTown_House1_MapObjects, DewfordTown_House1_MapWarps, 0x0, 0x0 - diff --git a/data/maps/events/DewfordTown_House2.s b/data/maps/events/DewfordTown_House2.s index ab8d6eab9..eae9ff28e 100644 --- a/data/maps/events/DewfordTown_House2.s +++ b/data/maps/events/DewfordTown_House2.s @@ -8,4 +8,3 @@ DewfordTown_House2_MapWarps:: @ 83861CC DewfordTown_House2_MapEvents:: @ 83861DC map_events DewfordTown_House2_MapObjects, DewfordTown_House2_MapWarps, 0x0, 0x0 - diff --git a/data/maps/events/DewfordTown_PokemonCenter_1F.s b/data/maps/events/DewfordTown_PokemonCenter_1F.s index 8ff89ab68..a870483b3 100644 --- a/data/maps/events/DewfordTown_PokemonCenter_1F.s +++ b/data/maps/events/DewfordTown_PokemonCenter_1F.s @@ -10,4 +10,3 @@ DewfordTown_PokemonCenter_1F_MapWarps:: @ 8385F0C DewfordTown_PokemonCenter_1F_MapEvents:: @ 8385F24 map_events DewfordTown_PokemonCenter_1F_MapObjects, DewfordTown_PokemonCenter_1F_MapWarps, 0x0, 0x0 - diff --git a/data/maps/events/DewfordTown_PokemonCenter_2F.s b/data/maps/events/DewfordTown_PokemonCenter_2F.s index 81dcd1573..0d17672de 100644 --- a/data/maps/events/DewfordTown_PokemonCenter_2F.s +++ b/data/maps/events/DewfordTown_PokemonCenter_2F.s @@ -12,4 +12,3 @@ DewfordTown_PokemonCenter_2F_MapWarps:: @ 8385F80 DewfordTown_PokemonCenter_2F_MapEvents:: @ 8385FA8 map_events DewfordTown_PokemonCenter_2F_MapObjects, DewfordTown_PokemonCenter_2F_MapWarps, 0x0, 0x0 - diff --git a/data/maps/events/DoubleBattleColosseum.s b/data/maps/events/DoubleBattleColosseum.s index 94e077e78..f6142c4b4 100644 --- a/data/maps/events/DoubleBattleColosseum.s +++ b/data/maps/events/DoubleBattleColosseum.s @@ -12,4 +12,3 @@ DoubleBattleColosseum_MapCoordEvents:: @ 8391448 DoubleBattleColosseum_MapEvents:: @ 8391488 map_events 0x0, DoubleBattleColosseum_MapWarps, DoubleBattleColosseum_MapCoordEvents, 0x0 - diff --git a/data/maps/events/EverGrandeCity.s b/data/maps/events/EverGrandeCity.s index fd9270eb6..41fd48f06 100644 --- a/data/maps/events/EverGrandeCity.s +++ b/data/maps/events/EverGrandeCity.s @@ -26,4 +26,3 @@ EverGrandeCity_MapBGEvents:: @ 83808AC EverGrandeCity_MapEvents:: @ 83808E8 map_events 0x0, EverGrandeCity_MapWarps, EverGrandeCity_MapCoordEvents, EverGrandeCity_MapBGEvents - diff --git a/data/maps/events/EverGrandeCity_ChampionsRoom.s b/data/maps/events/EverGrandeCity_ChampionsRoom.s index 4a1d90085..5d97fe89c 100644 --- a/data/maps/events/EverGrandeCity_ChampionsRoom.s +++ b/data/maps/events/EverGrandeCity_ChampionsRoom.s @@ -9,4 +9,3 @@ EverGrandeCity_ChampionsRoom_MapWarps:: @ 838B37C EverGrandeCity_ChampionsRoom_MapEvents:: @ 838B38C map_events EverGrandeCity_ChampionsRoom_MapObjects, EverGrandeCity_ChampionsRoom_MapWarps, 0x0, 0x0 - diff --git a/data/maps/events/EverGrandeCity_Corridor1.s b/data/maps/events/EverGrandeCity_Corridor1.s index d9b3964ca..df9176426 100644 --- a/data/maps/events/EverGrandeCity_Corridor1.s +++ b/data/maps/events/EverGrandeCity_Corridor1.s @@ -6,4 +6,3 @@ EverGrandeCity_Corridor1_MapWarps:: @ 838B3A0 EverGrandeCity_Corridor1_MapEvents:: @ 838B3C0 map_events 0x0, EverGrandeCity_Corridor1_MapWarps, 0x0, 0x0 - diff --git a/data/maps/events/EverGrandeCity_Corridor2.s b/data/maps/events/EverGrandeCity_Corridor2.s index acd3875e4..35dfa181c 100644 --- a/data/maps/events/EverGrandeCity_Corridor2.s +++ b/data/maps/events/EverGrandeCity_Corridor2.s @@ -6,4 +6,3 @@ EverGrandeCity_Corridor2_MapWarps:: @ 838B3D4 EverGrandeCity_Corridor2_MapEvents:: @ 838B3F4 map_events 0x0, EverGrandeCity_Corridor2_MapWarps, 0x0, 0x0 - diff --git a/data/maps/events/EverGrandeCity_Corridor3.s b/data/maps/events/EverGrandeCity_Corridor3.s index 53b3357c8..daf135a5f 100644 --- a/data/maps/events/EverGrandeCity_Corridor3.s +++ b/data/maps/events/EverGrandeCity_Corridor3.s @@ -6,4 +6,3 @@ EverGrandeCity_Corridor3_MapWarps:: @ 838B408 EverGrandeCity_Corridor3_MapEvents:: @ 838B428 map_events 0x0, EverGrandeCity_Corridor3_MapWarps, 0x0, 0x0 - diff --git a/data/maps/events/EverGrandeCity_Corridor4.s b/data/maps/events/EverGrandeCity_Corridor4.s index d53d63404..55757ea4c 100644 --- a/data/maps/events/EverGrandeCity_Corridor4.s +++ b/data/maps/events/EverGrandeCity_Corridor4.s @@ -4,4 +4,3 @@ EverGrandeCity_Corridor4_MapWarps:: @ 838B43C EverGrandeCity_Corridor4_MapEvents:: @ 838B44C map_events 0x0, EverGrandeCity_Corridor4_MapWarps, 0x0, 0x0 - diff --git a/data/maps/events/EverGrandeCity_Corridor5.s b/data/maps/events/EverGrandeCity_Corridor5.s index e4fbbbd53..bd07dd7e0 100644 --- a/data/maps/events/EverGrandeCity_Corridor5.s +++ b/data/maps/events/EverGrandeCity_Corridor5.s @@ -6,4 +6,3 @@ EverGrandeCity_Corridor5_MapWarps:: @ 838B460 EverGrandeCity_Corridor5_MapEvents:: @ 838B480 map_events 0x0, EverGrandeCity_Corridor5_MapWarps, 0x0, 0x0 - diff --git a/data/maps/events/EverGrandeCity_DrakesRoom.s b/data/maps/events/EverGrandeCity_DrakesRoom.s index 72b4c3170..a925ffed8 100644 --- a/data/maps/events/EverGrandeCity_DrakesRoom.s +++ b/data/maps/events/EverGrandeCity_DrakesRoom.s @@ -7,4 +7,3 @@ EverGrandeCity_DrakesRoom_MapWarps:: @ 838B310 EverGrandeCity_DrakesRoom_MapEvents:: @ 838B320 map_events EverGrandeCity_DrakesRoom_MapObjects, EverGrandeCity_DrakesRoom_MapWarps, 0x0, 0x0 - diff --git a/data/maps/events/EverGrandeCity_GlaciasRoom.s b/data/maps/events/EverGrandeCity_GlaciasRoom.s index 87ee60dee..806cfe7e1 100644 --- a/data/maps/events/EverGrandeCity_GlaciasRoom.s +++ b/data/maps/events/EverGrandeCity_GlaciasRoom.s @@ -7,4 +7,3 @@ EverGrandeCity_GlaciasRoom_MapWarps:: @ 838B2D4 EverGrandeCity_GlaciasRoom_MapEvents:: @ 838B2E4 map_events EverGrandeCity_GlaciasRoom_MapObjects, EverGrandeCity_GlaciasRoom_MapWarps, 0x0, 0x0 - diff --git a/data/maps/events/EverGrandeCity_HallOfFame.s b/data/maps/events/EverGrandeCity_HallOfFame.s index e610ee5dc..1860ee397 100644 --- a/data/maps/events/EverGrandeCity_HallOfFame.s +++ b/data/maps/events/EverGrandeCity_HallOfFame.s @@ -6,4 +6,3 @@ EverGrandeCity_HallOfFame_MapWarps:: @ 838B540 EverGrandeCity_HallOfFame_MapEvents:: @ 838B548 map_events EverGrandeCity_HallOfFame_MapObjects, EverGrandeCity_HallOfFame_MapWarps, 0x0, 0x0 - diff --git a/data/maps/events/EverGrandeCity_PhoebesRoom.s b/data/maps/events/EverGrandeCity_PhoebesRoom.s index 1401900f8..aab61bcf4 100644 --- a/data/maps/events/EverGrandeCity_PhoebesRoom.s +++ b/data/maps/events/EverGrandeCity_PhoebesRoom.s @@ -7,4 +7,3 @@ EverGrandeCity_PhoebesRoom_MapWarps:: @ 838B298 EverGrandeCity_PhoebesRoom_MapEvents:: @ 838B2A8 map_events EverGrandeCity_PhoebesRoom_MapObjects, EverGrandeCity_PhoebesRoom_MapWarps, 0x0, 0x0 - diff --git a/data/maps/events/EverGrandeCity_PokemonCenter_1F.s b/data/maps/events/EverGrandeCity_PokemonCenter_1F.s index 27497731d..25aee1300 100644 --- a/data/maps/events/EverGrandeCity_PokemonCenter_1F.s +++ b/data/maps/events/EverGrandeCity_PokemonCenter_1F.s @@ -10,4 +10,3 @@ EverGrandeCity_PokemonCenter_1F_MapWarps:: @ 838B5A4 EverGrandeCity_PokemonCenter_1F_MapEvents:: @ 838B5BC map_events EverGrandeCity_PokemonCenter_1F_MapObjects, EverGrandeCity_PokemonCenter_1F_MapWarps, 0x0, 0x0 - diff --git a/data/maps/events/EverGrandeCity_PokemonCenter_2F.s b/data/maps/events/EverGrandeCity_PokemonCenter_2F.s index 7bd153239..2bc94cdcc 100644 --- a/data/maps/events/EverGrandeCity_PokemonCenter_2F.s +++ b/data/maps/events/EverGrandeCity_PokemonCenter_2F.s @@ -12,4 +12,3 @@ EverGrandeCity_PokemonCenter_2F_MapWarps:: @ 838B618 EverGrandeCity_PokemonCenter_2F_MapEvents:: @ 838B640 map_events EverGrandeCity_PokemonCenter_2F_MapObjects, EverGrandeCity_PokemonCenter_2F_MapWarps, 0x0, 0x0 - diff --git a/data/maps/events/EverGrandeCity_PokemonLeague.s b/data/maps/events/EverGrandeCity_PokemonLeague.s index 3e759a22f..d60761727 100644 --- a/data/maps/events/EverGrandeCity_PokemonLeague.s +++ b/data/maps/events/EverGrandeCity_PokemonLeague.s @@ -12,4 +12,3 @@ EverGrandeCity_PokemonLeague_MapWarps:: @ 838B4F4 EverGrandeCity_PokemonLeague_MapEvents:: @ 838B514 map_events EverGrandeCity_PokemonLeague_MapObjects, EverGrandeCity_PokemonLeague_MapWarps, 0x0, 0x0 - diff --git a/data/maps/events/EverGrandeCity_SidneysRoom.s b/data/maps/events/EverGrandeCity_SidneysRoom.s index 4c73e643d..ff370d4ef 100644 --- a/data/maps/events/EverGrandeCity_SidneysRoom.s +++ b/data/maps/events/EverGrandeCity_SidneysRoom.s @@ -7,4 +7,3 @@ EverGrandeCity_SidneysRoom_MapWarps:: @ 838B25C EverGrandeCity_SidneysRoom_MapEvents:: @ 838B26C map_events EverGrandeCity_SidneysRoom_MapObjects, EverGrandeCity_SidneysRoom_MapWarps, 0x0, 0x0 - diff --git a/data/maps/events/FallarborTown.s b/data/maps/events/FallarborTown.s index e98657297..2d69688e7 100644 --- a/data/maps/events/FallarborTown.s +++ b/data/maps/events/FallarborTown.s @@ -23,4 +23,3 @@ FallarborTown_MapBGEvents:: @ 8380E8C FallarborTown_MapEvents:: @ 8380EEC map_events FallarborTown_MapObjects, FallarborTown_MapWarps, 0x0, FallarborTown_MapBGEvents - diff --git a/data/maps/events/FallarborTown_ContestHall.s b/data/maps/events/FallarborTown_ContestHall.s index 90fe5d71b..93b43eccc 100644 --- a/data/maps/events/FallarborTown_ContestHall.s +++ b/data/maps/events/FallarborTown_ContestHall.s @@ -13,4 +13,3 @@ FallarborTown_ContestHall_MapBGEvents:: @ 8386834 FallarborTown_ContestHall_MapEvents:: @ 838684C map_events FallarborTown_ContestHall_MapObjects, FallarborTown_ContestHall_MapWarps, 0x0, FallarborTown_ContestHall_MapBGEvents - diff --git a/data/maps/events/FallarborTown_ContestLobby.s b/data/maps/events/FallarborTown_ContestLobby.s index 7ae34cad6..af7ca5ed1 100644 --- a/data/maps/events/FallarborTown_ContestLobby.s +++ b/data/maps/events/FallarborTown_ContestLobby.s @@ -19,4 +19,3 @@ FallarborTown_ContestLobby_MapBGEvents:: @ 8386798 FallarborTown_ContestLobby_MapEvents:: @ 83867C8 map_events FallarborTown_ContestLobby_MapObjects, FallarborTown_ContestLobby_MapWarps, 0x0, FallarborTown_ContestLobby_MapBGEvents - diff --git a/data/maps/events/FallarborTown_House1.s b/data/maps/events/FallarborTown_House1.s index 5ed16a6ea..d4cd3e0c9 100644 --- a/data/maps/events/FallarborTown_House1.s +++ b/data/maps/events/FallarborTown_House1.s @@ -8,4 +8,3 @@ FallarborTown_House1_MapWarps:: @ 83869A0 FallarborTown_House1_MapEvents:: @ 83869B0 map_events FallarborTown_House1_MapObjects, FallarborTown_House1_MapWarps, 0x0, 0x0 - diff --git a/data/maps/events/FallarborTown_House2.s b/data/maps/events/FallarborTown_House2.s index dd5061663..0b1c64162 100644 --- a/data/maps/events/FallarborTown_House2.s +++ b/data/maps/events/FallarborTown_House2.s @@ -7,4 +7,3 @@ FallarborTown_House2_MapWarps:: @ 83869DC FallarborTown_House2_MapEvents:: @ 83869EC map_events FallarborTown_House2_MapObjects, FallarborTown_House2_MapWarps, 0x0, 0x0 - diff --git a/data/maps/events/FallarborTown_Mart.s b/data/maps/events/FallarborTown_Mart.s index 5548e4d43..584b70447 100644 --- a/data/maps/events/FallarborTown_Mart.s +++ b/data/maps/events/FallarborTown_Mart.s @@ -10,4 +10,3 @@ FallarborTown_Mart_MapWarps:: @ 83866CC FallarborTown_Mart_MapEvents:: @ 83866DC map_events FallarborTown_Mart_MapObjects, FallarborTown_Mart_MapWarps, 0x0, 0x0 - diff --git a/data/maps/events/FallarborTown_PokemonCenter_1F.s b/data/maps/events/FallarborTown_PokemonCenter_1F.s index 2282928ba..16f90af9d 100644 --- a/data/maps/events/FallarborTown_PokemonCenter_1F.s +++ b/data/maps/events/FallarborTown_PokemonCenter_1F.s @@ -11,4 +11,3 @@ FallarborTown_PokemonCenter_1F_MapWarps:: @ 83868C0 FallarborTown_PokemonCenter_1F_MapEvents:: @ 83868D8 map_events FallarborTown_PokemonCenter_1F_MapObjects, FallarborTown_PokemonCenter_1F_MapWarps, 0x0, 0x0 - diff --git a/data/maps/events/FallarborTown_PokemonCenter_2F.s b/data/maps/events/FallarborTown_PokemonCenter_2F.s index 61d042023..05ea78f75 100644 --- a/data/maps/events/FallarborTown_PokemonCenter_2F.s +++ b/data/maps/events/FallarborTown_PokemonCenter_2F.s @@ -12,4 +12,3 @@ FallarborTown_PokemonCenter_2F_MapWarps:: @ 8386934 FallarborTown_PokemonCenter_2F_MapEvents:: @ 838695C map_events FallarborTown_PokemonCenter_2F_MapObjects, FallarborTown_PokemonCenter_2F_MapWarps, 0x0, 0x0 - diff --git a/data/maps/events/FieryPath.s b/data/maps/events/FieryPath.s index ba51ffb89..01b7b3efe 100644 --- a/data/maps/events/FieryPath.s +++ b/data/maps/events/FieryPath.s @@ -14,4 +14,3 @@ FieryPath_MapWarps:: @ 838C7D8 FieryPath_MapEvents:: @ 838C7E8 map_events FieryPath_MapObjects, FieryPath_MapWarps, 0x0, 0x0 - diff --git a/data/maps/events/FortreeCity.s b/data/maps/events/FortreeCity.s index 4e2d1e97b..437852d25 100644 --- a/data/maps/events/FortreeCity.s +++ b/data/maps/events/FortreeCity.s @@ -28,4 +28,3 @@ FortreeCity_MapBGEvents:: @ 8380110 FortreeCity_MapEvents:: @ 8380158 map_events FortreeCity_MapObjects, FortreeCity_MapWarps, 0x0, FortreeCity_MapBGEvents - diff --git a/data/maps/events/FortreeCity_DecorationShop.s b/data/maps/events/FortreeCity_DecorationShop.s index 1283fe593..cc9894b5c 100644 --- a/data/maps/events/FortreeCity_DecorationShop.s +++ b/data/maps/events/FortreeCity_DecorationShop.s @@ -10,4 +10,3 @@ FortreeCity_DecorationShop_MapWarps:: @ 8389440 FortreeCity_DecorationShop_MapEvents:: @ 8389450 map_events FortreeCity_DecorationShop_MapObjects, FortreeCity_DecorationShop_MapWarps, 0x0, 0x0 - diff --git a/data/maps/events/FortreeCity_Gym.s b/data/maps/events/FortreeCity_Gym.s index 7427a7ab1..ad983f81b 100644 --- a/data/maps/events/FortreeCity_Gym.s +++ b/data/maps/events/FortreeCity_Gym.s @@ -16,4 +16,3 @@ FortreeCity_Gym_MapBGEvents:: @ 83890B8 FortreeCity_Gym_MapEvents:: @ 83890D0 map_events FortreeCity_Gym_MapObjects, FortreeCity_Gym_MapWarps, 0x0, FortreeCity_Gym_MapBGEvents - diff --git a/data/maps/events/FortreeCity_House1.s b/data/maps/events/FortreeCity_House1.s index f687cd86a..ff383b464 100644 --- a/data/maps/events/FortreeCity_House1.s +++ b/data/maps/events/FortreeCity_House1.s @@ -9,4 +9,3 @@ FortreeCity_House1_MapWarps:: @ 8388FF4 FortreeCity_House1_MapEvents:: @ 8389004 map_events FortreeCity_House1_MapObjects, FortreeCity_House1_MapWarps, 0x0, 0x0 - diff --git a/data/maps/events/FortreeCity_House2.s b/data/maps/events/FortreeCity_House2.s index 9e9fea410..3b0943b2e 100644 --- a/data/maps/events/FortreeCity_House2.s +++ b/data/maps/events/FortreeCity_House2.s @@ -7,4 +7,3 @@ FortreeCity_House2_MapWarps:: @ 8389290 FortreeCity_House2_MapEvents:: @ 83892A0 map_events FortreeCity_House2_MapObjects, FortreeCity_House2_MapWarps, 0x0, 0x0 - diff --git a/data/maps/events/FortreeCity_House3.s b/data/maps/events/FortreeCity_House3.s index c4970c754..b0b5a7412 100644 --- a/data/maps/events/FortreeCity_House3.s +++ b/data/maps/events/FortreeCity_House3.s @@ -8,4 +8,3 @@ FortreeCity_House3_MapWarps:: @ 83892E4 FortreeCity_House3_MapEvents:: @ 83892F4 map_events FortreeCity_House3_MapObjects, FortreeCity_House3_MapWarps, 0x0, 0x0 - diff --git a/data/maps/events/FortreeCity_House4.s b/data/maps/events/FortreeCity_House4.s index c4ac000bd..8b85660c7 100644 --- a/data/maps/events/FortreeCity_House4.s +++ b/data/maps/events/FortreeCity_House4.s @@ -9,4 +9,3 @@ FortreeCity_House4_MapWarps:: @ 8389350 FortreeCity_House4_MapEvents:: @ 8389360 map_events FortreeCity_House4_MapObjects, FortreeCity_House4_MapWarps, 0x0, 0x0 - diff --git a/data/maps/events/FortreeCity_House5.s b/data/maps/events/FortreeCity_House5.s index eba77eada..ffaa59e69 100644 --- a/data/maps/events/FortreeCity_House5.s +++ b/data/maps/events/FortreeCity_House5.s @@ -9,4 +9,3 @@ FortreeCity_House5_MapWarps:: @ 83893BC FortreeCity_House5_MapEvents:: @ 83893CC map_events FortreeCity_House5_MapObjects, FortreeCity_House5_MapWarps, 0x0, 0x0 - diff --git a/data/maps/events/FortreeCity_Mart.s b/data/maps/events/FortreeCity_Mart.s index 0e88f0598..5d1996fc2 100644 --- a/data/maps/events/FortreeCity_Mart.s +++ b/data/maps/events/FortreeCity_Mart.s @@ -10,4 +10,3 @@ FortreeCity_Mart_MapWarps:: @ 8389254 FortreeCity_Mart_MapEvents:: @ 8389264 map_events FortreeCity_Mart_MapObjects, FortreeCity_Mart_MapWarps, 0x0, 0x0 - diff --git a/data/maps/events/FortreeCity_PokemonCenter_1F.s b/data/maps/events/FortreeCity_PokemonCenter_1F.s index dd81d8351..bd7877e24 100644 --- a/data/maps/events/FortreeCity_PokemonCenter_1F.s +++ b/data/maps/events/FortreeCity_PokemonCenter_1F.s @@ -11,4 +11,3 @@ FortreeCity_PokemonCenter_1F_MapWarps:: @ 8389144 FortreeCity_PokemonCenter_1F_MapEvents:: @ 838915C map_events FortreeCity_PokemonCenter_1F_MapObjects, FortreeCity_PokemonCenter_1F_MapWarps, 0x0, 0x0 - diff --git a/data/maps/events/FortreeCity_PokemonCenter_2F.s b/data/maps/events/FortreeCity_PokemonCenter_2F.s index c23083513..b6a10428c 100644 --- a/data/maps/events/FortreeCity_PokemonCenter_2F.s +++ b/data/maps/events/FortreeCity_PokemonCenter_2F.s @@ -12,4 +12,3 @@ FortreeCity_PokemonCenter_2F_MapWarps:: @ 83891B8 FortreeCity_PokemonCenter_2F_MapEvents:: @ 83891E0 map_events FortreeCity_PokemonCenter_2F_MapObjects, FortreeCity_PokemonCenter_2F_MapWarps, 0x0, 0x0 - diff --git a/data/maps/events/GraniteCave_1F.s b/data/maps/events/GraniteCave_1F.s index 8ed16ccd8..760c1b0e9 100644 --- a/data/maps/events/GraniteCave_1F.s +++ b/data/maps/events/GraniteCave_1F.s @@ -10,4 +10,3 @@ GraniteCave_1F_MapWarps:: @ 838BF54 GraniteCave_1F_MapEvents:: @ 838BF74 map_events GraniteCave_1F_MapObjects, GraniteCave_1F_MapWarps, 0x0, 0x0 - diff --git a/data/maps/events/GraniteCave_B1F.s b/data/maps/events/GraniteCave_B1F.s index 2c2b4c2a2..2bfd8257d 100644 --- a/data/maps/events/GraniteCave_B1F.s +++ b/data/maps/events/GraniteCave_B1F.s @@ -12,4 +12,3 @@ GraniteCave_B1F_MapWarps:: @ 838BFA0 GraniteCave_B1F_MapEvents:: @ 838BFD8 map_events GraniteCave_B1F_MapObjects, GraniteCave_B1F_MapWarps, 0x0, 0x0 - diff --git a/data/maps/events/GraniteCave_B2F.s b/data/maps/events/GraniteCave_B2F.s index 014a11699..49c0bace0 100644 --- a/data/maps/events/GraniteCave_B2F.s +++ b/data/maps/events/GraniteCave_B2F.s @@ -22,4 +22,3 @@ GraniteCave_B2F_MapBGEvents:: @ 838C0EC GraniteCave_B2F_MapEvents:: @ 838C104 map_events GraniteCave_B2F_MapObjects, GraniteCave_B2F_MapWarps, 0x0, GraniteCave_B2F_MapBGEvents - diff --git a/data/maps/events/GraniteCave_StevensRoom.s b/data/maps/events/GraniteCave_StevensRoom.s index 812b0fc27..2e4d9cd30 100644 --- a/data/maps/events/GraniteCave_StevensRoom.s +++ b/data/maps/events/GraniteCave_StevensRoom.s @@ -6,4 +6,3 @@ GraniteCave_StevensRoom_MapWarps:: @ 838C130 GraniteCave_StevensRoom_MapEvents:: @ 838C138 map_events GraniteCave_StevensRoom_MapObjects, GraniteCave_StevensRoom_MapWarps, 0x0, 0x0 - diff --git a/data/maps/events/InsideOfTruck.s b/data/maps/events/InsideOfTruck.s index f0531d1dc..faf7a5274 100644 --- a/data/maps/events/InsideOfTruck.s +++ b/data/maps/events/InsideOfTruck.s @@ -22,4 +22,3 @@ InsideOfTruck_MapBGEvents:: @ 83916A8 InsideOfTruck_MapEvents:: @ 83916E4 map_events InsideOfTruck_MapObjects, InsideOfTruck_MapWarps, InsideOfTruck_MapCoordEvents, InsideOfTruck_MapBGEvents - diff --git a/data/maps/events/IslandCave.s b/data/maps/events/IslandCave.s index 72f7b9266..a3fbc959a 100644 --- a/data/maps/events/IslandCave.s +++ b/data/maps/events/IslandCave.s @@ -13,4 +13,3 @@ IslandCave_MapBGEvents:: @ 838E6A4 IslandCave_MapEvents:: @ 838E6C8 map_events IslandCave_MapObjects, IslandCave_MapWarps, 0x0, IslandCave_MapBGEvents - diff --git a/data/maps/events/JaggedPass.s b/data/maps/events/JaggedPass.s index 8267f504d..245871e9b 100644 --- a/data/maps/events/JaggedPass.s +++ b/data/maps/events/JaggedPass.s @@ -23,4 +23,3 @@ JaggedPass_MapBGEvents:: @ 838C6EC JaggedPass_MapEvents:: @ 838C704 map_events JaggedPass_MapObjects, JaggedPass_MapWarps, JaggedPass_MapCoordEvents, JaggedPass_MapBGEvents - diff --git a/data/maps/events/LavaridgeTown.s b/data/maps/events/LavaridgeTown.s index dc9c8c05f..47dd5ab4a 100644 --- a/data/maps/events/LavaridgeTown.s +++ b/data/maps/events/LavaridgeTown.s @@ -32,4 +32,3 @@ LavaridgeTown_MapBGEvents:: @ 8380D90 LavaridgeTown_MapEvents:: @ 8380DF0 map_events LavaridgeTown_MapObjects, LavaridgeTown_MapWarps, LavaridgeTown_MapCoordEvents, LavaridgeTown_MapBGEvents - diff --git a/data/maps/events/LavaridgeTown_Gym_1F.s b/data/maps/events/LavaridgeTown_Gym_1F.s index 2c28aaf2b..add699f5d 100644 --- a/data/maps/events/LavaridgeTown_Gym_1F.s +++ b/data/maps/events/LavaridgeTown_Gym_1F.s @@ -37,4 +37,3 @@ LavaridgeTown_Gym_1F_MapBGEvents:: @ 83863B4 LavaridgeTown_Gym_1F_MapEvents:: @ 83863CC map_events LavaridgeTown_Gym_1F_MapObjects, LavaridgeTown_Gym_1F_MapWarps, 0x0, LavaridgeTown_Gym_1F_MapBGEvents - diff --git a/data/maps/events/LavaridgeTown_Gym_B1F.s b/data/maps/events/LavaridgeTown_Gym_B1F.s index e3147dcb8..4cff944bc 100644 --- a/data/maps/events/LavaridgeTown_Gym_B1F.s +++ b/data/maps/events/LavaridgeTown_Gym_B1F.s @@ -22,4 +22,3 @@ LavaridgeTown_Gym_B1F_MapWarps:: @ 83863E0 LavaridgeTown_Gym_B1F_MapEvents:: @ 8386480 map_events 0x0, LavaridgeTown_Gym_B1F_MapWarps, 0x0, 0x0 - diff --git a/data/maps/events/LavaridgeTown_HerbShop.s b/data/maps/events/LavaridgeTown_HerbShop.s index b78ff8835..cb04b19d4 100644 --- a/data/maps/events/LavaridgeTown_HerbShop.s +++ b/data/maps/events/LavaridgeTown_HerbShop.s @@ -9,4 +9,3 @@ LavaridgeTown_HerbShop_MapWarps:: @ 8386238 LavaridgeTown_HerbShop_MapEvents:: @ 8386248 map_events LavaridgeTown_HerbShop_MapObjects, LavaridgeTown_HerbShop_MapWarps, 0x0, 0x0 - diff --git a/data/maps/events/LavaridgeTown_House.s b/data/maps/events/LavaridgeTown_House.s index ca600d8d7..feb226cd0 100644 --- a/data/maps/events/LavaridgeTown_House.s +++ b/data/maps/events/LavaridgeTown_House.s @@ -8,4 +8,3 @@ LavaridgeTown_House_MapWarps:: @ 83864C4 LavaridgeTown_House_MapEvents:: @ 83864D4 map_events LavaridgeTown_House_MapObjects, LavaridgeTown_House_MapWarps, 0x0, 0x0 - diff --git a/data/maps/events/LavaridgeTown_Mart.s b/data/maps/events/LavaridgeTown_Mart.s index cb5c05af5..8a07501f7 100644 --- a/data/maps/events/LavaridgeTown_Mart.s +++ b/data/maps/events/LavaridgeTown_Mart.s @@ -9,4 +9,3 @@ LavaridgeTown_Mart_MapWarps:: @ 8386530 LavaridgeTown_Mart_MapEvents:: @ 8386540 map_events LavaridgeTown_Mart_MapObjects, LavaridgeTown_Mart_MapWarps, 0x0, 0x0 - diff --git a/data/maps/events/LavaridgeTown_PokemonCenter_1F.s b/data/maps/events/LavaridgeTown_PokemonCenter_1F.s index 28cac417b..dac3d4a72 100644 --- a/data/maps/events/LavaridgeTown_PokemonCenter_1F.s +++ b/data/maps/events/LavaridgeTown_PokemonCenter_1F.s @@ -12,4 +12,3 @@ LavaridgeTown_PokemonCenter_1F_MapWarps:: @ 83865B4 LavaridgeTown_PokemonCenter_1F_MapEvents:: @ 83865D4 map_events LavaridgeTown_PokemonCenter_1F_MapObjects, LavaridgeTown_PokemonCenter_1F_MapWarps, 0x0, 0x0 - diff --git a/data/maps/events/LavaridgeTown_PokemonCenter_2F.s b/data/maps/events/LavaridgeTown_PokemonCenter_2F.s index b657b8759..3ef0517b1 100644 --- a/data/maps/events/LavaridgeTown_PokemonCenter_2F.s +++ b/data/maps/events/LavaridgeTown_PokemonCenter_2F.s @@ -12,4 +12,3 @@ LavaridgeTown_PokemonCenter_2F_MapWarps:: @ 8386630 LavaridgeTown_PokemonCenter_2F_MapEvents:: @ 8386658 map_events LavaridgeTown_PokemonCenter_2F_MapObjects, LavaridgeTown_PokemonCenter_2F_MapWarps, 0x0, 0x0 - diff --git a/data/maps/events/LilycoveCity.s b/data/maps/events/LilycoveCity.s index 2a1034f44..a356e2b9e 100644 --- a/data/maps/events/LilycoveCity.s +++ b/data/maps/events/LilycoveCity.s @@ -51,4 +51,3 @@ LilycoveCity_MapBGEvents:: @ 838037C LilycoveCity_MapEvents:: @ 8380418 map_events LilycoveCity_MapObjects, LilycoveCity_MapWarps, 0x0, LilycoveCity_MapBGEvents - diff --git a/data/maps/events/LilycoveCity_ContestHall.s b/data/maps/events/LilycoveCity_ContestHall.s index e99ba1f1a..4246afd33 100644 --- a/data/maps/events/LilycoveCity_ContestHall.s +++ b/data/maps/events/LilycoveCity_ContestHall.s @@ -48,4 +48,3 @@ LilycoveCity_ContestHall_MapBGEvents:: @ 8389D38 LilycoveCity_ContestHall_MapEvents:: @ 8389D80 map_events LilycoveCity_ContestHall_MapObjects, LilycoveCity_ContestHall_MapWarps, 0x0, LilycoveCity_ContestHall_MapBGEvents - diff --git a/data/maps/events/LilycoveCity_ContestLobby.s b/data/maps/events/LilycoveCity_ContestLobby.s index 480cabfce..2e41e6e49 100644 --- a/data/maps/events/LilycoveCity_ContestLobby.s +++ b/data/maps/events/LilycoveCity_ContestLobby.s @@ -30,4 +30,3 @@ LilycoveCity_ContestLobby_MapBGEvents:: @ 83899BC LilycoveCity_ContestLobby_MapEvents:: @ 8389A04 map_events LilycoveCity_ContestLobby_MapObjects, LilycoveCity_ContestLobby_MapWarps, 0x0, LilycoveCity_ContestLobby_MapBGEvents - diff --git a/data/maps/events/LilycoveCity_CoveLilyMotel_1F.s b/data/maps/events/LilycoveCity_CoveLilyMotel_1F.s index 44c7d612a..31bd1c94f 100644 --- a/data/maps/events/LilycoveCity_CoveLilyMotel_1F.s +++ b/data/maps/events/LilycoveCity_CoveLilyMotel_1F.s @@ -11,4 +11,3 @@ LilycoveCity_CoveLilyMotel_1F_MapCoordEvents:: @ 8389494 LilycoveCity_CoveLilyMotel_1F_MapEvents:: @ 83894A4 map_events LilycoveCity_CoveLilyMotel_1F_MapObjects, LilycoveCity_CoveLilyMotel_1F_MapWarps, LilycoveCity_CoveLilyMotel_1F_MapCoordEvents, 0x0 - diff --git a/data/maps/events/LilycoveCity_CoveLilyMotel_2F.s b/data/maps/events/LilycoveCity_CoveLilyMotel_2F.s index a8cb53f84..2117774f0 100644 --- a/data/maps/events/LilycoveCity_CoveLilyMotel_2F.s +++ b/data/maps/events/LilycoveCity_CoveLilyMotel_2F.s @@ -11,4 +11,3 @@ LilycoveCity_CoveLilyMotel_2F_MapWarps:: @ 8389548 LilycoveCity_CoveLilyMotel_2F_MapEvents:: @ 8389550 map_events LilycoveCity_CoveLilyMotel_2F_MapObjects, LilycoveCity_CoveLilyMotel_2F_MapWarps, 0x0, 0x0 - diff --git a/data/maps/events/LilycoveCity_DepartmentStoreElevator.s b/data/maps/events/LilycoveCity_DepartmentStoreElevator.s index 117c0b76c..896a96649 100644 --- a/data/maps/events/LilycoveCity_DepartmentStoreElevator.s +++ b/data/maps/events/LilycoveCity_DepartmentStoreElevator.s @@ -7,4 +7,3 @@ LilycoveCity_DepartmentStoreElevator_MapWarps:: @ 838A63C LilycoveCity_DepartmentStoreElevator_MapEvents:: @ 838A64C map_events LilycoveCity_DepartmentStoreElevator_MapObjects, LilycoveCity_DepartmentStoreElevator_MapWarps, 0x0, 0x0 - diff --git a/data/maps/events/LilycoveCity_DepartmentStoreRooftop.s b/data/maps/events/LilycoveCity_DepartmentStoreRooftop.s index 849ac136e..ac72a87c1 100644 --- a/data/maps/events/LilycoveCity_DepartmentStoreRooftop.s +++ b/data/maps/events/LilycoveCity_DepartmentStoreRooftop.s @@ -12,4 +12,3 @@ LilycoveCity_DepartmentStoreRooftop_MapBGEvents:: @ 838A5F8 LilycoveCity_DepartmentStoreRooftop_MapEvents:: @ 838A610 map_events LilycoveCity_DepartmentStoreRooftop_MapObjects, LilycoveCity_DepartmentStoreRooftop_MapWarps, 0x0, LilycoveCity_DepartmentStoreRooftop_MapBGEvents - diff --git a/data/maps/events/LilycoveCity_DepartmentStore_1F.s b/data/maps/events/LilycoveCity_DepartmentStore_1F.s index 5143b5d9a..28bc93a75 100644 --- a/data/maps/events/LilycoveCity_DepartmentStore_1F.s +++ b/data/maps/events/LilycoveCity_DepartmentStore_1F.s @@ -17,4 +17,3 @@ LilycoveCity_DepartmentStore_1F_MapBGEvents:: @ 838A2C8 LilycoveCity_DepartmentStore_1F_MapEvents:: @ 838A2D4 map_events LilycoveCity_DepartmentStore_1F_MapObjects, LilycoveCity_DepartmentStore_1F_MapWarps, 0x0, LilycoveCity_DepartmentStore_1F_MapBGEvents - diff --git a/data/maps/events/LilycoveCity_DepartmentStore_2F.s b/data/maps/events/LilycoveCity_DepartmentStore_2F.s index ffda16328..fc8872103 100644 --- a/data/maps/events/LilycoveCity_DepartmentStore_2F.s +++ b/data/maps/events/LilycoveCity_DepartmentStore_2F.s @@ -12,4 +12,3 @@ LilycoveCity_DepartmentStore_2F_MapWarps:: @ 838A360 LilycoveCity_DepartmentStore_2F_MapEvents:: @ 838A378 map_events LilycoveCity_DepartmentStore_2F_MapObjects, LilycoveCity_DepartmentStore_2F_MapWarps, 0x0, 0x0 - diff --git a/data/maps/events/LilycoveCity_DepartmentStore_3F.s b/data/maps/events/LilycoveCity_DepartmentStore_3F.s index d904058d2..bf3d1647f 100644 --- a/data/maps/events/LilycoveCity_DepartmentStore_3F.s +++ b/data/maps/events/LilycoveCity_DepartmentStore_3F.s @@ -12,4 +12,3 @@ LilycoveCity_DepartmentStore_3F_MapWarps:: @ 838A404 LilycoveCity_DepartmentStore_3F_MapEvents:: @ 838A41C map_events LilycoveCity_DepartmentStore_3F_MapObjects, LilycoveCity_DepartmentStore_3F_MapWarps, 0x0, 0x0 - diff --git a/data/maps/events/LilycoveCity_DepartmentStore_4F.s b/data/maps/events/LilycoveCity_DepartmentStore_4F.s index 8f5a468ef..007cc8bf4 100644 --- a/data/maps/events/LilycoveCity_DepartmentStore_4F.s +++ b/data/maps/events/LilycoveCity_DepartmentStore_4F.s @@ -12,4 +12,3 @@ LilycoveCity_DepartmentStore_4F_MapWarps:: @ 838A4A8 LilycoveCity_DepartmentStore_4F_MapEvents:: @ 838A4C0 map_events LilycoveCity_DepartmentStore_4F_MapObjects, LilycoveCity_DepartmentStore_4F_MapWarps, 0x0, 0x0 - diff --git a/data/maps/events/LilycoveCity_DepartmentStore_5F.s b/data/maps/events/LilycoveCity_DepartmentStore_5F.s index a24138ca2..85cf2431f 100644 --- a/data/maps/events/LilycoveCity_DepartmentStore_5F.s +++ b/data/maps/events/LilycoveCity_DepartmentStore_5F.s @@ -14,4 +14,3 @@ LilycoveCity_DepartmentStore_5F_MapWarps:: @ 838A57C LilycoveCity_DepartmentStore_5F_MapEvents:: @ 838A594 map_events LilycoveCity_DepartmentStore_5F_MapObjects, LilycoveCity_DepartmentStore_5F_MapWarps, 0x0, 0x0 - diff --git a/data/maps/events/LilycoveCity_EmptyMap.s b/data/maps/events/LilycoveCity_EmptyMap.s index b3bbd3805..906453882 100644 --- a/data/maps/events/LilycoveCity_EmptyMap.s +++ b/data/maps/events/LilycoveCity_EmptyMap.s @@ -3,4 +3,3 @@ LilycoveCity_EmptyMap_MapWarps:: @ 838A028 LilycoveCity_EmptyMap_MapEvents:: @ 838A030 map_events 0x0, LilycoveCity_EmptyMap_MapWarps, 0x0, 0x0 - diff --git a/data/maps/events/LilycoveCity_Harbor.s b/data/maps/events/LilycoveCity_Harbor.s index 01664e2d6..5682ada0e 100644 --- a/data/maps/events/LilycoveCity_Harbor.s +++ b/data/maps/events/LilycoveCity_Harbor.s @@ -12,4 +12,3 @@ LilycoveCity_Harbor_MapWarps:: @ 8389FF4 LilycoveCity_Harbor_MapEvents:: @ 838A014 map_events LilycoveCity_Harbor_MapObjects, LilycoveCity_Harbor_MapWarps, 0x0, 0x0 - diff --git a/data/maps/events/LilycoveCity_House1.s b/data/maps/events/LilycoveCity_House1.s index 85c4081a5..cdae83007 100644 --- a/data/maps/events/LilycoveCity_House1.s +++ b/data/maps/events/LilycoveCity_House1.s @@ -8,4 +8,3 @@ LilycoveCity_House1_MapWarps:: @ 838A0B0 LilycoveCity_House1_MapEvents:: @ 838A0C0 map_events LilycoveCity_House1_MapObjects, LilycoveCity_House1_MapWarps, 0x0, 0x0 - diff --git a/data/maps/events/LilycoveCity_House2.s b/data/maps/events/LilycoveCity_House2.s index 9589929c0..50b44e253 100644 --- a/data/maps/events/LilycoveCity_House2.s +++ b/data/maps/events/LilycoveCity_House2.s @@ -7,4 +7,3 @@ LilycoveCity_House2_MapWarps:: @ 838A0EC LilycoveCity_House2_MapEvents:: @ 838A0FC map_events LilycoveCity_House2_MapObjects, LilycoveCity_House2_MapWarps, 0x0, 0x0 - diff --git a/data/maps/events/LilycoveCity_House3.s b/data/maps/events/LilycoveCity_House3.s index 48917beac..43a1068f1 100644 --- a/data/maps/events/LilycoveCity_House3.s +++ b/data/maps/events/LilycoveCity_House3.s @@ -12,4 +12,3 @@ LilycoveCity_House3_MapWarps:: @ 838A1A0 LilycoveCity_House3_MapEvents:: @ 838A1B0 map_events LilycoveCity_House3_MapObjects, LilycoveCity_House3_MapWarps, 0x0, 0x0 - diff --git a/data/maps/events/LilycoveCity_House4.s b/data/maps/events/LilycoveCity_House4.s index cf7498304..88522497d 100644 --- a/data/maps/events/LilycoveCity_House4.s +++ b/data/maps/events/LilycoveCity_House4.s @@ -8,4 +8,3 @@ LilycoveCity_House4_MapWarps:: @ 838A1F4 LilycoveCity_House4_MapEvents:: @ 838A204 map_events LilycoveCity_House4_MapObjects, LilycoveCity_House4_MapWarps, 0x0, 0x0 - diff --git a/data/maps/events/LilycoveCity_LilycoveMuseum_1F.s b/data/maps/events/LilycoveCity_LilycoveMuseum_1F.s index 6b4c67874..983736d73 100644 --- a/data/maps/events/LilycoveCity_LilycoveMuseum_1F.s +++ b/data/maps/events/LilycoveCity_LilycoveMuseum_1F.s @@ -35,4 +35,3 @@ LilycoveCity_LilycoveMuseum_1F_MapBGEvents:: @ 838966C LilycoveCity_LilycoveMuseum_1F_MapEvents:: @ 838972C map_events LilycoveCity_LilycoveMuseum_1F_MapObjects, LilycoveCity_LilycoveMuseum_1F_MapWarps, 0x0, LilycoveCity_LilycoveMuseum_1F_MapBGEvents - diff --git a/data/maps/events/LilycoveCity_LilycoveMuseum_2F.s b/data/maps/events/LilycoveCity_LilycoveMuseum_2F.s index 55774a8bf..98c1aa9cd 100644 --- a/data/maps/events/LilycoveCity_LilycoveMuseum_2F.s +++ b/data/maps/events/LilycoveCity_LilycoveMuseum_2F.s @@ -23,4 +23,3 @@ LilycoveCity_LilycoveMuseum_2F_MapBGEvents:: @ 83897A8 LilycoveCity_LilycoveMuseum_2F_MapEvents:: @ 8389838 map_events LilycoveCity_LilycoveMuseum_2F_MapObjects, LilycoveCity_LilycoveMuseum_2F_MapWarps, 0x0, LilycoveCity_LilycoveMuseum_2F_MapBGEvents - diff --git a/data/maps/events/LilycoveCity_MoveDeletersHouse.s b/data/maps/events/LilycoveCity_MoveDeletersHouse.s index 6747891dd..563052712 100644 --- a/data/maps/events/LilycoveCity_MoveDeletersHouse.s +++ b/data/maps/events/LilycoveCity_MoveDeletersHouse.s @@ -7,4 +7,3 @@ LilycoveCity_MoveDeletersHouse_MapWarps:: @ 838A05C LilycoveCity_MoveDeletersHouse_MapEvents:: @ 838A06C map_events LilycoveCity_MoveDeletersHouse_MapObjects, LilycoveCity_MoveDeletersHouse_MapWarps, 0x0, 0x0 - diff --git a/data/maps/events/LilycoveCity_PokemonCenter_1F.s b/data/maps/events/LilycoveCity_PokemonCenter_1F.s index 8b45733ed..c33a07b6a 100644 --- a/data/maps/events/LilycoveCity_PokemonCenter_1F.s +++ b/data/maps/events/LilycoveCity_PokemonCenter_1F.s @@ -10,4 +10,3 @@ LilycoveCity_PokemonCenter_1F_MapWarps:: @ 8389DDC LilycoveCity_PokemonCenter_1F_MapEvents:: @ 8389DF4 map_events LilycoveCity_PokemonCenter_1F_MapObjects, LilycoveCity_PokemonCenter_1F_MapWarps, 0x0, 0x0 - diff --git a/data/maps/events/LilycoveCity_PokemonCenter_2F.s b/data/maps/events/LilycoveCity_PokemonCenter_2F.s index f50bdc536..736ef1151 100644 --- a/data/maps/events/LilycoveCity_PokemonCenter_2F.s +++ b/data/maps/events/LilycoveCity_PokemonCenter_2F.s @@ -12,4 +12,3 @@ LilycoveCity_PokemonCenter_2F_MapWarps:: @ 8389E50 LilycoveCity_PokemonCenter_2F_MapEvents:: @ 8389E78 map_events LilycoveCity_PokemonCenter_2F_MapObjects, LilycoveCity_PokemonCenter_2F_MapWarps, 0x0, 0x0 - diff --git a/data/maps/events/LilycoveCity_PokemonTrainerFanClub.s b/data/maps/events/LilycoveCity_PokemonTrainerFanClub.s index d5b5493a2..38007b34f 100644 --- a/data/maps/events/LilycoveCity_PokemonTrainerFanClub.s +++ b/data/maps/events/LilycoveCity_PokemonTrainerFanClub.s @@ -14,4 +14,3 @@ LilycoveCity_PokemonTrainerFanClub_MapWarps:: @ 8389F70 LilycoveCity_PokemonTrainerFanClub_MapEvents:: @ 8389F80 map_events LilycoveCity_PokemonTrainerFanClub_MapObjects, LilycoveCity_PokemonTrainerFanClub_MapWarps, 0x0, 0x0 - diff --git a/data/maps/events/LilycoveCity_UnusedMart.s b/data/maps/events/LilycoveCity_UnusedMart.s index 7fec14286..1eefb6a8f 100644 --- a/data/maps/events/LilycoveCity_UnusedMart.s +++ b/data/maps/events/LilycoveCity_UnusedMart.s @@ -4,4 +4,3 @@ LilycoveCity_UnusedMart_MapWarps:: @ 8389E8C LilycoveCity_UnusedMart_MapEvents:: @ 8389E9C map_events 0x0, LilycoveCity_UnusedMart_MapWarps, 0x0, 0x0 - diff --git a/data/maps/events/LittlerootTown.s b/data/maps/events/LittlerootTown.s index 14ce5fcb1..62a564821 100644 --- a/data/maps/events/LittlerootTown.s +++ b/data/maps/events/LittlerootTown.s @@ -30,4 +30,3 @@ LittlerootTown_MapBGEvents:: @ 8380A34 LittlerootTown_MapEvents:: @ 8380A64 map_events LittlerootTown_MapObjects, LittlerootTown_MapWarps, LittlerootTown_MapCoordEvents, LittlerootTown_MapBGEvents - diff --git a/data/maps/events/LittlerootTown_BrendansHouse_1F.s b/data/maps/events/LittlerootTown_BrendansHouse_1F.s index 624f712c5..f60a59018 100644 --- a/data/maps/events/LittlerootTown_BrendansHouse_1F.s +++ b/data/maps/events/LittlerootTown_BrendansHouse_1F.s @@ -15,4 +15,3 @@ LittlerootTown_BrendansHouse_1F_MapCoordEvents:: @ 8385704 LittlerootTown_BrendansHouse_1F_MapEvents:: @ 8385714 map_events LittlerootTown_BrendansHouse_1F_MapObjects, LittlerootTown_BrendansHouse_1F_MapWarps, LittlerootTown_BrendansHouse_1F_MapCoordEvents, 0x0 - diff --git a/data/maps/events/LittlerootTown_BrendansHouse_2F.s b/data/maps/events/LittlerootTown_BrendansHouse_2F.s index 53d62b978..a28a2d0d1 100644 --- a/data/maps/events/LittlerootTown_BrendansHouse_2F.s +++ b/data/maps/events/LittlerootTown_BrendansHouse_2F.s @@ -25,4 +25,3 @@ LittlerootTown_BrendansHouse_2F_MapBGEvents:: @ 8385880 LittlerootTown_BrendansHouse_2F_MapEvents:: @ 83858B0 map_events LittlerootTown_BrendansHouse_2F_MapObjects, LittlerootTown_BrendansHouse_2F_MapWarps, 0x0, LittlerootTown_BrendansHouse_2F_MapBGEvents - diff --git a/data/maps/events/LittlerootTown_MaysHouse_1F.s b/data/maps/events/LittlerootTown_MaysHouse_1F.s index 05dff7a9e..d5874624b 100644 --- a/data/maps/events/LittlerootTown_MaysHouse_1F.s +++ b/data/maps/events/LittlerootTown_MaysHouse_1F.s @@ -15,4 +15,3 @@ LittlerootTown_MaysHouse_1F_MapCoordEvents:: @ 8385954 LittlerootTown_MaysHouse_1F_MapEvents:: @ 8385964 map_events LittlerootTown_MaysHouse_1F_MapObjects, LittlerootTown_MaysHouse_1F_MapWarps, LittlerootTown_MaysHouse_1F_MapCoordEvents, 0x0 - diff --git a/data/maps/events/LittlerootTown_MaysHouse_2F.s b/data/maps/events/LittlerootTown_MaysHouse_2F.s index cbadc3bed..3a3656287 100644 --- a/data/maps/events/LittlerootTown_MaysHouse_2F.s +++ b/data/maps/events/LittlerootTown_MaysHouse_2F.s @@ -26,4 +26,3 @@ LittlerootTown_MaysHouse_2F_MapBGEvents:: @ 8385AE8 LittlerootTown_MaysHouse_2F_MapEvents:: @ 8385B18 map_events LittlerootTown_MaysHouse_2F_MapObjects, LittlerootTown_MaysHouse_2F_MapWarps, 0x0, LittlerootTown_MaysHouse_2F_MapBGEvents - diff --git a/data/maps/events/LittlerootTown_ProfessorBirchsLab.s b/data/maps/events/LittlerootTown_ProfessorBirchsLab.s index 2e680faf8..cbc1e4154 100644 --- a/data/maps/events/LittlerootTown_ProfessorBirchsLab.s +++ b/data/maps/events/LittlerootTown_ProfessorBirchsLab.s @@ -26,4 +26,3 @@ LittlerootTown_ProfessorBirchsLab_MapBGEvents:: @ 8385B84 LittlerootTown_ProfessorBirchsLab_MapEvents:: @ 8385C38 map_events LittlerootTown_ProfessorBirchsLab_MapObjects, LittlerootTown_ProfessorBirchsLab_MapWarps, 0x0, LittlerootTown_ProfessorBirchsLab_MapBGEvents - diff --git a/data/maps/events/MagmaHideout_1F.s b/data/maps/events/MagmaHideout_1F.s index f0339712c..b90e53ff8 100644 --- a/data/maps/events/MagmaHideout_1F.s +++ b/data/maps/events/MagmaHideout_1F.s @@ -9,4 +9,3 @@ MagmaHideout_1F_MapWarps:: @ 838EA04 MagmaHideout_1F_MapEvents:: @ 838EA14 map_events MagmaHideout_1F_MapObjects, MagmaHideout_1F_MapWarps, 0x0, 0x0 - diff --git a/data/maps/events/MagmaHideout_B1F.s b/data/maps/events/MagmaHideout_B1F.s index 5ec44bb7c..c9f1101cc 100644 --- a/data/maps/events/MagmaHideout_B1F.s +++ b/data/maps/events/MagmaHideout_B1F.s @@ -41,4 +41,3 @@ MagmaHideout_B1F_MapWarps:: @ 838EAE8 MagmaHideout_B1F_MapEvents:: @ 838EBD0 map_events MagmaHideout_B1F_MapObjects, MagmaHideout_B1F_MapWarps, 0x0, 0x0 - diff --git a/data/maps/events/MagmaHideout_B2F.s b/data/maps/events/MagmaHideout_B2F.s index 8453baf55..258592732 100644 --- a/data/maps/events/MagmaHideout_B2F.s +++ b/data/maps/events/MagmaHideout_B2F.s @@ -23,4 +23,3 @@ MagmaHideout_B2F_MapCoordEvents:: @ 838EC9C MagmaHideout_B2F_MapEvents:: @ 838ECDC map_events MagmaHideout_B2F_MapObjects, MagmaHideout_B2F_MapWarps, MagmaHideout_B2F_MapCoordEvents, 0x0 - diff --git a/data/maps/events/MauvilleCity.s b/data/maps/events/MauvilleCity.s index 9249a7053..4d228a92c 100644 --- a/data/maps/events/MauvilleCity.s +++ b/data/maps/events/MauvilleCity.s @@ -30,4 +30,3 @@ MauvilleCity_MapBGEvents:: @ 837FCA0 MauvilleCity_MapEvents:: @ 837FD00 map_events MauvilleCity_MapObjects, MauvilleCity_MapWarps, 0x0, MauvilleCity_MapBGEvents - diff --git a/data/maps/events/MauvilleCity_BikeShop.s b/data/maps/events/MauvilleCity_BikeShop.s index 165f23c3e..6c064a1f7 100644 --- a/data/maps/events/MauvilleCity_BikeShop.s +++ b/data/maps/events/MauvilleCity_BikeShop.s @@ -12,4 +12,3 @@ MauvilleCity_BikeShop_MapBGEvents:: @ 8388358 MauvilleCity_BikeShop_MapEvents:: @ 8388370 map_events MauvilleCity_BikeShop_MapObjects, MauvilleCity_BikeShop_MapWarps, 0x0, MauvilleCity_BikeShop_MapBGEvents - diff --git a/data/maps/events/MauvilleCity_GameCorner.s b/data/maps/events/MauvilleCity_GameCorner.s index 4aa469f77..ed8549079 100644 --- a/data/maps/events/MauvilleCity_GameCorner.s +++ b/data/maps/events/MauvilleCity_GameCorner.s @@ -44,4 +44,3 @@ MauvilleCity_GameCorner_MapBGEvents:: @ 83884F0 MauvilleCity_GameCorner_MapEvents:: @ 8388610 map_events MauvilleCity_GameCorner_MapObjects, MauvilleCity_GameCorner_MapWarps, 0x0, MauvilleCity_GameCorner_MapBGEvents - diff --git a/data/maps/events/MauvilleCity_Gym.s b/data/maps/events/MauvilleCity_Gym.s index 561cab1ff..4a9ee563f 100644 --- a/data/maps/events/MauvilleCity_Gym.s +++ b/data/maps/events/MauvilleCity_Gym.s @@ -21,4 +21,3 @@ MauvilleCity_Gym_MapBGEvents:: @ 83882EC MauvilleCity_Gym_MapEvents:: @ 8388304 map_events MauvilleCity_Gym_MapObjects, MauvilleCity_Gym_MapWarps, MauvilleCity_Gym_MapCoordEvents, MauvilleCity_Gym_MapBGEvents - diff --git a/data/maps/events/MauvilleCity_House1.s b/data/maps/events/MauvilleCity_House1.s index 02fd08bc9..12d6d8cc8 100644 --- a/data/maps/events/MauvilleCity_House1.s +++ b/data/maps/events/MauvilleCity_House1.s @@ -7,4 +7,3 @@ MauvilleCity_House1_MapWarps:: @ 838839C MauvilleCity_House1_MapEvents:: @ 83883AC map_events MauvilleCity_House1_MapObjects, MauvilleCity_House1_MapWarps, 0x0, 0x0 - diff --git a/data/maps/events/MauvilleCity_House2.s b/data/maps/events/MauvilleCity_House2.s index 5318ac92a..9feaafe2c 100644 --- a/data/maps/events/MauvilleCity_House2.s +++ b/data/maps/events/MauvilleCity_House2.s @@ -7,4 +7,3 @@ MauvilleCity_House2_MapWarps:: @ 838863C MauvilleCity_House2_MapEvents:: @ 838864C map_events MauvilleCity_House2_MapObjects, MauvilleCity_House2_MapWarps, 0x0, 0x0 - diff --git a/data/maps/events/MauvilleCity_Mart.s b/data/maps/events/MauvilleCity_Mart.s index 4b83cacff..05951f578 100644 --- a/data/maps/events/MauvilleCity_Mart.s +++ b/data/maps/events/MauvilleCity_Mart.s @@ -9,4 +9,3 @@ MauvilleCity_Mart_MapWarps:: @ 83887E8 MauvilleCity_Mart_MapEvents:: @ 83887F8 map_events MauvilleCity_Mart_MapObjects, MauvilleCity_Mart_MapWarps, 0x0, 0x0 - diff --git a/data/maps/events/MauvilleCity_PokemonCenter_1F.s b/data/maps/events/MauvilleCity_PokemonCenter_1F.s index 2c6599053..0f8e80d5c 100644 --- a/data/maps/events/MauvilleCity_PokemonCenter_1F.s +++ b/data/maps/events/MauvilleCity_PokemonCenter_1F.s @@ -12,4 +12,3 @@ MauvilleCity_PokemonCenter_1F_MapWarps:: @ 83886D8 MauvilleCity_PokemonCenter_1F_MapEvents:: @ 83886F0 map_events MauvilleCity_PokemonCenter_1F_MapObjects, MauvilleCity_PokemonCenter_1F_MapWarps, 0x0, 0x0 - diff --git a/data/maps/events/MauvilleCity_PokemonCenter_2F.s b/data/maps/events/MauvilleCity_PokemonCenter_2F.s index 0586e29f0..dbd55e499 100644 --- a/data/maps/events/MauvilleCity_PokemonCenter_2F.s +++ b/data/maps/events/MauvilleCity_PokemonCenter_2F.s @@ -13,4 +13,3 @@ MauvilleCity_PokemonCenter_2F_MapWarps:: @ 8388764 MauvilleCity_PokemonCenter_2F_MapEvents:: @ 838878C map_events MauvilleCity_PokemonCenter_2F_MapObjects, MauvilleCity_PokemonCenter_2F_MapWarps, 0x0, 0x0 - diff --git a/data/maps/events/MeteorFalls_1F_1R.s b/data/maps/events/MeteorFalls_1F_1R.s index 7072ecbdc..1178bf543 100644 --- a/data/maps/events/MeteorFalls_1F_1R.s +++ b/data/maps/events/MeteorFalls_1F_1R.s @@ -26,4 +26,3 @@ MeteorFalls_1F_1R_MapBGEvents:: @ 838BBF4 MeteorFalls_1F_1R_MapEvents:: @ 838BC0C map_events MeteorFalls_1F_1R_MapObjects, MeteorFalls_1F_1R_MapWarps, MeteorFalls_1F_1R_MapCoordEvents, MeteorFalls_1F_1R_MapBGEvents - diff --git a/data/maps/events/MeteorFalls_1F_2R.s b/data/maps/events/MeteorFalls_1F_2R.s index db5d53ee6..549620aa9 100644 --- a/data/maps/events/MeteorFalls_1F_2R.s +++ b/data/maps/events/MeteorFalls_1F_2R.s @@ -15,4 +15,3 @@ MeteorFalls_1F_2R_MapBGEvents:: @ 838BC88 MeteorFalls_1F_2R_MapEvents:: @ 838BCA0 map_events MeteorFalls_1F_2R_MapObjects, MeteorFalls_1F_2R_MapWarps, 0x0, MeteorFalls_1F_2R_MapBGEvents - diff --git a/data/maps/events/MeteorFalls_B1F_1R.s b/data/maps/events/MeteorFalls_B1F_1R.s index f5990a9a6..796e31cd2 100644 --- a/data/maps/events/MeteorFalls_B1F_1R.s +++ b/data/maps/events/MeteorFalls_B1F_1R.s @@ -8,4 +8,3 @@ MeteorFalls_B1F_1R_MapWarps:: @ 838BCB4 MeteorFalls_B1F_1R_MapEvents:: @ 838BCE4 map_events 0x0, MeteorFalls_B1F_1R_MapWarps, 0x0, 0x0 - diff --git a/data/maps/events/MeteorFalls_B1F_2R.s b/data/maps/events/MeteorFalls_B1F_2R.s index 2a48daee1..abdad1f03 100644 --- a/data/maps/events/MeteorFalls_B1F_2R.s +++ b/data/maps/events/MeteorFalls_B1F_2R.s @@ -6,4 +6,3 @@ MeteorFalls_B1F_2R_MapWarps:: @ 838BD10 MeteorFalls_B1F_2R_MapEvents:: @ 838BD18 map_events MeteorFalls_B1F_2R_MapObjects, MeteorFalls_B1F_2R_MapWarps, 0x0, 0x0 - diff --git a/data/maps/events/MossdeepCity.s b/data/maps/events/MossdeepCity.s index 2b9a53f62..b73bc64f3 100644 --- a/data/maps/events/MossdeepCity.s +++ b/data/maps/events/MossdeepCity.s @@ -39,4 +39,3 @@ MossdeepCity_MapBGEvents:: @ 8380594 MossdeepCity_MapEvents:: @ 83805F4 map_events MossdeepCity_MapObjects, MossdeepCity_MapWarps, MossdeepCity_MapCoordEvents, MossdeepCity_MapBGEvents - diff --git a/data/maps/events/MossdeepCity_GameCorner_1F.s b/data/maps/events/MossdeepCity_GameCorner_1F.s index 5cad24dc1..99350c4b0 100644 --- a/data/maps/events/MossdeepCity_GameCorner_1F.s +++ b/data/maps/events/MossdeepCity_GameCorner_1F.s @@ -11,4 +11,3 @@ MossdeepCity_GameCorner_1F_MapBGEvents:: @ 838AC9C MossdeepCity_GameCorner_1F_MapEvents:: @ 838ACA8 map_events MossdeepCity_GameCorner_1F_MapObjects, MossdeepCity_GameCorner_1F_MapWarps, 0x0, MossdeepCity_GameCorner_1F_MapBGEvents - diff --git a/data/maps/events/MossdeepCity_GameCorner_B1F.s b/data/maps/events/MossdeepCity_GameCorner_B1F.s index 47a760807..98c843f52 100644 --- a/data/maps/events/MossdeepCity_GameCorner_B1F.s +++ b/data/maps/events/MossdeepCity_GameCorner_B1F.s @@ -6,4 +6,3 @@ MossdeepCity_GameCorner_B1F_MapWarps:: @ 838ACD4 MossdeepCity_GameCorner_B1F_MapEvents:: @ 838ACDC map_events MossdeepCity_GameCorner_B1F_MapObjects, MossdeepCity_GameCorner_B1F_MapWarps, 0x0, 0x0 - diff --git a/data/maps/events/MossdeepCity_Gym.s b/data/maps/events/MossdeepCity_Gym.s index cafe7a834..d80237a3a 100644 --- a/data/maps/events/MossdeepCity_Gym.s +++ b/data/maps/events/MossdeepCity_Gym.s @@ -26,4 +26,3 @@ MossdeepCity_Gym_MapBGEvents:: @ 838A758 MossdeepCity_Gym_MapEvents:: @ 838A7A0 map_events MossdeepCity_Gym_MapObjects, MossdeepCity_Gym_MapWarps, MossdeepCity_Gym_MapCoordEvents, MossdeepCity_Gym_MapBGEvents - diff --git a/data/maps/events/MossdeepCity_House1.s b/data/maps/events/MossdeepCity_House1.s index ab1ab92cc..251440343 100644 --- a/data/maps/events/MossdeepCity_House1.s +++ b/data/maps/events/MossdeepCity_House1.s @@ -8,4 +8,3 @@ MossdeepCity_House1_MapWarps:: @ 838A7E4 MossdeepCity_House1_MapEvents:: @ 838A7F4 map_events MossdeepCity_House1_MapObjects, MossdeepCity_House1_MapWarps, 0x0, 0x0 - diff --git a/data/maps/events/MossdeepCity_House2.s b/data/maps/events/MossdeepCity_House2.s index e55c0ff06..31ef3ab7b 100644 --- a/data/maps/events/MossdeepCity_House2.s +++ b/data/maps/events/MossdeepCity_House2.s @@ -9,4 +9,3 @@ MossdeepCity_House2_MapWarps:: @ 838A850 MossdeepCity_House2_MapEvents:: @ 838A860 map_events MossdeepCity_House2_MapObjects, MossdeepCity_House2_MapWarps, 0x0, 0x0 - diff --git a/data/maps/events/MossdeepCity_House3.s b/data/maps/events/MossdeepCity_House3.s index b55646ca9..b1503decc 100644 --- a/data/maps/events/MossdeepCity_House3.s +++ b/data/maps/events/MossdeepCity_House3.s @@ -7,4 +7,3 @@ MossdeepCity_House3_MapWarps:: @ 838AA20 MossdeepCity_House3_MapEvents:: @ 838AA30 map_events MossdeepCity_House3_MapObjects, MossdeepCity_House3_MapWarps, 0x0, 0x0 - diff --git a/data/maps/events/MossdeepCity_House4.s b/data/maps/events/MossdeepCity_House4.s index 7eefcf496..dc0fdfed8 100644 --- a/data/maps/events/MossdeepCity_House4.s +++ b/data/maps/events/MossdeepCity_House4.s @@ -9,4 +9,3 @@ MossdeepCity_House4_MapWarps:: @ 838AB40 MossdeepCity_House4_MapEvents:: @ 838AB50 map_events MossdeepCity_House4_MapObjects, MossdeepCity_House4_MapWarps, 0x0, 0x0 - diff --git a/data/maps/events/MossdeepCity_Mart.s b/data/maps/events/MossdeepCity_Mart.s index be10d2e50..80514f1f8 100644 --- a/data/maps/events/MossdeepCity_Mart.s +++ b/data/maps/events/MossdeepCity_Mart.s @@ -10,4 +10,3 @@ MossdeepCity_Mart_MapWarps:: @ 838A9E4 MossdeepCity_Mart_MapEvents:: @ 838A9F4 map_events MossdeepCity_Mart_MapObjects, MossdeepCity_Mart_MapWarps, 0x0, 0x0 - diff --git a/data/maps/events/MossdeepCity_PokemonCenter_1F.s b/data/maps/events/MossdeepCity_PokemonCenter_1F.s index ddd6f6d43..d7cf07f6a 100644 --- a/data/maps/events/MossdeepCity_PokemonCenter_1F.s +++ b/data/maps/events/MossdeepCity_PokemonCenter_1F.s @@ -10,4 +10,3 @@ MossdeepCity_PokemonCenter_1F_MapWarps:: @ 838A8BC MossdeepCity_PokemonCenter_1F_MapEvents:: @ 838A8D4 map_events MossdeepCity_PokemonCenter_1F_MapObjects, MossdeepCity_PokemonCenter_1F_MapWarps, 0x0, 0x0 - diff --git a/data/maps/events/MossdeepCity_PokemonCenter_2F.s b/data/maps/events/MossdeepCity_PokemonCenter_2F.s index abce6d90e..337467351 100644 --- a/data/maps/events/MossdeepCity_PokemonCenter_2F.s +++ b/data/maps/events/MossdeepCity_PokemonCenter_2F.s @@ -13,4 +13,3 @@ MossdeepCity_PokemonCenter_2F_MapWarps:: @ 838A948 MossdeepCity_PokemonCenter_2F_MapEvents:: @ 838A970 map_events MossdeepCity_PokemonCenter_2F_MapObjects, MossdeepCity_PokemonCenter_2F_MapWarps, 0x0, 0x0 - diff --git a/data/maps/events/MossdeepCity_SpaceCenter_1F.s b/data/maps/events/MossdeepCity_SpaceCenter_1F.s index febaceb4a..d79459eb8 100644 --- a/data/maps/events/MossdeepCity_SpaceCenter_1F.s +++ b/data/maps/events/MossdeepCity_SpaceCenter_1F.s @@ -12,4 +12,3 @@ MossdeepCity_SpaceCenter_1F_MapWarps:: @ 838ABDC MossdeepCity_SpaceCenter_1F_MapEvents:: @ 838ABF4 map_events MossdeepCity_SpaceCenter_1F_MapObjects, MossdeepCity_SpaceCenter_1F_MapWarps, 0x0, 0x0 - diff --git a/data/maps/events/MossdeepCity_SpaceCenter_2F.s b/data/maps/events/MossdeepCity_SpaceCenter_2F.s index ca4dd97b0..2dc4f843a 100644 --- a/data/maps/events/MossdeepCity_SpaceCenter_2F.s +++ b/data/maps/events/MossdeepCity_SpaceCenter_2F.s @@ -8,4 +8,3 @@ MossdeepCity_SpaceCenter_2F_MapWarps:: @ 838AC50 MossdeepCity_SpaceCenter_2F_MapEvents:: @ 838AC58 map_events MossdeepCity_SpaceCenter_2F_MapObjects, MossdeepCity_SpaceCenter_2F_MapWarps, 0x0, 0x0 - diff --git a/data/maps/events/MossdeepCity_StevensHouse.s b/data/maps/events/MossdeepCity_StevensHouse.s index 062fe3a4e..ce240d81f 100644 --- a/data/maps/events/MossdeepCity_StevensHouse.s +++ b/data/maps/events/MossdeepCity_StevensHouse.s @@ -16,4 +16,3 @@ MossdeepCity_StevensHouse_MapBGEvents:: @ 838AAB4 MossdeepCity_StevensHouse_MapEvents:: @ 838AAE4 map_events MossdeepCity_StevensHouse_MapObjects, MossdeepCity_StevensHouse_MapWarps, 0x0, MossdeepCity_StevensHouse_MapBGEvents - diff --git a/data/maps/events/MtChimney.s b/data/maps/events/MtChimney.s index 741c7bea9..468edda1d 100644 --- a/data/maps/events/MtChimney.s +++ b/data/maps/events/MtChimney.s @@ -40,4 +40,3 @@ MtChimney_MapBGEvents:: @ 838C5F0 MtChimney_MapEvents:: @ 838C608 map_events MtChimney_MapObjects, MtChimney_MapWarps, 0x0, MtChimney_MapBGEvents - diff --git a/data/maps/events/MtChimney_CableCarStation.s b/data/maps/events/MtChimney_CableCarStation.s index a151775e0..db4eef0fa 100644 --- a/data/maps/events/MtChimney_CableCarStation.s +++ b/data/maps/events/MtChimney_CableCarStation.s @@ -8,4 +8,3 @@ MtChimney_CableCarStation_MapWarps:: @ 838B858 MtChimney_CableCarStation_MapEvents:: @ 838B868 map_events MtChimney_CableCarStation_MapObjects, MtChimney_CableCarStation_MapWarps, 0x0, 0x0 - diff --git a/data/maps/events/MtPyre_1F.s b/data/maps/events/MtPyre_1F.s index bd68cb405..3f4263f9e 100644 --- a/data/maps/events/MtPyre_1F.s +++ b/data/maps/events/MtPyre_1F.s @@ -13,4 +13,3 @@ MtPyre_1F_MapWarps:: @ 838C844 MtPyre_1F_MapEvents:: @ 838C874 map_events MtPyre_1F_MapObjects, MtPyre_1F_MapWarps, 0x0, 0x0 - diff --git a/data/maps/events/MtPyre_2F.s b/data/maps/events/MtPyre_2F.s index 80f64f367..320be57af 100644 --- a/data/maps/events/MtPyre_2F.s +++ b/data/maps/events/MtPyre_2F.s @@ -15,4 +15,3 @@ MtPyre_2F_MapWarps:: @ 838C918 MtPyre_2F_MapEvents:: @ 838C940 map_events MtPyre_2F_MapObjects, MtPyre_2F_MapWarps, 0x0, 0x0 - diff --git a/data/maps/events/MtPyre_3F.s b/data/maps/events/MtPyre_3F.s index 609560c1b..ba5428cb2 100644 --- a/data/maps/events/MtPyre_3F.s +++ b/data/maps/events/MtPyre_3F.s @@ -13,4 +13,3 @@ MtPyre_3F_MapWarps:: @ 838C99C MtPyre_3F_MapEvents:: @ 838C9CC map_events MtPyre_3F_MapObjects, MtPyre_3F_MapWarps, 0x0, 0x0 - diff --git a/data/maps/events/MtPyre_4F.s b/data/maps/events/MtPyre_4F.s index 9d2650c9e..c54b36645 100644 --- a/data/maps/events/MtPyre_4F.s +++ b/data/maps/events/MtPyre_4F.s @@ -12,4 +12,3 @@ MtPyre_4F_MapWarps:: @ 838CA10 MtPyre_4F_MapEvents:: @ 838CA40 map_events MtPyre_4F_MapObjects, MtPyre_4F_MapWarps, 0x0, 0x0 - diff --git a/data/maps/events/MtPyre_5F.s b/data/maps/events/MtPyre_5F.s index edc844971..73b97a40d 100644 --- a/data/maps/events/MtPyre_5F.s +++ b/data/maps/events/MtPyre_5F.s @@ -11,4 +11,3 @@ MtPyre_5F_MapWarps:: @ 838CA84 MtPyre_5F_MapEvents:: @ 838CAAC map_events MtPyre_5F_MapObjects, MtPyre_5F_MapWarps, 0x0, 0x0 - diff --git a/data/maps/events/MtPyre_6F.s b/data/maps/events/MtPyre_6F.s index 420ff3711..70228bc42 100644 --- a/data/maps/events/MtPyre_6F.s +++ b/data/maps/events/MtPyre_6F.s @@ -8,4 +8,3 @@ MtPyre_6F_MapWarps:: @ 838CAF0 MtPyre_6F_MapEvents:: @ 838CB00 map_events MtPyre_6F_MapObjects, MtPyre_6F_MapWarps, 0x0, 0x0 - diff --git a/data/maps/events/MtPyre_Exterior.s b/data/maps/events/MtPyre_Exterior.s index f01e9a6b9..ac372a2f0 100644 --- a/data/maps/events/MtPyre_Exterior.s +++ b/data/maps/events/MtPyre_Exterior.s @@ -20,4 +20,3 @@ MtPyre_Exterior_MapBGEvents:: @ 838CBAC MtPyre_Exterior_MapEvents:: @ 838CBC4 map_events MtPyre_Exterior_MapObjects, MtPyre_Exterior_MapWarps, MtPyre_Exterior_MapCoordEvents, MtPyre_Exterior_MapBGEvents - diff --git a/data/maps/events/MtPyre_Summit.s b/data/maps/events/MtPyre_Summit.s index a424a62fe..4f5047765 100644 --- a/data/maps/events/MtPyre_Summit.s +++ b/data/maps/events/MtPyre_Summit.s @@ -25,4 +25,3 @@ MtPyre_Summit_MapBGEvents:: @ 838CCE0 MtPyre_Summit_MapEvents:: @ 838CCF8 map_events MtPyre_Summit_MapObjects, MtPyre_Summit_MapWarps, MtPyre_Summit_MapCoordEvents, MtPyre_Summit_MapBGEvents - diff --git a/data/maps/events/NewMauville_Entrance.s b/data/maps/events/NewMauville_Entrance.s index e1b1e2e04..482ff83ca 100644 --- a/data/maps/events/NewMauville_Entrance.s +++ b/data/maps/events/NewMauville_Entrance.s @@ -7,4 +7,3 @@ NewMauville_Entrance_MapCoordEvents:: @ 838DEE4 NewMauville_Entrance_MapEvents:: @ 838DEF4 map_events 0x0, NewMauville_Entrance_MapWarps, NewMauville_Entrance_MapCoordEvents, 0x0 - diff --git a/data/maps/events/NewMauville_Inside.s b/data/maps/events/NewMauville_Inside.s index c0cd16a2f..a7384520d 100644 --- a/data/maps/events/NewMauville_Inside.s +++ b/data/maps/events/NewMauville_Inside.s @@ -35,4 +35,3 @@ NewMauville_Inside_MapBGEvents:: @ 838E070 NewMauville_Inside_MapEvents:: @ 838E0D0 map_events NewMauville_Inside_MapObjects, NewMauville_Inside_MapWarps, NewMauville_Inside_MapCoordEvents, NewMauville_Inside_MapBGEvents - diff --git a/data/maps/events/OldaleTown.s b/data/maps/events/OldaleTown.s index 5c4fb5f93..a09a08fe2 100644 --- a/data/maps/events/OldaleTown.s +++ b/data/maps/events/OldaleTown.s @@ -25,4 +25,3 @@ OldaleTown_MapBGEvents:: @ 8380B38 OldaleTown_MapEvents:: @ 8380B74 map_events OldaleTown_MapObjects, OldaleTown_MapWarps, OldaleTown_MapCoordEvents, OldaleTown_MapBGEvents - diff --git a/data/maps/events/OldaleTown_House1.s b/data/maps/events/OldaleTown_House1.s index 9af90253e..16f29b00e 100644 --- a/data/maps/events/OldaleTown_House1.s +++ b/data/maps/events/OldaleTown_House1.s @@ -7,4 +7,3 @@ OldaleTown_House1_MapWarps:: @ 8385C64 OldaleTown_House1_MapEvents:: @ 8385C74 map_events OldaleTown_House1_MapObjects, OldaleTown_House1_MapWarps, 0x0, 0x0 - diff --git a/data/maps/events/OldaleTown_House2.s b/data/maps/events/OldaleTown_House2.s index b183496ca..904291576 100644 --- a/data/maps/events/OldaleTown_House2.s +++ b/data/maps/events/OldaleTown_House2.s @@ -8,4 +8,3 @@ OldaleTown_House2_MapWarps:: @ 8385CB8 OldaleTown_House2_MapEvents:: @ 8385CC8 map_events OldaleTown_House2_MapObjects, OldaleTown_House2_MapWarps, 0x0, 0x0 - diff --git a/data/maps/events/OldaleTown_Mart.s b/data/maps/events/OldaleTown_Mart.s index 1621d4a79..a06ece505 100644 --- a/data/maps/events/OldaleTown_Mart.s +++ b/data/maps/events/OldaleTown_Mart.s @@ -9,4 +9,3 @@ OldaleTown_Mart_MapWarps:: @ 8385E34 OldaleTown_Mart_MapEvents:: @ 8385E44 map_events OldaleTown_Mart_MapObjects, OldaleTown_Mart_MapWarps, 0x0, 0x0 - diff --git a/data/maps/events/OldaleTown_PokemonCenter_1F.s b/data/maps/events/OldaleTown_PokemonCenter_1F.s index 54049c00e..161baec86 100644 --- a/data/maps/events/OldaleTown_PokemonCenter_1F.s +++ b/data/maps/events/OldaleTown_PokemonCenter_1F.s @@ -11,4 +11,3 @@ OldaleTown_PokemonCenter_1F_MapWarps:: @ 8385D3C OldaleTown_PokemonCenter_1F_MapEvents:: @ 8385D54 map_events OldaleTown_PokemonCenter_1F_MapObjects, OldaleTown_PokemonCenter_1F_MapWarps, 0x0, 0x0 - diff --git a/data/maps/events/OldaleTown_PokemonCenter_2F.s b/data/maps/events/OldaleTown_PokemonCenter_2F.s index 79e7be760..e2675bb14 100644 --- a/data/maps/events/OldaleTown_PokemonCenter_2F.s +++ b/data/maps/events/OldaleTown_PokemonCenter_2F.s @@ -12,4 +12,3 @@ OldaleTown_PokemonCenter_2F_MapWarps:: @ 8385DB0 OldaleTown_PokemonCenter_2F_MapEvents:: @ 8385DD8 map_events OldaleTown_PokemonCenter_2F_MapObjects, OldaleTown_PokemonCenter_2F_MapWarps, 0x0, 0x0 - diff --git a/data/maps/events/PacifidlogTown.s b/data/maps/events/PacifidlogTown.s index a608c7c12..1823e9afd 100644 --- a/data/maps/events/PacifidlogTown.s +++ b/data/maps/events/PacifidlogTown.s @@ -18,4 +18,3 @@ PacifidlogTown_MapBGEvents:: @ 8381084 PacifidlogTown_MapEvents:: @ 83810A8 map_events PacifidlogTown_MapObjects, PacifidlogTown_MapWarps, 0x0, PacifidlogTown_MapBGEvents - diff --git a/data/maps/events/PacifidlogTown_House1.s b/data/maps/events/PacifidlogTown_House1.s index 917648e80..233fa7604 100644 --- a/data/maps/events/PacifidlogTown_House1.s +++ b/data/maps/events/PacifidlogTown_House1.s @@ -8,4 +8,3 @@ PacifidlogTown_House1_MapWarps:: @ 8386F70 PacifidlogTown_House1_MapEvents:: @ 8386F80 map_events PacifidlogTown_House1_MapObjects, PacifidlogTown_House1_MapWarps, 0x0, 0x0 - diff --git a/data/maps/events/PacifidlogTown_House2.s b/data/maps/events/PacifidlogTown_House2.s index 4765253b2..aa1940d29 100644 --- a/data/maps/events/PacifidlogTown_House2.s +++ b/data/maps/events/PacifidlogTown_House2.s @@ -9,4 +9,3 @@ PacifidlogTown_House2_MapWarps:: @ 8386FDC PacifidlogTown_House2_MapEvents:: @ 8386FEC map_events PacifidlogTown_House2_MapObjects, PacifidlogTown_House2_MapWarps, 0x0, 0x0 - diff --git a/data/maps/events/PacifidlogTown_House3.s b/data/maps/events/PacifidlogTown_House3.s index e2a6f747f..80ab8d7f5 100644 --- a/data/maps/events/PacifidlogTown_House3.s +++ b/data/maps/events/PacifidlogTown_House3.s @@ -8,4 +8,3 @@ PacifidlogTown_House3_MapWarps:: @ 8387030 PacifidlogTown_House3_MapEvents:: @ 8387040 map_events PacifidlogTown_House3_MapObjects, PacifidlogTown_House3_MapWarps, 0x0, 0x0 - diff --git a/data/maps/events/PacifidlogTown_House4.s b/data/maps/events/PacifidlogTown_House4.s index 52666b2e3..a7dd1469b 100644 --- a/data/maps/events/PacifidlogTown_House4.s +++ b/data/maps/events/PacifidlogTown_House4.s @@ -9,4 +9,3 @@ PacifidlogTown_House4_MapWarps:: @ 838709C PacifidlogTown_House4_MapEvents:: @ 83870AC map_events PacifidlogTown_House4_MapObjects, PacifidlogTown_House4_MapWarps, 0x0, 0x0 - diff --git a/data/maps/events/PacifidlogTown_House5.s b/data/maps/events/PacifidlogTown_House5.s index b2793c57a..963a319cf 100644 --- a/data/maps/events/PacifidlogTown_House5.s +++ b/data/maps/events/PacifidlogTown_House5.s @@ -8,4 +8,3 @@ PacifidlogTown_House5_MapWarps:: @ 83870F0 PacifidlogTown_House5_MapEvents:: @ 8387100 map_events PacifidlogTown_House5_MapObjects, PacifidlogTown_House5_MapWarps, 0x0, 0x0 - diff --git a/data/maps/events/PacifidlogTown_PokemonCenter_1F.s b/data/maps/events/PacifidlogTown_PokemonCenter_1F.s index d66a2eafc..432ba616d 100644 --- a/data/maps/events/PacifidlogTown_PokemonCenter_1F.s +++ b/data/maps/events/PacifidlogTown_PokemonCenter_1F.s @@ -11,4 +11,3 @@ PacifidlogTown_PokemonCenter_1F_MapWarps:: @ 8386E90 PacifidlogTown_PokemonCenter_1F_MapEvents:: @ 8386EA8 map_events PacifidlogTown_PokemonCenter_1F_MapObjects, PacifidlogTown_PokemonCenter_1F_MapWarps, 0x0, 0x0 - diff --git a/data/maps/events/PacifidlogTown_PokemonCenter_2F.s b/data/maps/events/PacifidlogTown_PokemonCenter_2F.s index abe443e5e..f4110623f 100644 --- a/data/maps/events/PacifidlogTown_PokemonCenter_2F.s +++ b/data/maps/events/PacifidlogTown_PokemonCenter_2F.s @@ -12,4 +12,3 @@ PacifidlogTown_PokemonCenter_2F_MapWarps:: @ 8386F04 PacifidlogTown_PokemonCenter_2F_MapEvents:: @ 8386F2C map_events PacifidlogTown_PokemonCenter_2F_MapObjects, PacifidlogTown_PokemonCenter_2F_MapWarps, 0x0, 0x0 - diff --git a/data/maps/events/PetalburgCity.s b/data/maps/events/PetalburgCity.s index 10525c300..4c36c49ab 100644 --- a/data/maps/events/PetalburgCity.s +++ b/data/maps/events/PetalburgCity.s @@ -35,4 +35,3 @@ PetalburgCity_MapBGEvents:: @ 837F738 PetalburgCity_MapEvents:: @ 837F798 map_events PetalburgCity_MapObjects, PetalburgCity_MapWarps, PetalburgCity_MapCoordEvents, PetalburgCity_MapBGEvents - diff --git a/data/maps/events/PetalburgCity_Gym.s b/data/maps/events/PetalburgCity_Gym.s index 178f2a684..47205e253 100644 --- a/data/maps/events/PetalburgCity_Gym.s +++ b/data/maps/events/PetalburgCity_Gym.s @@ -68,4 +68,3 @@ PetalburgCity_Gym_MapBGEvents:: @ 8387388 PetalburgCity_Gym_MapEvents:: @ 8387430 map_events PetalburgCity_Gym_MapObjects, PetalburgCity_Gym_MapWarps, 0x0, PetalburgCity_Gym_MapBGEvents - diff --git a/data/maps/events/PetalburgCity_House1.s b/data/maps/events/PetalburgCity_House1.s index 48973ff27..2d6a28056 100644 --- a/data/maps/events/PetalburgCity_House1.s +++ b/data/maps/events/PetalburgCity_House1.s @@ -8,4 +8,3 @@ PetalburgCity_House1_MapWarps:: @ 8387474 PetalburgCity_House1_MapEvents:: @ 8387484 map_events PetalburgCity_House1_MapObjects, PetalburgCity_House1_MapWarps, 0x0, 0x0 - diff --git a/data/maps/events/PetalburgCity_House2.s b/data/maps/events/PetalburgCity_House2.s index 11fab721b..0797b9bab 100644 --- a/data/maps/events/PetalburgCity_House2.s +++ b/data/maps/events/PetalburgCity_House2.s @@ -8,4 +8,3 @@ PetalburgCity_House2_MapWarps:: @ 83874C8 PetalburgCity_House2_MapEvents:: @ 83874D8 map_events PetalburgCity_House2_MapObjects, PetalburgCity_House2_MapWarps, 0x0, 0x0 - diff --git a/data/maps/events/PetalburgCity_Mart.s b/data/maps/events/PetalburgCity_Mart.s index 68c9abbce..2fbed4b9d 100644 --- a/data/maps/events/PetalburgCity_Mart.s +++ b/data/maps/events/PetalburgCity_Mart.s @@ -10,4 +10,3 @@ PetalburgCity_Mart_MapWarps:: @ 8387674 PetalburgCity_Mart_MapEvents:: @ 8387684 map_events PetalburgCity_Mart_MapObjects, PetalburgCity_Mart_MapWarps, 0x0, 0x0 - diff --git a/data/maps/events/PetalburgCity_PokemonCenter_1F.s b/data/maps/events/PetalburgCity_PokemonCenter_1F.s index 77ff43bc1..5fb3186e5 100644 --- a/data/maps/events/PetalburgCity_PokemonCenter_1F.s +++ b/data/maps/events/PetalburgCity_PokemonCenter_1F.s @@ -12,4 +12,3 @@ PetalburgCity_PokemonCenter_1F_MapWarps:: @ 8387564 PetalburgCity_PokemonCenter_1F_MapEvents:: @ 838757C map_events PetalburgCity_PokemonCenter_1F_MapObjects, PetalburgCity_PokemonCenter_1F_MapWarps, 0x0, 0x0 - diff --git a/data/maps/events/PetalburgCity_PokemonCenter_2F.s b/data/maps/events/PetalburgCity_PokemonCenter_2F.s index 2adccdc91..eab3d7dd5 100644 --- a/data/maps/events/PetalburgCity_PokemonCenter_2F.s +++ b/data/maps/events/PetalburgCity_PokemonCenter_2F.s @@ -12,4 +12,3 @@ PetalburgCity_PokemonCenter_2F_MapWarps:: @ 83875D8 PetalburgCity_PokemonCenter_2F_MapEvents:: @ 8387600 map_events PetalburgCity_PokemonCenter_2F_MapObjects, PetalburgCity_PokemonCenter_2F_MapWarps, 0x0, 0x0 - diff --git a/data/maps/events/PetalburgCity_WallysHouse.s b/data/maps/events/PetalburgCity_WallysHouse.s index 777afdc10..724b84f0f 100644 --- a/data/maps/events/PetalburgCity_WallysHouse.s +++ b/data/maps/events/PetalburgCity_WallysHouse.s @@ -8,4 +8,3 @@ PetalburgCity_WallysHouse_MapWarps:: @ 8387144 PetalburgCity_WallysHouse_MapEvents:: @ 8387154 map_events PetalburgCity_WallysHouse_MapObjects, PetalburgCity_WallysHouse_MapWarps, 0x0, 0x0 - diff --git a/data/maps/events/PetalburgWoods.s b/data/maps/events/PetalburgWoods.s index 3fd0e78c7..0ec69c1a2 100644 --- a/data/maps/events/PetalburgWoods.s +++ b/data/maps/events/PetalburgWoods.s @@ -35,4 +35,3 @@ PetalburgWoods_MapBGEvents:: @ 838C2D4 PetalburgWoods_MapEvents:: @ 838C31C map_events PetalburgWoods_MapObjects, PetalburgWoods_MapWarps, PetalburgWoods_MapCoordEvents, PetalburgWoods_MapBGEvents - diff --git a/data/maps/events/RecordCorner.s b/data/maps/events/RecordCorner.s index 83942871c..7062f61ea 100644 --- a/data/maps/events/RecordCorner.s +++ b/data/maps/events/RecordCorner.s @@ -15,4 +15,3 @@ RecordCorner_MapCoordEvents:: @ 83913D4 RecordCorner_MapEvents:: @ 8391414 map_events RecordCorner_MapObjects, RecordCorner_MapWarps, RecordCorner_MapCoordEvents, 0x0 - diff --git a/data/maps/events/Route101.s b/data/maps/events/Route101.s index 8ee7bf27b..bad4e3ba9 100644 --- a/data/maps/events/Route101.s +++ b/data/maps/events/Route101.s @@ -22,4 +22,3 @@ Route101_MapBGEvents:: @ 83811DC Route101_MapEvents:: @ 83811E8 map_events Route101_MapObjects, 0x0, Route101_MapCoordEvents, Route101_MapBGEvents - diff --git a/data/maps/events/Route102.s b/data/maps/events/Route102.s index bfb0813b3..9cf97de4b 100644 --- a/data/maps/events/Route102.s +++ b/data/maps/events/Route102.s @@ -15,4 +15,3 @@ Route102_MapBGEvents:: @ 83812D4 Route102_MapEvents:: @ 83812EC map_events Route102_MapObjects, 0x0, 0x0, Route102_MapBGEvents - diff --git a/data/maps/events/Route103.s b/data/maps/events/Route103.s index 04f75e922..01640eb65 100644 --- a/data/maps/events/Route103.s +++ b/data/maps/events/Route103.s @@ -20,4 +20,3 @@ Route103_MapBGEvents:: @ 8381468 Route103_MapEvents:: @ 8381474 map_events Route103_MapObjects, 0x0, 0x0, Route103_MapBGEvents - diff --git a/data/maps/events/Route104.s b/data/maps/events/Route104.s index 970ff42c6..da4b5ffc1 100644 --- a/data/maps/events/Route104.s +++ b/data/maps/events/Route104.s @@ -56,4 +56,3 @@ Route104_MapBGEvents:: @ 83817C8 Route104_MapEvents:: @ 8381840 map_events Route104_MapObjects, Route104_MapWarps, 0x0, Route104_MapBGEvents - diff --git a/data/maps/events/Route104_MrBrineysHouse.s b/data/maps/events/Route104_MrBrineysHouse.s index 64959eb74..d8b2ff252 100644 --- a/data/maps/events/Route104_MrBrineysHouse.s +++ b/data/maps/events/Route104_MrBrineysHouse.s @@ -8,4 +8,3 @@ Route104_MrBrineysHouse_MapWarps:: @ 838B684 Route104_MrBrineysHouse_MapEvents:: @ 838B694 map_events Route104_MrBrineysHouse_MapObjects, Route104_MrBrineysHouse_MapWarps, 0x0, 0x0 - diff --git a/data/maps/events/Route104_PrettyPetalFlowerShop.s b/data/maps/events/Route104_PrettyPetalFlowerShop.s index d2baf64fe..0c540e940 100644 --- a/data/maps/events/Route104_PrettyPetalFlowerShop.s +++ b/data/maps/events/Route104_PrettyPetalFlowerShop.s @@ -9,4 +9,3 @@ Route104_PrettyPetalFlowerShop_MapWarps:: @ 838B6F0 Route104_PrettyPetalFlowerShop_MapEvents:: @ 838B700 map_events Route104_PrettyPetalFlowerShop_MapObjects, Route104_PrettyPetalFlowerShop_MapWarps, 0x0, 0x0 - diff --git a/data/maps/events/Route104_Prototype.s b/data/maps/events/Route104_Prototype.s index 4d073abb2..6748fe0ed 100644 --- a/data/maps/events/Route104_Prototype.s +++ b/data/maps/events/Route104_Prototype.s @@ -21,4 +21,3 @@ Route104_Prototype_MapBGEvents:: @ 8392054 Route104_Prototype_MapEvents:: @ 839206C map_events Route104_Prototype_MapObjects, Route104_Prototype_MapWarps, 0x0, Route104_Prototype_MapBGEvents - diff --git a/data/maps/events/Route104_PrototypePrettyPetalFlowerShop.s b/data/maps/events/Route104_PrototypePrettyPetalFlowerShop.s index 21cb6be90..96cac1e71 100644 --- a/data/maps/events/Route104_PrototypePrettyPetalFlowerShop.s +++ b/data/maps/events/Route104_PrototypePrettyPetalFlowerShop.s @@ -7,4 +7,3 @@ Route104_PrototypePrettyPetalFlowerShop_MapWarps:: @ 8392098 Route104_PrototypePrettyPetalFlowerShop_MapEvents:: @ 83920A8 map_events Route104_PrototypePrettyPetalFlowerShop_MapObjects, Route104_PrototypePrettyPetalFlowerShop_MapWarps, 0x0, 0x0 - diff --git a/data/maps/events/Route105.s b/data/maps/events/Route105.s index 9ac8d94f3..5f7f6c13d 100644 --- a/data/maps/events/Route105.s +++ b/data/maps/events/Route105.s @@ -14,4 +14,3 @@ Route105_MapBGEvents:: @ 83818EC Route105_MapEvents:: @ 83818F8 map_events Route105_MapObjects, Route105_MapWarps, 0x0, Route105_MapBGEvents - diff --git a/data/maps/events/Route106.s b/data/maps/events/Route106.s index 1119231b5..51c093fe5 100644 --- a/data/maps/events/Route106.s +++ b/data/maps/events/Route106.s @@ -16,4 +16,3 @@ Route106_MapBGEvents:: @ 838198C Route106_MapEvents:: @ 83819BC map_events Route106_MapObjects, Route106_MapWarps, 0x0, Route106_MapBGEvents - diff --git a/data/maps/events/Route107.s b/data/maps/events/Route107.s index 576975eca..363414c2f 100644 --- a/data/maps/events/Route107.s +++ b/data/maps/events/Route107.s @@ -8,4 +8,3 @@ Route107_MapObjects:: @ 83819D0 Route107_MapEvents:: @ 8381A60 map_events Route107_MapObjects, 0x0, 0x0, 0x0 - diff --git a/data/maps/events/Route108.s b/data/maps/events/Route108.s index 363cb6bd1..1f49a1e0c 100644 --- a/data/maps/events/Route108.s +++ b/data/maps/events/Route108.s @@ -12,4 +12,3 @@ Route108_MapBGEvents:: @ 8381ADC Route108_MapEvents:: @ 8381AE8 map_events Route108_MapObjects, Route108_MapWarps, 0x0, Route108_MapBGEvents - diff --git a/data/maps/events/Route109.s b/data/maps/events/Route109.s index e076fc164..511579650 100644 --- a/data/maps/events/Route109.s +++ b/data/maps/events/Route109.s @@ -35,4 +35,3 @@ Route109_MapBGEvents:: @ 8381CE4 Route109_MapEvents:: @ 8381D44 map_events Route109_MapObjects, Route109_MapWarps, 0x0, Route109_MapBGEvents - diff --git a/data/maps/events/Route109_SeashoreHouse.s b/data/maps/events/Route109_SeashoreHouse.s index 47ea6ce96..5036df1e7 100644 --- a/data/maps/events/Route109_SeashoreHouse.s +++ b/data/maps/events/Route109_SeashoreHouse.s @@ -10,4 +10,3 @@ Route109_SeashoreHouse_MapWarps:: @ 839211C Route109_SeashoreHouse_MapEvents:: @ 839212C map_events Route109_SeashoreHouse_MapObjects, Route109_SeashoreHouse_MapWarps, 0x0, 0x0 - diff --git a/data/maps/events/Route110.s b/data/maps/events/Route110.s index b151d1d74..4ece25549 100644 --- a/data/maps/events/Route110.s +++ b/data/maps/events/Route110.s @@ -67,4 +67,3 @@ Route110_MapBGEvents:: @ 83820C0 Route110_MapEvents:: @ 838218C map_events Route110_MapObjects, Route110_MapWarps, Route110_MapCoordEvents, Route110_MapBGEvents - diff --git a/data/maps/events/Route110_SeasideCyclingRoadNorthEntrance.s b/data/maps/events/Route110_SeasideCyclingRoadNorthEntrance.s index dd1546439..e1ca6b4de 100644 --- a/data/maps/events/Route110_SeasideCyclingRoadNorthEntrance.s +++ b/data/maps/events/Route110_SeasideCyclingRoadNorthEntrance.s @@ -13,4 +13,3 @@ Route110_SeasideCyclingRoadNorthEntrance_MapCoordEvents:: @ 8392CE4 Route110_SeasideCyclingRoadNorthEntrance_MapEvents:: @ 8392D04 map_events Route110_SeasideCyclingRoadNorthEntrance_MapObjects, Route110_SeasideCyclingRoadNorthEntrance_MapWarps, Route110_SeasideCyclingRoadNorthEntrance_MapCoordEvents, 0x0 - diff --git a/data/maps/events/Route110_SeasideCyclingRoadSouthEntrance.s b/data/maps/events/Route110_SeasideCyclingRoadSouthEntrance.s index 6019467dc..24ae3600f 100644 --- a/data/maps/events/Route110_SeasideCyclingRoadSouthEntrance.s +++ b/data/maps/events/Route110_SeasideCyclingRoadSouthEntrance.s @@ -13,4 +13,3 @@ Route110_SeasideCyclingRoadSouthEntrance_MapCoordEvents:: @ 8392C78 Route110_SeasideCyclingRoadSouthEntrance_MapEvents:: @ 8392C98 map_events Route110_SeasideCyclingRoadSouthEntrance_MapObjects, Route110_SeasideCyclingRoadSouthEntrance_MapWarps, Route110_SeasideCyclingRoadSouthEntrance_MapCoordEvents, 0x0 - diff --git a/data/maps/events/Route110_TrickHouseCorridor.s b/data/maps/events/Route110_TrickHouseCorridor.s index 5546edf44..105701e55 100644 --- a/data/maps/events/Route110_TrickHouseCorridor.s +++ b/data/maps/events/Route110_TrickHouseCorridor.s @@ -6,4 +6,3 @@ Route110_TrickHouseCorridor_MapWarps:: @ 8392228 Route110_TrickHouseCorridor_MapEvents:: @ 8392248 map_events 0x0, Route110_TrickHouseCorridor_MapWarps, 0x0, 0x0 - diff --git a/data/maps/events/Route110_TrickHouseEnd.s b/data/maps/events/Route110_TrickHouseEnd.s index 7a789fc5a..f050e3270 100644 --- a/data/maps/events/Route110_TrickHouseEnd.s +++ b/data/maps/events/Route110_TrickHouseEnd.s @@ -13,4 +13,3 @@ Route110_TrickHouseEnd_MapBGEvents:: @ 8392208 Route110_TrickHouseEnd_MapEvents:: @ 8392214 map_events Route110_TrickHouseEnd_MapObjects, Route110_TrickHouseEnd_MapWarps, Route110_TrickHouseEnd_MapCoordEvents, Route110_TrickHouseEnd_MapBGEvents - diff --git a/data/maps/events/Route110_TrickHouseEntrance.s b/data/maps/events/Route110_TrickHouseEntrance.s index dde80168a..a1f67bd3d 100644 --- a/data/maps/events/Route110_TrickHouseEntrance.s +++ b/data/maps/events/Route110_TrickHouseEntrance.s @@ -17,4 +17,3 @@ Route110_TrickHouseEntrance_MapBGEvents:: @ 83921B0 Route110_TrickHouseEntrance_MapEvents:: @ 83921BC map_events Route110_TrickHouseEntrance_MapObjects, Route110_TrickHouseEntrance_MapWarps, Route110_TrickHouseEntrance_MapCoordEvents, Route110_TrickHouseEntrance_MapBGEvents - diff --git a/data/maps/events/Route110_TrickHousePuzzle1.s b/data/maps/events/Route110_TrickHousePuzzle1.s index a2d4bd7c7..7e282f0e8 100644 --- a/data/maps/events/Route110_TrickHousePuzzle1.s +++ b/data/maps/events/Route110_TrickHousePuzzle1.s @@ -29,4 +29,3 @@ Route110_TrickHousePuzzle1_MapBGEvents:: @ 839243C Route110_TrickHousePuzzle1_MapEvents:: @ 8392448 map_events Route110_TrickHousePuzzle1_MapObjects, Route110_TrickHousePuzzle1_MapWarps, 0x0, Route110_TrickHousePuzzle1_MapBGEvents - diff --git a/data/maps/events/Route110_TrickHousePuzzle2.s b/data/maps/events/Route110_TrickHousePuzzle2.s index 68cbbf898..d77fd66a1 100644 --- a/data/maps/events/Route110_TrickHousePuzzle2.s +++ b/data/maps/events/Route110_TrickHousePuzzle2.s @@ -21,4 +21,3 @@ Route110_TrickHousePuzzle2_MapBGEvents:: @ 839252C Route110_TrickHousePuzzle2_MapEvents:: @ 8392538 map_events Route110_TrickHousePuzzle2_MapObjects, Route110_TrickHousePuzzle2_MapWarps, Route110_TrickHousePuzzle2_MapCoordEvents, Route110_TrickHousePuzzle2_MapBGEvents - diff --git a/data/maps/events/Route110_TrickHousePuzzle3.s b/data/maps/events/Route110_TrickHousePuzzle3.s index 66c7ca29c..b7a902a54 100644 --- a/data/maps/events/Route110_TrickHousePuzzle3.s +++ b/data/maps/events/Route110_TrickHousePuzzle3.s @@ -30,4 +30,3 @@ Route110_TrickHousePuzzle3_MapBGEvents:: @ 83926DC Route110_TrickHousePuzzle3_MapEvents:: @ 83926E8 map_events Route110_TrickHousePuzzle3_MapObjects, Route110_TrickHousePuzzle3_MapWarps, Route110_TrickHousePuzzle3_MapCoordEvents, Route110_TrickHousePuzzle3_MapBGEvents - diff --git a/data/maps/events/Route110_TrickHousePuzzle4.s b/data/maps/events/Route110_TrickHousePuzzle4.s index b4fce06f4..ac3e152a2 100644 --- a/data/maps/events/Route110_TrickHousePuzzle4.s +++ b/data/maps/events/Route110_TrickHousePuzzle4.s @@ -25,4 +25,3 @@ Route110_TrickHousePuzzle4_MapBGEvents:: @ 839287C Route110_TrickHousePuzzle4_MapEvents:: @ 8392888 map_events Route110_TrickHousePuzzle4_MapObjects, Route110_TrickHousePuzzle4_MapWarps, 0x0, Route110_TrickHousePuzzle4_MapBGEvents - diff --git a/data/maps/events/Route110_TrickHousePuzzle5.s b/data/maps/events/Route110_TrickHousePuzzle5.s index 487bb49f8..be38ef452 100644 --- a/data/maps/events/Route110_TrickHousePuzzle5.s +++ b/data/maps/events/Route110_TrickHousePuzzle5.s @@ -31,4 +31,3 @@ Route110_TrickHousePuzzle5_MapBGEvents:: @ 8392A0C Route110_TrickHousePuzzle5_MapEvents:: @ 8392A18 map_events Route110_TrickHousePuzzle5_MapObjects, Route110_TrickHousePuzzle5_MapWarps, Route110_TrickHousePuzzle5_MapCoordEvents, Route110_TrickHousePuzzle5_MapBGEvents - diff --git a/data/maps/events/Route110_TrickHousePuzzle6.s b/data/maps/events/Route110_TrickHousePuzzle6.s index 9188da0d1..1e6c7869b 100644 --- a/data/maps/events/Route110_TrickHousePuzzle6.s +++ b/data/maps/events/Route110_TrickHousePuzzle6.s @@ -14,4 +14,3 @@ Route110_TrickHousePuzzle6_MapBGEvents:: @ 8392AA4 Route110_TrickHousePuzzle6_MapEvents:: @ 8392AB0 map_events Route110_TrickHousePuzzle6_MapObjects, Route110_TrickHousePuzzle6_MapWarps, 0x0, Route110_TrickHousePuzzle6_MapBGEvents - diff --git a/data/maps/events/Route110_TrickHousePuzzle7.s b/data/maps/events/Route110_TrickHousePuzzle7.s index 9ab0a3754..d5e4f14af 100644 --- a/data/maps/events/Route110_TrickHousePuzzle7.s +++ b/data/maps/events/Route110_TrickHousePuzzle7.s @@ -22,4 +22,3 @@ Route110_TrickHousePuzzle7_MapBGEvents:: @ 8392B4C Route110_TrickHousePuzzle7_MapEvents:: @ 8392B94 map_events Route110_TrickHousePuzzle7_MapObjects, Route110_TrickHousePuzzle7_MapWarps, Route110_TrickHousePuzzle7_MapCoordEvents, Route110_TrickHousePuzzle7_MapBGEvents - diff --git a/data/maps/events/Route110_TrickHousePuzzle8.s b/data/maps/events/Route110_TrickHousePuzzle8.s index 7fbdbed39..accb0b3a2 100644 --- a/data/maps/events/Route110_TrickHousePuzzle8.s +++ b/data/maps/events/Route110_TrickHousePuzzle8.s @@ -14,4 +14,3 @@ Route110_TrickHousePuzzle8_MapBGEvents:: @ 8392C20 Route110_TrickHousePuzzle8_MapEvents:: @ 8392C2C map_events Route110_TrickHousePuzzle8_MapObjects, Route110_TrickHousePuzzle8_MapWarps, 0x0, Route110_TrickHousePuzzle8_MapBGEvents - diff --git a/data/maps/events/Route111.s b/data/maps/events/Route111.s index 32369d77c..9eeed5ede 100644 --- a/data/maps/events/Route111.s +++ b/data/maps/events/Route111.s @@ -98,4 +98,3 @@ Route111_MapBGEvents:: @ 8382738 Route111_MapEvents:: @ 8382804 map_events Route111_MapObjects, Route111_MapWarps, Route111_MapCoordEvents, Route111_MapBGEvents - diff --git a/data/maps/events/Route111_OldLadysRestStop.s b/data/maps/events/Route111_OldLadysRestStop.s index 325edeee6..c295aa0c9 100644 --- a/data/maps/events/Route111_OldLadysRestStop.s +++ b/data/maps/events/Route111_OldLadysRestStop.s @@ -7,4 +7,3 @@ Route111_OldLadysRestStop_MapWarps:: @ 838B7B0 Route111_OldLadysRestStop_MapEvents:: @ 838B7C0 map_events Route111_OldLadysRestStop_MapObjects, Route111_OldLadysRestStop_MapWarps, 0x0, 0x0 - diff --git a/data/maps/events/Route111_WinstrateFamilysHouse.s b/data/maps/events/Route111_WinstrateFamilysHouse.s index 7f7b3c8a7..8cb265965 100644 --- a/data/maps/events/Route111_WinstrateFamilysHouse.s +++ b/data/maps/events/Route111_WinstrateFamilysHouse.s @@ -10,4 +10,3 @@ Route111_WinstrateFamilysHouse_MapWarps:: @ 838B774 Route111_WinstrateFamilysHouse_MapEvents:: @ 838B784 map_events Route111_WinstrateFamilysHouse_MapObjects, Route111_WinstrateFamilysHouse_MapWarps, 0x0, 0x0 - diff --git a/data/maps/events/Route112.s b/data/maps/events/Route112.s index da75250d0..f6dfcfbe5 100644 --- a/data/maps/events/Route112.s +++ b/data/maps/events/Route112.s @@ -27,4 +27,3 @@ Route112_MapBGEvents:: @ 8382968 Route112_MapEvents:: @ 838298C map_events Route112_MapObjects, Route112_MapWarps, 0x0, Route112_MapBGEvents - diff --git a/data/maps/events/Route112_CableCarStation.s b/data/maps/events/Route112_CableCarStation.s index 3570762b3..6ca18059b 100644 --- a/data/maps/events/Route112_CableCarStation.s +++ b/data/maps/events/Route112_CableCarStation.s @@ -8,4 +8,3 @@ Route112_CableCarStation_MapWarps:: @ 838B804 Route112_CableCarStation_MapEvents:: @ 838B814 map_events Route112_CableCarStation_MapObjects, Route112_CableCarStation_MapWarps, 0x0, 0x0 - diff --git a/data/maps/events/Route113.s b/data/maps/events/Route113.s index 2cb0e6e41..ee145eb76 100644 --- a/data/maps/events/Route113.s +++ b/data/maps/events/Route113.s @@ -46,4 +46,3 @@ Route113_MapBGEvents:: @ 8382BE0 Route113_MapEvents:: @ 8382C34 map_events Route113_MapObjects, Route113_MapWarps, Route113_MapCoordEvents, Route113_MapBGEvents - diff --git a/data/maps/events/Route113_GlassWorkshop.s b/data/maps/events/Route113_GlassWorkshop.s index deee26c6e..68b47709d 100644 --- a/data/maps/events/Route113_GlassWorkshop.s +++ b/data/maps/events/Route113_GlassWorkshop.s @@ -8,4 +8,3 @@ Route113_GlassWorkshop_MapWarps:: @ 8392D48 Route113_GlassWorkshop_MapEvents:: @ 8392D58 map_events Route113_GlassWorkshop_MapObjects, Route113_GlassWorkshop_MapWarps, 0x0, 0x0 - diff --git a/data/maps/events/Route114.s b/data/maps/events/Route114.s index fd560752b..a2d948d33 100644 --- a/data/maps/events/Route114.s +++ b/data/maps/events/Route114.s @@ -44,4 +44,3 @@ Route114_MapBGEvents:: @ 8382E88 Route114_MapEvents:: @ 8382F18 map_events Route114_MapObjects, Route114_MapWarps, 0x0, Route114_MapBGEvents - diff --git a/data/maps/events/Route114_FossilManiacsHouse.s b/data/maps/events/Route114_FossilManiacsHouse.s index 74ec29552..f7bf465e9 100644 --- a/data/maps/events/Route114_FossilManiacsHouse.s +++ b/data/maps/events/Route114_FossilManiacsHouse.s @@ -14,4 +14,3 @@ Route114_FossilManiacsHouse_MapBGEvents:: @ 838B8AC Route114_FossilManiacsHouse_MapEvents:: @ 838B8DC map_events Route114_FossilManiacsHouse_MapObjects, Route114_FossilManiacsHouse_MapWarps, 0x0, Route114_FossilManiacsHouse_MapBGEvents - diff --git a/data/maps/events/Route114_FossilManiacsTunnel.s b/data/maps/events/Route114_FossilManiacsTunnel.s index c30299643..89c231d7e 100644 --- a/data/maps/events/Route114_FossilManiacsTunnel.s +++ b/data/maps/events/Route114_FossilManiacsTunnel.s @@ -7,4 +7,3 @@ Route114_FossilManiacsTunnel_MapWarps:: @ 838B908 Route114_FossilManiacsTunnel_MapEvents:: @ 838B918 map_events Route114_FossilManiacsTunnel_MapObjects, Route114_FossilManiacsTunnel_MapWarps, 0x0, 0x0 - diff --git a/data/maps/events/Route114_LanettesHouse.s b/data/maps/events/Route114_LanettesHouse.s index 5b011f2ca..e62f6e0ad 100644 --- a/data/maps/events/Route114_LanettesHouse.s +++ b/data/maps/events/Route114_LanettesHouse.s @@ -12,4 +12,3 @@ Route114_LanettesHouse_MapBGEvents:: @ 838B954 Route114_LanettesHouse_MapEvents:: @ 838B978 map_events Route114_LanettesHouse_MapObjects, Route114_LanettesHouse_MapWarps, 0x0, Route114_LanettesHouse_MapBGEvents - diff --git a/data/maps/events/Route115.s b/data/maps/events/Route115.s index 6c2baf23d..cba3c3e7d 100644 --- a/data/maps/events/Route115.s +++ b/data/maps/events/Route115.s @@ -37,4 +37,3 @@ Route115_MapBGEvents:: @ 83830B4 Route115_MapEvents:: @ 838315C map_events Route115_MapObjects, Route115_MapWarps, 0x0, Route115_MapBGEvents - diff --git a/data/maps/events/Route116.s b/data/maps/events/Route116.s index b7587f095..18717be4e 100644 --- a/data/maps/events/Route116.s +++ b/data/maps/events/Route116.s @@ -45,4 +45,3 @@ Route116_MapBGEvents:: @ 83833A8 Route116_MapEvents:: @ 838342C map_events Route116_MapObjects, Route116_MapWarps, Route116_MapCoordEvents, Route116_MapBGEvents - diff --git a/data/maps/events/Route116_TunnelersRestHouse.s b/data/maps/events/Route116_TunnelersRestHouse.s index d8f3f2e01..4e4553567 100644 --- a/data/maps/events/Route116_TunnelersRestHouse.s +++ b/data/maps/events/Route116_TunnelersRestHouse.s @@ -9,4 +9,3 @@ Route116_TunnelersRestHouse_MapWarps:: @ 838B9D4 Route116_TunnelersRestHouse_MapEvents:: @ 838B9E4 map_events Route116_TunnelersRestHouse_MapObjects, Route116_TunnelersRestHouse_MapWarps, 0x0, 0x0 - diff --git a/data/maps/events/Route117.s b/data/maps/events/Route117.s index ecea5d016..b53e3de57 100644 --- a/data/maps/events/Route117.s +++ b/data/maps/events/Route117.s @@ -32,4 +32,3 @@ Route117_MapBGEvents:: @ 8383640 Route117_MapEvents:: @ 8383670 map_events Route117_MapObjects, Route117_MapWarps, 0x0, Route117_MapBGEvents - diff --git a/data/maps/events/Route117_PokemonDayCare.s b/data/maps/events/Route117_PokemonDayCare.s index db5e64384..69ede9610 100644 --- a/data/maps/events/Route117_PokemonDayCare.s +++ b/data/maps/events/Route117_PokemonDayCare.s @@ -7,4 +7,3 @@ Route117_PokemonDayCare_MapWarps:: @ 838BA10 Route117_PokemonDayCare_MapEvents:: @ 838BA20 map_events Route117_PokemonDayCare_MapObjects, Route117_PokemonDayCare_MapWarps, 0x0, 0x0 - diff --git a/data/maps/events/Route118.s b/data/maps/events/Route118.s index fb7de71f9..f912b6fbd 100644 --- a/data/maps/events/Route118.s +++ b/data/maps/events/Route118.s @@ -38,4 +38,3 @@ Route118_MapBGEvents:: @ 8383894 Route118_MapEvents:: @ 8383900 map_events Route118_MapObjects, 0x0, Route118_MapCoordEvents, Route118_MapBGEvents - diff --git a/data/maps/events/Route119.s b/data/maps/events/Route119.s index f399604ac..966ae6058 100644 --- a/data/maps/events/Route119.s +++ b/data/maps/events/Route119.s @@ -92,4 +92,3 @@ Route119_MapBGEvents:: @ 8383E2C Route119_MapEvents:: @ 8383F1C map_events Route119_MapObjects, Route119_MapWarps, Route119_MapCoordEvents, Route119_MapBGEvents - diff --git a/data/maps/events/Route119_House.s b/data/maps/events/Route119_House.s index 7686460c0..45267ca0e 100644 --- a/data/maps/events/Route119_House.s +++ b/data/maps/events/Route119_House.s @@ -13,4 +13,3 @@ Route119_House_MapWarps:: @ 8392FE8 Route119_House_MapEvents:: @ 8392FF8 map_events Route119_House_MapObjects, Route119_House_MapWarps, 0x0, 0x0 - diff --git a/data/maps/events/Route119_WeatherInstitute_1F.s b/data/maps/events/Route119_WeatherInstitute_1F.s index bd3760b88..1472fb569 100644 --- a/data/maps/events/Route119_WeatherInstitute_1F.s +++ b/data/maps/events/Route119_WeatherInstitute_1F.s @@ -18,4 +18,3 @@ Route119_WeatherInstitute_1F_MapBGEvents:: @ 8392E50 Route119_WeatherInstitute_1F_MapEvents:: @ 8392E80 map_events Route119_WeatherInstitute_1F_MapObjects, Route119_WeatherInstitute_1F_MapWarps, 0x0, Route119_WeatherInstitute_1F_MapBGEvents - diff --git a/data/maps/events/Route119_WeatherInstitute_2F.s b/data/maps/events/Route119_WeatherInstitute_2F.s index 02437d9f1..d2dbce24d 100644 --- a/data/maps/events/Route119_WeatherInstitute_2F.s +++ b/data/maps/events/Route119_WeatherInstitute_2F.s @@ -11,4 +11,3 @@ Route119_WeatherInstitute_2F_MapWarps:: @ 8392F24 Route119_WeatherInstitute_2F_MapEvents:: @ 8392F2C map_events Route119_WeatherInstitute_2F_MapObjects, Route119_WeatherInstitute_2F_MapWarps, 0x0, 0x0 - diff --git a/data/maps/events/Route120.s b/data/maps/events/Route120.s index 3499d066e..43a67ee99 100644 --- a/data/maps/events/Route120.s +++ b/data/maps/events/Route120.s @@ -84,4 +84,3 @@ Route120_MapBGEvents:: @ 8384448 Route120_MapEvents:: @ 83844F0 map_events Route120_MapObjects, Route120_MapWarps, Route120_MapCoordEvents, Route120_MapBGEvents - diff --git a/data/maps/events/Route121.s b/data/maps/events/Route121.s index 771cfb815..514f51349 100644 --- a/data/maps/events/Route121.s +++ b/data/maps/events/Route121.s @@ -44,4 +44,3 @@ Route121_MapBGEvents:: @ 838475C Route121_MapEvents:: @ 83847C8 map_events Route121_MapObjects, Route121_MapWarps, Route121_MapCoordEvents, Route121_MapBGEvents - diff --git a/data/maps/events/Route121_SafariZoneEntrance.s b/data/maps/events/Route121_SafariZoneEntrance.s index 335688067..c3880d4b3 100644 --- a/data/maps/events/Route121_SafariZoneEntrance.s +++ b/data/maps/events/Route121_SafariZoneEntrance.s @@ -17,4 +17,3 @@ Route121_SafariZoneEntrance_MapBGEvents:: @ 838BAAC Route121_SafariZoneEntrance_MapEvents:: @ 838BAB8 map_events Route121_SafariZoneEntrance_MapObjects, Route121_SafariZoneEntrance_MapWarps, Route121_SafariZoneEntrance_MapCoordEvents, Route121_SafariZoneEntrance_MapBGEvents - diff --git a/data/maps/events/Route122.s b/data/maps/events/Route122.s index 588b56e41..217c28ee1 100644 --- a/data/maps/events/Route122.s +++ b/data/maps/events/Route122.s @@ -3,4 +3,3 @@ Route122_MapWarps:: @ 83847DC Route122_MapEvents:: @ 83847E4 map_events 0x0, Route122_MapWarps, 0x0, 0x0 - diff --git a/data/maps/events/Route123.s b/data/maps/events/Route123.s index 3b7d0850c..6b97bafe5 100644 --- a/data/maps/events/Route123.s +++ b/data/maps/events/Route123.s @@ -74,4 +74,3 @@ Route123_MapBGEvents:: @ 8384C90 Route123_MapEvents:: @ 8384CFC map_events Route123_MapObjects, Route123_MapWarps, Route123_MapCoordEvents, Route123_MapBGEvents - diff --git a/data/maps/events/Route123_BerryMastersHouse.s b/data/maps/events/Route123_BerryMastersHouse.s index 42f9d7e1c..183e19415 100644 --- a/data/maps/events/Route123_BerryMastersHouse.s +++ b/data/maps/events/Route123_BerryMastersHouse.s @@ -8,4 +8,3 @@ Route123_BerryMastersHouse_MapWarps:: @ 8392D9C Route123_BerryMastersHouse_MapEvents:: @ 8392DAC map_events Route123_BerryMastersHouse_MapObjects, Route123_BerryMastersHouse_MapWarps, 0x0, 0x0 - diff --git a/data/maps/events/Route124.s b/data/maps/events/Route124.s index 4b9dc496a..83db7f24b 100644 --- a/data/maps/events/Route124.s +++ b/data/maps/events/Route124.s @@ -18,4 +18,3 @@ Route124_MapBGEvents:: @ 8384E08 Route124_MapEvents:: @ 8384E14 map_events Route124_MapObjects, Route124_MapWarps, 0x0, Route124_MapBGEvents - diff --git a/data/maps/events/Route125.s b/data/maps/events/Route125.s index bf9696563..0c7d12643 100644 --- a/data/maps/events/Route125.s +++ b/data/maps/events/Route125.s @@ -18,4 +18,3 @@ Route125_MapBGEvents:: @ 8384ED8 Route125_MapEvents:: @ 8384F08 map_events Route125_MapObjects, Route125_MapWarps, 0x0, Route125_MapBGEvents - diff --git a/data/maps/events/Route126.s b/data/maps/events/Route126.s index a70e471d1..50d1dca52 100644 --- a/data/maps/events/Route126.s +++ b/data/maps/events/Route126.s @@ -7,4 +7,3 @@ Route126_MapObjects:: @ 8384F1C Route126_MapEvents:: @ 8384F94 map_events Route126_MapObjects, 0x0, 0x0, 0x0 - diff --git a/data/maps/events/Route127.s b/data/maps/events/Route127.s index 4b261a435..b3744194e 100644 --- a/data/maps/events/Route127.s +++ b/data/maps/events/Route127.s @@ -18,4 +18,3 @@ Route127_MapBGEvents:: @ 8385080 Route127_MapEvents:: @ 83850BC map_events Route127_MapObjects, 0x0, 0x0, Route127_MapBGEvents - diff --git a/data/maps/events/Route128.s b/data/maps/events/Route128.s index d49492d21..74f99d02c 100644 --- a/data/maps/events/Route128.s +++ b/data/maps/events/Route128.s @@ -15,4 +15,3 @@ Route128_MapBGEvents:: @ 8385190 Route128_MapEvents:: @ 83851B4 map_events Route128_MapObjects, 0x0, 0x0, Route128_MapBGEvents - diff --git a/data/maps/events/Route129.s b/data/maps/events/Route129.s index 400f26457..10716b557 100644 --- a/data/maps/events/Route129.s +++ b/data/maps/events/Route129.s @@ -6,4 +6,3 @@ Route129_MapObjects:: @ 83851C8 Route129_MapEvents:: @ 8385228 map_events Route129_MapObjects, 0x0, 0x0, 0x0 - diff --git a/data/maps/events/Route130.s b/data/maps/events/Route130.s index 33bbd3cf9..f2c72ef2d 100644 --- a/data/maps/events/Route130.s +++ b/data/maps/events/Route130.s @@ -5,4 +5,3 @@ Route130_MapObjects:: @ 838523C Route130_MapEvents:: @ 8385284 map_events Route130_MapObjects, 0x0, 0x0, 0x0 - diff --git a/data/maps/events/Route131.s b/data/maps/events/Route131.s index 7337299cb..ed1a33768 100644 --- a/data/maps/events/Route131.s +++ b/data/maps/events/Route131.s @@ -11,4 +11,3 @@ Route131_MapWarps:: @ 8385328 Route131_MapEvents:: @ 8385330 map_events Route131_MapObjects, Route131_MapWarps, 0x0, 0x0 - diff --git a/data/maps/events/Route132.s b/data/maps/events/Route132.s index ea5d79b9a..b19e96363 100644 --- a/data/maps/events/Route132.s +++ b/data/maps/events/Route132.s @@ -7,4 +7,3 @@ Route132_MapObjects:: @ 8385344 Route132_MapEvents:: @ 83853BC map_events Route132_MapObjects, 0x0, 0x0, 0x0 - diff --git a/data/maps/events/Route133.s b/data/maps/events/Route133.s index 229bdcda4..1461293e8 100644 --- a/data/maps/events/Route133.s +++ b/data/maps/events/Route133.s @@ -9,4 +9,3 @@ Route133_MapObjects:: @ 83853D0 Route133_MapEvents:: @ 8385478 map_events Route133_MapObjects, 0x0, 0x0, 0x0 - diff --git a/data/maps/events/Route134.s b/data/maps/events/Route134.s index e763a11ed..a8d2eb030 100644 --- a/data/maps/events/Route134.s +++ b/data/maps/events/Route134.s @@ -7,4 +7,3 @@ Route134_MapObjects:: @ 838548C Route134_MapEvents:: @ 8385504 map_events Route134_MapObjects, 0x0, 0x0, 0x0 - diff --git a/data/maps/events/RustboroCity.s b/data/maps/events/RustboroCity.s index ba75bd731..4bbf0a6a2 100644 --- a/data/maps/events/RustboroCity.s +++ b/data/maps/events/RustboroCity.s @@ -57,4 +57,3 @@ RustboroCity_MapBGEvents:: @ 837FF94 RustboroCity_MapEvents:: @ 838000C map_events RustboroCity_MapObjects, RustboroCity_MapWarps, RustboroCity_MapCoordEvents, RustboroCity_MapBGEvents - diff --git a/data/maps/events/RustboroCity_CuttersHouse.s b/data/maps/events/RustboroCity_CuttersHouse.s index d0cca63f3..b38fc9afe 100644 --- a/data/maps/events/RustboroCity_CuttersHouse.s +++ b/data/maps/events/RustboroCity_CuttersHouse.s @@ -8,4 +8,3 @@ RustboroCity_CuttersHouse_MapWarps:: @ 8388DCC RustboroCity_CuttersHouse_MapEvents:: @ 8388DDC map_events RustboroCity_CuttersHouse_MapObjects, RustboroCity_CuttersHouse_MapWarps, 0x0, 0x0 - diff --git a/data/maps/events/RustboroCity_DevonCorp_1F.s b/data/maps/events/RustboroCity_DevonCorp_1F.s index 798de776b..72437229c 100644 --- a/data/maps/events/RustboroCity_DevonCorp_1F.s +++ b/data/maps/events/RustboroCity_DevonCorp_1F.s @@ -10,4 +10,3 @@ RustboroCity_DevonCorp_1F_MapWarps:: @ 8388854 RustboroCity_DevonCorp_1F_MapEvents:: @ 838886C map_events RustboroCity_DevonCorp_1F_MapObjects, RustboroCity_DevonCorp_1F_MapWarps, 0x0, 0x0 - diff --git a/data/maps/events/RustboroCity_DevonCorp_2F.s b/data/maps/events/RustboroCity_DevonCorp_2F.s index f9c5a8665..3ca57bf10 100644 --- a/data/maps/events/RustboroCity_DevonCorp_2F.s +++ b/data/maps/events/RustboroCity_DevonCorp_2F.s @@ -11,4 +11,3 @@ RustboroCity_DevonCorp_2F_MapWarps:: @ 83888F8 RustboroCity_DevonCorp_2F_MapEvents:: @ 8388908 map_events RustboroCity_DevonCorp_2F_MapObjects, RustboroCity_DevonCorp_2F_MapWarps, 0x0, 0x0 - diff --git a/data/maps/events/RustboroCity_DevonCorp_3F.s b/data/maps/events/RustboroCity_DevonCorp_3F.s index a0b6f8ad9..f0f8fadec 100644 --- a/data/maps/events/RustboroCity_DevonCorp_3F.s +++ b/data/maps/events/RustboroCity_DevonCorp_3F.s @@ -12,4 +12,3 @@ RustboroCity_DevonCorp_3F_MapBGEvents:: @ 838896C RustboroCity_DevonCorp_3F_MapEvents:: @ 8388984 map_events RustboroCity_DevonCorp_3F_MapObjects, RustboroCity_DevonCorp_3F_MapWarps, 0x0, RustboroCity_DevonCorp_3F_MapBGEvents - diff --git a/data/maps/events/RustboroCity_Flat1_1F.s b/data/maps/events/RustboroCity_Flat1_1F.s index 252fd1423..9c637f0fb 100644 --- a/data/maps/events/RustboroCity_Flat1_1F.s +++ b/data/maps/events/RustboroCity_Flat1_1F.s @@ -9,4 +9,3 @@ RustboroCity_Flat1_1F_MapWarps:: @ 8388CE8 RustboroCity_Flat1_1F_MapEvents:: @ 8388D00 map_events RustboroCity_Flat1_1F_MapObjects, RustboroCity_Flat1_1F_MapWarps, 0x0, 0x0 - diff --git a/data/maps/events/RustboroCity_Flat1_2F.s b/data/maps/events/RustboroCity_Flat1_2F.s index 7041d8f6e..2d1d187e9 100644 --- a/data/maps/events/RustboroCity_Flat1_2F.s +++ b/data/maps/events/RustboroCity_Flat1_2F.s @@ -6,4 +6,3 @@ RustboroCity_Flat1_2F_MapWarps:: @ 8388D2C RustboroCity_Flat1_2F_MapEvents:: @ 8388D34 map_events RustboroCity_Flat1_2F_MapObjects, RustboroCity_Flat1_2F_MapWarps, 0x0, 0x0 - diff --git a/data/maps/events/RustboroCity_Flat2_1F.s b/data/maps/events/RustboroCity_Flat2_1F.s index 8f958c45f..bd9f4904e 100644 --- a/data/maps/events/RustboroCity_Flat2_1F.s +++ b/data/maps/events/RustboroCity_Flat2_1F.s @@ -9,4 +9,3 @@ RustboroCity_Flat2_1F_MapWarps:: @ 8388E74 RustboroCity_Flat2_1F_MapEvents:: @ 8388E8C map_events RustboroCity_Flat2_1F_MapObjects, RustboroCity_Flat2_1F_MapWarps, 0x0, 0x0 - diff --git a/data/maps/events/RustboroCity_Flat2_2F.s b/data/maps/events/RustboroCity_Flat2_2F.s index 1fdd2fa7c..988e3797d 100644 --- a/data/maps/events/RustboroCity_Flat2_2F.s +++ b/data/maps/events/RustboroCity_Flat2_2F.s @@ -8,4 +8,3 @@ RustboroCity_Flat2_2F_MapWarps:: @ 8388ED0 RustboroCity_Flat2_2F_MapEvents:: @ 8388EE0 map_events RustboroCity_Flat2_2F_MapObjects, RustboroCity_Flat2_2F_MapWarps, 0x0, 0x0 - diff --git a/data/maps/events/RustboroCity_Flat2_3F.s b/data/maps/events/RustboroCity_Flat2_3F.s index acb76be3f..3c09ce553 100644 --- a/data/maps/events/RustboroCity_Flat2_3F.s +++ b/data/maps/events/RustboroCity_Flat2_3F.s @@ -7,4 +7,3 @@ RustboroCity_Flat2_3F_MapWarps:: @ 8388F24 RustboroCity_Flat2_3F_MapEvents:: @ 8388F2C map_events RustboroCity_Flat2_3F_MapObjects, RustboroCity_Flat2_3F_MapWarps, 0x0, 0x0 - diff --git a/data/maps/events/RustboroCity_Gym.s b/data/maps/events/RustboroCity_Gym.s index 929a4ffbd..cfe9f420d 100644 --- a/data/maps/events/RustboroCity_Gym.s +++ b/data/maps/events/RustboroCity_Gym.s @@ -14,4 +14,3 @@ RustboroCity_Gym_MapBGEvents:: @ 8388A08 RustboroCity_Gym_MapEvents:: @ 8388A20 map_events RustboroCity_Gym_MapObjects, RustboroCity_Gym_MapWarps, 0x0, RustboroCity_Gym_MapBGEvents - diff --git a/data/maps/events/RustboroCity_House1.s b/data/maps/events/RustboroCity_House1.s index bf11dafb5..8e1cb1c7e 100644 --- a/data/maps/events/RustboroCity_House1.s +++ b/data/maps/events/RustboroCity_House1.s @@ -8,4 +8,3 @@ RustboroCity_House1_MapWarps:: @ 8388D78 RustboroCity_House1_MapEvents:: @ 8388D88 map_events RustboroCity_House1_MapObjects, RustboroCity_House1_MapWarps, 0x0, 0x0 - diff --git a/data/maps/events/RustboroCity_House2.s b/data/maps/events/RustboroCity_House2.s index f069ba0f5..33159faa4 100644 --- a/data/maps/events/RustboroCity_House2.s +++ b/data/maps/events/RustboroCity_House2.s @@ -8,4 +8,3 @@ RustboroCity_House2_MapWarps:: @ 8388E20 RustboroCity_House2_MapEvents:: @ 8388E30 map_events RustboroCity_House2_MapObjects, RustboroCity_House2_MapWarps, 0x0, 0x0 - diff --git a/data/maps/events/RustboroCity_House3.s b/data/maps/events/RustboroCity_House3.s index 5c57aeee0..696350f00 100644 --- a/data/maps/events/RustboroCity_House3.s +++ b/data/maps/events/RustboroCity_House3.s @@ -9,4 +9,3 @@ RustboroCity_House3_MapWarps:: @ 8388F88 RustboroCity_House3_MapEvents:: @ 8388F98 map_events RustboroCity_House3_MapObjects, RustboroCity_House3_MapWarps, 0x0, 0x0 - diff --git a/data/maps/events/RustboroCity_Mart.s b/data/maps/events/RustboroCity_Mart.s index ece3348c1..3949dcd2e 100644 --- a/data/maps/events/RustboroCity_Mart.s +++ b/data/maps/events/RustboroCity_Mart.s @@ -10,4 +10,3 @@ RustboroCity_Mart_MapWarps:: @ 8388C94 RustboroCity_Mart_MapEvents:: @ 8388CA4 map_events RustboroCity_Mart_MapObjects, RustboroCity_Mart_MapWarps, 0x0, 0x0 - diff --git a/data/maps/events/RustboroCity_PokemonCenter_1F.s b/data/maps/events/RustboroCity_PokemonCenter_1F.s index 36e1e386d..a0e7a3f76 100644 --- a/data/maps/events/RustboroCity_PokemonCenter_1F.s +++ b/data/maps/events/RustboroCity_PokemonCenter_1F.s @@ -11,4 +11,3 @@ RustboroCity_PokemonCenter_1F_MapWarps:: @ 8388B84 RustboroCity_PokemonCenter_1F_MapEvents:: @ 8388B9C map_events RustboroCity_PokemonCenter_1F_MapObjects, RustboroCity_PokemonCenter_1F_MapWarps, 0x0, 0x0 - diff --git a/data/maps/events/RustboroCity_PokemonCenter_2F.s b/data/maps/events/RustboroCity_PokemonCenter_2F.s index df450209c..c75817126 100644 --- a/data/maps/events/RustboroCity_PokemonCenter_2F.s +++ b/data/maps/events/RustboroCity_PokemonCenter_2F.s @@ -12,4 +12,3 @@ RustboroCity_PokemonCenter_2F_MapWarps:: @ 8388BF8 RustboroCity_PokemonCenter_2F_MapEvents:: @ 8388C20 map_events RustboroCity_PokemonCenter_2F_MapObjects, RustboroCity_PokemonCenter_2F_MapWarps, 0x0, 0x0 - diff --git a/data/maps/events/RustboroCity_PokemonSchool.s b/data/maps/events/RustboroCity_PokemonSchool.s index 7dd504a9b..5ae481bad 100644 --- a/data/maps/events/RustboroCity_PokemonSchool.s +++ b/data/maps/events/RustboroCity_PokemonSchool.s @@ -19,4 +19,3 @@ RustboroCity_PokemonSchool_MapBGEvents:: @ 8388AD4 RustboroCity_PokemonSchool_MapEvents:: @ 8388B10 map_events RustboroCity_PokemonSchool_MapObjects, RustboroCity_PokemonSchool_MapWarps, 0x0, RustboroCity_PokemonSchool_MapBGEvents - diff --git a/data/maps/events/RusturfTunnel.s b/data/maps/events/RusturfTunnel.s index 56d4fc302..490afda7b 100644 --- a/data/maps/events/RusturfTunnel.s +++ b/data/maps/events/RusturfTunnel.s @@ -24,4 +24,3 @@ RusturfTunnel_MapCoordEvents:: @ 838BE34 RusturfTunnel_MapEvents:: @ 838BE84 map_events RusturfTunnel_MapObjects, RusturfTunnel_MapWarps, RusturfTunnel_MapCoordEvents, 0x0 - diff --git a/data/maps/events/SSTidalCorridor.s b/data/maps/events/SSTidalCorridor.s index 58fe0f3db..b7eb1eb8f 100644 --- a/data/maps/events/SSTidalCorridor.s +++ b/data/maps/events/SSTidalCorridor.s @@ -31,4 +31,3 @@ SSTidalCorridor_MapBGEvents:: @ 83917A0 SSTidalCorridor_MapEvents:: @ 8391830 map_events SSTidalCorridor_MapObjects, SSTidalCorridor_MapWarps, 0x0, SSTidalCorridor_MapBGEvents - diff --git a/data/maps/events/SSTidalLowerDeck.s b/data/maps/events/SSTidalLowerDeck.s index 6309cc767..6e8530c36 100644 --- a/data/maps/events/SSTidalLowerDeck.s +++ b/data/maps/events/SSTidalLowerDeck.s @@ -10,4 +10,3 @@ SSTidalLowerDeck_MapBGEvents:: @ 839187C SSTidalLowerDeck_MapEvents:: @ 8391888 map_events SSTidalLowerDeck_MapObjects, SSTidalLowerDeck_MapWarps, 0x0, SSTidalLowerDeck_MapBGEvents - diff --git a/data/maps/events/SSTidalRooms.s b/data/maps/events/SSTidalRooms.s index c0eb92d5a..0ffe1cbe7 100644 --- a/data/maps/events/SSTidalRooms.s +++ b/data/maps/events/SSTidalRooms.s @@ -28,4 +28,3 @@ SSTidalRooms_MapBGEvents:: @ 83919BC SSTidalRooms_MapEvents:: @ 83919D4 map_events SSTidalRooms_MapObjects, SSTidalRooms_MapWarps, 0x0, SSTidalRooms_MapBGEvents - diff --git a/data/maps/events/SafariZone_Northeast.s b/data/maps/events/SafariZone_Northeast.s index a7dab8ff2..30921f095 100644 --- a/data/maps/events/SafariZone_Northeast.s +++ b/data/maps/events/SafariZone_Northeast.s @@ -11,4 +11,3 @@ SafariZone_Northeast_MapObjects:: @ 8391A2C SafariZone_Northeast_MapEvents:: @ 8391B04 map_events SafariZone_Northeast_MapObjects, 0x0, 0x0, 0x0 - diff --git a/data/maps/events/SafariZone_Northwest.s b/data/maps/events/SafariZone_Northwest.s index 700e88986..0a1846b29 100644 --- a/data/maps/events/SafariZone_Northwest.s +++ b/data/maps/events/SafariZone_Northwest.s @@ -4,4 +4,3 @@ SafariZone_Northwest_MapObjects:: @ 83919E8 SafariZone_Northwest_MapEvents:: @ 8391A18 map_events SafariZone_Northwest_MapObjects, 0x0, 0x0, 0x0 - diff --git a/data/maps/events/SafariZone_RestHouse.s b/data/maps/events/SafariZone_RestHouse.s index 2e0474133..d6de3f747 100644 --- a/data/maps/events/SafariZone_RestHouse.s +++ b/data/maps/events/SafariZone_RestHouse.s @@ -9,4 +9,3 @@ SafariZone_RestHouse_MapWarps:: @ 8391F08 SafariZone_RestHouse_MapEvents:: @ 8391F18 map_events SafariZone_RestHouse_MapObjects, SafariZone_RestHouse_MapWarps, 0x0, 0x0 - diff --git a/data/maps/events/SafariZone_Southeast.s b/data/maps/events/SafariZone_Southeast.s index ab172ba0c..d67f018ab 100644 --- a/data/maps/events/SafariZone_Southeast.s +++ b/data/maps/events/SafariZone_Southeast.s @@ -9,4 +9,3 @@ SafariZone_Southeast_MapWarps:: @ 8391BD0 SafariZone_Southeast_MapEvents:: @ 8391BD8 map_events SafariZone_Southeast_MapObjects, SafariZone_Southeast_MapWarps, 0x0, 0x0 - diff --git a/data/maps/events/SafariZone_Southwest.s b/data/maps/events/SafariZone_Southwest.s index b552c4d0f..4f7f21de5 100644 --- a/data/maps/events/SafariZone_Southwest.s +++ b/data/maps/events/SafariZone_Southwest.s @@ -10,4 +10,3 @@ SafariZone_Southwest_MapBGEvents:: @ 8391B50 SafariZone_Southwest_MapEvents:: @ 8391B5C map_events SafariZone_Southwest_MapObjects, SafariZone_Southwest_MapWarps, 0x0, SafariZone_Southwest_MapBGEvents - diff --git a/data/maps/events/ScorchedSlab.s b/data/maps/events/ScorchedSlab.s index 508381a9c..4b6625b52 100644 --- a/data/maps/events/ScorchedSlab.s +++ b/data/maps/events/ScorchedSlab.s @@ -6,4 +6,3 @@ ScorchedSlab_MapWarps:: @ 838E9A0 ScorchedSlab_MapEvents:: @ 838E9A8 map_events ScorchedSlab_MapObjects, ScorchedSlab_MapWarps, 0x0, 0x0 - diff --git a/data/maps/events/SeafloorCavern_Entrance.s b/data/maps/events/SeafloorCavern_Entrance.s index 5a3e66e57..a7f08532c 100644 --- a/data/maps/events/SeafloorCavern_Entrance.s +++ b/data/maps/events/SeafloorCavern_Entrance.s @@ -4,4 +4,3 @@ SeafloorCavern_Entrance_MapWarps:: @ 838D094 SeafloorCavern_Entrance_MapEvents:: @ 838D0A4 map_events 0x0, SeafloorCavern_Entrance_MapWarps, 0x0, 0x0 - diff --git a/data/maps/events/SeafloorCavern_Room1.s b/data/maps/events/SeafloorCavern_Room1.s index 20a052399..1e791f884 100644 --- a/data/maps/events/SeafloorCavern_Room1.s +++ b/data/maps/events/SeafloorCavern_Room1.s @@ -12,4 +12,3 @@ SeafloorCavern_Room1_MapWarps:: @ 838D130 SeafloorCavern_Room1_MapEvents:: @ 838D148 map_events SeafloorCavern_Room1_MapObjects, SeafloorCavern_Room1_MapWarps, 0x0, 0x0 - diff --git a/data/maps/events/SeafloorCavern_Room2.s b/data/maps/events/SeafloorCavern_Room2.s index a309aaf1c..3dbe5e8a7 100644 --- a/data/maps/events/SeafloorCavern_Room2.s +++ b/data/maps/events/SeafloorCavern_Room2.s @@ -17,4 +17,3 @@ SeafloorCavern_Room2_MapWarps:: @ 838D234 SeafloorCavern_Room2_MapEvents:: @ 838D254 map_events SeafloorCavern_Room2_MapObjects, SeafloorCavern_Room2_MapWarps, 0x0, 0x0 - diff --git a/data/maps/events/SeafloorCavern_Room3.s b/data/maps/events/SeafloorCavern_Room3.s index f55899e5b..98e6066f2 100644 --- a/data/maps/events/SeafloorCavern_Room3.s +++ b/data/maps/events/SeafloorCavern_Room3.s @@ -17,4 +17,3 @@ SeafloorCavern_Room3_MapWarps:: @ 838D358 SeafloorCavern_Room3_MapEvents:: @ 838D370 map_events SeafloorCavern_Room3_MapObjects, SeafloorCavern_Room3_MapWarps, 0x0, 0x0 - diff --git a/data/maps/events/SeafloorCavern_Room4.s b/data/maps/events/SeafloorCavern_Room4.s index 5d598836d..3233123b3 100644 --- a/data/maps/events/SeafloorCavern_Room4.s +++ b/data/maps/events/SeafloorCavern_Room4.s @@ -9,4 +9,3 @@ SeafloorCavern_Room4_MapWarps:: @ 838D39C SeafloorCavern_Room4_MapEvents:: @ 838D3BC map_events SeafloorCavern_Room4_MapObjects, SeafloorCavern_Room4_MapWarps, 0x0, 0x0 - diff --git a/data/maps/events/SeafloorCavern_Room5.s b/data/maps/events/SeafloorCavern_Room5.s index 8f86c1c76..0ebd46a56 100644 --- a/data/maps/events/SeafloorCavern_Room5.s +++ b/data/maps/events/SeafloorCavern_Room5.s @@ -13,4 +13,3 @@ SeafloorCavern_Room5_MapWarps:: @ 838D460 SeafloorCavern_Room5_MapEvents:: @ 838D478 map_events SeafloorCavern_Room5_MapObjects, SeafloorCavern_Room5_MapWarps, 0x0, 0x0 - diff --git a/data/maps/events/SeafloorCavern_Room6.s b/data/maps/events/SeafloorCavern_Room6.s index 42bb93ce7..9055af75b 100644 --- a/data/maps/events/SeafloorCavern_Room6.s +++ b/data/maps/events/SeafloorCavern_Room6.s @@ -5,4 +5,3 @@ SeafloorCavern_Room6_MapWarps:: @ 838D48C SeafloorCavern_Room6_MapEvents:: @ 838D4A4 map_events 0x0, SeafloorCavern_Room6_MapWarps, 0x0, 0x0 - diff --git a/data/maps/events/SeafloorCavern_Room7.s b/data/maps/events/SeafloorCavern_Room7.s index 7c6c05a1c..7125027fd 100644 --- a/data/maps/events/SeafloorCavern_Room7.s +++ b/data/maps/events/SeafloorCavern_Room7.s @@ -4,4 +4,3 @@ SeafloorCavern_Room7_MapWarps:: @ 838D4B8 SeafloorCavern_Room7_MapEvents:: @ 838D4C8 map_events 0x0, SeafloorCavern_Room7_MapWarps, 0x0, 0x0 - diff --git a/data/maps/events/SeafloorCavern_Room8.s b/data/maps/events/SeafloorCavern_Room8.s index 0c513143f..610937753 100644 --- a/data/maps/events/SeafloorCavern_Room8.s +++ b/data/maps/events/SeafloorCavern_Room8.s @@ -18,4 +18,3 @@ SeafloorCavern_Room8_MapWarps:: @ 838D5FC SeafloorCavern_Room8_MapEvents:: @ 838D60C map_events SeafloorCavern_Room8_MapObjects, SeafloorCavern_Room8_MapWarps, 0x0, 0x0 - diff --git a/data/maps/events/SeafloorCavern_Room9.s b/data/maps/events/SeafloorCavern_Room9.s index 8fac0af19..2fccd4fec 100644 --- a/data/maps/events/SeafloorCavern_Room9.s +++ b/data/maps/events/SeafloorCavern_Room9.s @@ -15,4 +15,3 @@ SeafloorCavern_Room9_MapCoordEvents:: @ 838D6D0 SeafloorCavern_Room9_MapEvents:: @ 838D6E0 map_events SeafloorCavern_Room9_MapObjects, SeafloorCavern_Room9_MapWarps, SeafloorCavern_Room9_MapCoordEvents, 0x0 - diff --git a/data/maps/events/SealedChamber_InnerRoom.s b/data/maps/events/SealedChamber_InnerRoom.s index 3f6077e8e..260de2dd9 100644 --- a/data/maps/events/SealedChamber_InnerRoom.s +++ b/data/maps/events/SealedChamber_InnerRoom.s @@ -14,4 +14,3 @@ SealedChamber_InnerRoom_MapBGEvents:: @ 838E908 SealedChamber_InnerRoom_MapEvents:: @ 838E974 map_events 0x0, SealedChamber_InnerRoom_MapWarps, 0x0, SealedChamber_InnerRoom_MapBGEvents - diff --git a/data/maps/events/SealedChamber_OuterRoom.s b/data/maps/events/SealedChamber_OuterRoom.s index 9b95fb06c..5251d401a 100644 --- a/data/maps/events/SealedChamber_OuterRoom.s +++ b/data/maps/events/SealedChamber_OuterRoom.s @@ -34,4 +34,3 @@ SealedChamber_OuterRoom_MapBGEvents:: @ 838E790 SealedChamber_OuterRoom_MapEvents:: @ 838E8EC map_events 0x0, SealedChamber_OuterRoom_MapWarps, 0x0, SealedChamber_OuterRoom_MapBGEvents - diff --git a/data/maps/events/SecretBase_BlueCave1.s b/data/maps/events/SecretBase_BlueCave1.s index 08ffdfdd1..25bab40da 100644 --- a/data/maps/events/SecretBase_BlueCave1.s +++ b/data/maps/events/SecretBase_BlueCave1.s @@ -20,4 +20,3 @@ SecretBase_BlueCave1_MapWarps:: @ 838F2F4 SecretBase_BlueCave1_MapEvents:: @ 838F2FC map_events SecretBase_BlueCave1_MapObjects, SecretBase_BlueCave1_MapWarps, 0x0, 0x0 - diff --git a/data/maps/events/SecretBase_BlueCave2.s b/data/maps/events/SecretBase_BlueCave2.s index 46f66a0be..a7eac24a4 100644 --- a/data/maps/events/SecretBase_BlueCave2.s +++ b/data/maps/events/SecretBase_BlueCave2.s @@ -20,4 +20,3 @@ SecretBase_BlueCave2_MapWarps:: @ 838FC0C SecretBase_BlueCave2_MapEvents:: @ 838FC14 map_events SecretBase_BlueCave2_MapObjects, SecretBase_BlueCave2_MapWarps, 0x0, 0x0 - diff --git a/data/maps/events/SecretBase_BlueCave3.s b/data/maps/events/SecretBase_BlueCave3.s index 487042edd..202c2bc4e 100644 --- a/data/maps/events/SecretBase_BlueCave3.s +++ b/data/maps/events/SecretBase_BlueCave3.s @@ -20,4 +20,3 @@ SecretBase_BlueCave3_MapWarps:: @ 8390524 SecretBase_BlueCave3_MapEvents:: @ 839052C map_events SecretBase_BlueCave3_MapObjects, SecretBase_BlueCave3_MapWarps, 0x0, 0x0 - diff --git a/data/maps/events/SecretBase_BlueCave4.s b/data/maps/events/SecretBase_BlueCave4.s index 949532d0b..2975c0b37 100644 --- a/data/maps/events/SecretBase_BlueCave4.s +++ b/data/maps/events/SecretBase_BlueCave4.s @@ -20,4 +20,3 @@ SecretBase_BlueCave4_MapWarps:: @ 8390E3C SecretBase_BlueCave4_MapEvents:: @ 8390E44 map_events SecretBase_BlueCave4_MapObjects, SecretBase_BlueCave4_MapWarps, 0x0, 0x0 - diff --git a/data/maps/events/SecretBase_BrownCave1.s b/data/maps/events/SecretBase_BrownCave1.s index 8f3c7b160..31e2d0117 100644 --- a/data/maps/events/SecretBase_BrownCave1.s +++ b/data/maps/events/SecretBase_BrownCave1.s @@ -20,4 +20,3 @@ SecretBase_BrownCave1_MapWarps:: @ 838F170 SecretBase_BrownCave1_MapEvents:: @ 838F178 map_events SecretBase_BrownCave1_MapObjects, SecretBase_BrownCave1_MapWarps, 0x0, 0x0 - diff --git a/data/maps/events/SecretBase_BrownCave2.s b/data/maps/events/SecretBase_BrownCave2.s index 1cc098a3d..93f9a3c03 100644 --- a/data/maps/events/SecretBase_BrownCave2.s +++ b/data/maps/events/SecretBase_BrownCave2.s @@ -20,4 +20,3 @@ SecretBase_BrownCave2_MapWarps:: @ 838FA88 SecretBase_BrownCave2_MapEvents:: @ 838FA90 map_events SecretBase_BrownCave2_MapObjects, SecretBase_BrownCave2_MapWarps, 0x0, 0x0 - diff --git a/data/maps/events/SecretBase_BrownCave3.s b/data/maps/events/SecretBase_BrownCave3.s index 40a318b15..5aa5aed7a 100644 --- a/data/maps/events/SecretBase_BrownCave3.s +++ b/data/maps/events/SecretBase_BrownCave3.s @@ -20,4 +20,3 @@ SecretBase_BrownCave3_MapWarps:: @ 83903A0 SecretBase_BrownCave3_MapEvents:: @ 83903A8 map_events SecretBase_BrownCave3_MapObjects, SecretBase_BrownCave3_MapWarps, 0x0, 0x0 - diff --git a/data/maps/events/SecretBase_BrownCave4.s b/data/maps/events/SecretBase_BrownCave4.s index 9b5572e02..fc66e8fb5 100644 --- a/data/maps/events/SecretBase_BrownCave4.s +++ b/data/maps/events/SecretBase_BrownCave4.s @@ -20,4 +20,3 @@ SecretBase_BrownCave4_MapWarps:: @ 8390CB8 SecretBase_BrownCave4_MapEvents:: @ 8390CC0 map_events SecretBase_BrownCave4_MapObjects, SecretBase_BrownCave4_MapWarps, 0x0, 0x0 - diff --git a/data/maps/events/SecretBase_RedCave1.s b/data/maps/events/SecretBase_RedCave1.s index 1e44ffb93..dbc8c7593 100644 --- a/data/maps/events/SecretBase_RedCave1.s +++ b/data/maps/events/SecretBase_RedCave1.s @@ -20,4 +20,3 @@ SecretBase_RedCave1_MapWarps:: @ 838EFEC SecretBase_RedCave1_MapEvents:: @ 838EFF4 map_events SecretBase_RedCave1_MapObjects, SecretBase_RedCave1_MapWarps, 0x0, 0x0 - diff --git a/data/maps/events/SecretBase_RedCave2.s b/data/maps/events/SecretBase_RedCave2.s index e4c5c8961..910b2c074 100644 --- a/data/maps/events/SecretBase_RedCave2.s +++ b/data/maps/events/SecretBase_RedCave2.s @@ -20,4 +20,3 @@ SecretBase_RedCave2_MapWarps:: @ 838F904 SecretBase_RedCave2_MapEvents:: @ 838F90C map_events SecretBase_RedCave2_MapObjects, SecretBase_RedCave2_MapWarps, 0x0, 0x0 - diff --git a/data/maps/events/SecretBase_RedCave3.s b/data/maps/events/SecretBase_RedCave3.s index 7841943ea..8745b272f 100644 --- a/data/maps/events/SecretBase_RedCave3.s +++ b/data/maps/events/SecretBase_RedCave3.s @@ -20,4 +20,3 @@ SecretBase_RedCave3_MapWarps:: @ 839021C SecretBase_RedCave3_MapEvents:: @ 8390224 map_events SecretBase_RedCave3_MapObjects, SecretBase_RedCave3_MapWarps, 0x0, 0x0 - diff --git a/data/maps/events/SecretBase_RedCave4.s b/data/maps/events/SecretBase_RedCave4.s index 1a3564abe..60928ef5c 100644 --- a/data/maps/events/SecretBase_RedCave4.s +++ b/data/maps/events/SecretBase_RedCave4.s @@ -20,4 +20,3 @@ SecretBase_RedCave4_MapWarps:: @ 8390B34 SecretBase_RedCave4_MapEvents:: @ 8390B3C map_events SecretBase_RedCave4_MapObjects, SecretBase_RedCave4_MapWarps, 0x0, 0x0 - diff --git a/data/maps/events/SecretBase_Shrub1.s b/data/maps/events/SecretBase_Shrub1.s index e7a1f5f3a..17c2f2530 100644 --- a/data/maps/events/SecretBase_Shrub1.s +++ b/data/maps/events/SecretBase_Shrub1.s @@ -20,4 +20,3 @@ SecretBase_Shrub1_MapWarps:: @ 838F780 SecretBase_Shrub1_MapEvents:: @ 838F788 map_events SecretBase_Shrub1_MapObjects, SecretBase_Shrub1_MapWarps, 0x0, 0x0 - diff --git a/data/maps/events/SecretBase_Shrub2.s b/data/maps/events/SecretBase_Shrub2.s index b8c5cfac7..6b973e730 100644 --- a/data/maps/events/SecretBase_Shrub2.s +++ b/data/maps/events/SecretBase_Shrub2.s @@ -20,4 +20,3 @@ SecretBase_Shrub2_MapWarps:: @ 8390098 SecretBase_Shrub2_MapEvents:: @ 83900A0 map_events SecretBase_Shrub2_MapObjects, SecretBase_Shrub2_MapWarps, 0x0, 0x0 - diff --git a/data/maps/events/SecretBase_Shrub3.s b/data/maps/events/SecretBase_Shrub3.s index 30496e5cf..12e2c7c81 100644 --- a/data/maps/events/SecretBase_Shrub3.s +++ b/data/maps/events/SecretBase_Shrub3.s @@ -20,4 +20,3 @@ SecretBase_Shrub3_MapWarps:: @ 83909B0 SecretBase_Shrub3_MapEvents:: @ 83909B8 map_events SecretBase_Shrub3_MapObjects, SecretBase_Shrub3_MapWarps, 0x0, 0x0 - diff --git a/data/maps/events/SecretBase_Shrub4.s b/data/maps/events/SecretBase_Shrub4.s index b6e7d14b7..bd3b94522 100644 --- a/data/maps/events/SecretBase_Shrub4.s +++ b/data/maps/events/SecretBase_Shrub4.s @@ -20,4 +20,3 @@ SecretBase_Shrub4_MapWarps:: @ 83912C8 SecretBase_Shrub4_MapEvents:: @ 83912D0 map_events SecretBase_Shrub4_MapObjects, SecretBase_Shrub4_MapWarps, 0x0, 0x0 - diff --git a/data/maps/events/SecretBase_Tree1.s b/data/maps/events/SecretBase_Tree1.s index dee9340d6..465a0d2be 100644 --- a/data/maps/events/SecretBase_Tree1.s +++ b/data/maps/events/SecretBase_Tree1.s @@ -20,4 +20,3 @@ SecretBase_Tree1_MapWarps:: @ 838F5FC SecretBase_Tree1_MapEvents:: @ 838F604 map_events SecretBase_Tree1_MapObjects, SecretBase_Tree1_MapWarps, 0x0, 0x0 - diff --git a/data/maps/events/SecretBase_Tree2.s b/data/maps/events/SecretBase_Tree2.s index 5b9e3ece0..d780ed779 100644 --- a/data/maps/events/SecretBase_Tree2.s +++ b/data/maps/events/SecretBase_Tree2.s @@ -20,4 +20,3 @@ SecretBase_Tree2_MapWarps:: @ 838FF14 SecretBase_Tree2_MapEvents:: @ 838FF1C map_events SecretBase_Tree2_MapObjects, SecretBase_Tree2_MapWarps, 0x0, 0x0 - diff --git a/data/maps/events/SecretBase_Tree3.s b/data/maps/events/SecretBase_Tree3.s index 1ddc6eb09..0c8888764 100644 --- a/data/maps/events/SecretBase_Tree3.s +++ b/data/maps/events/SecretBase_Tree3.s @@ -20,4 +20,3 @@ SecretBase_Tree3_MapWarps:: @ 839082C SecretBase_Tree3_MapEvents:: @ 8390834 map_events SecretBase_Tree3_MapObjects, SecretBase_Tree3_MapWarps, 0x0, 0x0 - diff --git a/data/maps/events/SecretBase_Tree4.s b/data/maps/events/SecretBase_Tree4.s index 7eb7a36e5..675ee1b8e 100644 --- a/data/maps/events/SecretBase_Tree4.s +++ b/data/maps/events/SecretBase_Tree4.s @@ -20,4 +20,3 @@ SecretBase_Tree4_MapWarps:: @ 8391144 SecretBase_Tree4_MapEvents:: @ 839114C map_events SecretBase_Tree4_MapObjects, SecretBase_Tree4_MapWarps, 0x0, 0x0 - diff --git a/data/maps/events/SecretBase_YellowCave1.s b/data/maps/events/SecretBase_YellowCave1.s index f08d926ba..8c6999f9b 100644 --- a/data/maps/events/SecretBase_YellowCave1.s +++ b/data/maps/events/SecretBase_YellowCave1.s @@ -20,4 +20,3 @@ SecretBase_YellowCave1_MapWarps:: @ 838F478 SecretBase_YellowCave1_MapEvents:: @ 838F480 map_events SecretBase_YellowCave1_MapObjects, SecretBase_YellowCave1_MapWarps, 0x0, 0x0 - diff --git a/data/maps/events/SecretBase_YellowCave2.s b/data/maps/events/SecretBase_YellowCave2.s index 7120e785c..8825836bf 100644 --- a/data/maps/events/SecretBase_YellowCave2.s +++ b/data/maps/events/SecretBase_YellowCave2.s @@ -20,4 +20,3 @@ SecretBase_YellowCave2_MapWarps:: @ 838FD90 SecretBase_YellowCave2_MapEvents:: @ 838FD98 map_events SecretBase_YellowCave2_MapObjects, SecretBase_YellowCave2_MapWarps, 0x0, 0x0 - diff --git a/data/maps/events/SecretBase_YellowCave3.s b/data/maps/events/SecretBase_YellowCave3.s index 85d70bed0..a88e44190 100644 --- a/data/maps/events/SecretBase_YellowCave3.s +++ b/data/maps/events/SecretBase_YellowCave3.s @@ -20,4 +20,3 @@ SecretBase_YellowCave3_MapWarps:: @ 83906A8 SecretBase_YellowCave3_MapEvents:: @ 83906B0 map_events SecretBase_YellowCave3_MapObjects, SecretBase_YellowCave3_MapWarps, 0x0, 0x0 - diff --git a/data/maps/events/SecretBase_YellowCave4.s b/data/maps/events/SecretBase_YellowCave4.s index 2997ddc91..0280e088a 100644 --- a/data/maps/events/SecretBase_YellowCave4.s +++ b/data/maps/events/SecretBase_YellowCave4.s @@ -20,4 +20,3 @@ SecretBase_YellowCave4_MapWarps:: @ 8390FC0 SecretBase_YellowCave4_MapEvents:: @ 8390FC8 map_events SecretBase_YellowCave4_MapObjects, SecretBase_YellowCave4_MapWarps, 0x0, 0x0 - diff --git a/data/maps/events/ShoalCave_HighTideEntranceRoom.s b/data/maps/events/ShoalCave_HighTideEntranceRoom.s index 96551e11c..c7225843f 100644 --- a/data/maps/events/ShoalCave_HighTideEntranceRoom.s +++ b/data/maps/events/ShoalCave_HighTideEntranceRoom.s @@ -1,3 +1,2 @@ ShoalCave_HighTideEntranceRoom_MapEvents:: @ 838DEAC map_events 0x0, 0x0, 0x0, 0x0 - diff --git a/data/maps/events/ShoalCave_HighTideInnerRoom.s b/data/maps/events/ShoalCave_HighTideInnerRoom.s index b66bfbc4a..e7951742a 100644 --- a/data/maps/events/ShoalCave_HighTideInnerRoom.s +++ b/data/maps/events/ShoalCave_HighTideInnerRoom.s @@ -1,3 +1,2 @@ ShoalCave_HighTideInnerRoom_MapEvents:: @ 838DEC0 map_events 0x0, 0x0, 0x0, 0x0 - diff --git a/data/maps/events/ShoalCave_LowTideEntranceRoom.s b/data/maps/events/ShoalCave_LowTideEntranceRoom.s index 582a1d9bd..a9381d0c4 100644 --- a/data/maps/events/ShoalCave_LowTideEntranceRoom.s +++ b/data/maps/events/ShoalCave_LowTideEntranceRoom.s @@ -10,4 +10,3 @@ ShoalCave_LowTideEntranceRoom_MapWarps:: @ 838DD0C ShoalCave_LowTideEntranceRoom_MapEvents:: @ 838DD2C map_events ShoalCave_LowTideEntranceRoom_MapObjects, ShoalCave_LowTideEntranceRoom_MapWarps, 0x0, 0x0 - diff --git a/data/maps/events/ShoalCave_LowTideIceRoom.s b/data/maps/events/ShoalCave_LowTideIceRoom.s index 236ed44fb..2d5958a37 100644 --- a/data/maps/events/ShoalCave_LowTideIceRoom.s +++ b/data/maps/events/ShoalCave_LowTideIceRoom.s @@ -7,4 +7,3 @@ ShoalCave_LowTideIceRoom_MapWarps:: @ 838EE10 ShoalCave_LowTideIceRoom_MapEvents:: @ 838EE18 map_events ShoalCave_LowTideIceRoom_MapObjects, ShoalCave_LowTideIceRoom_MapWarps, 0x0, 0x0 - diff --git a/data/maps/events/ShoalCave_LowTideInnerRoom.s b/data/maps/events/ShoalCave_LowTideInnerRoom.s index f69475f70..954c4c5e9 100644 --- a/data/maps/events/ShoalCave_LowTideInnerRoom.s +++ b/data/maps/events/ShoalCave_LowTideInnerRoom.s @@ -21,4 +21,3 @@ ShoalCave_LowTideInnerRoom_MapBGEvents:: @ 838DD98 ShoalCave_LowTideInnerRoom_MapEvents:: @ 838DDE0 map_events ShoalCave_LowTideInnerRoom_MapObjects, ShoalCave_LowTideInnerRoom_MapWarps, 0x0, ShoalCave_LowTideInnerRoom_MapBGEvents - diff --git a/data/maps/events/ShoalCave_LowTideLowerRoom.s b/data/maps/events/ShoalCave_LowTideLowerRoom.s index 66523ad73..a1770b5bb 100644 --- a/data/maps/events/ShoalCave_LowTideLowerRoom.s +++ b/data/maps/events/ShoalCave_LowTideLowerRoom.s @@ -13,4 +13,3 @@ ShoalCave_LowTideLowerRoom_MapBGEvents:: @ 838DE8C ShoalCave_LowTideLowerRoom_MapEvents:: @ 838DE98 map_events ShoalCave_LowTideLowerRoom_MapObjects, ShoalCave_LowTideLowerRoom_MapWarps, 0x0, ShoalCave_LowTideLowerRoom_MapBGEvents - diff --git a/data/maps/events/ShoalCave_LowTideStairsRoom.s b/data/maps/events/ShoalCave_LowTideStairsRoom.s index 544f0f347..878b1fca0 100644 --- a/data/maps/events/ShoalCave_LowTideStairsRoom.s +++ b/data/maps/events/ShoalCave_LowTideStairsRoom.s @@ -10,4 +10,3 @@ ShoalCave_LowTideStairsRoom_MapBGEvents:: @ 838DE1C ShoalCave_LowTideStairsRoom_MapEvents:: @ 838DE28 map_events ShoalCave_LowTideStairsRoom_MapObjects, ShoalCave_LowTideStairsRoom_MapWarps, 0x0, ShoalCave_LowTideStairsRoom_MapBGEvents - diff --git a/data/maps/events/SingleBattleColosseum.s b/data/maps/events/SingleBattleColosseum.s index a7af56d3a..1d4b51476 100644 --- a/data/maps/events/SingleBattleColosseum.s +++ b/data/maps/events/SingleBattleColosseum.s @@ -11,4 +11,3 @@ SingleBattleColosseum_MapCoordEvents:: @ 839130C SingleBattleColosseum_MapEvents:: @ 839132C map_events SingleBattleColosseum_MapObjects, SingleBattleColosseum_MapWarps, SingleBattleColosseum_MapCoordEvents, 0x0 - diff --git a/data/maps/events/SkyPillar_1F.s b/data/maps/events/SkyPillar_1F.s index 8758265d4..eaf7fa955 100644 --- a/data/maps/events/SkyPillar_1F.s +++ b/data/maps/events/SkyPillar_1F.s @@ -5,4 +5,3 @@ SkyPillar_1F_MapWarps:: @ 838ED38 SkyPillar_1F_MapEvents:: @ 838ED50 map_events 0x0, SkyPillar_1F_MapWarps, 0x0, 0x0 - diff --git a/data/maps/events/SkyPillar_2F.s b/data/maps/events/SkyPillar_2F.s index 4f4eb72a0..ffd0d7d25 100644 --- a/data/maps/events/SkyPillar_2F.s +++ b/data/maps/events/SkyPillar_2F.s @@ -4,4 +4,3 @@ SkyPillar_2F_MapWarps:: @ 838ED64 SkyPillar_2F_MapEvents:: @ 838ED74 map_events 0x0, SkyPillar_2F_MapWarps, 0x0, 0x0 - diff --git a/data/maps/events/SkyPillar_3F.s b/data/maps/events/SkyPillar_3F.s index 401a899db..c34440ab7 100644 --- a/data/maps/events/SkyPillar_3F.s +++ b/data/maps/events/SkyPillar_3F.s @@ -5,4 +5,3 @@ SkyPillar_3F_MapWarps:: @ 838ED88 SkyPillar_3F_MapEvents:: @ 838EDA0 map_events 0x0, SkyPillar_3F_MapWarps, 0x0, 0x0 - diff --git a/data/maps/events/SkyPillar_4F.s b/data/maps/events/SkyPillar_4F.s index 4cc78e723..77586a25a 100644 --- a/data/maps/events/SkyPillar_4F.s +++ b/data/maps/events/SkyPillar_4F.s @@ -5,4 +5,3 @@ SkyPillar_4F_MapWarps:: @ 838EDB4 SkyPillar_4F_MapEvents:: @ 838EDCC map_events 0x0, SkyPillar_4F_MapWarps, 0x0, 0x0 - diff --git a/data/maps/events/SkyPillar_5F.s b/data/maps/events/SkyPillar_5F.s index 2753a225f..7c4ea5a97 100644 --- a/data/maps/events/SkyPillar_5F.s +++ b/data/maps/events/SkyPillar_5F.s @@ -4,4 +4,3 @@ SkyPillar_5F_MapWarps:: @ 838EE2C SkyPillar_5F_MapEvents:: @ 838EE3C map_events 0x0, SkyPillar_5F_MapWarps, 0x0, 0x0 - diff --git a/data/maps/events/SkyPillar_Entrance.s b/data/maps/events/SkyPillar_Entrance.s index 03ba9a035..d27442989 100644 --- a/data/maps/events/SkyPillar_Entrance.s +++ b/data/maps/events/SkyPillar_Entrance.s @@ -4,4 +4,3 @@ SkyPillar_Entrance_MapWarps:: @ 838ECF0 SkyPillar_Entrance_MapEvents:: @ 838ED00 map_events 0x0, SkyPillar_Entrance_MapWarps, 0x0, 0x0 - diff --git a/data/maps/events/SkyPillar_Outside.s b/data/maps/events/SkyPillar_Outside.s index cf8cb36ff..05ffe4df8 100644 --- a/data/maps/events/SkyPillar_Outside.s +++ b/data/maps/events/SkyPillar_Outside.s @@ -4,4 +4,3 @@ SkyPillar_Outside_MapWarps:: @ 838ED14 SkyPillar_Outside_MapEvents:: @ 838ED24 map_events 0x0, SkyPillar_Outside_MapWarps, 0x0, 0x0 - diff --git a/data/maps/events/SkyPillar_Top.s b/data/maps/events/SkyPillar_Top.s index 73bf6337c..6c9d8abc6 100644 --- a/data/maps/events/SkyPillar_Top.s +++ b/data/maps/events/SkyPillar_Top.s @@ -6,4 +6,3 @@ SkyPillar_Top_MapWarps:: @ 838EE68 SkyPillar_Top_MapEvents:: @ 838EE70 map_events SkyPillar_Top_MapObjects, SkyPillar_Top_MapWarps, 0x0, 0x0 - diff --git a/data/maps/events/SlateportCity.s b/data/maps/events/SlateportCity.s index dfd7bdc87..bef2bf0d9 100644 --- a/data/maps/events/SlateportCity.s +++ b/data/maps/events/SlateportCity.s @@ -60,4 +60,3 @@ SlateportCity_MapBGEvents:: @ 837FAEC SlateportCity_MapEvents:: @ 837FB7C map_events SlateportCity_MapObjects, SlateportCity_MapWarps, 0x0, SlateportCity_MapBGEvents - diff --git a/data/maps/events/SlateportCity_ContestHall.s b/data/maps/events/SlateportCity_ContestHall.s index 398ac47f4..ae3e4ea7b 100644 --- a/data/maps/events/SlateportCity_ContestHall.s +++ b/data/maps/events/SlateportCity_ContestHall.s @@ -23,4 +23,3 @@ SlateportCity_ContestHall_MapBGEvents:: @ 83879EC SlateportCity_ContestHall_MapEvents:: @ 8387A04 map_events SlateportCity_ContestHall_MapObjects, SlateportCity_ContestHall_MapWarps, 0x0, SlateportCity_ContestHall_MapBGEvents - diff --git a/data/maps/events/SlateportCity_ContestLobby.s b/data/maps/events/SlateportCity_ContestLobby.s index 2833e91dd..74a8bc131 100644 --- a/data/maps/events/SlateportCity_ContestLobby.s +++ b/data/maps/events/SlateportCity_ContestLobby.s @@ -21,4 +21,3 @@ SlateportCity_ContestLobby_MapBGEvents:: @ 8387860 SlateportCity_ContestLobby_MapEvents:: @ 8387890 map_events SlateportCity_ContestLobby_MapObjects, SlateportCity_ContestLobby_MapWarps, 0x0, SlateportCity_ContestLobby_MapBGEvents - diff --git a/data/maps/events/SlateportCity_Harbor.s b/data/maps/events/SlateportCity_Harbor.s index 8ed7a8b99..3fbbd72c2 100644 --- a/data/maps/events/SlateportCity_Harbor.s +++ b/data/maps/events/SlateportCity_Harbor.s @@ -22,4 +22,3 @@ SlateportCity_Harbor_MapCoordEvents:: @ 8388010 SlateportCity_Harbor_MapEvents:: @ 8388050 map_events SlateportCity_Harbor_MapObjects, SlateportCity_Harbor_MapWarps, SlateportCity_Harbor_MapCoordEvents, 0x0 - diff --git a/data/maps/events/SlateportCity_House1.s b/data/maps/events/SlateportCity_House1.s index f1628d47a..3379b7fef 100644 --- a/data/maps/events/SlateportCity_House1.s +++ b/data/maps/events/SlateportCity_House1.s @@ -7,4 +7,3 @@ SlateportCity_House1_MapWarps:: @ 8387A30 SlateportCity_House1_MapEvents:: @ 8387A40 map_events SlateportCity_House1_MapObjects, SlateportCity_House1_MapWarps, 0x0, 0x0 - diff --git a/data/maps/events/SlateportCity_House2.s b/data/maps/events/SlateportCity_House2.s index 689949166..a147ec7ce 100644 --- a/data/maps/events/SlateportCity_House2.s +++ b/data/maps/events/SlateportCity_House2.s @@ -8,4 +8,3 @@ SlateportCity_House2_MapWarps:: @ 8388094 SlateportCity_House2_MapEvents:: @ 83880A4 map_events SlateportCity_House2_MapObjects, SlateportCity_House2_MapWarps, 0x0, 0x0 - diff --git a/data/maps/events/SlateportCity_Mart.s b/data/maps/events/SlateportCity_Mart.s index 7b8406575..54072eccc 100644 --- a/data/maps/events/SlateportCity_Mart.s +++ b/data/maps/events/SlateportCity_Mart.s @@ -9,4 +9,3 @@ SlateportCity_Mart_MapWarps:: @ 83881F8 SlateportCity_Mart_MapEvents:: @ 8388208 map_events SlateportCity_Mart_MapObjects, SlateportCity_Mart_MapWarps, 0x0, 0x0 - diff --git a/data/maps/events/SlateportCity_OceanicMuseum_1F.s b/data/maps/events/SlateportCity_OceanicMuseum_1F.s index 488140043..9756d6745 100644 --- a/data/maps/events/SlateportCity_OceanicMuseum_1F.s +++ b/data/maps/events/SlateportCity_OceanicMuseum_1F.s @@ -40,4 +40,3 @@ SlateportCity_OceanicMuseum_1F_MapBGEvents:: @ 8387CC0 SlateportCity_OceanicMuseum_1F_MapEvents:: @ 8387D5C map_events SlateportCity_OceanicMuseum_1F_MapObjects, SlateportCity_OceanicMuseum_1F_MapWarps, SlateportCity_OceanicMuseum_1F_MapCoordEvents, SlateportCity_OceanicMuseum_1F_MapBGEvents - diff --git a/data/maps/events/SlateportCity_OceanicMuseum_2F.s b/data/maps/events/SlateportCity_OceanicMuseum_2F.s index 6e35d33ca..a081e15d3 100644 --- a/data/maps/events/SlateportCity_OceanicMuseum_2F.s +++ b/data/maps/events/SlateportCity_OceanicMuseum_2F.s @@ -35,4 +35,3 @@ SlateportCity_OceanicMuseum_2F_MapBGEvents:: @ 8387E20 SlateportCity_OceanicMuseum_2F_MapEvents:: @ 8387F1C map_events SlateportCity_OceanicMuseum_2F_MapObjects, SlateportCity_OceanicMuseum_2F_MapWarps, 0x0, SlateportCity_OceanicMuseum_2F_MapBGEvents - diff --git a/data/maps/events/SlateportCity_PokemonCenter_1F.s b/data/maps/events/SlateportCity_PokemonCenter_1F.s index de0938a00..dfd38dc51 100644 --- a/data/maps/events/SlateportCity_PokemonCenter_1F.s +++ b/data/maps/events/SlateportCity_PokemonCenter_1F.s @@ -10,4 +10,3 @@ SlateportCity_PokemonCenter_1F_MapWarps:: @ 8388100 SlateportCity_PokemonCenter_1F_MapEvents:: @ 8388118 map_events SlateportCity_PokemonCenter_1F_MapObjects, SlateportCity_PokemonCenter_1F_MapWarps, 0x0, 0x0 - diff --git a/data/maps/events/SlateportCity_PokemonCenter_2F.s b/data/maps/events/SlateportCity_PokemonCenter_2F.s index 2de928343..db723fa33 100644 --- a/data/maps/events/SlateportCity_PokemonCenter_2F.s +++ b/data/maps/events/SlateportCity_PokemonCenter_2F.s @@ -12,4 +12,3 @@ SlateportCity_PokemonCenter_2F_MapWarps:: @ 8388174 SlateportCity_PokemonCenter_2F_MapEvents:: @ 838819C map_events SlateportCity_PokemonCenter_2F_MapObjects, SlateportCity_PokemonCenter_2F_MapWarps, 0x0, 0x0 - diff --git a/data/maps/events/SlateportCity_PokemonFanClub.s b/data/maps/events/SlateportCity_PokemonFanClub.s index 55870c257..8003a3439 100644 --- a/data/maps/events/SlateportCity_PokemonFanClub.s +++ b/data/maps/events/SlateportCity_PokemonFanClub.s @@ -14,4 +14,3 @@ SlateportCity_PokemonFanClub_MapWarps:: @ 8387B14 SlateportCity_PokemonFanClub_MapEvents:: @ 8387B24 map_events SlateportCity_PokemonFanClub_MapObjects, SlateportCity_PokemonFanClub_MapWarps, 0x0, 0x0 - diff --git a/data/maps/events/SlateportCity_SternsShipyard_1F.s b/data/maps/events/SlateportCity_SternsShipyard_1F.s index f57a7be9e..38d14fa4e 100644 --- a/data/maps/events/SlateportCity_SternsShipyard_1F.s +++ b/data/maps/events/SlateportCity_SternsShipyard_1F.s @@ -11,4 +11,3 @@ SlateportCity_SternsShipyard_1F_MapWarps:: @ 83876F8 SlateportCity_SternsShipyard_1F_MapEvents:: @ 8387710 map_events SlateportCity_SternsShipyard_1F_MapObjects, SlateportCity_SternsShipyard_1F_MapWarps, 0x0, 0x0 - diff --git a/data/maps/events/SlateportCity_SternsShipyard_2F.s b/data/maps/events/SlateportCity_SternsShipyard_2F.s index e5571ec62..cd26ed1cc 100644 --- a/data/maps/events/SlateportCity_SternsShipyard_2F.s +++ b/data/maps/events/SlateportCity_SternsShipyard_2F.s @@ -8,4 +8,3 @@ SlateportCity_SternsShipyard_2F_MapWarps:: @ 838776C SlateportCity_SternsShipyard_2F_MapEvents:: @ 8387774 map_events SlateportCity_SternsShipyard_2F_MapObjects, SlateportCity_SternsShipyard_2F_MapWarps, 0x0, 0x0 - diff --git a/data/maps/events/SootopolisCity.s b/data/maps/events/SootopolisCity.s index d1015b814..a93db6a93 100644 --- a/data/maps/events/SootopolisCity.s +++ b/data/maps/events/SootopolisCity.s @@ -38,4 +38,3 @@ SootopolisCity_MapBGEvents:: @ 8380780 SootopolisCity_MapEvents:: @ 83807C8 map_events SootopolisCity_MapObjects, SootopolisCity_MapWarps, SootopolisCity_MapCoordEvents, SootopolisCity_MapBGEvents - diff --git a/data/maps/events/SootopolisCity_Gym_1F.s b/data/maps/events/SootopolisCity_Gym_1F.s index f8f1ad0d8..88707692e 100644 --- a/data/maps/events/SootopolisCity_Gym_1F.s +++ b/data/maps/events/SootopolisCity_Gym_1F.s @@ -13,4 +13,3 @@ SootopolisCity_Gym_1F_MapBGEvents:: @ 838AD38 SootopolisCity_Gym_1F_MapEvents:: @ 838AD50 map_events SootopolisCity_Gym_1F_MapObjects, SootopolisCity_Gym_1F_MapWarps, 0x0, SootopolisCity_Gym_1F_MapBGEvents - diff --git a/data/maps/events/SootopolisCity_Gym_B1F.s b/data/maps/events/SootopolisCity_Gym_B1F.s index 3814c5852..44827aaf5 100644 --- a/data/maps/events/SootopolisCity_Gym_B1F.s +++ b/data/maps/events/SootopolisCity_Gym_B1F.s @@ -13,4 +13,3 @@ SootopolisCity_Gym_B1F_MapWarps:: @ 838AE24 SootopolisCity_Gym_B1F_MapEvents:: @ 838AE2C map_events SootopolisCity_Gym_B1F_MapObjects, SootopolisCity_Gym_B1F_MapWarps, 0x0, 0x0 - diff --git a/data/maps/events/SootopolisCity_House1.s b/data/maps/events/SootopolisCity_House1.s index 3c5959ea6..bddda2d88 100644 --- a/data/maps/events/SootopolisCity_House1.s +++ b/data/maps/events/SootopolisCity_House1.s @@ -8,4 +8,3 @@ SootopolisCity_House1_MapWarps:: @ 838AFD4 SootopolisCity_House1_MapEvents:: @ 838AFE4 map_events SootopolisCity_House1_MapObjects, SootopolisCity_House1_MapWarps, 0x0, 0x0 - diff --git a/data/maps/events/SootopolisCity_House2.s b/data/maps/events/SootopolisCity_House2.s index c96b634c7..01cf77ddb 100644 --- a/data/maps/events/SootopolisCity_House2.s +++ b/data/maps/events/SootopolisCity_House2.s @@ -7,4 +7,3 @@ SootopolisCity_House2_MapWarps:: @ 838B010 SootopolisCity_House2_MapEvents:: @ 838B020 map_events SootopolisCity_House2_MapObjects, SootopolisCity_House2_MapWarps, 0x0, 0x0 - diff --git a/data/maps/events/SootopolisCity_House3.s b/data/maps/events/SootopolisCity_House3.s index 65aabc255..dfae0f969 100644 --- a/data/maps/events/SootopolisCity_House3.s +++ b/data/maps/events/SootopolisCity_House3.s @@ -8,4 +8,3 @@ SootopolisCity_House3_MapWarps:: @ 838B064 SootopolisCity_House3_MapEvents:: @ 838B074 map_events SootopolisCity_House3_MapObjects, SootopolisCity_House3_MapWarps, 0x0, 0x0 - diff --git a/data/maps/events/SootopolisCity_House4.s b/data/maps/events/SootopolisCity_House4.s index 33e197f9f..766dbc682 100644 --- a/data/maps/events/SootopolisCity_House4.s +++ b/data/maps/events/SootopolisCity_House4.s @@ -9,4 +9,3 @@ SootopolisCity_House4_MapWarps:: @ 838B0D0 SootopolisCity_House4_MapEvents:: @ 838B0E0 map_events SootopolisCity_House4_MapObjects, SootopolisCity_House4_MapWarps, 0x0, 0x0 - diff --git a/data/maps/events/SootopolisCity_House5.s b/data/maps/events/SootopolisCity_House5.s index 2ad8c1efd..499bc26de 100644 --- a/data/maps/events/SootopolisCity_House5.s +++ b/data/maps/events/SootopolisCity_House5.s @@ -8,4 +8,3 @@ SootopolisCity_House5_MapWarps:: @ 838B124 SootopolisCity_House5_MapEvents:: @ 838B134 map_events SootopolisCity_House5_MapObjects, SootopolisCity_House5_MapWarps, 0x0, 0x0 - diff --git a/data/maps/events/SootopolisCity_House6.s b/data/maps/events/SootopolisCity_House6.s index f56d0d6ef..9fcb17f50 100644 --- a/data/maps/events/SootopolisCity_House6.s +++ b/data/maps/events/SootopolisCity_House6.s @@ -7,4 +7,3 @@ SootopolisCity_House6_MapWarps:: @ 838B160 SootopolisCity_House6_MapEvents:: @ 838B170 map_events SootopolisCity_House6_MapObjects, SootopolisCity_House6_MapWarps, 0x0, 0x0 - diff --git a/data/maps/events/SootopolisCity_House7.s b/data/maps/events/SootopolisCity_House7.s index a737e74b2..d23992a32 100644 --- a/data/maps/events/SootopolisCity_House7.s +++ b/data/maps/events/SootopolisCity_House7.s @@ -8,4 +8,3 @@ SootopolisCity_House7_MapWarps:: @ 838B1B4 SootopolisCity_House7_MapEvents:: @ 838B1C4 map_events SootopolisCity_House7_MapObjects, SootopolisCity_House7_MapWarps, 0x0, 0x0 - diff --git a/data/maps/events/SootopolisCity_House8.s b/data/maps/events/SootopolisCity_House8.s index f484d37f2..4fd384f2b 100644 --- a/data/maps/events/SootopolisCity_House8.s +++ b/data/maps/events/SootopolisCity_House8.s @@ -12,4 +12,3 @@ SootopolisCity_House8_MapBGEvents:: @ 838B218 SootopolisCity_House8_MapEvents:: @ 838B230 map_events SootopolisCity_House8_MapObjects, SootopolisCity_House8_MapWarps, 0x0, SootopolisCity_House8_MapBGEvents - diff --git a/data/maps/events/SootopolisCity_Mart.s b/data/maps/events/SootopolisCity_Mart.s index 07c83773d..144a2b79b 100644 --- a/data/maps/events/SootopolisCity_Mart.s +++ b/data/maps/events/SootopolisCity_Mart.s @@ -9,4 +9,3 @@ SootopolisCity_Mart_MapWarps:: @ 838AF80 SootopolisCity_Mart_MapEvents:: @ 838AF90 map_events SootopolisCity_Mart_MapObjects, SootopolisCity_Mart_MapWarps, 0x0, 0x0 - diff --git a/data/maps/events/SootopolisCity_PokemonCenter_1F.s b/data/maps/events/SootopolisCity_PokemonCenter_1F.s index 640eb2389..c69ebb84c 100644 --- a/data/maps/events/SootopolisCity_PokemonCenter_1F.s +++ b/data/maps/events/SootopolisCity_PokemonCenter_1F.s @@ -10,4 +10,3 @@ SootopolisCity_PokemonCenter_1F_MapWarps:: @ 838AE88 SootopolisCity_PokemonCenter_1F_MapEvents:: @ 838AEA0 map_events SootopolisCity_PokemonCenter_1F_MapObjects, SootopolisCity_PokemonCenter_1F_MapWarps, 0x0, 0x0 - diff --git a/data/maps/events/SootopolisCity_PokemonCenter_2F.s b/data/maps/events/SootopolisCity_PokemonCenter_2F.s index b149402ca..217185c78 100644 --- a/data/maps/events/SootopolisCity_PokemonCenter_2F.s +++ b/data/maps/events/SootopolisCity_PokemonCenter_2F.s @@ -12,4 +12,3 @@ SootopolisCity_PokemonCenter_2F_MapWarps:: @ 838AEFC SootopolisCity_PokemonCenter_2F_MapEvents:: @ 838AF24 map_events SootopolisCity_PokemonCenter_2F_MapObjects, SootopolisCity_PokemonCenter_2F_MapWarps, 0x0, 0x0 - diff --git a/data/maps/events/SouthernIsland_Exterior.s b/data/maps/events/SouthernIsland_Exterior.s index 30a77ac29..062b72d1f 100644 --- a/data/maps/events/SouthernIsland_Exterior.s +++ b/data/maps/events/SouthernIsland_Exterior.s @@ -11,4 +11,3 @@ SouthernIsland_Exterior_MapBGEvents:: @ 8391E40 SouthernIsland_Exterior_MapEvents:: @ 8391E4C map_events SouthernIsland_Exterior_MapObjects, SouthernIsland_Exterior_MapWarps, 0x0, SouthernIsland_Exterior_MapBGEvents - diff --git a/data/maps/events/SouthernIsland_Interior.s b/data/maps/events/SouthernIsland_Interior.s index 0f718c43a..77073fc85 100644 --- a/data/maps/events/SouthernIsland_Interior.s +++ b/data/maps/events/SouthernIsland_Interior.s @@ -11,4 +11,3 @@ SouthernIsland_Interior_MapBGEvents:: @ 8391EA0 SouthernIsland_Interior_MapEvents:: @ 8391EAC map_events SouthernIsland_Interior_MapObjects, SouthernIsland_Interior_MapWarps, 0x0, SouthernIsland_Interior_MapBGEvents - diff --git a/data/maps/events/TradeCenter.s b/data/maps/events/TradeCenter.s index b837208d9..8c5ff5578 100644 --- a/data/maps/events/TradeCenter.s +++ b/data/maps/events/TradeCenter.s @@ -11,4 +11,3 @@ TradeCenter_MapCoordEvents:: @ 8391368 TradeCenter_MapEvents:: @ 8391388 map_events TradeCenter_MapObjects, TradeCenter_MapWarps, TradeCenter_MapCoordEvents, 0x0 - diff --git a/data/maps/events/Underwater1.s b/data/maps/events/Underwater1.s index cc1b41c03..e67181a50 100644 --- a/data/maps/events/Underwater1.s +++ b/data/maps/events/Underwater1.s @@ -9,4 +9,3 @@ Underwater1_MapBGEvents:: @ 8385518 Underwater1_MapEvents:: @ 838556C map_events 0x0, 0x0, 0x0, Underwater1_MapBGEvents - diff --git a/data/maps/events/Underwater2.s b/data/maps/events/Underwater2.s index ca025905f..a9ecbd465 100644 --- a/data/maps/events/Underwater2.s +++ b/data/maps/events/Underwater2.s @@ -13,4 +13,3 @@ Underwater2_MapBGEvents:: @ 8385588 Underwater2_MapEvents:: @ 83855E8 map_events 0x0, Underwater2_MapWarps, 0x0, Underwater2_MapBGEvents - diff --git a/data/maps/events/Underwater3.s b/data/maps/events/Underwater3.s index 7fa02cd71..1e0925650 100644 --- a/data/maps/events/Underwater3.s +++ b/data/maps/events/Underwater3.s @@ -6,4 +6,3 @@ Underwater3_MapBGEvents:: @ 83855FC Underwater3_MapEvents:: @ 838562C map_events 0x0, 0x0, 0x0, Underwater3_MapBGEvents - diff --git a/data/maps/events/Underwater4.s b/data/maps/events/Underwater4.s index 97fc15c1b..711131621 100644 --- a/data/maps/events/Underwater4.s +++ b/data/maps/events/Underwater4.s @@ -7,4 +7,3 @@ Underwater4_MapBGEvents:: @ 8385648 Underwater4_MapEvents:: @ 8385660 map_events 0x0, Underwater4_MapWarps, 0x0, Underwater4_MapBGEvents - diff --git a/data/maps/events/Underwater_Route134.s b/data/maps/events/Underwater_Route134.s index 1212a3e71..f6c734112 100644 --- a/data/maps/events/Underwater_Route134.s +++ b/data/maps/events/Underwater_Route134.s @@ -3,4 +3,3 @@ Underwater_Route134_MapWarps:: @ 838E744 Underwater_Route134_MapEvents:: @ 838E74C map_events 0x0, Underwater_Route134_MapWarps, 0x0, 0x0 - diff --git a/data/maps/events/Underwater_SeafloorCavern.s b/data/maps/events/Underwater_SeafloorCavern.s index dbc3638ed..e06e0a498 100644 --- a/data/maps/events/Underwater_SeafloorCavern.s +++ b/data/maps/events/Underwater_SeafloorCavern.s @@ -9,4 +9,3 @@ Underwater_SeafloorCavern_MapWarps:: @ 838D078 Underwater_SeafloorCavern_MapEvents:: @ 838D080 map_events Underwater_SeafloorCavern_MapObjects, Underwater_SeafloorCavern_MapWarps, 0x0, 0x0 - diff --git a/data/maps/events/Underwater_SealedChamber.s b/data/maps/events/Underwater_SealedChamber.s index e0cbafb31..867527aaf 100644 --- a/data/maps/events/Underwater_SealedChamber.s +++ b/data/maps/events/Underwater_SealedChamber.s @@ -6,4 +6,3 @@ Underwater_SealedChamber_MapBGEvents:: @ 838E768 Underwater_SealedChamber_MapEvents:: @ 838E774 map_events 0x0, Underwater_SealedChamber_MapWarps, 0x0, Underwater_SealedChamber_MapBGEvents - diff --git a/data/maps/events/Underwater_SootopolisCity.s b/data/maps/events/Underwater_SootopolisCity.s index 9e55744e1..fb48a32fb 100644 --- a/data/maps/events/Underwater_SootopolisCity.s +++ b/data/maps/events/Underwater_SootopolisCity.s @@ -4,4 +4,3 @@ Underwater_SootopolisCity_MapWarps:: @ 838BE98 Underwater_SootopolisCity_MapEvents:: @ 838BEA8 map_events 0x0, Underwater_SootopolisCity_MapWarps, 0x0, 0x0 - diff --git a/data/maps/events/UnknownMap_25_34.s b/data/maps/events/UnknownMap_25_34.s index 9b1faa0d7..f3778b3eb 100644 --- a/data/maps/events/UnknownMap_25_34.s +++ b/data/maps/events/UnknownMap_25_34.s @@ -1,3 +1,2 @@ UnknownMap_25_34_MapEvents:: @ 8391604 map_events LinkContestRoom1_MapObjects, 0x0, 0x0, 0x0 - diff --git a/data/maps/events/VerdanturfTown.s b/data/maps/events/VerdanturfTown.s index af83cf9fb..1d40f7f53 100644 --- a/data/maps/events/VerdanturfTown.s +++ b/data/maps/events/VerdanturfTown.s @@ -25,4 +25,3 @@ VerdanturfTown_MapBGEvents:: @ 8380F98 VerdanturfTown_MapEvents:: @ 8380FF8 map_events VerdanturfTown_MapObjects, VerdanturfTown_MapWarps, 0x0, VerdanturfTown_MapBGEvents - diff --git a/data/maps/events/VerdanturfTown_ContestHall.s b/data/maps/events/VerdanturfTown_ContestHall.s index 373bca14d..36f4d58e4 100644 --- a/data/maps/events/VerdanturfTown_ContestHall.s +++ b/data/maps/events/VerdanturfTown_ContestHall.s @@ -13,4 +13,3 @@ VerdanturfTown_ContestHall_MapBGEvents:: @ 8386B44 VerdanturfTown_ContestHall_MapEvents:: @ 8386B5C map_events VerdanturfTown_ContestHall_MapObjects, VerdanturfTown_ContestHall_MapWarps, 0x0, VerdanturfTown_ContestHall_MapBGEvents - diff --git a/data/maps/events/VerdanturfTown_ContestLobby.s b/data/maps/events/VerdanturfTown_ContestLobby.s index 3a61c341a..ec9d88d71 100644 --- a/data/maps/events/VerdanturfTown_ContestLobby.s +++ b/data/maps/events/VerdanturfTown_ContestLobby.s @@ -19,4 +19,3 @@ VerdanturfTown_ContestLobby_MapBGEvents:: @ 8386AA8 VerdanturfTown_ContestLobby_MapEvents:: @ 8386AD8 map_events VerdanturfTown_ContestLobby_MapObjects, VerdanturfTown_ContestLobby_MapWarps, 0x0, VerdanturfTown_ContestLobby_MapBGEvents - diff --git a/data/maps/events/VerdanturfTown_FriendshipRatersHouse.s b/data/maps/events/VerdanturfTown_FriendshipRatersHouse.s index e5c7c6c7d..6ec948511 100644 --- a/data/maps/events/VerdanturfTown_FriendshipRatersHouse.s +++ b/data/maps/events/VerdanturfTown_FriendshipRatersHouse.s @@ -8,4 +8,3 @@ VerdanturfTown_FriendshipRatersHouse_MapWarps:: @ 8386DB8 VerdanturfTown_FriendshipRatersHouse_MapEvents:: @ 8386DC8 map_events VerdanturfTown_FriendshipRatersHouse_MapObjects, VerdanturfTown_FriendshipRatersHouse_MapWarps, 0x0, 0x0 - diff --git a/data/maps/events/VerdanturfTown_House.s b/data/maps/events/VerdanturfTown_House.s index 6bfd73eac..91a54684b 100644 --- a/data/maps/events/VerdanturfTown_House.s +++ b/data/maps/events/VerdanturfTown_House.s @@ -8,4 +8,3 @@ VerdanturfTown_House_MapWarps:: @ 8386E0C VerdanturfTown_House_MapEvents:: @ 8386E1C map_events VerdanturfTown_House_MapObjects, VerdanturfTown_House_MapWarps, 0x0, 0x0 - diff --git a/data/maps/events/VerdanturfTown_Mart.s b/data/maps/events/VerdanturfTown_Mart.s index b85f000b2..90e1cf014 100644 --- a/data/maps/events/VerdanturfTown_Mart.s +++ b/data/maps/events/VerdanturfTown_Mart.s @@ -10,4 +10,3 @@ VerdanturfTown_Mart_MapWarps:: @ 8386BD0 VerdanturfTown_Mart_MapEvents:: @ 8386BE0 map_events VerdanturfTown_Mart_MapObjects, VerdanturfTown_Mart_MapWarps, 0x0, 0x0 - diff --git a/data/maps/events/VerdanturfTown_PokemonCenter_1F.s b/data/maps/events/VerdanturfTown_PokemonCenter_1F.s index ae89432a3..3db30796c 100644 --- a/data/maps/events/VerdanturfTown_PokemonCenter_1F.s +++ b/data/maps/events/VerdanturfTown_PokemonCenter_1F.s @@ -10,4 +10,3 @@ VerdanturfTown_PokemonCenter_1F_MapWarps:: @ 8386C3C VerdanturfTown_PokemonCenter_1F_MapEvents:: @ 8386C54 map_events VerdanturfTown_PokemonCenter_1F_MapObjects, VerdanturfTown_PokemonCenter_1F_MapWarps, 0x0, 0x0 - diff --git a/data/maps/events/VerdanturfTown_PokemonCenter_2F.s b/data/maps/events/VerdanturfTown_PokemonCenter_2F.s index 1a4114ba6..89f02e31f 100644 --- a/data/maps/events/VerdanturfTown_PokemonCenter_2F.s +++ b/data/maps/events/VerdanturfTown_PokemonCenter_2F.s @@ -12,4 +12,3 @@ VerdanturfTown_PokemonCenter_2F_MapWarps:: @ 8386CB0 VerdanturfTown_PokemonCenter_2F_MapEvents:: @ 8386CD8 map_events VerdanturfTown_PokemonCenter_2F_MapObjects, VerdanturfTown_PokemonCenter_2F_MapWarps, 0x0, 0x0 - diff --git a/data/maps/events/VerdanturfTown_WandasHouse.s b/data/maps/events/VerdanturfTown_WandasHouse.s index 7fc3e4cc2..5d0f3e572 100644 --- a/data/maps/events/VerdanturfTown_WandasHouse.s +++ b/data/maps/events/VerdanturfTown_WandasHouse.s @@ -11,4 +11,3 @@ VerdanturfTown_WandasHouse_MapWarps:: @ 8386D64 VerdanturfTown_WandasHouse_MapEvents:: @ 8386D74 map_events VerdanturfTown_WandasHouse_MapObjects, VerdanturfTown_WandasHouse_MapWarps, 0x0, 0x0 - diff --git a/data/maps/events/VictoryRoad_1F.s b/data/maps/events/VictoryRoad_1F.s index c02f109c2..f3f8dcad6 100644 --- a/data/maps/events/VictoryRoad_1F.s +++ b/data/maps/events/VictoryRoad_1F.s @@ -24,4 +24,3 @@ VictoryRoad_1F_MapBGEvents:: @ 838D9E4 VictoryRoad_1F_MapEvents:: @ 838D9F0 map_events VictoryRoad_1F_MapObjects, VictoryRoad_1F_MapWarps, VictoryRoad_1F_MapCoordEvents, VictoryRoad_1F_MapBGEvents - diff --git a/data/maps/events/VictoryRoad_B1F.s b/data/maps/events/VictoryRoad_B1F.s index 941bb71da..a4f778c4d 100644 --- a/data/maps/events/VictoryRoad_B1F.s +++ b/data/maps/events/VictoryRoad_B1F.s @@ -30,4 +30,3 @@ VictoryRoad_B1F_MapWarps:: @ 838DBCC VictoryRoad_B1F_MapEvents:: @ 838DC04 map_events VictoryRoad_B1F_MapObjects, VictoryRoad_B1F_MapWarps, 0x0, 0x0 - diff --git a/data/maps/events/VictoryRoad_B2F.s b/data/maps/events/VictoryRoad_B2F.s index 139259691..b4aa07e59 100644 --- a/data/maps/events/VictoryRoad_B2F.s +++ b/data/maps/events/VictoryRoad_B2F.s @@ -17,4 +17,3 @@ VictoryRoad_B2F_MapBGEvents:: @ 838DCB0 VictoryRoad_B2F_MapEvents:: @ 838DCC8 map_events VictoryRoad_B2F_MapObjects, VictoryRoad_B2F_MapWarps, 0x0, VictoryRoad_B2F_MapBGEvents - diff --git a/data/scripts/maps/AbandonedShip_CaptainsOffice.s b/data/scripts/maps/AbandonedShip_CaptainsOffice.s index 5ad17725b..cf525003e 100644 --- a/data/scripts/maps/AbandonedShip_CaptainsOffice.s +++ b/data/scripts/maps/AbandonedShip_CaptainsOffice.s @@ -24,4 +24,3 @@ AbandonedShip_CaptainsOffice_EventScript_15EB2D:: @ 815EB2D msgbox AbandonedShip_CaptainsOffice_Text_198D7B, 4 release end - diff --git a/data/scripts/maps/AbandonedShip_Corridors_1F.s b/data/scripts/maps/AbandonedShip_Corridors_1F.s index 408299ac4..3cb3592ac 100644 --- a/data/scripts/maps/AbandonedShip_Corridors_1F.s +++ b/data/scripts/maps/AbandonedShip_Corridors_1F.s @@ -9,4 +9,3 @@ AbandonedShip_Corridors_1F_EventScript_15E96E:: @ 815E96E trainerbattle 0, 66, 0, AbandonedShip_Corridors_1F_Text_19843D, AbandonedShip_Corridors_1F_Text_198479 msgbox AbandonedShip_Corridors_1F_Text_198493, 6 end - diff --git a/data/scripts/maps/AbandonedShip_Corridors_B1F.s b/data/scripts/maps/AbandonedShip_Corridors_B1F.s index 71c3691fe..3f66cdbc4 100644 --- a/data/scripts/maps/AbandonedShip_Corridors_B1F.s +++ b/data/scripts/maps/AbandonedShip_Corridors_B1F.s @@ -56,4 +56,3 @@ AbandonedShip_Corridors_B1F_EventScript_15EA1E:: @ 815EA1E trainerbattle 0, 496, 0, AbandonedShip_Corridors_B1F_Text_19856F, AbandonedShip_Corridors_B1F_Text_1985C5 msgbox AbandonedShip_Corridors_B1F_Text_1985D7, 6 end - diff --git a/data/scripts/maps/AbandonedShip_Deck.s b/data/scripts/maps/AbandonedShip_Deck.s index 605dbae59..49f837744 100644 --- a/data/scripts/maps/AbandonedShip_Deck.s +++ b/data/scripts/maps/AbandonedShip_Deck.s @@ -5,4 +5,3 @@ AbandonedShip_Deck_MapScripts:: @ 815E95A AbandonedShip_Deck_MapScript1_15E960:: @ 815E960 setflag 2110 end - diff --git a/data/scripts/maps/AbandonedShip_HiddenFloorCorridors.s b/data/scripts/maps/AbandonedShip_HiddenFloorCorridors.s index 2b1254a11..4b634106a 100644 --- a/data/scripts/maps/AbandonedShip_HiddenFloorCorridors.s +++ b/data/scripts/maps/AbandonedShip_HiddenFloorCorridors.s @@ -146,4 +146,3 @@ AbandonedShip_HiddenFloorCorridors_EventScript_15ECF7:: @ 815ECF7 msgbox AbandonedShip_HiddenFloorCorridors_Text_1986EC, 4 releaseall end - diff --git a/data/scripts/maps/AbandonedShip_HiddenFloorRooms.s b/data/scripts/maps/AbandonedShip_HiddenFloorRooms.s index 8b1e250a6..5e90673fe 100644 --- a/data/scripts/maps/AbandonedShip_HiddenFloorRooms.s +++ b/data/scripts/maps/AbandonedShip_HiddenFloorRooms.s @@ -141,4 +141,3 @@ AbandonedShip_HiddenFloorRooms_EventScript_15EEAB:: @ 815EEAB msgbox AbandonedShip_HiddenFloorRooms_Text_198EE2, 4 releaseall end - diff --git a/data/scripts/maps/AbandonedShip_Room_B1F.s b/data/scripts/maps/AbandonedShip_Room_B1F.s index 92bee6319..4cdc8bbd1 100644 --- a/data/scripts/maps/AbandonedShip_Room_B1F.s +++ b/data/scripts/maps/AbandonedShip_Room_B1F.s @@ -1,3 +1,2 @@ AbandonedShip_Room_B1F_MapScripts:: @ 815EA66 .byte 0 - diff --git a/data/scripts/maps/AbandonedShip_Rooms2_1F.s b/data/scripts/maps/AbandonedShip_Rooms2_1F.s index b059ca4e5..1b2acf7ec 100644 --- a/data/scripts/maps/AbandonedShip_Rooms2_1F.s +++ b/data/scripts/maps/AbandonedShip_Rooms2_1F.s @@ -26,4 +26,3 @@ AbandonedShip_Rooms2_1F_EventScript_15EAD9:: @ 815EAD9 trainerbattle 7, 642, 0, AbandonedShip_Rooms2_1F_Text_198B3B, AbandonedShip_Rooms2_1F_Text_198BCF, AbandonedShip_Rooms2_1F_Text_198C40 msgbox AbandonedShip_Rooms2_1F_Text_198BEA, 6 end - diff --git a/data/scripts/maps/AbandonedShip_Rooms2_B1F.s b/data/scripts/maps/AbandonedShip_Rooms2_B1F.s index 18e144a44..0c8f3ffc9 100644 --- a/data/scripts/maps/AbandonedShip_Rooms2_B1F.s +++ b/data/scripts/maps/AbandonedShip_Rooms2_B1F.s @@ -4,4 +4,3 @@ AbandonedShip_Rooms2_B1F_MapScripts:: @ 815EA4D AbandonedShip_Rooms2_B1F_EventScript_15EA4E:: @ 815EA4E msgbox AbandonedShip_Rooms2_B1F_Text_198759, 2 end - diff --git a/data/scripts/maps/AbandonedShip_Rooms_1F.s b/data/scripts/maps/AbandonedShip_Rooms_1F.s index dafa5c7bd..c5f9ad3f5 100644 --- a/data/scripts/maps/AbandonedShip_Rooms_1F.s +++ b/data/scripts/maps/AbandonedShip_Rooms_1F.s @@ -4,4 +4,3 @@ AbandonedShip_Rooms_1F_MapScripts:: @ 815E985 AbandonedShip_Rooms_1F_EventScript_15E986:: @ 815E986 msgbox AbandonedShip_Rooms_1F_Text_19850A, 2 end - diff --git a/data/scripts/maps/AbandonedShip_Rooms_B1F.s b/data/scripts/maps/AbandonedShip_Rooms_B1F.s index cebcf1b77..44b8c5f20 100644 --- a/data/scripts/maps/AbandonedShip_Rooms_B1F.s +++ b/data/scripts/maps/AbandonedShip_Rooms_B1F.s @@ -9,4 +9,3 @@ AbandonedShip_Rooms_B1F_MapScript1_15EA3B:: @ 815EA3B AbandonedShip_Rooms_B1F_EventScript_15EA44:: @ 815EA44 msgbox AbandonedShip_Rooms_B1F_Text_1986FE, 2 end - diff --git a/data/scripts/maps/AbandonedShip_Underwater1.s b/data/scripts/maps/AbandonedShip_Underwater1.s index af7a26580..71d903682 100644 --- a/data/scripts/maps/AbandonedShip_Underwater1.s +++ b/data/scripts/maps/AbandonedShip_Underwater1.s @@ -5,4 +5,3 @@ AbandonedShip_Underwater1_MapScripts:: @ 815EA57 AbandonedShip_Underwater1_MapScript1_15EA5D:: @ 815EA5D warp4 AbandonedShip_HiddenFloorCorridors, 255, 0, 10 end - diff --git a/data/scripts/maps/AbandonedShip_Underwater2.s b/data/scripts/maps/AbandonedShip_Underwater2.s index a4f9d3912..f7b434c07 100644 --- a/data/scripts/maps/AbandonedShip_Underwater2.s +++ b/data/scripts/maps/AbandonedShip_Underwater2.s @@ -5,4 +5,3 @@ AbandonedShip_Underwater2_MapScripts:: @ 815EB37 AbandonedShip_Underwater2_MapScript1_15EB3D:: @ 815EB3D warp4 AbandonedShip_Rooms_B1F, 255, 13, 7 end - diff --git a/data/scripts/maps/AncientTomb.s b/data/scripts/maps/AncientTomb.s index 66cf88a9c..f8eba6a9d 100644 --- a/data/scripts/maps/AncientTomb.s +++ b/data/scripts/maps/AncientTomb.s @@ -69,4 +69,3 @@ AncientTomb_EventScript_15F050:: @ 815F050 clearflag 2145 release end - diff --git a/data/scripts/maps/AquaHideout_1F.s b/data/scripts/maps/AquaHideout_1F.s index 5a7b04fda..f24e7031e 100644 --- a/data/scripts/maps/AquaHideout_1F.s +++ b/data/scripts/maps/AquaHideout_1F.s @@ -46,4 +46,3 @@ AquaHideout_1F_EventScript_15D827:: @ 815D827 msgbox AquaHideout_1F_Text_196E3D, 4 release end - diff --git a/data/scripts/maps/AquaHideout_B1F.s b/data/scripts/maps/AquaHideout_B1F.s index fe37ddda3..51b782a26 100644 --- a/data/scripts/maps/AquaHideout_B1F.s +++ b/data/scripts/maps/AquaHideout_B1F.s @@ -43,4 +43,3 @@ MagmaHideout_B1F_EventScript_15D89A:: @ 815D89A trainerbattle 0, TRAINER_HIDEOUT_B1F_GRUNT_3, 0, AquaHideout_B1F_Text_196FFD, AquaHideout_B1F_Text_197040 msgbox AquaHideout_B1F_Text_197056, 6 end - diff --git a/data/scripts/maps/AquaHideout_B2F.s b/data/scripts/maps/AquaHideout_B2F.s index 330a9f5fa..479dad430 100644 --- a/data/scripts/maps/AquaHideout_B2F.s +++ b/data/scripts/maps/AquaHideout_B2F.s @@ -99,4 +99,3 @@ MagmaHideout_B2F_EventScript_15D987:: @ 815D987 trainerbattle 0, TRAINER_HIDEOUT_B2F_GRUNT_3, 0, AquaHideout_B2F_Text_1972EF, AquaHideout_B2F_Text_197390 msgbox AquaHideout_B2F_Text_1973C0, 6 end - diff --git a/data/scripts/maps/BattleTower_BattleRoom.s b/data/scripts/maps/BattleTower_BattleRoom.s index 76a1a3194..d991b8853 100644 --- a/data/scripts/maps/BattleTower_BattleRoom.s +++ b/data/scripts/maps/BattleTower_BattleRoom.s @@ -163,4 +163,3 @@ BattleTower_BattleRoom_Movement_160AD0:: @ 8160AD0 step_left step_03 step_end - diff --git a/data/scripts/maps/BattleTower_Corridor.s b/data/scripts/maps/BattleTower_Corridor.s index 6dd4adb3d..4ccf2028c 100644 --- a/data/scripts/maps/BattleTower_Corridor.s +++ b/data/scripts/maps/BattleTower_Corridor.s @@ -56,4 +56,3 @@ BattleTower_Corridor_Movement_1608D5:: @ 81608D5 step_up step_54 step_end - diff --git a/data/scripts/maps/BattleTower_Elevator.s b/data/scripts/maps/BattleTower_Elevator.s index fab5d010d..7a79cc4e9 100644 --- a/data/scripts/maps/BattleTower_Elevator.s +++ b/data/scripts/maps/BattleTower_Elevator.s @@ -55,4 +55,3 @@ BattleTower_Elevator_Movement_160841:: @ 8160841 step_down step_down step_end - diff --git a/data/scripts/maps/BattleTower_Lobby.s b/data/scripts/maps/BattleTower_Lobby.s index 2387a4515..7489dcc7b 100644 --- a/data/scripts/maps/BattleTower_Lobby.s +++ b/data/scripts/maps/BattleTower_Lobby.s @@ -426,4 +426,3 @@ BattleTower_Lobby_EventScript_1607C5:: @ 81607C5 msgbox BattleTower_Lobby_Text_19AC55, 4 release end - diff --git a/data/scripts/maps/BattleTower_Outside.s b/data/scripts/maps/BattleTower_Outside.s index 4ff10710f..02c4e0c6f 100644 --- a/data/scripts/maps/BattleTower_Outside.s +++ b/data/scripts/maps/BattleTower_Outside.s @@ -92,4 +92,3 @@ BattleTower_Outside_EventScript_16026C:: @ 816026C BattleTower_Outside_EventScript_160275:: @ 8160275 msgbox BattleTower_Outside_Text_199ED4, 2 end - diff --git a/data/scripts/maps/CaveOfOrigin_1F.s b/data/scripts/maps/CaveOfOrigin_1F.s index f55cd5081..7fd365b36 100644 --- a/data/scripts/maps/CaveOfOrigin_1F.s +++ b/data/scripts/maps/CaveOfOrigin_1F.s @@ -6,4 +6,3 @@ CaveOfOrigin_1F_MapScript1_15DD72:: @ 815DD72 checkflag 113 callif 1, CaveOfOrigin_1F_EventScript_1A04E3 end - diff --git a/data/scripts/maps/CaveOfOrigin_B1F.s b/data/scripts/maps/CaveOfOrigin_B1F.s index 751f38659..9603ae83b 100644 --- a/data/scripts/maps/CaveOfOrigin_B1F.s +++ b/data/scripts/maps/CaveOfOrigin_B1F.s @@ -6,4 +6,3 @@ CaveOfOrigin_B1F_MapScript1_15DD82:: @ 815DD82 checkflag 113 callif 1, CaveOfOrigin_B1F_EventScript_1A04E3 end - diff --git a/data/scripts/maps/CaveOfOrigin_B2F.s b/data/scripts/maps/CaveOfOrigin_B2F.s index 8c1ba56b8..6b3a55648 100644 --- a/data/scripts/maps/CaveOfOrigin_B2F.s +++ b/data/scripts/maps/CaveOfOrigin_B2F.s @@ -6,4 +6,3 @@ CaveOfOrigin_B2F_MapScript1_15DD92:: @ 815DD92 checkflag 113 callif 1, CaveOfOrigin_B2F_EventScript_1A04E3 end - diff --git a/data/scripts/maps/CaveOfOrigin_B3F.s b/data/scripts/maps/CaveOfOrigin_B3F.s index 2ebdb2d05..8e61048d2 100644 --- a/data/scripts/maps/CaveOfOrigin_B3F.s +++ b/data/scripts/maps/CaveOfOrigin_B3F.s @@ -6,4 +6,3 @@ CaveOfOrigin_B3F_MapScript1_15DDA2:: @ 815DDA2 checkflag 113 callif 1, CaveOfOrigin_B3F_EventScript_1A04E3 end - diff --git a/data/scripts/maps/CaveOfOrigin_B4F.s b/data/scripts/maps/CaveOfOrigin_B4F.s index b9f83fe67..e9f23ff5a 100644 --- a/data/scripts/maps/CaveOfOrigin_B4F.s +++ b/data/scripts/maps/CaveOfOrigin_B4F.s @@ -97,4 +97,3 @@ CaveOfOrigin_B4F_Movement_15DE7D:: @ 815DE7D step_14 step_61 step_end - diff --git a/data/scripts/maps/CaveOfOrigin_Entrance.s b/data/scripts/maps/CaveOfOrigin_Entrance.s index a39a290be..68f91e0bd 100644 --- a/data/scripts/maps/CaveOfOrigin_Entrance.s +++ b/data/scripts/maps/CaveOfOrigin_Entrance.s @@ -1,3 +1,2 @@ CaveOfOrigin_Entrance_MapScripts:: @ 815DD6B .byte 0 - diff --git a/data/scripts/maps/DesertRuins.s b/data/scripts/maps/DesertRuins.s index de5658eac..d5787d792 100644 --- a/data/scripts/maps/DesertRuins.s +++ b/data/scripts/maps/DesertRuins.s @@ -69,4 +69,3 @@ DesertRuins_EventScript_15CB85:: @ 815CB85 clearflag 2145 release end - diff --git a/data/scripts/maps/DewfordTown_Gym.s b/data/scripts/maps/DewfordTown_Gym.s index e51c33c69..e6b80462d 100644 --- a/data/scripts/maps/DewfordTown_Gym.s +++ b/data/scripts/maps/DewfordTown_Gym.s @@ -198,4 +198,3 @@ DewfordTown_Gym_EventScript_153288:: @ 8153288 msgbox DewfordTown_Gym_Text_175477, 4 releaseall end - diff --git a/data/scripts/maps/DewfordTown_Hall.s b/data/scripts/maps/DewfordTown_Hall.s index a7dd01c32..0b25e0aba 100644 --- a/data/scripts/maps/DewfordTown_Hall.s +++ b/data/scripts/maps/DewfordTown_Hall.s @@ -266,4 +266,3 @@ DewfordTown_Hall_EventScript_1535D1:: @ 81535D1 msgbox DewfordTown_Hall_Text_175EBE, 4 release end - diff --git a/data/scripts/maps/DewfordTown_House1.s b/data/scripts/maps/DewfordTown_House1.s index fa9e62b12..40e06357c 100644 --- a/data/scripts/maps/DewfordTown_House1.s +++ b/data/scripts/maps/DewfordTown_House1.s @@ -18,4 +18,3 @@ DewfordTown_House1_EventScript_153001:: @ 8153001 waitpokecry release end - diff --git a/data/scripts/maps/DewfordTown_House2.s b/data/scripts/maps/DewfordTown_House2.s index 8f1e8c784..529f8bb24 100644 --- a/data/scripts/maps/DewfordTown_House2.s +++ b/data/scripts/maps/DewfordTown_House2.s @@ -27,4 +27,3 @@ DewfordTown_House2_EventScript_153615:: @ 8153615 DewfordTown_House2_EventScript_15361F:: @ 815361F msgbox DewfordTown_House2_Text_1760C8, 2 end - diff --git a/data/scripts/maps/DewfordTown_PokemonCenter_1F.s b/data/scripts/maps/DewfordTown_PokemonCenter_1F.s index 687a01ddc..96c198ae5 100644 --- a/data/scripts/maps/DewfordTown_PokemonCenter_1F.s +++ b/data/scripts/maps/DewfordTown_PokemonCenter_1F.s @@ -22,4 +22,3 @@ DewfordTown_PokemonCenter_1F_EventScript_153031:: @ 8153031 DewfordTown_PokemonCenter_1F_EventScript_15303A:: @ 815303A msgbox DewfordTown_PokemonCenter_1F_Text_174D32, 2 end - diff --git a/data/scripts/maps/DewfordTown_PokemonCenter_2F.s b/data/scripts/maps/DewfordTown_PokemonCenter_2F.s index 5d23f1f9a..554c9ef6b 100644 --- a/data/scripts/maps/DewfordTown_PokemonCenter_2F.s +++ b/data/scripts/maps/DewfordTown_PokemonCenter_2F.s @@ -15,4 +15,3 @@ DewfordTown_PokemonCenter_2F_EventScript_153059:: @ 8153059 DewfordTown_PokemonCenter_2F_EventScript_15305F:: @ 815305F call DewfordTown_PokemonCenter_2F_EventScript_1A41FB end - diff --git a/data/scripts/maps/DoubleBattleColosseum.s b/data/scripts/maps/DoubleBattleColosseum.s index 360f5fced..9bc33e6bd 100644 --- a/data/scripts/maps/DoubleBattleColosseum.s +++ b/data/scripts/maps/DoubleBattleColosseum.s @@ -1,3 +1,2 @@ DoubleBattleColosseum_MapScripts:: @ 815F57F .byte 0 - diff --git a/data/scripts/maps/EverGrandeCity.s b/data/scripts/maps/EverGrandeCity.s index cdac6069e..9b6d2a8b7 100644 --- a/data/scripts/maps/EverGrandeCity.s +++ b/data/scripts/maps/EverGrandeCity.s @@ -23,4 +23,3 @@ EverGrandeCity_EventScript_14D500:: @ 814D500 setflag 2078 setvar 0x4001, 1 end - diff --git a/data/scripts/maps/EverGrandeCity_ChampionsRoom.s b/data/scripts/maps/EverGrandeCity_ChampionsRoom.s index 1187aaeea..92048597b 100644 --- a/data/scripts/maps/EverGrandeCity_ChampionsRoom.s +++ b/data/scripts/maps/EverGrandeCity_ChampionsRoom.s @@ -224,4 +224,3 @@ EverGrandeCity_ChampionsRoom_Movement_15BA03:: @ 815BA03 step_up step_27 step_end - diff --git a/data/scripts/maps/EverGrandeCity_Corridor1.s b/data/scripts/maps/EverGrandeCity_Corridor1.s index a3798d99b..499ad673f 100644 --- a/data/scripts/maps/EverGrandeCity_Corridor1.s +++ b/data/scripts/maps/EverGrandeCity_Corridor1.s @@ -9,4 +9,3 @@ EverGrandeCity_Corridor1_MapScript2_15BA12:: @ 815BA12 EverGrandeCity_Corridor1_EventScript_15BA1C:: @ 815BA1C spriteface 255, 2 end - diff --git a/data/scripts/maps/EverGrandeCity_Corridor2.s b/data/scripts/maps/EverGrandeCity_Corridor2.s index 699338f21..692de1ed9 100644 --- a/data/scripts/maps/EverGrandeCity_Corridor2.s +++ b/data/scripts/maps/EverGrandeCity_Corridor2.s @@ -9,4 +9,3 @@ EverGrandeCity_Corridor2_MapScript2_15BA27:: @ 815BA27 EverGrandeCity_Corridor2_EventScript_15BA31:: @ 815BA31 spriteface 255, 2 end - diff --git a/data/scripts/maps/EverGrandeCity_Corridor3.s b/data/scripts/maps/EverGrandeCity_Corridor3.s index d70b390a5..f8ed19669 100644 --- a/data/scripts/maps/EverGrandeCity_Corridor3.s +++ b/data/scripts/maps/EverGrandeCity_Corridor3.s @@ -9,4 +9,3 @@ EverGrandeCity_Corridor3_MapScript2_15BA3C:: @ 815BA3C EverGrandeCity_Corridor3_EventScript_15BA46:: @ 815BA46 spriteface 255, 2 end - diff --git a/data/scripts/maps/EverGrandeCity_Corridor4.s b/data/scripts/maps/EverGrandeCity_Corridor4.s index 131f5d342..616a25ec5 100644 --- a/data/scripts/maps/EverGrandeCity_Corridor4.s +++ b/data/scripts/maps/EverGrandeCity_Corridor4.s @@ -9,4 +9,3 @@ EverGrandeCity_Corridor4_MapScript2_15BA51:: @ 815BA51 EverGrandeCity_Corridor4_EventScript_15BA5B:: @ 815BA5B spriteface 255, 2 end - diff --git a/data/scripts/maps/EverGrandeCity_Corridor5.s b/data/scripts/maps/EverGrandeCity_Corridor5.s index d27df4ec8..783b03aec 100644 --- a/data/scripts/maps/EverGrandeCity_Corridor5.s +++ b/data/scripts/maps/EverGrandeCity_Corridor5.s @@ -9,4 +9,3 @@ EverGrandeCity_Corridor5_MapScript2_15BA66:: @ 815BA66 EverGrandeCity_Corridor5_EventScript_15BA70:: @ 815BA70 spriteface 255, 2 end - diff --git a/data/scripts/maps/EverGrandeCity_DrakesRoom.s b/data/scripts/maps/EverGrandeCity_DrakesRoom.s index 84b52ca7e..fa301c508 100644 --- a/data/scripts/maps/EverGrandeCity_DrakesRoom.s +++ b/data/scripts/maps/EverGrandeCity_DrakesRoom.s @@ -62,4 +62,3 @@ EverGrandeCity_DrakesRoom_EventScript_15B795:: @ 815B795 msgbox EverGrandeCity_DrakesRoom_Text_190E5D, 4 release end - diff --git a/data/scripts/maps/EverGrandeCity_GlaciasRoom.s b/data/scripts/maps/EverGrandeCity_GlaciasRoom.s index 830a810e6..6942aec23 100644 --- a/data/scripts/maps/EverGrandeCity_GlaciasRoom.s +++ b/data/scripts/maps/EverGrandeCity_GlaciasRoom.s @@ -60,4 +60,3 @@ EverGrandeCity_GlaciasRoom_EventScript_15B6FB:: @ 815B6FB msgbox EverGrandeCity_GlaciasRoom_Text_190C8F, 4 release end - diff --git a/data/scripts/maps/EverGrandeCity_HallOfFame.s b/data/scripts/maps/EverGrandeCity_HallOfFame.s index e3d3b74e4..2e7099110 100644 --- a/data/scripts/maps/EverGrandeCity_HallOfFame.s +++ b/data/scripts/maps/EverGrandeCity_HallOfFame.s @@ -82,4 +82,3 @@ EverGrandeCity_HallOfFame_Movement_15BC60:: @ 815BC60 step_up step_up step_end - diff --git a/data/scripts/maps/EverGrandeCity_PhoebesRoom.s b/data/scripts/maps/EverGrandeCity_PhoebesRoom.s index f97a892ce..289065d72 100644 --- a/data/scripts/maps/EverGrandeCity_PhoebesRoom.s +++ b/data/scripts/maps/EverGrandeCity_PhoebesRoom.s @@ -60,4 +60,3 @@ EverGrandeCity_PhoebesRoom_EventScript_15B661:: @ 815B661 msgbox EverGrandeCity_PhoebesRoom_Text_190A2A, 4 release end - diff --git a/data/scripts/maps/EverGrandeCity_PokemonCenter_1F.s b/data/scripts/maps/EverGrandeCity_PokemonCenter_1F.s index 85d9e2241..7c0b8b0a4 100644 --- a/data/scripts/maps/EverGrandeCity_PokemonCenter_1F.s +++ b/data/scripts/maps/EverGrandeCity_PokemonCenter_1F.s @@ -22,4 +22,3 @@ EverGrandeCity_PokemonCenter_1F_EventScript_15BC7E:: @ 815BC7E EverGrandeCity_PokemonCenter_1F_EventScript_15BC87:: @ 815BC87 msgbox EverGrandeCity_PokemonCenter_1F_Text_1919EF, 2 end - diff --git a/data/scripts/maps/EverGrandeCity_PokemonCenter_2F.s b/data/scripts/maps/EverGrandeCity_PokemonCenter_2F.s index 27da0d547..9941e17e4 100644 --- a/data/scripts/maps/EverGrandeCity_PokemonCenter_2F.s +++ b/data/scripts/maps/EverGrandeCity_PokemonCenter_2F.s @@ -15,4 +15,3 @@ EverGrandeCity_PokemonCenter_2F_EventScript_15BCA6:: @ 815BCA6 EverGrandeCity_PokemonCenter_2F_EventScript_15BCAC:: @ 815BCAC call EverGrandeCity_PokemonCenter_2F_EventScript_1A41FB end - diff --git a/data/scripts/maps/EverGrandeCity_PokemonLeague.s b/data/scripts/maps/EverGrandeCity_PokemonLeague.s index 9663d087c..bfb3cdc1b 100644 --- a/data/scripts/maps/EverGrandeCity_PokemonLeague.s +++ b/data/scripts/maps/EverGrandeCity_PokemonLeague.s @@ -122,4 +122,3 @@ EverGrandeCity_PokemonLeague_Movement_15BB81:: @ 815BB81 step_right step_25 step_end - diff --git a/data/scripts/maps/EverGrandeCity_SidneysRoom.s b/data/scripts/maps/EverGrandeCity_SidneysRoom.s index 02d8107d7..e90317f01 100644 --- a/data/scripts/maps/EverGrandeCity_SidneysRoom.s +++ b/data/scripts/maps/EverGrandeCity_SidneysRoom.s @@ -61,4 +61,3 @@ EverGrandeCity_SidneysRoom_EventScript_15B5C7:: @ 815B5C7 msgbox EverGrandeCity_SidneysRoom_Text_19086D, 4 release end - diff --git a/data/scripts/maps/FallarborTown.s b/data/scripts/maps/FallarborTown.s index a2e3865c3..a48be5b24 100644 --- a/data/scripts/maps/FallarborTown.s +++ b/data/scripts/maps/FallarborTown.s @@ -54,4 +54,3 @@ MeteorFalls_1F_2R_EventScript_14E842:: @ 814E842 FallarborTown_EventScript_14E84B:: @ 814E84B msgbox FallarborTown_Text_16CAB9, 3 end - diff --git a/data/scripts/maps/FallarborTown_ContestHall.s b/data/scripts/maps/FallarborTown_ContestHall.s index 74deba311..e3fcfd9bc 100644 --- a/data/scripts/maps/FallarborTown_ContestHall.s +++ b/data/scripts/maps/FallarborTown_ContestHall.s @@ -16,4 +16,3 @@ FallarborTown_ContestHall_EventScript_153AE1:: @ 8153AE1 FallarborTown_ContestHall_EventScript_153AEA:: @ 8153AEA msgbox FallarborTown_ContestHall_Text_1774B1, 3 end - diff --git a/data/scripts/maps/FallarborTown_ContestLobby.s b/data/scripts/maps/FallarborTown_ContestLobby.s index bad7e79d2..9bbd48722 100644 --- a/data/scripts/maps/FallarborTown_ContestLobby.s +++ b/data/scripts/maps/FallarborTown_ContestLobby.s @@ -119,4 +119,3 @@ FallarborTown_ContestLobby_EventScript_153AC2:: @ 8153AC2 hidebox 0, 0, 29, 19 releaseall end - diff --git a/data/scripts/maps/FallarborTown_House1.s b/data/scripts/maps/FallarborTown_House1.s index 379c17ef9..8a44cdcfb 100644 --- a/data/scripts/maps/FallarborTown_House1.s +++ b/data/scripts/maps/FallarborTown_House1.s @@ -75,4 +75,3 @@ FallarborTown_House1_EventScript_153C86:: @ 8153C86 msgbox FallarborTown_House1_Text_177ABB, 4 release end - diff --git a/data/scripts/maps/FallarborTown_House2.s b/data/scripts/maps/FallarborTown_House2.s index e63074905..179f281af 100644 --- a/data/scripts/maps/FallarborTown_House2.s +++ b/data/scripts/maps/FallarborTown_House2.s @@ -61,4 +61,3 @@ FallarborTown_House2_EventScript_153D60:: @ 8153D60 msgbox FallarborTown_House2_Text_177CEF, 4 releaseall end - diff --git a/data/scripts/maps/FallarborTown_Mart.s b/data/scripts/maps/FallarborTown_Mart.s index 591b67509..4b66546e8 100644 --- a/data/scripts/maps/FallarborTown_Mart.s +++ b/data/scripts/maps/FallarborTown_Mart.s @@ -46,4 +46,3 @@ FallarborTown_Mart_EventScript_1539AE:: @ 81539AE waitpokecry release end - diff --git a/data/scripts/maps/FallarborTown_PokemonCenter_1F.s b/data/scripts/maps/FallarborTown_PokemonCenter_1F.s index 04a08eeb3..636cac8f1 100644 --- a/data/scripts/maps/FallarborTown_PokemonCenter_1F.s +++ b/data/scripts/maps/FallarborTown_PokemonCenter_1F.s @@ -79,4 +79,3 @@ FallarborTown_PokemonCenter_1F_Movement_153B81:: @ 8153B81 step_down step_13 step_end - diff --git a/data/scripts/maps/FallarborTown_PokemonCenter_2F.s b/data/scripts/maps/FallarborTown_PokemonCenter_2F.s index bc3fb9acb..148b22531 100644 --- a/data/scripts/maps/FallarborTown_PokemonCenter_2F.s +++ b/data/scripts/maps/FallarborTown_PokemonCenter_2F.s @@ -15,4 +15,3 @@ FallarborTown_PokemonCenter_2F_EventScript_153BA2:: @ 8153BA2 FallarborTown_PokemonCenter_2F_EventScript_153BA8:: @ 8153BA8 call FallarborTown_PokemonCenter_2F_EventScript_1A41FB end - diff --git a/data/scripts/maps/FieryPath.s b/data/scripts/maps/FieryPath.s index d89bd3476..bd984ad20 100644 --- a/data/scripts/maps/FieryPath.s +++ b/data/scripts/maps/FieryPath.s @@ -5,4 +5,3 @@ FieryPath_MapScripts:: @ 815D318 FieryPath_MapScript1_15D31E:: @ 815D31E setflag 2122 end - diff --git a/data/scripts/maps/FortreeCity.s b/data/scripts/maps/FortreeCity.s index 96248b265..7f9d5ae12 100644 --- a/data/scripts/maps/FortreeCity.s +++ b/data/scripts/maps/FortreeCity.s @@ -89,4 +89,3 @@ FortreeCity_EventScript_14C9E4:: @ 814C9E4 FortreeCity_Movement_14CA13:: @ 814CA13 step_right step_end - diff --git a/data/scripts/maps/FortreeCity_DecorationShop.s b/data/scripts/maps/FortreeCity_DecorationShop.s index 2c7ed6617..47d96115c 100644 --- a/data/scripts/maps/FortreeCity_DecorationShop.s +++ b/data/scripts/maps/FortreeCity_DecorationShop.s @@ -56,4 +56,3 @@ FortreeCity_DecorationShop_PokemartDecor_1582B0:: @ 81582B0 .2byte 0 release end - diff --git a/data/scripts/maps/FortreeCity_Gym.s b/data/scripts/maps/FortreeCity_Gym.s index a9d641f57..cb474d1a1 100644 --- a/data/scripts/maps/FortreeCity_Gym.s +++ b/data/scripts/maps/FortreeCity_Gym.s @@ -101,4 +101,3 @@ FortreeCity_Gym_EventScript_158007:: @ 8158007 msgbox FortreeCity_Gym_Text_185FD5, 4 releaseall end - diff --git a/data/scripts/maps/FortreeCity_House1.s b/data/scripts/maps/FortreeCity_House1.s index 827e6cc34..0ae6e3fbd 100644 --- a/data/scripts/maps/FortreeCity_House1.s +++ b/data/scripts/maps/FortreeCity_House1.s @@ -63,4 +63,3 @@ FortreeCity_House1_EventScript_157EC0:: @ 8157EC0 waitpokecry release end - diff --git a/data/scripts/maps/FortreeCity_House2.s b/data/scripts/maps/FortreeCity_House2.s index adf190f5c..ea4aad3d8 100644 --- a/data/scripts/maps/FortreeCity_House2.s +++ b/data/scripts/maps/FortreeCity_House2.s @@ -43,4 +43,3 @@ FortreeCity_House2_EventScript_158161:: @ 8158161 msgbox FortreeCity_House2_Text_186565, 4 release end - diff --git a/data/scripts/maps/FortreeCity_House3.s b/data/scripts/maps/FortreeCity_House3.s index 99ff44637..f5d11ffa7 100644 --- a/data/scripts/maps/FortreeCity_House3.s +++ b/data/scripts/maps/FortreeCity_House3.s @@ -8,4 +8,3 @@ FortreeCity_House3_EventScript_15816C:: @ 815816C FortreeCity_House3_EventScript_158175:: @ 8158175 msgbox FortreeCity_House3_Text_186745, 2 end - diff --git a/data/scripts/maps/FortreeCity_House4.s b/data/scripts/maps/FortreeCity_House4.s index f48ef1a6d..33d0ed1ae 100644 --- a/data/scripts/maps/FortreeCity_House4.s +++ b/data/scripts/maps/FortreeCity_House4.s @@ -65,4 +65,3 @@ FortreeCity_House4_EventScript_15821E:: @ 815821E waitpokecry release end - diff --git a/data/scripts/maps/FortreeCity_House5.s b/data/scripts/maps/FortreeCity_House5.s index 3c92a619c..1144a8e81 100644 --- a/data/scripts/maps/FortreeCity_House5.s +++ b/data/scripts/maps/FortreeCity_House5.s @@ -18,4 +18,3 @@ FortreeCity_House5_EventScript_158244:: @ 8158244 waitpokecry release end - diff --git a/data/scripts/maps/FortreeCity_Mart.s b/data/scripts/maps/FortreeCity_Mart.s index 5630bcd5f..9e5f34ff9 100644 --- a/data/scripts/maps/FortreeCity_Mart.s +++ b/data/scripts/maps/FortreeCity_Mart.s @@ -38,4 +38,3 @@ FortreeCity_Mart_EventScript_1580A1:: @ 81580A1 FortreeCity_Mart_EventScript_1580AA:: @ 81580AA msgbox FortreeCity_Mart_Text_1862CA, 2 end - diff --git a/data/scripts/maps/FortreeCity_PokemonCenter_1F.s b/data/scripts/maps/FortreeCity_PokemonCenter_1F.s index d8a8945c9..148324abf 100644 --- a/data/scripts/maps/FortreeCity_PokemonCenter_1F.s +++ b/data/scripts/maps/FortreeCity_PokemonCenter_1F.s @@ -25,4 +25,3 @@ FortreeCity_PokemonCenter_1F_EventScript_158032:: @ 8158032 FortreeCity_PokemonCenter_1F_EventScript_15803B:: @ 815803B msgbox FortreeCity_PokemonCenter_1F_Text_186138, 2 end - diff --git a/data/scripts/maps/FortreeCity_PokemonCenter_2F.s b/data/scripts/maps/FortreeCity_PokemonCenter_2F.s index 0b63f5670..3019dbbc0 100644 --- a/data/scripts/maps/FortreeCity_PokemonCenter_2F.s +++ b/data/scripts/maps/FortreeCity_PokemonCenter_2F.s @@ -15,4 +15,3 @@ FortreeCity_PokemonCenter_2F_EventScript_15805A:: @ 815805A FortreeCity_PokemonCenter_2F_EventScript_158060:: @ 8158060 call FortreeCity_PokemonCenter_2F_EventScript_1A41FB end - diff --git a/data/scripts/maps/GraniteCave_1F.s b/data/scripts/maps/GraniteCave_1F.s index 5e05f8602..59aaa2fc3 100644 --- a/data/scripts/maps/GraniteCave_1F.s +++ b/data/scripts/maps/GraniteCave_1F.s @@ -17,4 +17,3 @@ GraniteCave_1F_EventScript_15CBD3:: @ 815CBD3 msgbox GraniteCave_1F_Text_194A3E, 4 release end - diff --git a/data/scripts/maps/GraniteCave_B1F.s b/data/scripts/maps/GraniteCave_B1F.s index 538c58118..240de1d98 100644 --- a/data/scripts/maps/GraniteCave_B1F.s +++ b/data/scripts/maps/GraniteCave_B1F.s @@ -8,4 +8,3 @@ GraniteCave_B1F_MapScript1_15CBED:: @ 815CBED tileeffect 7 warp5 GraniteCave_B2F, 255, 0, 0 end - diff --git a/data/scripts/maps/GraniteCave_B2F.s b/data/scripts/maps/GraniteCave_B2F.s index d28614032..54e1150f1 100644 --- a/data/scripts/maps/GraniteCave_B2F.s +++ b/data/scripts/maps/GraniteCave_B2F.s @@ -1,3 +1,2 @@ GraniteCave_B2F_MapScripts:: @ 815CBF8 .byte 0 - diff --git a/data/scripts/maps/GraniteCave_StevensRoom.s b/data/scripts/maps/GraniteCave_StevensRoom.s index 55dccda5f..895241406 100644 --- a/data/scripts/maps/GraniteCave_StevensRoom.s +++ b/data/scripts/maps/GraniteCave_StevensRoom.s @@ -60,4 +60,3 @@ GraniteCave_StevensRoom_Movement_15CC93:: @ 815CC93 step_up step_13 step_end - diff --git a/data/scripts/maps/InsideOfTruck.s b/data/scripts/maps/InsideOfTruck.s index e411adde2..0c26f0f88 100644 --- a/data/scripts/maps/InsideOfTruck.s +++ b/data/scripts/maps/InsideOfTruck.s @@ -50,4 +50,3 @@ InsideOfTruck_EventScript_15FC68:: @ 815FC68 InsideOfTruck_EventScript_15FC8B:: @ 815FC8B msgbox InsideOfTruck_Text_198FAD, 3 end - diff --git a/data/scripts/maps/JaggedPass.s b/data/scripts/maps/JaggedPass.s index a4aa0964b..9d3191c3c 100644 --- a/data/scripts/maps/JaggedPass.s +++ b/data/scripts/maps/JaggedPass.s @@ -47,4 +47,3 @@ JaggedPass_EventScript_15D301:: @ 815D301 trainerbattle 5, 216, 0, JaggedPass_Text_1960AA, JaggedPass_Text_1960E2 msgbox JaggedPass_Text_196118, 6 end - diff --git a/data/scripts/maps/LavaridgeTown_Gym_1F.s b/data/scripts/maps/LavaridgeTown_Gym_1F.s index a44b3cf16..c6cfc818c 100644 --- a/data/scripts/maps/LavaridgeTown_Gym_1F.s +++ b/data/scripts/maps/LavaridgeTown_Gym_1F.s @@ -169,4 +169,3 @@ LavaridgeTown_Gym_1F_EventScript_1538A2:: @ 81538A2 msgbox LavaridgeTown_Gym_1F_Text_176CAF, 4 releaseall end - diff --git a/data/scripts/maps/LavaridgeTown_Gym_B1F.s b/data/scripts/maps/LavaridgeTown_Gym_B1F.s index 428c76c49..58178722c 100644 --- a/data/scripts/maps/LavaridgeTown_Gym_B1F.s +++ b/data/scripts/maps/LavaridgeTown_Gym_B1F.s @@ -1,3 +1,2 @@ LavaridgeTown_Gym_B1F_MapScripts:: @ 81538AC .byte 0 - diff --git a/data/scripts/maps/LavaridgeTown_HerbShop.s b/data/scripts/maps/LavaridgeTown_HerbShop.s index d63f7276d..6ff103ce3 100644 --- a/data/scripts/maps/LavaridgeTown_HerbShop.s +++ b/data/scripts/maps/LavaridgeTown_HerbShop.s @@ -42,4 +42,3 @@ LavaridgeTown_HerbShop_EventScript_153684:: @ 8153684 msgbox LavaridgeTown_HerbShop_Text_176209, 4 release end - diff --git a/data/scripts/maps/LavaridgeTown_House.s b/data/scripts/maps/LavaridgeTown_House.s index 7d5e9bf8b..944427bb6 100644 --- a/data/scripts/maps/LavaridgeTown_House.s +++ b/data/scripts/maps/LavaridgeTown_House.s @@ -14,4 +14,3 @@ LavaridgeTown_House_EventScript_1538B7:: @ 81538B7 waitpokecry release end - diff --git a/data/scripts/maps/LavaridgeTown_Mart.s b/data/scripts/maps/LavaridgeTown_Mart.s index 747c606f4..4f28e16b0 100644 --- a/data/scripts/maps/LavaridgeTown_Mart.s +++ b/data/scripts/maps/LavaridgeTown_Mart.s @@ -33,4 +33,3 @@ LavaridgeTown_Mart_EventScript_1538FA:: @ 81538FA LavaridgeTown_Mart_EventScript_153903:: @ 8153903 msgbox LavaridgeTown_Mart_Text_176E1A, 2 end - diff --git a/data/scripts/maps/LavaridgeTown_PokemonCenter_1F.s b/data/scripts/maps/LavaridgeTown_PokemonCenter_1F.s index 8c17e6d4c..c0762bcc3 100644 --- a/data/scripts/maps/LavaridgeTown_PokemonCenter_1F.s +++ b/data/scripts/maps/LavaridgeTown_PokemonCenter_1F.s @@ -26,4 +26,3 @@ LavaridgeTown_PokemonCenter_1F_EventScript_153932:: @ 8153932 LavaridgeTown_PokemonCenter_1F_EventScript_15393B:: @ 815393B msgbox LavaridgeTown_PokemonCenter_1F_Text_176F7A, 2 end - diff --git a/data/scripts/maps/LavaridgeTown_PokemonCenter_2F.s b/data/scripts/maps/LavaridgeTown_PokemonCenter_2F.s index 9b7949ecc..daaeb0b93 100644 --- a/data/scripts/maps/LavaridgeTown_PokemonCenter_2F.s +++ b/data/scripts/maps/LavaridgeTown_PokemonCenter_2F.s @@ -15,4 +15,3 @@ LavaridgeTown_PokemonCenter_2F_EventScript_15395A:: @ 815395A LavaridgeTown_PokemonCenter_2F_EventScript_153960:: @ 8153960 call LavaridgeTown_PokemonCenter_2F_EventScript_1A41FB end - diff --git a/data/scripts/maps/LilycoveCity.s b/data/scripts/maps/LilycoveCity.s index 55e1f2a79..da5fdeba6 100644 --- a/data/scripts/maps/LilycoveCity.s +++ b/data/scripts/maps/LilycoveCity.s @@ -425,4 +425,3 @@ LilycoveCity_EventScript_14CF6B:: @ 814CF6B setflag 292 release end - diff --git a/data/scripts/maps/LilycoveCity_ContestHall.s b/data/scripts/maps/LilycoveCity_ContestHall.s index fa0dbc9df..3601cb455 100644 --- a/data/scripts/maps/LilycoveCity_ContestHall.s +++ b/data/scripts/maps/LilycoveCity_ContestHall.s @@ -253,4 +253,3 @@ LilycoveCity_ContestHall_EventScript_159315:: @ 8159315 LilycoveCity_ContestHall_EventScript_15931E:: @ 815931E msgbox LilycoveCity_ContestHall_Text_189F5C, 3 end - diff --git a/data/scripts/maps/LilycoveCity_ContestLobby.s b/data/scripts/maps/LilycoveCity_ContestLobby.s index f1f1e7925..948d3eb7c 100644 --- a/data/scripts/maps/LilycoveCity_ContestLobby.s +++ b/data/scripts/maps/LilycoveCity_ContestLobby.s @@ -769,4 +769,3 @@ SlateportCity_ContestLobby_EventScript_15908D:: @ 815908D hidebox 0, 0, 29, 19 releaseall end - diff --git a/data/scripts/maps/LilycoveCity_CoveLilyMotel_1F.s b/data/scripts/maps/LilycoveCity_CoveLilyMotel_1F.s index 95047f532..95945a595 100644 --- a/data/scripts/maps/LilycoveCity_CoveLilyMotel_1F.s +++ b/data/scripts/maps/LilycoveCity_CoveLilyMotel_1F.s @@ -74,4 +74,3 @@ LilycoveCity_CoveLilyMotel_1F_Movement_15839C:: @ 815839C step_down step_01 step_end - diff --git a/data/scripts/maps/LilycoveCity_CoveLilyMotel_2F.s b/data/scripts/maps/LilycoveCity_CoveLilyMotel_2F.s index 5f9c6cd08..d2a86e0a5 100644 --- a/data/scripts/maps/LilycoveCity_CoveLilyMotel_2F.s +++ b/data/scripts/maps/LilycoveCity_CoveLilyMotel_2F.s @@ -53,4 +53,3 @@ LilycoveCity_CoveLilyMotel_2F_EventScript_158409:: @ 8158409 LilycoveCity_CoveLilyMotel_2F_EventScript_158412:: @ 8158412 msgbox LilycoveCity_CoveLilyMotel_2F_Text_1872D4, 2 end - diff --git a/data/scripts/maps/LilycoveCity_DepartmentStoreElevator.s b/data/scripts/maps/LilycoveCity_DepartmentStoreElevator.s index 1dfacdfbf..c82cc6428 100644 --- a/data/scripts/maps/LilycoveCity_DepartmentStoreElevator.s +++ b/data/scripts/maps/LilycoveCity_DepartmentStoreElevator.s @@ -82,4 +82,3 @@ LilycoveCity_DepartmentStoreElevator_EventScript_15A4B8:: @ 815A4B8 LilycoveCity_DepartmentStoreElevator_EventScript_15A4CF:: @ 815A4CF special 216 return - diff --git a/data/scripts/maps/LilycoveCity_DepartmentStoreRooftop.s b/data/scripts/maps/LilycoveCity_DepartmentStoreRooftop.s index 2499621c5..da00a0ec5 100644 --- a/data/scripts/maps/LilycoveCity_DepartmentStoreRooftop.s +++ b/data/scripts/maps/LilycoveCity_DepartmentStoreRooftop.s @@ -200,4 +200,3 @@ LilycoveCity_DepartmentStoreRooftop_EventScript_15A396:: @ 815A396 hidemoney 0, 0 releaseall end - diff --git a/data/scripts/maps/LilycoveCity_DepartmentStore_1F.s b/data/scripts/maps/LilycoveCity_DepartmentStore_1F.s index 8a84101aa..c05921779 100644 --- a/data/scripts/maps/LilycoveCity_DepartmentStore_1F.s +++ b/data/scripts/maps/LilycoveCity_DepartmentStore_1F.s @@ -143,4 +143,3 @@ LilycoveCity_DepartmentStore_1F_EventScript_159EF2:: @ 8159EF2 LilycoveCity_DepartmentStore_1F_EventScript_159F05:: @ 8159F05 msgbox LilycoveCity_DepartmentStore_1F_Text_18C0D9, 3 end - diff --git a/data/scripts/maps/LilycoveCity_DepartmentStore_2F.s b/data/scripts/maps/LilycoveCity_DepartmentStore_2F.s index 9ab45fd85..e54883714 100644 --- a/data/scripts/maps/LilycoveCity_DepartmentStore_2F.s +++ b/data/scripts/maps/LilycoveCity_DepartmentStore_2F.s @@ -65,4 +65,3 @@ LilycoveCity_DepartmentStore_2F_Items2:: @ 8159F78 .2byte ITEM_NONE release end - diff --git a/data/scripts/maps/LilycoveCity_DepartmentStore_3F.s b/data/scripts/maps/LilycoveCity_DepartmentStore_3F.s index c81f9ac95..e669cef7f 100644 --- a/data/scripts/maps/LilycoveCity_DepartmentStore_3F.s +++ b/data/scripts/maps/LilycoveCity_DepartmentStore_3F.s @@ -58,4 +58,3 @@ LilycoveCity_DepartmentStore_3F_EventScript_159FEB:: @ 8159FEB LilycoveCity_DepartmentStore_3F_EventScript_159FF4:: @ 8159FF4 msgbox LilycoveCity_DepartmentStore_3F_Text_18C32E, 2 end - diff --git a/data/scripts/maps/LilycoveCity_DepartmentStore_4F.s b/data/scripts/maps/LilycoveCity_DepartmentStore_4F.s index 949891fec..994b3b63f 100644 --- a/data/scripts/maps/LilycoveCity_DepartmentStore_4F.s +++ b/data/scripts/maps/LilycoveCity_DepartmentStore_4F.s @@ -52,4 +52,3 @@ LilycoveCity_DepartmentStore_4F_Items2:: @ 815A054 .2byte ITEM_NONE release end - diff --git a/data/scripts/maps/LilycoveCity_DepartmentStore_5F.s b/data/scripts/maps/LilycoveCity_DepartmentStore_5F.s index cdd8621b6..0bef8866a 100644 --- a/data/scripts/maps/LilycoveCity_DepartmentStore_5F.s +++ b/data/scripts/maps/LilycoveCity_DepartmentStore_5F.s @@ -116,4 +116,3 @@ LilycoveCity_DepartmentStore_5F_EventScript_15A12D:: @ 815A12D LilycoveCity_DepartmentStore_5F_EventScript_15A136:: @ 815A136 msgbox LilycoveCity_DepartmentStore_5F_Text_18C556, 2 end - diff --git a/data/scripts/maps/LilycoveCity_EmptyMap.s b/data/scripts/maps/LilycoveCity_EmptyMap.s index 25ecb3866..16d025174 100644 --- a/data/scripts/maps/LilycoveCity_EmptyMap.s +++ b/data/scripts/maps/LilycoveCity_EmptyMap.s @@ -1,3 +1,2 @@ LilycoveCity_EmptyMap_MapScripts:: @ 8159AAC .byte 0 - diff --git a/data/scripts/maps/LilycoveCity_Harbor.s b/data/scripts/maps/LilycoveCity_Harbor.s index 38eabbd83..2f4e4352e 100644 --- a/data/scripts/maps/LilycoveCity_Harbor.s +++ b/data/scripts/maps/LilycoveCity_Harbor.s @@ -169,4 +169,3 @@ LilycoveCity_Harbor_EventScript_159AA2:: @ 8159AA2 msgbox LilycoveCity_Harbor_Text_18B58E, 4 release end - diff --git a/data/scripts/maps/LilycoveCity_House1.s b/data/scripts/maps/LilycoveCity_House1.s index 28a4532b1..3dae362c1 100644 --- a/data/scripts/maps/LilycoveCity_House1.s +++ b/data/scripts/maps/LilycoveCity_House1.s @@ -14,4 +14,3 @@ LilycoveCity_House1_EventScript_159B8F:: @ 8159B8F waitpokecry release end - diff --git a/data/scripts/maps/LilycoveCity_House2.s b/data/scripts/maps/LilycoveCity_House2.s index c1fe01b46..75780667d 100644 --- a/data/scripts/maps/LilycoveCity_House2.s +++ b/data/scripts/maps/LilycoveCity_House2.s @@ -19,4 +19,3 @@ LilycoveCity_House2_EventScript_159BDA:: @ 8159BDA msgbox LilycoveCity_House2_Text_18B883, 4 release end - diff --git a/data/scripts/maps/LilycoveCity_House3.s b/data/scripts/maps/LilycoveCity_House3.s index 5c4eaac9d..51e4988b3 100644 --- a/data/scripts/maps/LilycoveCity_House3.s +++ b/data/scripts/maps/LilycoveCity_House3.s @@ -97,4 +97,3 @@ LilycoveCity_House3_EventScript_159D37:: @ 8159D37 msgbox LilycoveCity_House3_Text_18BE8E, 4 release end - diff --git a/data/scripts/maps/LilycoveCity_House4.s b/data/scripts/maps/LilycoveCity_House4.s index 98d8ca9a4..13bc95dfa 100644 --- a/data/scripts/maps/LilycoveCity_House4.s +++ b/data/scripts/maps/LilycoveCity_House4.s @@ -8,4 +8,3 @@ LilycoveCity_House4_EventScript_159D42:: @ 8159D42 LilycoveCity_House4_EventScript_159D4B:: @ 8159D4B msgbox LilycoveCity_House4_Text_18BF4E, 2 end - diff --git a/data/scripts/maps/LilycoveCity_LilycoveMuseum_1F.s b/data/scripts/maps/LilycoveCity_LilycoveMuseum_1F.s index 9975419d0..a481f9c32 100644 --- a/data/scripts/maps/LilycoveCity_LilycoveMuseum_1F.s +++ b/data/scripts/maps/LilycoveCity_LilycoveMuseum_1F.s @@ -160,4 +160,3 @@ LilycoveCity_LilycoveMuseum_1F_EventScript_15858E:: @ 815858E LilycoveCity_LilycoveMuseum_1F_EventScript_1585A3:: @ 81585A3 msgbox LilycoveCity_LilycoveMuseum_1F_Text_187B7F, 2 end - diff --git a/data/scripts/maps/LilycoveCity_LilycoveMuseum_2F.s b/data/scripts/maps/LilycoveCity_LilycoveMuseum_2F.s index 89d769dbb..2e6d6698f 100644 --- a/data/scripts/maps/LilycoveCity_LilycoveMuseum_2F.s +++ b/data/scripts/maps/LilycoveCity_LilycoveMuseum_2F.s @@ -229,4 +229,3 @@ LilycoveCity_LilycoveMuseum_2F_EventScript_158858:: @ 8158858 showcontestwinner 13 releaseall end - diff --git a/data/scripts/maps/LilycoveCity_MoveDeletersHouse.s b/data/scripts/maps/LilycoveCity_MoveDeletersHouse.s index cd6f648a4..c9b026060 100644 --- a/data/scripts/maps/LilycoveCity_MoveDeletersHouse.s +++ b/data/scripts/maps/LilycoveCity_MoveDeletersHouse.s @@ -61,4 +61,3 @@ LilycoveCity_MoveDeletersHouse_EventScript_159B7B:: @ 8159B7B msgbox LilycoveCity_MoveDeletersHouse_Text_18B757, 4 releaseall end - diff --git a/data/scripts/maps/LilycoveCity_PokemonCenter_1F.s b/data/scripts/maps/LilycoveCity_PokemonCenter_1F.s index d34bd0b84..5809e28c8 100644 --- a/data/scripts/maps/LilycoveCity_PokemonCenter_1F.s +++ b/data/scripts/maps/LilycoveCity_PokemonCenter_1F.s @@ -31,4 +31,3 @@ LilycoveCity_PokemonCenter_1F_EventScript_15935D:: @ 815935D msgbox LilycoveCity_PokemonCenter_1F_Text_18A0A1, 4 release end - diff --git a/data/scripts/maps/LilycoveCity_PokemonCenter_2F.s b/data/scripts/maps/LilycoveCity_PokemonCenter_2F.s index ee60cf2ca..e4554e49c 100644 --- a/data/scripts/maps/LilycoveCity_PokemonCenter_2F.s +++ b/data/scripts/maps/LilycoveCity_PokemonCenter_2F.s @@ -15,4 +15,3 @@ LilycoveCity_PokemonCenter_2F_EventScript_15937D:: @ 815937D LilycoveCity_PokemonCenter_2F_EventScript_159383:: @ 8159383 call LilycoveCity_PokemonCenter_2F_EventScript_1A41FB end - diff --git a/data/scripts/maps/LilycoveCity_PokemonTrainerFanClub.s b/data/scripts/maps/LilycoveCity_PokemonTrainerFanClub.s index c76acaff4..9ac66f98e 100644 --- a/data/scripts/maps/LilycoveCity_PokemonTrainerFanClub.s +++ b/data/scripts/maps/LilycoveCity_PokemonTrainerFanClub.s @@ -434,4 +434,3 @@ LilycoveCity_PokemonTrainerFanClub_EventScript_159889:: @ 8159889 msgbox LilycoveCity_PokemonTrainerFanClub_Text_18B24F, 4 release end - diff --git a/data/scripts/maps/LilycoveCity_UnusedMart.s b/data/scripts/maps/LilycoveCity_UnusedMart.s index edfd32b4a..2e7ff450f 100644 --- a/data/scripts/maps/LilycoveCity_UnusedMart.s +++ b/data/scripts/maps/LilycoveCity_UnusedMart.s @@ -1,3 +1,2 @@ LilycoveCity_UnusedMart_MapScripts:: @ 8159389 .byte 0 - diff --git a/data/scripts/maps/LittlerootTown.s b/data/scripts/maps/LittlerootTown.s index 600218ebf..81692acc5 100644 --- a/data/scripts/maps/LittlerootTown.s +++ b/data/scripts/maps/LittlerootTown.s @@ -878,4 +878,3 @@ LittlerootTown_EventScript_14DD38:: @ 814DD38 closebutton pause 30 return - diff --git a/data/scripts/maps/LittlerootTown_BrendansHouse_1F.s b/data/scripts/maps/LittlerootTown_BrendansHouse_1F.s index 78a10f6e6..9816734d0 100644 --- a/data/scripts/maps/LittlerootTown_BrendansHouse_1F.s +++ b/data/scripts/maps/LittlerootTown_BrendansHouse_1F.s @@ -122,4 +122,3 @@ LittlerootTown_BrendansHouse_1F_EventScript_152789:: @ 8152789 waitmove 0 jump LittlerootTown_BrendansHouse_1F_EventScript_1B69B7 end - diff --git a/data/scripts/maps/LittlerootTown_MaysHouse_1F.s b/data/scripts/maps/LittlerootTown_MaysHouse_1F.s index eea17b4e9..2b9ad42ef 100644 --- a/data/scripts/maps/LittlerootTown_MaysHouse_1F.s +++ b/data/scripts/maps/LittlerootTown_MaysHouse_1F.s @@ -169,4 +169,3 @@ LittlerootTown_MaysHouse_1F_EventScript_152A35:: @ 8152A35 waitmove 0 jump LittlerootTown_MaysHouse_1F_EventScript_1B69B7 end - diff --git a/data/scripts/maps/LittlerootTown_ProfessorBirchsLab.s b/data/scripts/maps/LittlerootTown_ProfessorBirchsLab.s index 81bb270fc..94aeadfa6 100644 --- a/data/scripts/maps/LittlerootTown_ProfessorBirchsLab.s +++ b/data/scripts/maps/LittlerootTown_ProfessorBirchsLab.s @@ -214,4 +214,3 @@ LittlerootTown_ProfessorBirchsLab_EventScript_152ED9:: @ 8152ED9 LittlerootTown_ProfessorBirchsLab_EventScript_152EE2:: @ 8152EE2 msgbox LittlerootTown_ProfessorBirchsLab_Text_174748, 3 end - diff --git a/data/scripts/maps/MagmaHideout_1F.s b/data/scripts/maps/MagmaHideout_1F.s index c58248c10..f5b535f71 100644 --- a/data/scripts/maps/MagmaHideout_1F.s +++ b/data/scripts/maps/MagmaHideout_1F.s @@ -1,3 +1,2 @@ MagmaHideout_1F_MapScripts:: @ 815F2A7 .byte 0 - diff --git a/data/scripts/maps/MagmaHideout_B1F.s b/data/scripts/maps/MagmaHideout_B1F.s index ca2d6f773..0304181fb 100644 --- a/data/scripts/maps/MagmaHideout_B1F.s +++ b/data/scripts/maps/MagmaHideout_B1F.s @@ -10,4 +10,3 @@ MagmaHideout_B1F_MapScript1_15F2AE:: @ 815F2AE MagmaHideout_B1F_EventScript_15F2B8:: @ 815F2B8 disappear LAST_TALKED return - diff --git a/data/scripts/maps/MagmaHideout_B2F.s b/data/scripts/maps/MagmaHideout_B2F.s index 09b6659c3..222297ef7 100644 --- a/data/scripts/maps/MagmaHideout_B2F.s +++ b/data/scripts/maps/MagmaHideout_B2F.s @@ -1,3 +1,2 @@ MagmaHideout_B2F_MapScripts:: @ 815F2BC .byte 0 - diff --git a/data/scripts/maps/MauvilleCity.s b/data/scripts/maps/MauvilleCity.s index 229b6143c..0db1a2ab4 100644 --- a/data/scripts/maps/MauvilleCity.s +++ b/data/scripts/maps/MauvilleCity.s @@ -316,4 +316,3 @@ MauvilleCity_EventScript_14C368:: @ 814C368 msgbox MauvilleCity_Text_166488, 4 release end - diff --git a/data/scripts/maps/MauvilleCity_BikeShop.s b/data/scripts/maps/MauvilleCity_BikeShop.s index 9d9293365..09f5e4d37 100644 --- a/data/scripts/maps/MauvilleCity_BikeShop.s +++ b/data/scripts/maps/MauvilleCity_BikeShop.s @@ -182,4 +182,3 @@ MauvilleCity_BikeShop_EventScript_1569EE:: @ 81569EE MauvilleCity_BikeShop_EventScript_1569FA:: @ 81569FA release end - diff --git a/data/scripts/maps/MauvilleCity_GameCorner.s b/data/scripts/maps/MauvilleCity_GameCorner.s index 3ddb6963e..a0aab4238 100644 --- a/data/scripts/maps/MauvilleCity_GameCorner.s +++ b/data/scripts/maps/MauvilleCity_GameCorner.s @@ -655,4 +655,3 @@ MauvilleCity_GameCorner_EventScript_1572B5:: @ 81572B5 msgbox MauvilleCity_GameCorner_Text_182420, 4 releaseall end - diff --git a/data/scripts/maps/MauvilleCity_Gym.s b/data/scripts/maps/MauvilleCity_Gym.s index bbae24bf3..30bd20ada 100644 --- a/data/scripts/maps/MauvilleCity_Gym.s +++ b/data/scripts/maps/MauvilleCity_Gym.s @@ -225,4 +225,3 @@ MauvilleCity_Gym_EventScript_15678B:: @ 815678B msgbox MauvilleCity_Gym_Text_180F4A, 4 releaseall end - diff --git a/data/scripts/maps/MauvilleCity_House1.s b/data/scripts/maps/MauvilleCity_House1.s index e1ae389bb..48ee31be5 100644 --- a/data/scripts/maps/MauvilleCity_House1.s +++ b/data/scripts/maps/MauvilleCity_House1.s @@ -17,4 +17,3 @@ MauvilleCity_House1_EventScript_156A29:: @ 8156A29 msgbox MauvilleCity_House1_Text_181BF6, 4 release end - diff --git a/data/scripts/maps/MauvilleCity_House2.s b/data/scripts/maps/MauvilleCity_House2.s index 65e7c0e3e..8a73af034 100644 --- a/data/scripts/maps/MauvilleCity_House2.s +++ b/data/scripts/maps/MauvilleCity_House2.s @@ -43,4 +43,3 @@ MauvilleCity_House2_EventScript_157347:: @ 8157347 msgbox MauvilleCity_House2_Text_182578, 4 release end - diff --git a/data/scripts/maps/MauvilleCity_Mart.s b/data/scripts/maps/MauvilleCity_Mart.s index 96ac01a8a..fac5906ad 100644 --- a/data/scripts/maps/MauvilleCity_Mart.s +++ b/data/scripts/maps/MauvilleCity_Mart.s @@ -36,4 +36,3 @@ MauvilleCity_Mart_EventScript_1573F4:: @ 81573F4 MauvilleCity_Mart_EventScript_1573FD:: @ 81573FD msgbox MauvilleCity_Mart_Text_18287F, 2 end - diff --git a/data/scripts/maps/MauvilleCity_PokemonCenter_1F.s b/data/scripts/maps/MauvilleCity_PokemonCenter_1F.s index 6a1582145..b943b9c8f 100644 --- a/data/scripts/maps/MauvilleCity_PokemonCenter_1F.s +++ b/data/scripts/maps/MauvilleCity_PokemonCenter_1F.s @@ -31,4 +31,3 @@ MauvilleCity_PokemonCenter_1F_EventScript_157380:: @ 8157380 MauvilleCity_PokemonCenter_1F_EventScript_157389:: @ 8157389 msgbox MauvilleCity_PokemonCenter_1F_Text_1826A6, 2 end - diff --git a/data/scripts/maps/MauvilleCity_PokemonCenter_2F.s b/data/scripts/maps/MauvilleCity_PokemonCenter_2F.s index e888ecc6e..e85e80308 100644 --- a/data/scripts/maps/MauvilleCity_PokemonCenter_2F.s +++ b/data/scripts/maps/MauvilleCity_PokemonCenter_2F.s @@ -19,4 +19,3 @@ MauvilleCity_PokemonCenter_2F_EventScript_1573AE:: @ 81573AE MauvilleCity_PokemonCenter_2F_EventScript_1573B4:: @ 81573B4 msgbox MauvilleCity_PokemonCenter_2F_Text_182724, 2 end - diff --git a/data/scripts/maps/MeteorFalls_1F_1R.s b/data/scripts/maps/MeteorFalls_1F_1R.s index 7966bc76d..3e7155955 100644 --- a/data/scripts/maps/MeteorFalls_1F_1R.s +++ b/data/scripts/maps/MeteorFalls_1F_1R.s @@ -226,4 +226,3 @@ MeteorFalls_1F_1R_EventScript_15C66E:: @ 815C66E msgbox MeteorFalls_1F_1R_Text_19396A, 4 release end - diff --git a/data/scripts/maps/MeteorFalls_1F_2R.s b/data/scripts/maps/MeteorFalls_1F_2R.s index ffd6f619c..14dcc4622 100644 --- a/data/scripts/maps/MeteorFalls_1F_2R.s +++ b/data/scripts/maps/MeteorFalls_1F_2R.s @@ -39,4 +39,3 @@ MeteorFalls_1F_2R_EventScript_15C728:: @ 815C728 trainerbattle 7, 681, 0, MeteorFalls_1F_2R_Text_193FCA, MeteorFalls_1F_2R_Text_19403A, MeteorFalls_1F_2R_Text_1940DF msgbox MeteorFalls_1F_2R_Text_194066, 6 end - diff --git a/data/scripts/maps/MeteorFalls_B1F_1R.s b/data/scripts/maps/MeteorFalls_B1F_1R.s index 024cf305e..57d458b23 100644 --- a/data/scripts/maps/MeteorFalls_B1F_1R.s +++ b/data/scripts/maps/MeteorFalls_B1F_1R.s @@ -1,3 +1,2 @@ MeteorFalls_B1F_1R_MapScripts:: @ 815C743 .byte 0 - diff --git a/data/scripts/maps/MeteorFalls_B1F_2R.s b/data/scripts/maps/MeteorFalls_B1F_2R.s index 1f1f6ee99..514e60966 100644 --- a/data/scripts/maps/MeteorFalls_B1F_2R.s +++ b/data/scripts/maps/MeteorFalls_B1F_2R.s @@ -1,3 +1,2 @@ MeteorFalls_B1F_2R_MapScripts:: @ 815C744 .byte 0 - diff --git a/data/scripts/maps/MossdeepCity.s b/data/scripts/maps/MossdeepCity.s index 70adb2f9d..ddb317364 100644 --- a/data/scripts/maps/MossdeepCity.s +++ b/data/scripts/maps/MossdeepCity.s @@ -90,4 +90,3 @@ MossdeepCity_EventScript_14D073:: @ 814D073 msgbox MossdeepCity_Text_1691A7, 4 release end - diff --git a/data/scripts/maps/MossdeepCity_GameCorner_1F.s b/data/scripts/maps/MossdeepCity_GameCorner_1F.s index 573e69d8e..c56adb1f3 100644 --- a/data/scripts/maps/MossdeepCity_GameCorner_1F.s +++ b/data/scripts/maps/MossdeepCity_GameCorner_1F.s @@ -184,4 +184,3 @@ MossdeepCity_GameCorner_1F_Movement_15AE49:: @ 815AE49 MossdeepCity_GameCorner_1F_EventScript_15AE4C:: @ 815AE4C msgbox MossdeepCity_GameCorner_1F_Text_18E631, 3 end - diff --git a/data/scripts/maps/MossdeepCity_GameCorner_B1F.s b/data/scripts/maps/MossdeepCity_GameCorner_B1F.s index 3fa9fe707..a733093f9 100644 --- a/data/scripts/maps/MossdeepCity_GameCorner_B1F.s +++ b/data/scripts/maps/MossdeepCity_GameCorner_B1F.s @@ -75,4 +75,3 @@ MossdeepCity_GameCorner_B1F_Movement_15AEFF:: @ 815AEFF step_up step_13 step_end - diff --git a/data/scripts/maps/MossdeepCity_Gym.s b/data/scripts/maps/MossdeepCity_Gym.s index a28f6043a..db6af9689 100644 --- a/data/scripts/maps/MossdeepCity_Gym.s +++ b/data/scripts/maps/MossdeepCity_Gym.s @@ -249,4 +249,3 @@ MossdeepCity_Gym_EventScript_15A824:: @ 815A824 msgbox MossdeepCity_Gym_Text_18D40A, 4 releaseall end - diff --git a/data/scripts/maps/MossdeepCity_House1.s b/data/scripts/maps/MossdeepCity_House1.s index 607ca1baa..d83e49643 100644 --- a/data/scripts/maps/MossdeepCity_House1.s +++ b/data/scripts/maps/MossdeepCity_House1.s @@ -21,4 +21,3 @@ MossdeepCity_House1_EventScript_15A855:: @ 815A855 MossdeepCity_House1_EventScript_15A85F:: @ 815A85F msgbox MossdeepCity_House1_Text_18D4F1, 2 end - diff --git a/data/scripts/maps/MossdeepCity_House2.s b/data/scripts/maps/MossdeepCity_House2.s index 99aa63f91..f3d07b64e 100644 --- a/data/scripts/maps/MossdeepCity_House2.s +++ b/data/scripts/maps/MossdeepCity_House2.s @@ -52,4 +52,3 @@ MossdeepCity_House2_Movement_15A8CB:: @ 815A8CB step_15 step_13 step_end - diff --git a/data/scripts/maps/MossdeepCity_House3.s b/data/scripts/maps/MossdeepCity_House3.s index 9401bf58e..fd97ee598 100644 --- a/data/scripts/maps/MossdeepCity_House3.s +++ b/data/scripts/maps/MossdeepCity_House3.s @@ -25,4 +25,3 @@ MossdeepCity_House3_EventScript_15A9BB:: @ 815A9BB msgbox MossdeepCity_House3_Text_18DA26, 4 release end - diff --git a/data/scripts/maps/MossdeepCity_House4.s b/data/scripts/maps/MossdeepCity_House4.s index 3fde63469..bc8f44400 100644 --- a/data/scripts/maps/MossdeepCity_House4.s +++ b/data/scripts/maps/MossdeepCity_House4.s @@ -40,4 +40,3 @@ MossdeepCity_House4_EventScript_15AB77:: @ 815AB77 waitpokecry release end - diff --git a/data/scripts/maps/MossdeepCity_Mart.s b/data/scripts/maps/MossdeepCity_Mart.s index 193bf71ea..d1e861b99 100644 --- a/data/scripts/maps/MossdeepCity_Mart.s +++ b/data/scripts/maps/MossdeepCity_Mart.s @@ -37,4 +37,3 @@ MossdeepCity_Mart_EventScript_15A95F:: @ 815A95F MossdeepCity_Mart_EventScript_15A968:: @ 815A968 msgbox MossdeepCity_Mart_Text_18D841, 2 end - diff --git a/data/scripts/maps/MossdeepCity_PokemonCenter_1F.s b/data/scripts/maps/MossdeepCity_PokemonCenter_1F.s index 4ac89863a..988608ffd 100644 --- a/data/scripts/maps/MossdeepCity_PokemonCenter_1F.s +++ b/data/scripts/maps/MossdeepCity_PokemonCenter_1F.s @@ -21,4 +21,3 @@ MossdeepCity_PokemonCenter_1F_EventScript_15A8E8:: @ 815A8E8 MossdeepCity_PokemonCenter_1F_EventScript_15A8F1:: @ 815A8F1 msgbox MossdeepCity_PokemonCenter_1F_Text_18D69A, 2 end - diff --git a/data/scripts/maps/MossdeepCity_PokemonCenter_2F.s b/data/scripts/maps/MossdeepCity_PokemonCenter_2F.s index 09aca3dae..a88147c08 100644 --- a/data/scripts/maps/MossdeepCity_PokemonCenter_2F.s +++ b/data/scripts/maps/MossdeepCity_PokemonCenter_2F.s @@ -19,4 +19,3 @@ MossdeepCity_PokemonCenter_2F_EventScript_15A919:: @ 815A919 MossdeepCity_PokemonCenter_2F_EventScript_15A91F:: @ 815A91F call MossdeepCity_PokemonCenter_2F_EventScript_1A41FB end - diff --git a/data/scripts/maps/MossdeepCity_SpaceCenter_1F.s b/data/scripts/maps/MossdeepCity_SpaceCenter_1F.s index 460281ebb..3b3a7f083 100644 --- a/data/scripts/maps/MossdeepCity_SpaceCenter_1F.s +++ b/data/scripts/maps/MossdeepCity_SpaceCenter_1F.s @@ -61,4 +61,3 @@ MossdeepCity_SpaceCenter_1F_EventScript_15AC1F:: @ 815AC1F waitmove 0 release end - diff --git a/data/scripts/maps/MossdeepCity_SpaceCenter_2F.s b/data/scripts/maps/MossdeepCity_SpaceCenter_2F.s index 145cae073..97467f4e5 100644 --- a/data/scripts/maps/MossdeepCity_SpaceCenter_2F.s +++ b/data/scripts/maps/MossdeepCity_SpaceCenter_2F.s @@ -12,4 +12,3 @@ MossdeepCity_SpaceCenter_2F_EventScript_15AC40:: @ 815AC40 MossdeepCity_SpaceCenter_2F_EventScript_15AC49:: @ 815AC49 msgbox MossdeepCity_SpaceCenter_2F_Text_18E564, 2 end - diff --git a/data/scripts/maps/MossdeepCity_StevensHouse.s b/data/scripts/maps/MossdeepCity_StevensHouse.s index 69e0fbffd..d4477bd39 100644 --- a/data/scripts/maps/MossdeepCity_StevensHouse.s +++ b/data/scripts/maps/MossdeepCity_StevensHouse.s @@ -128,4 +128,3 @@ MossdeepCity_StevensHouse_EventScript_15AB20:: @ 815AB20 giveitem ITEM_HM08, 1, 1 setflag 123 end - diff --git a/data/scripts/maps/MtChimney.s b/data/scripts/maps/MtChimney.s index eadd3395a..4c6f90d9d 100644 --- a/data/scripts/maps/MtChimney.s +++ b/data/scripts/maps/MtChimney.s @@ -465,4 +465,3 @@ MtChimney_EventScript_15D24F:: @ 815D24F trainerbattle 0, 126, 0, MtChimney_Text_195CD8, MtChimney_Text_195D2F msgbox MtChimney_Text_195D5C, 6 end - diff --git a/data/scripts/maps/MtChimney_CableCarStation.s b/data/scripts/maps/MtChimney_CableCarStation.s index 2f916a554..a9ab8ffe6 100644 --- a/data/scripts/maps/MtChimney_CableCarStation.s +++ b/data/scripts/maps/MtChimney_CableCarStation.s @@ -85,4 +85,3 @@ MtChimney_CableCarStation_Movement_15C1B4:: @ 815C1B4 step_down step_14 step_end - diff --git a/data/scripts/maps/MtPyre_1F.s b/data/scripts/maps/MtPyre_1F.s index cc9ff3cba..805c4a8d3 100644 --- a/data/scripts/maps/MtPyre_1F.s +++ b/data/scripts/maps/MtPyre_1F.s @@ -26,4 +26,3 @@ MtPyre_1F_EventScript_15D35C:: @ 815D35C MtPyre_1F_EventScript_15D365:: @ 815D365 msgbox MtPyre_1F_Text_196283, 2 end - diff --git a/data/scripts/maps/MtPyre_2F.s b/data/scripts/maps/MtPyre_2F.s index f01d63528..8cfff795b 100644 --- a/data/scripts/maps/MtPyre_2F.s +++ b/data/scripts/maps/MtPyre_2F.s @@ -31,4 +31,3 @@ MtPyre_2F_EventScript_15D3CD:: @ 815D3CD trainerbattle 4, 640, 0, MtPyre_2F_Text_196449, MtPyre_2F_Text_1964EB, MtPyre_2F_Text_196539 msgbox MtPyre_2F_Text_196504, 6 end - diff --git a/data/scripts/maps/MtPyre_3F.s b/data/scripts/maps/MtPyre_3F.s index 2d571a99a..0f6f5c2ae 100644 --- a/data/scripts/maps/MtPyre_3F.s +++ b/data/scripts/maps/MtPyre_3F.s @@ -10,4 +10,3 @@ MtPyre_3F_EventScript_15D400:: @ 815D400 trainerbattle 0, 247, 0, MtPyre_3F_Text_1967EF, MtPyre_3F_Text_19682B msgbox MtPyre_3F_Text_196842, 6 end - diff --git a/data/scripts/maps/MtPyre_4F.s b/data/scripts/maps/MtPyre_4F.s index 34fd8db92..c8e961384 100644 --- a/data/scripts/maps/MtPyre_4F.s +++ b/data/scripts/maps/MtPyre_4F.s @@ -5,4 +5,3 @@ MtPyre_4F_EventScript_15D418:: @ 815D418 trainerbattle 0, 190, 0, MtPyre_4F_Text_1968A6, MtPyre_4F_Text_1968D0 msgbox MtPyre_4F_Text_1968EE, 6 end - diff --git a/data/scripts/maps/MtPyre_5F.s b/data/scripts/maps/MtPyre_5F.s index 2495a4c9a..cd25d09b3 100644 --- a/data/scripts/maps/MtPyre_5F.s +++ b/data/scripts/maps/MtPyre_5F.s @@ -5,4 +5,3 @@ MtPyre_5F_EventScript_15D430:: @ 815D430 trainerbattle 0, 109, 0, MtPyre_5F_Text_196939, MtPyre_5F_Text_196997 msgbox MtPyre_5F_Text_1969AC, 6 end - diff --git a/data/scripts/maps/MtPyre_6F.s b/data/scripts/maps/MtPyre_6F.s index 90b9ac2be..2212d5dd3 100644 --- a/data/scripts/maps/MtPyre_6F.s +++ b/data/scripts/maps/MtPyre_6F.s @@ -13,4 +13,3 @@ MtPyre_6F_EventScript_15D46F:: @ 815D46F trainerbattle 5, 108, 0, MtPyre_6F_Text_196A95, MtPyre_6F_Text_196AB1 msgbox MtPyre_6F_Text_196AC9, 6 end - diff --git a/data/scripts/maps/MtPyre_Exterior.s b/data/scripts/maps/MtPyre_Exterior.s index 0cd44ed2b..efffc7c3b 100644 --- a/data/scripts/maps/MtPyre_Exterior.s +++ b/data/scripts/maps/MtPyre_Exterior.s @@ -25,4 +25,3 @@ MtPyre_Exterior_EventScript_15D4AC:: @ 815D4AC setweather 2 doweather end - diff --git a/data/scripts/maps/MtPyre_Summit.s b/data/scripts/maps/MtPyre_Summit.s index 96d31be8e..e352ac30e 100644 --- a/data/scripts/maps/MtPyre_Summit.s +++ b/data/scripts/maps/MtPyre_Summit.s @@ -366,4 +366,3 @@ MtPyre_Summit_Movement_15D7B9:: @ 815D7B9 step_down step_down step_end - diff --git a/data/scripts/maps/NewMauville_Entrance.s b/data/scripts/maps/NewMauville_Entrance.s index 3683aea5b..dc5885939 100644 --- a/data/scripts/maps/NewMauville_Entrance.s +++ b/data/scripts/maps/NewMauville_Entrance.s @@ -48,4 +48,3 @@ NewMauville_Entrance_EventScript_15E4DC:: @ 815E4DC NewMauville_Entrance_EventScript_15E55D:: @ 815E55D releaseall end - diff --git a/data/scripts/maps/NewMauville_Inside.s b/data/scripts/maps/NewMauville_Inside.s index 7111ab770..29c42e460 100644 --- a/data/scripts/maps/NewMauville_Inside.s +++ b/data/scripts/maps/NewMauville_Inside.s @@ -205,4 +205,3 @@ NewMauville_Inside_EventScript_15E93C:: @ 815E93C clearflag 2145 release end - diff --git a/data/scripts/maps/OldaleTown.s b/data/scripts/maps/OldaleTown.s index 4a7db8c40..68ed80949 100644 --- a/data/scripts/maps/OldaleTown.s +++ b/data/scripts/maps/OldaleTown.s @@ -322,4 +322,3 @@ OldaleTown_Movement_14DFF5:: @ 814DFF5 step_down step_left step_end - diff --git a/data/scripts/maps/OldaleTown_House1.s b/data/scripts/maps/OldaleTown_House1.s index 033980c01..1e519a737 100644 --- a/data/scripts/maps/OldaleTown_House1.s +++ b/data/scripts/maps/OldaleTown_House1.s @@ -4,4 +4,3 @@ OldaleTown_House1_MapScripts:: @ 8152EEB OldaleTown_House1_EventScript_152EEC:: @ 8152EEC msgbox OldaleTown_House1_Text_17476D, 2 end - diff --git a/data/scripts/maps/OldaleTown_House2.s b/data/scripts/maps/OldaleTown_House2.s index 3cdcc49db..57a9ab8ac 100644 --- a/data/scripts/maps/OldaleTown_House2.s +++ b/data/scripts/maps/OldaleTown_House2.s @@ -8,4 +8,3 @@ OldaleTown_House2_EventScript_152EF6:: @ 8152EF6 OldaleTown_House2_EventScript_152EFF:: @ 8152EFF msgbox OldaleTown_House2_Text_17487B, 2 end - diff --git a/data/scripts/maps/OldaleTown_Mart.s b/data/scripts/maps/OldaleTown_Mart.s index d1c36ce7a..3f4994890 100644 --- a/data/scripts/maps/OldaleTown_Mart.s +++ b/data/scripts/maps/OldaleTown_Mart.s @@ -57,4 +57,3 @@ OldaleTown_Mart_EventScript_152FDB:: @ 8152FDB OldaleTown_Mart_EventScript_152FE5:: @ 8152FE5 msgbox OldaleTown_Mart_Text_174B10, 2 end - diff --git a/data/scripts/maps/OldaleTown_PokemonCenter_1F.s b/data/scripts/maps/OldaleTown_PokemonCenter_1F.s index c9abc12a7..4ba96ddc8 100644 --- a/data/scripts/maps/OldaleTown_PokemonCenter_1F.s +++ b/data/scripts/maps/OldaleTown_PokemonCenter_1F.s @@ -36,4 +36,3 @@ OldaleTown_PokemonCenter_1F_EventScript_152F4C:: @ 8152F4C msgbox OldaleTown_PokemonCenter_1F_Text_174A2E, 4 release end - diff --git a/data/scripts/maps/OldaleTown_PokemonCenter_2F.s b/data/scripts/maps/OldaleTown_PokemonCenter_2F.s index bab0f21af..622f50c29 100644 --- a/data/scripts/maps/OldaleTown_PokemonCenter_2F.s +++ b/data/scripts/maps/OldaleTown_PokemonCenter_2F.s @@ -15,4 +15,3 @@ OldaleTown_PokemonCenter_2F_EventScript_152F6C:: @ 8152F6C OldaleTown_PokemonCenter_2F_EventScript_152F72:: @ 8152F72 call OldaleTown_PokemonCenter_2F_EventScript_1A41FB end - diff --git a/data/scripts/maps/PacifidlogTown.s b/data/scripts/maps/PacifidlogTown.s index f1c6ed462..c7cfb08df 100644 --- a/data/scripts/maps/PacifidlogTown.s +++ b/data/scripts/maps/PacifidlogTown.s @@ -26,4 +26,3 @@ PacifidlogTown_EventScript_14E912:: @ 814E912 PacifidlogTown_EventScript_14E91B:: @ 814E91B msgbox PacifidlogTown_Text_16D0CE, 3 end - diff --git a/data/scripts/maps/PacifidlogTown_House1.s b/data/scripts/maps/PacifidlogTown_House1.s index e7ad13f31..4b3586a16 100644 --- a/data/scripts/maps/PacifidlogTown_House1.s +++ b/data/scripts/maps/PacifidlogTown_House1.s @@ -8,4 +8,3 @@ PacifidlogTown_House1_EventScript_154155:: @ 8154155 PacifidlogTown_House1_EventScript_15415E:: @ 815415E msgbox PacifidlogTown_House1_Text_17906A, 2 end - diff --git a/data/scripts/maps/PacifidlogTown_House2.s b/data/scripts/maps/PacifidlogTown_House2.s index 5348a273d..b95a41ceb 100644 --- a/data/scripts/maps/PacifidlogTown_House2.s +++ b/data/scripts/maps/PacifidlogTown_House2.s @@ -98,4 +98,3 @@ PacifidlogTown_House2_EventScript_154282:: @ 8154282 msgbox PacifidlogTown_House2_Text_1793DD, 4 release end - diff --git a/data/scripts/maps/PacifidlogTown_House3.s b/data/scripts/maps/PacifidlogTown_House3.s index 4dfc1fa92..7ee815f07 100644 --- a/data/scripts/maps/PacifidlogTown_House3.s +++ b/data/scripts/maps/PacifidlogTown_House3.s @@ -53,4 +53,3 @@ PacifidlogTown_House3_EventScript_154338:: @ 8154338 PacifidlogTown_House3_EventScript_154342:: @ 8154342 msgbox PacifidlogTown_House3_Text_179541, 2 end - diff --git a/data/scripts/maps/PacifidlogTown_House4.s b/data/scripts/maps/PacifidlogTown_House4.s index 1df583033..e48644beb 100644 --- a/data/scripts/maps/PacifidlogTown_House4.s +++ b/data/scripts/maps/PacifidlogTown_House4.s @@ -28,4 +28,3 @@ PacifidlogTown_House4_EventScript_154389:: @ 8154389 msgbox PacifidlogTown_House4_Text_17968C, 4 release end - diff --git a/data/scripts/maps/PacifidlogTown_House5.s b/data/scripts/maps/PacifidlogTown_House5.s index 0aace4265..f20de28df 100644 --- a/data/scripts/maps/PacifidlogTown_House5.s +++ b/data/scripts/maps/PacifidlogTown_House5.s @@ -19,4 +19,3 @@ PacifidlogTown_House5_EventScript_1543B0:: @ 81543B0 PacifidlogTown_House5_EventScript_1543BA:: @ 81543BA msgbox PacifidlogTown_House5_Text_179765, 2 end - diff --git a/data/scripts/maps/PacifidlogTown_PokemonCenter_1F.s b/data/scripts/maps/PacifidlogTown_PokemonCenter_1F.s index 5dac78e75..973f80a55 100644 --- a/data/scripts/maps/PacifidlogTown_PokemonCenter_1F.s +++ b/data/scripts/maps/PacifidlogTown_PokemonCenter_1F.s @@ -25,4 +25,3 @@ PacifidlogTown_PokemonCenter_1F_EventScript_154120:: @ 8154120 PacifidlogTown_PokemonCenter_1F_EventScript_154129:: @ 8154129 msgbox PacifidlogTown_PokemonCenter_1F_Text_178ED9, 2 end - diff --git a/data/scripts/maps/PacifidlogTown_PokemonCenter_2F.s b/data/scripts/maps/PacifidlogTown_PokemonCenter_2F.s index 0ac2d8a88..2bff37736 100644 --- a/data/scripts/maps/PacifidlogTown_PokemonCenter_2F.s +++ b/data/scripts/maps/PacifidlogTown_PokemonCenter_2F.s @@ -15,4 +15,3 @@ PacifidlogTown_PokemonCenter_2F_MapScripts:: @ 8154132 PacifidlogTown_PokemonCenter_2F_EventScript_15414E:: @ 815414E call PacifidlogTown_PokemonCenter_2F_EventScript_1A41FB end - diff --git a/data/scripts/maps/PetalburgCity.s b/data/scripts/maps/PetalburgCity.s index e746a37b8..3667eb3cf 100644 --- a/data/scripts/maps/PetalburgCity.s +++ b/data/scripts/maps/PetalburgCity.s @@ -426,4 +426,3 @@ PetalburgCity_Movement_14BA22:: @ 814BA22 PetalburgCity_EventScript_14BA2D:: @ 814BA2D msgbox PetalburgCity_Text_16438A, 2 end - diff --git a/data/scripts/maps/PetalburgCity_Gym.s b/data/scripts/maps/PetalburgCity_Gym.s index a60df1c7f..13577ef04 100644 --- a/data/scripts/maps/PetalburgCity_Gym.s +++ b/data/scripts/maps/PetalburgCity_Gym.s @@ -1055,4 +1055,3 @@ PetalburgCity_Gym_EventScript_1551D4:: @ 81551D4 msgbox PetalburgCity_Gym_Text_17BAA5, 4 releaseall end - diff --git a/data/scripts/maps/PetalburgCity_House1.s b/data/scripts/maps/PetalburgCity_House1.s index 3950e1259..7a3b7c1b1 100644 --- a/data/scripts/maps/PetalburgCity_House1.s +++ b/data/scripts/maps/PetalburgCity_House1.s @@ -8,4 +8,3 @@ PetalburgCity_House1_EventScript_1551DF:: @ 81551DF PetalburgCity_House1_EventScript_1551E8:: @ 81551E8 msgbox PetalburgCity_House1_Text_17BB4A, 2 end - diff --git a/data/scripts/maps/PetalburgCity_House2.s b/data/scripts/maps/PetalburgCity_House2.s index fbd3f9b0d..4cc1325a2 100644 --- a/data/scripts/maps/PetalburgCity_House2.s +++ b/data/scripts/maps/PetalburgCity_House2.s @@ -8,4 +8,3 @@ PetalburgCity_House2_EventScript_1551F2:: @ 81551F2 PetalburgCity_House2_EventScript_1551FB:: @ 81551FB msgbox PetalburgCity_House2_Text_17BCB1, 2 end - diff --git a/data/scripts/maps/PetalburgCity_Mart.s b/data/scripts/maps/PetalburgCity_Mart.s index 52ad90072..2eac03cac 100644 --- a/data/scripts/maps/PetalburgCity_Mart.s +++ b/data/scripts/maps/PetalburgCity_Mart.s @@ -66,4 +66,3 @@ PetalburgCity_Mart_EventScript_155323:: @ 8155323 PetalburgCity_Mart_EventScript_15532C:: @ 815532C msgbox PetalburgCity_Mart_Text_17C0BC, 2 end - diff --git a/data/scripts/maps/PetalburgCity_PokemonCenter_1F.s b/data/scripts/maps/PetalburgCity_PokemonCenter_1F.s index faf7b8792..09d414dcb 100644 --- a/data/scripts/maps/PetalburgCity_PokemonCenter_1F.s +++ b/data/scripts/maps/PetalburgCity_PokemonCenter_1F.s @@ -54,4 +54,3 @@ PetalburgCity_PokemonCenter_1F_EventScript_15527B:: @ 815527B PetalburgCity_PokemonCenter_1F_EventScript_155284:: @ 8155284 msgbox PetalburgCity_PokemonCenter_1F_Text_17BF73, 4 return - diff --git a/data/scripts/maps/PetalburgCity_PokemonCenter_2F.s b/data/scripts/maps/PetalburgCity_PokemonCenter_2F.s index e26624dd6..a95823736 100644 --- a/data/scripts/maps/PetalburgCity_PokemonCenter_2F.s +++ b/data/scripts/maps/PetalburgCity_PokemonCenter_2F.s @@ -15,4 +15,3 @@ PetalburgCity_PokemonCenter_2F_EventScript_1552A3:: @ 81552A3 PetalburgCity_PokemonCenter_2F_EventScript_1552A9:: @ 81552A9 call PetalburgCity_PokemonCenter_2F_EventScript_1A41FB end - diff --git a/data/scripts/maps/PetalburgCity_WallysHouse.s b/data/scripts/maps/PetalburgCity_WallysHouse.s index 724e0da6f..e8ac407dc 100644 --- a/data/scripts/maps/PetalburgCity_WallysHouse.s +++ b/data/scripts/maps/PetalburgCity_WallysHouse.s @@ -66,4 +66,3 @@ PetalburgCity_WallysHouse_EventScript_15446D:: @ 815446D msgbox PetalburgCity_WallysHouse_Text_179D12, 4 release end - diff --git a/data/scripts/maps/PetalburgWoods.s b/data/scripts/maps/PetalburgWoods.s index 4642642a4..754dcff39 100644 --- a/data/scripts/maps/PetalburgWoods.s +++ b/data/scripts/maps/PetalburgWoods.s @@ -281,4 +281,3 @@ PetalburgWoods_EventScript_15CF65:: @ 815CF65 trainerbattle 5, 621, 0, PetalburgWoods_Text_195306, PetalburgWoods_Text_195338 msgbox PetalburgWoods_Text_195356, 6 end - diff --git a/data/scripts/maps/RecordCorner.s b/data/scripts/maps/RecordCorner.s index 60ea39284..8a2c1db22 100644 --- a/data/scripts/maps/RecordCorner.s +++ b/data/scripts/maps/RecordCorner.s @@ -1,3 +1,2 @@ RecordCorner_MapScripts:: @ 815F57E .byte 0 - diff --git a/data/scripts/maps/Route101.s b/data/scripts/maps/Route101.s index dfb202d32..944473e96 100644 --- a/data/scripts/maps/Route101.s +++ b/data/scripts/maps/Route101.s @@ -244,4 +244,3 @@ Route101_EventScript_14EA7F:: @ 814EA7F Route101_Movement_14EAD7:: @ 814EAD7 step_right step_end - diff --git a/data/scripts/maps/Route102.s b/data/scripts/maps/Route102.s index 09ce6f806..e82ff15c4 100644 --- a/data/scripts/maps/Route102.s +++ b/data/scripts/maps/Route102.s @@ -44,4 +44,3 @@ Route102_EventScript_14EB6A:: @ 814EB6A trainerbattle 0, 333, 0, Route102_Text_1B7B68, Route102_Text_1B7B9D msgbox Route102_Text_1B7BD0, 6 end - diff --git a/data/scripts/maps/Route103.s b/data/scripts/maps/Route103.s index ad745ea37..ec2f9e067 100644 --- a/data/scripts/maps/Route103.s +++ b/data/scripts/maps/Route103.s @@ -214,4 +214,3 @@ Route103_EventScript_14EE75:: @ 814EE75 trainerbattle 5, 293, 0, Route103_Text_1B8349, Route103_Text_1B838C msgbox Route103_Text_1B83A4, 6 end - diff --git a/data/scripts/maps/Route104.s b/data/scripts/maps/Route104.s index 624646d34..45a8062c8 100644 --- a/data/scripts/maps/Route104.s +++ b/data/scripts/maps/Route104.s @@ -459,4 +459,3 @@ Route104_EventScript_14F279:: @ 814F279 msgbox Route104_Text_1B853B, 4 release end - diff --git a/data/scripts/maps/Route104_MrBrineysHouse.s b/data/scripts/maps/Route104_MrBrineysHouse.s index 592e58ce8..5c6704e67 100644 --- a/data/scripts/maps/Route104_MrBrineysHouse.s +++ b/data/scripts/maps/Route104_MrBrineysHouse.s @@ -97,4 +97,3 @@ Route104_MrBrineysHouse_EventScript_15BDD1:: @ 815BDD1 waitpokecry release end - diff --git a/data/scripts/maps/Route104_PrettyPetalFlowerShop.s b/data/scripts/maps/Route104_PrettyPetalFlowerShop.s index 122b15e9e..02842c62d 100644 --- a/data/scripts/maps/Route104_PrettyPetalFlowerShop.s +++ b/data/scripts/maps/Route104_PrettyPetalFlowerShop.s @@ -107,4 +107,3 @@ Route104_PrettyPetalFlowerShop_EventScript_15BF1A:: @ 815BF1A msgbox Route104_PrettyPetalFlowerShop_Text_1C6335, 4 release end - diff --git a/data/scripts/maps/Route104_Prototype.s b/data/scripts/maps/Route104_Prototype.s index 71022f23f..91ed6e593 100644 --- a/data/scripts/maps/Route104_Prototype.s +++ b/data/scripts/maps/Route104_Prototype.s @@ -110,4 +110,3 @@ Route104_Prototype_EventScript_160DA9:: @ 8160DA9 trainerbattle 0, 633, 0, Route104_Prototype_Text_19B066, Route104_Prototype_Text_19B0D7 msgbox Route104_Prototype_Text_19B0EF, 6 end - diff --git a/data/scripts/maps/Route104_PrototypePrettyPetalFlowerShop.s b/data/scripts/maps/Route104_PrototypePrettyPetalFlowerShop.s index ce5355d8a..f979ab60b 100644 --- a/data/scripts/maps/Route104_PrototypePrettyPetalFlowerShop.s +++ b/data/scripts/maps/Route104_PrototypePrettyPetalFlowerShop.s @@ -4,4 +4,3 @@ Route104_PrototypePrettyPetalFlowerShop_MapScripts:: @ 8160DC0 Route104_PrototypePrettyPetalFlowerShop_EventScript_160DC1:: @ 8160DC1 msgbox Route104_PrototypePrettyPetalFlowerShop_Text_19B436, 2 end - diff --git a/data/scripts/maps/Route105.s b/data/scripts/maps/Route105.s index 391b31e34..eb86b126c 100644 --- a/data/scripts/maps/Route105.s +++ b/data/scripts/maps/Route105.s @@ -36,4 +36,3 @@ Route105_EventScript_14F317:: @ 814F317 trainerbattle 0, 442, 0, Route105_Text_1B8E66, Route105_Text_1B8EA0 msgbox Route105_Text_1B8EBD, 6 end - diff --git a/data/scripts/maps/Route106.s b/data/scripts/maps/Route106.s index c7c9820cd..8ff86e445 100644 --- a/data/scripts/maps/Route106.s +++ b/data/scripts/maps/Route106.s @@ -32,4 +32,3 @@ Route106_EventScript_14F3A4:: @ 814F3A4 trainerbattle 0, 340, 0, Route106_Text_1B9052, Route106_Text_1B90D3 msgbox Route106_Text_1B910A, 6 end - diff --git a/data/scripts/maps/Route107.s b/data/scripts/maps/Route107.s index c50eec6a1..bf94d6ce7 100644 --- a/data/scripts/maps/Route107.s +++ b/data/scripts/maps/Route107.s @@ -38,4 +38,3 @@ Route107_EventScript_14F45A:: @ 814F45A trainerbattle 4, 692, 0, Route107_Text_1B96AB, Route107_Text_1B9707, Route107_Text_1B9788 msgbox Route107_Text_1B9735, 6 end - diff --git a/data/scripts/maps/Route108.s b/data/scripts/maps/Route108.s index 70a852195..c474cc2dd 100644 --- a/data/scripts/maps/Route108.s +++ b/data/scripts/maps/Route108.s @@ -20,4 +20,3 @@ Route108_EventScript_14F4BB:: @ 814F4BB trainerbattle 0, 447, 0, Route108_Text_1B9986, Route108_Text_1B99BB msgbox Route108_Text_1B99E9, 6 end - diff --git a/data/scripts/maps/Route109.s b/data/scripts/maps/Route109.s index 39def243c..2fa119117 100644 --- a/data/scripts/maps/Route109.s +++ b/data/scripts/maps/Route109.s @@ -444,4 +444,3 @@ Route109_EventScript_14F8E5:: @ 814F8E5 trainerbattle 4, 680, 0, Route109_Text_1BA114, Route109_Text_1BA15F, Route109_Text_1BA1D0 msgbox Route109_Text_1BA193, 6 end - diff --git a/data/scripts/maps/Route109_SeashoreHouse.s b/data/scripts/maps/Route109_SeashoreHouse.s index aa9d55919..919f07091 100644 --- a/data/scripts/maps/Route109_SeashoreHouse.s +++ b/data/scripts/maps/Route109_SeashoreHouse.s @@ -107,4 +107,3 @@ Route109_SeashoreHouse_EventScript_160F09:: @ 8160F09 Route109_SeashoreHouse_EventScript_160F29:: @ 8160F29 release end - diff --git a/data/scripts/maps/Route110.s b/data/scripts/maps/Route110.s index 53b2c8172..46e4633c8 100644 --- a/data/scripts/maps/Route110.s +++ b/data/scripts/maps/Route110.s @@ -537,4 +537,3 @@ Route110_Movement_14FF89:: @ 814FF89 step_16 step_16 step_end - diff --git a/data/scripts/maps/Route110_SeasideCyclingRoadNorthEntrance.s b/data/scripts/maps/Route110_SeasideCyclingRoadNorthEntrance.s index ed5dd3cda..641c32d55 100644 --- a/data/scripts/maps/Route110_SeasideCyclingRoadNorthEntrance.s +++ b/data/scripts/maps/Route110_SeasideCyclingRoadNorthEntrance.s @@ -55,4 +55,3 @@ Route110_SeasideCyclingRoadNorthEntrance_EventScript_16353A:: @ 816353A setvar 0x4001, 0 releaseall end - diff --git a/data/scripts/maps/Route110_SeasideCyclingRoadSouthEntrance.s b/data/scripts/maps/Route110_SeasideCyclingRoadSouthEntrance.s index d25463993..96fb13f2b 100644 --- a/data/scripts/maps/Route110_SeasideCyclingRoadSouthEntrance.s +++ b/data/scripts/maps/Route110_SeasideCyclingRoadSouthEntrance.s @@ -36,4 +36,3 @@ Route110_SeasideCyclingRoadSouthEntrance_EventScript_1634BD:: @ 81634BD setvar 0x4001, 0 releaseall end - diff --git a/data/scripts/maps/Route110_TrickHouseCorridor.s b/data/scripts/maps/Route110_TrickHouseCorridor.s index 06da2482d..7b3d93118 100644 --- a/data/scripts/maps/Route110_TrickHouseCorridor.s +++ b/data/scripts/maps/Route110_TrickHouseCorridor.s @@ -5,4 +5,3 @@ Route110_TrickHouseCorridor_MapScripts:: @ 8161CEC Route110_TrickHouseCorridor_MapScript1_161CF2:: @ 8161CF2 setvar 0x40b5, 1 end - diff --git a/data/scripts/maps/Route110_TrickHouseEnd.s b/data/scripts/maps/Route110_TrickHouseEnd.s index 4b335af91..d2b2eaefb 100644 --- a/data/scripts/maps/Route110_TrickHouseEnd.s +++ b/data/scripts/maps/Route110_TrickHouseEnd.s @@ -249,4 +249,3 @@ Route110_TrickHouseEnd_Movement_161CE8:: @ 8161CE8 Route110_TrickHouseEnd_Movement_161CEA:: @ 8161CEA step_48 step_end - diff --git a/data/scripts/maps/Route110_TrickHousePuzzle1.s b/data/scripts/maps/Route110_TrickHousePuzzle1.s index 074273652..df9235c0b 100644 --- a/data/scripts/maps/Route110_TrickHousePuzzle1.s +++ b/data/scripts/maps/Route110_TrickHousePuzzle1.s @@ -37,4 +37,3 @@ Route110_TrickHousePuzzle1_EventScript_161D5F:: @ 8161D5F trainerbattle 0, 612, 0, Route110_TrickHousePuzzle1_Text_19CC68, Route110_TrickHousePuzzle1_Text_19CC86 msgbox Route110_TrickHousePuzzle1_Text_19CCAA, 6 end - diff --git a/data/scripts/maps/Route110_TrickHousePuzzle2.s b/data/scripts/maps/Route110_TrickHousePuzzle2.s index 0984690a1..e9d4648b0 100644 --- a/data/scripts/maps/Route110_TrickHousePuzzle2.s +++ b/data/scripts/maps/Route110_TrickHousePuzzle2.s @@ -103,4 +103,3 @@ Route110_TrickHousePuzzle2_EventScript_161EA6:: @ 8161EA6 trainerbattle 0, 281, 0, Route110_TrickHousePuzzle2_Text_19CE52, Route110_TrickHousePuzzle2_Text_19CE98 msgbox Route110_TrickHousePuzzle2_Text_19CEB8, 6 end - diff --git a/data/scripts/maps/Route110_TrickHousePuzzle3.s b/data/scripts/maps/Route110_TrickHousePuzzle3.s index 309728db7..0a9a1c6a2 100644 --- a/data/scripts/maps/Route110_TrickHousePuzzle3.s +++ b/data/scripts/maps/Route110_TrickHousePuzzle3.s @@ -394,4 +394,3 @@ Route110_TrickHousePuzzle3_EventScript_162736:: @ 8162736 trainerbattle 0, 630, 0, Route110_TrickHousePuzzle3_Text_19D0AE, Route110_TrickHousePuzzle3_Text_19D0F0 msgbox Route110_TrickHousePuzzle3_Text_19D110, 6 end - diff --git a/data/scripts/maps/Route110_TrickHousePuzzle4.s b/data/scripts/maps/Route110_TrickHousePuzzle4.s index f8760aba7..e0f16d739 100644 --- a/data/scripts/maps/Route110_TrickHousePuzzle4.s +++ b/data/scripts/maps/Route110_TrickHousePuzzle4.s @@ -27,4 +27,3 @@ Route110_TrickHousePuzzle4_EventScript_162799:: @ 8162799 trainerbattle 0, 429, 0, Route110_TrickHousePuzzle4_Text_19D351, Route110_TrickHousePuzzle4_Text_19D380 msgbox Route110_TrickHousePuzzle4_Text_19D386, 6 end - diff --git a/data/scripts/maps/Route110_TrickHousePuzzle6.s b/data/scripts/maps/Route110_TrickHousePuzzle6.s index b921842d7..fa9b00e95 100644 --- a/data/scripts/maps/Route110_TrickHousePuzzle6.s +++ b/data/scripts/maps/Route110_TrickHousePuzzle6.s @@ -41,4 +41,3 @@ Route110_TrickHousePuzzle6_EventScript_163135:: @ 8163135 trainerbattle 0, 554, 0, Route110_TrickHousePuzzle6_Text_19DDCF, Route110_TrickHousePuzzle6_Text_19DDFE msgbox Route110_TrickHousePuzzle6_Text_19DE44, 6 end - diff --git a/data/scripts/maps/Route110_TrickHousePuzzle7.s b/data/scripts/maps/Route110_TrickHousePuzzle7.s index a50af06c4..835cce0a1 100644 --- a/data/scripts/maps/Route110_TrickHousePuzzle7.s +++ b/data/scripts/maps/Route110_TrickHousePuzzle7.s @@ -257,4 +257,3 @@ Route110_TrickHousePuzzle7_EventScript_163404:: @ 8163404 trainerbattle 0, 248, 0, Route110_TrickHousePuzzle7_Text_19E054, Route110_TrickHousePuzzle7_Text_19E098 msgbox Route110_TrickHousePuzzle7_Text_19E0B2, 6 end - diff --git a/data/scripts/maps/Route110_TrickHousePuzzle8.s b/data/scripts/maps/Route110_TrickHousePuzzle8.s index 99100e4f6..d22fe8edc 100644 --- a/data/scripts/maps/Route110_TrickHousePuzzle8.s +++ b/data/scripts/maps/Route110_TrickHousePuzzle8.s @@ -27,4 +27,3 @@ Route110_TrickHousePuzzle8_EventScript_163467:: @ 8163467 trainerbattle 0, 77, 0, Route110_TrickHousePuzzle8_Text_19E284, Route110_TrickHousePuzzle8_Text_19E2C1 msgbox Route110_TrickHousePuzzle8_Text_19E2EE, 6 end - diff --git a/data/scripts/maps/Route111.s b/data/scripts/maps/Route111.s index b6e009427..17cf1cdc7 100644 --- a/data/scripts/maps/Route111.s +++ b/data/scripts/maps/Route111.s @@ -443,4 +443,3 @@ Route111_EventScript_1504EB:: @ 81504EB trainerbattle 5, 94, 0, Route111_Text_1BB529, Route111_Text_1BB5A2 msgbox Route111_Text_1BB5C1, 6 end - diff --git a/data/scripts/maps/Route111_OldLadysRestStop.s b/data/scripts/maps/Route111_OldLadysRestStop.s index 81f66b738..107026a4b 100644 --- a/data/scripts/maps/Route111_OldLadysRestStop.s +++ b/data/scripts/maps/Route111_OldLadysRestStop.s @@ -31,4 +31,3 @@ Route111_OldLadysRestStop_EventScript_15C029:: @ 815C029 msgbox Route111_OldLadysRestStop_Text_1924C6, 4 release end - diff --git a/data/scripts/maps/Route111_WinstrateFamilysHouse.s b/data/scripts/maps/Route111_WinstrateFamilysHouse.s index b48269333..3eb514ad2 100644 --- a/data/scripts/maps/Route111_WinstrateFamilysHouse.s +++ b/data/scripts/maps/Route111_WinstrateFamilysHouse.s @@ -58,4 +58,3 @@ Route111_WinstrateFamilysHouse_EventScript_15BFC4:: @ 815BFC4 waitmove 0 release end - diff --git a/data/scripts/maps/Route112.s b/data/scripts/maps/Route112.s index b97a28d75..e6853005d 100644 --- a/data/scripts/maps/Route112.s +++ b/data/scripts/maps/Route112.s @@ -58,4 +58,3 @@ Route112_EventScript_1505B5:: @ 81505B5 trainerbattle 0, 471, 0, Route112_Text_1BB8F0, Route112_Text_1BB942 msgbox Route112_Text_1BB958, 6 end - diff --git a/data/scripts/maps/Route112_CableCarStation.s b/data/scripts/maps/Route112_CableCarStation.s index 4d4ab5c92..8703bc2e0 100644 --- a/data/scripts/maps/Route112_CableCarStation.s +++ b/data/scripts/maps/Route112_CableCarStation.s @@ -86,4 +86,3 @@ Route112_CableCarStation_Movement_15C0F5:: @ 815C0F5 step_down step_14 step_end - diff --git a/data/scripts/maps/Route113.s b/data/scripts/maps/Route113.s index d56e7c5d5..a7a6807d4 100644 --- a/data/scripts/maps/Route113.s +++ b/data/scripts/maps/Route113.s @@ -98,4 +98,3 @@ Route113_EventScript_150717:: @ 8150717 trainerbattle 4, 677, 0, Route113_Text_1BBF62, Route113_Text_1BBF9D, Route113_Text_1BC021 msgbox Route113_Text_1BBFE2, 6 end - diff --git a/data/scripts/maps/Route113_GlassWorkshop.s b/data/scripts/maps/Route113_GlassWorkshop.s index 51a4b7b7e..d59942472 100644 --- a/data/scripts/maps/Route113_GlassWorkshop.s +++ b/data/scripts/maps/Route113_GlassWorkshop.s @@ -306,4 +306,3 @@ Route113_GlassWorkshop_EventScript_1639B1:: @ 81639B1 Route113_GlassWorkshop_EventScript_1639D6:: @ 81639D6 msgbox Route113_GlassWorkshop_Text_19EB3B, 2 end - diff --git a/data/scripts/maps/Route114.s b/data/scripts/maps/Route114.s index da590b8d6..4f43cf3ad 100644 --- a/data/scripts/maps/Route114.s +++ b/data/scripts/maps/Route114.s @@ -130,4 +130,3 @@ Route114_EventScript_150912:: @ 8150912 trainerbattle 4, 679, 0, Route114_Text_1BC8D8, Route114_Text_1BC8FB, Route114_Text_1BC96A msgbox Route114_Text_1BC91E, 6 end - diff --git a/data/scripts/maps/Route114_FossilManiacsHouse.s b/data/scripts/maps/Route114_FossilManiacsHouse.s index 71893af74..50305dc04 100644 --- a/data/scripts/maps/Route114_FossilManiacsHouse.s +++ b/data/scripts/maps/Route114_FossilManiacsHouse.s @@ -31,4 +31,3 @@ Route114_FossilManiacsHouse_EventScript_15C1FC:: @ 815C1FC Route114_FossilManiacsHouse_EventScript_15C205:: @ 815C205 msgbox Route114_FossilManiacsHouse_Text_192729, 3 end - diff --git a/data/scripts/maps/Route114_FossilManiacsTunnel.s b/data/scripts/maps/Route114_FossilManiacsTunnel.s index b888a3a4c..7986a0436 100644 --- a/data/scripts/maps/Route114_FossilManiacsTunnel.s +++ b/data/scripts/maps/Route114_FossilManiacsTunnel.s @@ -25,4 +25,3 @@ Route114_FossilManiacsTunnel_EventScript_15C24E:: @ 815C24E msgbox Route114_FossilManiacsTunnel_Text_1929DC, 4 release end - diff --git a/data/scripts/maps/Route114_LanettesHouse.s b/data/scripts/maps/Route114_LanettesHouse.s index 16cc31033..ff8a1c565 100644 --- a/data/scripts/maps/Route114_LanettesHouse.s +++ b/data/scripts/maps/Route114_LanettesHouse.s @@ -52,4 +52,3 @@ Route114_LanettesHouse_EventScript_15C2CC:: @ 815C2CC Route114_LanettesHouse_EventScript_15C2D5:: @ 815C2D5 msgbox Route114_LanettesHouse_Text_192DC1, 3 end - diff --git a/data/scripts/maps/Route115.s b/data/scripts/maps/Route115.s index 0bdf8b16f..187e9b86f 100644 --- a/data/scripts/maps/Route115.s +++ b/data/scripts/maps/Route115.s @@ -66,4 +66,3 @@ Route115_EventScript_150A1A:: @ 8150A1A msgbox Route115_Text_1BCF3D, 6 .endc end - diff --git a/data/scripts/maps/Route116.s b/data/scripts/maps/Route116.s index c6c6e1cb1..2a1a29409 100644 --- a/data/scripts/maps/Route116.s +++ b/data/scripts/maps/Route116.s @@ -273,4 +273,3 @@ Route116_EventScript_150D23:: @ 8150D23 trainerbattle 5, 280, 0, Route116_Text_1BD405, Route116_Text_1BD44A msgbox Route116_Text_1BD466, 6 end - diff --git a/data/scripts/maps/Route116_TunnelersRestHouse.s b/data/scripts/maps/Route116_TunnelersRestHouse.s index 87e21addd..d141fae37 100644 --- a/data/scripts/maps/Route116_TunnelersRestHouse.s +++ b/data/scripts/maps/Route116_TunnelersRestHouse.s @@ -27,4 +27,3 @@ Route116_TunnelersRestHouse_EventScript_15C30F:: @ 815C30F msgbox Route116_TunnelersRestHouse_Text_1931C1, 4 release end - diff --git a/data/scripts/maps/Route117.s b/data/scripts/maps/Route117.s index 232ed81d4..155a94bce 100644 --- a/data/scripts/maps/Route117.s +++ b/data/scripts/maps/Route117.s @@ -120,4 +120,3 @@ Route117_EventScript_150F0D:: @ 8150F0D trainerbattle 7, 287, 0, Route117_Text_1BDEE3, Route117_Text_1BDF26, Route117_Text_1BDF90 msgbox Route117_Text_1BDF37, 6 end - diff --git a/data/scripts/maps/Route117_PokemonDayCare.s b/data/scripts/maps/Route117_PokemonDayCare.s index 15435a631..2a3ee79e1 100644 --- a/data/scripts/maps/Route117_PokemonDayCare.s +++ b/data/scripts/maps/Route117_PokemonDayCare.s @@ -5,4 +5,3 @@ Route117_PokemonDayCare_MapScripts:: @ 815C319 Route117_PokemonDayCare_MapScript1_15C31F:: @ 815C31F setflag 2118 end - diff --git a/data/scripts/maps/Route118.s b/data/scripts/maps/Route118.s index e2e685aba..f8e25a002 100644 --- a/data/scripts/maps/Route118.s +++ b/data/scripts/maps/Route118.s @@ -204,4 +204,3 @@ Route118_EventScript_151150:: @ 8151150 trainerbattle 0, 408, 0, Route118_Text_1BE1D7, Route118_Text_1BE1F5 msgbox Route118_Text_1BE20D, 6 end - diff --git a/data/scripts/maps/Route119.s b/data/scripts/maps/Route119.s index 22e8c1c84..4bf0e6888 100644 --- a/data/scripts/maps/Route119.s +++ b/data/scripts/maps/Route119.s @@ -381,4 +381,3 @@ Route119_EventScript_1515FC:: @ 81515FC Route119_EventScript_151605:: @ 8151605 msgbox Route119_Text_171774, 3 end - diff --git a/data/scripts/maps/Route119_House.s b/data/scripts/maps/Route119_House.s index b18ea7a6c..6395e40eb 100644 --- a/data/scripts/maps/Route119_House.s +++ b/data/scripts/maps/Route119_House.s @@ -14,4 +14,3 @@ Route119_House_EventScript_163DE7:: @ 8163DE7 waitpokecry release end - diff --git a/data/scripts/maps/Route119_WeatherInstitute_1F.s b/data/scripts/maps/Route119_WeatherInstitute_1F.s index f280086f6..64bc09057 100644 --- a/data/scripts/maps/Route119_WeatherInstitute_1F.s +++ b/data/scripts/maps/Route119_WeatherInstitute_1F.s @@ -53,4 +53,3 @@ Route119_WeatherInstitute_1F_EventScript_163CAB:: @ 8163CAB trainerbattle 0, TRAINER_WEATHER_INSTITUTE_GRUNT_2, 0, Route119_WeatherInstitute_1F_Text_19EC6B, Route119_WeatherInstitute_1F_Text_19EC89 msgbox Route119_WeatherInstitute_1F_Text_19EC97, 6 end - diff --git a/data/scripts/maps/Route119_WeatherInstitute_2F.s b/data/scripts/maps/Route119_WeatherInstitute_2F.s index deee98d09..30a98313c 100644 --- a/data/scripts/maps/Route119_WeatherInstitute_2F.s +++ b/data/scripts/maps/Route119_WeatherInstitute_2F.s @@ -91,4 +91,3 @@ Route119_WeatherInstitute_2F_EventScript_163DCC:: @ 8163DCC jumpeq Route119_WeatherInstitute_2F_EventScript_163DBE jump Route119_WeatherInstitute_2F_EventScript_163D7A end - diff --git a/data/scripts/maps/Route120.s b/data/scripts/maps/Route120.s index e0ef91dc0..9d8f4cd5c 100644 --- a/data/scripts/maps/Route120.s +++ b/data/scripts/maps/Route120.s @@ -355,4 +355,3 @@ Route120_EventScript_151AE7:: @ 8151AE7 trainerbattle 0, 653, 0, Route120_Text_1BF8C5, Route120_Text_1BF920 msgbox Route120_Text_1BF946, 6 end - diff --git a/data/scripts/maps/Route121.s b/data/scripts/maps/Route121.s index 096e294d5..49b6031bc 100644 --- a/data/scripts/maps/Route121.s +++ b/data/scripts/maps/Route121.s @@ -111,4 +111,3 @@ Route121_EventScript_151C3B:: @ 8151C3B trainerbattle 5, 127, 0, Route121_Text_1BFEDE, Route121_Text_1BFF0A msgbox Route121_Text_1BFF3A, 6 end - diff --git a/data/scripts/maps/Route121_SafariZoneEntrance.s b/data/scripts/maps/Route121_SafariZoneEntrance.s index 9d5c12e26..2056bc328 100644 --- a/data/scripts/maps/Route121_SafariZoneEntrance.s +++ b/data/scripts/maps/Route121_SafariZoneEntrance.s @@ -136,4 +136,3 @@ Route121_SafariZoneEntrance_Movement_15C47E:: @ 815C47E Route121_SafariZoneEntrance_EventScript_15C487:: @ 815C487 msgbox Route121_SafariZoneEntrance_Text_1C3E4B, 3 end - diff --git a/data/scripts/maps/Route122.s b/data/scripts/maps/Route122.s index 75718c2b1..4c4e49aa1 100644 --- a/data/scripts/maps/Route122.s +++ b/data/scripts/maps/Route122.s @@ -1,3 +1,2 @@ Route122_MapScripts:: @ 8151C52 .byte 0 - diff --git a/data/scripts/maps/Route123.s b/data/scripts/maps/Route123.s index eb2ae5fcf..958f83c2d 100644 --- a/data/scripts/maps/Route123.s +++ b/data/scripts/maps/Route123.s @@ -100,4 +100,3 @@ Route123_EventScript_151DC8:: @ 8151DC8 trainerbattle 0, 106, 0, Route123_Text_1C0554, Route123_Text_1C059F msgbox Route123_Text_1C05BC, 6 end - diff --git a/data/scripts/maps/Route123_BerryMastersHouse.s b/data/scripts/maps/Route123_BerryMastersHouse.s index 3402bb000..9290f845d 100644 --- a/data/scripts/maps/Route123_BerryMastersHouse.s +++ b/data/scripts/maps/Route123_BerryMastersHouse.s @@ -150,4 +150,3 @@ Route123_BerryMastersHouse_EventScript_163C1D:: @ 8163C1D msgbox Route123_BerryMastersHouse_Text_1C5E59, 4 release end - diff --git a/data/scripts/maps/Route124.s b/data/scripts/maps/Route124.s index d0295dd37..9a665f3b7 100644 --- a/data/scripts/maps/Route124.s +++ b/data/scripts/maps/Route124.s @@ -69,4 +69,3 @@ Route124_EventScript_151F03:: @ 8151F03 trainerbattle 7, 687, 0, Route124_Text_1C0EA2, Route124_Text_1C0EE5, Route124_Text_1C0F90 msgbox Route124_Text_1C0F19, 6 end - diff --git a/data/scripts/maps/Route124_DivingTreasureHuntersHouse.s b/data/scripts/maps/Route124_DivingTreasureHuntersHouse.s index 6e7a0a0df..e1049c8be 100644 --- a/data/scripts/maps/Route124_DivingTreasureHuntersHouse.s +++ b/data/scripts/maps/Route124_DivingTreasureHuntersHouse.s @@ -293,4 +293,3 @@ Route124_DivingTreasureHuntersHouse_EventScript_164333:: @ 8164333 Route124_DivingTreasureHuntersHouse_EventScript_164335:: @ 8164335 msgbox Route124_DivingTreasureHuntersHouse_Text_19F6C5, 3 end - diff --git a/data/scripts/maps/Route125.s b/data/scripts/maps/Route125.s index 1c51c45ad..664d25622 100644 --- a/data/scripts/maps/Route125.s +++ b/data/scripts/maps/Route125.s @@ -49,4 +49,3 @@ Route125_EventScript_151FE3:: @ 8151FE3 trainerbattle 4, 678, 0, Route125_Text_1C14AB, Route125_Text_1C14E7, Route125_Text_1C154F msgbox Route125_Text_1C1508, 6 end - diff --git a/data/scripts/maps/Route126.s b/data/scripts/maps/Route126.s index 574d05b98..27fee871e 100644 --- a/data/scripts/maps/Route126.s +++ b/data/scripts/maps/Route126.s @@ -26,4 +26,3 @@ Route126_EventScript_152053:: @ 8152053 trainerbattle 0, 454, 0, Route126_Text_1C1741, Route126_Text_1C1766 msgbox Route126_Text_1C1773, 6 end - diff --git a/data/scripts/maps/Route127.s b/data/scripts/maps/Route127.s index 5beffdbcb..4605c3ffe 100644 --- a/data/scripts/maps/Route127.s +++ b/data/scripts/maps/Route127.s @@ -41,4 +41,3 @@ Route127_EventScript_152104:: @ 8152104 trainerbattle 0, 674, 0, Route127_Text_1C1B92, Route127_Text_1C1BD9 msgbox Route127_Text_1C1BEC, 6 end - diff --git a/data/scripts/maps/Route128.s b/data/scripts/maps/Route128.s index f59d2fbbb..9e3c3e924 100644 --- a/data/scripts/maps/Route128.s +++ b/data/scripts/maps/Route128.s @@ -220,4 +220,3 @@ Route128_EventScript_15234E:: @ 815234E trainerbattle 0, 673, 0, Route128_Text_1C2090, Route128_Text_1C20FC msgbox Route128_Text_1C210D, 6 end - diff --git a/data/scripts/maps/Route129.s b/data/scripts/maps/Route129.s index c6b955df8..186c8ad42 100644 --- a/data/scripts/maps/Route129.s +++ b/data/scripts/maps/Route129.s @@ -20,4 +20,3 @@ Route129_EventScript_1523AB:: @ 81523AB trainerbattle 0, 676, 0, Route129_Text_1C2349, Route129_Text_1C2378 msgbox Route129_Text_1C23A3, 6 end - diff --git a/data/scripts/maps/Route130.s b/data/scripts/maps/Route130.s index c61f7e3b1..ba2e702bc 100644 --- a/data/scripts/maps/Route130.s +++ b/data/scripts/maps/Route130.s @@ -38,4 +38,3 @@ Route130_EventScript_152427:: @ 8152427 trainerbattle 0, 455, 0, Route130_Text_1C24DC, Route130_Text_1C2525 msgbox Route130_Text_1C256E, 6 end - diff --git a/data/scripts/maps/Route131.s b/data/scripts/maps/Route131.s index fb344f59b..d09ba2852 100644 --- a/data/scripts/maps/Route131.s +++ b/data/scripts/maps/Route131.s @@ -40,4 +40,3 @@ Route131_EventScript_1524C9:: @ 81524C9 trainerbattle 4, 686, 0, Route131_Text_1C29F3, Route131_Text_1C2A20, Route131_Text_1C2ACA msgbox Route131_Text_1C2A5D, 6 end - diff --git a/data/scripts/maps/Route132.s b/data/scripts/maps/Route132.s index bdeaad51e..9922c8dfa 100644 --- a/data/scripts/maps/Route132.s +++ b/data/scripts/maps/Route132.s @@ -20,4 +20,3 @@ Route132_EventScript_15252A:: @ 815252A trainerbattle 0, 181, 0, Route132_Text_1C2CD9, Route132_Text_1C2D1F msgbox Route132_Text_1C2D3E, 6 end - diff --git a/data/scripts/maps/Route133.s b/data/scripts/maps/Route133.s index 16d937782..5840c9b2c 100644 --- a/data/scripts/maps/Route133.s +++ b/data/scripts/maps/Route133.s @@ -25,4 +25,3 @@ Route133_EventScript_15259E:: @ 815259E trainerbattle 0, 414, 0, Route133_Text_1C302D, Route133_Text_1C305F msgbox Route133_Text_1C307E, 6 end - diff --git a/data/scripts/maps/Route134.s b/data/scripts/maps/Route134.s index f1f738f88..6c82dc7ac 100644 --- a/data/scripts/maps/Route134.s +++ b/data/scripts/maps/Route134.s @@ -30,4 +30,3 @@ Route134_EventScript_152620:: @ 8152620 trainerbattle 0, 180, 0, Route134_Text_1C3262, Route134_Text_1C329E msgbox Route134_Text_1C32D6, 6 end - diff --git a/data/scripts/maps/RustboroCity.s b/data/scripts/maps/RustboroCity.s index 9576c2ab7..c338e8b67 100644 --- a/data/scripts/maps/RustboroCity.s +++ b/data/scripts/maps/RustboroCity.s @@ -587,4 +587,3 @@ RustboroCity_EventScript_14C939:: @ 814C939 msgbox RustboroCity_Text_1672B8, 4 release end - diff --git a/data/scripts/maps/RustboroCity_CuttersHouse.s b/data/scripts/maps/RustboroCity_CuttersHouse.s index f75cc842f..d400de1ef 100644 --- a/data/scripts/maps/RustboroCity_CuttersHouse.s +++ b/data/scripts/maps/RustboroCity_CuttersHouse.s @@ -21,4 +21,3 @@ RustboroCity_CuttersHouse_EventScript_157D53:: @ 8157D53 RustboroCity_CuttersHouse_EventScript_157D5D:: @ 8157D5D msgbox RustboroCity_CuttersHouse_Text_1852B3, 2 end - diff --git a/data/scripts/maps/RustboroCity_DevonCorp_1F.s b/data/scripts/maps/RustboroCity_DevonCorp_1F.s index 3c55fb9bf..97a59257f 100644 --- a/data/scripts/maps/RustboroCity_DevonCorp_1F.s +++ b/data/scripts/maps/RustboroCity_DevonCorp_1F.s @@ -78,4 +78,3 @@ RustboroCity_DevonCorp_1F_EventScript_1574C0:: @ 81574C0 msgbox RustboroCity_DevonCorp_1F_Text_18295E, 4 release end - diff --git a/data/scripts/maps/RustboroCity_DevonCorp_2F.s b/data/scripts/maps/RustboroCity_DevonCorp_2F.s index cd05952fc..e35015b3e 100644 --- a/data/scripts/maps/RustboroCity_DevonCorp_2F.s +++ b/data/scripts/maps/RustboroCity_DevonCorp_2F.s @@ -175,4 +175,3 @@ RustboroCity_DevonCorp_2F_EventScript_157707:: @ 8157707 msgbox RustboroCity_DevonCorp_2F_Text_1831C8, 4 release end - diff --git a/data/scripts/maps/RustboroCity_DevonCorp_3F.s b/data/scripts/maps/RustboroCity_DevonCorp_3F.s index 5af0e2cf4..2b749c873 100644 --- a/data/scripts/maps/RustboroCity_DevonCorp_3F.s +++ b/data/scripts/maps/RustboroCity_DevonCorp_3F.s @@ -195,4 +195,3 @@ RustboroCity_DevonCorp_3F_EventScript_1578C5:: @ 81578C5 RustboroCity_DevonCorp_3F_EventScript_1578CF:: @ 81578CF msgbox RustboroCity_DevonCorp_3F_Text_183A04, 3 end - diff --git a/data/scripts/maps/RustboroCity_Flat1_1F.s b/data/scripts/maps/RustboroCity_Flat1_1F.s index d84d2ba4f..dbbdf22b7 100644 --- a/data/scripts/maps/RustboroCity_Flat1_1F.s +++ b/data/scripts/maps/RustboroCity_Flat1_1F.s @@ -8,4 +8,3 @@ RustboroCity_Flat1_1F_EventScript_157C60:: @ 8157C60 RustboroCity_Flat1_1F_EventScript_157C69:: @ 8157C69 msgbox RustboroCity_Flat1_1F_Text_184DE9, 2 end - diff --git a/data/scripts/maps/RustboroCity_Flat1_2F.s b/data/scripts/maps/RustboroCity_Flat1_2F.s index a682f160a..53672bb42 100644 --- a/data/scripts/maps/RustboroCity_Flat1_2F.s +++ b/data/scripts/maps/RustboroCity_Flat1_2F.s @@ -4,4 +4,3 @@ RustboroCity_Flat1_2F_MapScripts:: @ 8157C72 RustboroCity_Flat1_2F_EventScript_157C73:: @ 8157C73 msgbox RustboroCity_Flat1_2F_Text_184E0D, 2 end - diff --git a/data/scripts/maps/RustboroCity_Flat2_1F.s b/data/scripts/maps/RustboroCity_Flat2_1F.s index 088a6b16f..5aa91d5d1 100644 --- a/data/scripts/maps/RustboroCity_Flat2_1F.s +++ b/data/scripts/maps/RustboroCity_Flat2_1F.s @@ -14,4 +14,3 @@ RustboroCity_Flat2_1F_EventScript_157D83:: @ 8157D83 waitpokecry release end - diff --git a/data/scripts/maps/RustboroCity_Flat2_2F.s b/data/scripts/maps/RustboroCity_Flat2_2F.s index bd8b0c9b7..d6e0c92b3 100644 --- a/data/scripts/maps/RustboroCity_Flat2_2F.s +++ b/data/scripts/maps/RustboroCity_Flat2_2F.s @@ -22,4 +22,3 @@ RustboroCity_Flat2_2F_EventScript_157DCF:: @ 8157DCF msgbox RustboroCity_Flat2_2F_Text_1854C4, 4 release end - diff --git a/data/scripts/maps/RustboroCity_Flat2_3F.s b/data/scripts/maps/RustboroCity_Flat2_3F.s index 919609205..d3b05b5bf 100644 --- a/data/scripts/maps/RustboroCity_Flat2_3F.s +++ b/data/scripts/maps/RustboroCity_Flat2_3F.s @@ -8,4 +8,3 @@ RustboroCity_Flat2_3F_EventScript_157DDA:: @ 8157DDA RustboroCity_Flat2_3F_EventScript_157DE3:: @ 8157DE3 msgbox RustboroCity_Flat2_3F_Text_18554D, 2 end - diff --git a/data/scripts/maps/RustboroCity_Gym.s b/data/scripts/maps/RustboroCity_Gym.s index 0bf68a616..4d4a3d87d 100644 --- a/data/scripts/maps/RustboroCity_Gym.s +++ b/data/scripts/maps/RustboroCity_Gym.s @@ -81,4 +81,3 @@ RustboroCity_Gym_EventScript_1579D7:: @ 81579D7 msgbox RustboroCity_Gym_Text_1842CC, 4 releaseall end - diff --git a/data/scripts/maps/RustboroCity_House1.s b/data/scripts/maps/RustboroCity_House1.s index 1eff4001e..a10d7b69e 100644 --- a/data/scripts/maps/RustboroCity_House1.s +++ b/data/scripts/maps/RustboroCity_House1.s @@ -52,4 +52,3 @@ RustboroCity_House1_EventScript_157D13:: @ 8157D13 RustboroCity_House1_EventScript_157D1D:: @ 8157D1D msgbox RustboroCity_House1_Text_185020, 2 end - diff --git a/data/scripts/maps/RustboroCity_House2.s b/data/scripts/maps/RustboroCity_House2.s index 66eeedf9b..b448065f4 100644 --- a/data/scripts/maps/RustboroCity_House2.s +++ b/data/scripts/maps/RustboroCity_House2.s @@ -8,4 +8,3 @@ RustboroCity_House2_EventScript_157D67:: @ 8157D67 RustboroCity_House2_EventScript_157D70:: @ 8157D70 msgbox RustboroCity_House2_Text_185388, 2 end - diff --git a/data/scripts/maps/RustboroCity_House3.s b/data/scripts/maps/RustboroCity_House3.s index 60978400e..0e81ed158 100644 --- a/data/scripts/maps/RustboroCity_House3.s +++ b/data/scripts/maps/RustboroCity_House3.s @@ -18,4 +18,3 @@ RustboroCity_House3_EventScript_157DFF:: @ 8157DFF waitpokecry release end - diff --git a/data/scripts/maps/RustboroCity_Mart.s b/data/scripts/maps/RustboroCity_Mart.s index 39b4de4e8..6b4ff3a77 100644 --- a/data/scripts/maps/RustboroCity_Mart.s +++ b/data/scripts/maps/RustboroCity_Mart.s @@ -69,4 +69,3 @@ RustboroCity_Mart_EventScript_157C4D:: @ 8157C4D RustboroCity_Mart_EventScript_157C56:: @ 8157C56 msgbox RustboroCity_Mart_Text_184D43, 2 end - diff --git a/data/scripts/maps/RustboroCity_PokemonCenter_1F.s b/data/scripts/maps/RustboroCity_PokemonCenter_1F.s index 488c97722..896e8e220 100644 --- a/data/scripts/maps/RustboroCity_PokemonCenter_1F.s +++ b/data/scripts/maps/RustboroCity_PokemonCenter_1F.s @@ -26,4 +26,3 @@ RustboroCity_PokemonCenter_1F_EventScript_157B9F:: @ 8157B9F RustboroCity_PokemonCenter_1F_EventScript_157BA8:: @ 8157BA8 msgbox RustboroCity_PokemonCenter_1F_Text_184C19, 2 end - diff --git a/data/scripts/maps/RustboroCity_PokemonCenter_2F.s b/data/scripts/maps/RustboroCity_PokemonCenter_2F.s index 6f983d651..d0ffc5435 100644 --- a/data/scripts/maps/RustboroCity_PokemonCenter_2F.s +++ b/data/scripts/maps/RustboroCity_PokemonCenter_2F.s @@ -15,4 +15,3 @@ RustboroCity_PokemonCenter_2F_EventScript_157BC7:: @ 8157BC7 RustboroCity_PokemonCenter_2F_EventScript_157BCD:: @ 8157BCD call RustboroCity_PokemonCenter_2F_EventScript_1A41FB end - diff --git a/data/scripts/maps/RustboroCity_PokemonSchool.s b/data/scripts/maps/RustboroCity_PokemonSchool.s index af475848f..8b037a3e7 100644 --- a/data/scripts/maps/RustboroCity_PokemonSchool.s +++ b/data/scripts/maps/RustboroCity_PokemonSchool.s @@ -163,4 +163,3 @@ RustboroCity_PokemonSchool_Movement_157B60:: @ 8157B60 step_left step_left step_end - diff --git a/data/scripts/maps/RusturfTunnel.s b/data/scripts/maps/RusturfTunnel.s index 9922489cf..bba1933b8 100644 --- a/data/scripts/maps/RusturfTunnel.s +++ b/data/scripts/maps/RusturfTunnel.s @@ -419,4 +419,3 @@ RusturfTunnel_EventScript_15CACD:: @ 815CACD trainerbattle 0, 635, 0, RusturfTunnel_Text_194814, RusturfTunnel_Text_1948A2 msgbox RusturfTunnel_Text_1948C4, 6 end - diff --git a/data/scripts/maps/SSTidalLowerDeck.s b/data/scripts/maps/SSTidalLowerDeck.s index f3dc6f0a0..8911f5802 100644 --- a/data/scripts/maps/SSTidalLowerDeck.s +++ b/data/scripts/maps/SSTidalLowerDeck.s @@ -10,4 +10,3 @@ SSTidalLowerDeck_EventScript_15FEEE:: @ 815FEEE trainerbattle 0, 495, 0, SSTidalLowerDeck_Text_199491, SSTidalLowerDeck_Text_1994F7 msgbox SSTidalLowerDeck_Text_199508, 6 end - diff --git a/data/scripts/maps/SSTidalRooms.s b/data/scripts/maps/SSTidalRooms.s index 860b00a47..7de0557a1 100644 --- a/data/scripts/maps/SSTidalRooms.s +++ b/data/scripts/maps/SSTidalRooms.s @@ -63,4 +63,3 @@ SSTidalRooms_EventScript_15FFEF:: @ 815FFEF trainerbattle 0, 119, 0, SSTidalRooms_Text_199A62, SSTidalRooms_Text_199ABF msgbox SSTidalRooms_Text_199ADE, 6 end - diff --git a/data/scripts/maps/SafariZone_Northeast.s b/data/scripts/maps/SafariZone_Northeast.s index bb301e4fa..11e14da0f 100644 --- a/data/scripts/maps/SafariZone_Northeast.s +++ b/data/scripts/maps/SafariZone_Northeast.s @@ -8,4 +8,3 @@ SafariZone_Northeast_EventScript_160011:: @ 8160011 SafariZone_Northeast_EventScript_16001A:: @ 816001A msgbox SafariZone_Northeast_Text_1C3D80, 2 end - diff --git a/data/scripts/maps/SafariZone_Northwest.s b/data/scripts/maps/SafariZone_Northwest.s index 4f30ad378..f17b7078d 100644 --- a/data/scripts/maps/SafariZone_Northwest.s +++ b/data/scripts/maps/SafariZone_Northwest.s @@ -4,4 +4,3 @@ SafariZone_Northwest_MapScripts:: @ 8160006 SafariZone_Northwest_EventScript_160007:: @ 8160007 msgbox SafariZone_Northwest_Text_1C3CAE, 2 end - diff --git a/data/scripts/maps/SafariZone_RestHouse.s b/data/scripts/maps/SafariZone_RestHouse.s index ace6e6473..edaee1580 100644 --- a/data/scripts/maps/SafariZone_RestHouse.s +++ b/data/scripts/maps/SafariZone_RestHouse.s @@ -12,4 +12,3 @@ SafariZone_RestHouse_EventScript_160C38:: @ 8160C38 SafariZone_RestHouse_EventScript_160C41:: @ 8160C41 msgbox SafariZone_RestHouse_Text_1C3FF4, 2 end - diff --git a/data/scripts/maps/SafariZone_Southeast.s b/data/scripts/maps/SafariZone_Southeast.s index 38fa96053..196efbb35 100644 --- a/data/scripts/maps/SafariZone_Southeast.s +++ b/data/scripts/maps/SafariZone_Southeast.s @@ -116,4 +116,3 @@ SafariZone_Southeast_Movement_160153:: @ 8160153 step_down step_26 step_end - diff --git a/data/scripts/maps/SafariZone_Southwest.s b/data/scripts/maps/SafariZone_Southwest.s index 158b8720f..51bffeeab 100644 --- a/data/scripts/maps/SafariZone_Southwest.s +++ b/data/scripts/maps/SafariZone_Southwest.s @@ -8,4 +8,3 @@ SafariZone_Southwest_EventScript_160024:: @ 8160024 SafariZone_Southwest_EventScript_16002D:: @ 816002D msgbox SafariZone_Southwest_Text_1C3EA3, 3 end - diff --git a/data/scripts/maps/ScorchedSlab.s b/data/scripts/maps/ScorchedSlab.s index bf5074e95..112289083 100644 --- a/data/scripts/maps/ScorchedSlab.s +++ b/data/scripts/maps/ScorchedSlab.s @@ -5,4 +5,3 @@ ScorchedSlab_MapScripts:: @ 815F29D ScorchedSlab_MapScript1_15F2A3:: @ 815F2A3 setflag 2136 end - diff --git a/data/scripts/maps/SeafloorCavern_Entrance.s b/data/scripts/maps/SeafloorCavern_Entrance.s index 5f2788cf9..0bf99d2ad 100644 --- a/data/scripts/maps/SeafloorCavern_Entrance.s +++ b/data/scripts/maps/SeafloorCavern_Entrance.s @@ -6,4 +6,3 @@ SeafloorCavern_Entrance_MapScript1_15DA50:: @ 815DA50 warp4 Underwater_SeafloorCavern, 255, 6, 5 warp6 Underwater_SeafloorCavern, 255, 6, 5 end - diff --git a/data/scripts/maps/SeafloorCavern_Room1.s b/data/scripts/maps/SeafloorCavern_Room1.s index 4cc0ea0cd..cd1513ec1 100644 --- a/data/scripts/maps/SeafloorCavern_Room1.s +++ b/data/scripts/maps/SeafloorCavern_Room1.s @@ -15,4 +15,3 @@ SeafloorCavern_Room1_EventScript_15DA84:: @ 815DA84 trainerbattle 0, TRAINER_SEAFLOOR_CAVERN_GRUNT_2, 0, SeafloorCavern_Room1_Text_19753C, SeafloorCavern_Room1_Text_197573 msgbox SeafloorCavern_Room1_Text_197589, 6 end - diff --git a/data/scripts/maps/SeafloorCavern_Room2.s b/data/scripts/maps/SeafloorCavern_Room2.s index cc53a220a..b4507c8b9 100644 --- a/data/scripts/maps/SeafloorCavern_Room2.s +++ b/data/scripts/maps/SeafloorCavern_Room2.s @@ -1,3 +1,2 @@ SeafloorCavern_Room2_MapScripts:: @ 815DA9B .byte 0 - diff --git a/data/scripts/maps/SeafloorCavern_Room3.s b/data/scripts/maps/SeafloorCavern_Room3.s index 6d836adc7..57f2bc20a 100644 --- a/data/scripts/maps/SeafloorCavern_Room3.s +++ b/data/scripts/maps/SeafloorCavern_Room3.s @@ -10,4 +10,3 @@ SeafloorCavern_Room3_EventScript_15DAA8:: @ 815DAA8 trainerbattle 0, TRAINER_SEAFLOOR_CAVERN_GRUNT_3, 0, SeafloorCavern_Room3_Text_1975DC, SeafloorCavern_Room3_Text_1976F3 msgbox SeafloorCavern_Room3_Text_197704, 6 end - diff --git a/data/scripts/maps/SeafloorCavern_Room4.s b/data/scripts/maps/SeafloorCavern_Room4.s index 1e79317c7..8f53d948c 100644 --- a/data/scripts/maps/SeafloorCavern_Room4.s +++ b/data/scripts/maps/SeafloorCavern_Room4.s @@ -10,4 +10,3 @@ SeafloorCavern_Room4_EventScript_15DACB:: @ 815DACB trainerbattle 0, TRAINER_SEAFLOOR_CAVERN_GRUNT_4, 0, SeafloorCavern_Room4_Text_1977B9, SeafloorCavern_Room4_Text_1977E2 msgbox SeafloorCavern_Room4_Text_1977ED, 6 end - diff --git a/data/scripts/maps/SeafloorCavern_Room5.s b/data/scripts/maps/SeafloorCavern_Room5.s index 0bccaf57d..79b65c2e6 100644 --- a/data/scripts/maps/SeafloorCavern_Room5.s +++ b/data/scripts/maps/SeafloorCavern_Room5.s @@ -1,3 +1,2 @@ SeafloorCavern_Room5_MapScripts:: @ 815DAE2 .byte 0 - diff --git a/data/scripts/maps/SeafloorCavern_Room6.s b/data/scripts/maps/SeafloorCavern_Room6.s index c765f7715..3ebeae07f 100644 --- a/data/scripts/maps/SeafloorCavern_Room6.s +++ b/data/scripts/maps/SeafloorCavern_Room6.s @@ -1,3 +1,2 @@ SeafloorCavern_Room6_MapScripts:: @ 815DAE3 .byte 0 - diff --git a/data/scripts/maps/SeafloorCavern_Room7.s b/data/scripts/maps/SeafloorCavern_Room7.s index b0a2e1cd3..acad96ad0 100644 --- a/data/scripts/maps/SeafloorCavern_Room7.s +++ b/data/scripts/maps/SeafloorCavern_Room7.s @@ -1,3 +1,2 @@ SeafloorCavern_Room7_MapScripts:: @ 815DAE4 .byte 0 - diff --git a/data/scripts/maps/SeafloorCavern_Room8.s b/data/scripts/maps/SeafloorCavern_Room8.s index 48858c411..117f9e6b5 100644 --- a/data/scripts/maps/SeafloorCavern_Room8.s +++ b/data/scripts/maps/SeafloorCavern_Room8.s @@ -1,3 +1,2 @@ SeafloorCavern_Room8_MapScripts:: @ 815DAE5 .byte 0 - diff --git a/data/scripts/maps/SeafloorCavern_Room9.s b/data/scripts/maps/SeafloorCavern_Room9.s index f6827d059..31672110d 100644 --- a/data/scripts/maps/SeafloorCavern_Room9.s +++ b/data/scripts/maps/SeafloorCavern_Room9.s @@ -289,4 +289,3 @@ SeafloorCavern_Room9_Movement_15DD68:: @ 815DD68 step_14 step_14 step_end - diff --git a/data/scripts/maps/SealedChamber_InnerRoom.s b/data/scripts/maps/SealedChamber_InnerRoom.s index 42a6bfce7..16d4c7003 100644 --- a/data/scripts/maps/SealedChamber_InnerRoom.s +++ b/data/scripts/maps/SealedChamber_InnerRoom.s @@ -86,4 +86,3 @@ SealedChamber_InnerRoom_EventScript_15F28F:: @ 815F28F hidebox 0, 0, 29, 19 releaseall end - diff --git a/data/scripts/maps/SealedChamber_OuterRoom.s b/data/scripts/maps/SealedChamber_OuterRoom.s index ed7a5b6bd..83ca4e4df 100644 --- a/data/scripts/maps/SealedChamber_OuterRoom.s +++ b/data/scripts/maps/SealedChamber_OuterRoom.s @@ -129,4 +129,3 @@ SealedChamber_OuterRoom_EventScript_15F1D9:: @ 815F1D9 hidebox 0, 0, 29, 19 releaseall end - diff --git a/data/scripts/maps/SecretBase_YellowCave4.s b/data/scripts/maps/SecretBase_YellowCave4.s index 7f6ba9644..4ccbc2f0e 100644 --- a/data/scripts/maps/SecretBase_YellowCave4.s +++ b/data/scripts/maps/SecretBase_YellowCave4.s @@ -21,4 +21,3 @@ SecretBase_RedCave1_MapScript2_15F358:: @ 815F358 SecretBase_RedCave1_MapScript2_15F362:: @ 815F362 map_script_2 0x4097, 0, SecretBase_RedCave1_EventScript_1A2DDE .2byte 0 - diff --git a/data/scripts/maps/ShoalCave_HighTideEntranceRoom.s b/data/scripts/maps/ShoalCave_HighTideEntranceRoom.s index 7e9c3cea2..ae1f2c279 100644 --- a/data/scripts/maps/ShoalCave_HighTideEntranceRoom.s +++ b/data/scripts/maps/ShoalCave_HighTideEntranceRoom.s @@ -1,3 +1,2 @@ ShoalCave_HighTideEntranceRoom_MapScripts:: @ 815E488 .byte 0 - diff --git a/data/scripts/maps/ShoalCave_HighTideInnerRoom.s b/data/scripts/maps/ShoalCave_HighTideInnerRoom.s index ed506a50e..9b47c97e7 100644 --- a/data/scripts/maps/ShoalCave_HighTideInnerRoom.s +++ b/data/scripts/maps/ShoalCave_HighTideInnerRoom.s @@ -1,3 +1,2 @@ ShoalCave_HighTideInnerRoom_MapScripts:: @ 815E489 .byte 0 - diff --git a/data/scripts/maps/ShoalCave_LowTideEntranceRoom.s b/data/scripts/maps/ShoalCave_LowTideEntranceRoom.s index f44c79dfe..9b822a473 100644 --- a/data/scripts/maps/ShoalCave_LowTideEntranceRoom.s +++ b/data/scripts/maps/ShoalCave_LowTideEntranceRoom.s @@ -100,4 +100,3 @@ ShoalCave_LowTideEntranceRoom_EventScript_15E176:: @ 815E176 clearflag 959 clearflag 2143 return - diff --git a/data/scripts/maps/ShoalCave_LowTideIceRoom.s b/data/scripts/maps/ShoalCave_LowTideIceRoom.s index 1290d6efd..311ff2126 100644 --- a/data/scripts/maps/ShoalCave_LowTideIceRoom.s +++ b/data/scripts/maps/ShoalCave_LowTideIceRoom.s @@ -1,3 +1,2 @@ ShoalCave_LowTideIceRoom_MapScripts:: @ 815F300 .byte 0 - diff --git a/data/scripts/maps/ShoalCave_LowTideInnerRoom.s b/data/scripts/maps/ShoalCave_LowTideInnerRoom.s index d00193e42..eab522a1f 100644 --- a/data/scripts/maps/ShoalCave_LowTideInnerRoom.s +++ b/data/scripts/maps/ShoalCave_LowTideInnerRoom.s @@ -155,4 +155,3 @@ ShoalCave_LowTideInnerRoom_EventScript_15E365:: @ 815E365 setflag 953 releaseall end - diff --git a/data/scripts/maps/ShoalCave_LowTideLowerRoom.s b/data/scripts/maps/ShoalCave_LowTideLowerRoom.s index 4ffed780e..dfcd5b83f 100644 --- a/data/scripts/maps/ShoalCave_LowTideLowerRoom.s +++ b/data/scripts/maps/ShoalCave_LowTideLowerRoom.s @@ -50,4 +50,3 @@ ShoalCave_LowTideLowerRoom_EventScript_15E47E:: @ 815E47E msgbox ShoalCave_LowTideLowerRoom_Text_1982A2, 4 release end - diff --git a/data/scripts/maps/ShoalCave_LowTideStairsRoom.s b/data/scripts/maps/ShoalCave_LowTideStairsRoom.s index bf660eaa4..584a57818 100644 --- a/data/scripts/maps/ShoalCave_LowTideStairsRoom.s +++ b/data/scripts/maps/ShoalCave_LowTideStairsRoom.s @@ -32,4 +32,3 @@ ShoalCave_LowTideStairsRoom_EventScript_15E3E9:: @ 815E3E9 msgbox ShoalCave_LowTideStairsRoom_Text_1C6979, 4 releaseall end - diff --git a/data/scripts/maps/SingleBattleColosseum.s b/data/scripts/maps/SingleBattleColosseum.s index 270e4b670..d3f2bdcaf 100644 --- a/data/scripts/maps/SingleBattleColosseum.s +++ b/data/scripts/maps/SingleBattleColosseum.s @@ -1,3 +1,2 @@ SingleBattleColosseum_MapScripts:: @ 815F57C .byte 0 - diff --git a/data/scripts/maps/SkyPillar_1F.s b/data/scripts/maps/SkyPillar_1F.s index 6afcecf08..aa6c117da 100644 --- a/data/scripts/maps/SkyPillar_1F.s +++ b/data/scripts/maps/SkyPillar_1F.s @@ -1,3 +1,2 @@ SkyPillar_1F_MapScripts:: @ 815F2C8 .byte 0 - diff --git a/data/scripts/maps/SkyPillar_2F.s b/data/scripts/maps/SkyPillar_2F.s index 7a473a795..62cb389f2 100644 --- a/data/scripts/maps/SkyPillar_2F.s +++ b/data/scripts/maps/SkyPillar_2F.s @@ -8,4 +8,3 @@ SkyPillar_2F_MapScript1_15F2D9:: @ 815F2D9 tileeffect 7 warp5 SkyPillar_1F, 255, 0, 0 end - diff --git a/data/scripts/maps/SkyPillar_3F.s b/data/scripts/maps/SkyPillar_3F.s index 6b0afa4d0..2dc97fc9c 100644 --- a/data/scripts/maps/SkyPillar_3F.s +++ b/data/scripts/maps/SkyPillar_3F.s @@ -1,3 +1,2 @@ SkyPillar_3F_MapScripts:: @ 815F2E4 .byte 0 - diff --git a/data/scripts/maps/SkyPillar_4F.s b/data/scripts/maps/SkyPillar_4F.s index 22128480c..5e1f7f4e6 100644 --- a/data/scripts/maps/SkyPillar_4F.s +++ b/data/scripts/maps/SkyPillar_4F.s @@ -8,4 +8,3 @@ SkyPillar_4F_MapScript1_15F2F5:: @ 815F2F5 tileeffect 7 warp5 SkyPillar_3F, 255, 0, 0 end - diff --git a/data/scripts/maps/SkyPillar_5F.s b/data/scripts/maps/SkyPillar_5F.s index cf0e60ecb..64e6d0f38 100644 --- a/data/scripts/maps/SkyPillar_5F.s +++ b/data/scripts/maps/SkyPillar_5F.s @@ -1,3 +1,2 @@ SkyPillar_5F_MapScripts:: @ 815F301 .byte 0 - diff --git a/data/scripts/maps/SkyPillar_Entrance.s b/data/scripts/maps/SkyPillar_Entrance.s index 09eb538c9..7a3927332 100644 --- a/data/scripts/maps/SkyPillar_Entrance.s +++ b/data/scripts/maps/SkyPillar_Entrance.s @@ -5,4 +5,3 @@ SkyPillar_Entrance_MapScripts:: @ 815F2BD SkyPillar_Entrance_MapScript1_15F2C3:: @ 815F2C3 setflag 2142 end - diff --git a/data/scripts/maps/SkyPillar_Outside.s b/data/scripts/maps/SkyPillar_Outside.s index 338593de7..51e6a4e83 100644 --- a/data/scripts/maps/SkyPillar_Outside.s +++ b/data/scripts/maps/SkyPillar_Outside.s @@ -1,3 +1,2 @@ SkyPillar_Outside_MapScripts:: @ 815F2C7 .byte 0 - diff --git a/data/scripts/maps/SkyPillar_Top.s b/data/scripts/maps/SkyPillar_Top.s index 970725bf8..b28d89d93 100644 --- a/data/scripts/maps/SkyPillar_Top.s +++ b/data/scripts/maps/SkyPillar_Top.s @@ -26,4 +26,3 @@ SkyPillar_Top_EventScript_15F316:: @ 815F316 clearflag 2145 release end - diff --git a/data/scripts/maps/SlateportCity.s b/data/scripts/maps/SlateportCity.s index 84dae5dfc..d89490b14 100644 --- a/data/scripts/maps/SlateportCity.s +++ b/data/scripts/maps/SlateportCity.s @@ -646,4 +646,3 @@ SlateportCity_EventScript_14C020:: @ 814C020 SlateportCity_EventScript_14C029:: @ 814C029 msgbox SlateportCity_Text_1647A7, 2 end - diff --git a/data/scripts/maps/SlateportCity_ContestHall.s b/data/scripts/maps/SlateportCity_ContestHall.s index 2e33c1ec5..559719583 100644 --- a/data/scripts/maps/SlateportCity_ContestHall.s +++ b/data/scripts/maps/SlateportCity_ContestHall.s @@ -111,4 +111,3 @@ SlateportCity_ContestHall_EventScript_15565C:: @ 815565C SlateportCity_ContestHall_EventScript_155671:: @ 8155671 msgbox SlateportCity_ContestHall_Text_17D447, 3 end - diff --git a/data/scripts/maps/SlateportCity_Harbor.s b/data/scripts/maps/SlateportCity_Harbor.s index 241b48a16..d65d28877 100644 --- a/data/scripts/maps/SlateportCity_Harbor.s +++ b/data/scripts/maps/SlateportCity_Harbor.s @@ -373,4 +373,3 @@ SlateportCity_Harbor_EventScript_156380:: @ 8156380 msgbox SlateportCity_Harbor_Text_180491, 4 release end - diff --git a/data/scripts/maps/SlateportCity_House1.s b/data/scripts/maps/SlateportCity_House1.s index bde33129c..936d520dd 100644 --- a/data/scripts/maps/SlateportCity_House1.s +++ b/data/scripts/maps/SlateportCity_House1.s @@ -70,4 +70,3 @@ SlateportCity_House1_EventScript_15575A:: @ 815575A msgbox SlateportCity_House1_Text_17D5B0, 4 release end - diff --git a/data/scripts/maps/SlateportCity_House2.s b/data/scripts/maps/SlateportCity_House2.s index 87581ceaf..2d50f0851 100644 --- a/data/scripts/maps/SlateportCity_House2.s +++ b/data/scripts/maps/SlateportCity_House2.s @@ -19,4 +19,3 @@ SlateportCity_House2_EventScript_1563B5:: @ 81563B5 msgbox SlateportCity_House2_Text_1805CD, 4 release end - diff --git a/data/scripts/maps/SlateportCity_Mart.s b/data/scripts/maps/SlateportCity_Mart.s index 2374fa2d3..730afe6d4 100644 --- a/data/scripts/maps/SlateportCity_Mart.s +++ b/data/scripts/maps/SlateportCity_Mart.s @@ -33,4 +33,3 @@ SlateportCity_Mart_EventScript_15643E:: @ 815643E SlateportCity_Mart_EventScript_156447:: @ 8156447 msgbox SlateportCity_Mart_Text_18079D, 2 end - diff --git a/data/scripts/maps/SlateportCity_OceanicMuseum_1F.s b/data/scripts/maps/SlateportCity_OceanicMuseum_1F.s index 0646a9d95..0bfeb4f5a 100644 --- a/data/scripts/maps/SlateportCity_OceanicMuseum_1F.s +++ b/data/scripts/maps/SlateportCity_OceanicMuseum_1F.s @@ -216,4 +216,3 @@ SlateportCity_OceanicMuseum_1F_Movement_155CD3:: @ 8155CD3 step_15 step_13 step_end - diff --git a/data/scripts/maps/SlateportCity_OceanicMuseum_2F.s b/data/scripts/maps/SlateportCity_OceanicMuseum_2F.s index c9f5675d5..0a88d83e6 100644 --- a/data/scripts/maps/SlateportCity_OceanicMuseum_2F.s +++ b/data/scripts/maps/SlateportCity_OceanicMuseum_2F.s @@ -270,4 +270,3 @@ SlateportCity_OceanicMuseum_2F_EventScript_155F46:: @ 8155F46 waitmove 0 release end - diff --git a/data/scripts/maps/SlateportCity_PokemonCenter_1F.s b/data/scripts/maps/SlateportCity_PokemonCenter_1F.s index a8ef51f52..c550a6850 100644 --- a/data/scripts/maps/SlateportCity_PokemonCenter_1F.s +++ b/data/scripts/maps/SlateportCity_PokemonCenter_1F.s @@ -22,4 +22,3 @@ SlateportCity_PokemonCenter_1F_EventScript_1563DC:: @ 81563DC SlateportCity_PokemonCenter_1F_EventScript_1563E5:: @ 81563E5 msgbox SlateportCity_PokemonCenter_1F_Text_1806CB, 2 end - diff --git a/data/scripts/maps/SlateportCity_PokemonCenter_2F.s b/data/scripts/maps/SlateportCity_PokemonCenter_2F.s index 1f5216d11..98782b24d 100644 --- a/data/scripts/maps/SlateportCity_PokemonCenter_2F.s +++ b/data/scripts/maps/SlateportCity_PokemonCenter_2F.s @@ -15,4 +15,3 @@ SlateportCity_PokemonCenter_2F_EventScript_156404:: @ 8156404 SlateportCity_PokemonCenter_2F_EventScript_15640A:: @ 815640A call SlateportCity_PokemonCenter_2F_EventScript_1A41FB end - diff --git a/data/scripts/maps/SlateportCity_PokemonFanClub.s b/data/scripts/maps/SlateportCity_PokemonFanClub.s index ecaf833e8..8f0323f77 100644 --- a/data/scripts/maps/SlateportCity_PokemonFanClub.s +++ b/data/scripts/maps/SlateportCity_PokemonFanClub.s @@ -261,4 +261,3 @@ SlateportCity_PokemonFanClub_EventScript_155AB7:: @ 8155AB7 waitpokecry release end - diff --git a/data/scripts/maps/SlateportCity_SternsShipyard_1F.s b/data/scripts/maps/SlateportCity_SternsShipyard_1F.s index 64c81d3c4..4c0596d29 100644 --- a/data/scripts/maps/SlateportCity_SternsShipyard_1F.s +++ b/data/scripts/maps/SlateportCity_SternsShipyard_1F.s @@ -65,4 +65,3 @@ SlateportCity_SternsShipyard_1F_EventScript_1553EC:: @ 81553EC SlateportCity_SternsShipyard_1F_EventScript_1553F5:: @ 81553F5 msgbox SlateportCity_SternsShipyard_1F_Text_17C53D, 2 end - diff --git a/data/scripts/maps/SlateportCity_SternsShipyard_2F.s b/data/scripts/maps/SlateportCity_SternsShipyard_2F.s index 069b5c9f8..df9227dd3 100644 --- a/data/scripts/maps/SlateportCity_SternsShipyard_2F.s +++ b/data/scripts/maps/SlateportCity_SternsShipyard_2F.s @@ -8,4 +8,3 @@ SlateportCity_SternsShipyard_2F_EventScript_1553FF:: @ 81553FF SlateportCity_SternsShipyard_2F_EventScript_155408:: @ 8155408 msgbox SlateportCity_SternsShipyard_2F_Text_17C80C, 2 end - diff --git a/data/scripts/maps/SootopolisCity_Gym_1F.s b/data/scripts/maps/SootopolisCity_Gym_1F.s index fa52b4da3..7328302b2 100644 --- a/data/scripts/maps/SootopolisCity_Gym_1F.s +++ b/data/scripts/maps/SootopolisCity_Gym_1F.s @@ -158,4 +158,3 @@ SootopolisCity_Gym_1F_EventScript_15B0CD:: @ 815B0CD msgbox SootopolisCity_Gym_1F_Text_18F649, 4 releaseall end - diff --git a/data/scripts/maps/SootopolisCity_Gym_B1F.s b/data/scripts/maps/SootopolisCity_Gym_B1F.s index 21bbc1558..9c17d617a 100644 --- a/data/scripts/maps/SootopolisCity_Gym_B1F.s +++ b/data/scripts/maps/SootopolisCity_Gym_B1F.s @@ -40,4 +40,3 @@ SootopolisCity_Gym_B1F_EventScript_15B179:: @ 815B179 trainerbattle 0, 301, 0, SootopolisCity_Gym_B1F_Text_18F037, SootopolisCity_Gym_B1F_Text_18F07F msgbox SootopolisCity_Gym_B1F_Text_18F085, 6 end - diff --git a/data/scripts/maps/SootopolisCity_House1.s b/data/scripts/maps/SootopolisCity_House1.s index a2243206c..604f04c4f 100644 --- a/data/scripts/maps/SootopolisCity_House1.s +++ b/data/scripts/maps/SootopolisCity_House1.s @@ -27,4 +27,3 @@ SootopolisCity_House1_EventScript_15B2D1:: @ 815B2D1 waitpokecry release end - diff --git a/data/scripts/maps/SootopolisCity_House2.s b/data/scripts/maps/SootopolisCity_House2.s index cb99f1004..409a871a8 100644 --- a/data/scripts/maps/SootopolisCity_House2.s +++ b/data/scripts/maps/SootopolisCity_House2.s @@ -19,4 +19,3 @@ SootopolisCity_House2_EventScript_15B307:: @ 815B307 SootopolisCity_House2_EventScript_15B310:: @ 815B310 msgbox SootopolisCity_House2_Text_18FB04, 4 return - diff --git a/data/scripts/maps/SootopolisCity_House3.s b/data/scripts/maps/SootopolisCity_House3.s index 7ebfa3787..88e35730e 100644 --- a/data/scripts/maps/SootopolisCity_House3.s +++ b/data/scripts/maps/SootopolisCity_House3.s @@ -19,4 +19,3 @@ SootopolisCity_House3_EventScript_15B339:: @ 815B339 SootopolisCity_House3_EventScript_15B343:: @ 815B343 msgbox SootopolisCity_House3_Text_18FC1A, 2 end - diff --git a/data/scripts/maps/SootopolisCity_House4.s b/data/scripts/maps/SootopolisCity_House4.s index f8fdd8b4b..ee3bfe61b 100644 --- a/data/scripts/maps/SootopolisCity_House4.s +++ b/data/scripts/maps/SootopolisCity_House4.s @@ -18,4 +18,3 @@ SootopolisCity_House4_EventScript_15B35F:: @ 815B35F waitpokecry release end - diff --git a/data/scripts/maps/SootopolisCity_House5.s b/data/scripts/maps/SootopolisCity_House5.s index b42855160..26e5c7d5c 100644 --- a/data/scripts/maps/SootopolisCity_House5.s +++ b/data/scripts/maps/SootopolisCity_House5.s @@ -8,4 +8,3 @@ SootopolisCity_House5_EventScript_15B373:: @ 815B373 SootopolisCity_House5_EventScript_15B37C:: @ 815B37C msgbox SootopolisCity_House5_Text_18FE7B, 2 end - diff --git a/data/scripts/maps/SootopolisCity_House6.s b/data/scripts/maps/SootopolisCity_House6.s index 429d0c438..cccfa78ee 100644 --- a/data/scripts/maps/SootopolisCity_House6.s +++ b/data/scripts/maps/SootopolisCity_House6.s @@ -33,4 +33,3 @@ SootopolisCity_House6_EventScript_15B3D7:: @ 815B3D7 msgbox SootopolisCity_House6_Text_18FF28, 4 release end - diff --git a/data/scripts/maps/SootopolisCity_House7.s b/data/scripts/maps/SootopolisCity_House7.s index 889f8993d..a9b06b176 100644 --- a/data/scripts/maps/SootopolisCity_House7.s +++ b/data/scripts/maps/SootopolisCity_House7.s @@ -8,4 +8,3 @@ SootopolisCity_House7_EventScript_15B3EE:: @ 815B3EE SootopolisCity_House7_EventScript_15B3F7:: @ 815B3F7 msgbox SootopolisCity_House7_Text_19005B, 2 end - diff --git a/data/scripts/maps/SootopolisCity_House8.s b/data/scripts/maps/SootopolisCity_House8.s index 0f9ee3580..c52965124 100644 --- a/data/scripts/maps/SootopolisCity_House8.s +++ b/data/scripts/maps/SootopolisCity_House8.s @@ -112,4 +112,3 @@ SootopolisCity_House8_EventScript_15B531:: @ 815B531 msgbox SootopolisCity_House8_Text_1906BE, 4 releaseall end - diff --git a/data/scripts/maps/SootopolisCity_Mart.s b/data/scripts/maps/SootopolisCity_Mart.s index fd562a3c0..9f37f9d0b 100644 --- a/data/scripts/maps/SootopolisCity_Mart.s +++ b/data/scripts/maps/SootopolisCity_Mart.s @@ -57,4 +57,3 @@ SootopolisCity_Mart_EventScript_15B290:: @ 815B290 msgbox SootopolisCity_Mart_Text_18F8F2, 4 release end - diff --git a/data/scripts/maps/SootopolisCity_PokemonCenter_1F.s b/data/scripts/maps/SootopolisCity_PokemonCenter_1F.s index d46d68dad..29cc06584 100644 --- a/data/scripts/maps/SootopolisCity_PokemonCenter_1F.s +++ b/data/scripts/maps/SootopolisCity_PokemonCenter_1F.s @@ -45,4 +45,3 @@ SootopolisCity_PokemonCenter_1F_EventScript_15B1EE:: @ 815B1EE msgbox SootopolisCity_PokemonCenter_1F_Text_18F7EA, 4 release end - diff --git a/data/scripts/maps/SootopolisCity_PokemonCenter_2F.s b/data/scripts/maps/SootopolisCity_PokemonCenter_2F.s index 2046a9042..0547e666f 100644 --- a/data/scripts/maps/SootopolisCity_PokemonCenter_2F.s +++ b/data/scripts/maps/SootopolisCity_PokemonCenter_2F.s @@ -15,4 +15,3 @@ SootopolisCity_PokemonCenter_2F_EventScript_15B20E:: @ 815B20E SootopolisCity_PokemonCenter_2F_EventScript_15B214:: @ 815B214 call SootopolisCity_PokemonCenter_2F_EventScript_1A41FB end - diff --git a/data/scripts/maps/SouthernIsland_Interior.s b/data/scripts/maps/SouthernIsland_Interior.s index 63e5b78a9..d3b944f29 100644 --- a/data/scripts/maps/SouthernIsland_Interior.s +++ b/data/scripts/maps/SouthernIsland_Interior.s @@ -111,4 +111,3 @@ SouthernIsland_Interior_Movement_160C22:: @ 8160C22 step_down step_down step_end - diff --git a/data/scripts/maps/TradeCenter.s b/data/scripts/maps/TradeCenter.s index 44efcf62f..dadb3e875 100644 --- a/data/scripts/maps/TradeCenter.s +++ b/data/scripts/maps/TradeCenter.s @@ -1,3 +1,2 @@ TradeCenter_MapScripts:: @ 815F57D .byte 0 - diff --git a/data/scripts/maps/Underwater1.s b/data/scripts/maps/Underwater1.s index aedbe82c4..ab2e910fe 100644 --- a/data/scripts/maps/Underwater1.s +++ b/data/scripts/maps/Underwater1.s @@ -1,3 +1,2 @@ Underwater1_MapScripts:: @ 8152637 .byte 0 - diff --git a/data/scripts/maps/Underwater2.s b/data/scripts/maps/Underwater2.s index 4da2a5cb2..cf60a2b34 100644 --- a/data/scripts/maps/Underwater2.s +++ b/data/scripts/maps/Underwater2.s @@ -1,3 +1,2 @@ Underwater2_MapScripts:: @ 8152638 .byte 0 - diff --git a/data/scripts/maps/Underwater3.s b/data/scripts/maps/Underwater3.s index b87c72c9f..c34b07b1c 100644 --- a/data/scripts/maps/Underwater3.s +++ b/data/scripts/maps/Underwater3.s @@ -1,3 +1,2 @@ Underwater3_MapScripts:: @ 8152639 .byte 0 - diff --git a/data/scripts/maps/Underwater4.s b/data/scripts/maps/Underwater4.s index a6d8f1bd0..0d2256e07 100644 --- a/data/scripts/maps/Underwater4.s +++ b/data/scripts/maps/Underwater4.s @@ -1,3 +1,2 @@ Underwater4_MapScripts:: @ 815263A .byte 0 - diff --git a/data/scripts/maps/Underwater_Route134.s b/data/scripts/maps/Underwater_Route134.s index 427481eda..ee79f9799 100644 --- a/data/scripts/maps/Underwater_Route134.s +++ b/data/scripts/maps/Underwater_Route134.s @@ -5,4 +5,3 @@ Underwater_Route134_MapScripts:: @ 815F071 Underwater_Route134_MapScript1_15F077:: @ 815F077 warp4 Route134, 255, 60, 31 end - diff --git a/data/scripts/maps/Underwater_SeafloorCavern.s b/data/scripts/maps/Underwater_SeafloorCavern.s index 4a0388146..c879ec609 100644 --- a/data/scripts/maps/Underwater_SeafloorCavern.s +++ b/data/scripts/maps/Underwater_SeafloorCavern.s @@ -43,4 +43,3 @@ Underwater_SeafloorCavern_EventScript_15DA3F:: @ 815DA3F msgbox Underwater_SeafloorCavern_Text_197435, 4 releaseall end - diff --git a/data/scripts/maps/Underwater_SealedChamber.s b/data/scripts/maps/Underwater_SealedChamber.s index 8e790ddc0..d7e7aabcb 100644 --- a/data/scripts/maps/Underwater_SealedChamber.s +++ b/data/scripts/maps/Underwater_SealedChamber.s @@ -25,4 +25,3 @@ Underwater_SealedChamber_EventScript_15F0B8:: @ 815F0B8 hidebox 0, 0, 29, 19 releaseall end - diff --git a/data/scripts/maps/Underwater_SootopolisCity.s b/data/scripts/maps/Underwater_SootopolisCity.s index aa3465cb7..624c2c83e 100644 --- a/data/scripts/maps/Underwater_SootopolisCity.s +++ b/data/scripts/maps/Underwater_SootopolisCity.s @@ -5,4 +5,3 @@ Underwater_SootopolisCity_MapScripts:: @ 815CAE4 Underwater_SootopolisCity_MapScript1_15CAEA:: @ 815CAEA warp4 SootopolisCity, 255, 29, 53 end - diff --git a/data/scripts/maps/UnknownMap_25_34.s b/data/scripts/maps/UnknownMap_25_34.s index 3fc7b181a..394c2ef2d 100644 --- a/data/scripts/maps/UnknownMap_25_34.s +++ b/data/scripts/maps/UnknownMap_25_34.s @@ -427,4 +427,3 @@ FallarborTown_ContestLobby_EventScript_15FBF3:: @ 815FBF3 FallarborTown_ContestLobby_EventScript_15FBF9:: @ 815FBF9 setvar 0x4013, 105 return - diff --git a/data/scripts/maps/VerdanturfTown.s b/data/scripts/maps/VerdanturfTown.s index 6b702a243..610643823 100644 --- a/data/scripts/maps/VerdanturfTown.s +++ b/data/scripts/maps/VerdanturfTown.s @@ -63,4 +63,3 @@ VerdanturfTown_EventScript_14E8DC:: @ 814E8DC VerdanturfTown_EventScript_14E8E5:: @ 814E8E5 msgbox VerdanturfTown_Text_16CF6D, 3 end - diff --git a/data/scripts/maps/VerdanturfTown_ContestHall.s b/data/scripts/maps/VerdanturfTown_ContestHall.s index 0c8e84e41..380385a88 100644 --- a/data/scripts/maps/VerdanturfTown_ContestHall.s +++ b/data/scripts/maps/VerdanturfTown_ContestHall.s @@ -18,4 +18,3 @@ VerdanturfTown_ContestHall_EventScript_153EA9:: @ 8153EA9 VerdanturfTown_ContestHall_EventScript_153EB2:: @ 8153EB2 msgbox VerdanturfTown_ContestHall_Text_1781A5, 3 end - diff --git a/data/scripts/maps/VerdanturfTown_ContestLobby.s b/data/scripts/maps/VerdanturfTown_ContestLobby.s index 2f0d74896..7033e4fb1 100644 --- a/data/scripts/maps/VerdanturfTown_ContestLobby.s +++ b/data/scripts/maps/VerdanturfTown_ContestLobby.s @@ -127,4 +127,3 @@ VerdanturfTown_ContestLobby_EventScript_153E89:: @ 8153E89 hidebox 0, 0, 29, 19 releaseall end - diff --git a/data/scripts/maps/VerdanturfTown_FriendshipRatersHouse.s b/data/scripts/maps/VerdanturfTown_FriendshipRatersHouse.s index f2b561733..2dc2e1355 100644 --- a/data/scripts/maps/VerdanturfTown_FriendshipRatersHouse.s +++ b/data/scripts/maps/VerdanturfTown_FriendshipRatersHouse.s @@ -61,4 +61,3 @@ VerdanturfTown_FriendshipRatersHouse_EventScript_1540D9:: @ 81540D9 waitpokecry release end - diff --git a/data/scripts/maps/VerdanturfTown_House.s b/data/scripts/maps/VerdanturfTown_House.s index fc9f5ffd9..45a22ae93 100644 --- a/data/scripts/maps/VerdanturfTown_House.s +++ b/data/scripts/maps/VerdanturfTown_House.s @@ -8,4 +8,3 @@ VerdanturfTown_House_EventScript_1540ED:: @ 81540ED VerdanturfTown_House_EventScript_1540F6:: @ 81540F6 msgbox VerdanturfTown_House_Text_178D8E, 2 end - diff --git a/data/scripts/maps/VerdanturfTown_Mart.s b/data/scripts/maps/VerdanturfTown_Mart.s index bc105de61..4227dc8b1 100644 --- a/data/scripts/maps/VerdanturfTown_Mart.s +++ b/data/scripts/maps/VerdanturfTown_Mart.s @@ -39,4 +39,3 @@ VerdanturfTown_Mart_EventScript_153EF7:: @ 8153EF7 VerdanturfTown_Mart_EventScript_153F00:: @ 8153F00 msgbox VerdanturfTown_Mart_Text_1782C0, 2 end - diff --git a/data/scripts/maps/VerdanturfTown_PokemonCenter_1F.s b/data/scripts/maps/VerdanturfTown_PokemonCenter_1F.s index 7b8dcfc8f..e0fee3fb8 100644 --- a/data/scripts/maps/VerdanturfTown_PokemonCenter_1F.s +++ b/data/scripts/maps/VerdanturfTown_PokemonCenter_1F.s @@ -23,4 +23,3 @@ VerdanturfTown_PokemonCenter_1F_EventScript_153F26:: @ 8153F26 VerdanturfTown_PokemonCenter_1F_EventScript_153F2F:: @ 8153F2F msgbox VerdanturfTown_PokemonCenter_1F_Text_178389, 2 end - diff --git a/data/scripts/maps/VerdanturfTown_PokemonCenter_2F.s b/data/scripts/maps/VerdanturfTown_PokemonCenter_2F.s index 113e3cfee..ec52d45a7 100644 --- a/data/scripts/maps/VerdanturfTown_PokemonCenter_2F.s +++ b/data/scripts/maps/VerdanturfTown_PokemonCenter_2F.s @@ -17,4 +17,3 @@ VerdanturfTown_PokemonCenter_2F_EventScript_153F4E:: @ 8153F4E VerdanturfTown_PokemonCenter_2F_EventScript_153F54:: @ 8153F54 call VerdanturfTown_PokemonCenter_2F_EventScript_1A41FB end - diff --git a/data/scripts/maps/VerdanturfTown_WandasHouse.s b/data/scripts/maps/VerdanturfTown_WandasHouse.s index eb497c426..80bd6151d 100644 --- a/data/scripts/maps/VerdanturfTown_WandasHouse.s +++ b/data/scripts/maps/VerdanturfTown_WandasHouse.s @@ -89,4 +89,3 @@ VerdanturfTown_WandasHouse_EventScript_154025:: @ 8154025 msgbox VerdanturfTown_WandasHouse_Text_178A47, 4 release end - diff --git a/data/scripts/maps/VictoryRoad_1F.s b/data/scripts/maps/VictoryRoad_1F.s index 88865f4eb..02c6411fb 100644 --- a/data/scripts/maps/VictoryRoad_1F.s +++ b/data/scripts/maps/VictoryRoad_1F.s @@ -118,4 +118,3 @@ VictoryRoad_1F_EventScript_15DF9D:: @ 815DF9D trainerbattle 0, 96, 0, VictoryRoad_1F_Text_197C45, VictoryRoad_1F_Text_197C8D msgbox VictoryRoad_1F_Text_197CAF, 6 end - diff --git a/data/scripts/maps/VictoryRoad_B1F.s b/data/scripts/maps/VictoryRoad_B1F.s index a4f40b815..d355bf919 100644 --- a/data/scripts/maps/VictoryRoad_B1F.s +++ b/data/scripts/maps/VictoryRoad_B1F.s @@ -15,4 +15,3 @@ VictoryRoad_B1F_EventScript_15DFE3:: @ 815DFE3 trainerbattle 0, 98, 0, VictoryRoad_B1F_Text_197E5D, VictoryRoad_B1F_Text_197EA6 msgbox VictoryRoad_B1F_Text_197EB6, 6 end - diff --git a/data/scripts/maps/VictoryRoad_B2F.s b/data/scripts/maps/VictoryRoad_B2F.s index 39ac84e92..427c492ce 100644 --- a/data/scripts/maps/VictoryRoad_B2F.s +++ b/data/scripts/maps/VictoryRoad_B2F.s @@ -20,4 +20,3 @@ VictoryRoad_B2F_EventScript_15E040:: @ 815E040 trainerbattle 0, 100, 0, VictoryRoad_B2F_Text_198121, VictoryRoad_B2F_Text_1981A3 msgbox VictoryRoad_B2F_Text_1981BA, 6 end - 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.$" - |