summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRemy Oukaour <remy.oukaour@gmail.com>2018-01-12 17:09:32 -0500
committerRemy Oukaour <remy.oukaour@gmail.com>2018-01-12 17:09:32 -0500
commit59c95abf836e139931a41d20cf95af2472763fab (patch)
treeb500e6c6438d36df7e6f74b1570d6b8435d8902e
parent5a8700c56a24f59eb181221456b3c8a75b60c068 (diff)
Trim whitespace
-rw-r--r--maps/BattleTowerBattleRoom.asm2
-rw-r--r--maps/BattleTowerHallway.asm2
-rw-r--r--maps/BlackthornGym2F.asm1
-rw-r--r--maps/BurnedTower1F.asm2
-rw-r--r--maps/CeladonDeptStore6F.asm1
-rw-r--r--maps/CeladonGameCornerPrizeRoom.asm12
-rw-r--r--maps/CeruleanGym.asm1
-rw-r--r--maps/DarkCaveVioletEntrance.asm1
-rw-r--r--maps/DiglettsCave.asm1
-rw-r--r--maps/DragonShrine.asm6
-rw-r--r--maps/GoldenrodCity.asm2
-rw-r--r--maps/GoldenrodDeptStore6F.asm1
-rw-r--r--maps/GoldenrodDeptStoreElevator.asm2
-rw-r--r--maps/GoldenrodGameCorner.asm4
-rw-r--r--maps/GoldenrodPokeComCenter2FMobile.asm4
-rw-r--r--maps/IcePathB1F.asm3
-rw-r--r--maps/IcePathB2FBlackthornSide.asm1
-rw-r--r--maps/IcePathB2FMahoganySide.asm1
-rw-r--r--maps/IlexForest.asm2
-rw-r--r--maps/LakeOfRage.asm3
-rw-r--r--maps/MountMoonSquare.asm1
-rw-r--r--maps/MountMortar1FInside.asm1
-rw-r--r--maps/MountMortar1FOutside.asm1
-rw-r--r--maps/MountMortar2FInside.asm1
-rw-r--r--maps/MountMortarB1F.asm1
-rw-r--r--maps/NationalPark.asm1
-rw-r--r--maps/NationalParkBugContest.asm1
-rw-r--r--maps/OlivineLighthouse5F.asm1
-rw-r--r--maps/OlivinePort.asm1
-rw-r--r--maps/RockTunnel1F.asm2
-rw-r--r--maps/RockTunnelB1F.asm1
-rw-r--r--maps/Route11.asm1
-rw-r--r--maps/Route12.asm1
-rw-r--r--maps/Route13.asm1
-rw-r--r--maps/Route17.asm2
-rw-r--r--maps/Route25.asm1
-rw-r--r--maps/Route28.asm1
-rw-r--r--maps/Route30.asm1
-rw-r--r--maps/Route32.asm2
-rw-r--r--maps/Route34.asm2
-rw-r--r--maps/Route37.asm1
-rw-r--r--maps/Route39.asm1
-rw-r--r--maps/Route4.asm1
-rw-r--r--maps/Route42.asm1
-rw-r--r--maps/Route44.asm1
-rw-r--r--maps/Route45.asm1
-rw-r--r--maps/Route9.asm1
-rw-r--r--maps/RuinsOfAlphOutside.asm2
-rw-r--r--maps/SilverCaveRoom1.asm2
-rw-r--r--maps/SilverCaveRoom2.asm1
-rw-r--r--maps/TeamRocketBaseB1F.asm1
-rw-r--r--maps/TeamRocketBaseB2F.asm1
-rw-r--r--maps/TinTower4F.asm1
-rw-r--r--maps/TinTower5F.asm2
-rw-r--r--maps/UndergroundPath.asm2
-rw-r--r--maps/VermilionPort.asm1
-rw-r--r--maps/VictoryRoad.asm2
-rw-r--r--maps/WhirlIslandB1F.asm3
58 files changed, 4 insertions, 97 deletions
diff --git a/maps/BattleTowerBattleRoom.asm b/maps/BattleTowerBattleRoom.asm
index 82e1ea21e..e74b9634c 100644
--- a/maps/BattleTowerBattleRoom.asm
+++ b/maps/BattleTowerBattleRoom.asm
@@ -133,13 +133,11 @@ UnreferencedScript_0x9f4f7:
closetext
end
-
Text_ReturnedAfterSave_Mobile:
text "You'll be returned"
line "after you SAVE."
done
-
BattleTowerBattleRoom_MapEventHeader:
; filler
db 0, 0
diff --git a/maps/BattleTowerHallway.asm b/maps/BattleTowerHallway.asm
index e461ce613..c12091582 100644
--- a/maps/BattleTowerHallway.asm
+++ b/maps/BattleTowerHallway.asm
@@ -21,7 +21,6 @@ BattleTowerHallway_MapScriptHeader:
callasm .asm_load_battle_room
jump .WalkToChosenBattleRoom
-
.asm_load_battle_room
ld a, [rSVBK]
push af
@@ -35,7 +34,6 @@ BattleTowerHallway_MapScriptHeader:
ld [rSVBK], a
ret
-
; enter different rooms for different levels to battle against
; at least it should look like that
; because all warps lead to the same room
diff --git a/maps/BlackthornGym2F.asm b/maps/BlackthornGym2F.asm
index 6aa55a0e5..270ec0481 100644
--- a/maps/BlackthornGym2F.asm
+++ b/maps/BlackthornGym2F.asm
@@ -56,7 +56,6 @@ BlackthornGym2F_MapScriptHeader:
earthquake 80
end
-
BlackthornGymBoulder:
jumpstd strengthboulder
diff --git a/maps/BurnedTower1F.asm b/maps/BurnedTower1F.asm
index fce0e73c8..246946e76 100644
--- a/maps/BurnedTower1F.asm
+++ b/maps/BurnedTower1F.asm
@@ -133,11 +133,9 @@ BurnedTower1FRock:
BurnedTower1FHiddenEther:
dwb EVENT_BURNED_TOWER_1F_HIDDEN_ETHER, ETHER
-
BurnedTower1FHiddenUltraBall:
dwb EVENT_BURNED_TOWER_1F_HIDDEN_ULTRA_BALL, ULTRA_BALL
-
BurnedTower1FHPUp:
itemball HP_UP
diff --git a/maps/CeladonDeptStore6F.asm b/maps/CeladonDeptStore6F.asm
index 95c0f6199..15b9a752b 100644
--- a/maps/CeladonDeptStore6F.asm
+++ b/maps/CeladonDeptStore6F.asm
@@ -94,7 +94,6 @@ CeladonDeptStore6FVendingMachine:
db "LEMONADE ¥350@"
db "CANCEL@"
-
CeladonDeptStore6FDirectory:
jumptext CeladonDeptStore6FDirectoryText
diff --git a/maps/CeladonGameCornerPrizeRoom.asm b/maps/CeladonGameCornerPrizeRoom.asm
index 3918c86fa..3e66a0e6b 100644
--- a/maps/CeladonGameCornerPrizeRoom.asm
+++ b/maps/CeladonGameCornerPrizeRoom.asm
@@ -15,7 +15,7 @@ CeladonGameCornerPrizeRoomGentlemanScript:
CeladonGameCornerPrizeRoomPharmacistScript:
jumptextfaceplayer CeladonGameCornerPrizeRoomPharmacistText
-GoldenrodGameCornerTMVendor:
+CeladonGameCornerPrizeRoomTMVendor:
faceplayer
opentext
writetext CeladonPrizeRoom_PrizeVendorIntroText
@@ -102,7 +102,6 @@ CeladonPrizeRoom_NoCoinCase:
closetext
end
-
CeladonPrizeRoom_TMMenuDataHeader:
db $40 ; flags
db 02, 00 ; start coords
@@ -118,8 +117,7 @@ CeladonPrizeRoom_TMMenuDataHeader:
db "TM15 7500@"
db "CANCEL@"
-
-GoldenrodGameCornerPokemonVendor:
+CeladonGameCornerPrizeRoomPokemonVendor:
faceplayer
opentext
writetext CeladonPrizeRoom_PrizeVendorIntroText
@@ -191,7 +189,6 @@ GoldenrodGameCornerPokemonVendor:
takecoins 8888
jump .loop
-
.MenuDataHeader:
db $40 ; flags
db 02, 00 ; start coords
@@ -207,7 +204,6 @@ GoldenrodGameCornerPokemonVendor:
db "LARVITAR 8888@"
db "CANCEL@"
-
CeladonGameCornerPrizeRoomGentlemanText:
text "I wanted PORYGON,"
line "but I was short by"
@@ -283,8 +279,8 @@ CeladonGameCornerPrizeRoom_MapEventHeader:
.BGEvents:
db 2
- bg_event 2, 1, BGEVENT_READ, GoldenrodGameCornerTMVendor
- bg_event 4, 1, BGEVENT_READ, GoldenrodGameCornerPokemonVendor
+ bg_event 2, 1, BGEVENT_READ, CeladonGameCornerPrizeRoomTMVendor
+ bg_event 4, 1, BGEVENT_READ, CeladonGameCornerPrizeRoomPokemonVendor
.ObjectEvents:
db 2
diff --git a/maps/CeruleanGym.asm b/maps/CeruleanGym.asm
index af9939f2d..844286fa8 100644
--- a/maps/CeruleanGym.asm
+++ b/maps/CeruleanGym.asm
@@ -137,7 +137,6 @@ CeruleanGymGuyScript:
CeruleanGymHiddenMachinePart:
dwb EVENT_FOUND_MACHINE_PART_IN_CERULEAN_GYM, MACHINE_PART
-
CeruleanGymStatue1:
checkevent EVENT_TRAINERS_IN_CERULEAN_GYM
iffalse CeruleanGymStatue
diff --git a/maps/DarkCaveVioletEntrance.asm b/maps/DarkCaveVioletEntrance.asm
index b1e629a54..42510fd44 100644
--- a/maps/DarkCaveVioletEntrance.asm
+++ b/maps/DarkCaveVioletEntrance.asm
@@ -33,7 +33,6 @@ DarkCaveVioletEntranceRock:
DarkCaveVioletEntranceHiddenElixer:
dwb EVENT_DARK_CAVE_VIOLET_ENTRANCE_HIDDEN_ELIXER, ELIXER
-
DarkCaveVioletEntrance_MapEventHeader:
; filler
db 0, 0
diff --git a/maps/DiglettsCave.asm b/maps/DiglettsCave.asm
index 04277b792..d2bdb03bf 100644
--- a/maps/DiglettsCave.asm
+++ b/maps/DiglettsCave.asm
@@ -14,7 +14,6 @@ DiglettsCavePokefanMScript:
DiglettsCaveHiddenMaxRevive:
dwb EVENT_DIGLETTS_CAVE_HIDDEN_MAX_REVIVE, MAX_REVIVE
-
DiglettsCavePokefanMText:
text "A bunch of DIGLETT"
line "popped out of the"
diff --git a/maps/DragonShrine.asm b/maps/DragonShrine.asm
index fd6cd48bf..2b1e9267c 100644
--- a/maps/DragonShrine.asm
+++ b/maps/DragonShrine.asm
@@ -265,7 +265,6 @@ ElderScript_0x18d20d:
closetext
end
-
MenuDataHeader_0x18d215:
db $40 ; flags
db 04, 08 ; start coords
@@ -280,7 +279,6 @@ MenuDataHeader_0x18d215:
db "Underling@"
db "Friend@"
-
MenuDataHeader_0x18d234:
db $40 ; flags
db 04, 09 ; start coords
@@ -295,7 +293,6 @@ MenuDataHeader_0x18d234:
db "Raising@"
db "Cheating@"
-
MenuDataHeader_0x18d258:
db $40 ; flags
db 04, 05 ; start coords
@@ -310,7 +307,6 @@ MenuDataHeader_0x18d258:
db "Tough person@"
db "Anybody@"
-
MenuDataHeader_0x18d283:
db $40 ; flags
db 04, 08 ; start coords
@@ -325,7 +321,6 @@ MenuDataHeader_0x18d283:
db "Violence@"
db "Knowledge@"
-
MenuDataHeader_0x18d2a5:
db $40 ; flags
db 04, 12 ; start coords
@@ -340,7 +335,6 @@ MenuDataHeader_0x18d2a5:
db "Both@"
db "Weak@"
-
MovementData_0x18d2bf:
slow_step UP
slow_step UP
diff --git a/maps/GoldenrodCity.asm b/maps/GoldenrodCity.asm
index 356a0e6ef..6f612692c 100644
--- a/maps/GoldenrodCity.asm
+++ b/maps/GoldenrodCity.asm
@@ -94,7 +94,6 @@ MoveTutor:
if_equal FALSE, .TeachMove
jump .Incompatible
-
.MoveMenuDataHeader:
db $40 ; flags
db 02, 00 ; start coords
@@ -110,7 +109,6 @@ MoveTutor:
db "ICE BEAM@"
db "CANCEL@"
-
.Refused:
writetext UnknownText_0x1990b4
waitbutton
diff --git a/maps/GoldenrodDeptStore6F.asm b/maps/GoldenrodDeptStore6F.asm
index cfe7fde52..a20b74133 100644
--- a/maps/GoldenrodDeptStore6F.asm
+++ b/maps/GoldenrodDeptStore6F.asm
@@ -83,7 +83,6 @@ GoldenrodVendingMachine:
db "LEMONADE ¥350@"
db "CANCEL@"
-
GoldenrodDeptStore6FLassScript:
jumptextfaceplayer GoldenrodDeptStore6FLassText
diff --git a/maps/GoldenrodDeptStoreElevator.asm b/maps/GoldenrodDeptStoreElevator.asm
index 9b6a2158b..7d921dd57 100644
--- a/maps/GoldenrodDeptStoreElevator.asm
+++ b/maps/GoldenrodDeptStoreElevator.asm
@@ -43,7 +43,6 @@ MapGoldenrodDeptStoreElevatorSignpost0Script:
.Done:
end
-
Elevator_0x566e0:
db 7 ; floors
elevfloor FLOOR_B1F, 2, GOLDENROD_DEPT_STORE_B1F
@@ -55,7 +54,6 @@ Elevator_0x566e0:
elevfloor FLOOR_6F, 2, GOLDENROD_DEPT_STORE_6F
db -1 ; end
-
GoldenrodDeptStoreElevator_MapEventHeader:
; filler
db 0, 0
diff --git a/maps/GoldenrodGameCorner.asm b/maps/GoldenrodGameCorner.asm
index f6412f3b2..628cb852e 100644
--- a/maps/GoldenrodGameCorner.asm
+++ b/maps/GoldenrodGameCorner.asm
@@ -138,7 +138,6 @@ GoldenrodGameCornerPrizeVendor_NoCoinCaseScript:
closetext
end
-
GoldenrodGameCornerTMVendorMenuData:
db $40 ; flags
db 02, 00 ; start coords
@@ -154,7 +153,6 @@ GoldenrodGameCornerTMVendorMenuData:
db "TM38 5500@"
db "CANCEL@"
-
GoldenrodGameCornerPrizeMonVendorScript:
faceplayer
opentext
@@ -227,7 +225,6 @@ GoldenrodGameCornerPrizeMonVendorScript:
takecoins 1500
jump .loop
-
.MenuDataHeader:
db $40 ; flags
db 02, 00 ; start coords
@@ -243,7 +240,6 @@ GoldenrodGameCornerPrizeMonVendorScript:
db "WOBBUFFET 1500@"
db "CANCEL@"
-
GoldenrodGameCornerPharmacistScript:
faceplayer
opentext
diff --git a/maps/GoldenrodPokeComCenter2FMobile.asm b/maps/GoldenrodPokeComCenter2FMobile.asm
index 304bb2234..1696a014f 100644
--- a/maps/GoldenrodPokeComCenter2FMobile.asm
+++ b/maps/GoldenrodPokeComCenter2FMobile.asm
@@ -48,7 +48,6 @@ UnknownScript_0x62600:
closetext
end
-
MenuDataHeader_0x62602:
db $40 ; flags
db 00, 00 ; start coords
@@ -63,7 +62,6 @@ MenuDataHeader_0x62602:
db "モバイルセンター@" ; MOBILE CENTER
db "やめる@" ; QUIT
-
MapGoldenrodPokeComCenter2FMobileSignpost1Script:
opentext
writetext UnknownText_0x62989
@@ -93,7 +91,6 @@ UnknownScript_0x6264a:
closetext
end
-
MenuDataHeader_0x6264c:
db $40 ; flags
db 00, 00 ; start coords
@@ -108,7 +105,6 @@ MenuDataHeader_0x6264c:
db "でんわ", $4a,"つながらないとき@" ; Don't use phone
db "やめる@" ; QUIT
-
MapGoldenrodPokeComCenter2FMobileSignpost2Script:
jumptext UnknownText_0x62b26
diff --git a/maps/IcePathB1F.asm b/maps/IcePathB1F.asm
index 78c5dc659..58c75e63d 100644
--- a/maps/IcePathB1F.asm
+++ b/maps/IcePathB1F.asm
@@ -62,7 +62,6 @@ IcePathB1F_MapScriptHeader:
earthquake 80
end
-
IcePathB1FBoulder:
jumpstd strengthboulder
@@ -72,13 +71,11 @@ IcePathB1FIron:
IcePathB1FHiddenMaxPotion:
dwb EVENT_ICE_PATH_B1F_HIDDEN_MAX_POTION, MAX_POTION
-
IcePathBoulderFellThroughText:
text "The boulder fell"
line "through."
done
-
IcePathB1F_MapEventHeader:
; filler
db 0, 0
diff --git a/maps/IcePathB2FBlackthornSide.asm b/maps/IcePathB2FBlackthornSide.asm
index c171147cd..2e20d36ae 100644
--- a/maps/IcePathB2FBlackthornSide.asm
+++ b/maps/IcePathB2FBlackthornSide.asm
@@ -14,7 +14,6 @@ IcePathB2FBlackthornSideTMRest:
IcePathB2FBlackthornSideHiddenIceHeal:
dwb EVENT_ICE_PATH_B2F_BLACKTHORN_SIDE_HIDDEN_ICE_HEAL, ICE_HEAL
-
IcePathB2FBlackthornSide_MapEventHeader:
; filler
db 0, 0
diff --git a/maps/IcePathB2FMahoganySide.asm b/maps/IcePathB2FMahoganySide.asm
index 80ae7f938..1b837eb11 100644
--- a/maps/IcePathB2FMahoganySide.asm
+++ b/maps/IcePathB2FMahoganySide.asm
@@ -25,7 +25,6 @@ IcePathB2FMahoganySideMaxPotion:
IcePathB2FMahoganySideHiddenCarbos:
dwb EVENT_ICE_PATH_B2F_MAHOGANY_SIDE_HIDDEN_CARBOS, CARBOS
-
UnknownText_0x7e5ad:
text "It's immovably"
line "imbedded in ice."
diff --git a/maps/IlexForest.asm b/maps/IlexForest.asm
index 094567692..880839d97 100644
--- a/maps/IlexForest.asm
+++ b/maps/IlexForest.asm
@@ -416,11 +416,9 @@ IlexForestEther:
IlexForestHiddenEther:
dwb EVENT_ILEX_FOREST_HIDDEN_ETHER, ETHER
-
IlexForestHiddenSuperPotion:
dwb EVENT_ILEX_FOREST_HIDDEN_SUPER_POTION, SUPER_POTION
-
IlexForestHiddenFullHeal:
dwb EVENT_ILEX_FOREST_HIDDEN_FULL_HEAL, FULL_HEAL
diff --git a/maps/LakeOfRage.asm b/maps/LakeOfRage.asm
index 6ff7060f9..92de41cc8 100644
--- a/maps/LakeOfRage.asm
+++ b/maps/LakeOfRage.asm
@@ -234,15 +234,12 @@ LakeOfRageTMDetect:
LakeOfRageHiddenFullRestore:
dwb EVENT_LAKE_OF_RAGE_HIDDEN_FULL_RESTORE, FULL_RESTORE
-
LakeOfRageHiddenRareCandy:
dwb EVENT_LAKE_OF_RAGE_HIDDEN_RARE_CANDY, RARE_CANDY
-
LakeOfRageHiddenMaxPotion:
dwb EVENT_LAKE_OF_RAGE_HIDDEN_MAX_POTION, MAX_POTION
-
MovementData_0x70155:
teleport_from
step_end
diff --git a/maps/MountMoonSquare.asm b/maps/MountMoonSquare.asm
index 3e13b58ea..ea372868a 100644
--- a/maps/MountMoonSquare.asm
+++ b/maps/MountMoonSquare.asm
@@ -77,7 +77,6 @@ ClefairyDance:
MountMoonSquareHiddenMoonStone:
dwb EVENT_MOUNT_MOON_SQUARE_HIDDEN_MOON_STONE, MOON_STONE
-
DontLitterSign:
jumptext DontLitterSignText
diff --git a/maps/MountMortar1FInside.asm b/maps/MountMortar1FInside.asm
index 659d7a54d..050abdc74 100644
--- a/maps/MountMortar1FInside.asm
+++ b/maps/MountMortar1FInside.asm
@@ -66,7 +66,6 @@ MountMortar1FInsideUltraBall:
MountMortar1FInsideHiddenMaxRepel:
dwb EVENT_MOUNT_MORTAR_1F_INSIDE_HIDDEN_MAX_REPEL, MAX_REPEL
-
PokemaniacMillerSeenText:
text "I'm not losing"
line "this time!"
diff --git a/maps/MountMortar1FOutside.asm b/maps/MountMortar1FOutside.asm
index faa9930d2..b06d8786a 100644
--- a/maps/MountMortar1FOutside.asm
+++ b/maps/MountMortar1FOutside.asm
@@ -18,7 +18,6 @@ MountMortar1FOutsideRevive:
MountMortar1FOutsideHiddenHyperPotion:
dwb EVENT_MOUNT_MORTAR_1F_OUTSIDE_HIDDEN_HYPER_POTION, HYPER_POTION
-
MountMortar1FOutside_MapEventHeader:
; filler
db 0, 0
diff --git a/maps/MountMortar2FInside.asm b/maps/MountMortar2FInside.asm
index 106e51f5a..f44b33db3 100644
--- a/maps/MountMortar2FInside.asm
+++ b/maps/MountMortar2FInside.asm
@@ -46,7 +46,6 @@ MountMortar2FInsideEscapeRope:
MountMortar2FInsideHiddenFullRestore:
dwb EVENT_MOUNT_MORTAR_2F_INSIDE_HIDDEN_FULL_RESTORE, FULL_RESTORE
-
SupernerdHughSeenText:
text "Yo! MARKUS!"
done
diff --git a/maps/MountMortarB1F.asm b/maps/MountMortarB1F.asm
index f3db52690..968c8fe2e 100644
--- a/maps/MountMortarB1F.asm
+++ b/maps/MountMortarB1F.asm
@@ -74,7 +74,6 @@ MountMortarB1FPPUp:
MountMortarB1FHiddenMaxRevive:
dwb EVENT_MOUNT_MORTAR_B1F_HIDDEN_MAX_REVIVE, MAX_REVIVE
-
UnknownText_0x7e24d:
text "Hey!"
diff --git a/maps/NationalPark.asm b/maps/NationalPark.asm
index 4f5077724..cb841b187 100644
--- a/maps/NationalPark.asm
+++ b/maps/NationalPark.asm
@@ -307,7 +307,6 @@ NationalParkTMDig:
NationalParkHiddenFullHeal:
dwb EVENT_NATIONAL_PARK_HIDDEN_FULL_HEAL, FULL_HEAL
-
NationalParkLassText:
text "Look! Check out my"
line "bag!"
diff --git a/maps/NationalParkBugContest.asm b/maps/NationalParkBugContest.asm
index 5d7831529..3f9225eaf 100644
--- a/maps/NationalParkBugContest.asm
+++ b/maps/NationalParkBugContest.asm
@@ -117,7 +117,6 @@ NationalParkBugContestTMDig:
NationalParkBugContestHiddenFullHeal:
dwb EVENT_NATIONAL_PARK_HIDDEN_FULL_HEAL, FULL_HEAL
-
UnknownText_0x5c94c:
text "DON: I'm going to"
line "win! Don't bother"
diff --git a/maps/OlivineLighthouse5F.asm b/maps/OlivineLighthouse5F.asm
index e7c4a7884..07f6d95e1 100644
--- a/maps/OlivineLighthouse5F.asm
+++ b/maps/OlivineLighthouse5F.asm
@@ -46,7 +46,6 @@ OlivineLighthouse5FTMSwagger:
OlivineLighthouse5FHiddenHyperPotion:
dwb EVENT_OLIVINE_LIGHTHOUSE_5F_HIDDEN_HYPER_POTION, HYPER_POTION
-
SailorErnestSeenText:
text "I wanted to battle"
line "JASMINE, but she's"
diff --git a/maps/OlivinePort.asm b/maps/OlivinePort.asm
index 4fd072c67..0aeaad328 100644
--- a/maps/OlivinePort.asm
+++ b/maps/OlivinePort.asm
@@ -236,7 +236,6 @@ CooltrainerFScript_0x74a22:
OlivinePortHiddenProtein:
dwb EVENT_OLIVINE_PORT_HIDDEN_PROTEIN, PROTEIN
-
MovementData_0x74a30:
step DOWN
step_end
diff --git a/maps/RockTunnel1F.asm b/maps/RockTunnel1F.asm
index 3f2f57f20..cdc3f04a7 100644
--- a/maps/RockTunnel1F.asm
+++ b/maps/RockTunnel1F.asm
@@ -18,11 +18,9 @@ RockTunnel1FTMSteelWing:
RockTunnel1FHiddenXAccuracy:
dwb EVENT_ROCK_TUNNEL_1F_HIDDEN_X_ACCURACY, X_ACCURACY
-
RockTunnel1FHiddenXDefend:
dwb EVENT_ROCK_TUNNEL_1F_HIDDEN_X_DEFEND, X_DEFEND
-
RockTunnel1F_MapEventHeader:
; filler
db 0, 0
diff --git a/maps/RockTunnelB1F.asm b/maps/RockTunnelB1F.asm
index 6d20a92f2..549f1c868 100644
--- a/maps/RockTunnelB1F.asm
+++ b/maps/RockTunnelB1F.asm
@@ -22,7 +22,6 @@ RockTunnelB1FRevive:
RockTunnelB1FHiddenMaxPotion:
dwb EVENT_ROCK_TUNNEL_B1F_HIDDEN_MAX_POTION, MAX_POTION
-
RockTunnelB1F_MapEventHeader:
; filler
db 0, 0
diff --git a/maps/Route11.asm b/maps/Route11.asm
index 903cf1009..6034dcd37 100644
--- a/maps/Route11.asm
+++ b/maps/Route11.asm
@@ -65,7 +65,6 @@ FruitTreeScript_0x68055:
Route11HiddenRevive:
dwb EVENT_ROUTE_11_HIDDEN_REVIVE, REVIVE
-
YoungsterOwenSeenText:
text "There's no cheat-"
line "ing in #MON."
diff --git a/maps/Route12.asm b/maps/Route12.asm
index 240ff0bb5..778177c81 100644
--- a/maps/Route12.asm
+++ b/maps/Route12.asm
@@ -72,7 +72,6 @@ Route12Nugget:
Route12HiddenElixer:
dwb EVENT_ROUTE_12_HIDDEN_ELIXER, ELIXER
-
FisherMartinSeenText:
text "Patience is the"
line "key to both fish-"
diff --git a/maps/Route13.asm b/maps/Route13.asm
index 59107f67f..64274d758 100644
--- a/maps/Route13.asm
+++ b/maps/Route13.asm
@@ -79,7 +79,6 @@ Route13DirectionsSign:
Route13HiddenCalcium:
dwb EVENT_ROUTE_13_HIDDEN_CALCIUM, CALCIUM
-
PokefanmAlexSeenText:
text "Bow down before my"
line "regal #MON!"
diff --git a/maps/Route17.asm b/maps/Route17.asm
index 0f8d17b3a..c906db984 100644
--- a/maps/Route17.asm
+++ b/maps/Route17.asm
@@ -64,11 +64,9 @@ TrainerBikerGlenn:
Route17HiddenMaxEther:
dwb EVENT_ROUTE_17_HIDDEN_MAX_ETHER, MAX_ETHER
-
Route17HiddenMaxElixer:
dwb EVENT_ROUTE_17_HIDDEN_MAX_ELIXER, MAX_ELIXER
-
BikerRileySeenText:
text "Hey, you! You're"
line "from JOHTO, huh?"
diff --git a/maps/Route25.asm b/maps/Route25.asm
index 0d2f7a054..00f52d1e9 100644
--- a/maps/Route25.asm
+++ b/maps/Route25.asm
@@ -193,7 +193,6 @@ Route25Protein:
Route25HiddenPotion:
dwb EVENT_ROUTE_25_HIDDEN_POTION, POTION
-
MovementData_0x19efe8:
big_step DOWN
step_end
diff --git a/maps/Route28.asm b/maps/Route28.asm
index 8b76bc407..fa93fdc31 100644
--- a/maps/Route28.asm
+++ b/maps/Route28.asm
@@ -11,7 +11,6 @@ Route28Sign:
Route28HiddenRareCandy:
dwb EVENT_ROUTE_28_HIDDEN_RARE_CANDY, RARE_CANDY
-
Route28SignText:
text "ROUTE 28"
done
diff --git a/maps/Route30.asm b/maps/Route30.asm
index 9830f4019..ed6fa98ef 100644
--- a/maps/Route30.asm
+++ b/maps/Route30.asm
@@ -250,7 +250,6 @@ Route30FruitTree2:
Route30HiddenPotion:
dwb EVENT_ROUTE_30_HIDDEN_POTION, POTION
-
Route30_JoeysRattataAttacksMovement:
fix_facing
big_step UP
diff --git a/maps/Route32.asm b/maps/Route32.asm
index d9149ad7f..07b4db57d 100644
--- a/maps/Route32.asm
+++ b/maps/Route32.asm
@@ -508,11 +508,9 @@ Route32PokecenterSign:
Route32HiddenGreatBall:
dwb EVENT_ROUTE_32_HIDDEN_GREAT_BALL, GREAT_BALL
-
Route32HiddenSuperPotion:
dwb EVENT_ROUTE_32_HIDDEN_SUPER_POTION, SUPER_POTION
-
Movement_Route32CooltrainerMPushesYouBackToViolet:
step UP
step UP
diff --git a/maps/Route34.asm b/maps/Route34.asm
index 29d3232d8..a82cb350b 100644
--- a/maps/Route34.asm
+++ b/maps/Route34.asm
@@ -490,11 +490,9 @@ Route34Nugget:
Route34HiddenRareCandy:
dwb EVENT_ROUTE_34_HIDDEN_RARE_CANDY, RARE_CANDY
-
Route34HiddenSuperPotion:
dwb EVENT_ROUTE_34_HIDDEN_SUPER_POTION, SUPER_POTION
-
Route34MovementData_DayCareManWalksBackInside:
slow_step LEFT
slow_step LEFT
diff --git a/maps/Route37.asm b/maps/Route37.asm
index 190656869..8821f951e 100644
--- a/maps/Route37.asm
+++ b/maps/Route37.asm
@@ -116,7 +116,6 @@ FruitTreeScript_0x1a8e0d:
Route37HiddenEther:
dwb EVENT_ROUTE_37_HIDDEN_ETHER, ETHER
-
TwinsAnnandanne1SeenText:
text "ANN: ANNE and I"
line "are in this to-"
diff --git a/maps/Route39.asm b/maps/Route39.asm
index db7b37410..b1044d293 100644
--- a/maps/Route39.asm
+++ b/maps/Route39.asm
@@ -182,7 +182,6 @@ FruitTreeScript_0x1a5bf4:
Route39HiddenNugget:
dwb EVENT_ROUTE_39_HIDDEN_NUGGET, NUGGET
-
Route39MiltankText:
text "MILTANK: Mooo!"
done
diff --git a/maps/Route4.asm b/maps/Route4.asm
index bd6ea62e5..8a36de84a 100644
--- a/maps/Route4.asm
+++ b/maps/Route4.asm
@@ -53,7 +53,6 @@ Route4HPUp:
Route4HiddenUltraBall:
dwb EVENT_ROUTE_4_HIDDEN_ULTRA_BALL, ULTRA_BALL
-
BirdKeeperHankSeenText:
text "I'm raising my"
line "#MON. Want to"
diff --git a/maps/Route42.asm b/maps/Route42.asm
index 2a7b0e775..ad820796b 100644
--- a/maps/Route42.asm
+++ b/maps/Route42.asm
@@ -214,7 +214,6 @@ FruitTreeScript_0x1a9351:
Route42HiddenMaxPotion:
dwb EVENT_ROUTE_42_HIDDEN_MAX_POTION, MAX_POTION
-
MovementData_0x1a9356:
set_sliding
fast_jump_step UP
diff --git a/maps/Route44.asm b/maps/Route44.asm
index 5693e9e15..9e6504097 100644
--- a/maps/Route44.asm
+++ b/maps/Route44.asm
@@ -320,7 +320,6 @@ Route44MaxRepel:
Route44HiddenElixer:
dwb EVENT_ROUTE_44_HIDDEN_ELIXER, ELIXER
-
FisherWilton1SeenText:
text "Aack! You made me"
line "lose a POLIWAG!"
diff --git a/maps/Route45.asm b/maps/Route45.asm
index f024eb7d7..786a5db7c 100644
--- a/maps/Route45.asm
+++ b/maps/Route45.asm
@@ -314,7 +314,6 @@ Route45MaxPotion:
Route45HiddenPpUp:
dwb EVENT_ROUTE_45_HIDDEN_PP_UP, PP_UP
-
HikerErikSeenText:
text "Be prepared for"
line "anything!"
diff --git a/maps/Route9.asm b/maps/Route9.asm
index 1b377ceeb..b8ad4eeb0 100644
--- a/maps/Route9.asm
+++ b/maps/Route9.asm
@@ -85,7 +85,6 @@ Route9Sign:
Route9HiddenEther:
dwb EVENT_ROUTE_9_HIDDEN_ETHER, ETHER
-
CamperDeanSeenText:
text "I came to explore"
line "ROCK TUNNEL."
diff --git a/maps/RuinsOfAlphOutside.asm b/maps/RuinsOfAlphOutside.asm
index d313644bb..8dc42daee 100644
--- a/maps/RuinsOfAlphOutside.asm
+++ b/maps/RuinsOfAlphOutside.asm
@@ -112,7 +112,6 @@ TrainerPsychicNathan:
closetext
end
-
TrainerSuperNerdStan:
trainer EVENT_BEAT_SUPER_NERD_STAN, SUPER_NERD, STAN, UnknownText_0x581e5, UnknownText_0x58217, 0, .Script
@@ -124,7 +123,6 @@ TrainerSuperNerdStan:
closetext
end
-
RuinsOfAlphOutsideSignpost0Script:
jumptext UnknownText_0x58325
diff --git a/maps/SilverCaveRoom1.asm b/maps/SilverCaveRoom1.asm
index 7879184ee..335c4a834 100644
--- a/maps/SilverCaveRoom1.asm
+++ b/maps/SilverCaveRoom1.asm
@@ -26,11 +26,9 @@ SilverCaveRoom1UltraBall:
SilverCaveRoom1HiddenDireHit:
dwb EVENT_SILVER_CAVE_ROOM_1_HIDDEN_DIRE_HIT, DIRE_HIT
-
SilverCaveRoom1HiddenUltraBall:
dwb EVENT_SILVER_CAVE_ROOM_1_HIDDEN_ULTRA_BALL, ULTRA_BALL
-
SilverCaveRoom1_MapEventHeader:
; filler
db 0, 0
diff --git a/maps/SilverCaveRoom2.asm b/maps/SilverCaveRoom2.asm
index ec33e2be8..6bb381e3a 100644
--- a/maps/SilverCaveRoom2.asm
+++ b/maps/SilverCaveRoom2.asm
@@ -22,7 +22,6 @@ SilverCaveRoom2PPUp:
SilverCaveRoom2HiddenMaxPotion:
dwb EVENT_SILVER_CAVE_ROOM_2_HIDDEN_MAX_POTION, MAX_POTION
-
SilverCaveRoom2_MapEventHeader:
; filler
db 0, 0
diff --git a/maps/TeamRocketBaseB1F.asm b/maps/TeamRocketBaseB1F.asm
index 76b3cdc9f..503477338 100644
--- a/maps/TeamRocketBaseB1F.asm
+++ b/maps/TeamRocketBaseB1F.asm
@@ -542,7 +542,6 @@ TeamRocketBaseB1FGuardSpec:
TeamRocketBaseB1FHiddenRevive:
dwb EVENT_TEAM_ROCKET_BASE_B1F_HIDDEN_REVIVE, REVIVE
-
SecurityCameraMovement1:
big_step RIGHT
big_step RIGHT
diff --git a/maps/TeamRocketBaseB2F.asm b/maps/TeamRocketBaseB2F.asm
index 76b22da03..9c4b2f66f 100644
--- a/maps/TeamRocketBaseB2F.asm
+++ b/maps/TeamRocketBaseB2F.asm
@@ -358,7 +358,6 @@ TeamRocketBaseB2FTMThief:
TeamRocketBaseB2FHiddenFullHeal:
dwb EVENT_TEAM_ROCKET_BASE_B2F_HIDDEN_FULL_HEAL, FULL_HEAL
-
MovementData_0x6d212:
step RIGHT
step RIGHT
diff --git a/maps/TinTower4F.asm b/maps/TinTower4F.asm
index 34d1be488..7a19c395b 100644
--- a/maps/TinTower4F.asm
+++ b/maps/TinTower4F.asm
@@ -22,7 +22,6 @@ TinTower4FEscapeRope:
TinTower4FHiddenMaxPotion:
dwb EVENT_TIN_TOWER_4F_HIDDEN_MAX_POTION, MAX_POTION
-
TinTower4F_MapEventHeader:
; filler
db 0, 0
diff --git a/maps/TinTower5F.asm b/maps/TinTower5F.asm
index d8991932c..968cf61fc 100644
--- a/maps/TinTower5F.asm
+++ b/maps/TinTower5F.asm
@@ -14,11 +14,9 @@ TinTower5FRareCandy:
TinTower5FHiddenFullRestore:
dwb EVENT_TIN_TOWER_5F_HIDDEN_FULL_RESTORE, FULL_RESTORE
-
TinTower5FHiddenCarbos:
dwb EVENT_TIN_TOWER_5F_HIDDEN_CARBOS, CARBOS
-
TinTower5F_MapEventHeader:
; filler
db 0, 0
diff --git a/maps/UndergroundPath.asm b/maps/UndergroundPath.asm
index 557a478be..45807676a 100644
--- a/maps/UndergroundPath.asm
+++ b/maps/UndergroundPath.asm
@@ -8,11 +8,9 @@ UndergroundPath_MapScriptHeader:
UndergroundPathHiddenFullRestore:
dwb EVENT_UNDERGROUND_PATH_HIDDEN_FULL_RESTORE, FULL_RESTORE
-
UndergroundPathHiddenXSpecial:
dwb EVENT_UNDERGROUND_PATH_HIDDEN_X_SPECIAL, X_SPECIAL
-
UndergroundPath_MapEventHeader:
; filler
db 0, 0
diff --git a/maps/VermilionPort.asm b/maps/VermilionPort.asm
index 557525898..9698eae6c 100644
--- a/maps/VermilionPort.asm
+++ b/maps/VermilionPort.asm
@@ -197,7 +197,6 @@ SuperNerdScript_0x74ee6:
VermilionPortHiddenIron:
dwb EVENT_VERMILION_PORT_HIDDEN_IRON, IRON
-
MovementData_0x74ef1:
step DOWN
step_end
diff --git a/maps/VictoryRoad.asm b/maps/VictoryRoad.asm
index 1ae22e121..c4b85dfbb 100644
--- a/maps/VictoryRoad.asm
+++ b/maps/VictoryRoad.asm
@@ -114,11 +114,9 @@ VictoryRoadHPUp:
VictoryRoadHiddenMaxPotion:
dwb EVENT_VICTORY_ROAD_HIDDEN_MAX_POTION, MAX_POTION
-
VictoryRoadHiddenFullHeal:
dwb EVENT_VICTORY_ROAD_HIDDEN_FULL_HEAL, FULL_HEAL
-
MovementData_0x74539:
step LEFT
step LEFT
diff --git a/maps/WhirlIslandB1F.asm b/maps/WhirlIslandB1F.asm
index 011b0ac8f..92bb755b7 100644
--- a/maps/WhirlIslandB1F.asm
+++ b/maps/WhirlIslandB1F.asm
@@ -34,15 +34,12 @@ WhirlIslandB1FBoulder:
WhirlIslandB1FHiddenRareCandy:
dwb EVENT_WHIRL_ISLAND_B1F_HIDDEN_RARE_CANDY, RARE_CANDY
-
WhirlIslandB1FHiddenUltraBall:
dwb EVENT_WHIRL_ISLAND_B1F_HIDDEN_ULTRA_BALL, ULTRA_BALL
-
WhirlIslandB1FHiddenFullRestore:
dwb EVENT_WHIRL_ISLAND_B1F_HIDDEN_FULL_RESTORE, FULL_RESTORE
-
WhirlIslandB1F_MapEventHeader:
; filler
db 0, 0