From 3088a77a21fd39b9bfa0850e676ddbbed5fdf52b Mon Sep 17 00:00:00 2001 From: Rangi Date: Thu, 1 Feb 2018 21:54:00 -0500 Subject: [PATCH] warp_event x, y, map, warp_id --- docs/map_event_scripts.md | 2 +- macros/scripts/maps.asm | 8 +-- maps/AzaleaGym.asm | 4 +- maps/AzaleaMart.asm | 4 +- maps/AzaleaPokecenter1F.asm | 6 +- maps/AzaleaTown.asm | 16 ++--- maps/BattleTower1F.asm | 6 +- maps/BattleTowerBattleRoom.asm | 4 +- maps/BattleTowerElevator.asm | 4 +- maps/BattleTowerHallway.asm | 12 ++-- maps/BattleTowerOutside.asm | 8 +-- maps/BillsBrothersHouse.asm | 4 +- maps/BillsFamilysHouse.asm | 4 +- maps/BillsHouse.asm | 4 +- maps/BlackthornCity.asm | 16 ++--- maps/BlackthornDragonSpeechHouse.asm | 4 +- maps/BlackthornEmysHouse.asm | 4 +- maps/BlackthornGym1F.asm | 14 ++-- maps/BlackthornGym2F.asm | 10 +-- maps/BlackthornMart.asm | 4 +- maps/BlackthornPokecenter1F.asm | 6 +- maps/BluesHouse.asm | 4 +- maps/BrunosRoom.asm | 8 +-- maps/BurnedTower1F.asm | 28 ++++---- maps/BurnedTowerB1F.asm | 12 ++-- maps/CeladonCafe.asm | 4 +- maps/CeladonCity.asm | 18 ++--- maps/CeladonDeptStore1F.asm | 8 +-- maps/CeladonDeptStore2F.asm | 6 +- maps/CeladonDeptStore3F.asm | 6 +- maps/CeladonDeptStore4F.asm | 6 +- maps/CeladonDeptStore5F.asm | 6 +- maps/CeladonDeptStore6F.asm | 4 +- maps/CeladonDeptStoreElevator.asm | 4 +- maps/CeladonGameCorner.asm | 4 +- maps/CeladonGameCornerPrizeRoom.asm | 4 +- maps/CeladonGym.asm | 4 +- maps/CeladonMansion1F.asm | 10 +-- maps/CeladonMansion2F.asm | 8 +-- maps/CeladonMansion3F.asm | 8 +-- maps/CeladonMansionRoof.asm | 6 +- maps/CeladonMansionRoofHouse.asm | 4 +- maps/CeladonPokecenter1F.asm | 6 +- maps/CeladonPokecenter2FBeta.asm | 2 +- maps/CeruleanCity.asm | 12 ++-- maps/CeruleanGym.asm | 4 +- maps/CeruleanGymBadgeSpeechHouse.asm | 4 +- maps/CeruleanMart.asm | 4 +- maps/CeruleanPokecenter1F.asm | 6 +- maps/CeruleanPokecenter2FBeta.asm | 2 +- maps/CeruleanPoliceStation.asm | 4 +- maps/CeruleanTradeSpeechHouse.asm | 4 +- maps/CharcoalKiln.asm | 4 +- maps/CherrygroveCity.asm | 10 +-- maps/CherrygroveEvolutionSpeechHouse.asm | 4 +- maps/CherrygroveGymSpeechHouse.asm | 4 +- maps/CherrygroveMart.asm | 4 +- maps/CherrygrovePokecenter1F.asm | 6 +- maps/CianwoodCity.asm | 14 ++-- maps/CianwoodGym.asm | 4 +- maps/CianwoodLugiaSpeechHouse.asm | 4 +- maps/CianwoodPharmacy.asm | 4 +- maps/CianwoodPhotoStudio.asm | 4 +- maps/CianwoodPokecenter1F.asm | 6 +- maps/CinnabarIsland.asm | 2 +- maps/CinnabarPokecenter1F.asm | 6 +- maps/CinnabarPokecenter2FBeta.asm | 2 +- maps/Colosseum.asm | 4 +- maps/CopycatsHouse1F.asm | 6 +- maps/CopycatsHouse2F.asm | 2 +- maps/DanceTheatre.asm | 4 +- maps/DarkCaveBlackthornEntrance.asm | 4 +- maps/DarkCaveVioletEntrance.asm | 6 +- maps/DayCare.asm | 8 +-- maps/DayOfWeekSiblingsHouse.asm | 4 +- maps/DiglettsCave.asm | 12 ++-- maps/DragonShrine.asm | 4 +- maps/DragonsDen1F.asm | 8 +-- maps/DragonsDenB1F.asm | 4 +- maps/EarlsPokemonAcademy.asm | 4 +- maps/EcruteakCity.asm | 30 ++++----- maps/EcruteakGym.asm | 66 +++++++++---------- maps/EcruteakItemfinderHouse.asm | 4 +- maps/EcruteakLugiaSpeechHouse.asm | 4 +- maps/EcruteakMart.asm | 4 +- maps/EcruteakPokecenter1F.asm | 6 +- maps/EcruteakTinTowerEntrance.asm | 10 +-- maps/ElmsHouse.asm | 4 +- maps/ElmsLab.asm | 4 +- maps/FastShip1F.asm | 24 +++---- maps/FastShipB1F.asm | 4 +- maps/FastShipCabins_NNW_NNE_NE.asm | 6 +- maps/FastShipCabins_SE_SSE_CaptainsCabin.asm | 12 ++-- maps/FastShipCabins_SW_SSW_NW.asm | 10 +-- maps/FightingDojo.asm | 4 +- maps/FuchsiaCity.asm | 22 +++---- maps/FuchsiaGym.asm | 4 +- maps/FuchsiaMart.asm | 4 +- maps/FuchsiaPokecenter1F.asm | 6 +- maps/FuchsiaPokecenter2FBeta.asm | 2 +- maps/GoldenrodBikeShop.asm | 4 +- maps/GoldenrodCity.asm | 30 ++++----- maps/GoldenrodDeptStore1F.asm | 8 +-- maps/GoldenrodDeptStore2F.asm | 6 +- maps/GoldenrodDeptStore3F.asm | 6 +- maps/GoldenrodDeptStore4F.asm | 6 +- maps/GoldenrodDeptStore5F.asm | 6 +- maps/GoldenrodDeptStore6F.asm | 6 +- maps/GoldenrodDeptStoreB1F.asm | 6 +- maps/GoldenrodDeptStoreElevator.asm | 4 +- maps/GoldenrodDeptStoreRoof.asm | 2 +- maps/GoldenrodFlowerShop.asm | 4 +- maps/GoldenrodGameCorner.asm | 4 +- maps/GoldenrodGym.asm | 4 +- maps/GoldenrodHappinessRater.asm | 4 +- maps/GoldenrodMagnetTrainStation.asm | 8 +-- maps/GoldenrodNameRater.asm | 4 +- maps/GoldenrodPPSpeechHouse.asm | 4 +- maps/GoldenrodPokecenter1F.asm | 8 +-- maps/GoldenrodUnderground.asm | 12 ++-- ...oldenrodUndergroundSwitchRoomEntrances.asm | 18 ++--- maps/GoldenrodUndergroundWarehouse.asm | 6 +- maps/GuideGentsHouse.asm | 4 +- maps/HallOfFame.asm | 4 +- maps/IcePath1F.asm | 8 +-- maps/IcePathB1F.asm | 16 ++--- maps/IcePathB2FBlackthornSide.asm | 4 +- maps/IcePathB2FMahoganySide.asm | 12 ++-- maps/IcePathB3F.asm | 4 +- maps/IlexForest.asm | 6 +- maps/IlexForestAzaleaGate.asm | 8 +-- maps/IndigoPlateauPokecenter1F.asm | 8 +-- maps/KarensRoom.asm | 8 +-- maps/KogasRoom.asm | 8 +-- maps/KurtsHouse.asm | 4 +- maps/LakeOfRage.asm | 4 +- maps/LakeOfRageHiddenPowerHouse.asm | 4 +- maps/LakeOfRageMagikarpHouse.asm | 4 +- maps/LancesRoom.asm | 8 +-- maps/LavRadioTower1F.asm | 4 +- maps/LavenderMart.asm | 4 +- maps/LavenderNameRater.asm | 4 +- maps/LavenderPokecenter1F.asm | 6 +- maps/LavenderPokecenter2FBeta.asm | 2 +- maps/LavenderSpeechHouse.asm | 4 +- maps/LavenderTown.asm | 14 ++-- maps/MahoganyGym.asm | 4 +- maps/MahoganyMart1F.asm | 6 +- maps/MahoganyPokecenter1F.asm | 6 +- maps/MahoganyRedGyaradosSpeechHouse.asm | 4 +- maps/MahoganyTown.asm | 10 +-- maps/ManiasHouse.asm | 4 +- maps/MobileBattleRoom.asm | 4 +- maps/MobileTradeRoom.asm | 4 +- maps/MountMoon.asm | 16 ++--- maps/MountMoonGiftShop.asm | 4 +- maps/MountMoonSquare.asm | 6 +- maps/MountMortar1FInside.asm | 12 ++-- maps/MountMortar1FOutside.asm | 18 ++--- maps/MountMortar2FInside.asm | 4 +- maps/MountMortarB1F.asm | 4 +- maps/MoveDeletersHouse.asm | 4 +- maps/MrFujisHouse.asm | 4 +- maps/MrPokemonsHouse.asm | 4 +- maps/MrPsychicsHouse.asm | 4 +- maps/NationalPark.asm | 8 +-- maps/NationalParkBugContest.asm | 8 +-- maps/NewBarkTown.asm | 8 +-- maps/OaksLab.asm | 4 +- maps/OlivineCafe.asm | 4 +- maps/OlivineCity.asm | 22 +++---- maps/OlivineGoodRodHouse.asm | 4 +- maps/OlivineGym.asm | 4 +- maps/OlivineHouseBeta.asm | 4 +- maps/OlivineLighthouse1F.asm | 10 +-- maps/OlivineLighthouse2F.asm | 12 ++-- maps/OlivineLighthouse3F.asm | 18 ++--- maps/OlivineLighthouse4F.asm | 20 +++--- maps/OlivineLighthouse5F.asm | 14 ++-- maps/OlivineLighthouse6F.asm | 6 +- maps/OlivineMart.asm | 4 +- maps/OlivinePokecenter1F.asm | 6 +- maps/OlivinePort.asm | 4 +- maps/OlivinePortPassage.asm | 10 +-- maps/OlivinePunishmentSpeechHouse.asm | 4 +- maps/OlivineTimsHouse.asm | 4 +- maps/PalletTown.asm | 6 +- maps/PewterCity.asm | 10 +-- maps/PewterGym.asm | 4 +- maps/PewterMart.asm | 4 +- maps/PewterNidoranSpeechHouse.asm | 4 +- maps/PewterPokecenter1F.asm | 6 +- maps/PewterPokecenter2FBeta.asm | 2 +- maps/PewterSnoozeSpeechHouse.asm | 4 +- maps/PlayersHouse1F.asm | 6 +- maps/PlayersHouse2F.asm | 2 +- maps/PlayersNeighborsHouse.asm | 4 +- maps/PokeSeersHouse.asm | 4 +- maps/Pokecenter2F.asm | 12 ++-- maps/PokecomCenterAdminRoomMobile.asm | 4 +- maps/PokemonFanClub.asm | 4 +- maps/PowerPlant.asm | 4 +- maps/RadioTower1F.asm | 6 +- maps/RadioTower2F.asm | 4 +- maps/RadioTower3F.asm | 6 +- maps/RadioTower4F.asm | 8 +-- maps/RadioTower5F.asm | 4 +- maps/RedsHouse1F.asm | 6 +- maps/RedsHouse2F.asm | 2 +- maps/RockTunnel1F.asm | 12 ++-- maps/RockTunnelB1F.asm | 8 +-- maps/Route10North.asm | 4 +- maps/Route10Pokecenter1F.asm | 6 +- maps/Route10Pokecenter2FBeta.asm | 2 +- maps/Route10South.asm | 2 +- maps/Route12.asm | 2 +- maps/Route12SuperRodHouse.asm | 4 +- maps/Route15.asm | 4 +- maps/Route15FuchsiaGate.asm | 8 +-- maps/Route16.asm | 10 +-- maps/Route16FuchsiaSpeechHouse.asm | 4 +- maps/Route16Gate.asm | 8 +-- maps/Route17.asm | 4 +- maps/Route17Route18Gate.asm | 8 +-- maps/Route18.asm | 4 +- maps/Route19.asm | 2 +- maps/Route19FuchsiaGate.asm | 8 +-- maps/Route2.asm | 10 +-- maps/Route20.asm | 2 +- maps/Route22.asm | 2 +- maps/Route23.asm | 8 +-- maps/Route25.asm | 2 +- maps/Route26.asm | 6 +- maps/Route26HealHouse.asm | 4 +- maps/Route27.asm | 6 +- maps/Route27SandstormHouse.asm | 4 +- maps/Route28.asm | 4 +- maps/Route28SteelWingHouse.asm | 4 +- maps/Route29.asm | 2 +- maps/Route29Route46Gate.asm | 8 +-- maps/Route2Gate.asm | 8 +-- maps/Route2NuggetHouse.asm | 4 +- maps/Route3.asm | 2 +- maps/Route30.asm | 4 +- maps/Route30BerryHouse.asm | 4 +- maps/Route31.asm | 6 +- maps/Route31VioletGate.asm | 8 +-- maps/Route32.asm | 8 +-- maps/Route32Pokecenter1F.asm | 6 +- maps/Route32RuinsOfAlphGate.asm | 8 +-- maps/Route33.asm | 2 +- maps/Route34.asm | 10 +-- maps/Route34IlexForestGate.asm | 8 +-- maps/Route35.asm | 6 +- maps/Route35GoldenrodGate.asm | 8 +-- maps/Route35NationalParkGate.asm | 8 +-- maps/Route36.asm | 8 +-- maps/Route36NationalParkGate.asm | 8 +-- maps/Route36RuinsOfAlphGate.asm | 8 +-- maps/Route38.asm | 4 +- maps/Route38EcruteakGate.asm | 8 +-- maps/Route39.asm | 4 +- maps/Route39Barn.asm | 4 +- maps/Route39Farmhouse.asm | 4 +- maps/Route4.asm | 2 +- maps/Route40.asm | 2 +- maps/Route40BattleTowerGate.asm | 8 +-- maps/Route41.asm | 8 +-- maps/Route42.asm | 10 +-- maps/Route42EcruteakGate.asm | 8 +-- maps/Route43.asm | 10 +-- maps/Route43Gate.asm | 8 +-- maps/Route43MahoganyGate.asm | 8 +-- maps/Route44.asm | 2 +- maps/Route45.asm | 2 +- maps/Route46.asm | 6 +- maps/Route5.asm | 8 +-- maps/Route5CleanseTagHouse.asm | 4 +- maps/Route5SaffronGate.asm | 8 +-- maps/Route5UndergroundPathEntrance.asm | 6 +- maps/Route6.asm | 4 +- maps/Route6SaffronGate.asm | 8 +-- maps/Route6UndergroundPathEntrance.asm | 6 +- maps/Route7.asm | 4 +- maps/Route7SaffronGate.asm | 8 +-- maps/Route8.asm | 4 +- maps/Route8SaffronGate.asm | 8 +-- maps/Route9.asm | 2 +- maps/RuinsOfAlphAerodactylChamber.asm | 10 +-- maps/RuinsOfAlphAerodactylItemRoom.asm | 8 +-- maps/RuinsOfAlphAerodactylWordRoom.asm | 6 +- maps/RuinsOfAlphHoOhChamber.asm | 10 +-- maps/RuinsOfAlphHoOhItemRoom.asm | 8 +-- maps/RuinsOfAlphHoOhWordRoom.asm | 6 +- maps/RuinsOfAlphInnerChamber.asm | 18 ++--- maps/RuinsOfAlphKabutoChamber.asm | 10 +-- maps/RuinsOfAlphKabutoItemRoom.asm | 8 +-- maps/RuinsOfAlphKabutoWordRoom.asm | 6 +- maps/RuinsOfAlphOmanyteChamber.asm | 10 +-- maps/RuinsOfAlphOmanyteItemRoom.asm | 8 +-- maps/RuinsOfAlphOmanyteWordRoom.asm | 6 +- maps/RuinsOfAlphOutside.asm | 22 +++---- maps/RuinsOfAlphResearchCenter.asm | 4 +- maps/SafariZoneBeta.asm | 4 +- maps/SafariZoneFuchsiaGateBeta.asm | 8 +-- maps/SafariZoneMainOffice.asm | 4 +- maps/SafariZoneWardensHome.asm | 4 +- maps/SaffronCity.asm | 30 ++++----- maps/SaffronGym.asm | 64 +++++++++--------- maps/SaffronMagnetTrainStation.asm | 8 +-- maps/SaffronMart.asm | 4 +- maps/SaffronPokecenter1F.asm | 6 +- maps/SaffronPokecenter2FBeta.asm | 2 +- maps/SeafoamGym.asm | 2 +- maps/SilphCo1F.asm | 4 +- maps/SilverCaveItemRooms.asm | 4 +- maps/SilverCaveOutside.asm | 4 +- maps/SilverCavePokecenter1F.asm | 6 +- maps/SilverCaveRoom1.asm | 4 +- maps/SilverCaveRoom2.asm | 8 +-- maps/SilverCaveRoom3.asm | 2 +- maps/SlowpokeWellB1F.asm | 4 +- maps/SlowpokeWellB2F.asm | 2 +- maps/SoulHouse.asm | 4 +- maps/SproutTower1F.asm | 10 +-- maps/SproutTower2F.asm | 8 +-- maps/SproutTower3F.asm | 2 +- maps/TeamRocketBaseB1F.asm | 8 +-- maps/TeamRocketBaseB2F.asm | 10 +-- maps/TeamRocketBaseB3F.asm | 8 +-- maps/TimeCapsule.asm | 4 +- maps/TinTower1F.asm | 6 +- maps/TinTower2F.asm | 4 +- maps/TinTower3F.asm | 4 +- maps/TinTower4F.asm | 8 +-- maps/TinTower5F.asm | 8 +-- maps/TinTower6F.asm | 4 +- maps/TinTower7F.asm | 10 +-- maps/TinTower8F.asm | 12 ++-- maps/TinTower9F.asm | 14 ++-- maps/TinTowerRoof.asm | 2 +- maps/TohjoFalls.asm | 4 +- maps/TradeCenter.asm | 4 +- maps/TrainerHouse1F.asm | 6 +- maps/TrainerHouseB1F.asm | 2 +- maps/UndergroundPath.asm | 4 +- maps/UnionCave1F.asm | 8 +-- maps/UnionCaveB1F.asm | 10 +-- maps/UnionCaveB2F.asm | 2 +- maps/VermilionCity.asm | 20 +++--- maps/VermilionDiglettsCaveSpeechHouse.asm | 4 +- maps/VermilionFishingSpeechHouse.asm | 4 +- maps/VermilionGym.asm | 4 +- maps/VermilionMagnetTrainSpeechHouse.asm | 4 +- maps/VermilionMart.asm | 4 +- maps/VermilionPokecenter1F.asm | 6 +- maps/VermilionPokecenter2FBeta.asm | 2 +- maps/VermilionPort.asm | 4 +- maps/VermilionPortPassage.asm | 10 +-- maps/VictoryRoad.asm | 20 +++--- maps/VictoryRoadGate.asm | 16 ++--- maps/VioletCity.asm | 18 ++--- maps/VioletGym.asm | 4 +- maps/VioletKylesHouse.asm | 4 +- maps/VioletMart.asm | 4 +- maps/VioletNicknameSpeechHouse.asm | 4 +- maps/VioletPokecenter1F.asm | 6 +- maps/ViridianCity.asm | 10 +-- maps/ViridianGym.asm | 4 +- maps/ViridianMart.asm | 4 +- maps/ViridianNicknameSpeechHouse.asm | 4 +- maps/ViridianPokecenter1F.asm | 6 +- maps/ViridianPokecenter2FBeta.asm | 2 +- maps/WhirlIslandB1F.asm | 18 ++--- maps/WhirlIslandB2F.asm | 8 +-- maps/WhirlIslandCave.asm | 4 +- maps/WhirlIslandLugiaChamber.asm | 2 +- maps/WhirlIslandNE.asm | 6 +- maps/WhirlIslandNW.asm | 8 +-- maps/WhirlIslandSE.asm | 4 +- maps/WhirlIslandSW.asm | 10 +-- maps/WillsRoom.asm | 6 +- maps/WiseTriosRoom.asm | 6 +- 383 files changed, 1317 insertions(+), 1317 deletions(-) diff --git a/docs/map_event_scripts.md b/docs/map_event_scripts.md index c8edc9dc1..a77f74503 100644 --- a/docs/map_event_scripts.md +++ b/docs/map_event_scripts.md @@ -106,7 +106,7 @@ 
 	db N ; warp events
-	warp_event x, y, warp_id, map
+	warp_event x, y, map, warp_id
diff --git a/macros/scripts/maps.asm b/macros/scripts/maps.asm index 12f1adb8e..7d06a620f 100644 --- a/macros/scripts/maps.asm +++ b/macros/scripts/maps.asm @@ -19,10 +19,10 @@ ENDM warp_event: MACRO ;\1: x: left to right, starts at 0 ;\2: y: top to bottom, starts at 0 -;\3: warp destination: starts at 1 -;\4: map id: from constants/map_constants.asm - db \2, \1, \3 - map \4 +;\3: map id: from constants/map_constants.asm +;\4: warp destination: starts at 1 + db \2, \1, \4 + map \3 ENDM coord_event: MACRO diff --git a/maps/AzaleaGym.asm b/maps/AzaleaGym.asm index 7967fed01..3d0ab665b 100644 --- a/maps/AzaleaGym.asm +++ b/maps/AzaleaGym.asm @@ -363,8 +363,8 @@ AzaleaGym_MapEvents: db 0, 0 ; filler db 2 ; warp events - warp_event 4, 15, 5, AZALEA_TOWN - warp_event 5, 15, 5, AZALEA_TOWN + warp_event 4, 15, AZALEA_TOWN, 5 + warp_event 5, 15, AZALEA_TOWN, 5 db 0 ; coord events diff --git a/maps/AzaleaMart.asm b/maps/AzaleaMart.asm index 3d224bb74..4100363d9 100644 --- a/maps/AzaleaMart.asm +++ b/maps/AzaleaMart.asm @@ -47,8 +47,8 @@ AzaleaMart_MapEvents: db 0, 0 ; filler db 2 ; warp events - warp_event 2, 7, 3, AZALEA_TOWN - warp_event 3, 7, 3, AZALEA_TOWN + warp_event 2, 7, AZALEA_TOWN, 3 + warp_event 3, 7, AZALEA_TOWN, 3 db 0 ; coord events diff --git a/maps/AzaleaPokecenter1F.asm b/maps/AzaleaPokecenter1F.asm index 84c7a3bae..64ceb7cd4 100644 --- a/maps/AzaleaPokecenter1F.asm +++ b/maps/AzaleaPokecenter1F.asm @@ -78,9 +78,9 @@ AzaleaPokecenter1F_MapEvents: db 0, 0 ; filler db 3 ; warp events - warp_event 3, 7, 1, AZALEA_TOWN - warp_event 4, 7, 1, AZALEA_TOWN - warp_event 0, 7, 1, POKECENTER_2F + warp_event 3, 7, AZALEA_TOWN, 1 + warp_event 4, 7, AZALEA_TOWN, 1 + warp_event 0, 7, POKECENTER_2F, 1 db 0 ; coord events diff --git a/maps/AzaleaTown.asm b/maps/AzaleaTown.asm index 834a4fd1d..61dd4acff 100644 --- a/maps/AzaleaTown.asm +++ b/maps/AzaleaTown.asm @@ -457,14 +457,14 @@ AzaleaTown_MapEvents: db 0, 0 ; filler db 8 ; warp events - warp_event 15, 9, 1, AZALEA_POKECENTER_1F - warp_event 21, 13, 1, CHARCOAL_KILN - warp_event 21, 5, 2, AZALEA_MART - warp_event 9, 5, 1, KURTS_HOUSE - warp_event 10, 15, 1, AZALEA_GYM - warp_event 31, 7, 1, SLOWPOKE_WELL_B1F - warp_event 2, 10, 3, ILEX_FOREST_AZALEA_GATE - warp_event 2, 11, 4, ILEX_FOREST_AZALEA_GATE + warp_event 15, 9, AZALEA_POKECENTER_1F, 1 + warp_event 21, 13, CHARCOAL_KILN, 1 + warp_event 21, 5, AZALEA_MART, 2 + warp_event 9, 5, KURTS_HOUSE, 1 + warp_event 10, 15, AZALEA_GYM, 1 + warp_event 31, 7, SLOWPOKE_WELL_B1F, 1 + warp_event 2, 10, ILEX_FOREST_AZALEA_GATE, 3 + warp_event 2, 11, ILEX_FOREST_AZALEA_GATE, 4 db 3 ; coord events coord_event 5, 10, SCENE_AZALEATOWN_RIVAL_BATTLE, AzaleaTownRivalBattleScene1 diff --git a/maps/BattleTower1F.asm b/maps/BattleTower1F.asm index 52c10c738..9c1357646 100644 --- a/maps/BattleTower1F.asm +++ b/maps/BattleTower1F.asm @@ -795,9 +795,9 @@ BattleTower1F_MapEvents: db 0, 0 ; filler db 3 ; warp events - warp_event 7, 9, 3, BATTLE_TOWER_OUTSIDE - warp_event 8, 9, 4, BATTLE_TOWER_OUTSIDE - warp_event 7, 0, 1, BATTLE_TOWER_ELEVATOR + warp_event 7, 9, BATTLE_TOWER_OUTSIDE, 3 + warp_event 8, 9, BATTLE_TOWER_OUTSIDE, 4 + warp_event 7, 0, BATTLE_TOWER_ELEVATOR, 1 db 0 ; coord events diff --git a/maps/BattleTowerBattleRoom.asm b/maps/BattleTowerBattleRoom.asm index a63ab95f6..2d65c076e 100644 --- a/maps/BattleTowerBattleRoom.asm +++ b/maps/BattleTowerBattleRoom.asm @@ -140,8 +140,8 @@ BattleTowerBattleRoom_MapEvents: db 0, 0 ; filler db 2 ; warp events - warp_event 3, 7, 4, BATTLE_TOWER_HALLWAY - warp_event 4, 7, 4, BATTLE_TOWER_HALLWAY + warp_event 3, 7, BATTLE_TOWER_HALLWAY, 4 + warp_event 4, 7, BATTLE_TOWER_HALLWAY, 4 db 0 ; coord events diff --git a/maps/BattleTowerElevator.asm b/maps/BattleTowerElevator.asm index 8d2eeb38a..439233867 100644 --- a/maps/BattleTowerElevator.asm +++ b/maps/BattleTowerElevator.asm @@ -45,8 +45,8 @@ BattleTowerElevator_MapEvents: db 0, 0 ; filler db 2 ; warp events - warp_event 1, 3, 1, BATTLE_TOWER_HALLWAY - warp_event 2, 3, 1, BATTLE_TOWER_HALLWAY + warp_event 1, 3, BATTLE_TOWER_HALLWAY, 1 + warp_event 2, 3, BATTLE_TOWER_HALLWAY, 1 db 0 ; coord events diff --git a/maps/BattleTowerHallway.asm b/maps/BattleTowerHallway.asm index 90187dca6..3f046f21d 100644 --- a/maps/BattleTowerHallway.asm +++ b/maps/BattleTowerHallway.asm @@ -78,12 +78,12 @@ BattleTowerHallway_MapEvents: db 0, 0 ; filler db 6 ; warp events - warp_event 11, 1, 1, BATTLE_TOWER_ELEVATOR - warp_event 5, 0, 1, BATTLE_TOWER_BATTLE_ROOM - warp_event 7, 0, 1, BATTLE_TOWER_BATTLE_ROOM - warp_event 9, 0, 1, BATTLE_TOWER_BATTLE_ROOM - warp_event 13, 0, 1, BATTLE_TOWER_BATTLE_ROOM - warp_event 15, 0, 1, BATTLE_TOWER_BATTLE_ROOM + warp_event 11, 1, BATTLE_TOWER_ELEVATOR, 1 + warp_event 5, 0, BATTLE_TOWER_BATTLE_ROOM, 1 + warp_event 7, 0, BATTLE_TOWER_BATTLE_ROOM, 1 + warp_event 9, 0, BATTLE_TOWER_BATTLE_ROOM, 1 + warp_event 13, 0, BATTLE_TOWER_BATTLE_ROOM, 1 + warp_event 15, 0, BATTLE_TOWER_BATTLE_ROOM, 1 db 0 ; coord events diff --git a/maps/BattleTowerOutside.asm b/maps/BattleTowerOutside.asm index 23d265637..4e2a719e2 100644 --- a/maps/BattleTowerOutside.asm +++ b/maps/BattleTowerOutside.asm @@ -128,10 +128,10 @@ BattleTowerOutside_MapEvents: db 0, 0 ; filler db 4 ; warp events - warp_event 8, 21, 3, ROUTE_40_BATTLE_TOWER_GATE - warp_event 9, 21, 4, ROUTE_40_BATTLE_TOWER_GATE - warp_event 8, 9, 1, BATTLE_TOWER_1F - warp_event 9, 9, 2, BATTLE_TOWER_1F + warp_event 8, 21, ROUTE_40_BATTLE_TOWER_GATE, 3 + warp_event 9, 21, ROUTE_40_BATTLE_TOWER_GATE, 4 + warp_event 8, 9, BATTLE_TOWER_1F, 1 + warp_event 9, 9, BATTLE_TOWER_1F, 2 db 0 ; coord events diff --git a/maps/BillsBrothersHouse.asm b/maps/BillsBrothersHouse.asm index 452b1fdb8..e2681c979 100644 --- a/maps/BillsBrothersHouse.asm +++ b/maps/BillsBrothersHouse.asm @@ -29,8 +29,8 @@ BillsBrothersHouse_MapEvents: db 0, 0 ; filler db 2 ; warp events - warp_event 2, 7, 4, FUCHSIA_CITY - warp_event 3, 7, 4, FUCHSIA_CITY + warp_event 2, 7, FUCHSIA_CITY, 4 + warp_event 3, 7, FUCHSIA_CITY, 4 db 0 ; coord events diff --git a/maps/BillsFamilysHouse.asm b/maps/BillsFamilysHouse.asm index a0ce47a75..6357b69de 100644 --- a/maps/BillsFamilysHouse.asm +++ b/maps/BillsFamilysHouse.asm @@ -244,8 +244,8 @@ BillsFamilysHouse_MapEvents: db 0, 0 ; filler db 2 ; warp events - warp_event 2, 7, 4, GOLDENROD_CITY - warp_event 3, 7, 4, GOLDENROD_CITY + warp_event 2, 7, GOLDENROD_CITY, 4 + warp_event 3, 7, GOLDENROD_CITY, 4 db 0 ; coord events diff --git a/maps/BillsHouse.asm b/maps/BillsHouse.asm index 6de4d2bc7..6ce1cbcd2 100644 --- a/maps/BillsHouse.asm +++ b/maps/BillsHouse.asm @@ -355,8 +355,8 @@ BillsHouse_MapEvents: db 0, 0 ; filler db 2 ; warp events - warp_event 2, 7, 1, ROUTE_25 - warp_event 3, 7, 1, ROUTE_25 + warp_event 2, 7, ROUTE_25, 1 + warp_event 3, 7, ROUTE_25, 1 db 0 ; coord events diff --git a/maps/BlackthornCity.asm b/maps/BlackthornCity.asm index 0ba92b110..3d9dd2a41 100644 --- a/maps/BlackthornCity.asm +++ b/maps/BlackthornCity.asm @@ -314,14 +314,14 @@ BlackthornCity_MapEvents: db 0, 0 ; filler db 8 ; warp events - warp_event 18, 11, 1, BLACKTHORN_GYM_1F - warp_event 13, 21, 1, BLACKTHORN_DRAGON_SPEECH_HOUSE - warp_event 29, 23, 1, BLACKTHORN_EMYS_HOUSE - warp_event 15, 29, 2, BLACKTHORN_MART - warp_event 21, 29, 1, BLACKTHORN_POKECENTER_1F - warp_event 9, 31, 1, MOVE_DELETERS_HOUSE - warp_event 36, 9, 2, ICE_PATH_1F - warp_event 20, 1, 1, DRAGONS_DEN_1F + warp_event 18, 11, BLACKTHORN_GYM_1F, 1 + warp_event 13, 21, BLACKTHORN_DRAGON_SPEECH_HOUSE, 1 + warp_event 29, 23, BLACKTHORN_EMYS_HOUSE, 1 + warp_event 15, 29, BLACKTHORN_MART, 2 + warp_event 21, 29, BLACKTHORN_POKECENTER_1F, 1 + warp_event 9, 31, MOVE_DELETERS_HOUSE, 1 + warp_event 36, 9, ICE_PATH_1F, 2 + warp_event 20, 1, DRAGONS_DEN_1F, 1 db 0 ; coord events diff --git a/maps/BlackthornDragonSpeechHouse.asm b/maps/BlackthornDragonSpeechHouse.asm index d9425f9ed..530421296 100644 --- a/maps/BlackthornDragonSpeechHouse.asm +++ b/maps/BlackthornDragonSpeechHouse.asm @@ -49,8 +49,8 @@ BlackthornDragonSpeechHouse_MapEvents: db 0, 0 ; filler db 2 ; warp events - warp_event 2, 7, 2, BLACKTHORN_CITY - warp_event 3, 7, 2, BLACKTHORN_CITY + warp_event 2, 7, BLACKTHORN_CITY, 2 + warp_event 3, 7, BLACKTHORN_CITY, 2 db 0 ; coord events diff --git a/maps/BlackthornEmysHouse.asm b/maps/BlackthornEmysHouse.asm index 956a8944b..2e8853727 100644 --- a/maps/BlackthornEmysHouse.asm +++ b/maps/BlackthornEmysHouse.asm @@ -21,8 +21,8 @@ BlackthornEmysHouse_MapEvents: db 0, 0 ; filler db 2 ; warp events - warp_event 2, 7, 3, BLACKTHORN_CITY - warp_event 3, 7, 3, BLACKTHORN_CITY + warp_event 2, 7, BLACKTHORN_CITY, 3 + warp_event 3, 7, BLACKTHORN_CITY, 3 db 0 ; coord events diff --git a/maps/BlackthornGym1F.asm b/maps/BlackthornGym1F.asm index 1e9b7fb7e..07af82bcf 100644 --- a/maps/BlackthornGym1F.asm +++ b/maps/BlackthornGym1F.asm @@ -388,13 +388,13 @@ BlackthornGym1F_MapEvents: db 0, 0 ; filler db 7 ; warp events - warp_event 4, 17, 1, BLACKTHORN_CITY - warp_event 5, 17, 1, BLACKTHORN_CITY - warp_event 1, 7, 1, BLACKTHORN_GYM_2F - warp_event 7, 9, 2, BLACKTHORN_GYM_2F - warp_event 2, 6, 3, BLACKTHORN_GYM_2F - warp_event 7, 7, 4, BLACKTHORN_GYM_2F - warp_event 7, 6, 5, BLACKTHORN_GYM_2F + warp_event 4, 17, BLACKTHORN_CITY, 1 + warp_event 5, 17, BLACKTHORN_CITY, 1 + warp_event 1, 7, BLACKTHORN_GYM_2F, 1 + warp_event 7, 9, BLACKTHORN_GYM_2F, 2 + warp_event 2, 6, BLACKTHORN_GYM_2F, 3 + warp_event 7, 7, BLACKTHORN_GYM_2F, 4 + warp_event 7, 6, BLACKTHORN_GYM_2F, 5 db 0 ; coord events diff --git a/maps/BlackthornGym2F.asm b/maps/BlackthornGym2F.asm index 73cf4bc88..2b41c2775 100644 --- a/maps/BlackthornGym2F.asm +++ b/maps/BlackthornGym2F.asm @@ -127,11 +127,11 @@ BlackthornGym2F_MapEvents: db 0, 0 ; filler db 5 ; warp events - warp_event 1, 7, 3, BLACKTHORN_GYM_1F - warp_event 7, 9, 4, BLACKTHORN_GYM_1F - warp_event 2, 5, 5, BLACKTHORN_GYM_1F ; hole - warp_event 8, 7, 6, BLACKTHORN_GYM_1F ; hole - warp_event 8, 3, 7, BLACKTHORN_GYM_1F ; hole + warp_event 1, 7, BLACKTHORN_GYM_1F, 3 + warp_event 7, 9, BLACKTHORN_GYM_1F, 4 + warp_event 2, 5, BLACKTHORN_GYM_1F, 5 ; hole + warp_event 8, 7, BLACKTHORN_GYM_1F, 6 ; hole + warp_event 8, 3, BLACKTHORN_GYM_1F, 7 ; hole db 0 ; coord events diff --git a/maps/BlackthornMart.asm b/maps/BlackthornMart.asm index d0a4e541b..cdc9ec50f 100644 --- a/maps/BlackthornMart.asm +++ b/maps/BlackthornMart.asm @@ -48,8 +48,8 @@ BlackthornMart_MapEvents: db 0, 0 ; filler db 2 ; warp events - warp_event 2, 7, 4, BLACKTHORN_CITY - warp_event 3, 7, 4, BLACKTHORN_CITY + warp_event 2, 7, BLACKTHORN_CITY, 4 + warp_event 3, 7, BLACKTHORN_CITY, 4 db 0 ; coord events diff --git a/maps/BlackthornPokecenter1F.asm b/maps/BlackthornPokecenter1F.asm index c39cd68b3..77c47f364 100644 --- a/maps/BlackthornPokecenter1F.asm +++ b/maps/BlackthornPokecenter1F.asm @@ -51,9 +51,9 @@ BlackthornPokecenter1F_MapEvents: db 0, 0 ; filler db 3 ; warp events - warp_event 3, 7, 5, BLACKTHORN_CITY - warp_event 4, 7, 5, BLACKTHORN_CITY - warp_event 0, 7, 1, POKECENTER_2F + warp_event 3, 7, BLACKTHORN_CITY, 5 + warp_event 4, 7, BLACKTHORN_CITY, 5 + warp_event 0, 7, POKECENTER_2F, 1 db 0 ; coord events diff --git a/maps/BluesHouse.asm b/maps/BluesHouse.asm index ebc528bbe..e27c9923f 100644 --- a/maps/BluesHouse.asm +++ b/maps/BluesHouse.asm @@ -146,8 +146,8 @@ BluesHouse_MapEvents: db 0, 0 ; filler db 2 ; warp events - warp_event 2, 7, 2, PALLET_TOWN - warp_event 3, 7, 2, PALLET_TOWN + warp_event 2, 7, PALLET_TOWN, 2 + warp_event 3, 7, PALLET_TOWN, 2 db 0 ; coord events diff --git a/maps/BrunosRoom.asm b/maps/BrunosRoom.asm index 8633cb27b..bd4fada98 100644 --- a/maps/BrunosRoom.asm +++ b/maps/BrunosRoom.asm @@ -126,10 +126,10 @@ BrunosRoom_MapEvents: db 0, 0 ; filler db 4 ; warp events - warp_event 4, 17, 3, KOGAS_ROOM - warp_event 5, 17, 4, KOGAS_ROOM - warp_event 4, 2, 1, KARENS_ROOM - warp_event 5, 2, 2, KARENS_ROOM + warp_event 4, 17, KOGAS_ROOM, 3 + warp_event 5, 17, KOGAS_ROOM, 4 + warp_event 4, 2, KARENS_ROOM, 1 + warp_event 5, 2, KARENS_ROOM, 2 db 0 ; coord events diff --git a/maps/BurnedTower1F.asm b/maps/BurnedTower1F.asm index a7f5d66e0..71bab1aa6 100644 --- a/maps/BurnedTower1F.asm +++ b/maps/BurnedTower1F.asm @@ -279,20 +279,20 @@ BurnedTower1F_MapEvents: db 0, 0 ; filler db 14 ; warp events - warp_event 9, 15, 13, ECRUTEAK_CITY - warp_event 10, 15, 13, ECRUTEAK_CITY - warp_event 10, 9, 1, BURNED_TOWER_B1F - warp_event 5, 5, 1, BURNED_TOWER_B1F - warp_event 5, 6, 1, BURNED_TOWER_B1F - warp_event 4, 6, 1, BURNED_TOWER_B1F - warp_event 15, 4, 2, BURNED_TOWER_B1F - warp_event 15, 5, 2, BURNED_TOWER_B1F - warp_event 10, 7, 3, BURNED_TOWER_B1F - warp_event 5, 14, 4, BURNED_TOWER_B1F - warp_event 4, 14, 4, BURNED_TOWER_B1F - warp_event 14, 14, 5, BURNED_TOWER_B1F - warp_event 15, 14, 5, BURNED_TOWER_B1F - warp_event 7, 15, 6, BURNED_TOWER_B1F + warp_event 9, 15, ECRUTEAK_CITY, 13 + warp_event 10, 15, ECRUTEAK_CITY, 13 + warp_event 10, 9, BURNED_TOWER_B1F, 1 + warp_event 5, 5, BURNED_TOWER_B1F, 1 + warp_event 5, 6, BURNED_TOWER_B1F, 1 + warp_event 4, 6, BURNED_TOWER_B1F, 1 + warp_event 15, 4, BURNED_TOWER_B1F, 2 + warp_event 15, 5, BURNED_TOWER_B1F, 2 + warp_event 10, 7, BURNED_TOWER_B1F, 3 + warp_event 5, 14, BURNED_TOWER_B1F, 4 + warp_event 4, 14, BURNED_TOWER_B1F, 4 + warp_event 14, 14, BURNED_TOWER_B1F, 5 + warp_event 15, 14, BURNED_TOWER_B1F, 5 + warp_event 7, 15, BURNED_TOWER_B1F, 6 db 1 ; coord events coord_event 11, 9, SCENE_BURNEDTOWER1F_RIVAL_BATTLE, BurnedTowerRivalBattleScript diff --git a/maps/BurnedTowerB1F.asm b/maps/BurnedTowerB1F.asm index 2f7fb5090..f83d4cbdb 100644 --- a/maps/BurnedTowerB1F.asm +++ b/maps/BurnedTowerB1F.asm @@ -237,12 +237,12 @@ BurnedTowerB1F_MapEvents: db 0, 0 ; filler db 6 ; warp events - warp_event 10, 9, 3, BURNED_TOWER_1F - warp_event 17, 7, 7, BURNED_TOWER_1F - warp_event 10, 8, 9, BURNED_TOWER_1F - warp_event 3, 13, 10, BURNED_TOWER_1F - warp_event 17, 14, 12, BURNED_TOWER_1F - warp_event 7, 15, 14, BURNED_TOWER_1F + warp_event 10, 9, BURNED_TOWER_1F, 3 + warp_event 17, 7, BURNED_TOWER_1F, 7 + warp_event 10, 8, BURNED_TOWER_1F, 9 + warp_event 3, 13, BURNED_TOWER_1F, 10 + warp_event 17, 14, BURNED_TOWER_1F, 12 + warp_event 7, 15, BURNED_TOWER_1F, 14 db 1 ; coord events coord_event 10, 6, SCENE_DEFAULT, ReleaseTheBeasts diff --git a/maps/CeladonCafe.asm b/maps/CeladonCafe.asm index 039231283..c4337f9cf 100644 --- a/maps/CeladonCafe.asm +++ b/maps/CeladonCafe.asm @@ -209,8 +209,8 @@ CeladonCafe_MapEvents: db 0, 0 ; filler db 2 ; warp events - warp_event 6, 7, 9, CELADON_CITY - warp_event 7, 7, 9, CELADON_CITY + warp_event 6, 7, CELADON_CITY, 9 + warp_event 7, 7, CELADON_CITY, 9 db 0 ; coord events diff --git a/maps/CeladonCity.asm b/maps/CeladonCity.asm index 606587906..52695628b 100644 --- a/maps/CeladonCity.asm +++ b/maps/CeladonCity.asm @@ -236,15 +236,15 @@ CeladonCity_MapEvents: db 0, 0 ; filler db 9 ; warp events - warp_event 4, 9, 1, CELADON_DEPT_STORE_1F - warp_event 16, 9, 1, CELADON_MANSION_1F - warp_event 16, 3, 3, CELADON_MANSION_1F - warp_event 17, 3, 3, CELADON_MANSION_1F - warp_event 29, 9, 1, CELADON_POKECENTER_1F - warp_event 18, 19, 1, CELADON_GAME_CORNER - warp_event 23, 19, 1, CELADON_GAME_CORNER_PRIZE_ROOM - warp_event 10, 29, 1, CELADON_GYM - warp_event 25, 29, 1, CELADON_CAFE + warp_event 4, 9, CELADON_DEPT_STORE_1F, 1 + warp_event 16, 9, CELADON_MANSION_1F, 1 + warp_event 16, 3, CELADON_MANSION_1F, 3 + warp_event 17, 3, CELADON_MANSION_1F, 3 + warp_event 29, 9, CELADON_POKECENTER_1F, 1 + warp_event 18, 19, CELADON_GAME_CORNER, 1 + warp_event 23, 19, CELADON_GAME_CORNER_PRIZE_ROOM, 1 + warp_event 10, 29, CELADON_GYM, 1 + warp_event 25, 29, CELADON_CAFE, 1 db 0 ; coord events diff --git a/maps/CeladonDeptStore1F.asm b/maps/CeladonDeptStore1F.asm index 515ab70b0..5aab57ddb 100644 --- a/maps/CeladonDeptStore1F.asm +++ b/maps/CeladonDeptStore1F.asm @@ -75,10 +75,10 @@ CeladonDeptStore1F_MapEvents: db 0, 0 ; filler db 4 ; warp events - warp_event 7, 7, 1, CELADON_CITY - warp_event 8, 7, 1, CELADON_CITY - warp_event 15, 0, 2, CELADON_DEPT_STORE_2F - warp_event 2, 0, 1, CELADON_DEPT_STORE_ELEVATOR + warp_event 7, 7, CELADON_CITY, 1 + warp_event 8, 7, CELADON_CITY, 1 + warp_event 15, 0, CELADON_DEPT_STORE_2F, 2 + warp_event 2, 0, CELADON_DEPT_STORE_ELEVATOR, 1 db 0 ; coord events diff --git a/maps/CeladonDeptStore2F.asm b/maps/CeladonDeptStore2F.asm index 6810cf390..09df8440c 100644 --- a/maps/CeladonDeptStore2F.asm +++ b/maps/CeladonDeptStore2F.asm @@ -70,9 +70,9 @@ CeladonDeptStore2F_MapEvents: db 0, 0 ; filler db 3 ; warp events - warp_event 12, 0, 1, CELADON_DEPT_STORE_3F - warp_event 15, 0, 3, CELADON_DEPT_STORE_1F - warp_event 2, 0, 1, CELADON_DEPT_STORE_ELEVATOR + warp_event 12, 0, CELADON_DEPT_STORE_3F, 1 + warp_event 15, 0, CELADON_DEPT_STORE_1F, 3 + warp_event 2, 0, CELADON_DEPT_STORE_ELEVATOR, 1 db 0 ; coord events diff --git a/maps/CeladonDeptStore3F.asm b/maps/CeladonDeptStore3F.asm index 2527599c4..733100ab2 100644 --- a/maps/CeladonDeptStore3F.asm +++ b/maps/CeladonDeptStore3F.asm @@ -96,9 +96,9 @@ CeladonDeptStore3F_MapEvents: db 0, 0 ; filler db 3 ; warp events - warp_event 12, 0, 1, CELADON_DEPT_STORE_2F - warp_event 15, 0, 2, CELADON_DEPT_STORE_4F - warp_event 2, 0, 1, CELADON_DEPT_STORE_ELEVATOR + warp_event 12, 0, CELADON_DEPT_STORE_2F, 1 + warp_event 15, 0, CELADON_DEPT_STORE_4F, 2 + warp_event 2, 0, CELADON_DEPT_STORE_ELEVATOR, 1 db 0 ; coord events diff --git a/maps/CeladonDeptStore4F.asm b/maps/CeladonDeptStore4F.asm index 46532322f..4241a3595 100644 --- a/maps/CeladonDeptStore4F.asm +++ b/maps/CeladonDeptStore4F.asm @@ -52,9 +52,9 @@ CeladonDeptStore4F_MapEvents: db 0, 0 ; filler db 3 ; warp events - warp_event 12, 0, 1, CELADON_DEPT_STORE_5F - warp_event 15, 0, 2, CELADON_DEPT_STORE_3F - warp_event 2, 0, 1, CELADON_DEPT_STORE_ELEVATOR + warp_event 12, 0, CELADON_DEPT_STORE_5F, 1 + warp_event 15, 0, CELADON_DEPT_STORE_3F, 2 + warp_event 2, 0, CELADON_DEPT_STORE_ELEVATOR, 1 db 0 ; coord events diff --git a/maps/CeladonDeptStore5F.asm b/maps/CeladonDeptStore5F.asm index 94fc55de3..ddac9b490 100644 --- a/maps/CeladonDeptStore5F.asm +++ b/maps/CeladonDeptStore5F.asm @@ -73,9 +73,9 @@ CeladonDeptStore5F_MapEvents: db 0, 0 ; filler db 3 ; warp events - warp_event 12, 0, 1, CELADON_DEPT_STORE_4F - warp_event 15, 0, 1, CELADON_DEPT_STORE_6F - warp_event 2, 0, 1, CELADON_DEPT_STORE_ELEVATOR + warp_event 12, 0, CELADON_DEPT_STORE_4F, 1 + warp_event 15, 0, CELADON_DEPT_STORE_6F, 1 + warp_event 2, 0, CELADON_DEPT_STORE_ELEVATOR, 1 db 0 ; coord events diff --git a/maps/CeladonDeptStore6F.asm b/maps/CeladonDeptStore6F.asm index d85fdda2e..6bbff6bf2 100644 --- a/maps/CeladonDeptStore6F.asm +++ b/maps/CeladonDeptStore6F.asm @@ -147,8 +147,8 @@ CeladonDeptStore6F_MapEvents: db 0, 0 ; filler db 2 ; warp events - warp_event 15, 0, 2, CELADON_DEPT_STORE_5F - warp_event 2, 0, 1, CELADON_DEPT_STORE_ELEVATOR + warp_event 15, 0, CELADON_DEPT_STORE_5F, 2 + warp_event 2, 0, CELADON_DEPT_STORE_ELEVATOR, 1 db 0 ; coord events diff --git a/maps/CeladonDeptStoreElevator.asm b/maps/CeladonDeptStoreElevator.asm index cbf8f1efa..eaa5c927a 100644 --- a/maps/CeladonDeptStoreElevator.asm +++ b/maps/CeladonDeptStoreElevator.asm @@ -29,8 +29,8 @@ CeladonDeptStoreElevator_MapEvents: db 0, 0 ; filler db 2 ; warp events - warp_event 1, 3, -1, CELADON_DEPT_STORE_1F - warp_event 2, 3, -1, CELADON_DEPT_STORE_1F + warp_event 1, 3, CELADON_DEPT_STORE_1F, -1 + warp_event 2, 3, CELADON_DEPT_STORE_1F, -1 db 0 ; coord events diff --git a/maps/CeladonGameCorner.asm b/maps/CeladonGameCorner.asm index d39f09586..30268f9c7 100644 --- a/maps/CeladonGameCorner.asm +++ b/maps/CeladonGameCorner.asm @@ -283,8 +283,8 @@ CeladonGameCorner_MapEvents: db 0, 0 ; filler db 2 ; warp events - warp_event 14, 13, 6, CELADON_CITY - warp_event 15, 13, 6, CELADON_CITY + warp_event 14, 13, CELADON_CITY, 6 + warp_event 15, 13, CELADON_CITY, 6 db 0 ; coord events diff --git a/maps/CeladonGameCornerPrizeRoom.asm b/maps/CeladonGameCornerPrizeRoom.asm index 347aa1513..24384a6bf 100644 --- a/maps/CeladonGameCornerPrizeRoom.asm +++ b/maps/CeladonGameCornerPrizeRoom.asm @@ -265,8 +265,8 @@ CeladonGameCornerPrizeRoom_MapEvents: db 0, 0 ; filler db 2 ; warp events - warp_event 2, 5, 7, CELADON_CITY - warp_event 3, 5, 7, CELADON_CITY + warp_event 2, 5, CELADON_CITY, 7 + warp_event 3, 5, CELADON_CITY, 7 db 0 ; coord events diff --git a/maps/CeladonGym.asm b/maps/CeladonGym.asm index 1d6a23b40..7b3c96781 100644 --- a/maps/CeladonGym.asm +++ b/maps/CeladonGym.asm @@ -269,8 +269,8 @@ CeladonGym_MapEvents: db 0, 0 ; filler db 2 ; warp events - warp_event 4, 17, 8, CELADON_CITY - warp_event 5, 17, 8, CELADON_CITY + warp_event 4, 17, CELADON_CITY, 8 + warp_event 5, 17, CELADON_CITY, 8 db 0 ; coord events diff --git a/maps/CeladonMansion1F.asm b/maps/CeladonMansion1F.asm index 79c4fbaec..1746ce937 100644 --- a/maps/CeladonMansion1F.asm +++ b/maps/CeladonMansion1F.asm @@ -76,11 +76,11 @@ CeladonMansion1F_MapEvents: db 0, 0 ; filler db 5 ; warp events - warp_event 6, 9, 2, CELADON_CITY - warp_event 7, 9, 2, CELADON_CITY - warp_event 3, 0, 3, CELADON_CITY - warp_event 0, 0, 1, CELADON_MANSION_2F - warp_event 7, 0, 4, CELADON_MANSION_2F + warp_event 6, 9, CELADON_CITY, 2 + warp_event 7, 9, CELADON_CITY, 2 + warp_event 3, 0, CELADON_CITY, 3 + warp_event 0, 0, CELADON_MANSION_2F, 1 + warp_event 7, 0, CELADON_MANSION_2F, 4 db 0 ; coord events diff --git a/maps/CeladonMansion2F.asm b/maps/CeladonMansion2F.asm index 231e824c8..cc32da5e5 100644 --- a/maps/CeladonMansion2F.asm +++ b/maps/CeladonMansion2F.asm @@ -51,10 +51,10 @@ CeladonMansion2F_MapEvents: db 0, 0 ; filler db 4 ; warp events - warp_event 0, 0, 4, CELADON_MANSION_1F - warp_event 1, 0, 2, CELADON_MANSION_3F - warp_event 6, 0, 3, CELADON_MANSION_3F - warp_event 7, 0, 5, CELADON_MANSION_1F + warp_event 0, 0, CELADON_MANSION_1F, 4 + warp_event 1, 0, CELADON_MANSION_3F, 2 + warp_event 6, 0, CELADON_MANSION_3F, 3 + warp_event 7, 0, CELADON_MANSION_1F, 5 db 0 ; coord events diff --git a/maps/CeladonMansion3F.asm b/maps/CeladonMansion3F.asm index ce7e0c1fc..5d014f28b 100644 --- a/maps/CeladonMansion3F.asm +++ b/maps/CeladonMansion3F.asm @@ -191,10 +191,10 @@ CeladonMansion3F_MapEvents: db 0, 0 ; filler db 4 ; warp events - warp_event 0, 0, 1, CELADON_MANSION_ROOF - warp_event 1, 0, 2, CELADON_MANSION_2F - warp_event 6, 0, 3, CELADON_MANSION_2F - warp_event 7, 0, 2, CELADON_MANSION_ROOF + warp_event 0, 0, CELADON_MANSION_ROOF, 1 + warp_event 1, 0, CELADON_MANSION_2F, 2 + warp_event 6, 0, CELADON_MANSION_2F, 3 + warp_event 7, 0, CELADON_MANSION_ROOF, 2 db 0 ; coord events diff --git a/maps/CeladonMansionRoof.asm b/maps/CeladonMansionRoof.asm index de9bed48f..4af0fa1ab 100644 --- a/maps/CeladonMansionRoof.asm +++ b/maps/CeladonMansionRoof.asm @@ -35,9 +35,9 @@ CeladonMansionRoof_MapEvents: db 0, 0 ; filler db 3 ; warp events - warp_event 1, 1, 1, CELADON_MANSION_3F - warp_event 6, 1, 4, CELADON_MANSION_3F - warp_event 2, 5, 1, CELADON_MANSION_ROOF_HOUSE + warp_event 1, 1, CELADON_MANSION_3F, 1 + warp_event 6, 1, CELADON_MANSION_3F, 4 + warp_event 2, 5, CELADON_MANSION_ROOF_HOUSE, 1 db 0 ; coord events diff --git a/maps/CeladonMansionRoofHouse.asm b/maps/CeladonMansionRoofHouse.asm index a818b2875..56e46634b 100644 --- a/maps/CeladonMansionRoofHouse.asm +++ b/maps/CeladonMansionRoofHouse.asm @@ -118,8 +118,8 @@ CeladonMansionRoofHouse_MapEvents: db 0, 0 ; filler db 2 ; warp events - warp_event 2, 7, 3, CELADON_MANSION_ROOF - warp_event 3, 7, 3, CELADON_MANSION_ROOF + warp_event 2, 7, CELADON_MANSION_ROOF, 3 + warp_event 3, 7, CELADON_MANSION_ROOF, 3 db 0 ; coord events diff --git a/maps/CeladonPokecenter1F.asm b/maps/CeladonPokecenter1F.asm index 098d4f9f5..b333618df 100644 --- a/maps/CeladonPokecenter1F.asm +++ b/maps/CeladonPokecenter1F.asm @@ -147,9 +147,9 @@ CeladonPokecenter1F_MapEvents: db 0, 0 ; filler db 3 ; warp events - warp_event 3, 7, 5, CELADON_CITY - warp_event 4, 7, 5, CELADON_CITY - warp_event 0, 7, 1, POKECENTER_2F + warp_event 3, 7, CELADON_CITY, 5 + warp_event 4, 7, CELADON_CITY, 5 + warp_event 0, 7, POKECENTER_2F, 1 db 0 ; coord events diff --git a/maps/CeladonPokecenter2FBeta.asm b/maps/CeladonPokecenter2FBeta.asm index 836369e9a..34391e66d 100644 --- a/maps/CeladonPokecenter2FBeta.asm +++ b/maps/CeladonPokecenter2FBeta.asm @@ -7,7 +7,7 @@ CeladonPokecenter2FBeta_MapEvents: db 0, 0 ; filler db 1 ; warp events - warp_event 0, 7, 3, CELADON_POKECENTER_1F + warp_event 0, 7, CELADON_POKECENTER_1F, 3 db 0 ; coord events diff --git a/maps/CeruleanCity.asm b/maps/CeruleanCity.asm index 36495ce7d..3fb95bfca 100644 --- a/maps/CeruleanCity.asm +++ b/maps/CeruleanCity.asm @@ -277,12 +277,12 @@ CeruleanCity_MapEvents: db 0, 0 ; filler db 6 ; warp events - warp_event 7, 15, 1, CERULEAN_GYM_BADGE_SPEECH_HOUSE - warp_event 28, 17, 1, CERULEAN_POLICE_STATION - warp_event 13, 19, 1, CERULEAN_TRADE_SPEECH_HOUSE - warp_event 19, 21, 1, CERULEAN_POKECENTER_1F - warp_event 30, 23, 1, CERULEAN_GYM - warp_event 25, 29, 2, CERULEAN_MART + warp_event 7, 15, CERULEAN_GYM_BADGE_SPEECH_HOUSE, 1 + warp_event 28, 17, CERULEAN_POLICE_STATION, 1 + warp_event 13, 19, CERULEAN_TRADE_SPEECH_HOUSE, 1 + warp_event 19, 21, CERULEAN_POKECENTER_1F, 1 + warp_event 30, 23, CERULEAN_GYM, 1 + warp_event 25, 29, CERULEAN_MART, 2 db 0 ; coord events diff --git a/maps/CeruleanGym.asm b/maps/CeruleanGym.asm index 89f04bc1d..7349fb346 100644 --- a/maps/CeruleanGym.asm +++ b/maps/CeruleanGym.asm @@ -364,8 +364,8 @@ CeruleanGym_MapEvents: db 0, 0 ; filler db 2 ; warp events - warp_event 4, 15, 5, CERULEAN_CITY - warp_event 5, 15, 5, CERULEAN_CITY + warp_event 4, 15, CERULEAN_CITY, 5 + warp_event 5, 15, CERULEAN_CITY, 5 db 0 ; coord events diff --git a/maps/CeruleanGymBadgeSpeechHouse.asm b/maps/CeruleanGymBadgeSpeechHouse.asm index 2e15a2d43..5bb9100f5 100644 --- a/maps/CeruleanGymBadgeSpeechHouse.asm +++ b/maps/CeruleanGymBadgeSpeechHouse.asm @@ -18,8 +18,8 @@ CeruleanGymBadgeSpeechHouse_MapEvents: db 0, 0 ; filler db 2 ; warp events - warp_event 2, 7, 1, CERULEAN_CITY - warp_event 3, 7, 1, CERULEAN_CITY + warp_event 2, 7, CERULEAN_CITY, 1 + warp_event 3, 7, CERULEAN_CITY, 1 db 0 ; coord events diff --git a/maps/CeruleanMart.asm b/maps/CeruleanMart.asm index 4165f1c3e..c72fe7cd7 100644 --- a/maps/CeruleanMart.asm +++ b/maps/CeruleanMart.asm @@ -47,8 +47,8 @@ CeruleanMart_MapEvents: db 0, 0 ; filler db 2 ; warp events - warp_event 2, 7, 6, CERULEAN_CITY - warp_event 3, 7, 6, CERULEAN_CITY + warp_event 2, 7, CERULEAN_CITY, 6 + warp_event 3, 7, CERULEAN_CITY, 6 db 0 ; coord events diff --git a/maps/CeruleanPokecenter1F.asm b/maps/CeruleanPokecenter1F.asm index 6a777da4a..0894c9297 100644 --- a/maps/CeruleanPokecenter1F.asm +++ b/maps/CeruleanPokecenter1F.asm @@ -64,9 +64,9 @@ CeruleanPokecenter1F_MapEvents: db 0, 0 ; filler db 3 ; warp events - warp_event 3, 7, 4, CERULEAN_CITY - warp_event 4, 7, 4, CERULEAN_CITY - warp_event 0, 7, 1, POKECENTER_2F + warp_event 3, 7, CERULEAN_CITY, 4 + warp_event 4, 7, CERULEAN_CITY, 4 + warp_event 0, 7, POKECENTER_2F, 1 db 0 ; coord events diff --git a/maps/CeruleanPokecenter2FBeta.asm b/maps/CeruleanPokecenter2FBeta.asm index cbfabf4bf..d07b136c8 100644 --- a/maps/CeruleanPokecenter2FBeta.asm +++ b/maps/CeruleanPokecenter2FBeta.asm @@ -7,7 +7,7 @@ CeruleanPokecenter2FBeta_MapEvents: db 0, 0 ; filler db 1 ; warp events - warp_event 0, 7, 1, CERULEAN_POKECENTER_1F + warp_event 0, 7, CERULEAN_POKECENTER_1F, 1 db 0 ; coord events diff --git a/maps/CeruleanPoliceStation.asm b/maps/CeruleanPoliceStation.asm index a06c81ef7..0e9503786 100644 --- a/maps/CeruleanPoliceStation.asm +++ b/maps/CeruleanPoliceStation.asm @@ -45,8 +45,8 @@ CeruleanPoliceStation_MapEvents: db 0, 0 ; filler db 2 ; warp events - warp_event 2, 7, 2, CERULEAN_CITY - warp_event 3, 7, 2, CERULEAN_CITY + warp_event 2, 7, CERULEAN_CITY, 2 + warp_event 3, 7, CERULEAN_CITY, 2 db 0 ; coord events diff --git a/maps/CeruleanTradeSpeechHouse.asm b/maps/CeruleanTradeSpeechHouse.asm index 5f6cf03ed..766cbb061 100644 --- a/maps/CeruleanTradeSpeechHouse.asm +++ b/maps/CeruleanTradeSpeechHouse.asm @@ -55,8 +55,8 @@ CeruleanTradeSpeechHouse_MapEvents: db 0, 0 ; filler db 2 ; warp events - warp_event 2, 7, 3, CERULEAN_CITY - warp_event 3, 7, 3, CERULEAN_CITY + warp_event 2, 7, CERULEAN_CITY, 3 + warp_event 3, 7, CERULEAN_CITY, 3 db 0 ; coord events diff --git a/maps/CharcoalKiln.asm b/maps/CharcoalKiln.asm index 94b936421..b7407116d 100644 --- a/maps/CharcoalKiln.asm +++ b/maps/CharcoalKiln.asm @@ -150,8 +150,8 @@ CharcoalKiln_MapEvents: db 0, 0 ; filler db 2 ; warp events - warp_event 2, 7, 2, AZALEA_TOWN - warp_event 3, 7, 2, AZALEA_TOWN + warp_event 2, 7, AZALEA_TOWN, 2 + warp_event 3, 7, AZALEA_TOWN, 2 db 0 ; coord events diff --git a/maps/CherrygroveCity.asm b/maps/CherrygroveCity.asm index 09d824cd5..6a403c099 100644 --- a/maps/CherrygroveCity.asm +++ b/maps/CherrygroveCity.asm @@ -548,11 +548,11 @@ CherrygroveCity_MapEvents: db 0, 0 ; filler db 5 ; warp events - warp_event 23, 3, 2, CHERRYGROVE_MART - warp_event 29, 3, 1, CHERRYGROVE_POKECENTER_1F - warp_event 17, 7, 1, CHERRYGROVE_GYM_SPEECH_HOUSE - warp_event 25, 9, 1, GUIDE_GENTS_HOUSE - warp_event 31, 11, 1, CHERRYGROVE_EVOLUTION_SPEECH_HOUSE + warp_event 23, 3, CHERRYGROVE_MART, 2 + warp_event 29, 3, CHERRYGROVE_POKECENTER_1F, 1 + warp_event 17, 7, CHERRYGROVE_GYM_SPEECH_HOUSE, 1 + warp_event 25, 9, GUIDE_GENTS_HOUSE, 1 + warp_event 31, 11, CHERRYGROVE_EVOLUTION_SPEECH_HOUSE, 1 db 2 ; coord events coord_event 33, 6, SCENE_CHERRYGROVECITY_MEET_RIVAL, CherrygroveSilverSceneNorth diff --git a/maps/CherrygroveEvolutionSpeechHouse.asm b/maps/CherrygroveEvolutionSpeechHouse.asm index fdda1d4c0..842d125f3 100644 --- a/maps/CherrygroveEvolutionSpeechHouse.asm +++ b/maps/CherrygroveEvolutionSpeechHouse.asm @@ -43,8 +43,8 @@ CherrygroveEvolutionSpeechHouse_MapEvents: db 0, 0 ; filler db 2 ; warp events - warp_event 2, 7, 5, CHERRYGROVE_CITY - warp_event 3, 7, 5, CHERRYGROVE_CITY + warp_event 2, 7, CHERRYGROVE_CITY, 5 + warp_event 3, 7, CHERRYGROVE_CITY, 5 db 0 ; coord events diff --git a/maps/CherrygroveGymSpeechHouse.asm b/maps/CherrygroveGymSpeechHouse.asm index c8ba5248e..3f99a45d7 100644 --- a/maps/CherrygroveGymSpeechHouse.asm +++ b/maps/CherrygroveGymSpeechHouse.asm @@ -46,8 +46,8 @@ CherrygroveGymSpeechHouse_MapEvents: db 0, 0 ; filler db 2 ; warp events - warp_event 2, 7, 3, CHERRYGROVE_CITY - warp_event 3, 7, 3, CHERRYGROVE_CITY + warp_event 2, 7, CHERRYGROVE_CITY, 3 + warp_event 3, 7, CHERRYGROVE_CITY, 3 db 0 ; coord events diff --git a/maps/CherrygroveMart.asm b/maps/CherrygroveMart.asm index e05d21749..a4c7421f4 100644 --- a/maps/CherrygroveMart.asm +++ b/maps/CherrygroveMart.asm @@ -73,8 +73,8 @@ CherrygroveMart_MapEvents: db 0, 0 ; filler db 2 ; warp events - warp_event 2, 7, 1, CHERRYGROVE_CITY - warp_event 3, 7, 1, CHERRYGROVE_CITY + warp_event 2, 7, CHERRYGROVE_CITY, 1 + warp_event 3, 7, CHERRYGROVE_CITY, 1 db 0 ; coord events diff --git a/maps/CherrygrovePokecenter1F.asm b/maps/CherrygrovePokecenter1F.asm index 194b48e03..84ff082b3 100644 --- a/maps/CherrygrovePokecenter1F.asm +++ b/maps/CherrygrovePokecenter1F.asm @@ -70,9 +70,9 @@ CherrygrovePokecenter1F_MapEvents: db 0, 0 ; filler db 3 ; warp events - warp_event 3, 7, 2, CHERRYGROVE_CITY - warp_event 4, 7, 2, CHERRYGROVE_CITY - warp_event 0, 7, 1, POKECENTER_2F + warp_event 3, 7, CHERRYGROVE_CITY, 2 + warp_event 4, 7, CHERRYGROVE_CITY, 2 + warp_event 0, 7, POKECENTER_2F, 1 db 0 ; coord events diff --git a/maps/CianwoodCity.asm b/maps/CianwoodCity.asm index e88081814..4b5c9a380 100644 --- a/maps/CianwoodCity.asm +++ b/maps/CianwoodCity.asm @@ -382,13 +382,13 @@ CianwoodCity_MapEvents: db 0, 0 ; filler db 7 ; warp events - warp_event 17, 41, 1, MANIAS_HOUSE - warp_event 8, 43, 1, CIANWOOD_GYM - warp_event 23, 43, 1, CIANWOOD_POKECENTER_1F - warp_event 15, 47, 1, CIANWOOD_PHARMACY - warp_event 9, 31, 1, CIANWOOD_PHOTO_STUDIO - warp_event 15, 37, 1, CIANWOOD_LUGIA_SPEECH_HOUSE - warp_event 5, 17, 1, POKE_SEERS_HOUSE + warp_event 17, 41, MANIAS_HOUSE, 1 + warp_event 8, 43, CIANWOOD_GYM, 1 + warp_event 23, 43, CIANWOOD_POKECENTER_1F, 1 + warp_event 15, 47, CIANWOOD_PHARMACY, 1 + warp_event 9, 31, CIANWOOD_PHOTO_STUDIO, 1 + warp_event 15, 37, CIANWOOD_LUGIA_SPEECH_HOUSE, 1 + warp_event 5, 17, POKE_SEERS_HOUSE, 1 db 1 ; coord events coord_event 11, 16, SCENE_CIANWOODCITY_SUICUNE_AND_EUSINE, CianwoodCitySuicuneAndEusine diff --git a/maps/CianwoodGym.asm b/maps/CianwoodGym.asm index 4da9613b9..0cb7a3356 100644 --- a/maps/CianwoodGym.asm +++ b/maps/CianwoodGym.asm @@ -307,8 +307,8 @@ CianwoodGym_MapEvents: db 0, 0 ; filler db 2 ; warp events - warp_event 4, 17, 2, CIANWOOD_CITY - warp_event 5, 17, 2, CIANWOOD_CITY + warp_event 4, 17, CIANWOOD_CITY, 2 + warp_event 5, 17, CIANWOOD_CITY, 2 db 0 ; coord events diff --git a/maps/CianwoodLugiaSpeechHouse.asm b/maps/CianwoodLugiaSpeechHouse.asm index 686802ccc..712c50c29 100644 --- a/maps/CianwoodLugiaSpeechHouse.asm +++ b/maps/CianwoodLugiaSpeechHouse.asm @@ -63,8 +63,8 @@ CianwoodLugiaSpeechHouse_MapEvents: db 0, 0 ; filler db 2 ; warp events - warp_event 2, 7, 6, CIANWOOD_CITY - warp_event 3, 7, 6, CIANWOOD_CITY + warp_event 2, 7, CIANWOOD_CITY, 6 + warp_event 3, 7, CIANWOOD_CITY, 6 db 0 ; coord events diff --git a/maps/CianwoodPharmacy.asm b/maps/CianwoodPharmacy.asm index bc7bffe0d..7a41ce835 100644 --- a/maps/CianwoodPharmacy.asm +++ b/maps/CianwoodPharmacy.asm @@ -74,8 +74,8 @@ CianwoodPharmacy_MapEvents: db 0, 0 ; filler db 2 ; warp events - warp_event 2, 7, 4, CIANWOOD_CITY - warp_event 3, 7, 4, CIANWOOD_CITY + warp_event 2, 7, CIANWOOD_CITY, 4 + warp_event 3, 7, CIANWOOD_CITY, 4 db 0 ; coord events diff --git a/maps/CianwoodPhotoStudio.asm b/maps/CianwoodPhotoStudio.asm index 6abdd835c..76ba8055c 100644 --- a/maps/CianwoodPhotoStudio.asm +++ b/maps/CianwoodPhotoStudio.asm @@ -50,8 +50,8 @@ CianwoodPhotoStudio_MapEvents: db 0, 0 ; filler db 2 ; warp events - warp_event 2, 7, 5, CIANWOOD_CITY - warp_event 3, 7, 5, CIANWOOD_CITY + warp_event 2, 7, CIANWOOD_CITY, 5 + warp_event 3, 7, CIANWOOD_CITY, 5 db 0 ; coord events diff --git a/maps/CianwoodPokecenter1F.asm b/maps/CianwoodPokecenter1F.asm index 1a561c517..0c327e687 100644 --- a/maps/CianwoodPokecenter1F.asm +++ b/maps/CianwoodPokecenter1F.asm @@ -133,9 +133,9 @@ CianwoodPokecenter1F_MapEvents: db 0, 0 ; filler db 3 ; warp events - warp_event 3, 7, 3, CIANWOOD_CITY - warp_event 4, 7, 3, CIANWOOD_CITY - warp_event 0, 7, 1, POKECENTER_2F + warp_event 3, 7, CIANWOOD_CITY, 3 + warp_event 4, 7, CIANWOOD_CITY, 3 + warp_event 0, 7, POKECENTER_2F, 1 db 0 ; coord events diff --git a/maps/CinnabarIsland.asm b/maps/CinnabarIsland.asm index 9f559bff3..ef00047e5 100644 --- a/maps/CinnabarIsland.asm +++ b/maps/CinnabarIsland.asm @@ -129,7 +129,7 @@ CinnabarIsland_MapEvents: db 0, 0 ; filler db 1 ; warp events - warp_event 11, 11, 1, CINNABAR_POKECENTER_1F + warp_event 11, 11, CINNABAR_POKECENTER_1F, 1 db 0 ; coord events diff --git a/maps/CinnabarPokecenter1F.asm b/maps/CinnabarPokecenter1F.asm index 81610ee64..8811a1ae4 100644 --- a/maps/CinnabarPokecenter1F.asm +++ b/maps/CinnabarPokecenter1F.asm @@ -36,9 +36,9 @@ CinnabarPokecenter1F_MapEvents: db 0, 0 ; filler db 3 ; warp events - warp_event 3, 7, 1, CINNABAR_ISLAND - warp_event 4, 7, 1, CINNABAR_ISLAND - warp_event 0, 7, 1, POKECENTER_2F + warp_event 3, 7, CINNABAR_ISLAND, 1 + warp_event 4, 7, CINNABAR_ISLAND, 1 + warp_event 0, 7, POKECENTER_2F, 1 db 0 ; coord events diff --git a/maps/CinnabarPokecenter2FBeta.asm b/maps/CinnabarPokecenter2FBeta.asm index 559a1425f..0c459ccae 100644 --- a/maps/CinnabarPokecenter2FBeta.asm +++ b/maps/CinnabarPokecenter2FBeta.asm @@ -7,7 +7,7 @@ CinnabarPokecenter2FBeta_MapEvents: db 0, 0 ; filler db 1 ; warp events - warp_event 0, 7, 3, CINNABAR_POKECENTER_1F + warp_event 0, 7, CINNABAR_POKECENTER_1F, 3 db 0 ; coord events diff --git a/maps/Colosseum.asm b/maps/Colosseum.asm index 850c14e9f..75cd8ec11 100644 --- a/maps/Colosseum.asm +++ b/maps/Colosseum.asm @@ -64,8 +64,8 @@ Colosseum_MapEvents: db 0, 0 ; filler db 2 ; warp events - warp_event 4, 7, 3, POKECENTER_2F - warp_event 5, 7, 3, POKECENTER_2F + warp_event 4, 7, POKECENTER_2F, 3 + warp_event 5, 7, POKECENTER_2F, 3 db 0 ; coord events diff --git a/maps/CopycatsHouse1F.asm b/maps/CopycatsHouse1F.asm index fb5cbd042..e111ae677 100644 --- a/maps/CopycatsHouse1F.asm +++ b/maps/CopycatsHouse1F.asm @@ -74,9 +74,9 @@ CopycatsHouse1F_MapEvents: db 0, 0 ; filler db 3 ; warp events - warp_event 2, 7, 8, SAFFRON_CITY - warp_event 3, 7, 8, SAFFRON_CITY - warp_event 2, 0, 1, COPYCATS_HOUSE_2F + warp_event 2, 7, SAFFRON_CITY, 8 + warp_event 3, 7, SAFFRON_CITY, 8 + warp_event 2, 0, COPYCATS_HOUSE_2F, 1 db 0 ; coord events diff --git a/maps/CopycatsHouse2F.asm b/maps/CopycatsHouse2F.asm index d385ef0d5..d3b360d8d 100644 --- a/maps/CopycatsHouse2F.asm +++ b/maps/CopycatsHouse2F.asm @@ -362,7 +362,7 @@ CopycatsHouse2F_MapEvents: db 0, 0 ; filler db 1 ; warp events - warp_event 3, 0, 3, COPYCATS_HOUSE_1F + warp_event 3, 0, COPYCATS_HOUSE_1F, 3 db 0 ; coord events diff --git a/maps/DanceTheatre.asm b/maps/DanceTheatre.asm index ec4a257bb..feb460bb5 100644 --- a/maps/DanceTheatre.asm +++ b/maps/DanceTheatre.asm @@ -339,8 +339,8 @@ DanceTheatre_MapEvents: db 0, 0 ; filler db 2 ; warp events - warp_event 5, 13, 8, ECRUTEAK_CITY - warp_event 6, 13, 8, ECRUTEAK_CITY + warp_event 5, 13, ECRUTEAK_CITY, 8 + warp_event 6, 13, ECRUTEAK_CITY, 8 db 0 ; coord events diff --git a/maps/DarkCaveBlackthornEntrance.asm b/maps/DarkCaveBlackthornEntrance.asm index 71b160fd9..1380daa84 100644 --- a/maps/DarkCaveBlackthornEntrance.asm +++ b/maps/DarkCaveBlackthornEntrance.asm @@ -63,8 +63,8 @@ DarkCaveBlackthornEntrance_MapEvents: db 0, 0 ; filler db 2 ; warp events - warp_event 23, 3, 1, ROUTE_45 - warp_event 3, 25, 2, DARK_CAVE_VIOLET_ENTRANCE + warp_event 23, 3, ROUTE_45, 1 + warp_event 3, 25, DARK_CAVE_VIOLET_ENTRANCE, 2 db 0 ; coord events diff --git a/maps/DarkCaveVioletEntrance.asm b/maps/DarkCaveVioletEntrance.asm index eba31b40d..84a368188 100644 --- a/maps/DarkCaveVioletEntrance.asm +++ b/maps/DarkCaveVioletEntrance.asm @@ -35,9 +35,9 @@ DarkCaveVioletEntrance_MapEvents: db 0, 0 ; filler db 3 ; warp events - warp_event 3, 15, 3, ROUTE_31 - warp_event 17, 1, 2, DARK_CAVE_BLACKTHORN_ENTRANCE - warp_event 35, 33, 3, ROUTE_46 + warp_event 3, 15, ROUTE_31, 3 + warp_event 17, 1, DARK_CAVE_BLACKTHORN_ENTRANCE, 2 + warp_event 35, 33, ROUTE_46, 3 db 0 ; coord events diff --git a/maps/DayCare.asm b/maps/DayCare.asm index ce7e04c21..fbf05fb9b 100644 --- a/maps/DayCare.asm +++ b/maps/DayCare.asm @@ -157,10 +157,10 @@ DayCare_MapEvents: db 0, 0 ; filler db 4 ; warp events - warp_event 0, 5, 3, ROUTE_34 - warp_event 0, 6, 4, ROUTE_34 - warp_event 2, 7, 5, ROUTE_34 - warp_event 3, 7, 5, ROUTE_34 + warp_event 0, 5, ROUTE_34, 3 + warp_event 0, 6, ROUTE_34, 4 + warp_event 2, 7, ROUTE_34, 5 + warp_event 3, 7, ROUTE_34, 5 db 0 ; coord events diff --git a/maps/DayOfWeekSiblingsHouse.asm b/maps/DayOfWeekSiblingsHouse.asm index 40efae76e..ba2c89015 100644 --- a/maps/DayOfWeekSiblingsHouse.asm +++ b/maps/DayOfWeekSiblingsHouse.asm @@ -72,8 +72,8 @@ DayOfWeekSiblingsHouse_MapEvents: db 0, 0 ; filler db 2 ; warp events - warp_event 2, 7, 3, ROUTE_26 - warp_event 3, 7, 3, ROUTE_26 + warp_event 2, 7, ROUTE_26, 3 + warp_event 3, 7, ROUTE_26, 3 db 0 ; coord events diff --git a/maps/DiglettsCave.asm b/maps/DiglettsCave.asm index 6552e4d57..e3d0c4501 100644 --- a/maps/DiglettsCave.asm +++ b/maps/DiglettsCave.asm @@ -24,12 +24,12 @@ DiglettsCave_MapEvents: db 0, 0 ; filler db 6 ; warp events - warp_event 3, 33, 10, VERMILION_CITY - warp_event 5, 31, 5, DIGLETTS_CAVE - warp_event 15, 5, 5, ROUTE_2 - warp_event 17, 3, 6, DIGLETTS_CAVE - warp_event 17, 33, 2, DIGLETTS_CAVE - warp_event 3, 3, 4, DIGLETTS_CAVE + warp_event 3, 33, VERMILION_CITY, 10 + warp_event 5, 31, DIGLETTS_CAVE, 5 + warp_event 15, 5, ROUTE_2, 5 + warp_event 17, 3, DIGLETTS_CAVE, 6 + warp_event 17, 33, DIGLETTS_CAVE, 2 + warp_event 3, 3, DIGLETTS_CAVE, 4 db 0 ; coord events diff --git a/maps/DragonShrine.asm b/maps/DragonShrine.asm index ac6fcf25b..d4a2aa8ba 100644 --- a/maps/DragonShrine.asm +++ b/maps/DragonShrine.asm @@ -659,8 +659,8 @@ DragonShrine_MapEvents: db 0, 0 ; filler db 2 ; warp events - warp_event 4, 9, 2, DRAGONS_DEN_B1F - warp_event 5, 9, 2, DRAGONS_DEN_B1F + warp_event 4, 9, DRAGONS_DEN_B1F, 2 + warp_event 5, 9, DRAGONS_DEN_B1F, 2 db 0 ; coord events diff --git a/maps/DragonsDen1F.asm b/maps/DragonsDen1F.asm index 5d6b27646..4f7a947a1 100644 --- a/maps/DragonsDen1F.asm +++ b/maps/DragonsDen1F.asm @@ -7,10 +7,10 @@ DragonsDen1F_MapEvents: db 0, 0 ; filler db 4 ; warp events - warp_event 3, 5, 8, BLACKTHORN_CITY - warp_event 3, 3, 4, DRAGONS_DEN_1F - warp_event 5, 15, 1, DRAGONS_DEN_B1F - warp_event 5, 13, 2, DRAGONS_DEN_1F + warp_event 3, 5, BLACKTHORN_CITY, 8 + warp_event 3, 3, DRAGONS_DEN_1F, 4 + warp_event 5, 15, DRAGONS_DEN_B1F, 1 + warp_event 5, 13, DRAGONS_DEN_1F, 2 db 0 ; coord events diff --git a/maps/DragonsDenB1F.asm b/maps/DragonsDenB1F.asm index 2d0a815c6..51f37da71 100644 --- a/maps/DragonsDenB1F.asm +++ b/maps/DragonsDenB1F.asm @@ -408,8 +408,8 @@ DragonsDenB1F_MapEvents: db 0, 0 ; filler db 2 ; warp events - warp_event 20, 3, 3, DRAGONS_DEN_1F - warp_event 19, 29, 1, DRAGON_SHRINE + warp_event 20, 3, DRAGONS_DEN_1F, 3 + warp_event 19, 29, DRAGON_SHRINE, 1 db 1 ; coord events coord_event 19, 30, SCENE_DRAGONSDENB1F_CLAIR_GIVES_TM, DragonsDenB1F_ClairScene diff --git a/maps/EarlsPokemonAcademy.asm b/maps/EarlsPokemonAcademy.asm index b20863fd1..f4f17ea9a 100644 --- a/maps/EarlsPokemonAcademy.asm +++ b/maps/EarlsPokemonAcademy.asm @@ -413,8 +413,8 @@ EarlsPokemonAcademy_MapEvents: db 0, 0 ; filler db 2 ; warp events - warp_event 3, 15, 3, VIOLET_CITY - warp_event 4, 15, 3, VIOLET_CITY + warp_event 3, 15, VIOLET_CITY, 3 + warp_event 4, 15, VIOLET_CITY, 3 db 0 ; coord events diff --git a/maps/EcruteakCity.asm b/maps/EcruteakCity.asm index 6ba623bab..6a454bb83 100644 --- a/maps/EcruteakCity.asm +++ b/maps/EcruteakCity.asm @@ -261,21 +261,21 @@ EcruteakCity_MapEvents: db 0, 0 ; filler db 15 ; warp events - warp_event 35, 26, 1, ROUTE_42_ECRUTEAK_GATE - warp_event 35, 27, 2, ROUTE_42_ECRUTEAK_GATE - warp_event 18, 11, 1, ECRUTEAK_TIN_TOWER_ENTRANCE - warp_event 20, 2, 1, WISE_TRIOS_ROOM - warp_event 20, 3, 2, WISE_TRIOS_ROOM - warp_event 23, 27, 1, ECRUTEAK_POKECENTER_1F - warp_event 5, 21, 1, ECRUTEAK_LUGIA_SPEECH_HOUSE - warp_event 23, 21, 1, DANCE_THEATRE - warp_event 29, 21, 2, ECRUTEAK_MART - warp_event 6, 27, 1, ECRUTEAK_GYM - warp_event 13, 27, 1, ECRUTEAK_ITEMFINDER_HOUSE - warp_event 37, 7, 1, TIN_TOWER_1F - warp_event 5, 5, 1, BURNED_TOWER_1F - warp_event 0, 18, 3, ROUTE_38_ECRUTEAK_GATE - warp_event 0, 19, 4, ROUTE_38_ECRUTEAK_GATE + warp_event 35, 26, ROUTE_42_ECRUTEAK_GATE, 1 + warp_event 35, 27, ROUTE_42_ECRUTEAK_GATE, 2 + warp_event 18, 11, ECRUTEAK_TIN_TOWER_ENTRANCE, 1 + warp_event 20, 2, WISE_TRIOS_ROOM, 1 + warp_event 20, 3, WISE_TRIOS_ROOM, 2 + warp_event 23, 27, ECRUTEAK_POKECENTER_1F, 1 + warp_event 5, 21, ECRUTEAK_LUGIA_SPEECH_HOUSE, 1 + warp_event 23, 21, DANCE_THEATRE, 1 + warp_event 29, 21, ECRUTEAK_MART, 2 + warp_event 6, 27, ECRUTEAK_GYM, 1 + warp_event 13, 27, ECRUTEAK_ITEMFINDER_HOUSE, 1 + warp_event 37, 7, TIN_TOWER_1F, 1 + warp_event 5, 5, BURNED_TOWER_1F, 1 + warp_event 0, 18, ROUTE_38_ECRUTEAK_GATE, 3 + warp_event 0, 19, ROUTE_38_ECRUTEAK_GATE, 4 db 0 ; coord events diff --git a/maps/EcruteakGym.asm b/maps/EcruteakGym.asm index 3ff0a15d1..fc9e03020 100644 --- a/maps/EcruteakGym.asm +++ b/maps/EcruteakGym.asm @@ -388,39 +388,39 @@ EcruteakGym_MapEvents: db 0, 0 ; filler db 33 ; warp events - warp_event 4, 17, 10, ECRUTEAK_CITY - warp_event 5, 17, 10, ECRUTEAK_CITY - warp_event 4, 14, 4, ECRUTEAK_GYM - warp_event 2, 4, 3, ECRUTEAK_GYM - warp_event 3, 4, 3, ECRUTEAK_GYM - warp_event 4, 4, 3, ECRUTEAK_GYM - warp_event 4, 5, 3, ECRUTEAK_GYM - warp_event 6, 7, 3, ECRUTEAK_GYM - warp_event 7, 4, 3, ECRUTEAK_GYM - warp_event 2, 6, 3, ECRUTEAK_GYM - warp_event 3, 6, 3, ECRUTEAK_GYM - warp_event 4, 6, 3, ECRUTEAK_GYM - warp_event 5, 6, 3, ECRUTEAK_GYM - warp_event 7, 6, 3, ECRUTEAK_GYM - warp_event 7, 7, 3, ECRUTEAK_GYM - warp_event 4, 8, 3, ECRUTEAK_GYM - warp_event 5, 8, 3, ECRUTEAK_GYM - warp_event 6, 8, 3, ECRUTEAK_GYM - warp_event 7, 8, 3, ECRUTEAK_GYM - warp_event 2, 8, 3, ECRUTEAK_GYM - warp_event 2, 9, 3, ECRUTEAK_GYM - warp_event 2, 10, 3, ECRUTEAK_GYM - warp_event 2, 11, 3, ECRUTEAK_GYM - warp_event 4, 10, 3, ECRUTEAK_GYM - warp_event 5, 10, 3, ECRUTEAK_GYM - warp_event 2, 12, 3, ECRUTEAK_GYM - warp_event 3, 12, 3, ECRUTEAK_GYM - warp_event 4, 12, 3, ECRUTEAK_GYM - warp_event 5, 12, 3, ECRUTEAK_GYM - warp_event 7, 10, 3, ECRUTEAK_GYM - warp_event 7, 11, 3, ECRUTEAK_GYM - warp_event 7, 12, 3, ECRUTEAK_GYM - warp_event 7, 13, 3, ECRUTEAK_GYM + warp_event 4, 17, ECRUTEAK_CITY, 10 + warp_event 5, 17, ECRUTEAK_CITY, 10 + warp_event 4, 14, ECRUTEAK_GYM, 4 + warp_event 2, 4, ECRUTEAK_GYM, 3 + warp_event 3, 4, ECRUTEAK_GYM, 3 + warp_event 4, 4, ECRUTEAK_GYM, 3 + warp_event 4, 5, ECRUTEAK_GYM, 3 + warp_event 6, 7, ECRUTEAK_GYM, 3 + warp_event 7, 4, ECRUTEAK_GYM, 3 + warp_event 2, 6, ECRUTEAK_GYM, 3 + warp_event 3, 6, ECRUTEAK_GYM, 3 + warp_event 4, 6, ECRUTEAK_GYM, 3 + warp_event 5, 6, ECRUTEAK_GYM, 3 + warp_event 7, 6, ECRUTEAK_GYM, 3 + warp_event 7, 7, ECRUTEAK_GYM, 3 + warp_event 4, 8, ECRUTEAK_GYM, 3 + warp_event 5, 8, ECRUTEAK_GYM, 3 + warp_event 6, 8, ECRUTEAK_GYM, 3 + warp_event 7, 8, ECRUTEAK_GYM, 3 + warp_event 2, 8, ECRUTEAK_GYM, 3 + warp_event 2, 9, ECRUTEAK_GYM, 3 + warp_event 2, 10, ECRUTEAK_GYM, 3 + warp_event 2, 11, ECRUTEAK_GYM, 3 + warp_event 4, 10, ECRUTEAK_GYM, 3 + warp_event 5, 10, ECRUTEAK_GYM, 3 + warp_event 2, 12, ECRUTEAK_GYM, 3 + warp_event 3, 12, ECRUTEAK_GYM, 3 + warp_event 4, 12, ECRUTEAK_GYM, 3 + warp_event 5, 12, ECRUTEAK_GYM, 3 + warp_event 7, 10, ECRUTEAK_GYM, 3 + warp_event 7, 11, ECRUTEAK_GYM, 3 + warp_event 7, 12, ECRUTEAK_GYM, 3 + warp_event 7, 13, ECRUTEAK_GYM, 3 db 0 ; coord events diff --git a/maps/EcruteakItemfinderHouse.asm b/maps/EcruteakItemfinderHouse.asm index 7ecf9dcb6..f058a6ec9 100644 --- a/maps/EcruteakItemfinderHouse.asm +++ b/maps/EcruteakItemfinderHouse.asm @@ -164,8 +164,8 @@ EcruteakItemfinderHouse_MapEvents: db 0, 0 ; filler db 2 ; warp events - warp_event 3, 7, 11, ECRUTEAK_CITY - warp_event 4, 7, 11, ECRUTEAK_CITY + warp_event 3, 7, ECRUTEAK_CITY, 11 + warp_event 4, 7, ECRUTEAK_CITY, 11 db 0 ; coord events diff --git a/maps/EcruteakLugiaSpeechHouse.asm b/maps/EcruteakLugiaSpeechHouse.asm index 47735d27a..4df1e5430 100644 --- a/maps/EcruteakLugiaSpeechHouse.asm +++ b/maps/EcruteakLugiaSpeechHouse.asm @@ -46,8 +46,8 @@ EcruteakLugiaSpeechHouse_MapEvents: db 0, 0 ; filler db 2 ; warp events - warp_event 3, 7, 7, ECRUTEAK_CITY - warp_event 4, 7, 7, ECRUTEAK_CITY + warp_event 3, 7, ECRUTEAK_CITY, 7 + warp_event 4, 7, ECRUTEAK_CITY, 7 db 0 ; coord events diff --git a/maps/EcruteakMart.asm b/maps/EcruteakMart.asm index 07e680de6..9587e331b 100644 --- a/maps/EcruteakMart.asm +++ b/maps/EcruteakMart.asm @@ -47,8 +47,8 @@ EcruteakMart_MapEvents: db 0, 0 ; filler db 2 ; warp events - warp_event 2, 7, 9, ECRUTEAK_CITY - warp_event 3, 7, 9, ECRUTEAK_CITY + warp_event 2, 7, ECRUTEAK_CITY, 9 + warp_event 3, 7, ECRUTEAK_CITY, 9 db 0 ; coord events diff --git a/maps/EcruteakPokecenter1F.asm b/maps/EcruteakPokecenter1F.asm index 00ed64894..a51602588 100644 --- a/maps/EcruteakPokecenter1F.asm +++ b/maps/EcruteakPokecenter1F.asm @@ -208,9 +208,9 @@ EcruteakPokecenter1F_MapEvents: db 0, 0 ; filler db 3 ; warp events - warp_event 3, 7, 6, ECRUTEAK_CITY - warp_event 4, 7, 6, ECRUTEAK_CITY - warp_event 0, 7, 1, POKECENTER_2F + warp_event 3, 7, ECRUTEAK_CITY, 6 + warp_event 4, 7, ECRUTEAK_CITY, 6 + warp_event 0, 7, POKECENTER_2F, 1 db 0 ; coord events diff --git a/maps/EcruteakTinTowerEntrance.asm b/maps/EcruteakTinTowerEntrance.asm index 68e277a7f..2a0ebbcbc 100644 --- a/maps/EcruteakTinTowerEntrance.asm +++ b/maps/EcruteakTinTowerEntrance.asm @@ -279,11 +279,11 @@ EcruteakTinTowerEntrance_MapEvents: db 0, 0 ; filler db 5 ; warp events - warp_event 4, 17, 3, ECRUTEAK_CITY - warp_event 5, 17, 3, ECRUTEAK_CITY - warp_event 5, 3, 4, ECRUTEAK_TIN_TOWER_ENTRANCE - warp_event 17, 15, 3, ECRUTEAK_TIN_TOWER_ENTRANCE - warp_event 17, 3, 3, WISE_TRIOS_ROOM + warp_event 4, 17, ECRUTEAK_CITY, 3 + warp_event 5, 17, ECRUTEAK_CITY, 3 + warp_event 5, 3, ECRUTEAK_TIN_TOWER_ENTRANCE, 4 + warp_event 17, 15, ECRUTEAK_TIN_TOWER_ENTRANCE, 3 + warp_event 17, 3, WISE_TRIOS_ROOM, 3 db 2 ; coord events coord_event 4, 7, SCENE_DEFAULT, EcruteakTinTowerEntrance_CoordEvent1 diff --git a/maps/ElmsHouse.asm b/maps/ElmsHouse.asm index d41cc9ea4..5064bb44f 100644 --- a/maps/ElmsHouse.asm +++ b/maps/ElmsHouse.asm @@ -85,8 +85,8 @@ ElmsHouse_MapEvents: db 0, 0 ; filler db 2 ; warp events - warp_event 2, 7, 4, NEW_BARK_TOWN - warp_event 3, 7, 4, NEW_BARK_TOWN + warp_event 2, 7, NEW_BARK_TOWN, 4 + warp_event 3, 7, NEW_BARK_TOWN, 4 db 0 ; coord events diff --git a/maps/ElmsLab.asm b/maps/ElmsLab.asm index 47ec5c30a..d9ab8f320 100644 --- a/maps/ElmsLab.asm +++ b/maps/ElmsLab.asm @@ -1372,8 +1372,8 @@ ElmsLab_MapEvents: db 0, 0 ; filler db 2 ; warp events - warp_event 4, 11, 1, NEW_BARK_TOWN - warp_event 5, 11, 1, NEW_BARK_TOWN + warp_event 4, 11, NEW_BARK_TOWN, 1 + warp_event 5, 11, NEW_BARK_TOWN, 1 db 8 ; coord events coord_event 4, 6, SCENE_ELMSLAB_CANT_LEAVE, LabTryToLeaveScript diff --git a/maps/FastShip1F.asm b/maps/FastShip1F.asm index aa0877c63..405cb8caf 100644 --- a/maps/FastShip1F.asm +++ b/maps/FastShip1F.asm @@ -287,18 +287,18 @@ FastShip1F_MapEvents: db 0, 0 ; filler db 12 ; warp events - warp_event 25, 1, -1, FAST_SHIP_1F - warp_event 27, 8, 1, FAST_SHIP_CABINS_NNW_NNE_NE - warp_event 23, 8, 2, FAST_SHIP_CABINS_NNW_NNE_NE - warp_event 19, 8, 3, FAST_SHIP_CABINS_NNW_NNE_NE - warp_event 15, 8, 1, FAST_SHIP_CABINS_SW_SSW_NW - warp_event 15, 15, 2, FAST_SHIP_CABINS_SW_SSW_NW - warp_event 19, 15, 4, FAST_SHIP_CABINS_SW_SSW_NW - warp_event 23, 15, 1, FAST_SHIP_CABINS_SE_SSE_CAPTAINS_CABIN - warp_event 27, 15, 3, FAST_SHIP_CABINS_SE_SSE_CAPTAINS_CABIN - warp_event 3, 13, 5, FAST_SHIP_CABINS_SE_SSE_CAPTAINS_CABIN - warp_event 6, 12, 1, FAST_SHIP_B1F - warp_event 30, 14, 2, FAST_SHIP_B1F + warp_event 25, 1, FAST_SHIP_1F, -1 + warp_event 27, 8, FAST_SHIP_CABINS_NNW_NNE_NE, 1 + warp_event 23, 8, FAST_SHIP_CABINS_NNW_NNE_NE, 2 + warp_event 19, 8, FAST_SHIP_CABINS_NNW_NNE_NE, 3 + warp_event 15, 8, FAST_SHIP_CABINS_SW_SSW_NW, 1 + warp_event 15, 15, FAST_SHIP_CABINS_SW_SSW_NW, 2 + warp_event 19, 15, FAST_SHIP_CABINS_SW_SSW_NW, 4 + warp_event 23, 15, FAST_SHIP_CABINS_SE_SSE_CAPTAINS_CABIN, 1 + warp_event 27, 15, FAST_SHIP_CABINS_SE_SSE_CAPTAINS_CABIN, 3 + warp_event 3, 13, FAST_SHIP_CABINS_SE_SSE_CAPTAINS_CABIN, 5 + warp_event 6, 12, FAST_SHIP_B1F, 1 + warp_event 30, 14, FAST_SHIP_B1F, 2 db 2 ; coord events coord_event 24, 6, SCENE_FASTSHIP1F_MEET_GRANDPA, WorriedGrandpaSceneLeft diff --git a/maps/FastShipB1F.asm b/maps/FastShipB1F.asm index 4cec05fdc..3051ff20d 100644 --- a/maps/FastShipB1F.asm +++ b/maps/FastShipB1F.asm @@ -450,8 +450,8 @@ FastShipB1F_MapEvents: db 0, 0 ; filler db 2 ; warp events - warp_event 5, 11, 11, FAST_SHIP_1F - warp_event 31, 13, 12, FAST_SHIP_1F + warp_event 5, 11, FAST_SHIP_1F, 11 + warp_event 31, 13, FAST_SHIP_1F, 12 db 2 ; coord events coord_event 30, 7, SCENE_DEFAULT, UnknownScript_0x7673c diff --git a/maps/FastShipCabins_NNW_NNE_NE.asm b/maps/FastShipCabins_NNW_NNE_NE.asm index fa293562f..cbacb9b74 100644 --- a/maps/FastShipCabins_NNW_NNE_NE.asm +++ b/maps/FastShipCabins_NNW_NNE_NE.asm @@ -268,9 +268,9 @@ FastShipCabins_NNW_NNE_NE_MapEvents: db 0, 0 ; filler db 3 ; warp events - warp_event 2, 0, 2, FAST_SHIP_1F - warp_event 2, 12, 3, FAST_SHIP_1F - warp_event 2, 24, 4, FAST_SHIP_1F + warp_event 2, 0, FAST_SHIP_1F, 2 + warp_event 2, 12, FAST_SHIP_1F, 3 + warp_event 2, 24, FAST_SHIP_1F, 4 db 0 ; coord events diff --git a/maps/FastShipCabins_SE_SSE_CaptainsCabin.asm b/maps/FastShipCabins_SE_SSE_CaptainsCabin.asm index 3e68a1494..a1db95fa9 100644 --- a/maps/FastShipCabins_SE_SSE_CaptainsCabin.asm +++ b/maps/FastShipCabins_SE_SSE_CaptainsCabin.asm @@ -464,12 +464,12 @@ FastShipCabins_SE_SSE_CaptainsCabin_MapEvents: db 0, 0 ; filler db 6 ; warp events - warp_event 2, 7, 8, FAST_SHIP_1F - warp_event 3, 7, 8, FAST_SHIP_1F - warp_event 2, 19, 9, FAST_SHIP_1F - warp_event 3, 19, 9, FAST_SHIP_1F - warp_event 2, 33, 10, FAST_SHIP_1F - warp_event 3, 33, 10, FAST_SHIP_1F + warp_event 2, 7, FAST_SHIP_1F, 8 + warp_event 3, 7, FAST_SHIP_1F, 8 + warp_event 2, 19, FAST_SHIP_1F, 9 + warp_event 3, 19, FAST_SHIP_1F, 9 + warp_event 2, 33, FAST_SHIP_1F, 10 + warp_event 3, 33, FAST_SHIP_1F, 10 db 0 ; coord events diff --git a/maps/FastShipCabins_SW_SSW_NW.asm b/maps/FastShipCabins_SW_SSW_NW.asm index 15daeeae2..15200b33c 100644 --- a/maps/FastShipCabins_SW_SSW_NW.asm +++ b/maps/FastShipCabins_SW_SSW_NW.asm @@ -224,11 +224,11 @@ FastShipCabins_SW_SSW_NW_MapEvents: db 0, 0 ; filler db 5 ; warp events - warp_event 2, 0, 5, FAST_SHIP_1F - warp_event 2, 19, 6, FAST_SHIP_1F - warp_event 3, 19, 6, FAST_SHIP_1F - warp_event 2, 31, 7, FAST_SHIP_1F - warp_event 3, 31, 7, FAST_SHIP_1F + warp_event 2, 0, FAST_SHIP_1F, 5 + warp_event 2, 19, FAST_SHIP_1F, 6 + warp_event 3, 19, FAST_SHIP_1F, 6 + warp_event 2, 31, FAST_SHIP_1F, 7 + warp_event 3, 31, FAST_SHIP_1F, 7 db 0 ; coord events diff --git a/maps/FightingDojo.asm b/maps/FightingDojo.asm index 3ec583d79..0a30bdf3c 100644 --- a/maps/FightingDojo.asm +++ b/maps/FightingDojo.asm @@ -44,8 +44,8 @@ FightingDojo_MapEvents: db 0, 0 ; filler db 2 ; warp events - warp_event 4, 11, 1, SAFFRON_CITY - warp_event 5, 11, 1, SAFFRON_CITY + warp_event 4, 11, SAFFRON_CITY, 1 + warp_event 5, 11, SAFFRON_CITY, 1 db 0 ; coord events diff --git a/maps/FuchsiaCity.asm b/maps/FuchsiaCity.asm index a576868a7..5fd606422 100644 --- a/maps/FuchsiaCity.asm +++ b/maps/FuchsiaCity.asm @@ -126,17 +126,17 @@ FuchsiaCity_MapEvents: db 0, 0 ; filler db 11 ; warp events - warp_event 5, 13, 2, FUCHSIA_MART - warp_event 22, 13, 1, SAFARI_ZONE_MAIN_OFFICE - warp_event 8, 27, 1, FUCHSIA_GYM - warp_event 11, 27, 1, BILLS_BROTHERS_HOUSE - warp_event 19, 27, 1, FUCHSIA_POKECENTER_1F - warp_event 27, 27, 1, SAFARI_ZONE_WARDENS_HOME - warp_event 18, 3, 3, SAFARI_ZONE_FUCHSIA_GATE_BETA - warp_event 37, 22, 1, ROUTE_15_FUCHSIA_GATE - warp_event 37, 23, 2, ROUTE_15_FUCHSIA_GATE - warp_event 7, 35, 1, ROUTE_19_FUCHSIA_GATE - warp_event 8, 35, 2, ROUTE_19_FUCHSIA_GATE + warp_event 5, 13, FUCHSIA_MART, 2 + warp_event 22, 13, SAFARI_ZONE_MAIN_OFFICE, 1 + warp_event 8, 27, FUCHSIA_GYM, 1 + warp_event 11, 27, BILLS_BROTHERS_HOUSE, 1 + warp_event 19, 27, FUCHSIA_POKECENTER_1F, 1 + warp_event 27, 27, SAFARI_ZONE_WARDENS_HOME, 1 + warp_event 18, 3, SAFARI_ZONE_FUCHSIA_GATE_BETA, 3 + warp_event 37, 22, ROUTE_15_FUCHSIA_GATE, 1 + warp_event 37, 23, ROUTE_15_FUCHSIA_GATE, 2 + warp_event 7, 35, ROUTE_19_FUCHSIA_GATE, 1 + warp_event 8, 35, ROUTE_19_FUCHSIA_GATE, 2 db 0 ; coord events diff --git a/maps/FuchsiaGym.asm b/maps/FuchsiaGym.asm index a64dd49e1..0ffcdd0e3 100644 --- a/maps/FuchsiaGym.asm +++ b/maps/FuchsiaGym.asm @@ -382,8 +382,8 @@ FuchsiaGym_MapEvents: db 0, 0 ; filler db 2 ; warp events - warp_event 4, 17, 3, FUCHSIA_CITY - warp_event 5, 17, 3, FUCHSIA_CITY + warp_event 4, 17, FUCHSIA_CITY, 3 + warp_event 5, 17, FUCHSIA_CITY, 3 db 0 ; coord events diff --git a/maps/FuchsiaMart.asm b/maps/FuchsiaMart.asm index 98808262f..9bc34b006 100644 --- a/maps/FuchsiaMart.asm +++ b/maps/FuchsiaMart.asm @@ -39,8 +39,8 @@ FuchsiaMart_MapEvents: db 0, 0 ; filler db 2 ; warp events - warp_event 2, 7, 1, FUCHSIA_CITY - warp_event 3, 7, 1, FUCHSIA_CITY + warp_event 2, 7, FUCHSIA_CITY, 1 + warp_event 3, 7, FUCHSIA_CITY, 1 db 0 ; coord events diff --git a/maps/FuchsiaPokecenter1F.asm b/maps/FuchsiaPokecenter1F.asm index 01609dc48..418266485 100644 --- a/maps/FuchsiaPokecenter1F.asm +++ b/maps/FuchsiaPokecenter1F.asm @@ -90,9 +90,9 @@ FuchsiaPokecenter1F_MapEvents: db 0, 0 ; filler db 3 ; warp events - warp_event 3, 7, 5, FUCHSIA_CITY - warp_event 4, 7, 5, FUCHSIA_CITY - warp_event 0, 7, 1, POKECENTER_2F + warp_event 3, 7, FUCHSIA_CITY, 5 + warp_event 4, 7, FUCHSIA_CITY, 5 + warp_event 0, 7, POKECENTER_2F, 1 db 0 ; coord events diff --git a/maps/FuchsiaPokecenter2FBeta.asm b/maps/FuchsiaPokecenter2FBeta.asm index f37dd7e0a..f26304a3e 100644 --- a/maps/FuchsiaPokecenter2FBeta.asm +++ b/maps/FuchsiaPokecenter2FBeta.asm @@ -7,7 +7,7 @@ FuchsiaPokecenter2FBeta_MapEvents: db 0, 0 ; filler db 1 ; warp events - warp_event 0, 7, 3, FUCHSIA_POKECENTER_1F + warp_event 0, 7, FUCHSIA_POKECENTER_1F, 3 db 0 ; coord events diff --git a/maps/GoldenrodBikeShop.asm b/maps/GoldenrodBikeShop.asm index 980b3c940..05bcf0de7 100644 --- a/maps/GoldenrodBikeShop.asm +++ b/maps/GoldenrodBikeShop.asm @@ -104,8 +104,8 @@ GoldenrodBikeShop_MapEvents: db 0, 0 ; filler db 2 ; warp events - warp_event 2, 7, 2, GOLDENROD_CITY - warp_event 3, 7, 2, GOLDENROD_CITY + warp_event 2, 7, GOLDENROD_CITY, 2 + warp_event 3, 7, GOLDENROD_CITY, 2 db 0 ; coord events diff --git a/maps/GoldenrodCity.asm b/maps/GoldenrodCity.asm index 623107e95..1f30a0015 100644 --- a/maps/GoldenrodCity.asm +++ b/maps/GoldenrodCity.asm @@ -553,21 +553,21 @@ GoldenrodCity_MapEvents: db 0, 0 ; filler db 15 ; warp events - warp_event 24, 7, 1, GOLDENROD_GYM - warp_event 29, 29, 1, GOLDENROD_BIKE_SHOP - warp_event 31, 21, 1, GOLDENROD_HAPPINESS_RATER - warp_event 5, 25, 1, BILLS_FAMILYS_HOUSE - warp_event 9, 13, 2, GOLDENROD_MAGNET_TRAIN_STATION - warp_event 29, 5, 1, GOLDENROD_FLOWER_SHOP - warp_event 33, 9, 1, GOLDENROD_PP_SPEECH_HOUSE - warp_event 15, 7, 1, GOLDENROD_NAME_RATER - warp_event 24, 27, 1, GOLDENROD_DEPT_STORE_1F - warp_event 14, 21, 1, GOLDENROD_GAME_CORNER - warp_event 5, 15, 1, RADIO_TOWER_1F - warp_event 19, 1, 3, ROUTE_35_GOLDENROD_GATE - warp_event 9, 5, 8, GOLDENROD_UNDERGROUND_SWITCH_ROOM_ENTRANCES - warp_event 11, 29, 5, GOLDENROD_UNDERGROUND_SWITCH_ROOM_ENTRANCES - warp_event 15, 27, 1, GOLDENROD_POKECENTER_1F + warp_event 24, 7, GOLDENROD_GYM, 1 + warp_event 29, 29, GOLDENROD_BIKE_SHOP, 1 + warp_event 31, 21, GOLDENROD_HAPPINESS_RATER, 1 + warp_event 5, 25, BILLS_FAMILYS_HOUSE, 1 + warp_event 9, 13, GOLDENROD_MAGNET_TRAIN_STATION, 2 + warp_event 29, 5, GOLDENROD_FLOWER_SHOP, 1 + warp_event 33, 9, GOLDENROD_PP_SPEECH_HOUSE, 1 + warp_event 15, 7, GOLDENROD_NAME_RATER, 1 + warp_event 24, 27, GOLDENROD_DEPT_STORE_1F, 1 + warp_event 14, 21, GOLDENROD_GAME_CORNER, 1 + warp_event 5, 15, RADIO_TOWER_1F, 1 + warp_event 19, 1, ROUTE_35_GOLDENROD_GATE, 3 + warp_event 9, 5, GOLDENROD_UNDERGROUND_SWITCH_ROOM_ENTRANCES, 8 + warp_event 11, 29, GOLDENROD_UNDERGROUND_SWITCH_ROOM_ENTRANCES, 5 + warp_event 15, 27, GOLDENROD_POKECENTER_1F, 1 db 0 ; coord events diff --git a/maps/GoldenrodDeptStore1F.asm b/maps/GoldenrodDeptStore1F.asm index b38f5cddd..0a527369c 100644 --- a/maps/GoldenrodDeptStore1F.asm +++ b/maps/GoldenrodDeptStore1F.asm @@ -80,10 +80,10 @@ GoldenrodDeptStore1F_MapEvents: db 0, 0 ; filler db 4 ; warp events - warp_event 7, 7, 9, GOLDENROD_CITY - warp_event 8, 7, 9, GOLDENROD_CITY - warp_event 15, 0, 2, GOLDENROD_DEPT_STORE_2F - warp_event 2, 0, 1, GOLDENROD_DEPT_STORE_ELEVATOR + warp_event 7, 7, GOLDENROD_CITY, 9 + warp_event 8, 7, GOLDENROD_CITY, 9 + warp_event 15, 0, GOLDENROD_DEPT_STORE_2F, 2 + warp_event 2, 0, GOLDENROD_DEPT_STORE_ELEVATOR, 1 db 0 ; coord events diff --git a/maps/GoldenrodDeptStore2F.asm b/maps/GoldenrodDeptStore2F.asm index 6c6f99124..a759e6559 100644 --- a/maps/GoldenrodDeptStore2F.asm +++ b/maps/GoldenrodDeptStore2F.asm @@ -102,9 +102,9 @@ GoldenrodDeptStore2F_MapEvents: db 0, 0 ; filler db 3 ; warp events - warp_event 12, 0, 1, GOLDENROD_DEPT_STORE_3F - warp_event 15, 0, 3, GOLDENROD_DEPT_STORE_1F - warp_event 2, 0, 1, GOLDENROD_DEPT_STORE_ELEVATOR + warp_event 12, 0, GOLDENROD_DEPT_STORE_3F, 1 + warp_event 15, 0, GOLDENROD_DEPT_STORE_1F, 3 + warp_event 2, 0, GOLDENROD_DEPT_STORE_ELEVATOR, 1 db 0 ; coord events diff --git a/maps/GoldenrodDeptStore3F.asm b/maps/GoldenrodDeptStore3F.asm index 1bd2fecf8..ddd5dcacf 100644 --- a/maps/GoldenrodDeptStore3F.asm +++ b/maps/GoldenrodDeptStore3F.asm @@ -58,9 +58,9 @@ GoldenrodDeptStore3F_MapEvents: db 0, 0 ; filler db 3 ; warp events - warp_event 12, 0, 1, GOLDENROD_DEPT_STORE_2F - warp_event 15, 0, 2, GOLDENROD_DEPT_STORE_4F - warp_event 2, 0, 1, GOLDENROD_DEPT_STORE_ELEVATOR + warp_event 12, 0, GOLDENROD_DEPT_STORE_2F, 1 + warp_event 15, 0, GOLDENROD_DEPT_STORE_4F, 2 + warp_event 2, 0, GOLDENROD_DEPT_STORE_ELEVATOR, 1 db 0 ; coord events diff --git a/maps/GoldenrodDeptStore4F.asm b/maps/GoldenrodDeptStore4F.asm index 4263957f8..c408120ed 100644 --- a/maps/GoldenrodDeptStore4F.asm +++ b/maps/GoldenrodDeptStore4F.asm @@ -79,9 +79,9 @@ GoldenrodDeptStore4F_MapEvents: db 0, 0 ; filler db 3 ; warp events - warp_event 12, 0, 1, GOLDENROD_DEPT_STORE_5F - warp_event 15, 0, 2, GOLDENROD_DEPT_STORE_3F - warp_event 2, 0, 1, GOLDENROD_DEPT_STORE_ELEVATOR + warp_event 12, 0, GOLDENROD_DEPT_STORE_5F, 1 + warp_event 15, 0, GOLDENROD_DEPT_STORE_3F, 2 + warp_event 2, 0, GOLDENROD_DEPT_STORE_ELEVATOR, 1 db 0 ; coord events diff --git a/maps/GoldenrodDeptStore5F.asm b/maps/GoldenrodDeptStore5F.asm index 4572e53a6..3d69348f0 100644 --- a/maps/GoldenrodDeptStore5F.asm +++ b/maps/GoldenrodDeptStore5F.asm @@ -219,9 +219,9 @@ GoldenrodDeptStore5F_MapEvents: db 0, 0 ; filler db 3 ; warp events - warp_event 12, 0, 1, GOLDENROD_DEPT_STORE_4F - warp_event 15, 0, 1, GOLDENROD_DEPT_STORE_6F - warp_event 2, 0, 1, GOLDENROD_DEPT_STORE_ELEVATOR + warp_event 12, 0, GOLDENROD_DEPT_STORE_4F, 1 + warp_event 15, 0, GOLDENROD_DEPT_STORE_6F, 1 + warp_event 2, 0, GOLDENROD_DEPT_STORE_ELEVATOR, 1 db 0 ; coord events diff --git a/maps/GoldenrodDeptStore6F.asm b/maps/GoldenrodDeptStore6F.asm index 4fb4b9ff9..2703f0405 100644 --- a/maps/GoldenrodDeptStore6F.asm +++ b/maps/GoldenrodDeptStore6F.asm @@ -149,9 +149,9 @@ GoldenrodDeptStore6F_MapEvents: db 0, 0 ; filler db 3 ; warp events - warp_event 15, 0, 2, GOLDENROD_DEPT_STORE_5F - warp_event 2, 0, 1, GOLDENROD_DEPT_STORE_ELEVATOR - warp_event 13, 0, 1, GOLDENROD_DEPT_STORE_ROOF + warp_event 15, 0, GOLDENROD_DEPT_STORE_5F, 2 + warp_event 2, 0, GOLDENROD_DEPT_STORE_ELEVATOR, 1 + warp_event 13, 0, GOLDENROD_DEPT_STORE_ROOF, 1 db 0 ; coord events diff --git a/maps/GoldenrodDeptStoreB1F.asm b/maps/GoldenrodDeptStoreB1F.asm index d18a191da..1b887fbef 100644 --- a/maps/GoldenrodDeptStoreB1F.asm +++ b/maps/GoldenrodDeptStoreB1F.asm @@ -111,9 +111,9 @@ GoldenrodDeptStoreB1F_MapEvents: db 0, 0 ; filler db 3 ; warp events - warp_event 17, 2, 3, GOLDENROD_UNDERGROUND_WAREHOUSE - warp_event 9, 4, 1, GOLDENROD_DEPT_STORE_ELEVATOR - warp_event 10, 4, 2, GOLDENROD_DEPT_STORE_ELEVATOR + warp_event 17, 2, GOLDENROD_UNDERGROUND_WAREHOUSE, 3 + warp_event 9, 4, GOLDENROD_DEPT_STORE_ELEVATOR, 1 + warp_event 10, 4, GOLDENROD_DEPT_STORE_ELEVATOR, 2 db 0 ; coord events diff --git a/maps/GoldenrodDeptStoreElevator.asm b/maps/GoldenrodDeptStoreElevator.asm index f76c43b62..e7a48865c 100644 --- a/maps/GoldenrodDeptStoreElevator.asm +++ b/maps/GoldenrodDeptStoreElevator.asm @@ -56,8 +56,8 @@ GoldenrodDeptStoreElevator_MapEvents: db 0, 0 ; filler db 2 ; warp events - warp_event 1, 3, -1, GOLDENROD_DEPT_STORE_1F - warp_event 2, 3, -1, GOLDENROD_DEPT_STORE_1F + warp_event 1, 3, GOLDENROD_DEPT_STORE_1F, -1 + warp_event 2, 3, GOLDENROD_DEPT_STORE_1F, -1 db 0 ; coord events diff --git a/maps/GoldenrodDeptStoreRoof.asm b/maps/GoldenrodDeptStoreRoof.asm index f991bfe9d..30812c3fb 100644 --- a/maps/GoldenrodDeptStoreRoof.asm +++ b/maps/GoldenrodDeptStoreRoof.asm @@ -213,7 +213,7 @@ GoldenrodDeptStoreRoof_MapEvents: db 0, 0 ; filler db 1 ; warp events - warp_event 13, 1, 3, GOLDENROD_DEPT_STORE_6F + warp_event 13, 1, GOLDENROD_DEPT_STORE_6F, 3 db 0 ; coord events diff --git a/maps/GoldenrodFlowerShop.asm b/maps/GoldenrodFlowerShop.asm index 9e182f8d8..05968d8b0 100644 --- a/maps/GoldenrodFlowerShop.asm +++ b/maps/GoldenrodFlowerShop.asm @@ -161,8 +161,8 @@ GoldenrodFlowerShop_MapEvents: db 0, 0 ; filler db 2 ; warp events - warp_event 2, 7, 6, GOLDENROD_CITY - warp_event 3, 7, 6, GOLDENROD_CITY + warp_event 2, 7, GOLDENROD_CITY, 6 + warp_event 3, 7, GOLDENROD_CITY, 6 db 0 ; coord events diff --git a/maps/GoldenrodGameCorner.asm b/maps/GoldenrodGameCorner.asm index d435b7e5e..b0bb5549c 100644 --- a/maps/GoldenrodGameCorner.asm +++ b/maps/GoldenrodGameCorner.asm @@ -438,8 +438,8 @@ GoldenrodGameCorner_MapEvents: db 0, 0 ; filler db 2 ; warp events - warp_event 2, 13, 10, GOLDENROD_CITY - warp_event 3, 13, 10, GOLDENROD_CITY + warp_event 2, 13, GOLDENROD_CITY, 10 + warp_event 3, 13, GOLDENROD_CITY, 10 db 0 ; coord events diff --git a/maps/GoldenrodGym.asm b/maps/GoldenrodGym.asm index d02f2a4af..31f042f33 100644 --- a/maps/GoldenrodGym.asm +++ b/maps/GoldenrodGym.asm @@ -381,8 +381,8 @@ GoldenrodGym_MapEvents: db 0, 0 ; filler db 2 ; warp events - warp_event 2, 17, 1, GOLDENROD_CITY - warp_event 3, 17, 1, GOLDENROD_CITY + warp_event 2, 17, GOLDENROD_CITY, 1 + warp_event 3, 17, GOLDENROD_CITY, 1 db 1 ; coord events coord_event 8, 5, SCENE_GOLDENRODGYM_WHITNEY_STOPS_CRYING, WhitneyCriesScript diff --git a/maps/GoldenrodHappinessRater.asm b/maps/GoldenrodHappinessRater.asm index 2b582347b..d68090ad8 100644 --- a/maps/GoldenrodHappinessRater.asm +++ b/maps/GoldenrodHappinessRater.asm @@ -138,8 +138,8 @@ GoldenrodHappinessRater_MapEvents: db 0, 0 ; filler db 2 ; warp events - warp_event 2, 7, 3, GOLDENROD_CITY - warp_event 3, 7, 3, GOLDENROD_CITY + warp_event 2, 7, GOLDENROD_CITY, 3 + warp_event 3, 7, GOLDENROD_CITY, 3 db 0 ; coord events diff --git a/maps/GoldenrodMagnetTrainStation.asm b/maps/GoldenrodMagnetTrainStation.asm index 003925cb2..4817554a2 100644 --- a/maps/GoldenrodMagnetTrainStation.asm +++ b/maps/GoldenrodMagnetTrainStation.asm @@ -166,10 +166,10 @@ GoldenrodMagnetTrainStation_MapEvents: db 0, 0 ; filler db 4 ; warp events - warp_event 8, 17, 5, GOLDENROD_CITY - warp_event 9, 17, 5, GOLDENROD_CITY - warp_event 6, 5, 4, SAFFRON_MAGNET_TRAIN_STATION - warp_event 11, 5, 3, SAFFRON_MAGNET_TRAIN_STATION + warp_event 8, 17, GOLDENROD_CITY, 5 + warp_event 9, 17, GOLDENROD_CITY, 5 + warp_event 6, 5, SAFFRON_MAGNET_TRAIN_STATION, 4 + warp_event 11, 5, SAFFRON_MAGNET_TRAIN_STATION, 3 db 1 ; coord events coord_event 11, 6, SCENE_DEFAULT, Script_ArriveFromSaffron diff --git a/maps/GoldenrodNameRater.asm b/maps/GoldenrodNameRater.asm index 40a5d4719..63fbad27b 100644 --- a/maps/GoldenrodNameRater.asm +++ b/maps/GoldenrodNameRater.asm @@ -26,8 +26,8 @@ GoldenrodNameRater_MapEvents: db 0, 0 ; filler db 2 ; warp events - warp_event 2, 7, 8, GOLDENROD_CITY - warp_event 3, 7, 8, GOLDENROD_CITY + warp_event 2, 7, GOLDENROD_CITY, 8 + warp_event 3, 7, GOLDENROD_CITY, 8 db 0 ; coord events diff --git a/maps/GoldenrodPPSpeechHouse.asm b/maps/GoldenrodPPSpeechHouse.asm index 82d0fc72e..b2d0f77ac 100644 --- a/maps/GoldenrodPPSpeechHouse.asm +++ b/maps/GoldenrodPPSpeechHouse.asm @@ -53,8 +53,8 @@ GoldenrodPPSpeechHouse_MapEvents: db 0, 0 ; filler db 2 ; warp events - warp_event 2, 7, 7, GOLDENROD_CITY - warp_event 3, 7, 7, GOLDENROD_CITY + warp_event 2, 7, GOLDENROD_CITY, 7 + warp_event 3, 7, GOLDENROD_CITY, 7 db 0 ; coord events diff --git a/maps/GoldenrodPokecenter1F.asm b/maps/GoldenrodPokecenter1F.asm index 2d8b8b484..a8d57f136 100644 --- a/maps/GoldenrodPokecenter1F.asm +++ b/maps/GoldenrodPokecenter1F.asm @@ -806,10 +806,10 @@ GoldenrodPokecenter1F_MapEvents: db 0, 0 ; filler db 4 ; warp events - warp_event 3, 7, 15, GOLDENROD_CITY - warp_event 4, 7, 15, GOLDENROD_CITY - warp_event 0, 6, 1, POKECOM_CENTER_ADMIN_ROOM_MOBILE - warp_event 0, 7, 1, POKECENTER_2F + warp_event 3, 7, GOLDENROD_CITY, 15 + warp_event 4, 7, GOLDENROD_CITY, 15 + warp_event 0, 6, POKECOM_CENTER_ADMIN_ROOM_MOBILE, 1 + warp_event 0, 7, POKECENTER_2F, 1 db 2 ; coord events coord_event 3, 7, SCENE_DEFAULT, GoldenrodPokecenter1F_GSBallSceneLeft diff --git a/maps/GoldenrodUnderground.asm b/maps/GoldenrodUnderground.asm index daa35641f..8aae5d872 100644 --- a/maps/GoldenrodUnderground.asm +++ b/maps/GoldenrodUnderground.asm @@ -648,12 +648,12 @@ GoldenrodUnderground_MapEvents: db 0, 0 ; filler db 6 ; warp events - warp_event 3, 2, 7, GOLDENROD_UNDERGROUND_SWITCH_ROOM_ENTRANCES - warp_event 3, 34, 4, GOLDENROD_UNDERGROUND_SWITCH_ROOM_ENTRANCES - warp_event 18, 6, 4, GOLDENROD_UNDERGROUND - warp_event 21, 31, 3, GOLDENROD_UNDERGROUND - warp_event 22, 31, 3, GOLDENROD_UNDERGROUND - warp_event 22, 27, 1, GOLDENROD_UNDERGROUND_SWITCH_ROOM_ENTRANCES + warp_event 3, 2, GOLDENROD_UNDERGROUND_SWITCH_ROOM_ENTRANCES, 7 + warp_event 3, 34, GOLDENROD_UNDERGROUND_SWITCH_ROOM_ENTRANCES, 4 + warp_event 18, 6, GOLDENROD_UNDERGROUND, 4 + warp_event 21, 31, GOLDENROD_UNDERGROUND, 3 + warp_event 22, 31, GOLDENROD_UNDERGROUND, 3 + warp_event 22, 27, GOLDENROD_UNDERGROUND_SWITCH_ROOM_ENTRANCES, 1 db 0 ; coord events diff --git a/maps/GoldenrodUndergroundSwitchRoomEntrances.asm b/maps/GoldenrodUndergroundSwitchRoomEntrances.asm index 1c4afb979..106413e52 100644 --- a/maps/GoldenrodUndergroundSwitchRoomEntrances.asm +++ b/maps/GoldenrodUndergroundSwitchRoomEntrances.asm @@ -932,15 +932,15 @@ GoldenrodUndergroundSwitchRoomEntrances_MapEvents: db 0, 0 ; filler db 9 ; warp events - warp_event 23, 3, 6, GOLDENROD_UNDERGROUND - warp_event 22, 10, 1, GOLDENROD_UNDERGROUND_WAREHOUSE - warp_event 23, 10, 2, GOLDENROD_UNDERGROUND_WAREHOUSE - warp_event 5, 25, 2, GOLDENROD_UNDERGROUND - warp_event 4, 29, 14, GOLDENROD_CITY - warp_event 5, 29, 14, GOLDENROD_CITY - warp_event 21, 25, 1, GOLDENROD_UNDERGROUND - warp_event 20, 29, 13, GOLDENROD_CITY - warp_event 21, 29, 13, GOLDENROD_CITY + warp_event 23, 3, GOLDENROD_UNDERGROUND, 6 + warp_event 22, 10, GOLDENROD_UNDERGROUND_WAREHOUSE, 1 + warp_event 23, 10, GOLDENROD_UNDERGROUND_WAREHOUSE, 2 + warp_event 5, 25, GOLDENROD_UNDERGROUND, 2 + warp_event 4, 29, GOLDENROD_CITY, 14 + warp_event 5, 29, GOLDENROD_CITY, 14 + warp_event 21, 25, GOLDENROD_UNDERGROUND, 1 + warp_event 20, 29, GOLDENROD_CITY, 13 + warp_event 21, 29, GOLDENROD_CITY, 13 db 2 ; coord events coord_event 19, 4, SCENE_DEFAULT, UndergroundSilverScene1 diff --git a/maps/GoldenrodUndergroundWarehouse.asm b/maps/GoldenrodUndergroundWarehouse.asm index 4227dc7cc..4484d874b 100644 --- a/maps/GoldenrodUndergroundWarehouse.asm +++ b/maps/GoldenrodUndergroundWarehouse.asm @@ -212,9 +212,9 @@ GoldenrodUndergroundWarehouse_MapEvents: db 0, 0 ; filler db 3 ; warp events - warp_event 2, 12, 2, GOLDENROD_UNDERGROUND_SWITCH_ROOM_ENTRANCES - warp_event 3, 12, 3, GOLDENROD_UNDERGROUND_SWITCH_ROOM_ENTRANCES - warp_event 17, 2, 1, GOLDENROD_DEPT_STORE_B1F + warp_event 2, 12, GOLDENROD_UNDERGROUND_SWITCH_ROOM_ENTRANCES, 2 + warp_event 3, 12, GOLDENROD_UNDERGROUND_SWITCH_ROOM_ENTRANCES, 3 + warp_event 17, 2, GOLDENROD_DEPT_STORE_B1F, 1 db 0 ; coord events diff --git a/maps/GuideGentsHouse.asm b/maps/GuideGentsHouse.asm index 98ac32ada..bd4556397 100644 --- a/maps/GuideGentsHouse.asm +++ b/maps/GuideGentsHouse.asm @@ -29,8 +29,8 @@ GuideGentsHouse_MapEvents: db 0, 0 ; filler db 2 ; warp events - warp_event 2, 7, 4, CHERRYGROVE_CITY - warp_event 3, 7, 4, CHERRYGROVE_CITY + warp_event 2, 7, CHERRYGROVE_CITY, 4 + warp_event 3, 7, CHERRYGROVE_CITY, 4 db 0 ; coord events diff --git a/maps/HallOfFame.asm b/maps/HallOfFame.asm index 539ff039e..dca5f7625 100644 --- a/maps/HallOfFame.asm +++ b/maps/HallOfFame.asm @@ -112,8 +112,8 @@ HallOfFame_MapEvents: db 0, 0 ; filler db 2 ; warp events - warp_event 4, 13, 3, LANCES_ROOM - warp_event 5, 13, 4, LANCES_ROOM + warp_event 4, 13, LANCES_ROOM, 3 + warp_event 5, 13, LANCES_ROOM, 4 db 0 ; coord events diff --git a/maps/IcePath1F.asm b/maps/IcePath1F.asm index 58edccf9b..aa8529901 100644 --- a/maps/IcePath1F.asm +++ b/maps/IcePath1F.asm @@ -21,10 +21,10 @@ IcePath1F_MapEvents: db 0, 0 ; filler db 4 ; warp events - warp_event 4, 19, 1, ROUTE_44 - warp_event 36, 27, 7, BLACKTHORN_CITY - warp_event 37, 5, 1, ICE_PATH_B1F - warp_event 37, 13, 7, ICE_PATH_B1F + warp_event 4, 19, ROUTE_44, 1 + warp_event 36, 27, BLACKTHORN_CITY, 7 + warp_event 37, 5, ICE_PATH_B1F, 1 + warp_event 37, 13, ICE_PATH_B1F, 7 db 0 ; coord events diff --git a/maps/IcePathB1F.asm b/maps/IcePathB1F.asm index 0fa627255..0b3919419 100644 --- a/maps/IcePathB1F.asm +++ b/maps/IcePathB1F.asm @@ -77,14 +77,14 @@ IcePathB1F_MapEvents: db 0, 0 ; filler db 8 ; warp events - warp_event 3, 15, 3, ICE_PATH_1F - warp_event 17, 3, 1, ICE_PATH_B2F_MAHOGANY_SIDE - warp_event 11, 2, 3, ICE_PATH_B2F_MAHOGANY_SIDE ; hole - warp_event 4, 7, 4, ICE_PATH_B2F_MAHOGANY_SIDE ; hole - warp_event 5, 12, 5, ICE_PATH_B2F_MAHOGANY_SIDE ; hole - warp_event 12, 13, 6, ICE_PATH_B2F_MAHOGANY_SIDE ; hole - warp_event 5, 25, 4, ICE_PATH_1F - warp_event 11, 27, 1, ICE_PATH_B2F_BLACKTHORN_SIDE + warp_event 3, 15, ICE_PATH_1F, 3 + warp_event 17, 3, ICE_PATH_B2F_MAHOGANY_SIDE, 1 + warp_event 11, 2, ICE_PATH_B2F_MAHOGANY_SIDE, 3 ; hole + warp_event 4, 7, ICE_PATH_B2F_MAHOGANY_SIDE, 4 ; hole + warp_event 5, 12, ICE_PATH_B2F_MAHOGANY_SIDE, 5 ; hole + warp_event 12, 13, ICE_PATH_B2F_MAHOGANY_SIDE, 6 ; hole + warp_event 5, 25, ICE_PATH_1F, 4 + warp_event 11, 27, ICE_PATH_B2F_BLACKTHORN_SIDE, 1 db 0 ; coord events diff --git a/maps/IcePathB2FBlackthornSide.asm b/maps/IcePathB2FBlackthornSide.asm index 85d35d7b7..42585eeac 100644 --- a/maps/IcePathB2FBlackthornSide.asm +++ b/maps/IcePathB2FBlackthornSide.asm @@ -16,8 +16,8 @@ IcePathB2FBlackthornSide_MapEvents: db 0, 0 ; filler db 2 ; warp events - warp_event 3, 15, 8, ICE_PATH_B1F - warp_event 3, 3, 2, ICE_PATH_B3F + warp_event 3, 15, ICE_PATH_B1F, 8 + warp_event 3, 3, ICE_PATH_B3F, 2 db 0 ; coord events diff --git a/maps/IcePathB2FMahoganySide.asm b/maps/IcePathB2FMahoganySide.asm index cecdd5452..9d4a53fab 100644 --- a/maps/IcePathB2FMahoganySide.asm +++ b/maps/IcePathB2FMahoganySide.asm @@ -32,12 +32,12 @@ IcePathB2FMahoganySide_MapEvents: db 0, 0 ; filler db 6 ; warp events - warp_event 17, 1, 2, ICE_PATH_B1F - warp_event 9, 11, 1, ICE_PATH_B3F - warp_event 11, 4, 3, ICE_PATH_B1F - warp_event 4, 6, 4, ICE_PATH_B1F - warp_event 4, 12, 5, ICE_PATH_B1F - warp_event 12, 12, 6, ICE_PATH_B1F + warp_event 17, 1, ICE_PATH_B1F, 2 + warp_event 9, 11, ICE_PATH_B3F, 1 + warp_event 11, 4, ICE_PATH_B1F, 3 + warp_event 4, 6, ICE_PATH_B1F, 4 + warp_event 4, 12, ICE_PATH_B1F, 5 + warp_event 12, 12, ICE_PATH_B1F, 6 db 0 ; coord events diff --git a/maps/IcePathB3F.asm b/maps/IcePathB3F.asm index dbe60aea7..65b22c670 100644 --- a/maps/IcePathB3F.asm +++ b/maps/IcePathB3F.asm @@ -17,8 +17,8 @@ IcePathB3F_MapEvents: db 0, 0 ; filler db 2 ; warp events - warp_event 3, 5, 2, ICE_PATH_B2F_MAHOGANY_SIDE - warp_event 15, 5, 2, ICE_PATH_B2F_BLACKTHORN_SIDE + warp_event 3, 5, ICE_PATH_B2F_MAHOGANY_SIDE, 2 + warp_event 15, 5, ICE_PATH_B2F_BLACKTHORN_SIDE, 2 db 0 ; coord events diff --git a/maps/IlexForest.asm b/maps/IlexForest.asm index 0407c97f4..c78d8ef48 100644 --- a/maps/IlexForest.asm +++ b/maps/IlexForest.asm @@ -939,9 +939,9 @@ IlexForest_MapEvents: db 0, 0 ; filler db 3 ; warp events - warp_event 1, 5, 3, ROUTE_34_ILEX_FOREST_GATE - warp_event 3, 42, 1, ILEX_FOREST_AZALEA_GATE - warp_event 3, 43, 2, ILEX_FOREST_AZALEA_GATE + warp_event 1, 5, ROUTE_34_ILEX_FOREST_GATE, 3 + warp_event 3, 42, ILEX_FOREST_AZALEA_GATE, 1 + warp_event 3, 43, ILEX_FOREST_AZALEA_GATE, 2 db 0 ; coord events diff --git a/maps/IlexForestAzaleaGate.asm b/maps/IlexForestAzaleaGate.asm index c0dc50d9b..a2193fb8c 100644 --- a/maps/IlexForestAzaleaGate.asm +++ b/maps/IlexForestAzaleaGate.asm @@ -32,10 +32,10 @@ IlexForestAzaleaGate_MapEvents: db 0, 0 ; filler db 4 ; warp events - warp_event 0, 4, 2, ILEX_FOREST - warp_event 0, 5, 3, ILEX_FOREST - warp_event 9, 4, 7, AZALEA_TOWN - warp_event 9, 5, 8, AZALEA_TOWN + warp_event 0, 4, ILEX_FOREST, 2 + warp_event 0, 5, ILEX_FOREST, 3 + warp_event 9, 4, AZALEA_TOWN, 7 + warp_event 9, 5, AZALEA_TOWN, 8 db 0 ; coord events diff --git a/maps/IndigoPlateauPokecenter1F.asm b/maps/IndigoPlateauPokecenter1F.asm index 7e59b632a..4351d1769 100644 --- a/maps/IndigoPlateauPokecenter1F.asm +++ b/maps/IndigoPlateauPokecenter1F.asm @@ -304,10 +304,10 @@ IndigoPlateauPokecenter1F_MapEvents: db 0, 0 ; filler db 4 ; warp events - warp_event 5, 13, 1, ROUTE_23 - warp_event 6, 13, 2, ROUTE_23 - warp_event 0, 13, 1, POKECENTER_2F - warp_event 14, 3, 1, WILLS_ROOM + warp_event 5, 13, ROUTE_23, 1 + warp_event 6, 13, ROUTE_23, 2 + warp_event 0, 13, POKECENTER_2F, 1 + warp_event 14, 3, WILLS_ROOM, 1 db 2 ; coord events coord_event 16, 4, SCENE_DEFAULT, PlateauRivalBattle1 diff --git a/maps/KarensRoom.asm b/maps/KarensRoom.asm index 7159965bf..cfc8eeeaa 100644 --- a/maps/KarensRoom.asm +++ b/maps/KarensRoom.asm @@ -134,10 +134,10 @@ KarensRoom_MapEvents: db 0, 0 ; filler db 4 ; warp events - warp_event 4, 17, 3, BRUNOS_ROOM - warp_event 5, 17, 4, BRUNOS_ROOM - warp_event 4, 2, 1, LANCES_ROOM - warp_event 5, 2, 2, LANCES_ROOM + warp_event 4, 17, BRUNOS_ROOM, 3 + warp_event 5, 17, BRUNOS_ROOM, 4 + warp_event 4, 2, LANCES_ROOM, 1 + warp_event 5, 2, LANCES_ROOM, 2 db 0 ; coord events diff --git a/maps/KogasRoom.asm b/maps/KogasRoom.asm index 089c832f1..8067776cd 100644 --- a/maps/KogasRoom.asm +++ b/maps/KogasRoom.asm @@ -131,10 +131,10 @@ KogasRoom_MapEvents: db 0, 0 ; filler db 4 ; warp events - warp_event 4, 17, 2, WILLS_ROOM - warp_event 5, 17, 3, WILLS_ROOM - warp_event 4, 2, 1, BRUNOS_ROOM - warp_event 5, 2, 2, BRUNOS_ROOM + warp_event 4, 17, WILLS_ROOM, 2 + warp_event 5, 17, WILLS_ROOM, 3 + warp_event 4, 2, BRUNOS_ROOM, 1 + warp_event 5, 2, BRUNOS_ROOM, 2 db 0 ; coord events diff --git a/maps/KurtsHouse.asm b/maps/KurtsHouse.asm index 8a11474a8..a28ac52b5 100644 --- a/maps/KurtsHouse.asm +++ b/maps/KurtsHouse.asm @@ -678,8 +678,8 @@ KurtsHouse_MapEvents: db 0, 0 ; filler db 2 ; warp events - warp_event 3, 7, 4, AZALEA_TOWN - warp_event 4, 7, 4, AZALEA_TOWN + warp_event 3, 7, AZALEA_TOWN, 4 + warp_event 4, 7, AZALEA_TOWN, 4 db 0 ; coord events diff --git a/maps/LakeOfRage.asm b/maps/LakeOfRage.asm index 2ba2691c8..efa8bc4ff 100644 --- a/maps/LakeOfRage.asm +++ b/maps/LakeOfRage.asm @@ -495,8 +495,8 @@ LakeOfRage_MapEvents: db 0, 0 ; filler db 2 ; warp events - warp_event 7, 3, 1, LAKE_OF_RAGE_HIDDEN_POWER_HOUSE - warp_event 27, 31, 1, LAKE_OF_RAGE_MAGIKARP_HOUSE + warp_event 7, 3, LAKE_OF_RAGE_HIDDEN_POWER_HOUSE, 1 + warp_event 27, 31, LAKE_OF_RAGE_MAGIKARP_HOUSE, 1 db 0 ; coord events diff --git a/maps/LakeOfRageHiddenPowerHouse.asm b/maps/LakeOfRageHiddenPowerHouse.asm index 2c9b3e645..68b299f7c 100644 --- a/maps/LakeOfRageHiddenPowerHouse.asm +++ b/maps/LakeOfRageHiddenPowerHouse.asm @@ -69,8 +69,8 @@ LakeOfRageHiddenPowerHouse_MapEvents: db 0, 0 ; filler db 2 ; warp events - warp_event 2, 7, 1, LAKE_OF_RAGE - warp_event 3, 7, 1, LAKE_OF_RAGE + warp_event 2, 7, LAKE_OF_RAGE, 1 + warp_event 3, 7, LAKE_OF_RAGE, 1 db 0 ; coord events diff --git a/maps/LakeOfRageMagikarpHouse.asm b/maps/LakeOfRageMagikarpHouse.asm index 4f41b1a4c..a64b87e2a 100644 --- a/maps/LakeOfRageMagikarpHouse.asm +++ b/maps/LakeOfRageMagikarpHouse.asm @@ -208,8 +208,8 @@ LakeOfRageMagikarpHouse_MapEvents: db 0, 0 ; filler db 2 ; warp events - warp_event 2, 7, 2, LAKE_OF_RAGE - warp_event 3, 7, 2, LAKE_OF_RAGE + warp_event 2, 7, LAKE_OF_RAGE, 2 + warp_event 3, 7, LAKE_OF_RAGE, 2 db 0 ; coord events diff --git a/maps/LancesRoom.asm b/maps/LancesRoom.asm index 294321ac8..7cae63c73 100644 --- a/maps/LancesRoom.asm +++ b/maps/LancesRoom.asm @@ -339,10 +339,10 @@ LancesRoom_MapEvents: db 0, 0 ; filler db 4 ; warp events - warp_event 4, 23, 3, KARENS_ROOM - warp_event 5, 23, 4, KARENS_ROOM - warp_event 4, 1, 1, HALL_OF_FAME - warp_event 5, 1, 2, HALL_OF_FAME + warp_event 4, 23, KARENS_ROOM, 3 + warp_event 5, 23, KARENS_ROOM, 4 + warp_event 4, 1, HALL_OF_FAME, 1 + warp_event 5, 1, HALL_OF_FAME, 2 db 2 ; coord events coord_event 4, 5, SCENE_LANCESROOM_APPROACH_LANCE, Script_ApproachLanceFromLeft diff --git a/maps/LavRadioTower1F.asm b/maps/LavRadioTower1F.asm index 30e7871fd..ef84ad348 100644 --- a/maps/LavRadioTower1F.asm +++ b/maps/LavRadioTower1F.asm @@ -223,8 +223,8 @@ LavRadioTower1F_MapEvents: db 0, 0 ; filler db 2 ; warp events - warp_event 2, 7, 7, LAVENDER_TOWN - warp_event 3, 7, 7, LAVENDER_TOWN + warp_event 2, 7, LAVENDER_TOWN, 7 + warp_event 3, 7, LAVENDER_TOWN, 7 db 0 ; coord events diff --git a/maps/LavenderMart.asm b/maps/LavenderMart.asm index 2f313d3a3..004e22276 100644 --- a/maps/LavenderMart.asm +++ b/maps/LavenderMart.asm @@ -49,8 +49,8 @@ LavenderMart_MapEvents: db 0, 0 ; filler db 2 ; warp events - warp_event 2, 7, 5, LAVENDER_TOWN - warp_event 3, 7, 5, LAVENDER_TOWN + warp_event 2, 7, LAVENDER_TOWN, 5 + warp_event 3, 7, LAVENDER_TOWN, 5 db 0 ; coord events diff --git a/maps/LavenderNameRater.asm b/maps/LavenderNameRater.asm index 93ab36b9a..c2f102584 100644 --- a/maps/LavenderNameRater.asm +++ b/maps/LavenderNameRater.asm @@ -25,8 +25,8 @@ LavenderNameRater_MapEvents: db 0, 0 ; filler db 2 ; warp events - warp_event 2, 7, 4, LAVENDER_TOWN - warp_event 3, 7, 4, LAVENDER_TOWN + warp_event 2, 7, LAVENDER_TOWN, 4 + warp_event 3, 7, LAVENDER_TOWN, 4 db 0 ; coord events diff --git a/maps/LavenderPokecenter1F.asm b/maps/LavenderPokecenter1F.asm index ec9d41ab4..7305a95fe 100644 --- a/maps/LavenderPokecenter1F.asm +++ b/maps/LavenderPokecenter1F.asm @@ -82,9 +82,9 @@ LavenderPokecenter1F_MapEvents: db 0, 0 ; filler db 3 ; warp events - warp_event 3, 7, 1, LAVENDER_TOWN - warp_event 4, 7, 1, LAVENDER_TOWN - warp_event 0, 7, 1, POKECENTER_2F + warp_event 3, 7, LAVENDER_TOWN, 1 + warp_event 4, 7, LAVENDER_TOWN, 1 + warp_event 0, 7, POKECENTER_2F, 1 db 0 ; coord events diff --git a/maps/LavenderPokecenter2FBeta.asm b/maps/LavenderPokecenter2FBeta.asm index 7f822b3f8..7523c528c 100644 --- a/maps/LavenderPokecenter2FBeta.asm +++ b/maps/LavenderPokecenter2FBeta.asm @@ -7,7 +7,7 @@ LavenderPokecenter2FBeta_MapEvents: db 0, 0 ; filler db 1 ; warp events - warp_event 0, 7, 3, LAVENDER_POKECENTER_1F + warp_event 0, 7, LAVENDER_POKECENTER_1F, 3 db 0 ; coord events diff --git a/maps/LavenderSpeechHouse.asm b/maps/LavenderSpeechHouse.asm index 7891ce23d..c9a265aad 100644 --- a/maps/LavenderSpeechHouse.asm +++ b/maps/LavenderSpeechHouse.asm @@ -30,8 +30,8 @@ LavenderSpeechHouse_MapEvents: db 0, 0 ; filler db 2 ; warp events - warp_event 2, 7, 3, LAVENDER_TOWN - warp_event 3, 7, 3, LAVENDER_TOWN + warp_event 2, 7, LAVENDER_TOWN, 3 + warp_event 3, 7, LAVENDER_TOWN, 3 db 0 ; coord events diff --git a/maps/LavenderTown.asm b/maps/LavenderTown.asm index 8e16f47c7..973271b24 100644 --- a/maps/LavenderTown.asm +++ b/maps/LavenderTown.asm @@ -107,13 +107,13 @@ LavenderTown_MapEvents: db 0, 0 ; filler db 7 ; warp events - warp_event 5, 5, 1, LAVENDER_POKECENTER_1F - warp_event 5, 9, 1, MR_FUJIS_HOUSE - warp_event 3, 13, 1, LAVENDER_SPEECH_HOUSE - warp_event 7, 13, 1, LAVENDER_NAME_RATER - warp_event 1, 5, 2, LAVENDER_MART - warp_event 13, 11, 1, SOUL_HOUSE - warp_event 14, 5, 1, LAV_RADIO_TOWER_1F + warp_event 5, 5, LAVENDER_POKECENTER_1F, 1 + warp_event 5, 9, MR_FUJIS_HOUSE, 1 + warp_event 3, 13, LAVENDER_SPEECH_HOUSE, 1 + warp_event 7, 13, LAVENDER_NAME_RATER, 1 + warp_event 1, 5, LAVENDER_MART, 2 + warp_event 13, 11, SOUL_HOUSE, 1 + warp_event 14, 5, LAV_RADIO_TOWER_1F, 1 db 0 ; coord events diff --git a/maps/MahoganyGym.asm b/maps/MahoganyGym.asm index 0828bdf7a..777053a41 100644 --- a/maps/MahoganyGym.asm +++ b/maps/MahoganyGym.asm @@ -374,8 +374,8 @@ MahoganyGym_MapEvents: db 0, 0 ; filler db 2 ; warp events - warp_event 4, 17, 3, MAHOGANY_TOWN - warp_event 5, 17, 3, MAHOGANY_TOWN + warp_event 4, 17, MAHOGANY_TOWN, 3 + warp_event 5, 17, MAHOGANY_TOWN, 3 db 0 ; coord events diff --git a/maps/MahoganyMart1F.asm b/maps/MahoganyMart1F.asm index cbc4b05e1..822240911 100644 --- a/maps/MahoganyMart1F.asm +++ b/maps/MahoganyMart1F.asm @@ -222,9 +222,9 @@ MahoganyMart1F_MapEvents: db 0, 0 ; filler db 3 ; warp events - warp_event 3, 7, 1, MAHOGANY_TOWN - warp_event 4, 7, 1, MAHOGANY_TOWN - warp_event 7, 3, 1, TEAM_ROCKET_BASE_B1F + warp_event 3, 7, MAHOGANY_TOWN, 1 + warp_event 4, 7, MAHOGANY_TOWN, 1 + warp_event 7, 3, TEAM_ROCKET_BASE_B1F, 1 db 0 ; coord events diff --git a/maps/MahoganyPokecenter1F.asm b/maps/MahoganyPokecenter1F.asm index c28a62c67..de968338a 100644 --- a/maps/MahoganyPokecenter1F.asm +++ b/maps/MahoganyPokecenter1F.asm @@ -55,9 +55,9 @@ MahoganyPokecenter1F_MapEvents: db 0, 0 ; filler db 3 ; warp events - warp_event 3, 7, 4, MAHOGANY_TOWN - warp_event 4, 7, 4, MAHOGANY_TOWN - warp_event 0, 7, 1, POKECENTER_2F + warp_event 3, 7, MAHOGANY_TOWN, 4 + warp_event 4, 7, MAHOGANY_TOWN, 4 + warp_event 0, 7, POKECENTER_2F, 1 db 0 ; coord events diff --git a/maps/MahoganyRedGyaradosSpeechHouse.asm b/maps/MahoganyRedGyaradosSpeechHouse.asm index 2a657d60f..f0f91a2b2 100644 --- a/maps/MahoganyRedGyaradosSpeechHouse.asm +++ b/maps/MahoganyRedGyaradosSpeechHouse.asm @@ -62,8 +62,8 @@ MahoganyRedGyaradosSpeechHouse_MapEvents: db 0, 0 ; filler db 2 ; warp events - warp_event 2, 7, 2, MAHOGANY_TOWN - warp_event 3, 7, 2, MAHOGANY_TOWN + warp_event 2, 7, MAHOGANY_TOWN, 2 + warp_event 3, 7, MAHOGANY_TOWN, 2 db 0 ; coord events diff --git a/maps/MahoganyTown.asm b/maps/MahoganyTown.asm index c91d9cd2b..1a4ce8f44 100644 --- a/maps/MahoganyTown.asm +++ b/maps/MahoganyTown.asm @@ -246,11 +246,11 @@ MahoganyTown_MapEvents: db 0, 0 ; filler db 5 ; warp events - warp_event 11, 7, 1, MAHOGANY_MART_1F - warp_event 17, 7, 1, MAHOGANY_RED_GYARADOS_SPEECH_HOUSE - warp_event 6, 13, 1, MAHOGANY_GYM - warp_event 15, 13, 1, MAHOGANY_POKECENTER_1F - warp_event 9, 1, 3, ROUTE_43_MAHOGANY_GATE + warp_event 11, 7, MAHOGANY_MART_1F, 1 + warp_event 17, 7, MAHOGANY_RED_GYARADOS_SPEECH_HOUSE, 1 + warp_event 6, 13, MAHOGANY_GYM, 1 + warp_event 15, 13, MAHOGANY_POKECENTER_1F, 1 + warp_event 9, 1, ROUTE_43_MAHOGANY_GATE, 3 db 2 ; coord events coord_event 19, 8, SCENE_DEFAULT, UnknownScript_0x190013 diff --git a/maps/ManiasHouse.asm b/maps/ManiasHouse.asm index 0bf8a2c20..c69079aba 100644 --- a/maps/ManiasHouse.asm +++ b/maps/ManiasHouse.asm @@ -201,8 +201,8 @@ ManiasHouse_MapEvents: db 0, 0 ; filler db 2 ; warp events - warp_event 2, 7, 1, CIANWOOD_CITY - warp_event 3, 7, 1, CIANWOOD_CITY + warp_event 2, 7, CIANWOOD_CITY, 1 + warp_event 3, 7, CIANWOOD_CITY, 1 db 0 ; coord events diff --git a/maps/MobileBattleRoom.asm b/maps/MobileBattleRoom.asm index 15007ae4a..ad832b1fb 100644 --- a/maps/MobileBattleRoom.asm +++ b/maps/MobileBattleRoom.asm @@ -68,8 +68,8 @@ MobileBattleRoom_MapEvents: db 0, 0 ; filler db 2 ; warp events - warp_event 4, 7, 6, POKECENTER_2F - warp_event 5, 7, 6, POKECENTER_2F + warp_event 4, 7, POKECENTER_2F, 6 + warp_event 5, 7, POKECENTER_2F, 6 db 0 ; coord events diff --git a/maps/MobileTradeRoom.asm b/maps/MobileTradeRoom.asm index 31ddcbf8a..469822afc 100644 --- a/maps/MobileTradeRoom.asm +++ b/maps/MobileTradeRoom.asm @@ -36,8 +36,8 @@ MobileTradeRoom_MapEvents: db 0, 0 ; filler db 2 ; warp events - warp_event 4, 7, 5, POKECENTER_2F - warp_event 5, 7, 5, POKECENTER_2F + warp_event 4, 7, POKECENTER_2F, 5 + warp_event 5, 7, POKECENTER_2F, 5 db 0 ; coord events diff --git a/maps/MountMoon.asm b/maps/MountMoon.asm index ebe1286bc..deffa830d 100644 --- a/maps/MountMoon.asm +++ b/maps/MountMoon.asm @@ -162,14 +162,14 @@ MountMoon_MapEvents: db 0, 0 ; filler db 8 ; warp events - warp_event 3, 3, 1, ROUTE_3 - warp_event 15, 15, 1, ROUTE_4 - warp_event 13, 3, 7, MOUNT_MOON - warp_event 15, 11, 8, MOUNT_MOON - warp_event 25, 5, 1, MOUNT_MOON_SQUARE - warp_event 25, 15, 2, MOUNT_MOON_SQUARE - warp_event 25, 3, 3, MOUNT_MOON - warp_event 25, 13, 4, MOUNT_MOON + warp_event 3, 3, ROUTE_3, 1 + warp_event 15, 15, ROUTE_4, 1 + warp_event 13, 3, MOUNT_MOON, 7 + warp_event 15, 11, MOUNT_MOON, 8 + warp_event 25, 5, MOUNT_MOON_SQUARE, 1 + warp_event 25, 15, MOUNT_MOON_SQUARE, 2 + warp_event 25, 3, MOUNT_MOON, 3 + warp_event 25, 13, MOUNT_MOON, 4 db 0 ; coord events diff --git a/maps/MountMoonGiftShop.asm b/maps/MountMoonGiftShop.asm index df3a7aca6..5f260cd5c 100644 --- a/maps/MountMoonGiftShop.asm +++ b/maps/MountMoonGiftShop.asm @@ -29,8 +29,8 @@ MountMoonGiftShop_MapEvents: db 0, 0 ; filler db 2 ; warp events - warp_event 3, 7, 3, MOUNT_MOON_SQUARE - warp_event 4, 7, 3, MOUNT_MOON_SQUARE + warp_event 3, 7, MOUNT_MOON_SQUARE, 3 + warp_event 4, 7, MOUNT_MOON_SQUARE, 3 db 0 ; coord events diff --git a/maps/MountMoonSquare.asm b/maps/MountMoonSquare.asm index 22865f3e5..87139c286 100644 --- a/maps/MountMoonSquare.asm +++ b/maps/MountMoonSquare.asm @@ -134,9 +134,9 @@ MountMoonSquare_MapEvents: db 0, 0 ; filler db 3 ; warp events - warp_event 20, 5, 5, MOUNT_MOON - warp_event 22, 11, 6, MOUNT_MOON - warp_event 13, 7, 1, MOUNT_MOON_GIFT_SHOP + warp_event 20, 5, MOUNT_MOON, 5 + warp_event 22, 11, MOUNT_MOON, 6 + warp_event 13, 7, MOUNT_MOON_GIFT_SHOP, 1 db 1 ; coord events coord_event 7, 11, SCENE_DEFAULT, ClefairyDance diff --git a/maps/MountMortar1FInside.asm b/maps/MountMortar1FInside.asm index 5f9056e29..b8301b907 100644 --- a/maps/MountMortar1FInside.asm +++ b/maps/MountMortar1FInside.asm @@ -118,12 +118,12 @@ MountMortar1FInside_MapEvents: db 0, 0 ; filler db 6 ; warp events - warp_event 11, 47, 5, MOUNT_MORTAR_1F_OUTSIDE - warp_event 29, 47, 6, MOUNT_MORTAR_1F_OUTSIDE - warp_event 5, 39, 8, MOUNT_MORTAR_1F_OUTSIDE - warp_event 33, 41, 9, MOUNT_MORTAR_1F_OUTSIDE - warp_event 3, 19, 1, MOUNT_MORTAR_B1F - warp_event 9, 9, 2, MOUNT_MORTAR_2F_INSIDE + warp_event 11, 47, MOUNT_MORTAR_1F_OUTSIDE, 5 + warp_event 29, 47, MOUNT_MORTAR_1F_OUTSIDE, 6 + warp_event 5, 39, MOUNT_MORTAR_1F_OUTSIDE, 8 + warp_event 33, 41, MOUNT_MORTAR_1F_OUTSIDE, 9 + warp_event 3, 19, MOUNT_MORTAR_B1F, 1 + warp_event 9, 9, MOUNT_MORTAR_2F_INSIDE, 2 db 0 ; coord events diff --git a/maps/MountMortar1FOutside.asm b/maps/MountMortar1FOutside.asm index c261d1a3b..9bc92ccdf 100644 --- a/maps/MountMortar1FOutside.asm +++ b/maps/MountMortar1FOutside.asm @@ -20,15 +20,15 @@ MountMortar1FOutside_MapEvents: db 0, 0 ; filler db 9 ; warp events - warp_event 3, 33, 3, ROUTE_42 - warp_event 17, 33, 4, ROUTE_42 - warp_event 37, 33, 5, ROUTE_42 - warp_event 17, 5, 1, MOUNT_MORTAR_2F_INSIDE - warp_event 11, 21, 1, MOUNT_MORTAR_1F_INSIDE - warp_event 29, 21, 2, MOUNT_MORTAR_1F_INSIDE - warp_event 17, 29, 2, MOUNT_MORTAR_B1F - warp_event 7, 13, 3, MOUNT_MORTAR_1F_INSIDE - warp_event 33, 13, 4, MOUNT_MORTAR_1F_INSIDE + warp_event 3, 33, ROUTE_42, 3 + warp_event 17, 33, ROUTE_42, 4 + warp_event 37, 33, ROUTE_42, 5 + warp_event 17, 5, MOUNT_MORTAR_2F_INSIDE, 1 + warp_event 11, 21, MOUNT_MORTAR_1F_INSIDE, 1 + warp_event 29, 21, MOUNT_MORTAR_1F_INSIDE, 2 + warp_event 17, 29, MOUNT_MORTAR_B1F, 2 + warp_event 7, 13, MOUNT_MORTAR_1F_INSIDE, 3 + warp_event 33, 13, MOUNT_MORTAR_1F_INSIDE, 4 db 0 ; coord events diff --git a/maps/MountMortar2FInside.asm b/maps/MountMortar2FInside.asm index ce6811bca..18d62603b 100644 --- a/maps/MountMortar2FInside.asm +++ b/maps/MountMortar2FInside.asm @@ -68,8 +68,8 @@ MountMortar2FInside_MapEvents: db 0, 0 ; filler db 2 ; warp events - warp_event 17, 33, 4, MOUNT_MORTAR_1F_OUTSIDE - warp_event 3, 5, 6, MOUNT_MORTAR_1F_INSIDE + warp_event 17, 33, MOUNT_MORTAR_1F_OUTSIDE, 4 + warp_event 3, 5, MOUNT_MORTAR_1F_INSIDE, 6 db 0 ; coord events diff --git a/maps/MountMortarB1F.asm b/maps/MountMortarB1F.asm index 986e6e928..4eb2eb272 100644 --- a/maps/MountMortarB1F.asm +++ b/maps/MountMortarB1F.asm @@ -136,8 +136,8 @@ MountMortarB1F_MapEvents: db 0, 0 ; filler db 2 ; warp events - warp_event 3, 3, 5, MOUNT_MORTAR_1F_INSIDE - warp_event 19, 29, 7, MOUNT_MORTAR_1F_OUTSIDE + warp_event 3, 3, MOUNT_MORTAR_1F_INSIDE, 5 + warp_event 19, 29, MOUNT_MORTAR_1F_OUTSIDE, 7 db 0 ; coord events diff --git a/maps/MoveDeletersHouse.asm b/maps/MoveDeletersHouse.asm index 0b42fe99e..82dfa9a9f 100644 --- a/maps/MoveDeletersHouse.asm +++ b/maps/MoveDeletersHouse.asm @@ -21,8 +21,8 @@ MoveDeletersHouse_MapEvents: db 0, 0 ; filler db 2 ; warp events - warp_event 2, 7, 6, BLACKTHORN_CITY - warp_event 3, 7, 6, BLACKTHORN_CITY + warp_event 2, 7, BLACKTHORN_CITY, 6 + warp_event 3, 7, BLACKTHORN_CITY, 6 db 0 ; coord events diff --git a/maps/MrFujisHouse.asm b/maps/MrFujisHouse.asm index fc547e2d6..687657967 100644 --- a/maps/MrFujisHouse.asm +++ b/maps/MrFujisHouse.asm @@ -81,8 +81,8 @@ MrFujisHouse_MapEvents: db 0, 0 ; filler db 2 ; warp events - warp_event 2, 7, 2, LAVENDER_TOWN - warp_event 3, 7, 2, LAVENDER_TOWN + warp_event 2, 7, LAVENDER_TOWN, 2 + warp_event 3, 7, LAVENDER_TOWN, 2 db 0 ; coord events diff --git a/maps/MrPokemonsHouse.asm b/maps/MrPokemonsHouse.asm index 3a7a6b963..53332cd18 100644 --- a/maps/MrPokemonsHouse.asm +++ b/maps/MrPokemonsHouse.asm @@ -374,8 +374,8 @@ MrPokemonsHouse_MapEvents: db 0, 0 ; filler db 2 ; warp events - warp_event 2, 7, 2, ROUTE_30 - warp_event 3, 7, 2, ROUTE_30 + warp_event 2, 7, ROUTE_30, 2 + warp_event 3, 7, ROUTE_30, 2 db 0 ; coord events diff --git a/maps/MrPsychicsHouse.asm b/maps/MrPsychicsHouse.asm index 610a5e846..67593de2b 100644 --- a/maps/MrPsychicsHouse.asm +++ b/maps/MrPsychicsHouse.asm @@ -49,8 +49,8 @@ MrPsychicsHouse_MapEvents: db 0, 0 ; filler db 2 ; warp events - warp_event 2, 7, 5, SAFFRON_CITY - warp_event 3, 7, 5, SAFFRON_CITY + warp_event 2, 7, SAFFRON_CITY, 5 + warp_event 3, 7, SAFFRON_CITY, 5 db 0 ; coord events diff --git a/maps/NationalPark.asm b/maps/NationalPark.asm index 850c2ab9d..ed6bf6b9a 100644 --- a/maps/NationalPark.asm +++ b/maps/NationalPark.asm @@ -515,10 +515,10 @@ NationalPark_MapEvents: db 0, 0 ; filler db 4 ; warp events - warp_event 33, 18, 1, ROUTE_36_NATIONAL_PARK_GATE - warp_event 33, 19, 2, ROUTE_36_NATIONAL_PARK_GATE - warp_event 10, 47, 1, ROUTE_35_NATIONAL_PARK_GATE - warp_event 11, 47, 2, ROUTE_35_NATIONAL_PARK_GATE + warp_event 33, 18, ROUTE_36_NATIONAL_PARK_GATE, 1 + warp_event 33, 19, ROUTE_36_NATIONAL_PARK_GATE, 2 + warp_event 10, 47, ROUTE_35_NATIONAL_PARK_GATE, 1 + warp_event 11, 47, ROUTE_35_NATIONAL_PARK_GATE, 2 db 0 ; coord events diff --git a/maps/NationalParkBugContest.asm b/maps/NationalParkBugContest.asm index dd969f477..d6cffadcb 100644 --- a/maps/NationalParkBugContest.asm +++ b/maps/NationalParkBugContest.asm @@ -222,10 +222,10 @@ NationalParkBugContest_MapEvents: db 0, 0 ; filler db 4 ; warp events - warp_event 33, 18, 1, ROUTE_36_NATIONAL_PARK_GATE - warp_event 33, 19, 1, ROUTE_36_NATIONAL_PARK_GATE - warp_event 10, 47, 1, ROUTE_35_NATIONAL_PARK_GATE - warp_event 11, 47, 1, ROUTE_35_NATIONAL_PARK_GATE + warp_event 33, 18, ROUTE_36_NATIONAL_PARK_GATE, 1 + warp_event 33, 19, ROUTE_36_NATIONAL_PARK_GATE, 1 + warp_event 10, 47, ROUTE_35_NATIONAL_PARK_GATE, 1 + warp_event 11, 47, ROUTE_35_NATIONAL_PARK_GATE, 1 db 0 ; coord events diff --git a/maps/NewBarkTown.asm b/maps/NewBarkTown.asm index 83de407d1..c961e1490 100644 --- a/maps/NewBarkTown.asm +++ b/maps/NewBarkTown.asm @@ -283,10 +283,10 @@ NewBarkTown_MapEvents: db 0, 0 ; filler db 4 ; warp events - warp_event 6, 3, 1, ELMS_LAB - warp_event 13, 5, 1, PLAYERS_HOUSE_1F - warp_event 3, 11, 1, PLAYERS_NEIGHBORS_HOUSE - warp_event 11, 13, 1, ELMS_HOUSE + warp_event 6, 3, ELMS_LAB, 1 + warp_event 13, 5, PLAYERS_HOUSE_1F, 1 + warp_event 3, 11, PLAYERS_NEIGHBORS_HOUSE, 1 + warp_event 11, 13, ELMS_HOUSE, 1 db 2 ; coord events coord_event 1, 8, SCENE_DEFAULT, NewBarkTown_TeacherStopsYouScene1 diff --git a/maps/OaksLab.asm b/maps/OaksLab.asm index f6bae3fd2..370d0fdbd 100644 --- a/maps/OaksLab.asm +++ b/maps/OaksLab.asm @@ -258,8 +258,8 @@ OaksLab_MapEvents: db 0, 0 ; filler db 2 ; warp events - warp_event 4, 11, 3, PALLET_TOWN - warp_event 5, 11, 3, PALLET_TOWN + warp_event 4, 11, PALLET_TOWN, 3 + warp_event 5, 11, PALLET_TOWN, 3 db 0 ; coord events diff --git a/maps/OlivineCafe.asm b/maps/OlivineCafe.asm index 79a7f0540..d036233c1 100644 --- a/maps/OlivineCafe.asm +++ b/maps/OlivineCafe.asm @@ -80,8 +80,8 @@ OlivineCafe_MapEvents: db 0, 0 ; filler db 2 ; warp events - warp_event 2, 7, 7, OLIVINE_CITY - warp_event 3, 7, 7, OLIVINE_CITY + warp_event 2, 7, OLIVINE_CITY, 7 + warp_event 3, 7, OLIVINE_CITY, 7 db 0 ; coord events diff --git a/maps/OlivineCity.asm b/maps/OlivineCity.asm index 7b575f423..53dbd674f 100644 --- a/maps/OlivineCity.asm +++ b/maps/OlivineCity.asm @@ -289,17 +289,17 @@ OlivineCity_MapEvents: db 0, 0 ; filler db 11 ; warp events - warp_event 13, 21, 1, OLIVINE_POKECENTER_1F - warp_event 10, 11, 1, OLIVINE_GYM - warp_event 25, 11, 1, OLIVINE_TIMS_HOUSE - warp_event 0, 0, 1, OLIVINE_HOUSE_BETA - warp_event 29, 11, 1, OLIVINE_PUNISHMENT_SPEECH_HOUSE - warp_event 13, 15, 1, OLIVINE_GOOD_ROD_HOUSE - warp_event 7, 21, 1, OLIVINE_CAFE - warp_event 19, 17, 2, OLIVINE_MART - warp_event 29, 27, 1, OLIVINE_LIGHTHOUSE_1F - warp_event 19, 27, 1, OLIVINE_PORT_PASSAGE - warp_event 20, 27, 2, OLIVINE_PORT_PASSAGE + warp_event 13, 21, OLIVINE_POKECENTER_1F, 1 + warp_event 10, 11, OLIVINE_GYM, 1 + warp_event 25, 11, OLIVINE_TIMS_HOUSE, 1 + warp_event 0, 0, OLIVINE_HOUSE_BETA, 1 + warp_event 29, 11, OLIVINE_PUNISHMENT_SPEECH_HOUSE, 1 + warp_event 13, 15, OLIVINE_GOOD_ROD_HOUSE, 1 + warp_event 7, 21, OLIVINE_CAFE, 1 + warp_event 19, 17, OLIVINE_MART, 2 + warp_event 29, 27, OLIVINE_LIGHTHOUSE_1F, 1 + warp_event 19, 27, OLIVINE_PORT_PASSAGE, 1 + warp_event 20, 27, OLIVINE_PORT_PASSAGE, 2 db 2 ; coord events coord_event 13, 12, SCENE_DEFAULT, UnknownScript_0x1a8833 diff --git a/maps/OlivineGoodRodHouse.asm b/maps/OlivineGoodRodHouse.asm index 65e8a773d..585aebd04 100644 --- a/maps/OlivineGoodRodHouse.asm +++ b/maps/OlivineGoodRodHouse.asm @@ -84,8 +84,8 @@ OlivineGoodRodHouse_MapEvents: db 0, 0 ; filler db 2 ; warp events - warp_event 2, 7, 6, OLIVINE_CITY - warp_event 3, 7, 6, OLIVINE_CITY + warp_event 2, 7, OLIVINE_CITY, 6 + warp_event 3, 7, OLIVINE_CITY, 6 db 0 ; coord events diff --git a/maps/OlivineGym.asm b/maps/OlivineGym.asm index 5c024f015..f146985bd 100644 --- a/maps/OlivineGym.asm +++ b/maps/OlivineGym.asm @@ -199,8 +199,8 @@ OlivineGym_MapEvents: db 0, 0 ; filler db 2 ; warp events - warp_event 4, 15, 2, OLIVINE_CITY - warp_event 5, 15, 2, OLIVINE_CITY + warp_event 4, 15, OLIVINE_CITY, 2 + warp_event 5, 15, OLIVINE_CITY, 2 db 0 ; coord events diff --git a/maps/OlivineHouseBeta.asm b/maps/OlivineHouseBeta.asm index 085c67685..3e9065343 100644 --- a/maps/OlivineHouseBeta.asm +++ b/maps/OlivineHouseBeta.asm @@ -41,8 +41,8 @@ OlivineHouseBeta_MapEvents: db 0, 0 ; filler db 2 ; warp events - warp_event 2, 7, 4, OLIVINE_CITY - warp_event 3, 7, 4, OLIVINE_CITY + warp_event 2, 7, OLIVINE_CITY, 4 + warp_event 3, 7, OLIVINE_CITY, 4 db 0 ; coord events diff --git a/maps/OlivineLighthouse1F.asm b/maps/OlivineLighthouse1F.asm index 66d8d89ac..d1300badf 100644 --- a/maps/OlivineLighthouse1F.asm +++ b/maps/OlivineLighthouse1F.asm @@ -38,11 +38,11 @@ OlivineLighthouse1F_MapEvents: db 0, 0 ; filler db 5 ; warp events - warp_event 10, 17, 9, OLIVINE_CITY - warp_event 11, 17, 9, OLIVINE_CITY - warp_event 3, 11, 1, OLIVINE_LIGHTHOUSE_2F - warp_event 16, 13, 3, OLIVINE_LIGHTHOUSE_2F - warp_event 17, 13, 4, OLIVINE_LIGHTHOUSE_2F + warp_event 10, 17, OLIVINE_CITY, 9 + warp_event 11, 17, OLIVINE_CITY, 9 + warp_event 3, 11, OLIVINE_LIGHTHOUSE_2F, 1 + warp_event 16, 13, OLIVINE_LIGHTHOUSE_2F, 3 + warp_event 17, 13, OLIVINE_LIGHTHOUSE_2F, 4 db 0 ; coord events diff --git a/maps/OlivineLighthouse2F.asm b/maps/OlivineLighthouse2F.asm index bedd5d8c9..c132b9375 100644 --- a/maps/OlivineLighthouse2F.asm +++ b/maps/OlivineLighthouse2F.asm @@ -206,12 +206,12 @@ OlivineLighthouse2F_MapEvents: db 0, 0 ; filler db 6 ; warp events - warp_event 3, 11, 3, OLIVINE_LIGHTHOUSE_1F - warp_event 5, 3, 2, OLIVINE_LIGHTHOUSE_3F - warp_event 16, 13, 4, OLIVINE_LIGHTHOUSE_1F - warp_event 17, 13, 5, OLIVINE_LIGHTHOUSE_1F - warp_event 16, 11, 4, OLIVINE_LIGHTHOUSE_3F - warp_event 17, 11, 5, OLIVINE_LIGHTHOUSE_3F + warp_event 3, 11, OLIVINE_LIGHTHOUSE_1F, 3 + warp_event 5, 3, OLIVINE_LIGHTHOUSE_3F, 2 + warp_event 16, 13, OLIVINE_LIGHTHOUSE_1F, 4 + warp_event 17, 13, OLIVINE_LIGHTHOUSE_1F, 5 + warp_event 16, 11, OLIVINE_LIGHTHOUSE_3F, 4 + warp_event 17, 11, OLIVINE_LIGHTHOUSE_3F, 5 db 0 ; coord events diff --git a/maps/OlivineLighthouse3F.asm b/maps/OlivineLighthouse3F.asm index 63f02d6e2..1d07ae2c8 100644 --- a/maps/OlivineLighthouse3F.asm +++ b/maps/OlivineLighthouse3F.asm @@ -114,15 +114,15 @@ OlivineLighthouse3F_MapEvents: db 0, 0 ; filler db 9 ; warp events - warp_event 13, 3, 1, OLIVINE_LIGHTHOUSE_4F - warp_event 5, 3, 2, OLIVINE_LIGHTHOUSE_2F - warp_event 9, 5, 4, OLIVINE_LIGHTHOUSE_4F - warp_event 16, 11, 5, OLIVINE_LIGHTHOUSE_2F - warp_event 17, 11, 6, OLIVINE_LIGHTHOUSE_2F - warp_event 16, 9, 5, OLIVINE_LIGHTHOUSE_4F - warp_event 17, 9, 6, OLIVINE_LIGHTHOUSE_4F - warp_event 8, 3, 7, OLIVINE_LIGHTHOUSE_4F - warp_event 9, 3, 8, OLIVINE_LIGHTHOUSE_4F + warp_event 13, 3, OLIVINE_LIGHTHOUSE_4F, 1 + warp_event 5, 3, OLIVINE_LIGHTHOUSE_2F, 2 + warp_event 9, 5, OLIVINE_LIGHTHOUSE_4F, 4 + warp_event 16, 11, OLIVINE_LIGHTHOUSE_2F, 5 + warp_event 17, 11, OLIVINE_LIGHTHOUSE_2F, 6 + warp_event 16, 9, OLIVINE_LIGHTHOUSE_4F, 5 + warp_event 17, 9, OLIVINE_LIGHTHOUSE_4F, 6 + warp_event 8, 3, OLIVINE_LIGHTHOUSE_4F, 7 + warp_event 9, 3, OLIVINE_LIGHTHOUSE_4F, 8 db 0 ; coord events diff --git a/maps/OlivineLighthouse4F.asm b/maps/OlivineLighthouse4F.asm index 51b764d35..cc00a643a 100644 --- a/maps/OlivineLighthouse4F.asm +++ b/maps/OlivineLighthouse4F.asm @@ -83,16 +83,16 @@ OlivineLighthouse4F_MapEvents: db 0, 0 ; filler db 10 ; warp events - warp_event 13, 3, 1, OLIVINE_LIGHTHOUSE_3F - warp_event 3, 5, 2, OLIVINE_LIGHTHOUSE_5F - warp_event 9, 7, 3, OLIVINE_LIGHTHOUSE_5F - warp_event 9, 5, 3, OLIVINE_LIGHTHOUSE_3F - warp_event 16, 9, 6, OLIVINE_LIGHTHOUSE_3F - warp_event 17, 9, 7, OLIVINE_LIGHTHOUSE_3F - warp_event 8, 3, 8, OLIVINE_LIGHTHOUSE_3F - warp_event 9, 3, 9, OLIVINE_LIGHTHOUSE_3F - warp_event 16, 7, 4, OLIVINE_LIGHTHOUSE_5F - warp_event 17, 7, 5, OLIVINE_LIGHTHOUSE_5F + warp_event 13, 3, OLIVINE_LIGHTHOUSE_3F, 1 + warp_event 3, 5, OLIVINE_LIGHTHOUSE_5F, 2 + warp_event 9, 7, OLIVINE_LIGHTHOUSE_5F, 3 + warp_event 9, 5, OLIVINE_LIGHTHOUSE_3F, 3 + warp_event 16, 9, OLIVINE_LIGHTHOUSE_3F, 6 + warp_event 17, 9, OLIVINE_LIGHTHOUSE_3F, 7 + warp_event 8, 3, OLIVINE_LIGHTHOUSE_3F, 8 + warp_event 9, 3, OLIVINE_LIGHTHOUSE_3F, 9 + warp_event 16, 7, OLIVINE_LIGHTHOUSE_5F, 4 + warp_event 17, 7, OLIVINE_LIGHTHOUSE_5F, 5 db 0 ; coord events diff --git a/maps/OlivineLighthouse5F.asm b/maps/OlivineLighthouse5F.asm index a5219ff17..c69b5e98c 100644 --- a/maps/OlivineLighthouse5F.asm +++ b/maps/OlivineLighthouse5F.asm @@ -92,13 +92,13 @@ OlivineLighthouse5F_MapEvents: db 0, 0 ; filler db 7 ; warp events - warp_event 9, 15, 1, OLIVINE_LIGHTHOUSE_6F - warp_event 3, 5, 2, OLIVINE_LIGHTHOUSE_4F - warp_event 9, 7, 3, OLIVINE_LIGHTHOUSE_4F - warp_event 16, 7, 9, OLIVINE_LIGHTHOUSE_4F - warp_event 17, 7, 10, OLIVINE_LIGHTHOUSE_4F - warp_event 16, 5, 2, OLIVINE_LIGHTHOUSE_6F - warp_event 17, 5, 3, OLIVINE_LIGHTHOUSE_6F + warp_event 9, 15, OLIVINE_LIGHTHOUSE_6F, 1 + warp_event 3, 5, OLIVINE_LIGHTHOUSE_4F, 2 + warp_event 9, 7, OLIVINE_LIGHTHOUSE_4F, 3 + warp_event 16, 7, OLIVINE_LIGHTHOUSE_4F, 9 + warp_event 17, 7, OLIVINE_LIGHTHOUSE_4F, 10 + warp_event 16, 5, OLIVINE_LIGHTHOUSE_6F, 2 + warp_event 17, 5, OLIVINE_LIGHTHOUSE_6F, 3 db 0 ; coord events diff --git a/maps/OlivineLighthouse6F.asm b/maps/OlivineLighthouse6F.asm index 110b25353..381795a79 100644 --- a/maps/OlivineLighthouse6F.asm +++ b/maps/OlivineLighthouse6F.asm @@ -259,9 +259,9 @@ OlivineLighthouse6F_MapEvents: db 0, 0 ; filler db 3 ; warp events - warp_event 9, 15, 1, OLIVINE_LIGHTHOUSE_5F - warp_event 16, 5, 6, OLIVINE_LIGHTHOUSE_5F - warp_event 17, 5, 7, OLIVINE_LIGHTHOUSE_5F + warp_event 9, 15, OLIVINE_LIGHTHOUSE_5F, 1 + warp_event 16, 5, OLIVINE_LIGHTHOUSE_5F, 6 + warp_event 17, 5, OLIVINE_LIGHTHOUSE_5F, 7 db 0 ; coord events diff --git a/maps/OlivineMart.asm b/maps/OlivineMart.asm index 1356455a1..048bb9785 100644 --- a/maps/OlivineMart.asm +++ b/maps/OlivineMart.asm @@ -47,8 +47,8 @@ OlivineMart_MapEvents: db 0, 0 ; filler db 2 ; warp events - warp_event 2, 7, 8, OLIVINE_CITY - warp_event 3, 7, 8, OLIVINE_CITY + warp_event 2, 7, OLIVINE_CITY, 8 + warp_event 3, 7, OLIVINE_CITY, 8 db 0 ; coord events diff --git a/maps/OlivinePokecenter1F.asm b/maps/OlivinePokecenter1F.asm index 4e970a2bf..2686f00f1 100644 --- a/maps/OlivinePokecenter1F.asm +++ b/maps/OlivinePokecenter1F.asm @@ -49,9 +49,9 @@ OlivinePokecenter1F_MapEvents: db 0, 0 ; filler db 3 ; warp events - warp_event 3, 7, 1, OLIVINE_CITY - warp_event 4, 7, 1, OLIVINE_CITY - warp_event 0, 7, 1, POKECENTER_2F + warp_event 3, 7, OLIVINE_CITY, 1 + warp_event 4, 7, OLIVINE_CITY, 1 + warp_event 0, 7, POKECENTER_2F, 1 db 0 ; coord events diff --git a/maps/OlivinePort.asm b/maps/OlivinePort.asm index 7c0f2dd71..78940406c 100644 --- a/maps/OlivinePort.asm +++ b/maps/OlivinePort.asm @@ -386,8 +386,8 @@ OlivinePort_MapEvents: db 0, 0 ; filler db 2 ; warp events - warp_event 11, 7, 5, OLIVINE_PORT_PASSAGE - warp_event 7, 23, 1, FAST_SHIP_1F + warp_event 11, 7, OLIVINE_PORT_PASSAGE, 5 + warp_event 7, 23, FAST_SHIP_1F, 1 db 1 ; coord events coord_event 7, 15, SCENE_DEFAULT, UnknownScript_0x7491f diff --git a/maps/OlivinePortPassage.asm b/maps/OlivinePortPassage.asm index 4e68743a9..74feb52d5 100644 --- a/maps/OlivinePortPassage.asm +++ b/maps/OlivinePortPassage.asm @@ -21,11 +21,11 @@ OlivinePortPassage_MapEvents: db 0, 0 ; filler db 5 ; warp events - warp_event 15, 0, 10, OLIVINE_CITY - warp_event 16, 0, 11, OLIVINE_CITY - warp_event 15, 4, 4, OLIVINE_PORT_PASSAGE - warp_event 3, 2, 3, OLIVINE_PORT_PASSAGE - warp_event 3, 14, 1, OLIVINE_PORT + warp_event 15, 0, OLIVINE_CITY, 10 + warp_event 16, 0, OLIVINE_CITY, 11 + warp_event 15, 4, OLIVINE_PORT_PASSAGE, 4 + warp_event 3, 2, OLIVINE_PORT_PASSAGE, 3 + warp_event 3, 14, OLIVINE_PORT, 1 db 0 ; coord events diff --git a/maps/OlivinePunishmentSpeechHouse.asm b/maps/OlivinePunishmentSpeechHouse.asm index a6a436674..8216d53f6 100644 --- a/maps/OlivinePunishmentSpeechHouse.asm +++ b/maps/OlivinePunishmentSpeechHouse.asm @@ -41,8 +41,8 @@ OlivinePunishmentSpeechHouse_MapEvents: db 0, 0 ; filler db 2 ; warp events - warp_event 2, 7, 5, OLIVINE_CITY - warp_event 3, 7, 5, OLIVINE_CITY + warp_event 2, 7, OLIVINE_CITY, 5 + warp_event 3, 7, OLIVINE_CITY, 5 db 0 ; coord events diff --git a/maps/OlivineTimsHouse.asm b/maps/OlivineTimsHouse.asm index 0b9381cc0..7d59a92e5 100644 --- a/maps/OlivineTimsHouse.asm +++ b/maps/OlivineTimsHouse.asm @@ -21,8 +21,8 @@ OlivineTimsHouse_MapEvents: db 0, 0 ; filler db 2 ; warp events - warp_event 2, 7, 3, OLIVINE_CITY - warp_event 3, 7, 3, OLIVINE_CITY + warp_event 2, 7, OLIVINE_CITY, 3 + warp_event 3, 7, OLIVINE_CITY, 3 db 0 ; coord events diff --git a/maps/PalletTown.asm b/maps/PalletTown.asm index 65cca5e3b..13ea47815 100644 --- a/maps/PalletTown.asm +++ b/maps/PalletTown.asm @@ -71,9 +71,9 @@ PalletTown_MapEvents: db 0, 0 ; filler db 3 ; warp events - warp_event 5, 5, 1, REDS_HOUSE_1F - warp_event 13, 5, 1, BLUES_HOUSE - warp_event 12, 11, 1, OAKS_LAB + warp_event 5, 5, REDS_HOUSE_1F, 1 + warp_event 13, 5, BLUES_HOUSE, 1 + warp_event 12, 11, OAKS_LAB, 1 db 0 ; coord events diff --git a/maps/PewterCity.asm b/maps/PewterCity.asm index 5be0c8087..277f71487 100644 --- a/maps/PewterCity.asm +++ b/maps/PewterCity.asm @@ -154,11 +154,11 @@ PewterCity_MapEvents: db 0, 0 ; filler db 5 ; warp events - warp_event 29, 13, 1, PEWTER_NIDORAN_SPEECH_HOUSE - warp_event 16, 17, 1, PEWTER_GYM - warp_event 23, 17, 2, PEWTER_MART - warp_event 13, 25, 1, PEWTER_POKECENTER_1F - warp_event 7, 29, 1, PEWTER_SNOOZE_SPEECH_HOUSE + warp_event 29, 13, PEWTER_NIDORAN_SPEECH_HOUSE, 1 + warp_event 16, 17, PEWTER_GYM, 1 + warp_event 23, 17, PEWTER_MART, 2 + warp_event 13, 25, PEWTER_POKECENTER_1F, 1 + warp_event 7, 29, PEWTER_SNOOZE_SPEECH_HOUSE, 1 db 0 ; coord events diff --git a/maps/PewterGym.asm b/maps/PewterGym.asm index 211d7ac3b..0e73c3657 100644 --- a/maps/PewterGym.asm +++ b/maps/PewterGym.asm @@ -210,8 +210,8 @@ PewterGym_MapEvents: db 0, 0 ; filler db 2 ; warp events - warp_event 4, 13, 2, PEWTER_CITY - warp_event 5, 13, 2, PEWTER_CITY + warp_event 4, 13, PEWTER_CITY, 2 + warp_event 5, 13, PEWTER_CITY, 2 db 0 ; coord events diff --git a/maps/PewterMart.asm b/maps/PewterMart.asm index be0b3413f..19e324bca 100644 --- a/maps/PewterMart.asm +++ b/maps/PewterMart.asm @@ -47,8 +47,8 @@ PewterMart_MapEvents: db 0, 0 ; filler db 2 ; warp events - warp_event 2, 7, 3, PEWTER_CITY - warp_event 3, 7, 3, PEWTER_CITY + warp_event 2, 7, PEWTER_CITY, 3 + warp_event 3, 7, PEWTER_CITY, 3 db 0 ; coord events diff --git a/maps/PewterNidoranSpeechHouse.asm b/maps/PewterNidoranSpeechHouse.asm index 4202f9766..aed4ba69b 100644 --- a/maps/PewterNidoranSpeechHouse.asm +++ b/maps/PewterNidoranSpeechHouse.asm @@ -30,8 +30,8 @@ PewterNidoranSpeechHouse_MapEvents: db 0, 0 ; filler db 2 ; warp events - warp_event 2, 7, 1, PEWTER_CITY - warp_event 3, 7, 1, PEWTER_CITY + warp_event 2, 7, PEWTER_CITY, 1 + warp_event 3, 7, PEWTER_CITY, 1 db 0 ; coord events diff --git a/maps/PewterPokecenter1F.asm b/maps/PewterPokecenter1F.asm index c3d73a0ab..328b92f79 100644 --- a/maps/PewterPokecenter1F.asm +++ b/maps/PewterPokecenter1F.asm @@ -69,9 +69,9 @@ PewterPokecenter1F_MapEvents: db 0, 0 ; filler db 3 ; warp events - warp_event 3, 7, 4, PEWTER_CITY - warp_event 4, 7, 4, PEWTER_CITY - warp_event 0, 7, 1, POKECENTER_2F + warp_event 3, 7, PEWTER_CITY, 4 + warp_event 4, 7, PEWTER_CITY, 4 + warp_event 0, 7, POKECENTER_2F, 1 db 0 ; coord events diff --git a/maps/PewterPokecenter2FBeta.asm b/maps/PewterPokecenter2FBeta.asm index f01010f7a..49d4deea9 100644 --- a/maps/PewterPokecenter2FBeta.asm +++ b/maps/PewterPokecenter2FBeta.asm @@ -7,7 +7,7 @@ PewterPokecenter2FBeta_MapEvents: db 0, 0 ; filler db 1 ; warp events - warp_event 0, 7, 3, PEWTER_POKECENTER_1F + warp_event 0, 7, PEWTER_POKECENTER_1F, 3 db 0 ; coord events diff --git a/maps/PewterSnoozeSpeechHouse.asm b/maps/PewterSnoozeSpeechHouse.asm index d7feb63ad..2a7e21c8e 100644 --- a/maps/PewterSnoozeSpeechHouse.asm +++ b/maps/PewterSnoozeSpeechHouse.asm @@ -22,8 +22,8 @@ PewterSnoozeSpeechHouse_MapEvents: db 0, 0 ; filler db 2 ; warp events - warp_event 2, 7, 5, PEWTER_CITY - warp_event 3, 7, 5, PEWTER_CITY + warp_event 2, 7, PEWTER_CITY, 5 + warp_event 3, 7, PEWTER_CITY, 5 db 0 ; coord events diff --git a/maps/PlayersHouse1F.asm b/maps/PlayersHouse1F.asm index 4cd4c1ecd..61c52d7c9 100644 --- a/maps/PlayersHouse1F.asm +++ b/maps/PlayersHouse1F.asm @@ -387,9 +387,9 @@ PlayersHouse1F_MapEvents: db 0, 0 ; filler db 3 ; warp events - warp_event 6, 7, 2, NEW_BARK_TOWN - warp_event 7, 7, 2, NEW_BARK_TOWN - warp_event 9, 0, 1, PLAYERS_HOUSE_2F + warp_event 6, 7, NEW_BARK_TOWN, 2 + warp_event 7, 7, NEW_BARK_TOWN, 2 + warp_event 9, 0, PLAYERS_HOUSE_2F, 1 db 2 ; coord events coord_event 8, 4, SCENE_DEFAULT, UnknownScript_0x7a4d8 diff --git a/maps/PlayersHouse2F.asm b/maps/PlayersHouse2F.asm index d3748359c..d0fe5dece 100644 --- a/maps/PlayersHouse2F.asm +++ b/maps/PlayersHouse2F.asm @@ -117,7 +117,7 @@ PlayersHouse2F_MapEvents: db 0, 0 ; filler db 1 ; warp events - warp_event 7, 0, 3, PLAYERS_HOUSE_1F + warp_event 7, 0, PLAYERS_HOUSE_1F, 3 db 0 ; coord events diff --git a/maps/PlayersNeighborsHouse.asm b/maps/PlayersNeighborsHouse.asm index e5afd0949..127c0f1ec 100644 --- a/maps/PlayersNeighborsHouse.asm +++ b/maps/PlayersNeighborsHouse.asm @@ -100,8 +100,8 @@ PlayersNeighborsHouse_MapEvents: db 0, 0 ; filler db 2 ; warp events - warp_event 2, 7, 3, NEW_BARK_TOWN - warp_event 3, 7, 3, NEW_BARK_TOWN + warp_event 2, 7, NEW_BARK_TOWN, 3 + warp_event 3, 7, NEW_BARK_TOWN, 3 db 0 ; coord events diff --git a/maps/PokeSeersHouse.asm b/maps/PokeSeersHouse.asm index 6d0cadefe..a656ffe0e 100644 --- a/maps/PokeSeersHouse.asm +++ b/maps/PokeSeersHouse.asm @@ -18,8 +18,8 @@ PokeSeersHouse_MapEvents: db 0, 0 ; filler db 2 ; warp events - warp_event 2, 7, 7, CIANWOOD_CITY - warp_event 3, 7, 7, CIANWOOD_CITY + warp_event 2, 7, CIANWOOD_CITY, 7 + warp_event 3, 7, CIANWOOD_CITY, 7 db 0 ; coord events diff --git a/maps/Pokecenter2F.asm b/maps/Pokecenter2F.asm index 6f86921d2..27a5224f9 100644 --- a/maps/Pokecenter2F.asm +++ b/maps/Pokecenter2F.asm @@ -1024,12 +1024,12 @@ Pokecenter2F_MapEvents: db 0, 0 ; filler db 6 ; warp events - warp_event 0, 7, -1, POKECENTER_2F - warp_event 5, 0, 1, TRADE_CENTER - warp_event 9, 0, 1, COLOSSEUM - warp_event 13, 2, 1, TIME_CAPSULE - warp_event 6, 0, 1, MOBILE_TRADE_ROOM - warp_event 10, 0, 1, MOBILE_BATTLE_ROOM + warp_event 0, 7, POKECENTER_2F, -1 + warp_event 5, 0, TRADE_CENTER, 1 + warp_event 9, 0, COLOSSEUM, 1 + warp_event 13, 2, TIME_CAPSULE, 1 + warp_event 6, 0, MOBILE_TRADE_ROOM, 1 + warp_event 10, 0, MOBILE_BATTLE_ROOM, 1 db 0 ; coord events diff --git a/maps/PokecomCenterAdminRoomMobile.asm b/maps/PokecomCenterAdminRoomMobile.asm index 48428ec33..dcde9beaf 100644 --- a/maps/PokecomCenterAdminRoomMobile.asm +++ b/maps/PokecomCenterAdminRoomMobile.asm @@ -264,8 +264,8 @@ PokecomCenterAdminRoomMobile_MapEvents: db 0, 0 ; filler db 2 ; warp events - warp_event 0, 31, 3, GOLDENROD_POKECENTER_1F - warp_event 1, 31, 3, GOLDENROD_POKECENTER_1F + warp_event 0, 31, GOLDENROD_POKECENTER_1F, 3 + warp_event 1, 31, GOLDENROD_POKECENTER_1F, 3 db 0 ; coord events diff --git a/maps/PokemonFanClub.asm b/maps/PokemonFanClub.asm index bba5fff95..7a5260d61 100644 --- a/maps/PokemonFanClub.asm +++ b/maps/PokemonFanClub.asm @@ -298,8 +298,8 @@ PokemonFanClub_MapEvents: db 0, 0 ; filler db 2 ; warp events - warp_event 2, 7, 3, VERMILION_CITY - warp_event 3, 7, 3, VERMILION_CITY + warp_event 2, 7, VERMILION_CITY, 3 + warp_event 3, 7, VERMILION_CITY, 3 db 0 ; coord events diff --git a/maps/PowerPlant.asm b/maps/PowerPlant.asm index 1e291b890..6989234e0 100644 --- a/maps/PowerPlant.asm +++ b/maps/PowerPlant.asm @@ -390,8 +390,8 @@ PowerPlant_MapEvents: db 0, 0 ; filler db 2 ; warp events - warp_event 2, 17, 2, ROUTE_10_NORTH - warp_event 3, 17, 2, ROUTE_10_NORTH + warp_event 2, 17, ROUTE_10_NORTH, 2 + warp_event 3, 17, ROUTE_10_NORTH, 2 db 1 ; coord events coord_event 5, 12, SCENE_POWERPLANT_GUARD_GETS_PHONE_CALL, PowerPlantGuardPhoneScript diff --git a/maps/RadioTower1F.asm b/maps/RadioTower1F.asm index 655d77a91..f2b537f50 100644 --- a/maps/RadioTower1F.asm +++ b/maps/RadioTower1F.asm @@ -474,9 +474,9 @@ RadioTower1F_MapEvents: db 0, 0 ; filler db 3 ; warp events - warp_event 2, 7, 11, GOLDENROD_CITY - warp_event 3, 7, 11, GOLDENROD_CITY - warp_event 15, 0, 2, RADIO_TOWER_2F + warp_event 2, 7, GOLDENROD_CITY, 11 + warp_event 3, 7, GOLDENROD_CITY, 11 + warp_event 15, 0, RADIO_TOWER_2F, 2 db 0 ; coord events diff --git a/maps/RadioTower2F.asm b/maps/RadioTower2F.asm index 049c2c596..9343109d5 100644 --- a/maps/RadioTower2F.asm +++ b/maps/RadioTower2F.asm @@ -712,8 +712,8 @@ RadioTower2F_MapEvents: db 0, 0 ; filler db 2 ; warp events - warp_event 0, 0, 1, RADIO_TOWER_3F - warp_event 15, 0, 3, RADIO_TOWER_1F + warp_event 0, 0, RADIO_TOWER_3F, 1 + warp_event 15, 0, RADIO_TOWER_1F, 3 db 0 ; coord events diff --git a/maps/RadioTower3F.asm b/maps/RadioTower3F.asm index 737d19cce..26d5d5a9a 100644 --- a/maps/RadioTower3F.asm +++ b/maps/RadioTower3F.asm @@ -330,9 +330,9 @@ RadioTower3F_MapEvents: db 0, 0 ; filler db 3 ; warp events - warp_event 0, 0, 1, RADIO_TOWER_2F - warp_event 7, 0, 2, RADIO_TOWER_4F - warp_event 17, 0, 4, RADIO_TOWER_4F + warp_event 0, 0, RADIO_TOWER_2F, 1 + warp_event 7, 0, RADIO_TOWER_4F, 2 + warp_event 17, 0, RADIO_TOWER_4F, 4 db 0 ; coord events diff --git a/maps/RadioTower4F.asm b/maps/RadioTower4F.asm index 8b9adc7d0..b2181228e 100644 --- a/maps/RadioTower4F.asm +++ b/maps/RadioTower4F.asm @@ -247,10 +247,10 @@ RadioTower4F_MapEvents: db 0, 0 ; filler db 4 ; warp events - warp_event 0, 0, 1, RADIO_TOWER_5F - warp_event 9, 0, 2, RADIO_TOWER_3F - warp_event 12, 0, 2, RADIO_TOWER_5F - warp_event 17, 0, 3, RADIO_TOWER_3F + warp_event 0, 0, RADIO_TOWER_5F, 1 + warp_event 9, 0, RADIO_TOWER_3F, 2 + warp_event 12, 0, RADIO_TOWER_5F, 2 + warp_event 17, 0, RADIO_TOWER_3F, 3 db 0 ; coord events diff --git a/maps/RadioTower5F.asm b/maps/RadioTower5F.asm index 85f58fb6a..70a97ff65 100644 --- a/maps/RadioTower5F.asm +++ b/maps/RadioTower5F.asm @@ -422,8 +422,8 @@ RadioTower5F_MapEvents: db 0, 0 ; filler db 2 ; warp events - warp_event 0, 0, 1, RADIO_TOWER_4F - warp_event 12, 0, 3, RADIO_TOWER_4F + warp_event 0, 0, RADIO_TOWER_4F, 1 + warp_event 12, 0, RADIO_TOWER_4F, 3 db 2 ; coord events coord_event 0, 3, SCENE_DEFAULT, FakeDirectorScript diff --git a/maps/RedsHouse1F.asm b/maps/RedsHouse1F.asm index eb23329db..e12724bca 100644 --- a/maps/RedsHouse1F.asm +++ b/maps/RedsHouse1F.asm @@ -76,9 +76,9 @@ RedsHouse1F_MapEvents: db 0, 0 ; filler db 3 ; warp events - warp_event 2, 7, 1, PALLET_TOWN - warp_event 3, 7, 1, PALLET_TOWN - warp_event 7, 0, 1, REDS_HOUSE_2F + warp_event 2, 7, PALLET_TOWN, 1 + warp_event 3, 7, PALLET_TOWN, 1 + warp_event 7, 0, REDS_HOUSE_2F, 1 db 0 ; coord events diff --git a/maps/RedsHouse2F.asm b/maps/RedsHouse2F.asm index 74445fc3f..db61ec456 100644 --- a/maps/RedsHouse2F.asm +++ b/maps/RedsHouse2F.asm @@ -27,7 +27,7 @@ RedsHouse2F_MapEvents: db 0, 0 ; filler db 1 ; warp events - warp_event 7, 0, 3, REDS_HOUSE_1F + warp_event 7, 0, REDS_HOUSE_1F, 3 db 0 ; coord events diff --git a/maps/RockTunnel1F.asm b/maps/RockTunnel1F.asm index 8577d592e..84c285c28 100644 --- a/maps/RockTunnel1F.asm +++ b/maps/RockTunnel1F.asm @@ -23,12 +23,12 @@ RockTunnel1F_MapEvents: db 0, 0 ; filler db 6 ; warp events - warp_event 15, 3, 1, ROUTE_9 - warp_event 11, 25, 1, ROUTE_10_SOUTH - warp_event 5, 3, 3, ROCK_TUNNEL_B1F - warp_event 15, 9, 2, ROCK_TUNNEL_B1F - warp_event 27, 3, 4, ROCK_TUNNEL_B1F - warp_event 27, 13, 1, ROCK_TUNNEL_B1F + warp_event 15, 3, ROUTE_9, 1 + warp_event 11, 25, ROUTE_10_SOUTH, 1 + warp_event 5, 3, ROCK_TUNNEL_B1F, 3 + warp_event 15, 9, ROCK_TUNNEL_B1F, 2 + warp_event 27, 3, ROCK_TUNNEL_B1F, 4 + warp_event 27, 13, ROCK_TUNNEL_B1F, 1 db 0 ; coord events diff --git a/maps/RockTunnelB1F.asm b/maps/RockTunnelB1F.asm index df9c0db34..ece139cbf 100644 --- a/maps/RockTunnelB1F.asm +++ b/maps/RockTunnelB1F.asm @@ -24,10 +24,10 @@ RockTunnelB1F_MapEvents: db 0, 0 ; filler db 4 ; warp events - warp_event 3, 3, 6, ROCK_TUNNEL_1F - warp_event 17, 9, 4, ROCK_TUNNEL_1F - warp_event 23, 3, 3, ROCK_TUNNEL_1F - warp_event 25, 23, 5, ROCK_TUNNEL_1F + warp_event 3, 3, ROCK_TUNNEL_1F, 6 + warp_event 17, 9, ROCK_TUNNEL_1F, 4 + warp_event 23, 3, ROCK_TUNNEL_1F, 3 + warp_event 25, 23, ROCK_TUNNEL_1F, 5 db 0 ; coord events diff --git a/maps/Route10North.asm b/maps/Route10North.asm index 9e16ad2eb..954aeaac9 100644 --- a/maps/Route10North.asm +++ b/maps/Route10North.asm @@ -17,8 +17,8 @@ Route10North_MapEvents: db 0, 0 ; filler db 2 ; warp events - warp_event 11, 1, 1, ROUTE_10_POKECENTER_1F - warp_event 3, 9, 1, POWER_PLANT + warp_event 11, 1, ROUTE_10_POKECENTER_1F, 1 + warp_event 3, 9, POWER_PLANT, 1 db 0 ; coord events diff --git a/maps/Route10Pokecenter1F.asm b/maps/Route10Pokecenter1F.asm index 7b409c8c9..dc744312c 100644 --- a/maps/Route10Pokecenter1F.asm +++ b/maps/Route10Pokecenter1F.asm @@ -82,9 +82,9 @@ Route10Pokecenter1F_MapEvents: db 0, 0 ; filler db 3 ; warp events - warp_event 3, 7, 1, ROUTE_10_NORTH - warp_event 4, 7, 1, ROUTE_10_NORTH - warp_event 0, 7, 1, POKECENTER_2F + warp_event 3, 7, ROUTE_10_NORTH, 1 + warp_event 4, 7, ROUTE_10_NORTH, 1 + warp_event 0, 7, POKECENTER_2F, 1 db 0 ; coord events diff --git a/maps/Route10Pokecenter2FBeta.asm b/maps/Route10Pokecenter2FBeta.asm index 7b528ba13..ab9c80bb0 100644 --- a/maps/Route10Pokecenter2FBeta.asm +++ b/maps/Route10Pokecenter2FBeta.asm @@ -7,7 +7,7 @@ Route10Pokecenter2FBeta_MapEvents: db 0, 0 ; filler db 1 ; warp events - warp_event 0, 7, 3, ROUTE_10_POKECENTER_1F + warp_event 0, 7, ROUTE_10_POKECENTER_1F, 3 db 0 ; coord events diff --git a/maps/Route10South.asm b/maps/Route10South.asm index 655722c21..50c15c257 100644 --- a/maps/Route10South.asm +++ b/maps/Route10South.asm @@ -77,7 +77,7 @@ Route10South_MapEvents: db 0, 0 ; filler db 1 ; warp events - warp_event 6, 1, 2, ROCK_TUNNEL_1F + warp_event 6, 1, ROCK_TUNNEL_1F, 2 db 0 ; coord events diff --git a/maps/Route12.asm b/maps/Route12.asm index 5dc4a81f8..40bed0b3a 100644 --- a/maps/Route12.asm +++ b/maps/Route12.asm @@ -168,7 +168,7 @@ Route12_MapEvents: db 0, 0 ; filler db 1 ; warp events - warp_event 11, 33, 1, ROUTE_12_SUPER_ROD_HOUSE + warp_event 11, 33, ROUTE_12_SUPER_ROD_HOUSE, 1 db 0 ; coord events diff --git a/maps/Route12SuperRodHouse.asm b/maps/Route12SuperRodHouse.asm index 6856f2ab4..36fefbcd1 100644 --- a/maps/Route12SuperRodHouse.asm +++ b/maps/Route12SuperRodHouse.asm @@ -81,8 +81,8 @@ Route12SuperRodHouse_MapEvents: db 0, 0 ; filler db 2 ; warp events - warp_event 2, 7, 1, ROUTE_12 - warp_event 3, 7, 1, ROUTE_12 + warp_event 2, 7, ROUTE_12, 1 + warp_event 3, 7, ROUTE_12, 1 db 0 ; coord events diff --git a/maps/Route15.asm b/maps/Route15.asm index 0f0725262..b539866d1 100644 --- a/maps/Route15.asm +++ b/maps/Route15.asm @@ -203,8 +203,8 @@ Route15_MapEvents: db 0, 0 ; filler db 2 ; warp events - warp_event 2, 4, 3, ROUTE_15_FUCHSIA_GATE - warp_event 2, 5, 4, ROUTE_15_FUCHSIA_GATE + warp_event 2, 4, ROUTE_15_FUCHSIA_GATE, 3 + warp_event 2, 5, ROUTE_15_FUCHSIA_GATE, 4 db 0 ; coord events diff --git a/maps/Route15FuchsiaGate.asm b/maps/Route15FuchsiaGate.asm index c1ce3787e..73f40d679 100644 --- a/maps/Route15FuchsiaGate.asm +++ b/maps/Route15FuchsiaGate.asm @@ -21,10 +21,10 @@ Route15FuchsiaGate_MapEvents: db 0, 0 ; filler db 4 ; warp events - warp_event 0, 4, 8, FUCHSIA_CITY - warp_event 0, 5, 9, FUCHSIA_CITY - warp_event 9, 4, 1, ROUTE_15 - warp_event 9, 5, 2, ROUTE_15 + warp_event 0, 4, FUCHSIA_CITY, 8 + warp_event 0, 5, FUCHSIA_CITY, 9 + warp_event 9, 4, ROUTE_15, 1 + warp_event 9, 5, ROUTE_15, 2 db 0 ; coord events diff --git a/maps/Route16.asm b/maps/Route16.asm index a799803fd..760037f92 100644 --- a/maps/Route16.asm +++ b/maps/Route16.asm @@ -30,11 +30,11 @@ Route16_MapEvents: db 0, 0 ; filler db 5 ; warp events - warp_event 3, 1, 1, ROUTE_16_FUCHSIA_SPEECH_HOUSE - warp_event 14, 6, 3, ROUTE_16_GATE - warp_event 14, 7, 4, ROUTE_16_GATE - warp_event 9, 6, 1, ROUTE_16_GATE - warp_event 9, 7, 2, ROUTE_16_GATE + warp_event 3, 1, ROUTE_16_FUCHSIA_SPEECH_HOUSE, 1 + warp_event 14, 6, ROUTE_16_GATE, 3 + warp_event 14, 7, ROUTE_16_GATE, 4 + warp_event 9, 6, ROUTE_16_GATE, 1 + warp_event 9, 7, ROUTE_16_GATE, 2 db 0 ; coord events diff --git a/maps/Route16FuchsiaSpeechHouse.asm b/maps/Route16FuchsiaSpeechHouse.asm index aa2d700c9..1adf4e433 100644 --- a/maps/Route16FuchsiaSpeechHouse.asm +++ b/maps/Route16FuchsiaSpeechHouse.asm @@ -24,8 +24,8 @@ Route16FuchsiaSpeechHouse_MapEvents: db 0, 0 ; filler db 2 ; warp events - warp_event 2, 7, 1, ROUTE_16 - warp_event 3, 7, 1, ROUTE_16 + warp_event 2, 7, ROUTE_16, 1 + warp_event 3, 7, ROUTE_16, 1 db 0 ; coord events diff --git a/maps/Route16Gate.asm b/maps/Route16Gate.asm index 28b37ee6f..f31841a1d 100644 --- a/maps/Route16Gate.asm +++ b/maps/Route16Gate.asm @@ -62,10 +62,10 @@ Route16Gate_MapEvents: db 0, 0 ; filler db 4 ; warp events - warp_event 0, 4, 4, ROUTE_16 - warp_event 0, 5, 5, ROUTE_16 - warp_event 9, 4, 2, ROUTE_16 - warp_event 9, 5, 3, ROUTE_16 + warp_event 0, 4, ROUTE_16, 4 + warp_event 0, 5, ROUTE_16, 5 + warp_event 9, 4, ROUTE_16, 2 + warp_event 9, 5, ROUTE_16, 3 db 2 ; coord events coord_event 5, 4, SCENE_DEFAULT, UnknownScript_0x733ed diff --git a/maps/Route17.asm b/maps/Route17.asm index 4035e1a13..3f639d0ed 100644 --- a/maps/Route17.asm +++ b/maps/Route17.asm @@ -134,8 +134,8 @@ Route17_MapEvents: db 0, 0 ; filler db 2 ; warp events - warp_event 17, 82, 1, ROUTE_17_ROUTE_18_GATE - warp_event 17, 83, 2, ROUTE_17_ROUTE_18_GATE + warp_event 17, 82, ROUTE_17_ROUTE_18_GATE, 1 + warp_event 17, 83, ROUTE_17_ROUTE_18_GATE, 2 db 0 ; coord events diff --git a/maps/Route17Route18Gate.asm b/maps/Route17Route18Gate.asm index 740770356..41cee4f99 100644 --- a/maps/Route17Route18Gate.asm +++ b/maps/Route17Route18Gate.asm @@ -53,10 +53,10 @@ Route17Route18Gate_MapEvents: db 0, 0 ; filler db 4 ; warp events - warp_event 0, 4, 1, ROUTE_17 - warp_event 0, 5, 2, ROUTE_17 - warp_event 9, 4, 1, ROUTE_18 - warp_event 9, 5, 2, ROUTE_18 + warp_event 0, 4, ROUTE_17, 1 + warp_event 0, 5, ROUTE_17, 2 + warp_event 9, 4, ROUTE_18, 1 + warp_event 9, 5, ROUTE_18, 2 db 2 ; coord events coord_event 5, 4, SCENE_DEFAULT, UnknownScript_0x73611 diff --git a/maps/Route18.asm b/maps/Route18.asm index a30ab3332..2b79ba05a 100644 --- a/maps/Route18.asm +++ b/maps/Route18.asm @@ -79,8 +79,8 @@ Route18_MapEvents: db 0, 0 ; filler db 2 ; warp events - warp_event 2, 6, 3, ROUTE_17_ROUTE_18_GATE - warp_event 2, 7, 4, ROUTE_17_ROUTE_18_GATE + warp_event 2, 6, ROUTE_17_ROUTE_18_GATE, 3 + warp_event 2, 7, ROUTE_17_ROUTE_18_GATE, 4 db 0 ; coord events diff --git a/maps/Route19.asm b/maps/Route19.asm index a0b947c7c..a655879ac 100644 --- a/maps/Route19.asm +++ b/maps/Route19.asm @@ -236,7 +236,7 @@ Route19_MapEvents: db 0, 0 ; filler db 1 ; warp events - warp_event 7, 3, 3, ROUTE_19_FUCHSIA_GATE + warp_event 7, 3, ROUTE_19_FUCHSIA_GATE, 3 db 0 ; coord events diff --git a/maps/Route19FuchsiaGate.asm b/maps/Route19FuchsiaGate.asm index 04afecfdc..5592bb4bb 100644 --- a/maps/Route19FuchsiaGate.asm +++ b/maps/Route19FuchsiaGate.asm @@ -47,10 +47,10 @@ Route19FuchsiaGate_MapEvents: db 0, 0 ; filler db 4 ; warp events - warp_event 4, 0, 10, FUCHSIA_CITY - warp_event 5, 0, 11, FUCHSIA_CITY - warp_event 4, 7, 1, ROUTE_19 - warp_event 5, 7, 1, ROUTE_19 + warp_event 4, 0, FUCHSIA_CITY, 10 + warp_event 5, 0, FUCHSIA_CITY, 11 + warp_event 4, 7, ROUTE_19, 1 + warp_event 5, 7, ROUTE_19, 1 db 0 ; coord events diff --git a/maps/Route2.asm b/maps/Route2.asm index c42ce8d86..b58f330f6 100644 --- a/maps/Route2.asm +++ b/maps/Route2.asm @@ -148,11 +148,11 @@ Route2_MapEvents: db 0, 0 ; filler db 5 ; warp events - warp_event 15, 15, 1, ROUTE_2_NUGGET_HOUSE - warp_event 15, 31, 3, ROUTE_2_GATE - warp_event 16, 27, 1, ROUTE_2_GATE - warp_event 17, 27, 2, ROUTE_2_GATE - warp_event 12, 7, 3, DIGLETTS_CAVE + warp_event 15, 15, ROUTE_2_NUGGET_HOUSE, 1 + warp_event 15, 31, ROUTE_2_GATE, 3 + warp_event 16, 27, ROUTE_2_GATE, 1 + warp_event 17, 27, ROUTE_2_GATE, 2 + warp_event 12, 7, DIGLETTS_CAVE, 3 db 0 ; coord events diff --git a/maps/Route20.asm b/maps/Route20.asm index c5aa82140..61a758b84 100644 --- a/maps/Route20.asm +++ b/maps/Route20.asm @@ -114,7 +114,7 @@ Route20_MapEvents: db 0, 0 ; filler db 1 ; warp events - warp_event 38, 7, 1, SEAFOAM_GYM + warp_event 38, 7, SEAFOAM_GYM, 1 db 0 ; coord events diff --git a/maps/Route22.asm b/maps/Route22.asm index b34daae20..ec59e0c98 100644 --- a/maps/Route22.asm +++ b/maps/Route22.asm @@ -17,7 +17,7 @@ Route22_MapEvents: db 0, 0 ; filler db 1 ; warp events - warp_event 13, 5, 1, VICTORY_ROAD_GATE + warp_event 13, 5, VICTORY_ROAD_GATE, 1 db 0 ; coord events diff --git a/maps/Route23.asm b/maps/Route23.asm index a2149e6b9..5bd9b809c 100644 --- a/maps/Route23.asm +++ b/maps/Route23.asm @@ -24,10 +24,10 @@ Route23_MapEvents: db 0, 0 ; filler db 4 ; warp events - warp_event 9, 5, 1, INDIGO_PLATEAU_POKECENTER_1F - warp_event 10, 5, 2, INDIGO_PLATEAU_POKECENTER_1F - warp_event 9, 13, 10, VICTORY_ROAD - warp_event 10, 13, 10, VICTORY_ROAD + warp_event 9, 5, INDIGO_PLATEAU_POKECENTER_1F, 1 + warp_event 10, 5, INDIGO_PLATEAU_POKECENTER_1F, 2 + warp_event 9, 13, VICTORY_ROAD, 10 + warp_event 10, 13, VICTORY_ROAD, 10 db 0 ; coord events diff --git a/maps/Route25.asm b/maps/Route25.asm index 7732f06bf..78caeb418 100644 --- a/maps/Route25.asm +++ b/maps/Route25.asm @@ -431,7 +431,7 @@ Route25_MapEvents: db 0, 0 ; filler db 1 ; warp events - warp_event 47, 5, 1, BILLS_HOUSE + warp_event 47, 5, BILLS_HOUSE, 1 db 2 ; coord events coord_event 42, 6, SCENE_ROUTE25_MISTYS_DATE, Route25MistyDate1Script diff --git a/maps/Route26.asm b/maps/Route26.asm index 971729d94..05b20d057 100644 --- a/maps/Route26.asm +++ b/maps/Route26.asm @@ -414,9 +414,9 @@ Route26_MapEvents: db 0, 0 ; filler db 3 ; warp events - warp_event 7, 5, 3, VICTORY_ROAD_GATE - warp_event 15, 57, 1, ROUTE_26_HEAL_HOUSE - warp_event 5, 71, 1, DAY_OF_WEEK_SIBLINGS_HOUSE + warp_event 7, 5, VICTORY_ROAD_GATE, 3 + warp_event 15, 57, ROUTE_26_HEAL_HOUSE, 1 + warp_event 5, 71, DAY_OF_WEEK_SIBLINGS_HOUSE, 1 db 0 ; coord events diff --git a/maps/Route26HealHouse.asm b/maps/Route26HealHouse.asm index 76c5b670b..8a036b76a 100644 --- a/maps/Route26HealHouse.asm +++ b/maps/Route26HealHouse.asm @@ -50,8 +50,8 @@ Route26HealHouse_MapEvents: db 0, 0 ; filler db 2 ; warp events - warp_event 2, 7, 2, ROUTE_26 - warp_event 3, 7, 2, ROUTE_26 + warp_event 2, 7, ROUTE_26, 2 + warp_event 3, 7, ROUTE_26, 2 db 0 ; coord events diff --git a/maps/Route27.asm b/maps/Route27.asm index f31cf8d2b..9bdc741ee 100644 --- a/maps/Route27.asm +++ b/maps/Route27.asm @@ -469,9 +469,9 @@ Route27_MapEvents: db 0, 0 ; filler db 3 ; warp events - warp_event 33, 7, 1, ROUTE_27_SANDSTORM_HOUSE - warp_event 26, 5, 1, TOHJO_FALLS - warp_event 36, 5, 2, TOHJO_FALLS + warp_event 33, 7, ROUTE_27_SANDSTORM_HOUSE, 1 + warp_event 26, 5, TOHJO_FALLS, 1 + warp_event 36, 5, TOHJO_FALLS, 2 db 2 ; coord events coord_event 18, 10, SCENE_DEFAULT, UnknownScript_0x1a0873 diff --git a/maps/Route27SandstormHouse.asm b/maps/Route27SandstormHouse.asm index 34afb530f..430a10d73 100644 --- a/maps/Route27SandstormHouse.asm +++ b/maps/Route27SandstormHouse.asm @@ -95,8 +95,8 @@ Route27SandstormHouse_MapEvents: db 0, 0 ; filler db 2 ; warp events - warp_event 2, 7, 1, ROUTE_27 - warp_event 3, 7, 1, ROUTE_27 + warp_event 2, 7, ROUTE_27, 1 + warp_event 3, 7, ROUTE_27, 1 db 0 ; coord events diff --git a/maps/Route28.asm b/maps/Route28.asm index ad729079d..d36717833 100644 --- a/maps/Route28.asm +++ b/maps/Route28.asm @@ -17,8 +17,8 @@ Route28_MapEvents: db 0, 0 ; filler db 2 ; warp events - warp_event 7, 3, 1, ROUTE_28_STEEL_WING_HOUSE - warp_event 33, 5, 7, VICTORY_ROAD_GATE + warp_event 7, 3, ROUTE_28_STEEL_WING_HOUSE, 1 + warp_event 33, 5, VICTORY_ROAD_GATE, 7 db 0 ; coord events diff --git a/maps/Route28SteelWingHouse.asm b/maps/Route28SteelWingHouse.asm index df418b8f7..911c9cf9c 100644 --- a/maps/Route28SteelWingHouse.asm +++ b/maps/Route28SteelWingHouse.asm @@ -72,8 +72,8 @@ Route28SteelWingHouse_MapEvents: db 0, 0 ; filler db 2 ; warp events - warp_event 2, 7, 1, ROUTE_28 - warp_event 3, 7, 1, ROUTE_28 + warp_event 2, 7, ROUTE_28, 1 + warp_event 3, 7, ROUTE_28, 1 db 0 ; coord events diff --git a/maps/Route29.asm b/maps/Route29.asm index 02a71c12f..5edbcf4c5 100644 --- a/maps/Route29.asm +++ b/maps/Route29.asm @@ -417,7 +417,7 @@ Route29_MapEvents: db 0, 0 ; filler db 1 ; warp events - warp_event 27, 1, 3, ROUTE_29_ROUTE_46_GATE + warp_event 27, 1, ROUTE_29_ROUTE_46_GATE, 3 db 2 ; coord events coord_event 53, 8, SCENE_ROUTE29_CATCH_TUTORIAL, Route29Tutorial1 diff --git a/maps/Route29Route46Gate.asm b/maps/Route29Route46Gate.asm index 9259074f3..285fa836d 100644 --- a/maps/Route29Route46Gate.asm +++ b/maps/Route29Route46Gate.asm @@ -38,10 +38,10 @@ Route29Route46Gate_MapEvents: db 0, 0 ; filler db 4 ; warp events - warp_event 4, 0, 1, ROUTE_46 - warp_event 5, 0, 2, ROUTE_46 - warp_event 4, 7, 1, ROUTE_29 - warp_event 5, 7, 1, ROUTE_29 + warp_event 4, 0, ROUTE_46, 1 + warp_event 5, 0, ROUTE_46, 2 + warp_event 4, 7, ROUTE_29, 1 + warp_event 5, 7, ROUTE_29, 1 db 0 ; coord events diff --git a/maps/Route2Gate.asm b/maps/Route2Gate.asm index 9b90d34e4..7a31fc70b 100644 --- a/maps/Route2Gate.asm +++ b/maps/Route2Gate.asm @@ -27,10 +27,10 @@ Route2Gate_MapEvents: db 0, 0 ; filler db 4 ; warp events - warp_event 4, 0, 3, ROUTE_2 - warp_event 5, 0, 4, ROUTE_2 - warp_event 4, 7, 2, ROUTE_2 - warp_event 5, 7, 2, ROUTE_2 + warp_event 4, 0, ROUTE_2, 3 + warp_event 5, 0, ROUTE_2, 4 + warp_event 4, 7, ROUTE_2, 2 + warp_event 5, 7, ROUTE_2, 2 db 0 ; coord events diff --git a/maps/Route2NuggetHouse.asm b/maps/Route2NuggetHouse.asm index cacd90080..ca5059de9 100644 --- a/maps/Route2NuggetHouse.asm +++ b/maps/Route2NuggetHouse.asm @@ -54,8 +54,8 @@ Route2NuggetHouse_MapEvents: db 0, 0 ; filler db 2 ; warp events - warp_event 2, 7, 1, ROUTE_2 - warp_event 3, 7, 1, ROUTE_2 + warp_event 2, 7, ROUTE_2, 1 + warp_event 3, 7, ROUTE_2, 1 db 0 ; coord events diff --git a/maps/Route3.asm b/maps/Route3.asm index 6821bea8e..9d15d96cc 100644 --- a/maps/Route3.asm +++ b/maps/Route3.asm @@ -134,7 +134,7 @@ Route3_MapEvents: db 0, 0 ; filler db 1 ; warp events - warp_event 52, 1, 1, MOUNT_MOON + warp_event 52, 1, MOUNT_MOON, 1 db 0 ; coord events diff --git a/maps/Route30.asm b/maps/Route30.asm index 9cf36ad60..0ab3d9cf3 100644 --- a/maps/Route30.asm +++ b/maps/Route30.asm @@ -408,8 +408,8 @@ Route30_MapEvents: db 0, 0 ; filler db 2 ; warp events - warp_event 7, 39, 1, ROUTE_30_BERRY_HOUSE - warp_event 17, 5, 1, MR_POKEMONS_HOUSE + warp_event 7, 39, ROUTE_30_BERRY_HOUSE, 1 + warp_event 17, 5, MR_POKEMONS_HOUSE, 1 db 0 ; coord events diff --git a/maps/Route30BerryHouse.asm b/maps/Route30BerryHouse.asm index e8403352d..ede2fee7b 100644 --- a/maps/Route30BerryHouse.asm +++ b/maps/Route30BerryHouse.asm @@ -48,8 +48,8 @@ Route30BerryHouse_MapEvents: db 0, 0 ; filler db 2 ; warp events - warp_event 2, 7, 1, ROUTE_30 - warp_event 3, 7, 1, ROUTE_30 + warp_event 2, 7, ROUTE_30, 1 + warp_event 3, 7, ROUTE_30, 1 db 0 ; coord events diff --git a/maps/Route31.asm b/maps/Route31.asm index 3215a83bd..fc4c16fa2 100644 --- a/maps/Route31.asm +++ b/maps/Route31.asm @@ -419,9 +419,9 @@ Route31_MapEvents: db 0, 0 ; filler db 3 ; warp events - warp_event 4, 6, 3, ROUTE_31_VIOLET_GATE - warp_event 4, 7, 4, ROUTE_31_VIOLET_GATE - warp_event 34, 5, 1, DARK_CAVE_VIOLET_ENTRANCE + warp_event 4, 6, ROUTE_31_VIOLET_GATE, 3 + warp_event 4, 7, ROUTE_31_VIOLET_GATE, 4 + warp_event 34, 5, DARK_CAVE_VIOLET_ENTRANCE, 1 db 0 ; coord events diff --git a/maps/Route31VioletGate.asm b/maps/Route31VioletGate.asm index 2d07a5ef3..f0acc8aa8 100644 --- a/maps/Route31VioletGate.asm +++ b/maps/Route31VioletGate.asm @@ -29,10 +29,10 @@ Route31VioletGate_MapEvents: db 0, 0 ; filler db 4 ; warp events - warp_event 0, 4, 8, VIOLET_CITY - warp_event 0, 5, 9, VIOLET_CITY - warp_event 9, 4, 1, ROUTE_31 - warp_event 9, 5, 2, ROUTE_31 + warp_event 0, 4, VIOLET_CITY, 8 + warp_event 0, 5, VIOLET_CITY, 9 + warp_event 9, 4, ROUTE_31, 1 + warp_event 9, 5, ROUTE_31, 2 db 0 ; coord events diff --git a/maps/Route32.asm b/maps/Route32.asm index e0f7725d2..78c5f16ce 100644 --- a/maps/Route32.asm +++ b/maps/Route32.asm @@ -930,10 +930,10 @@ Route32_MapEvents: db 0, 0 ; filler db 4 ; warp events - warp_event 11, 73, 1, ROUTE_32_POKECENTER_1F - warp_event 4, 2, 3, ROUTE_32_RUINS_OF_ALPH_GATE - warp_event 4, 3, 4, ROUTE_32_RUINS_OF_ALPH_GATE - warp_event 6, 79, 4, UNION_CAVE_1F + warp_event 11, 73, ROUTE_32_POKECENTER_1F, 1 + warp_event 4, 2, ROUTE_32_RUINS_OF_ALPH_GATE, 3 + warp_event 4, 3, ROUTE_32_RUINS_OF_ALPH_GATE, 4 + warp_event 6, 79, UNION_CAVE_1F, 4 db 2 ; coord events coord_event 18, 8, SCENE_DEFAULT, Route32CooltrainerMStopsYouScene diff --git a/maps/Route32Pokecenter1F.asm b/maps/Route32Pokecenter1F.asm index 0dbc204b8..0127ebe72 100644 --- a/maps/Route32Pokecenter1F.asm +++ b/maps/Route32Pokecenter1F.asm @@ -96,9 +96,9 @@ Route32Pokecenter1F_MapEvents: db 0, 0 ; filler db 3 ; warp events - warp_event 3, 7, 1, ROUTE_32 - warp_event 4, 7, 1, ROUTE_32 - warp_event 0, 7, 1, POKECENTER_2F + warp_event 3, 7, ROUTE_32, 1 + warp_event 4, 7, ROUTE_32, 1 + warp_event 0, 7, POKECENTER_2F, 1 db 0 ; coord events diff --git a/maps/Route32RuinsOfAlphGate.asm b/maps/Route32RuinsOfAlphGate.asm index ebcdb8e83..8481351b4 100644 --- a/maps/Route32RuinsOfAlphGate.asm +++ b/maps/Route32RuinsOfAlphGate.asm @@ -48,10 +48,10 @@ Route32RuinsOfAlphGate_MapEvents: db 0, 0 ; filler db 4 ; warp events - warp_event 0, 4, 10, RUINS_OF_ALPH_OUTSIDE - warp_event 0, 5, 11, RUINS_OF_ALPH_OUTSIDE - warp_event 9, 4, 2, ROUTE_32 - warp_event 9, 5, 3, ROUTE_32 + warp_event 0, 4, RUINS_OF_ALPH_OUTSIDE, 10 + warp_event 0, 5, RUINS_OF_ALPH_OUTSIDE, 11 + warp_event 9, 4, ROUTE_32, 2 + warp_event 9, 5, ROUTE_32, 3 db 0 ; coord events diff --git a/maps/Route33.asm b/maps/Route33.asm index 4aa3fd6f4..dad0a0571 100644 --- a/maps/Route33.asm +++ b/maps/Route33.asm @@ -196,7 +196,7 @@ Route33_MapEvents: db 0, 0 ; filler db 1 ; warp events - warp_event 11, 9, 3, UNION_CAVE_1F + warp_event 11, 9, UNION_CAVE_1F, 3 db 0 ; coord events diff --git a/maps/Route34.asm b/maps/Route34.asm index e20b348b9..3a2832cb9 100644 --- a/maps/Route34.asm +++ b/maps/Route34.asm @@ -762,11 +762,11 @@ Route34_MapEvents: db 0, 0 ; filler db 5 ; warp events - warp_event 13, 37, 1, ROUTE_34_ILEX_FOREST_GATE - warp_event 14, 37, 2, ROUTE_34_ILEX_FOREST_GATE - warp_event 11, 14, 1, DAY_CARE - warp_event 11, 15, 2, DAY_CARE - warp_event 13, 15, 3, DAY_CARE + warp_event 13, 37, ROUTE_34_ILEX_FOREST_GATE, 1 + warp_event 14, 37, ROUTE_34_ILEX_FOREST_GATE, 2 + warp_event 11, 14, DAY_CARE, 1 + warp_event 11, 15, DAY_CARE, 2 + warp_event 13, 15, DAY_CARE, 3 db 0 ; coord events diff --git a/maps/Route34IlexForestGate.asm b/maps/Route34IlexForestGate.asm index 85b0ec3b2..8472ee54b 100644 --- a/maps/Route34IlexForestGate.asm +++ b/maps/Route34IlexForestGate.asm @@ -137,10 +137,10 @@ Route34IlexForestGate_MapEvents: db 0, 0 ; filler db 4 ; warp events - warp_event 4, 0, 1, ROUTE_34 - warp_event 5, 0, 2, ROUTE_34 - warp_event 4, 7, 1, ILEX_FOREST - warp_event 5, 7, 1, ILEX_FOREST + warp_event 4, 0, ROUTE_34, 1 + warp_event 5, 0, ROUTE_34, 2 + warp_event 4, 7, ILEX_FOREST, 1 + warp_event 5, 7, ILEX_FOREST, 1 db 1 ; coord events coord_event 4, 7, 0, UnknownScript_0x62d3d diff --git a/maps/Route35.asm b/maps/Route35.asm index 52ebe785d..cd3483e12 100644 --- a/maps/Route35.asm +++ b/maps/Route35.asm @@ -464,9 +464,9 @@ Route35_MapEvents: db 0, 0 ; filler db 3 ; warp events - warp_event 9, 33, 1, ROUTE_35_GOLDENROD_GATE - warp_event 10, 33, 2, ROUTE_35_GOLDENROD_GATE - warp_event 3, 5, 3, ROUTE_35_NATIONAL_PARK_GATE + warp_event 9, 33, ROUTE_35_GOLDENROD_GATE, 1 + warp_event 10, 33, ROUTE_35_GOLDENROD_GATE, 2 + warp_event 3, 5, ROUTE_35_NATIONAL_PARK_GATE, 3 db 0 ; coord events diff --git a/maps/Route35GoldenrodGate.asm b/maps/Route35GoldenrodGate.asm index 3aeae2ff2..46a2bd9f4 100644 --- a/maps/Route35GoldenrodGate.asm +++ b/maps/Route35GoldenrodGate.asm @@ -197,10 +197,10 @@ Route35GoldenrodGate_MapEvents: db 0, 0 ; filler db 4 ; warp events - warp_event 4, 0, 1, ROUTE_35 - warp_event 5, 0, 2, ROUTE_35 - warp_event 4, 7, 12, GOLDENROD_CITY - warp_event 5, 7, 12, GOLDENROD_CITY + warp_event 4, 0, ROUTE_35, 1 + warp_event 5, 0, ROUTE_35, 2 + warp_event 4, 7, GOLDENROD_CITY, 12 + warp_event 5, 7, GOLDENROD_CITY, 12 db 0 ; coord events diff --git a/maps/Route35NationalParkGate.asm b/maps/Route35NationalParkGate.asm index e59a1502d..274ae9414 100644 --- a/maps/Route35NationalParkGate.asm +++ b/maps/Route35NationalParkGate.asm @@ -439,10 +439,10 @@ Route35NationalParkGate_MapEvents: db 0, 0 ; filler db 4 ; warp events - warp_event 3, 0, 3, NATIONAL_PARK - warp_event 4, 0, 4, NATIONAL_PARK - warp_event 3, 7, 3, ROUTE_35 - warp_event 4, 7, 3, ROUTE_35 + warp_event 3, 0, NATIONAL_PARK, 3 + warp_event 4, 0, NATIONAL_PARK, 4 + warp_event 3, 7, ROUTE_35, 3 + warp_event 4, 7, ROUTE_35, 3 db 0 ; coord events diff --git a/maps/Route36.asm b/maps/Route36.asm index 2800aa90e..478a8bdff 100644 --- a/maps/Route36.asm +++ b/maps/Route36.asm @@ -661,10 +661,10 @@ Route36_MapEvents: db 0, 0 ; filler db 4 ; warp events - warp_event 18, 8, 3, ROUTE_36_NATIONAL_PARK_GATE - warp_event 18, 9, 4, ROUTE_36_NATIONAL_PARK_GATE - warp_event 47, 13, 1, ROUTE_36_RUINS_OF_ALPH_GATE - warp_event 48, 13, 2, ROUTE_36_RUINS_OF_ALPH_GATE + warp_event 18, 8, ROUTE_36_NATIONAL_PARK_GATE, 3 + warp_event 18, 9, ROUTE_36_NATIONAL_PARK_GATE, 4 + warp_event 47, 13, ROUTE_36_RUINS_OF_ALPH_GATE, 1 + warp_event 48, 13, ROUTE_36_RUINS_OF_ALPH_GATE, 2 db 2 ; coord events coord_event 20, 7, SCENE_ROUTE36_SUICUNE, Route36SuicuneScript diff --git a/maps/Route36NationalParkGate.asm b/maps/Route36NationalParkGate.asm index bf4978504..062e088b4 100644 --- a/maps/Route36NationalParkGate.asm +++ b/maps/Route36NationalParkGate.asm @@ -851,10 +851,10 @@ Route36NationalParkGate_MapEvents: db 0, 0 ; filler db 4 ; warp events - warp_event 0, 4, 1, NATIONAL_PARK - warp_event 0, 5, 2, NATIONAL_PARK - warp_event 9, 4, 1, ROUTE_36 - warp_event 9, 5, 2, ROUTE_36 + warp_event 0, 4, NATIONAL_PARK, 1 + warp_event 0, 5, NATIONAL_PARK, 2 + warp_event 9, 4, ROUTE_36, 1 + warp_event 9, 5, ROUTE_36, 2 db 0 ; coord events diff --git a/maps/Route36RuinsOfAlphGate.asm b/maps/Route36RuinsOfAlphGate.asm index 077b9debe..e06a71f41 100644 --- a/maps/Route36RuinsOfAlphGate.asm +++ b/maps/Route36RuinsOfAlphGate.asm @@ -36,10 +36,10 @@ Route36RuinsOfAlphGate_MapEvents: db 0, 0 ; filler db 4 ; warp events - warp_event 4, 0, 3, ROUTE_36 - warp_event 5, 0, 4, ROUTE_36 - warp_event 4, 7, 9, RUINS_OF_ALPH_OUTSIDE - warp_event 5, 7, 9, RUINS_OF_ALPH_OUTSIDE + warp_event 4, 0, ROUTE_36, 3 + warp_event 5, 0, ROUTE_36, 4 + warp_event 4, 7, RUINS_OF_ALPH_OUTSIDE, 9 + warp_event 5, 7, RUINS_OF_ALPH_OUTSIDE, 9 db 0 ; coord events diff --git a/maps/Route38.asm b/maps/Route38.asm index 32b9a6feb..a18e69a6d 100644 --- a/maps/Route38.asm +++ b/maps/Route38.asm @@ -474,8 +474,8 @@ Route38_MapEvents: db 0, 0 ; filler db 2 ; warp events - warp_event 35, 8, 1, ROUTE_38_ECRUTEAK_GATE - warp_event 35, 9, 2, ROUTE_38_ECRUTEAK_GATE + warp_event 35, 8, ROUTE_38_ECRUTEAK_GATE, 1 + warp_event 35, 9, ROUTE_38_ECRUTEAK_GATE, 2 db 0 ; coord events diff --git a/maps/Route38EcruteakGate.asm b/maps/Route38EcruteakGate.asm index f97705b22..358bb0eae 100644 --- a/maps/Route38EcruteakGate.asm +++ b/maps/Route38EcruteakGate.asm @@ -26,10 +26,10 @@ Route38EcruteakGate_MapEvents: db 0, 0 ; filler db 4 ; warp events - warp_event 0, 4, 1, ROUTE_38 - warp_event 0, 5, 2, ROUTE_38 - warp_event 9, 4, 14, ECRUTEAK_CITY - warp_event 9, 5, 15, ECRUTEAK_CITY + warp_event 0, 4, ROUTE_38, 1 + warp_event 0, 5, ROUTE_38, 2 + warp_event 9, 4, ECRUTEAK_CITY, 14 + warp_event 9, 5, ECRUTEAK_CITY, 15 db 0 ; coord events diff --git a/maps/Route39.asm b/maps/Route39.asm index 426eb6449..8d27b9285 100644 --- a/maps/Route39.asm +++ b/maps/Route39.asm @@ -345,8 +345,8 @@ Route39_MapEvents: db 0, 0 ; filler db 2 ; warp events - warp_event 1, 3, 1, ROUTE_39_BARN - warp_event 5, 3, 1, ROUTE_39_FARMHOUSE + warp_event 1, 3, ROUTE_39_BARN, 1 + warp_event 5, 3, ROUTE_39_FARMHOUSE, 1 db 0 ; coord events diff --git a/maps/Route39Barn.asm b/maps/Route39Barn.asm index 68187ecd5..e3359e1e4 100644 --- a/maps/Route39Barn.asm +++ b/maps/Route39Barn.asm @@ -190,8 +190,8 @@ Route39Barn_MapEvents: db 0, 0 ; filler db 2 ; warp events - warp_event 3, 7, 1, ROUTE_39 - warp_event 4, 7, 1, ROUTE_39 + warp_event 3, 7, ROUTE_39, 1 + warp_event 4, 7, ROUTE_39, 1 db 0 ; coord events diff --git a/maps/Route39Farmhouse.asm b/maps/Route39Farmhouse.asm index caf17f96b..a82f8a75c 100644 --- a/maps/Route39Farmhouse.asm +++ b/maps/Route39Farmhouse.asm @@ -194,8 +194,8 @@ Route39Farmhouse_MapEvents: db 0, 0 ; filler db 2 ; warp events - warp_event 2, 7, 2, ROUTE_39 - warp_event 3, 7, 2, ROUTE_39 + warp_event 2, 7, ROUTE_39, 2 + warp_event 3, 7, ROUTE_39, 2 db 0 ; coord events diff --git a/maps/Route4.asm b/maps/Route4.asm index 371bca62b..3259ebce6 100644 --- a/maps/Route4.asm +++ b/maps/Route4.asm @@ -122,7 +122,7 @@ Route4_MapEvents: db 0, 0 ; filler db 1 ; warp events - warp_event 2, 5, 2, MOUNT_MOON + warp_event 2, 5, MOUNT_MOON, 2 db 0 ; coord events diff --git a/maps/Route40.asm b/maps/Route40.asm index 1a3cde94a..2b7081ef3 100644 --- a/maps/Route40.asm +++ b/maps/Route40.asm @@ -339,7 +339,7 @@ Route40_MapEvents: db 0, 0 ; filler db 1 ; warp events - warp_event 9, 5, 1, ROUTE_40_BATTLE_TOWER_GATE + warp_event 9, 5, ROUTE_40_BATTLE_TOWER_GATE, 1 db 0 ; coord events diff --git a/maps/Route40BattleTowerGate.asm b/maps/Route40BattleTowerGate.asm index be048fa04..3bafbd21b 100644 --- a/maps/Route40BattleTowerGate.asm +++ b/maps/Route40BattleTowerGate.asm @@ -72,10 +72,10 @@ Route40BattleTowerGate_MapEvents: db 0, 0 ; filler db 4 ; warp events - warp_event 4, 7, 1, ROUTE_40 - warp_event 5, 7, 1, ROUTE_40 - warp_event 4, 0, 1, BATTLE_TOWER_OUTSIDE - warp_event 5, 0, 2, BATTLE_TOWER_OUTSIDE + warp_event 4, 7, ROUTE_40, 1 + warp_event 5, 7, ROUTE_40, 1 + warp_event 4, 0, BATTLE_TOWER_OUTSIDE, 1 + warp_event 5, 0, BATTLE_TOWER_OUTSIDE, 2 db 0 ; coord events diff --git a/maps/Route41.asm b/maps/Route41.asm index b061f469d..8fbfbce85 100644 --- a/maps/Route41.asm +++ b/maps/Route41.asm @@ -343,10 +343,10 @@ Route41_MapEvents: db 0, 0 ; filler db 4 ; warp events - warp_event 12, 17, 1, WHIRL_ISLAND_NW - warp_event 36, 19, 1, WHIRL_ISLAND_NE - warp_event 12, 37, 1, WHIRL_ISLAND_SW - warp_event 36, 45, 1, WHIRL_ISLAND_SE + warp_event 12, 17, WHIRL_ISLAND_NW, 1 + warp_event 36, 19, WHIRL_ISLAND_NE, 1 + warp_event 12, 37, WHIRL_ISLAND_SW, 1 + warp_event 36, 45, WHIRL_ISLAND_SE, 1 db 0 ; coord events diff --git a/maps/Route42.asm b/maps/Route42.asm index 69d2b92a6..20a4f856c 100644 --- a/maps/Route42.asm +++ b/maps/Route42.asm @@ -320,11 +320,11 @@ Route42_MapEvents: db 0, 0 ; filler db 5 ; warp events - warp_event 0, 8, 3, ROUTE_42_ECRUTEAK_GATE - warp_event 0, 9, 4, ROUTE_42_ECRUTEAK_GATE - warp_event 10, 5, 1, MOUNT_MORTAR_1F_OUTSIDE - warp_event 28, 9, 2, MOUNT_MORTAR_1F_OUTSIDE - warp_event 46, 7, 3, MOUNT_MORTAR_1F_OUTSIDE + warp_event 0, 8, ROUTE_42_ECRUTEAK_GATE, 3 + warp_event 0, 9, ROUTE_42_ECRUTEAK_GATE, 4 + warp_event 10, 5, MOUNT_MORTAR_1F_OUTSIDE, 1 + warp_event 28, 9, MOUNT_MORTAR_1F_OUTSIDE, 2 + warp_event 46, 7, MOUNT_MORTAR_1F_OUTSIDE, 3 db 1 ; coord events coord_event 24, 14, SCENE_ROUTE42_SUICUNE, Route42SuicuneScript diff --git a/maps/Route42EcruteakGate.asm b/maps/Route42EcruteakGate.asm index 4b0196f29..89ef5cd1a 100644 --- a/maps/Route42EcruteakGate.asm +++ b/maps/Route42EcruteakGate.asm @@ -21,10 +21,10 @@ Route42EcruteakGate_MapEvents: db 0, 0 ; filler db 4 ; warp events - warp_event 0, 4, 1, ECRUTEAK_CITY - warp_event 0, 5, 2, ECRUTEAK_CITY - warp_event 9, 4, 1, ROUTE_42 - warp_event 9, 5, 2, ROUTE_42 + warp_event 0, 4, ECRUTEAK_CITY, 1 + warp_event 0, 5, ECRUTEAK_CITY, 2 + warp_event 9, 4, ROUTE_42, 1 + warp_event 9, 5, ROUTE_42, 2 db 0 ; coord events diff --git a/maps/Route43.asm b/maps/Route43.asm index 4b222f4a6..fa8067663 100644 --- a/maps/Route43.asm +++ b/maps/Route43.asm @@ -502,11 +502,11 @@ Route43_MapEvents: db 0, 0 ; filler db 5 ; warp events - warp_event 9, 51, 1, ROUTE_43_MAHOGANY_GATE - warp_event 10, 51, 2, ROUTE_43_MAHOGANY_GATE - warp_event 17, 35, 3, ROUTE_43_GATE - warp_event 17, 31, 1, ROUTE_43_GATE - warp_event 18, 31, 2, ROUTE_43_GATE + warp_event 9, 51, ROUTE_43_MAHOGANY_GATE, 1 + warp_event 10, 51, ROUTE_43_MAHOGANY_GATE, 2 + warp_event 17, 35, ROUTE_43_GATE, 3 + warp_event 17, 31, ROUTE_43_GATE, 1 + warp_event 18, 31, ROUTE_43_GATE, 2 db 0 ; coord events diff --git a/maps/Route43Gate.asm b/maps/Route43Gate.asm index 31d215fd4..a9c1affe5 100644 --- a/maps/Route43Gate.asm +++ b/maps/Route43Gate.asm @@ -249,10 +249,10 @@ Route43Gate_MapEvents: db 0, 0 ; filler db 4 ; warp events - warp_event 4, 0, 4, ROUTE_43 - warp_event 5, 0, 5, ROUTE_43 - warp_event 4, 7, 3, ROUTE_43 - warp_event 5, 7, 3, ROUTE_43 + warp_event 4, 0, ROUTE_43, 4 + warp_event 5, 0, ROUTE_43, 5 + warp_event 4, 7, ROUTE_43, 3 + warp_event 5, 7, ROUTE_43, 3 db 0 ; coord events diff --git a/maps/Route43MahoganyGate.asm b/maps/Route43MahoganyGate.asm index c2641abcd..c5fbca190 100644 --- a/maps/Route43MahoganyGate.asm +++ b/maps/Route43MahoganyGate.asm @@ -40,10 +40,10 @@ Route43MahoganyGate_MapEvents: db 0, 0 ; filler db 4 ; warp events - warp_event 4, 0, 1, ROUTE_43 - warp_event 5, 0, 2, ROUTE_43 - warp_event 4, 7, 5, MAHOGANY_TOWN - warp_event 5, 7, 5, MAHOGANY_TOWN + warp_event 4, 0, ROUTE_43, 1 + warp_event 5, 0, ROUTE_43, 2 + warp_event 4, 7, MAHOGANY_TOWN, 5 + warp_event 5, 7, MAHOGANY_TOWN, 5 db 0 ; coord events diff --git a/maps/Route44.asm b/maps/Route44.asm index 5cb2f9e9e..aad425161 100644 --- a/maps/Route44.asm +++ b/maps/Route44.asm @@ -508,7 +508,7 @@ Route44_MapEvents: db 0, 0 ; filler db 1 ; warp events - warp_event 56, 7, 1, ICE_PATH_1F + warp_event 56, 7, ICE_PATH_1F, 1 db 0 ; coord events diff --git a/maps/Route45.asm b/maps/Route45.asm index 721e3cb4c..ddfaddd26 100644 --- a/maps/Route45.asm +++ b/maps/Route45.asm @@ -533,7 +533,7 @@ Route45_MapEvents: db 0, 0 ; filler db 1 ; warp events - warp_event 2, 5, 1, DARK_CAVE_BLACKTHORN_ENTRANCE + warp_event 2, 5, DARK_CAVE_BLACKTHORN_ENTRANCE, 1 db 0 ; coord events diff --git a/maps/Route46.asm b/maps/Route46.asm index 86b7b7396..497c2654f 100644 --- a/maps/Route46.asm +++ b/maps/Route46.asm @@ -252,9 +252,9 @@ Route46_MapEvents: db 0, 0 ; filler db 3 ; warp events - warp_event 7, 33, 1, ROUTE_29_ROUTE_46_GATE - warp_event 8, 33, 2, ROUTE_29_ROUTE_46_GATE - warp_event 14, 5, 3, DARK_CAVE_VIOLET_ENTRANCE + warp_event 7, 33, ROUTE_29_ROUTE_46_GATE, 1 + warp_event 8, 33, ROUTE_29_ROUTE_46_GATE, 2 + warp_event 14, 5, DARK_CAVE_VIOLET_ENTRANCE, 3 db 0 ; coord events diff --git a/maps/Route5.asm b/maps/Route5.asm index f1d7f0ef4..fcb1d9988 100644 --- a/maps/Route5.asm +++ b/maps/Route5.asm @@ -41,10 +41,10 @@ Route5_MapEvents: db 0, 0 ; filler db 4 ; warp events - warp_event 17, 15, 1, ROUTE_5_UNDERGROUND_PATH_ENTRANCE - warp_event 8, 17, 1, ROUTE_5_SAFFRON_GATE - warp_event 9, 17, 2, ROUTE_5_SAFFRON_GATE - warp_event 10, 11, 1, ROUTE_5_CLEANSE_TAG_HOUSE + warp_event 17, 15, ROUTE_5_UNDERGROUND_PATH_ENTRANCE, 1 + warp_event 8, 17, ROUTE_5_SAFFRON_GATE, 1 + warp_event 9, 17, ROUTE_5_SAFFRON_GATE, 2 + warp_event 10, 11, ROUTE_5_CLEANSE_TAG_HOUSE, 1 db 0 ; coord events diff --git a/maps/Route5CleanseTagHouse.asm b/maps/Route5CleanseTagHouse.asm index 2e268d68d..a99de824f 100644 --- a/maps/Route5CleanseTagHouse.asm +++ b/maps/Route5CleanseTagHouse.asm @@ -62,8 +62,8 @@ Route5CleanseTagHouse_MapEvents: db 0, 0 ; filler db 2 ; warp events - warp_event 2, 7, 4, ROUTE_5 - warp_event 3, 7, 4, ROUTE_5 + warp_event 2, 7, ROUTE_5, 4 + warp_event 3, 7, ROUTE_5, 4 db 0 ; coord events diff --git a/maps/Route5SaffronGate.asm b/maps/Route5SaffronGate.asm index 8ab29c1e5..f6f5139db 100644 --- a/maps/Route5SaffronGate.asm +++ b/maps/Route5SaffronGate.asm @@ -22,10 +22,10 @@ Route5SaffronGate_MapEvents: db 0, 0 ; filler db 4 ; warp events - warp_event 4, 0, 2, ROUTE_5 - warp_event 5, 0, 3, ROUTE_5 - warp_event 4, 7, 9, SAFFRON_CITY - warp_event 5, 7, 9, SAFFRON_CITY + warp_event 4, 0, ROUTE_5, 2 + warp_event 5, 0, ROUTE_5, 3 + warp_event 4, 7, SAFFRON_CITY, 9 + warp_event 5, 7, SAFFRON_CITY, 9 db 0 ; coord events diff --git a/maps/Route5UndergroundPathEntrance.asm b/maps/Route5UndergroundPathEntrance.asm index 5ffbee7d0..15d7e9f03 100644 --- a/maps/Route5UndergroundPathEntrance.asm +++ b/maps/Route5UndergroundPathEntrance.asm @@ -21,9 +21,9 @@ Route5UndergroundPathEntrance_MapEvents: db 0, 0 ; filler db 3 ; warp events - warp_event 3, 7, 1, ROUTE_5 - warp_event 4, 7, 1, ROUTE_5 - warp_event 4, 3, 1, UNDERGROUND_PATH + warp_event 3, 7, ROUTE_5, 1 + warp_event 4, 7, ROUTE_5, 1 + warp_event 4, 3, UNDERGROUND_PATH, 1 db 0 ; coord events diff --git a/maps/Route6.asm b/maps/Route6.asm index 5a42ddc0c..8ba5fc6ef 100644 --- a/maps/Route6.asm +++ b/maps/Route6.asm @@ -93,8 +93,8 @@ Route6_MapEvents: db 0, 0 ; filler db 2 ; warp events - warp_event 17, 3, 1, ROUTE_6_UNDERGROUND_PATH_ENTRANCE - warp_event 6, 1, 3, ROUTE_6_SAFFRON_GATE + warp_event 17, 3, ROUTE_6_UNDERGROUND_PATH_ENTRANCE, 1 + warp_event 6, 1, ROUTE_6_SAFFRON_GATE, 3 db 0 ; coord events diff --git a/maps/Route6SaffronGate.asm b/maps/Route6SaffronGate.asm index fb278c277..85f289df0 100644 --- a/maps/Route6SaffronGate.asm +++ b/maps/Route6SaffronGate.asm @@ -59,10 +59,10 @@ Route6SaffronGate_MapEvents: db 0, 0 ; filler db 4 ; warp events - warp_event 4, 0, 12, SAFFRON_CITY - warp_event 5, 0, 13, SAFFRON_CITY - warp_event 4, 7, 2, ROUTE_6 - warp_event 5, 7, 2, ROUTE_6 + warp_event 4, 0, SAFFRON_CITY, 12 + warp_event 5, 0, SAFFRON_CITY, 13 + warp_event 4, 7, ROUTE_6, 2 + warp_event 5, 7, ROUTE_6, 2 db 0 ; coord events diff --git a/maps/Route6UndergroundPathEntrance.asm b/maps/Route6UndergroundPathEntrance.asm index a17861c2b..0f3a2a3ee 100644 --- a/maps/Route6UndergroundPathEntrance.asm +++ b/maps/Route6UndergroundPathEntrance.asm @@ -7,9 +7,9 @@ Route6UndergroundPathEntrance_MapEvents: db 0, 0 ; filler db 3 ; warp events - warp_event 3, 7, 1, ROUTE_6 - warp_event 4, 7, 1, ROUTE_6 - warp_event 4, 3, 2, UNDERGROUND_PATH + warp_event 3, 7, ROUTE_6, 1 + warp_event 4, 7, ROUTE_6, 1 + warp_event 4, 3, UNDERGROUND_PATH, 2 db 0 ; coord events diff --git a/maps/Route7.asm b/maps/Route7.asm index cea61fd24..70849c693 100644 --- a/maps/Route7.asm +++ b/maps/Route7.asm @@ -36,8 +36,8 @@ Route7_MapEvents: db 0, 0 ; filler db 2 ; warp events - warp_event 15, 6, 1, ROUTE_7_SAFFRON_GATE - warp_event 15, 7, 2, ROUTE_7_SAFFRON_GATE + warp_event 15, 6, ROUTE_7_SAFFRON_GATE, 1 + warp_event 15, 7, ROUTE_7_SAFFRON_GATE, 2 db 0 ; coord events diff --git a/maps/Route7SaffronGate.asm b/maps/Route7SaffronGate.asm index 566b58123..8b392b591 100644 --- a/maps/Route7SaffronGate.asm +++ b/maps/Route7SaffronGate.asm @@ -47,10 +47,10 @@ Route7SaffronGate_MapEvents: db 0, 0 ; filler db 4 ; warp events - warp_event 0, 4, 1, ROUTE_7 - warp_event 0, 5, 2, ROUTE_7 - warp_event 9, 4, 10, SAFFRON_CITY - warp_event 9, 5, 11, SAFFRON_CITY + warp_event 0, 4, ROUTE_7, 1 + warp_event 0, 5, ROUTE_7, 2 + warp_event 9, 4, SAFFRON_CITY, 10 + warp_event 9, 5, SAFFRON_CITY, 11 db 0 ; coord events diff --git a/maps/Route8.asm b/maps/Route8.asm index a70558e44..809ef1a5c 100644 --- a/maps/Route8.asm +++ b/maps/Route8.asm @@ -174,8 +174,8 @@ Route8_MapEvents: db 0, 0 ; filler db 2 ; warp events - warp_event 4, 4, 3, ROUTE_8_SAFFRON_GATE - warp_event 4, 5, 4, ROUTE_8_SAFFRON_GATE + warp_event 4, 4, ROUTE_8_SAFFRON_GATE, 3 + warp_event 4, 5, ROUTE_8_SAFFRON_GATE, 4 db 0 ; coord events diff --git a/maps/Route8SaffronGate.asm b/maps/Route8SaffronGate.asm index 51c9d8958..9290eefd7 100644 --- a/maps/Route8SaffronGate.asm +++ b/maps/Route8SaffronGate.asm @@ -21,10 +21,10 @@ Route8SaffronGate_MapEvents: db 0, 0 ; filler db 4 ; warp events - warp_event 0, 4, 14, SAFFRON_CITY - warp_event 0, 5, 15, SAFFRON_CITY - warp_event 9, 4, 1, ROUTE_8 - warp_event 9, 5, 2, ROUTE_8 + warp_event 0, 4, SAFFRON_CITY, 14 + warp_event 0, 5, SAFFRON_CITY, 15 + warp_event 9, 4, ROUTE_8, 1 + warp_event 9, 5, ROUTE_8, 2 db 0 ; coord events diff --git a/maps/Route9.asm b/maps/Route9.asm index 984f08413..45c0e6299 100644 --- a/maps/Route9.asm +++ b/maps/Route9.asm @@ -207,7 +207,7 @@ Route9_MapEvents: db 0, 0 ; filler db 1 ; warp events - warp_event 48, 15, 1, ROCK_TUNNEL_1F + warp_event 48, 15, ROCK_TUNNEL_1F, 1 db 0 ; coord events diff --git a/maps/RuinsOfAlphAerodactylChamber.asm b/maps/RuinsOfAlphAerodactylChamber.asm index 39528ad80..bc167d872 100644 --- a/maps/RuinsOfAlphAerodactylChamber.asm +++ b/maps/RuinsOfAlphAerodactylChamber.asm @@ -145,11 +145,11 @@ RuinsOfAlphAerodactylChamber_MapEvents: db 0, 0 ; filler db 5 ; warp events - warp_event 3, 9, 4, RUINS_OF_ALPH_OUTSIDE - warp_event 4, 9, 4, RUINS_OF_ALPH_OUTSIDE - warp_event 3, 3, 8, RUINS_OF_ALPH_INNER_CHAMBER - warp_event 4, 3, 9, RUINS_OF_ALPH_INNER_CHAMBER - warp_event 4, 0, 1, RUINS_OF_ALPH_AERODACTYL_ITEM_ROOM + warp_event 3, 9, RUINS_OF_ALPH_OUTSIDE, 4 + warp_event 4, 9, RUINS_OF_ALPH_OUTSIDE, 4 + warp_event 3, 3, RUINS_OF_ALPH_INNER_CHAMBER, 8 + warp_event 4, 3, RUINS_OF_ALPH_INNER_CHAMBER, 9 + warp_event 4, 0, RUINS_OF_ALPH_AERODACTYL_ITEM_ROOM, 1 db 0 ; coord events diff --git a/maps/RuinsOfAlphAerodactylItemRoom.asm b/maps/RuinsOfAlphAerodactylItemRoom.asm index 732ac2a16..ce455fab6 100644 --- a/maps/RuinsOfAlphAerodactylItemRoom.asm +++ b/maps/RuinsOfAlphAerodactylItemRoom.asm @@ -34,10 +34,10 @@ RuinsOfAlphAerodactylItemRoom_MapEvents: db 0, 0 ; filler db 4 ; warp events - warp_event 3, 9, 5, RUINS_OF_ALPH_AERODACTYL_CHAMBER - warp_event 4, 9, 5, RUINS_OF_ALPH_AERODACTYL_CHAMBER - warp_event 3, 1, 1, RUINS_OF_ALPH_AERODACTYL_WORD_ROOM - warp_event 4, 1, 2, RUINS_OF_ALPH_AERODACTYL_WORD_ROOM + warp_event 3, 9, RUINS_OF_ALPH_AERODACTYL_CHAMBER, 5 + warp_event 4, 9, RUINS_OF_ALPH_AERODACTYL_CHAMBER, 5 + warp_event 3, 1, RUINS_OF_ALPH_AERODACTYL_WORD_ROOM, 1 + warp_event 4, 1, RUINS_OF_ALPH_AERODACTYL_WORD_ROOM, 2 db 0 ; coord events diff --git a/maps/RuinsOfAlphAerodactylWordRoom.asm b/maps/RuinsOfAlphAerodactylWordRoom.asm index 2da613f1c..65228a709 100644 --- a/maps/RuinsOfAlphAerodactylWordRoom.asm +++ b/maps/RuinsOfAlphAerodactylWordRoom.asm @@ -7,9 +7,9 @@ RuinsOfAlphAerodactylWordRoom_MapEvents: db 0, 0 ; filler db 3 ; warp events - warp_event 9, 5, 3, RUINS_OF_ALPH_AERODACTYL_ITEM_ROOM - warp_event 10, 5, 4, RUINS_OF_ALPH_AERODACTYL_ITEM_ROOM - warp_event 17, 11, 8, RUINS_OF_ALPH_INNER_CHAMBER + warp_event 9, 5, RUINS_OF_ALPH_AERODACTYL_ITEM_ROOM, 3 + warp_event 10, 5, RUINS_OF_ALPH_AERODACTYL_ITEM_ROOM, 4 + warp_event 17, 11, RUINS_OF_ALPH_INNER_CHAMBER, 8 db 0 ; coord events diff --git a/maps/RuinsOfAlphHoOhChamber.asm b/maps/RuinsOfAlphHoOhChamber.asm index 9fccc0089..99339f985 100644 --- a/maps/RuinsOfAlphHoOhChamber.asm +++ b/maps/RuinsOfAlphHoOhChamber.asm @@ -146,11 +146,11 @@ RuinsOfAlphHoOhChamber_MapEvents: db 0, 0 ; filler db 5 ; warp events - warp_event 3, 9, 1, RUINS_OF_ALPH_OUTSIDE - warp_event 4, 9, 1, RUINS_OF_ALPH_OUTSIDE - warp_event 3, 3, 2, RUINS_OF_ALPH_INNER_CHAMBER - warp_event 4, 3, 3, RUINS_OF_ALPH_INNER_CHAMBER - warp_event 4, 0, 1, RUINS_OF_ALPH_HO_OH_ITEM_ROOM + warp_event 3, 9, RUINS_OF_ALPH_OUTSIDE, 1 + warp_event 4, 9, RUINS_OF_ALPH_OUTSIDE, 1 + warp_event 3, 3, RUINS_OF_ALPH_INNER_CHAMBER, 2 + warp_event 4, 3, RUINS_OF_ALPH_INNER_CHAMBER, 3 + warp_event 4, 0, RUINS_OF_ALPH_HO_OH_ITEM_ROOM, 1 db 0 ; coord events diff --git a/maps/RuinsOfAlphHoOhItemRoom.asm b/maps/RuinsOfAlphHoOhItemRoom.asm index 4536e09b6..29a7183ab 100644 --- a/maps/RuinsOfAlphHoOhItemRoom.asm +++ b/maps/RuinsOfAlphHoOhItemRoom.asm @@ -34,10 +34,10 @@ RuinsOfAlphHoOhItemRoom_MapEvents: db 0, 0 ; filler db 4 ; warp events - warp_event 3, 9, 5, RUINS_OF_ALPH_HO_OH_CHAMBER - warp_event 4, 9, 5, RUINS_OF_ALPH_HO_OH_CHAMBER - warp_event 3, 1, 1, RUINS_OF_ALPH_HO_OH_WORD_ROOM - warp_event 4, 1, 2, RUINS_OF_ALPH_HO_OH_WORD_ROOM + warp_event 3, 9, RUINS_OF_ALPH_HO_OH_CHAMBER, 5 + warp_event 4, 9, RUINS_OF_ALPH_HO_OH_CHAMBER, 5 + warp_event 3, 1, RUINS_OF_ALPH_HO_OH_WORD_ROOM, 1 + warp_event 4, 1, RUINS_OF_ALPH_HO_OH_WORD_ROOM, 2 db 0 ; coord events diff --git a/maps/RuinsOfAlphHoOhWordRoom.asm b/maps/RuinsOfAlphHoOhWordRoom.asm index 8f66f2f7b..40c282351 100644 --- a/maps/RuinsOfAlphHoOhWordRoom.asm +++ b/maps/RuinsOfAlphHoOhWordRoom.asm @@ -7,9 +7,9 @@ RuinsOfAlphHoOhWordRoom_MapEvents: db 0, 0 ; filler db 3 ; warp events - warp_event 9, 9, 3, RUINS_OF_ALPH_HO_OH_ITEM_ROOM - warp_event 10, 9, 4, RUINS_OF_ALPH_HO_OH_ITEM_ROOM - warp_event 17, 21, 2, RUINS_OF_ALPH_INNER_CHAMBER + warp_event 9, 9, RUINS_OF_ALPH_HO_OH_ITEM_ROOM, 3 + warp_event 10, 9, RUINS_OF_ALPH_HO_OH_ITEM_ROOM, 4 + warp_event 17, 21, RUINS_OF_ALPH_INNER_CHAMBER, 2 db 0 ; coord events diff --git a/maps/RuinsOfAlphInnerChamber.asm b/maps/RuinsOfAlphInnerChamber.asm index b91f95f69..352dcf8dc 100644 --- a/maps/RuinsOfAlphInnerChamber.asm +++ b/maps/RuinsOfAlphInnerChamber.asm @@ -78,15 +78,15 @@ RuinsOfAlphInnerChamber_MapEvents: db 0, 0 ; filler db 9 ; warp events - warp_event 10, 13, 5, RUINS_OF_ALPH_OUTSIDE - warp_event 3, 15, 3, RUINS_OF_ALPH_HO_OH_CHAMBER - warp_event 4, 15, 4, RUINS_OF_ALPH_HO_OH_CHAMBER - warp_event 15, 3, 3, RUINS_OF_ALPH_KABUTO_CHAMBER - warp_event 16, 3, 4, RUINS_OF_ALPH_KABUTO_CHAMBER - warp_event 3, 21, 3, RUINS_OF_ALPH_OMANYTE_CHAMBER - warp_event 4, 21, 4, RUINS_OF_ALPH_OMANYTE_CHAMBER - warp_event 15, 24, 3, RUINS_OF_ALPH_AERODACTYL_CHAMBER - warp_event 16, 24, 4, RUINS_OF_ALPH_AERODACTYL_CHAMBER + warp_event 10, 13, RUINS_OF_ALPH_OUTSIDE, 5 + warp_event 3, 15, RUINS_OF_ALPH_HO_OH_CHAMBER, 3 + warp_event 4, 15, RUINS_OF_ALPH_HO_OH_CHAMBER, 4 + warp_event 15, 3, RUINS_OF_ALPH_KABUTO_CHAMBER, 3 + warp_event 16, 3, RUINS_OF_ALPH_KABUTO_CHAMBER, 4 + warp_event 3, 21, RUINS_OF_ALPH_OMANYTE_CHAMBER, 3 + warp_event 4, 21, RUINS_OF_ALPH_OMANYTE_CHAMBER, 4 + warp_event 15, 24, RUINS_OF_ALPH_AERODACTYL_CHAMBER, 3 + warp_event 16, 24, RUINS_OF_ALPH_AERODACTYL_CHAMBER, 4 db 0 ; coord events diff --git a/maps/RuinsOfAlphKabutoChamber.asm b/maps/RuinsOfAlphKabutoChamber.asm index 1a0c2f799..1b01adee1 100644 --- a/maps/RuinsOfAlphKabutoChamber.asm +++ b/maps/RuinsOfAlphKabutoChamber.asm @@ -257,11 +257,11 @@ RuinsOfAlphKabutoChamber_MapEvents: db 0, 0 ; filler db 5 ; warp events - warp_event 3, 9, 2, RUINS_OF_ALPH_OUTSIDE - warp_event 4, 9, 2, RUINS_OF_ALPH_OUTSIDE - warp_event 3, 3, 4, RUINS_OF_ALPH_INNER_CHAMBER - warp_event 4, 3, 5, RUINS_OF_ALPH_INNER_CHAMBER - warp_event 4, 0, 1, RUINS_OF_ALPH_KABUTO_ITEM_ROOM + warp_event 3, 9, RUINS_OF_ALPH_OUTSIDE, 2 + warp_event 4, 9, RUINS_OF_ALPH_OUTSIDE, 2 + warp_event 3, 3, RUINS_OF_ALPH_INNER_CHAMBER, 4 + warp_event 4, 3, RUINS_OF_ALPH_INNER_CHAMBER, 5 + warp_event 4, 0, RUINS_OF_ALPH_KABUTO_ITEM_ROOM, 1 db 0 ; coord events diff --git a/maps/RuinsOfAlphKabutoItemRoom.asm b/maps/RuinsOfAlphKabutoItemRoom.asm index 5239b562e..ac9753ca4 100644 --- a/maps/RuinsOfAlphKabutoItemRoom.asm +++ b/maps/RuinsOfAlphKabutoItemRoom.asm @@ -34,10 +34,10 @@ RuinsOfAlphKabutoItemRoom_MapEvents: db 0, 0 ; filler db 4 ; warp events - warp_event 3, 9, 5, RUINS_OF_ALPH_KABUTO_CHAMBER - warp_event 4, 9, 5, RUINS_OF_ALPH_KABUTO_CHAMBER - warp_event 3, 1, 1, RUINS_OF_ALPH_KABUTO_WORD_ROOM - warp_event 4, 1, 2, RUINS_OF_ALPH_KABUTO_WORD_ROOM + warp_event 3, 9, RUINS_OF_ALPH_KABUTO_CHAMBER, 5 + warp_event 4, 9, RUINS_OF_ALPH_KABUTO_CHAMBER, 5 + warp_event 3, 1, RUINS_OF_ALPH_KABUTO_WORD_ROOM, 1 + warp_event 4, 1, RUINS_OF_ALPH_KABUTO_WORD_ROOM, 2 db 0 ; coord events diff --git a/maps/RuinsOfAlphKabutoWordRoom.asm b/maps/RuinsOfAlphKabutoWordRoom.asm index 79f8c98b6..9820104eb 100644 --- a/maps/RuinsOfAlphKabutoWordRoom.asm +++ b/maps/RuinsOfAlphKabutoWordRoom.asm @@ -7,9 +7,9 @@ RuinsOfAlphKabutoWordRoom_MapEvents: db 0, 0 ; filler db 3 ; warp events - warp_event 9, 5, 3, RUINS_OF_ALPH_KABUTO_ITEM_ROOM - warp_event 10, 5, 4, RUINS_OF_ALPH_KABUTO_ITEM_ROOM - warp_event 17, 11, 4, RUINS_OF_ALPH_INNER_CHAMBER + warp_event 9, 5, RUINS_OF_ALPH_KABUTO_ITEM_ROOM, 3 + warp_event 10, 5, RUINS_OF_ALPH_KABUTO_ITEM_ROOM, 4 + warp_event 17, 11, RUINS_OF_ALPH_INNER_CHAMBER, 4 db 0 ; coord events diff --git a/maps/RuinsOfAlphOmanyteChamber.asm b/maps/RuinsOfAlphOmanyteChamber.asm index 52eb813e5..f4074ed72 100644 --- a/maps/RuinsOfAlphOmanyteChamber.asm +++ b/maps/RuinsOfAlphOmanyteChamber.asm @@ -146,11 +146,11 @@ RuinsOfAlphOmanyteChamber_MapEvents: db 0, 0 ; filler db 5 ; warp events - warp_event 3, 9, 3, RUINS_OF_ALPH_OUTSIDE - warp_event 4, 9, 3, RUINS_OF_ALPH_OUTSIDE - warp_event 3, 3, 6, RUINS_OF_ALPH_INNER_CHAMBER - warp_event 4, 3, 7, RUINS_OF_ALPH_INNER_CHAMBER - warp_event 4, 0, 1, RUINS_OF_ALPH_OMANYTE_ITEM_ROOM + warp_event 3, 9, RUINS_OF_ALPH_OUTSIDE, 3 + warp_event 4, 9, RUINS_OF_ALPH_OUTSIDE, 3 + warp_event 3, 3, RUINS_OF_ALPH_INNER_CHAMBER, 6 + warp_event 4, 3, RUINS_OF_ALPH_INNER_CHAMBER, 7 + warp_event 4, 0, RUINS_OF_ALPH_OMANYTE_ITEM_ROOM, 1 db 0 ; coord events diff --git a/maps/RuinsOfAlphOmanyteItemRoom.asm b/maps/RuinsOfAlphOmanyteItemRoom.asm index a9a0acde5..1a8dcce72 100644 --- a/maps/RuinsOfAlphOmanyteItemRoom.asm +++ b/maps/RuinsOfAlphOmanyteItemRoom.asm @@ -34,10 +34,10 @@ RuinsOfAlphOmanyteItemRoom_MapEvents: db 0, 0 ; filler db 4 ; warp events - warp_event 3, 9, 5, RUINS_OF_ALPH_OMANYTE_CHAMBER - warp_event 4, 9, 5, RUINS_OF_ALPH_OMANYTE_CHAMBER - warp_event 3, 1, 1, RUINS_OF_ALPH_OMANYTE_WORD_ROOM - warp_event 4, 1, 2, RUINS_OF_ALPH_OMANYTE_WORD_ROOM + warp_event 3, 9, RUINS_OF_ALPH_OMANYTE_CHAMBER, 5 + warp_event 4, 9, RUINS_OF_ALPH_OMANYTE_CHAMBER, 5 + warp_event 3, 1, RUINS_OF_ALPH_OMANYTE_WORD_ROOM, 1 + warp_event 4, 1, RUINS_OF_ALPH_OMANYTE_WORD_ROOM, 2 db 0 ; coord events diff --git a/maps/RuinsOfAlphOmanyteWordRoom.asm b/maps/RuinsOfAlphOmanyteWordRoom.asm index c0bc8c777..5c78330bb 100644 --- a/maps/RuinsOfAlphOmanyteWordRoom.asm +++ b/maps/RuinsOfAlphOmanyteWordRoom.asm @@ -7,9 +7,9 @@ RuinsOfAlphOmanyteWordRoom_MapEvents: db 0, 0 ; filler db 3 ; warp events - warp_event 9, 7, 3, RUINS_OF_ALPH_OMANYTE_ITEM_ROOM - warp_event 10, 7, 4, RUINS_OF_ALPH_OMANYTE_ITEM_ROOM - warp_event 17, 13, 6, RUINS_OF_ALPH_INNER_CHAMBER + warp_event 9, 7, RUINS_OF_ALPH_OMANYTE_ITEM_ROOM, 3 + warp_event 10, 7, RUINS_OF_ALPH_OMANYTE_ITEM_ROOM, 4 + warp_event 17, 13, RUINS_OF_ALPH_INNER_CHAMBER, 6 db 0 ; coord events diff --git a/maps/RuinsOfAlphOutside.asm b/maps/RuinsOfAlphOutside.asm index 12fb23a57..646be0d1c 100644 --- a/maps/RuinsOfAlphOutside.asm +++ b/maps/RuinsOfAlphOutside.asm @@ -282,17 +282,17 @@ RuinsOfAlphOutside_MapEvents: db 0, 0 ; filler db 11 ; warp events - warp_event 2, 17, 1, RUINS_OF_ALPH_HO_OH_CHAMBER - warp_event 14, 7, 1, RUINS_OF_ALPH_KABUTO_CHAMBER - warp_event 2, 29, 1, RUINS_OF_ALPH_OMANYTE_CHAMBER - warp_event 16, 33, 1, RUINS_OF_ALPH_AERODACTYL_CHAMBER - warp_event 10, 13, 1, RUINS_OF_ALPH_INNER_CHAMBER - warp_event 17, 11, 1, RUINS_OF_ALPH_RESEARCH_CENTER - warp_event 6, 19, 1, UNION_CAVE_B1F - warp_event 6, 27, 2, UNION_CAVE_B1F - warp_event 7, 5, 3, ROUTE_36_RUINS_OF_ALPH_GATE - warp_event 13, 20, 1, ROUTE_32_RUINS_OF_ALPH_GATE - warp_event 13, 21, 2, ROUTE_32_RUINS_OF_ALPH_GATE + warp_event 2, 17, RUINS_OF_ALPH_HO_OH_CHAMBER, 1 + warp_event 14, 7, RUINS_OF_ALPH_KABUTO_CHAMBER, 1 + warp_event 2, 29, RUINS_OF_ALPH_OMANYTE_CHAMBER, 1 + warp_event 16, 33, RUINS_OF_ALPH_AERODACTYL_CHAMBER, 1 + warp_event 10, 13, RUINS_OF_ALPH_INNER_CHAMBER, 1 + warp_event 17, 11, RUINS_OF_ALPH_RESEARCH_CENTER, 1 + warp_event 6, 19, UNION_CAVE_B1F, 1 + warp_event 6, 27, UNION_CAVE_B1F, 2 + warp_event 7, 5, ROUTE_36_RUINS_OF_ALPH_GATE, 3 + warp_event 13, 20, ROUTE_32_RUINS_OF_ALPH_GATE, 1 + warp_event 13, 21, ROUTE_32_RUINS_OF_ALPH_GATE, 2 db 2 ; coord events coord_event 11, 14, SCENE_RUINSOFALPHOUTSIDE_GET_UNOWN_DEX, RuinsOfAlphOutsideScientistScene1 diff --git a/maps/RuinsOfAlphResearchCenter.asm b/maps/RuinsOfAlphResearchCenter.asm index b9d722275..d8113b972 100644 --- a/maps/RuinsOfAlphResearchCenter.asm +++ b/maps/RuinsOfAlphResearchCenter.asm @@ -394,8 +394,8 @@ RuinsOfAlphResearchCenter_MapEvents: db 0, 0 ; filler db 2 ; warp events - warp_event 2, 7, 6, RUINS_OF_ALPH_OUTSIDE - warp_event 3, 7, 6, RUINS_OF_ALPH_OUTSIDE + warp_event 2, 7, RUINS_OF_ALPH_OUTSIDE, 6 + warp_event 3, 7, RUINS_OF_ALPH_OUTSIDE, 6 db 0 ; coord events diff --git a/maps/SafariZoneBeta.asm b/maps/SafariZoneBeta.asm index 93c28b0e0..f0fbba12d 100644 --- a/maps/SafariZoneBeta.asm +++ b/maps/SafariZoneBeta.asm @@ -7,8 +7,8 @@ SafariZoneBeta_MapEvents: db 0, 0 ; filler db 2 ; warp events - warp_event 9, 23, 1, SAFARI_ZONE_FUCHSIA_GATE_BETA - warp_event 10, 23, 2, SAFARI_ZONE_FUCHSIA_GATE_BETA + warp_event 9, 23, SAFARI_ZONE_FUCHSIA_GATE_BETA, 1 + warp_event 10, 23, SAFARI_ZONE_FUCHSIA_GATE_BETA, 2 db 0 ; coord events diff --git a/maps/SafariZoneFuchsiaGateBeta.asm b/maps/SafariZoneFuchsiaGateBeta.asm index f0d39e723..f18421f40 100644 --- a/maps/SafariZoneFuchsiaGateBeta.asm +++ b/maps/SafariZoneFuchsiaGateBeta.asm @@ -7,10 +7,10 @@ SafariZoneFuchsiaGateBeta_MapEvents: db 0, 0 ; filler db 4 ; warp events - warp_event 4, 0, 1, SAFARI_ZONE_BETA - warp_event 5, 0, 2, SAFARI_ZONE_BETA - warp_event 4, 7, 7, FUCHSIA_CITY - warp_event 5, 7, 7, FUCHSIA_CITY + warp_event 4, 0, SAFARI_ZONE_BETA, 1 + warp_event 5, 0, SAFARI_ZONE_BETA, 2 + warp_event 4, 7, FUCHSIA_CITY, 7 + warp_event 5, 7, FUCHSIA_CITY, 7 db 0 ; coord events diff --git a/maps/SafariZoneMainOffice.asm b/maps/SafariZoneMainOffice.asm index 0c2deae10..a44a0387e 100644 --- a/maps/SafariZoneMainOffice.asm +++ b/maps/SafariZoneMainOffice.asm @@ -7,8 +7,8 @@ SafariZoneMainOffice_MapEvents: db 0, 0 ; filler db 2 ; warp events - warp_event 2, 7, 2, FUCHSIA_CITY - warp_event 3, 7, 2, FUCHSIA_CITY + warp_event 2, 7, FUCHSIA_CITY, 2 + warp_event 3, 7, FUCHSIA_CITY, 2 db 0 ; coord events diff --git a/maps/SafariZoneWardensHome.asm b/maps/SafariZoneWardensHome.asm index c0c75f227..afa22d55d 100644 --- a/maps/SafariZoneWardensHome.asm +++ b/maps/SafariZoneWardensHome.asm @@ -78,8 +78,8 @@ SafariZoneWardensHome_MapEvents: db 0, 0 ; filler db 2 ; warp events - warp_event 2, 7, 6, FUCHSIA_CITY - warp_event 3, 7, 6, FUCHSIA_CITY + warp_event 2, 7, FUCHSIA_CITY, 6 + warp_event 3, 7, FUCHSIA_CITY, 6 db 0 ; coord events diff --git a/maps/SaffronCity.asm b/maps/SaffronCity.asm index 06c7119d7..752dc6d1e 100644 --- a/maps/SaffronCity.asm +++ b/maps/SaffronCity.asm @@ -267,21 +267,21 @@ SaffronCity_MapEvents: db 0, 0 ; filler db 15 ; warp events - warp_event 26, 3, 1, FIGHTING_DOJO - warp_event 34, 3, 1, SAFFRON_GYM - warp_event 25, 11, 2, SAFFRON_MART - warp_event 9, 29, 1, SAFFRON_POKECENTER_1F - warp_event 27, 29, 1, MR_PSYCHICS_HOUSE - warp_event 8, 3, 2, SAFFRON_MAGNET_TRAIN_STATION - warp_event 18, 21, 1, SILPH_CO_1F - warp_event 9, 11, 1, COPYCATS_HOUSE_1F - warp_event 18, 3, 3, ROUTE_5_SAFFRON_GATE - warp_event 0, 24, 3, ROUTE_7_SAFFRON_GATE - warp_event 0, 25, 4, ROUTE_7_SAFFRON_GATE - warp_event 16, 33, 1, ROUTE_6_SAFFRON_GATE - warp_event 17, 33, 2, ROUTE_6_SAFFRON_GATE - warp_event 39, 22, 1, ROUTE_8_SAFFRON_GATE - warp_event 39, 23, 2, ROUTE_8_SAFFRON_GATE + warp_event 26, 3, FIGHTING_DOJO, 1 + warp_event 34, 3, SAFFRON_GYM, 1 + warp_event 25, 11, SAFFRON_MART, 2 + warp_event 9, 29, SAFFRON_POKECENTER_1F, 1 + warp_event 27, 29, MR_PSYCHICS_HOUSE, 1 + warp_event 8, 3, SAFFRON_MAGNET_TRAIN_STATION, 2 + warp_event 18, 21, SILPH_CO_1F, 1 + warp_event 9, 11, COPYCATS_HOUSE_1F, 1 + warp_event 18, 3, ROUTE_5_SAFFRON_GATE, 3 + warp_event 0, 24, ROUTE_7_SAFFRON_GATE, 3 + warp_event 0, 25, ROUTE_7_SAFFRON_GATE, 4 + warp_event 16, 33, ROUTE_6_SAFFRON_GATE, 1 + warp_event 17, 33, ROUTE_6_SAFFRON_GATE, 2 + warp_event 39, 22, ROUTE_8_SAFFRON_GATE, 1 + warp_event 39, 23, ROUTE_8_SAFFRON_GATE, 2 db 0 ; coord events diff --git a/maps/SaffronGym.asm b/maps/SaffronGym.asm index f6926ddc0..732a75168 100644 --- a/maps/SaffronGym.asm +++ b/maps/SaffronGym.asm @@ -292,38 +292,38 @@ SaffronGym_MapEvents: db 0, 0 ; filler db 32 ; warp events - warp_event 8, 17, 2, SAFFRON_CITY - warp_event 9, 17, 2, SAFFRON_CITY - warp_event 11, 15, 18, SAFFRON_GYM - warp_event 19, 15, 19, SAFFRON_GYM - warp_event 19, 11, 20, SAFFRON_GYM - warp_event 1, 11, 21, SAFFRON_GYM - warp_event 5, 3, 22, SAFFRON_GYM - warp_event 11, 5, 23, SAFFRON_GYM - warp_event 1, 15, 24, SAFFRON_GYM - warp_event 19, 3, 25, SAFFRON_GYM - warp_event 15, 17, 26, SAFFRON_GYM - warp_event 5, 17, 27, SAFFRON_GYM - warp_event 5, 9, 28, SAFFRON_GYM - warp_event 9, 3, 29, SAFFRON_GYM - warp_event 15, 9, 30, SAFFRON_GYM - warp_event 15, 5, 31, SAFFRON_GYM - warp_event 1, 5, 32, SAFFRON_GYM - warp_event 19, 17, 3, SAFFRON_GYM - warp_event 19, 9, 4, SAFFRON_GYM - warp_event 1, 9, 5, SAFFRON_GYM - warp_event 5, 5, 6, SAFFRON_GYM - warp_event 11, 3, 7, SAFFRON_GYM - warp_event 1, 17, 8, SAFFRON_GYM - warp_event 19, 5, 9, SAFFRON_GYM - warp_event 15, 15, 10, SAFFRON_GYM - warp_event 5, 15, 11, SAFFRON_GYM - warp_event 5, 11, 12, SAFFRON_GYM - warp_event 9, 5, 13, SAFFRON_GYM - warp_event 15, 11, 14, SAFFRON_GYM - warp_event 15, 3, 15, SAFFRON_GYM - warp_event 1, 3, 16, SAFFRON_GYM - warp_event 11, 9, 17, SAFFRON_GYM + warp_event 8, 17, SAFFRON_CITY, 2 + warp_event 9, 17, SAFFRON_CITY, 2 + warp_event 11, 15, SAFFRON_GYM, 18 + warp_event 19, 15, SAFFRON_GYM, 19 + warp_event 19, 11, SAFFRON_GYM, 20 + warp_event 1, 11, SAFFRON_GYM, 21 + warp_event 5, 3, SAFFRON_GYM, 22 + warp_event 11, 5, SAFFRON_GYM, 23 + warp_event 1, 15, SAFFRON_GYM, 24 + warp_event 19, 3, SAFFRON_GYM, 25 + warp_event 15, 17, SAFFRON_GYM, 26 + warp_event 5, 17, SAFFRON_GYM, 27 + warp_event 5, 9, SAFFRON_GYM, 28 + warp_event 9, 3, SAFFRON_GYM, 29 + warp_event 15, 9, SAFFRON_GYM, 30 + warp_event 15, 5, SAFFRON_GYM, 31 + warp_event 1, 5, SAFFRON_GYM, 32 + warp_event 19, 17, SAFFRON_GYM, 3 + warp_event 19, 9, SAFFRON_GYM, 4 + warp_event 1, 9, SAFFRON_GYM, 5 + warp_event 5, 5, SAFFRON_GYM, 6 + warp_event 11, 3, SAFFRON_GYM, 7 + warp_event 1, 17, SAFFRON_GYM, 8 + warp_event 19, 5, SAFFRON_GYM, 9 + warp_event 15, 15, SAFFRON_GYM, 10 + warp_event 5, 15, SAFFRON_GYM, 11 + warp_event 5, 11, SAFFRON_GYM, 12 + warp_event 9, 5, SAFFRON_GYM, 13 + warp_event 15, 11, SAFFRON_GYM, 14 + warp_event 15, 3, SAFFRON_GYM, 15 + warp_event 1, 3, SAFFRON_GYM, 16 + warp_event 11, 9, SAFFRON_GYM, 17 db 0 ; coord events diff --git a/maps/SaffronMagnetTrainStation.asm b/maps/SaffronMagnetTrainStation.asm index 4b90f69f2..0c57587d8 100644 --- a/maps/SaffronMagnetTrainStation.asm +++ b/maps/SaffronMagnetTrainStation.asm @@ -217,10 +217,10 @@ SaffronMagnetTrainStation_MapEvents: db 0, 0 ; filler db 4 ; warp events - warp_event 8, 17, 6, SAFFRON_CITY - warp_event 9, 17, 6, SAFFRON_CITY - warp_event 6, 5, 4, GOLDENROD_MAGNET_TRAIN_STATION - warp_event 11, 5, 3, GOLDENROD_MAGNET_TRAIN_STATION + warp_event 8, 17, SAFFRON_CITY, 6 + warp_event 9, 17, SAFFRON_CITY, 6 + warp_event 6, 5, GOLDENROD_MAGNET_TRAIN_STATION, 4 + warp_event 11, 5, GOLDENROD_MAGNET_TRAIN_STATION, 3 db 1 ; coord events coord_event 11, 6, SCENE_DEFAULT, Script_ArriveFromGoldenrod diff --git a/maps/SaffronMart.asm b/maps/SaffronMart.asm index 2d9708c49..3b701ee2f 100644 --- a/maps/SaffronMart.asm +++ b/maps/SaffronMart.asm @@ -39,8 +39,8 @@ SaffronMart_MapEvents: db 0, 0 ; filler db 2 ; warp events - warp_event 2, 7, 3, SAFFRON_CITY - warp_event 3, 7, 3, SAFFRON_CITY + warp_event 2, 7, SAFFRON_CITY, 3 + warp_event 3, 7, SAFFRON_CITY, 3 db 0 ; coord events diff --git a/maps/SaffronPokecenter1F.asm b/maps/SaffronPokecenter1F.asm index 9680de72f..943582370 100644 --- a/maps/SaffronPokecenter1F.asm +++ b/maps/SaffronPokecenter1F.asm @@ -113,9 +113,9 @@ SaffronPokecenter1F_MapEvents: db 0, 0 ; filler db 3 ; warp events - warp_event 3, 7, 4, SAFFRON_CITY - warp_event 4, 7, 4, SAFFRON_CITY - warp_event 0, 7, 1, POKECENTER_2F + warp_event 3, 7, SAFFRON_CITY, 4 + warp_event 4, 7, SAFFRON_CITY, 4 + warp_event 0, 7, POKECENTER_2F, 1 db 0 ; coord events diff --git a/maps/SaffronPokecenter2FBeta.asm b/maps/SaffronPokecenter2FBeta.asm index 11d07cc3f..9a5196196 100644 --- a/maps/SaffronPokecenter2FBeta.asm +++ b/maps/SaffronPokecenter2FBeta.asm @@ -7,7 +7,7 @@ SaffronPokecenter2FBeta_MapEvents: db 0, 0 ; filler db 1 ; warp events - warp_event 0, 7, 3, SAFFRON_POKECENTER_1F + warp_event 0, 7, SAFFRON_POKECENTER_1F, 3 db 0 ; coord events diff --git a/maps/SeafoamGym.asm b/maps/SeafoamGym.asm index 2870ea52a..be63733a0 100644 --- a/maps/SeafoamGym.asm +++ b/maps/SeafoamGym.asm @@ -159,7 +159,7 @@ SeafoamGym_MapEvents: db 0, 0 ; filler db 1 ; warp events - warp_event 5, 5, 1, ROUTE_20 + warp_event 5, 5, ROUTE_20, 1 db 0 ; coord events diff --git a/maps/SilphCo1F.asm b/maps/SilphCo1F.asm index a14659571..925fffb0f 100644 --- a/maps/SilphCo1F.asm +++ b/maps/SilphCo1F.asm @@ -57,8 +57,8 @@ SilphCo1F_MapEvents: db 0, 0 ; filler db 2 ; warp events - warp_event 2, 7, 7, SAFFRON_CITY - warp_event 3, 7, 7, SAFFRON_CITY + warp_event 2, 7, SAFFRON_CITY, 7 + warp_event 3, 7, SAFFRON_CITY, 7 db 0 ; coord events diff --git a/maps/SilverCaveItemRooms.asm b/maps/SilverCaveItemRooms.asm index 3aa1b2ab5..b9f0be206 100644 --- a/maps/SilverCaveItemRooms.asm +++ b/maps/SilverCaveItemRooms.asm @@ -17,8 +17,8 @@ SilverCaveItemRooms_MapEvents: db 0, 0 ; filler db 2 ; warp events - warp_event 13, 3, 3, SILVER_CAVE_ROOM_2 - warp_event 7, 15, 4, SILVER_CAVE_ROOM_2 + warp_event 13, 3, SILVER_CAVE_ROOM_2, 3 + warp_event 7, 15, SILVER_CAVE_ROOM_2, 4 db 0 ; coord events diff --git a/maps/SilverCaveOutside.asm b/maps/SilverCaveOutside.asm index 6f1487619..9dec24604 100644 --- a/maps/SilverCaveOutside.asm +++ b/maps/SilverCaveOutside.asm @@ -25,8 +25,8 @@ SilverCaveOutside_MapEvents: db 0, 0 ; filler db 2 ; warp events - warp_event 23, 19, 1, SILVER_CAVE_POKECENTER_1F - warp_event 18, 11, 1, SILVER_CAVE_ROOM_1 + warp_event 23, 19, SILVER_CAVE_POKECENTER_1F, 1 + warp_event 18, 11, SILVER_CAVE_ROOM_1, 1 db 0 ; coord events diff --git a/maps/SilverCavePokecenter1F.asm b/maps/SilverCavePokecenter1F.asm index 326e5bde2..94ac820ce 100644 --- a/maps/SilverCavePokecenter1F.asm +++ b/maps/SilverCavePokecenter1F.asm @@ -31,9 +31,9 @@ SilverCavePokecenter1F_MapEvents: db 0, 0 ; filler db 3 ; warp events - warp_event 3, 7, 1, SILVER_CAVE_OUTSIDE - warp_event 4, 7, 1, SILVER_CAVE_OUTSIDE - warp_event 0, 7, 1, POKECENTER_2F + warp_event 3, 7, SILVER_CAVE_OUTSIDE, 1 + warp_event 4, 7, SILVER_CAVE_OUTSIDE, 1 + warp_event 0, 7, POKECENTER_2F, 1 db 0 ; coord events diff --git a/maps/SilverCaveRoom1.asm b/maps/SilverCaveRoom1.asm index b6dad455c..74518dbeb 100644 --- a/maps/SilverCaveRoom1.asm +++ b/maps/SilverCaveRoom1.asm @@ -31,8 +31,8 @@ SilverCaveRoom1_MapEvents: db 0, 0 ; filler db 2 ; warp events - warp_event 9, 33, 2, SILVER_CAVE_OUTSIDE - warp_event 15, 1, 1, SILVER_CAVE_ROOM_2 + warp_event 9, 33, SILVER_CAVE_OUTSIDE, 2 + warp_event 15, 1, SILVER_CAVE_ROOM_2, 1 db 0 ; coord events diff --git a/maps/SilverCaveRoom2.asm b/maps/SilverCaveRoom2.asm index 774e105bc..1002acc78 100644 --- a/maps/SilverCaveRoom2.asm +++ b/maps/SilverCaveRoom2.asm @@ -24,10 +24,10 @@ SilverCaveRoom2_MapEvents: db 0, 0 ; filler db 4 ; warp events - warp_event 17, 31, 2, SILVER_CAVE_ROOM_1 - warp_event 11, 5, 1, SILVER_CAVE_ROOM_3 - warp_event 13, 21, 1, SILVER_CAVE_ITEM_ROOMS - warp_event 23, 3, 2, SILVER_CAVE_ITEM_ROOMS + warp_event 17, 31, SILVER_CAVE_ROOM_1, 2 + warp_event 11, 5, SILVER_CAVE_ROOM_3, 1 + warp_event 13, 21, SILVER_CAVE_ITEM_ROOMS, 1 + warp_event 23, 3, SILVER_CAVE_ITEM_ROOMS, 2 db 0 ; coord events diff --git a/maps/SilverCaveRoom3.asm b/maps/SilverCaveRoom3.asm index 4c4e5ef02..4ca196ea1 100644 --- a/maps/SilverCaveRoom3.asm +++ b/maps/SilverCaveRoom3.asm @@ -52,7 +52,7 @@ SilverCaveRoom3_MapEvents: db 0, 0 ; filler db 1 ; warp events - warp_event 9, 33, 2, SILVER_CAVE_ROOM_2 + warp_event 9, 33, SILVER_CAVE_ROOM_2, 2 db 0 ; coord events diff --git a/maps/SlowpokeWellB1F.asm b/maps/SlowpokeWellB1F.asm index 6b4330a2c..79d093970 100644 --- a/maps/SlowpokeWellB1F.asm +++ b/maps/SlowpokeWellB1F.asm @@ -322,8 +322,8 @@ SlowpokeWellB1F_MapEvents: db 0, 0 ; filler db 2 ; warp events - warp_event 17, 15, 6, AZALEA_TOWN - warp_event 7, 11, 1, SLOWPOKE_WELL_B2F + warp_event 17, 15, AZALEA_TOWN, 6 + warp_event 7, 11, SLOWPOKE_WELL_B2F, 1 db 0 ; coord events diff --git a/maps/SlowpokeWellB2F.asm b/maps/SlowpokeWellB2F.asm index 195ab560c..e9da7b24e 100644 --- a/maps/SlowpokeWellB2F.asm +++ b/maps/SlowpokeWellB2F.asm @@ -63,7 +63,7 @@ SlowpokeWellB2F_MapEvents: db 0, 0 ; filler db 1 ; warp events - warp_event 9, 11, 2, SLOWPOKE_WELL_B1F + warp_event 9, 11, SLOWPOKE_WELL_B1F, 2 db 0 ; coord events diff --git a/maps/SoulHouse.asm b/maps/SoulHouse.asm index d8bd3951e..dac4aa66e 100644 --- a/maps/SoulHouse.asm +++ b/maps/SoulHouse.asm @@ -74,8 +74,8 @@ SoulHouse_MapEvents: db 0, 0 ; filler db 2 ; warp events - warp_event 4, 7, 6, LAVENDER_TOWN - warp_event 5, 7, 6, LAVENDER_TOWN + warp_event 4, 7, LAVENDER_TOWN, 6 + warp_event 5, 7, LAVENDER_TOWN, 6 db 0 ; coord events diff --git a/maps/SproutTower1F.asm b/maps/SproutTower1F.asm index d3d8ff323..cddd2ed4c 100644 --- a/maps/SproutTower1F.asm +++ b/maps/SproutTower1F.asm @@ -104,11 +104,11 @@ SproutTower1F_MapEvents: db 0, 0 ; filler db 5 ; warp events - warp_event 9, 15, 7, VIOLET_CITY - warp_event 10, 15, 7, VIOLET_CITY - warp_event 6, 4, 1, SPROUT_TOWER_2F - warp_event 2, 6, 2, SPROUT_TOWER_2F - warp_event 17, 3, 3, SPROUT_TOWER_2F + warp_event 9, 15, VIOLET_CITY, 7 + warp_event 10, 15, VIOLET_CITY, 7 + warp_event 6, 4, SPROUT_TOWER_2F, 1 + warp_event 2, 6, SPROUT_TOWER_2F, 2 + warp_event 17, 3, SPROUT_TOWER_2F, 3 db 0 ; coord events diff --git a/maps/SproutTower2F.asm b/maps/SproutTower2F.asm index 73cc7bd48..79da8c462 100644 --- a/maps/SproutTower2F.asm +++ b/maps/SproutTower2F.asm @@ -86,10 +86,10 @@ SproutTower2F_MapEvents: db 0, 0 ; filler db 4 ; warp events - warp_event 6, 4, 3, SPROUT_TOWER_1F - warp_event 2, 6, 4, SPROUT_TOWER_1F - warp_event 17, 3, 5, SPROUT_TOWER_1F - warp_event 10, 14, 1, SPROUT_TOWER_3F + warp_event 6, 4, SPROUT_TOWER_1F, 3 + warp_event 2, 6, SPROUT_TOWER_1F, 4 + warp_event 17, 3, SPROUT_TOWER_1F, 5 + warp_event 10, 14, SPROUT_TOWER_3F, 1 db 0 ; coord events diff --git a/maps/SproutTower3F.asm b/maps/SproutTower3F.asm index d911fac0f..b52459ab5 100644 --- a/maps/SproutTower3F.asm +++ b/maps/SproutTower3F.asm @@ -331,7 +331,7 @@ SproutTower3F_MapEvents: db 0, 0 ; filler db 1 ; warp events - warp_event 10, 14, 4, SPROUT_TOWER_2F + warp_event 10, 14, SPROUT_TOWER_2F, 4 db 1 ; coord events coord_event 11, 9, SCENE_DEFAULT, UnknownScript_0x184947 diff --git a/maps/TeamRocketBaseB1F.asm b/maps/TeamRocketBaseB1F.asm index 9bc3365f8..dabd5eef4 100644 --- a/maps/TeamRocketBaseB1F.asm +++ b/maps/TeamRocketBaseB1F.asm @@ -728,10 +728,10 @@ TeamRocketBaseB1F_MapEvents: db 0, 0 ; filler db 4 ; warp events - warp_event 27, 2, 3, MAHOGANY_MART_1F - warp_event 3, 14, 1, TEAM_ROCKET_BASE_B2F - warp_event 5, 15, 4, TEAM_ROCKET_BASE_B1F - warp_event 25, 2, 3, TEAM_ROCKET_BASE_B1F + warp_event 27, 2, MAHOGANY_MART_1F, 3 + warp_event 3, 14, TEAM_ROCKET_BASE_B2F, 1 + warp_event 5, 15, TEAM_ROCKET_BASE_B1F, 4 + warp_event 25, 2, TEAM_ROCKET_BASE_B1F, 3 db 30 ; coord events ; There are five security cameras in the base. diff --git a/maps/TeamRocketBaseB2F.asm b/maps/TeamRocketBaseB2F.asm index 052077bc3..67130dd45 100644 --- a/maps/TeamRocketBaseB2F.asm +++ b/maps/TeamRocketBaseB2F.asm @@ -910,11 +910,11 @@ TeamRocketBaseB2F_MapEvents: db 0, 0 ; filler db 5 ; warp events - warp_event 3, 14, 2, TEAM_ROCKET_BASE_B1F - warp_event 3, 2, 1, TEAM_ROCKET_BASE_B3F - warp_event 27, 2, 2, TEAM_ROCKET_BASE_B3F - warp_event 3, 6, 3, TEAM_ROCKET_BASE_B3F - warp_event 27, 14, 4, TEAM_ROCKET_BASE_B3F + warp_event 3, 14, TEAM_ROCKET_BASE_B1F, 2 + warp_event 3, 2, TEAM_ROCKET_BASE_B3F, 1 + warp_event 27, 2, TEAM_ROCKET_BASE_B3F, 2 + warp_event 3, 6, TEAM_ROCKET_BASE_B3F, 3 + warp_event 27, 14, TEAM_ROCKET_BASE_B3F, 4 db 9 ; coord events coord_event 5, 14, SCENE_DEFAULT, LanceHealsScript1 diff --git a/maps/TeamRocketBaseB3F.asm b/maps/TeamRocketBaseB3F.asm index 1ba793c5c..2b72232fa 100644 --- a/maps/TeamRocketBaseB3F.asm +++ b/maps/TeamRocketBaseB3F.asm @@ -567,10 +567,10 @@ TeamRocketBaseB3F_MapEvents: db 0, 0 ; filler db 4 ; warp events - warp_event 3, 2, 2, TEAM_ROCKET_BASE_B2F - warp_event 27, 2, 3, TEAM_ROCKET_BASE_B2F - warp_event 3, 6, 4, TEAM_ROCKET_BASE_B2F - warp_event 27, 14, 5, TEAM_ROCKET_BASE_B2F + warp_event 3, 2, TEAM_ROCKET_BASE_B2F, 2 + warp_event 27, 2, TEAM_ROCKET_BASE_B2F, 3 + warp_event 3, 6, TEAM_ROCKET_BASE_B2F, 4 + warp_event 27, 14, TEAM_ROCKET_BASE_B2F, 5 db 3 ; coord events coord_event 10, 8, SCENE_TEAMROCKETBASEB3F_ROCKET_BOSS, UnknownScript_0x6e04b diff --git a/maps/TimeCapsule.asm b/maps/TimeCapsule.asm index 0cb0748b7..dc56ead92 100644 --- a/maps/TimeCapsule.asm +++ b/maps/TimeCapsule.asm @@ -55,8 +55,8 @@ TimeCapsule_MapEvents: db 0, 0 ; filler db 2 ; warp events - warp_event 4, 7, 4, POKECENTER_2F - warp_event 5, 7, 4, POKECENTER_2F + warp_event 4, 7, POKECENTER_2F, 4 + warp_event 5, 7, POKECENTER_2F, 4 db 0 ; coord events diff --git a/maps/TinTower1F.asm b/maps/TinTower1F.asm index 7a5c435d4..419173628 100644 --- a/maps/TinTower1F.asm +++ b/maps/TinTower1F.asm @@ -524,9 +524,9 @@ TinTower1F_MapEvents: db 0, 0 ; filler db 3 ; warp events - warp_event 9, 15, 12, ECRUTEAK_CITY - warp_event 10, 15, 12, ECRUTEAK_CITY - warp_event 10, 2, 2, TIN_TOWER_2F + warp_event 9, 15, ECRUTEAK_CITY, 12 + warp_event 10, 15, ECRUTEAK_CITY, 12 + warp_event 10, 2, TIN_TOWER_2F, 2 db 0 ; coord events diff --git a/maps/TinTower2F.asm b/maps/TinTower2F.asm index a3a9447af..e23ce1e6a 100644 --- a/maps/TinTower2F.asm +++ b/maps/TinTower2F.asm @@ -7,8 +7,8 @@ TinTower2F_MapEvents: db 0, 0 ; filler db 2 ; warp events - warp_event 10, 14, 1, TIN_TOWER_3F - warp_event 10, 2, 3, TIN_TOWER_1F + warp_event 10, 14, TIN_TOWER_3F, 1 + warp_event 10, 2, TIN_TOWER_1F, 3 db 0 ; coord events diff --git a/maps/TinTower3F.asm b/maps/TinTower3F.asm index ce81f87c0..61eebad8f 100644 --- a/maps/TinTower3F.asm +++ b/maps/TinTower3F.asm @@ -13,8 +13,8 @@ TinTower3F_MapEvents: db 0, 0 ; filler db 2 ; warp events - warp_event 10, 14, 1, TIN_TOWER_2F - warp_event 16, 2, 2, TIN_TOWER_4F + warp_event 10, 14, TIN_TOWER_2F, 1 + warp_event 16, 2, TIN_TOWER_4F, 2 db 0 ; coord events diff --git a/maps/TinTower4F.asm b/maps/TinTower4F.asm index 6d7a69860..6f5510f9f 100644 --- a/maps/TinTower4F.asm +++ b/maps/TinTower4F.asm @@ -24,10 +24,10 @@ TinTower4F_MapEvents: db 0, 0 ; filler db 4 ; warp events - warp_event 2, 4, 2, TIN_TOWER_5F - warp_event 16, 2, 2, TIN_TOWER_3F - warp_event 2, 14, 3, TIN_TOWER_5F - warp_event 17, 15, 4, TIN_TOWER_5F + warp_event 2, 4, TIN_TOWER_5F, 2 + warp_event 16, 2, TIN_TOWER_3F, 2 + warp_event 2, 14, TIN_TOWER_5F, 3 + warp_event 17, 15, TIN_TOWER_5F, 4 db 0 ; coord events diff --git a/maps/TinTower5F.asm b/maps/TinTower5F.asm index 0e199be0b..bcd38389a 100644 --- a/maps/TinTower5F.asm +++ b/maps/TinTower5F.asm @@ -19,10 +19,10 @@ TinTower5F_MapEvents: db 0, 0 ; filler db 4 ; warp events - warp_event 11, 15, 2, TIN_TOWER_6F - warp_event 2, 4, 1, TIN_TOWER_4F - warp_event 2, 14, 3, TIN_TOWER_4F - warp_event 17, 15, 4, TIN_TOWER_4F + warp_event 11, 15, TIN_TOWER_6F, 2 + warp_event 2, 4, TIN_TOWER_4F, 1 + warp_event 2, 14, TIN_TOWER_4F, 3 + warp_event 17, 15, TIN_TOWER_4F, 4 db 0 ; coord events diff --git a/maps/TinTower6F.asm b/maps/TinTower6F.asm index ac4e7adb6..654aa942f 100644 --- a/maps/TinTower6F.asm +++ b/maps/TinTower6F.asm @@ -13,8 +13,8 @@ TinTower6F_MapEvents: db 0, 0 ; filler db 2 ; warp events - warp_event 3, 9, 1, TIN_TOWER_7F - warp_event 11, 15, 1, TIN_TOWER_5F + warp_event 3, 9, TIN_TOWER_7F, 1 + warp_event 11, 15, TIN_TOWER_5F, 1 db 0 ; coord events diff --git a/maps/TinTower7F.asm b/maps/TinTower7F.asm index 323ee7cdd..44868df45 100644 --- a/maps/TinTower7F.asm +++ b/maps/TinTower7F.asm @@ -13,11 +13,11 @@ TinTower7F_MapEvents: db 0, 0 ; filler db 5 ; warp events - warp_event 3, 9, 1, TIN_TOWER_6F - warp_event 10, 15, 1, TIN_TOWER_8F - warp_event 12, 7, 4, TIN_TOWER_7F - warp_event 8, 3, 3, TIN_TOWER_7F - warp_event 6, 9, 5, TIN_TOWER_9F + warp_event 3, 9, TIN_TOWER_6F, 1 + warp_event 10, 15, TIN_TOWER_8F, 1 + warp_event 12, 7, TIN_TOWER_7F, 4 + warp_event 8, 3, TIN_TOWER_7F, 3 + warp_event 6, 9, TIN_TOWER_9F, 5 db 0 ; coord events diff --git a/maps/TinTower8F.asm b/maps/TinTower8F.asm index af18d7615..fa9968b64 100644 --- a/maps/TinTower8F.asm +++ b/maps/TinTower8F.asm @@ -21,12 +21,12 @@ TinTower8F_MapEvents: db 0, 0 ; filler db 6 ; warp events - warp_event 2, 5, 2, TIN_TOWER_7F - warp_event 2, 11, 1, TIN_TOWER_9F - warp_event 16, 7, 2, TIN_TOWER_9F - warp_event 10, 3, 3, TIN_TOWER_9F - warp_event 14, 15, 6, TIN_TOWER_9F - warp_event 6, 9, 7, TIN_TOWER_9F + warp_event 2, 5, TIN_TOWER_7F, 2 + warp_event 2, 11, TIN_TOWER_9F, 1 + warp_event 16, 7, TIN_TOWER_9F, 2 + warp_event 10, 3, TIN_TOWER_9F, 3 + warp_event 14, 15, TIN_TOWER_9F, 6 + warp_event 6, 9, TIN_TOWER_9F, 7 db 0 ; coord events diff --git a/maps/TinTower9F.asm b/maps/TinTower9F.asm index 070ced50d..f7a0965e5 100644 --- a/maps/TinTower9F.asm +++ b/maps/TinTower9F.asm @@ -23,13 +23,13 @@ TinTower9F_MapEvents: db 0, 0 ; filler db 7 ; warp events - warp_event 12, 3, 2, TIN_TOWER_8F - warp_event 2, 5, 3, TIN_TOWER_8F - warp_event 12, 7, 4, TIN_TOWER_8F - warp_event 7, 9, 1, TIN_TOWER_ROOF - warp_event 16, 7, 5, TIN_TOWER_7F - warp_event 6, 13, 5, TIN_TOWER_8F - warp_event 8, 13, 6, TIN_TOWER_8F + warp_event 12, 3, TIN_TOWER_8F, 2 + warp_event 2, 5, TIN_TOWER_8F, 3 + warp_event 12, 7, TIN_TOWER_8F, 4 + warp_event 7, 9, TIN_TOWER_ROOF, 1 + warp_event 16, 7, TIN_TOWER_7F, 5 + warp_event 6, 13, TIN_TOWER_8F, 5 + warp_event 8, 13, TIN_TOWER_8F, 6 db 0 ; coord events diff --git a/maps/TinTowerRoof.asm b/maps/TinTowerRoof.asm index d997c0f03..c03c47c50 100644 --- a/maps/TinTowerRoof.asm +++ b/maps/TinTowerRoof.asm @@ -46,7 +46,7 @@ TinTowerRoof_MapEvents: db 0, 0 ; filler db 1 ; warp events - warp_event 9, 13, 4, TIN_TOWER_9F + warp_event 9, 13, TIN_TOWER_9F, 4 db 0 ; coord events diff --git a/maps/TohjoFalls.asm b/maps/TohjoFalls.asm index 6e25876e5..272d4a905 100644 --- a/maps/TohjoFalls.asm +++ b/maps/TohjoFalls.asm @@ -13,8 +13,8 @@ TohjoFalls_MapEvents: db 0, 0 ; filler db 2 ; warp events - warp_event 13, 15, 2, ROUTE_27 - warp_event 25, 15, 3, ROUTE_27 + warp_event 13, 15, ROUTE_27, 2 + warp_event 25, 15, ROUTE_27, 3 db 0 ; coord events diff --git a/maps/TradeCenter.asm b/maps/TradeCenter.asm index 40690c4a3..c690a9546 100644 --- a/maps/TradeCenter.asm +++ b/maps/TradeCenter.asm @@ -55,8 +55,8 @@ TradeCenter_MapEvents: db 0, 0 ; filler db 2 ; warp events - warp_event 4, 7, 2, POKECENTER_2F - warp_event 5, 7, 2, POKECENTER_2F + warp_event 4, 7, POKECENTER_2F, 2 + warp_event 5, 7, POKECENTER_2F, 2 db 0 ; coord events diff --git a/maps/TrainerHouse1F.asm b/maps/TrainerHouse1F.asm index 666b795c4..2bcfe9a3d 100644 --- a/maps/TrainerHouse1F.asm +++ b/maps/TrainerHouse1F.asm @@ -139,9 +139,9 @@ TrainerHouse1F_MapEvents: db 0, 0 ; filler db 3 ; warp events - warp_event 2, 13, 3, VIRIDIAN_CITY - warp_event 3, 13, 3, VIRIDIAN_CITY - warp_event 8, 2, 1, TRAINER_HOUSE_B1F + warp_event 2, 13, VIRIDIAN_CITY, 3 + warp_event 3, 13, VIRIDIAN_CITY, 3 + warp_event 8, 2, TRAINER_HOUSE_B1F, 1 db 0 ; coord events diff --git a/maps/TrainerHouseB1F.asm b/maps/TrainerHouseB1F.asm index 06bf4017d..7d011b7c8 100644 --- a/maps/TrainerHouseB1F.asm +++ b/maps/TrainerHouseB1F.asm @@ -171,7 +171,7 @@ TrainerHouseB1F_MapEvents: db 0, 0 ; filler db 1 ; warp events - warp_event 9, 4, 3, TRAINER_HOUSE_1F + warp_event 9, 4, TRAINER_HOUSE_1F, 3 db 1 ; coord events coord_event 7, 3, SCENE_DEFAULT, TrainerHouseReceptionistScript diff --git a/maps/UndergroundPath.asm b/maps/UndergroundPath.asm index 7ed7f76f4..2bbb50e4b 100644 --- a/maps/UndergroundPath.asm +++ b/maps/UndergroundPath.asm @@ -13,8 +13,8 @@ UndergroundPath_MapEvents: db 0, 0 ; filler db 2 ; warp events - warp_event 3, 2, 3, ROUTE_5_UNDERGROUND_PATH_ENTRANCE - warp_event 3, 24, 3, ROUTE_6_UNDERGROUND_PATH_ENTRANCE + warp_event 3, 2, ROUTE_5_UNDERGROUND_PATH_ENTRANCE, 3 + warp_event 3, 24, ROUTE_6_UNDERGROUND_PATH_ENTRANCE, 3 db 0 ; coord events diff --git a/maps/UnionCave1F.asm b/maps/UnionCave1F.asm index 84189c9d3..04bae9c63 100644 --- a/maps/UnionCave1F.asm +++ b/maps/UnionCave1F.asm @@ -201,10 +201,10 @@ UnionCave1F_MapEvents: db 0, 0 ; filler db 4 ; warp events - warp_event 5, 19, 3, UNION_CAVE_B1F - warp_event 3, 33, 4, UNION_CAVE_B1F - warp_event 17, 31, 1, ROUTE_33 - warp_event 17, 3, 4, ROUTE_32 + warp_event 5, 19, UNION_CAVE_B1F, 3 + warp_event 3, 33, UNION_CAVE_B1F, 4 + warp_event 17, 31, ROUTE_33, 1 + warp_event 17, 3, ROUTE_32, 4 db 0 ; coord events diff --git a/maps/UnionCaveB1F.asm b/maps/UnionCaveB1F.asm index 6a9d7da72..844e2dd64 100644 --- a/maps/UnionCaveB1F.asm +++ b/maps/UnionCaveB1F.asm @@ -154,11 +154,11 @@ UnionCaveB1F_MapEvents: db 0, 0 ; filler db 5 ; warp events - warp_event 3, 3, 7, RUINS_OF_ALPH_OUTSIDE - warp_event 3, 11, 8, RUINS_OF_ALPH_OUTSIDE - warp_event 7, 19, 1, UNION_CAVE_1F - warp_event 3, 33, 2, UNION_CAVE_1F - warp_event 17, 31, 1, UNION_CAVE_B2F + warp_event 3, 3, RUINS_OF_ALPH_OUTSIDE, 7 + warp_event 3, 11, RUINS_OF_ALPH_OUTSIDE, 8 + warp_event 7, 19, UNION_CAVE_1F, 1 + warp_event 3, 33, UNION_CAVE_1F, 2 + warp_event 17, 31, UNION_CAVE_B2F, 1 db 0 ; coord events diff --git a/maps/UnionCaveB2F.asm b/maps/UnionCaveB2F.asm index 0e9be1712..f33251e69 100644 --- a/maps/UnionCaveB2F.asm +++ b/maps/UnionCaveB2F.asm @@ -143,7 +143,7 @@ UnionCaveB2F_MapEvents: db 0, 0 ; filler db 1 ; warp events - warp_event 5, 3, 5, UNION_CAVE_B1F + warp_event 5, 3, UNION_CAVE_B1F, 5 db 0 ; coord events diff --git a/maps/VermilionCity.asm b/maps/VermilionCity.asm index 55feb54b5..85dd629c6 100644 --- a/maps/VermilionCity.asm +++ b/maps/VermilionCity.asm @@ -269,16 +269,16 @@ VermilionCity_MapEvents: db 0, 0 ; filler db 10 ; warp events - warp_event 5, 5, 1, VERMILION_FISHING_SPEECH_HOUSE - warp_event 9, 5, 1, VERMILION_POKECENTER_1F - warp_event 7, 13, 1, POKEMON_FAN_CLUB - warp_event 13, 13, 1, VERMILION_MAGNET_TRAIN_SPEECH_HOUSE - warp_event 21, 13, 2, VERMILION_MART - warp_event 21, 17, 1, VERMILION_DIGLETTS_CAVE_SPEECH_HOUSE - warp_event 10, 19, 1, VERMILION_GYM - warp_event 19, 31, 1, VERMILION_PORT_PASSAGE - warp_event 20, 31, 2, VERMILION_PORT_PASSAGE - warp_event 34, 7, 1, DIGLETTS_CAVE + warp_event 5, 5, VERMILION_FISHING_SPEECH_HOUSE, 1 + warp_event 9, 5, VERMILION_POKECENTER_1F, 1 + warp_event 7, 13, POKEMON_FAN_CLUB, 1 + warp_event 13, 13, VERMILION_MAGNET_TRAIN_SPEECH_HOUSE, 1 + warp_event 21, 13, VERMILION_MART, 2 + warp_event 21, 17, VERMILION_DIGLETTS_CAVE_SPEECH_HOUSE, 1 + warp_event 10, 19, VERMILION_GYM, 1 + warp_event 19, 31, VERMILION_PORT_PASSAGE, 1 + warp_event 20, 31, VERMILION_PORT_PASSAGE, 2 + warp_event 34, 7, DIGLETTS_CAVE, 1 db 0 ; coord events diff --git a/maps/VermilionDiglettsCaveSpeechHouse.asm b/maps/VermilionDiglettsCaveSpeechHouse.asm index a7c9c9979..5a78a70af 100644 --- a/maps/VermilionDiglettsCaveSpeechHouse.asm +++ b/maps/VermilionDiglettsCaveSpeechHouse.asm @@ -22,8 +22,8 @@ VermilionDiglettsCaveSpeechHouse_MapEvents: db 0, 0 ; filler db 2 ; warp events - warp_event 2, 7, 6, VERMILION_CITY - warp_event 3, 7, 6, VERMILION_CITY + warp_event 2, 7, VERMILION_CITY, 6 + warp_event 3, 7, VERMILION_CITY, 6 db 0 ; coord events diff --git a/maps/VermilionFishingSpeechHouse.asm b/maps/VermilionFishingSpeechHouse.asm index 84fc0dc04..a733fac23 100644 --- a/maps/VermilionFishingSpeechHouse.asm +++ b/maps/VermilionFishingSpeechHouse.asm @@ -52,8 +52,8 @@ VermilionFishingSpeechHouse_MapEvents: db 0, 0 ; filler db 2 ; warp events - warp_event 2, 7, 1, VERMILION_CITY - warp_event 3, 7, 1, VERMILION_CITY + warp_event 2, 7, VERMILION_CITY, 1 + warp_event 3, 7, VERMILION_CITY, 1 db 0 ; coord events diff --git a/maps/VermilionGym.asm b/maps/VermilionGym.asm index 9da49e767..605cd857e 100644 --- a/maps/VermilionGym.asm +++ b/maps/VermilionGym.asm @@ -262,8 +262,8 @@ VermilionGym_MapEvents: db 0, 0 ; filler db 2 ; warp events - warp_event 4, 17, 7, VERMILION_CITY - warp_event 5, 17, 7, VERMILION_CITY + warp_event 4, 17, VERMILION_CITY, 7 + warp_event 5, 17, VERMILION_CITY, 7 db 0 ; coord events diff --git a/maps/VermilionMagnetTrainSpeechHouse.asm b/maps/VermilionMagnetTrainSpeechHouse.asm index b88489650..3dda82a2c 100644 --- a/maps/VermilionMagnetTrainSpeechHouse.asm +++ b/maps/VermilionMagnetTrainSpeechHouse.asm @@ -35,8 +35,8 @@ VermilionMagnetTrainSpeechHouse_MapEvents: db 0, 0 ; filler db 2 ; warp events - warp_event 2, 7, 4, VERMILION_CITY - warp_event 3, 7, 4, VERMILION_CITY + warp_event 2, 7, VERMILION_CITY, 4 + warp_event 3, 7, VERMILION_CITY, 4 db 0 ; coord events diff --git a/maps/VermilionMart.asm b/maps/VermilionMart.asm index 8c7fd611b..8e24b1cb7 100644 --- a/maps/VermilionMart.asm +++ b/maps/VermilionMart.asm @@ -38,8 +38,8 @@ VermilionMart_MapEvents: db 0, 0 ; filler db 2 ; warp events - warp_event 2, 7, 5, VERMILION_CITY - warp_event 3, 7, 5, VERMILION_CITY + warp_event 2, 7, VERMILION_CITY, 5 + warp_event 3, 7, VERMILION_CITY, 5 db 0 ; coord events diff --git a/maps/VermilionPokecenter1F.asm b/maps/VermilionPokecenter1F.asm index 7330b6f31..700352d7a 100644 --- a/maps/VermilionPokecenter1F.asm +++ b/maps/VermilionPokecenter1F.asm @@ -78,9 +78,9 @@ VermilionPokecenter1F_MapEvents: db 0, 0 ; filler db 3 ; warp events - warp_event 3, 7, 2, VERMILION_CITY - warp_event 4, 7, 2, VERMILION_CITY - warp_event 0, 7, 1, POKECENTER_2F + warp_event 3, 7, VERMILION_CITY, 2 + warp_event 4, 7, VERMILION_CITY, 2 + warp_event 0, 7, POKECENTER_2F, 1 db 0 ; coord events diff --git a/maps/VermilionPokecenter2FBeta.asm b/maps/VermilionPokecenter2FBeta.asm index e8ed5dbd1..392c44556 100644 --- a/maps/VermilionPokecenter2FBeta.asm +++ b/maps/VermilionPokecenter2FBeta.asm @@ -7,7 +7,7 @@ VermilionPokecenter2FBeta_MapEvents: db 0, 0 ; filler db 1 ; warp events - warp_event 0, 7, 3, VERMILION_POKECENTER_1F + warp_event 0, 7, VERMILION_POKECENTER_1F, 3 db 0 ; coord events diff --git a/maps/VermilionPort.asm b/maps/VermilionPort.asm index 4a30eac99..65dc59834 100644 --- a/maps/VermilionPort.asm +++ b/maps/VermilionPort.asm @@ -300,8 +300,8 @@ VermilionPort_MapEvents: db 0, 0 ; filler db 2 ; warp events - warp_event 9, 5, 5, VERMILION_PORT_PASSAGE - warp_event 7, 17, 1, FAST_SHIP_1F + warp_event 9, 5, VERMILION_PORT_PASSAGE, 5 + warp_event 7, 17, FAST_SHIP_1F, 1 db 1 ; coord events coord_event 7, 11, SCENE_DEFAULT, UnknownScript_0x74e20 diff --git a/maps/VermilionPortPassage.asm b/maps/VermilionPortPassage.asm index e7afefffe..49756b0d0 100644 --- a/maps/VermilionPortPassage.asm +++ b/maps/VermilionPortPassage.asm @@ -20,11 +20,11 @@ VermilionPortPassage_MapEvents: db 0, 0 ; filler db 5 ; warp events - warp_event 15, 0, 8, VERMILION_CITY - warp_event 16, 0, 9, VERMILION_CITY - warp_event 15, 4, 4, VERMILION_PORT_PASSAGE - warp_event 3, 2, 3, VERMILION_PORT_PASSAGE - warp_event 3, 14, 1, VERMILION_PORT + warp_event 15, 0, VERMILION_CITY, 8 + warp_event 16, 0, VERMILION_CITY, 9 + warp_event 15, 4, VERMILION_PORT_PASSAGE, 4 + warp_event 3, 2, VERMILION_PORT_PASSAGE, 3 + warp_event 3, 14, VERMILION_PORT, 1 db 0 ; coord events diff --git a/maps/VictoryRoad.asm b/maps/VictoryRoad.asm index d933b1ff1..10582779d 100644 --- a/maps/VictoryRoad.asm +++ b/maps/VictoryRoad.asm @@ -240,16 +240,16 @@ VictoryRoad_MapEvents: db 0, 0 ; filler db 10 ; warp events - warp_event 9, 67, 5, VICTORY_ROAD_GATE - warp_event 1, 49, 3, VICTORY_ROAD - warp_event 1, 35, 2, VICTORY_ROAD - warp_event 13, 31, 5, VICTORY_ROAD - warp_event 13, 17, 4, VICTORY_ROAD - warp_event 17, 33, 7, VICTORY_ROAD - warp_event 17, 19, 6, VICTORY_ROAD - warp_event 0, 11, 9, VICTORY_ROAD - warp_event 0, 27, 8, VICTORY_ROAD - warp_event 13, 5, 3, ROUTE_23 + warp_event 9, 67, VICTORY_ROAD_GATE, 5 + warp_event 1, 49, VICTORY_ROAD, 3 + warp_event 1, 35, VICTORY_ROAD, 2 + warp_event 13, 31, VICTORY_ROAD, 5 + warp_event 13, 17, VICTORY_ROAD, 4 + warp_event 17, 33, VICTORY_ROAD, 7 + warp_event 17, 19, VICTORY_ROAD, 6 + warp_event 0, 11, VICTORY_ROAD, 9 + warp_event 0, 27, VICTORY_ROAD, 8 + warp_event 13, 5, ROUTE_23, 3 db 2 ; coord events coord_event 12, 8, SCENE_DEFAULT, UnknownScript_0x74492 diff --git a/maps/VictoryRoadGate.asm b/maps/VictoryRoadGate.asm index 541008e02..41dee39ae 100644 --- a/maps/VictoryRoadGate.asm +++ b/maps/VictoryRoadGate.asm @@ -99,14 +99,14 @@ VictoryRoadGate_MapEvents: db 0, 0 ; filler db 8 ; warp events - warp_event 17, 7, 1, ROUTE_22 - warp_event 18, 7, 1, ROUTE_22 - warp_event 9, 17, 1, ROUTE_26 - warp_event 10, 17, 1, ROUTE_26 - warp_event 9, 0, 1, VICTORY_ROAD - warp_event 10, 0, 1, VICTORY_ROAD - warp_event 1, 7, 2, ROUTE_28 - warp_event 2, 7, 2, ROUTE_28 + warp_event 17, 7, ROUTE_22, 1 + warp_event 18, 7, ROUTE_22, 1 + warp_event 9, 17, ROUTE_26, 1 + warp_event 10, 17, ROUTE_26, 1 + warp_event 9, 0, VICTORY_ROAD, 1 + warp_event 10, 0, VICTORY_ROAD, 1 + warp_event 1, 7, ROUTE_28, 2 + warp_event 2, 7, ROUTE_28, 2 db 1 ; coord events coord_event 10, 11, SCENE_DEFAULT, VictoryRoadGateBadgeCheckScene diff --git a/maps/VioletCity.asm b/maps/VioletCity.asm index bcbdcb870..e56cd9100 100644 --- a/maps/VioletCity.asm +++ b/maps/VioletCity.asm @@ -280,15 +280,15 @@ VioletCity_MapEvents: db 0, 0 ; filler db 9 ; warp events - warp_event 9, 17, 2, VIOLET_MART - warp_event 18, 17, 1, VIOLET_GYM - warp_event 30, 17, 1, EARLS_POKEMON_ACADEMY - warp_event 3, 15, 1, VIOLET_NICKNAME_SPEECH_HOUSE - warp_event 31, 25, 1, VIOLET_POKECENTER_1F - warp_event 21, 29, 1, VIOLET_KYLES_HOUSE - warp_event 23, 5, 1, SPROUT_TOWER_1F - warp_event 39, 24, 1, ROUTE_31_VIOLET_GATE - warp_event 39, 25, 2, ROUTE_31_VIOLET_GATE + warp_event 9, 17, VIOLET_MART, 2 + warp_event 18, 17, VIOLET_GYM, 1 + warp_event 30, 17, EARLS_POKEMON_ACADEMY, 1 + warp_event 3, 15, VIOLET_NICKNAME_SPEECH_HOUSE, 1 + warp_event 31, 25, VIOLET_POKECENTER_1F, 1 + warp_event 21, 29, VIOLET_KYLES_HOUSE, 1 + warp_event 23, 5, SPROUT_TOWER_1F, 1 + warp_event 39, 24, ROUTE_31_VIOLET_GATE, 1 + warp_event 39, 25, ROUTE_31_VIOLET_GATE, 2 db 0 ; coord events diff --git a/maps/VioletGym.asm b/maps/VioletGym.asm index 184a5783a..a030379f9 100644 --- a/maps/VioletGym.asm +++ b/maps/VioletGym.asm @@ -283,8 +283,8 @@ VioletGym_MapEvents: db 0, 0 ; filler db 2 ; warp events - warp_event 4, 15, 2, VIOLET_CITY - warp_event 5, 15, 2, VIOLET_CITY + warp_event 4, 15, VIOLET_CITY, 2 + warp_event 5, 15, VIOLET_CITY, 2 db 0 ; coord events diff --git a/maps/VioletKylesHouse.asm b/maps/VioletKylesHouse.asm index 09078a49f..2766556dd 100644 --- a/maps/VioletKylesHouse.asm +++ b/maps/VioletKylesHouse.asm @@ -34,8 +34,8 @@ VioletKylesHouse_MapEvents: db 0, 0 ; filler db 2 ; warp events - warp_event 3, 7, 6, VIOLET_CITY - warp_event 4, 7, 6, VIOLET_CITY + warp_event 3, 7, VIOLET_CITY, 6 + warp_event 4, 7, VIOLET_CITY, 6 db 0 ; coord events diff --git a/maps/VioletMart.asm b/maps/VioletMart.asm index fd520e94b..428ae18c9 100644 --- a/maps/VioletMart.asm +++ b/maps/VioletMart.asm @@ -50,8 +50,8 @@ VioletMart_MapEvents: db 0, 0 ; filler db 2 ; warp events - warp_event 2, 7, 1, VIOLET_CITY - warp_event 3, 7, 1, VIOLET_CITY + warp_event 2, 7, VIOLET_CITY, 1 + warp_event 3, 7, VIOLET_CITY, 1 db 0 ; coord events diff --git a/maps/VioletNicknameSpeechHouse.asm b/maps/VioletNicknameSpeechHouse.asm index 0706369d7..a59c2e6c1 100644 --- a/maps/VioletNicknameSpeechHouse.asm +++ b/maps/VioletNicknameSpeechHouse.asm @@ -46,8 +46,8 @@ VioletNicknameSpeechHouse_MapEvents: db 0, 0 ; filler db 2 ; warp events - warp_event 3, 7, 4, VIOLET_CITY - warp_event 4, 7, 4, VIOLET_CITY + warp_event 3, 7, VIOLET_CITY, 4 + warp_event 4, 7, VIOLET_CITY, 4 db 0 ; coord events diff --git a/maps/VioletPokecenter1F.asm b/maps/VioletPokecenter1F.asm index 19923c2d7..efa538493 100644 --- a/maps/VioletPokecenter1F.asm +++ b/maps/VioletPokecenter1F.asm @@ -217,9 +217,9 @@ VioletPokecenter1F_MapEvents: db 0, 0 ; filler db 3 ; warp events - warp_event 3, 7, 5, VIOLET_CITY - warp_event 4, 7, 5, VIOLET_CITY - warp_event 0, 7, 1, POKECENTER_2F + warp_event 3, 7, VIOLET_CITY, 5 + warp_event 4, 7, VIOLET_CITY, 5 + warp_event 0, 7, POKECENTER_2F, 1 db 0 ; coord events diff --git a/maps/ViridianCity.asm b/maps/ViridianCity.asm index 92dabcf8b..222fb0a24 100644 --- a/maps/ViridianCity.asm +++ b/maps/ViridianCity.asm @@ -217,11 +217,11 @@ ViridianCity_MapEvents: db 0, 0 ; filler db 5 ; warp events - warp_event 32, 7, 1, VIRIDIAN_GYM - warp_event 21, 9, 1, VIRIDIAN_NICKNAME_SPEECH_HOUSE - warp_event 23, 15, 1, TRAINER_HOUSE_1F - warp_event 29, 19, 2, VIRIDIAN_MART - warp_event 23, 25, 1, VIRIDIAN_POKECENTER_1F + warp_event 32, 7, VIRIDIAN_GYM, 1 + warp_event 21, 9, VIRIDIAN_NICKNAME_SPEECH_HOUSE, 1 + warp_event 23, 15, TRAINER_HOUSE_1F, 1 + warp_event 29, 19, VIRIDIAN_MART, 2 + warp_event 23, 25, VIRIDIAN_POKECENTER_1F, 1 db 0 ; coord events diff --git a/maps/ViridianGym.asm b/maps/ViridianGym.asm index 3079b852e..ddc29bf5c 100644 --- a/maps/ViridianGym.asm +++ b/maps/ViridianGym.asm @@ -171,8 +171,8 @@ ViridianGym_MapEvents: db 0, 0 ; filler db 2 ; warp events - warp_event 4, 17, 1, VIRIDIAN_CITY - warp_event 5, 17, 1, VIRIDIAN_CITY + warp_event 4, 17, VIRIDIAN_CITY, 1 + warp_event 5, 17, VIRIDIAN_CITY, 1 db 0 ; coord events diff --git a/maps/ViridianMart.asm b/maps/ViridianMart.asm index 7f41f5c73..53720ea89 100644 --- a/maps/ViridianMart.asm +++ b/maps/ViridianMart.asm @@ -38,8 +38,8 @@ ViridianMart_MapEvents: db 0, 0 ; filler db 2 ; warp events - warp_event 2, 7, 4, VIRIDIAN_CITY - warp_event 3, 7, 4, VIRIDIAN_CITY + warp_event 2, 7, VIRIDIAN_CITY, 4 + warp_event 3, 7, VIRIDIAN_CITY, 4 db 0 ; coord events diff --git a/maps/ViridianNicknameSpeechHouse.asm b/maps/ViridianNicknameSpeechHouse.asm index 7c186e22d..40431b616 100644 --- a/maps/ViridianNicknameSpeechHouse.asm +++ b/maps/ViridianNicknameSpeechHouse.asm @@ -63,8 +63,8 @@ ViridianNicknameSpeechHouse_MapEvents: db 0, 0 ; filler db 2 ; warp events - warp_event 2, 7, 2, VIRIDIAN_CITY - warp_event 3, 7, 2, VIRIDIAN_CITY + warp_event 2, 7, VIRIDIAN_CITY, 2 + warp_event 3, 7, VIRIDIAN_CITY, 2 db 0 ; coord events diff --git a/maps/ViridianPokecenter1F.asm b/maps/ViridianPokecenter1F.asm index 8fc0749d8..11b3d8b86 100644 --- a/maps/ViridianPokecenter1F.asm +++ b/maps/ViridianPokecenter1F.asm @@ -73,9 +73,9 @@ ViridianPokecenter1F_MapEvents: db 0, 0 ; filler db 3 ; warp events - warp_event 3, 7, 5, VIRIDIAN_CITY - warp_event 4, 7, 5, VIRIDIAN_CITY - warp_event 0, 7, 1, POKECENTER_2F + warp_event 3, 7, VIRIDIAN_CITY, 5 + warp_event 4, 7, VIRIDIAN_CITY, 5 + warp_event 0, 7, POKECENTER_2F, 1 db 0 ; coord events diff --git a/maps/ViridianPokecenter2FBeta.asm b/maps/ViridianPokecenter2FBeta.asm index ea714aa9e..7f184eedc 100644 --- a/maps/ViridianPokecenter2FBeta.asm +++ b/maps/ViridianPokecenter2FBeta.asm @@ -7,7 +7,7 @@ ViridianPokecenter2FBeta_MapEvents: db 0, 0 ; filler db 1 ; warp events - warp_event 0, 7, 3, VIRIDIAN_POKECENTER_1F + warp_event 0, 7, VIRIDIAN_POKECENTER_1F, 3 db 0 ; coord events diff --git a/maps/WhirlIslandB1F.asm b/maps/WhirlIslandB1F.asm index f5d19b391..1d2eef8df 100644 --- a/maps/WhirlIslandB1F.asm +++ b/maps/WhirlIslandB1F.asm @@ -42,15 +42,15 @@ WhirlIslandB1F_MapEvents: db 0, 0 ; filler db 9 ; warp events - warp_event 5, 5, 2, WHIRL_ISLAND_NW - warp_event 35, 3, 2, WHIRL_ISLAND_NE - warp_event 29, 9, 3, WHIRL_ISLAND_NE - warp_event 9, 31, 3, WHIRL_ISLAND_SW - warp_event 23, 31, 2, WHIRL_ISLAND_SW - warp_event 31, 29, 2, WHIRL_ISLAND_SE - warp_event 25, 21, 1, WHIRL_ISLAND_B2F - warp_event 13, 27, 2, WHIRL_ISLAND_B2F - warp_event 17, 21, 1, WHIRL_ISLAND_CAVE + warp_event 5, 5, WHIRL_ISLAND_NW, 2 + warp_event 35, 3, WHIRL_ISLAND_NE, 2 + warp_event 29, 9, WHIRL_ISLAND_NE, 3 + warp_event 9, 31, WHIRL_ISLAND_SW, 3 + warp_event 23, 31, WHIRL_ISLAND_SW, 2 + warp_event 31, 29, WHIRL_ISLAND_SE, 2 + warp_event 25, 21, WHIRL_ISLAND_B2F, 1 + warp_event 13, 27, WHIRL_ISLAND_B2F, 2 + warp_event 17, 21, WHIRL_ISLAND_CAVE, 1 db 0 ; coord events diff --git a/maps/WhirlIslandB2F.asm b/maps/WhirlIslandB2F.asm index 6a8754b6c..3d1ace476 100644 --- a/maps/WhirlIslandB2F.asm +++ b/maps/WhirlIslandB2F.asm @@ -21,10 +21,10 @@ WhirlIslandB2F_MapEvents: db 0, 0 ; filler db 4 ; warp events - warp_event 11, 5, 7, WHIRL_ISLAND_B1F - warp_event 7, 11, 8, WHIRL_ISLAND_B1F - warp_event 7, 25, 1, WHIRL_ISLAND_LUGIA_CHAMBER - warp_event 13, 31, 5, WHIRL_ISLAND_SW + warp_event 11, 5, WHIRL_ISLAND_B1F, 7 + warp_event 7, 11, WHIRL_ISLAND_B1F, 8 + warp_event 7, 25, WHIRL_ISLAND_LUGIA_CHAMBER, 1 + warp_event 13, 31, WHIRL_ISLAND_SW, 5 db 0 ; coord events diff --git a/maps/WhirlIslandCave.asm b/maps/WhirlIslandCave.asm index 98312ad5a..83608829d 100644 --- a/maps/WhirlIslandCave.asm +++ b/maps/WhirlIslandCave.asm @@ -7,8 +7,8 @@ WhirlIslandCave_MapEvents: db 0, 0 ; filler db 2 ; warp events - warp_event 7, 5, 9, WHIRL_ISLAND_B1F - warp_event 3, 13, 4, WHIRL_ISLAND_NW + warp_event 7, 5, WHIRL_ISLAND_B1F, 9 + warp_event 3, 13, WHIRL_ISLAND_NW, 4 db 0 ; coord events diff --git a/maps/WhirlIslandLugiaChamber.asm b/maps/WhirlIslandLugiaChamber.asm index cc3138331..f2b9fab6d 100644 --- a/maps/WhirlIslandLugiaChamber.asm +++ b/maps/WhirlIslandLugiaChamber.asm @@ -45,7 +45,7 @@ WhirlIslandLugiaChamber_MapEvents: db 0, 0 ; filler db 1 ; warp events - warp_event 9, 13, 3, WHIRL_ISLAND_B2F + warp_event 9, 13, WHIRL_ISLAND_B2F, 3 db 0 ; coord events diff --git a/maps/WhirlIslandNE.asm b/maps/WhirlIslandNE.asm index d1a41c13b..10458252e 100644 --- a/maps/WhirlIslandNE.asm +++ b/maps/WhirlIslandNE.asm @@ -13,9 +13,9 @@ WhirlIslandNE_MapEvents: db 0, 0 ; filler db 3 ; warp events - warp_event 3, 13, 2, ROUTE_41 - warp_event 17, 3, 2, WHIRL_ISLAND_B1F - warp_event 13, 11, 3, WHIRL_ISLAND_B1F + warp_event 3, 13, ROUTE_41, 2 + warp_event 17, 3, WHIRL_ISLAND_B1F, 2 + warp_event 13, 11, WHIRL_ISLAND_B1F, 3 db 0 ; coord events diff --git a/maps/WhirlIslandNW.asm b/maps/WhirlIslandNW.asm index 38a413e96..6e0f9c4aa 100644 --- a/maps/WhirlIslandNW.asm +++ b/maps/WhirlIslandNW.asm @@ -7,10 +7,10 @@ WhirlIslandNW_MapEvents: db 0, 0 ; filler db 4 ; warp events - warp_event 5, 7, 1, ROUTE_41 - warp_event 5, 3, 1, WHIRL_ISLAND_B1F - warp_event 3, 15, 4, WHIRL_ISLAND_SW - warp_event 7, 15, 2, WHIRL_ISLAND_CAVE + warp_event 5, 7, ROUTE_41, 1 + warp_event 5, 3, WHIRL_ISLAND_B1F, 1 + warp_event 3, 15, WHIRL_ISLAND_SW, 4 + warp_event 7, 15, WHIRL_ISLAND_CAVE, 2 db 0 ; coord events diff --git a/maps/WhirlIslandSE.asm b/maps/WhirlIslandSE.asm index 51b21821a..9dd6fc3bc 100644 --- a/maps/WhirlIslandSE.asm +++ b/maps/WhirlIslandSE.asm @@ -7,8 +7,8 @@ WhirlIslandSE_MapEvents: db 0, 0 ; filler db 2 ; warp events - warp_event 5, 13, 4, ROUTE_41 - warp_event 5, 3, 6, WHIRL_ISLAND_B1F + warp_event 5, 13, ROUTE_41, 4 + warp_event 5, 3, WHIRL_ISLAND_B1F, 6 db 0 ; coord events diff --git a/maps/WhirlIslandSW.asm b/maps/WhirlIslandSW.asm index c2e1d8295..d6ae335b2 100644 --- a/maps/WhirlIslandSW.asm +++ b/maps/WhirlIslandSW.asm @@ -13,11 +13,11 @@ WhirlIslandSW_MapEvents: db 0, 0 ; filler db 5 ; warp events - warp_event 5, 7, 3, ROUTE_41 - warp_event 17, 3, 5, WHIRL_ISLAND_B1F - warp_event 3, 3, 4, WHIRL_ISLAND_B1F - warp_event 3, 15, 3, WHIRL_ISLAND_NW - warp_event 17, 15, 4, WHIRL_ISLAND_B2F + warp_event 5, 7, ROUTE_41, 3 + warp_event 17, 3, WHIRL_ISLAND_B1F, 5 + warp_event 3, 3, WHIRL_ISLAND_B1F, 4 + warp_event 3, 15, WHIRL_ISLAND_NW, 3 + warp_event 17, 15, WHIRL_ISLAND_B2F, 4 db 0 ; coord events diff --git a/maps/WillsRoom.asm b/maps/WillsRoom.asm index 546113c3e..470ff38a3 100644 --- a/maps/WillsRoom.asm +++ b/maps/WillsRoom.asm @@ -130,9 +130,9 @@ WillsRoom_MapEvents: db 0, 0 ; filler db 3 ; warp events - warp_event 5, 17, 4, INDIGO_PLATEAU_POKECENTER_1F - warp_event 4, 2, 1, KOGAS_ROOM - warp_event 5, 2, 2, KOGAS_ROOM + warp_event 5, 17, INDIGO_PLATEAU_POKECENTER_1F, 4 + warp_event 4, 2, KOGAS_ROOM, 1 + warp_event 5, 2, KOGAS_ROOM, 2 db 0 ; coord events diff --git a/maps/WiseTriosRoom.asm b/maps/WiseTriosRoom.asm index 10079981f..a98159020 100644 --- a/maps/WiseTriosRoom.asm +++ b/maps/WiseTriosRoom.asm @@ -346,9 +346,9 @@ WiseTriosRoom_MapEvents: db 0, 0 ; filler db 3 ; warp events - warp_event 7, 4, 4, ECRUTEAK_CITY - warp_event 7, 5, 5, ECRUTEAK_CITY - warp_event 1, 4, 5, ECRUTEAK_TIN_TOWER_ENTRANCE + warp_event 7, 4, ECRUTEAK_CITY, 4 + warp_event 7, 5, ECRUTEAK_CITY, 5 + warp_event 1, 4, ECRUTEAK_TIN_TOWER_ENTRANCE, 5 db 1 ; coord events coord_event 7, 4, SCENE_DEFAULT, UnknownScript_0x985a3