ref: 59c95abf836e139931a41d20cf95af2472763fab
parent: 5a8700c56a24f59eb181221456b3c8a75b60c068
author: Remy Oukaour <[email protected]>
date: Fri Jan 12 12:09:32 EST 2018
Trim whitespace
--- a/maps/BattleTowerBattleRoom.asm
+++ b/maps/BattleTowerBattleRoom.asm
@@ -133,12 +133,10 @@
closetext
end
-
Text_ReturnedAfterSave_Mobile:
text "You'll be returned"
line "after you SAVE."
done
-
BattleTowerBattleRoom_MapEventHeader:
; filler
--- a/maps/BattleTowerHallway.asm
+++ b/maps/BattleTowerHallway.asm
@@ -21,7 +21,6 @@
callasm .asm_load_battle_room
jump .WalkToChosenBattleRoom
-
.asm_load_battle_room
ld a, [rSVBK]
push af
@@ -34,7 +33,6 @@
pop af
ld [rSVBK], a
ret
-
; enter different rooms for different levels to battle against
; at least it should look like that
--- a/maps/BlackthornGym2F.asm
+++ b/maps/BlackthornGym2F.asm
@@ -56,7 +56,6 @@
earthquake 80
end
-
BlackthornGymBoulder:
jumpstd strengthboulder
--- a/maps/BurnedTower1F.asm
+++ b/maps/BurnedTower1F.asm
@@ -133,10 +133,8 @@
BurnedTower1FHiddenEther:
dwb EVENT_BURNED_TOWER_1F_HIDDEN_ETHER, ETHER
-
BurnedTower1FHiddenUltraBall:
dwb EVENT_BURNED_TOWER_1F_HIDDEN_ULTRA_BALL, ULTRA_BALL
-
BurnedTower1FHPUp:
itemball HP_UP
--- a/maps/CeladonDeptStore6F.asm
+++ b/maps/CeladonDeptStore6F.asm
@@ -94,7 +94,6 @@
db "LEMONADE ¥350@"
db "CANCEL@"
-
CeladonDeptStore6FDirectory:
jumptext CeladonDeptStore6FDirectoryText
--- a/maps/CeladonGameCornerPrizeRoom.asm
+++ b/maps/CeladonGameCornerPrizeRoom.asm
@@ -15,7 +15,7 @@
CeladonGameCornerPrizeRoomPharmacistScript:
jumptextfaceplayer CeladonGameCornerPrizeRoomPharmacistText
-GoldenrodGameCornerTMVendor:
+CeladonGameCornerPrizeRoomTMVendor:
faceplayer
opentext
writetext CeladonPrizeRoom_PrizeVendorIntroText
@@ -102,7 +102,6 @@
closetext
end
-
CeladonPrizeRoom_TMMenuDataHeader:
db $40 ; flags
db 02, 00 ; start coords
@@ -118,8 +117,7 @@
db "TM15 7500@"
db "CANCEL@"
-
-GoldenrodGameCornerPokemonVendor:
+CeladonGameCornerPrizeRoomPokemonVendor:
faceplayer
opentext
writetext CeladonPrizeRoom_PrizeVendorIntroText
@@ -191,7 +189,6 @@
takecoins 8888
jump .loop
-
.MenuDataHeader:
db $40 ; flags
db 02, 00 ; start coords
@@ -207,7 +204,6 @@
db "LARVITAR 8888@"
db "CANCEL@"
-
CeladonGameCornerPrizeRoomGentlemanText:
text "I wanted PORYGON,"
line "but I was short by"
@@ -283,8 +279,8 @@
.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
--- a/maps/CeruleanGym.asm
+++ b/maps/CeruleanGym.asm
@@ -137,7 +137,6 @@
CeruleanGymHiddenMachinePart:
dwb EVENT_FOUND_MACHINE_PART_IN_CERULEAN_GYM, MACHINE_PART
-
CeruleanGymStatue1:
checkevent EVENT_TRAINERS_IN_CERULEAN_GYM
iffalse CeruleanGymStatue
--- a/maps/DarkCaveVioletEntrance.asm
+++ b/maps/DarkCaveVioletEntrance.asm
@@ -33,7 +33,6 @@
DarkCaveVioletEntranceHiddenElixer:
dwb EVENT_DARK_CAVE_VIOLET_ENTRANCE_HIDDEN_ELIXER, ELIXER
-
DarkCaveVioletEntrance_MapEventHeader:
; filler
db 0, 0
--- a/maps/DiglettsCave.asm
+++ b/maps/DiglettsCave.asm
@@ -14,7 +14,6 @@
DiglettsCaveHiddenMaxRevive:
dwb EVENT_DIGLETTS_CAVE_HIDDEN_MAX_REVIVE, MAX_REVIVE
-
DiglettsCavePokefanMText:
text "A bunch of DIGLETT"
line "popped out of the"
--- a/maps/DragonShrine.asm
+++ b/maps/DragonShrine.asm
@@ -265,7 +265,6 @@
closetext
end
-
MenuDataHeader_0x18d215:
db $40 ; flags
db 04, 08 ; start coords
@@ -280,7 +279,6 @@
db "Underling@"
db "Friend@"
-
MenuDataHeader_0x18d234:
db $40 ; flags
db 04, 09 ; start coords
@@ -295,7 +293,6 @@
db "Raising@"
db "Cheating@"
-
MenuDataHeader_0x18d258:
db $40 ; flags
db 04, 05 ; start coords
@@ -310,7 +307,6 @@
db "Tough person@"
db "Anybody@"
-
MenuDataHeader_0x18d283:
db $40 ; flags
db 04, 08 ; start coords
@@ -325,7 +321,6 @@
db "Violence@"
db "Knowledge@"
-
MenuDataHeader_0x18d2a5:
db $40 ; flags
db 04, 12 ; start coords
@@ -339,7 +334,6 @@
db "Tough@"
db "Both@"
db "Weak@"
-
MovementData_0x18d2bf:
slow_step UP
--- a/maps/GoldenrodCity.asm
+++ b/maps/GoldenrodCity.asm
@@ -94,7 +94,6 @@
if_equal FALSE, .TeachMove
jump .Incompatible
-
.MoveMenuDataHeader:
db $40 ; flags
db 02, 00 ; start coords
@@ -109,7 +108,6 @@
db "THUNDERBOLT@"
db "ICE BEAM@"
db "CANCEL@"
-
.Refused:
writetext UnknownText_0x1990b4
--- a/maps/GoldenrodDeptStore6F.asm
+++ b/maps/GoldenrodDeptStore6F.asm
@@ -83,7 +83,6 @@
db "LEMONADE ¥350@"
db "CANCEL@"
-
GoldenrodDeptStore6FLassScript:
jumptextfaceplayer GoldenrodDeptStore6FLassText
--- a/maps/GoldenrodDeptStoreElevator.asm
+++ b/maps/GoldenrodDeptStoreElevator.asm
@@ -43,7 +43,6 @@
.Done:
end
-
Elevator_0x566e0:
db 7 ; floors
elevfloor FLOOR_B1F, 2, GOLDENROD_DEPT_STORE_B1F
@@ -54,7 +53,6 @@
elevfloor FLOOR_5F, 3, GOLDENROD_DEPT_STORE_5F
elevfloor FLOOR_6F, 2, GOLDENROD_DEPT_STORE_6F
db -1 ; end
-
GoldenrodDeptStoreElevator_MapEventHeader:
; filler
--- a/maps/GoldenrodGameCorner.asm
+++ b/maps/GoldenrodGameCorner.asm
@@ -138,7 +138,6 @@
closetext
end
-
GoldenrodGameCornerTMVendorMenuData:
db $40 ; flags
db 02, 00 ; start coords
@@ -154,7 +153,6 @@
db "TM38 5500@"
db "CANCEL@"
-
GoldenrodGameCornerPrizeMonVendorScript:
faceplayer
opentext
@@ -227,7 +225,6 @@
takecoins 1500
jump .loop
-
.MenuDataHeader:
db $40 ; flags
db 02, 00 ; start coords
@@ -242,7 +239,6 @@
db "CUBONE 800@"
db "WOBBUFFET 1500@"
db "CANCEL@"
-
GoldenrodGameCornerPharmacistScript:
faceplayer
--- a/maps/GoldenrodPokeComCenter2FMobile.asm
+++ b/maps/GoldenrodPokeComCenter2FMobile.asm
@@ -48,7 +48,6 @@
closetext
end
-
MenuDataHeader_0x62602:
db $40 ; flags
db 00, 00 ; start coords
@@ -63,7 +62,6 @@
db "モバイルセンター@" ; MOBILE CENTER
db "やめる@" ; QUIT
-
MapGoldenrodPokeComCenter2FMobileSignpost1Script:
opentext
writetext UnknownText_0x62989
@@ -93,7 +91,6 @@
closetext
end
-
MenuDataHeader_0x6264c:
db $40 ; flags
db 00, 00 ; start coords
@@ -107,7 +104,6 @@
db "でんわ", $1f,"つかうとき@" ; Use phone
db "でんわ", $4a,"つながらないとき@" ; Don't use phone
db "やめる@" ; QUIT
-
MapGoldenrodPokeComCenter2FMobileSignpost2Script:
jumptext UnknownText_0x62b26
--- a/maps/IcePathB1F.asm
+++ b/maps/IcePathB1F.asm
@@ -62,7 +62,6 @@
earthquake 80
end
-
IcePathB1FBoulder:
jumpstd strengthboulder
@@ -72,12 +71,10 @@
IcePathB1FHiddenMaxPotion:
dwb EVENT_ICE_PATH_B1F_HIDDEN_MAX_POTION, MAX_POTION
-
IcePathBoulderFellThroughText:
text "The boulder fell"
line "through."
done
-
IcePathB1F_MapEventHeader:
; filler
--- a/maps/IcePathB2FBlackthornSide.asm
+++ b/maps/IcePathB2FBlackthornSide.asm
@@ -14,7 +14,6 @@
IcePathB2FBlackthornSideHiddenIceHeal:
dwb EVENT_ICE_PATH_B2F_BLACKTHORN_SIDE_HIDDEN_ICE_HEAL, ICE_HEAL
-
IcePathB2FBlackthornSide_MapEventHeader:
; filler
db 0, 0
--- a/maps/IcePathB2FMahoganySide.asm
+++ b/maps/IcePathB2FMahoganySide.asm
@@ -25,7 +25,6 @@
IcePathB2FMahoganySideHiddenCarbos:
dwb EVENT_ICE_PATH_B2F_MAHOGANY_SIDE_HIDDEN_CARBOS, CARBOS
-
UnknownText_0x7e5ad:
text "It's immovably"
line "imbedded in ice."
--- a/maps/IlexForest.asm
+++ b/maps/IlexForest.asm
@@ -416,10 +416,8 @@
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
--- a/maps/LakeOfRage.asm
+++ b/maps/LakeOfRage.asm
@@ -234,14 +234,11 @@
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
--- a/maps/MountMoonSquare.asm
+++ b/maps/MountMoonSquare.asm
@@ -77,7 +77,6 @@
MountMoonSquareHiddenMoonStone:
dwb EVENT_MOUNT_MOON_SQUARE_HIDDEN_MOON_STONE, MOON_STONE
-
DontLitterSign:
jumptext DontLitterSignText
--- a/maps/MountMortar1FInside.asm
+++ b/maps/MountMortar1FInside.asm
@@ -66,7 +66,6 @@
MountMortar1FInsideHiddenMaxRepel:
dwb EVENT_MOUNT_MORTAR_1F_INSIDE_HIDDEN_MAX_REPEL, MAX_REPEL
-
PokemaniacMillerSeenText:
text "I'm not losing"
line "this time!"
--- a/maps/MountMortar1FOutside.asm
+++ b/maps/MountMortar1FOutside.asm
@@ -18,7 +18,6 @@
MountMortar1FOutsideHiddenHyperPotion:
dwb EVENT_MOUNT_MORTAR_1F_OUTSIDE_HIDDEN_HYPER_POTION, HYPER_POTION
-
MountMortar1FOutside_MapEventHeader:
; filler
db 0, 0
--- a/maps/MountMortar2FInside.asm
+++ b/maps/MountMortar2FInside.asm
@@ -46,7 +46,6 @@
MountMortar2FInsideHiddenFullRestore:
dwb EVENT_MOUNT_MORTAR_2F_INSIDE_HIDDEN_FULL_RESTORE, FULL_RESTORE
-
SupernerdHughSeenText:
text "Yo! MARKUS!"
done
--- a/maps/MountMortarB1F.asm
+++ b/maps/MountMortarB1F.asm
@@ -74,7 +74,6 @@
MountMortarB1FHiddenMaxRevive:
dwb EVENT_MOUNT_MORTAR_B1F_HIDDEN_MAX_REVIVE, MAX_REVIVE
-
UnknownText_0x7e24d:
text "Hey!"
--- a/maps/NationalPark.asm
+++ b/maps/NationalPark.asm
@@ -307,7 +307,6 @@
NationalParkHiddenFullHeal:
dwb EVENT_NATIONAL_PARK_HIDDEN_FULL_HEAL, FULL_HEAL
-
NationalParkLassText:
text "Look! Check out my"
line "bag!"
--- a/maps/NationalParkBugContest.asm
+++ b/maps/NationalParkBugContest.asm
@@ -117,7 +117,6 @@
NationalParkBugContestHiddenFullHeal:
dwb EVENT_NATIONAL_PARK_HIDDEN_FULL_HEAL, FULL_HEAL
-
UnknownText_0x5c94c:
text "DON: I'm going to"
line "win! Don't bother"
--- a/maps/OlivineLighthouse5F.asm
+++ b/maps/OlivineLighthouse5F.asm
@@ -46,7 +46,6 @@
OlivineLighthouse5FHiddenHyperPotion:
dwb EVENT_OLIVINE_LIGHTHOUSE_5F_HIDDEN_HYPER_POTION, HYPER_POTION
-
SailorErnestSeenText:
text "I wanted to battle"
line "JASMINE, but she's"
--- a/maps/OlivinePort.asm
+++ b/maps/OlivinePort.asm
@@ -236,7 +236,6 @@
OlivinePortHiddenProtein:
dwb EVENT_OLIVINE_PORT_HIDDEN_PROTEIN, PROTEIN
-
MovementData_0x74a30:
step DOWN
step_end
--- a/maps/RockTunnel1F.asm
+++ b/maps/RockTunnel1F.asm
@@ -18,10 +18,8 @@
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
--- a/maps/RockTunnelB1F.asm
+++ b/maps/RockTunnelB1F.asm
@@ -22,7 +22,6 @@
RockTunnelB1FHiddenMaxPotion:
dwb EVENT_ROCK_TUNNEL_B1F_HIDDEN_MAX_POTION, MAX_POTION
-
RockTunnelB1F_MapEventHeader:
; filler
db 0, 0
--- a/maps/Route11.asm
+++ b/maps/Route11.asm
@@ -65,7 +65,6 @@
Route11HiddenRevive:
dwb EVENT_ROUTE_11_HIDDEN_REVIVE, REVIVE
-
YoungsterOwenSeenText:
text "There's no cheat-"
line "ing in #MON."
--- a/maps/Route12.asm
+++ b/maps/Route12.asm
@@ -72,7 +72,6 @@
Route12HiddenElixer:
dwb EVENT_ROUTE_12_HIDDEN_ELIXER, ELIXER
-
FisherMartinSeenText:
text "Patience is the"
line "key to both fish-"
--- a/maps/Route13.asm
+++ b/maps/Route13.asm
@@ -79,7 +79,6 @@
Route13HiddenCalcium:
dwb EVENT_ROUTE_13_HIDDEN_CALCIUM, CALCIUM
-
PokefanmAlexSeenText:
text "Bow down before my"
line "regal #MON!"
--- a/maps/Route17.asm
+++ b/maps/Route17.asm
@@ -64,10 +64,8 @@
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"
--- a/maps/Route25.asm
+++ b/maps/Route25.asm
@@ -193,7 +193,6 @@
Route25HiddenPotion:
dwb EVENT_ROUTE_25_HIDDEN_POTION, POTION
-
MovementData_0x19efe8:
big_step DOWN
step_end
--- a/maps/Route28.asm
+++ b/maps/Route28.asm
@@ -11,7 +11,6 @@
Route28HiddenRareCandy:
dwb EVENT_ROUTE_28_HIDDEN_RARE_CANDY, RARE_CANDY
-
Route28SignText:
text "ROUTE 28"
done
--- a/maps/Route30.asm
+++ b/maps/Route30.asm
@@ -250,7 +250,6 @@
Route30HiddenPotion:
dwb EVENT_ROUTE_30_HIDDEN_POTION, POTION
-
Route30_JoeysRattataAttacksMovement:
fix_facing
big_step UP
--- a/maps/Route32.asm
+++ b/maps/Route32.asm
@@ -508,10 +508,8 @@
Route32HiddenGreatBall:
dwb EVENT_ROUTE_32_HIDDEN_GREAT_BALL, GREAT_BALL
-
Route32HiddenSuperPotion:
dwb EVENT_ROUTE_32_HIDDEN_SUPER_POTION, SUPER_POTION
-
Movement_Route32CooltrainerMPushesYouBackToViolet:
step UP
--- a/maps/Route34.asm
+++ b/maps/Route34.asm
@@ -490,10 +490,8 @@
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
--- a/maps/Route37.asm
+++ b/maps/Route37.asm
@@ -116,7 +116,6 @@
Route37HiddenEther:
dwb EVENT_ROUTE_37_HIDDEN_ETHER, ETHER
-
TwinsAnnandanne1SeenText:
text "ANN: ANNE and I"
line "are in this to-"
--- a/maps/Route39.asm
+++ b/maps/Route39.asm
@@ -182,7 +182,6 @@
Route39HiddenNugget:
dwb EVENT_ROUTE_39_HIDDEN_NUGGET, NUGGET
-
Route39MiltankText:
text "MILTANK: Mooo!"
done
--- a/maps/Route4.asm
+++ b/maps/Route4.asm
@@ -53,7 +53,6 @@
Route4HiddenUltraBall:
dwb EVENT_ROUTE_4_HIDDEN_ULTRA_BALL, ULTRA_BALL
-
BirdKeeperHankSeenText:
text "I'm raising my"
line "#MON. Want to"
--- a/maps/Route42.asm
+++ b/maps/Route42.asm
@@ -214,7 +214,6 @@
Route42HiddenMaxPotion:
dwb EVENT_ROUTE_42_HIDDEN_MAX_POTION, MAX_POTION
-
MovementData_0x1a9356:
set_sliding
fast_jump_step UP
--- a/maps/Route44.asm
+++ b/maps/Route44.asm
@@ -320,7 +320,6 @@
Route44HiddenElixer:
dwb EVENT_ROUTE_44_HIDDEN_ELIXER, ELIXER
-
FisherWilton1SeenText:
text "Aack! You made me"
line "lose a POLIWAG!"
--- a/maps/Route45.asm
+++ b/maps/Route45.asm
@@ -314,7 +314,6 @@
Route45HiddenPpUp:
dwb EVENT_ROUTE_45_HIDDEN_PP_UP, PP_UP
-
HikerErikSeenText:
text "Be prepared for"
line "anything!"
--- a/maps/Route9.asm
+++ b/maps/Route9.asm
@@ -85,7 +85,6 @@
Route9HiddenEther:
dwb EVENT_ROUTE_9_HIDDEN_ETHER, ETHER
-
CamperDeanSeenText:
text "I came to explore"
line "ROCK TUNNEL."
--- a/maps/RuinsOfAlphOutside.asm
+++ b/maps/RuinsOfAlphOutside.asm
@@ -112,7 +112,6 @@
closetext
end
-
TrainerSuperNerdStan:
trainer EVENT_BEAT_SUPER_NERD_STAN, SUPER_NERD, STAN, UnknownText_0x581e5, UnknownText_0x58217, 0, .Script
@@ -123,7 +122,6 @@
waitbutton
closetext
end
-
RuinsOfAlphOutsideSignpost0Script:
jumptext UnknownText_0x58325
--- a/maps/SilverCaveRoom1.asm
+++ b/maps/SilverCaveRoom1.asm
@@ -26,10 +26,8 @@
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
--- a/maps/SilverCaveRoom2.asm
+++ b/maps/SilverCaveRoom2.asm
@@ -22,7 +22,6 @@
SilverCaveRoom2HiddenMaxPotion:
dwb EVENT_SILVER_CAVE_ROOM_2_HIDDEN_MAX_POTION, MAX_POTION
-
SilverCaveRoom2_MapEventHeader:
; filler
db 0, 0
--- a/maps/TeamRocketBaseB1F.asm
+++ b/maps/TeamRocketBaseB1F.asm
@@ -542,7 +542,6 @@
TeamRocketBaseB1FHiddenRevive:
dwb EVENT_TEAM_ROCKET_BASE_B1F_HIDDEN_REVIVE, REVIVE
-
SecurityCameraMovement1:
big_step RIGHT
big_step RIGHT
--- a/maps/TeamRocketBaseB2F.asm
+++ b/maps/TeamRocketBaseB2F.asm
@@ -358,7 +358,6 @@
TeamRocketBaseB2FHiddenFullHeal:
dwb EVENT_TEAM_ROCKET_BASE_B2F_HIDDEN_FULL_HEAL, FULL_HEAL
-
MovementData_0x6d212:
step RIGHT
step RIGHT
--- a/maps/TinTower4F.asm
+++ b/maps/TinTower4F.asm
@@ -22,7 +22,6 @@
TinTower4FHiddenMaxPotion:
dwb EVENT_TIN_TOWER_4F_HIDDEN_MAX_POTION, MAX_POTION
-
TinTower4F_MapEventHeader:
; filler
db 0, 0
--- a/maps/TinTower5F.asm
+++ b/maps/TinTower5F.asm
@@ -14,10 +14,8 @@
TinTower5FHiddenFullRestore:
dwb EVENT_TIN_TOWER_5F_HIDDEN_FULL_RESTORE, FULL_RESTORE
-
TinTower5FHiddenCarbos:
dwb EVENT_TIN_TOWER_5F_HIDDEN_CARBOS, CARBOS
-
TinTower5F_MapEventHeader:
; filler
--- a/maps/UndergroundPath.asm
+++ b/maps/UndergroundPath.asm
@@ -8,10 +8,8 @@
UndergroundPathHiddenFullRestore:
dwb EVENT_UNDERGROUND_PATH_HIDDEN_FULL_RESTORE, FULL_RESTORE
-
UndergroundPathHiddenXSpecial:
dwb EVENT_UNDERGROUND_PATH_HIDDEN_X_SPECIAL, X_SPECIAL
-
UndergroundPath_MapEventHeader:
; filler
--- a/maps/VermilionPort.asm
+++ b/maps/VermilionPort.asm
@@ -197,7 +197,6 @@
VermilionPortHiddenIron:
dwb EVENT_VERMILION_PORT_HIDDEN_IRON, IRON
-
MovementData_0x74ef1:
step DOWN
step_end
--- a/maps/VictoryRoad.asm
+++ b/maps/VictoryRoad.asm
@@ -114,10 +114,8 @@
VictoryRoadHiddenMaxPotion:
dwb EVENT_VICTORY_ROAD_HIDDEN_MAX_POTION, MAX_POTION
-
VictoryRoadHiddenFullHeal:
dwb EVENT_VICTORY_ROAD_HIDDEN_FULL_HEAL, FULL_HEAL
-
MovementData_0x74539:
step LEFT
--- a/maps/WhirlIslandB1F.asm
+++ b/maps/WhirlIslandB1F.asm
@@ -34,14 +34,11 @@
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