diff options
| author | YamaArashi <shadow962@live.com> | 2016-07-05 01:43:01 -0700 |
|---|---|---|
| committer | YamaArashi <shadow962@live.com> | 2016-07-05 01:43:01 -0700 |
| commit | 86b7c742692565a5eb9b5824378b3e2c74f555c5 (patch) | |
| tree | 7a292ae2b2be6ebbe26419c5ac74a26cba0851d2 /data/scripts/maps | |
| parent | 1465509725e20d73dc5959e8aaf82cfe36321838 (diff) | |
remove empty lines at eof
Diffstat (limited to 'data/scripts/maps')
349 files changed, 0 insertions, 349 deletions
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 - |