From dcb24bc72428a60e37c1dfa7a93dc46bff7bd5ed Mon Sep 17 00:00:00 2001 From: Rangi Date: Fri, 24 Jul 2020 09:49:26 -0400 Subject: [PATCH] Use def_* macros for automatic map event counts Resolves #742 --- docs/map_event_scripts.md | 14 ++--- engine/overworld/player_object.asm | 1 + macros/legacy.asm | 18 ++---- macros/scripts/maps.asm | 60 +++++++++++++++++++ maps/AzaleaGym.asm | 14 ++--- maps/AzaleaMart.asm | 14 ++--- maps/AzaleaPokecenter1F.asm | 14 ++--- maps/AzaleaTown.asm | 14 ++--- maps/BattleTower1F.asm | 14 ++--- maps/BattleTowerBattleRoom.asm | 14 ++--- maps/BattleTowerElevator.asm | 14 ++--- maps/BattleTowerHallway.asm | 14 ++--- maps/BattleTowerOutside.asm | 14 ++--- maps/BillsBrothersHouse.asm | 14 ++--- maps/BillsFamilysHouse.asm | 14 ++--- maps/BillsHouse.asm | 14 ++--- maps/BlackthornCity.asm | 14 ++--- maps/BlackthornDragonSpeechHouse.asm | 14 ++--- maps/BlackthornEmysHouse.asm | 14 ++--- maps/BlackthornGym1F.asm | 14 ++--- maps/BlackthornGym2F.asm | 14 ++--- maps/BlackthornMart.asm | 14 ++--- maps/BlackthornPokecenter1F.asm | 14 ++--- maps/BluesHouse.asm | 14 ++--- maps/BrunosRoom.asm | 14 ++--- maps/BurnedTower1F.asm | 14 ++--- maps/BurnedTowerB1F.asm | 14 ++--- maps/CeladonCafe.asm | 14 ++--- maps/CeladonCity.asm | 14 ++--- maps/CeladonDeptStore1F.asm | 14 ++--- maps/CeladonDeptStore2F.asm | 14 ++--- maps/CeladonDeptStore3F.asm | 14 ++--- maps/CeladonDeptStore4F.asm | 14 ++--- maps/CeladonDeptStore5F.asm | 14 ++--- maps/CeladonDeptStore6F.asm | 14 ++--- maps/CeladonDeptStoreElevator.asm | 12 ++-- maps/CeladonGameCorner.asm | 14 ++--- maps/CeladonGameCornerPrizeRoom.asm | 14 ++--- maps/CeladonGym.asm | 14 ++--- maps/CeladonMansion1F.asm | 14 ++--- maps/CeladonMansion2F.asm | 12 ++-- maps/CeladonMansion3F.asm | 14 ++--- maps/CeladonMansionRoof.asm | 14 ++--- maps/CeladonMansionRoofHouse.asm | 14 ++--- maps/CeladonPokecenter1F.asm | 14 ++--- maps/CeladonPokecenter2FBeta.asm | 12 ++-- maps/CeruleanCity.asm | 14 ++--- maps/CeruleanGym.asm | 14 ++--- maps/CeruleanGymBadgeSpeechHouse.asm | 14 ++--- maps/CeruleanMart.asm | 14 ++--- maps/CeruleanPokecenter1F.asm | 14 ++--- maps/CeruleanPokecenter2FBeta.asm | 12 ++-- maps/CeruleanPoliceStation.asm | 14 ++--- maps/CeruleanTradeSpeechHouse.asm | 14 ++--- maps/CharcoalKiln.asm | 14 ++--- maps/CherrygroveCity.asm | 14 ++--- maps/CherrygroveEvolutionSpeechHouse.asm | 14 ++--- maps/CherrygroveGymSpeechHouse.asm | 14 ++--- maps/CherrygroveMart.asm | 14 ++--- maps/CherrygrovePokecenter1F.asm | 14 ++--- maps/CianwoodCity.asm | 14 ++--- maps/CianwoodGym.asm | 14 ++--- maps/CianwoodLugiaSpeechHouse.asm | 14 ++--- maps/CianwoodPharmacy.asm | 14 ++--- maps/CianwoodPhotoStudio.asm | 14 ++--- maps/CianwoodPokecenter1F.asm | 14 ++--- maps/CinnabarIsland.asm | 14 ++--- maps/CinnabarPokecenter1F.asm | 14 ++--- maps/CinnabarPokecenter2FBeta.asm | 12 ++-- maps/Colosseum.asm | 14 ++--- maps/CopycatsHouse1F.asm | 14 ++--- maps/CopycatsHouse2F.asm | 14 ++--- maps/DanceTheatre.asm | 14 ++--- maps/DarkCaveBlackthornEntrance.asm | 14 ++--- maps/DarkCaveVioletEntrance.asm | 14 ++--- maps/DayCare.asm | 14 ++--- maps/DayOfWeekSiblingsHouse.asm | 14 ++--- maps/DiglettsCave.asm | 14 ++--- maps/DragonShrine.asm | 14 ++--- maps/DragonsDen1F.asm | 12 ++-- maps/DragonsDenB1F.asm | 14 ++--- maps/EarlsPokemonAcademy.asm | 14 ++--- maps/EcruteakCity.asm | 14 ++--- maps/EcruteakGym.asm | 14 ++--- maps/EcruteakItemfinderHouse.asm | 14 ++--- maps/EcruteakLugiaSpeechHouse.asm | 14 ++--- maps/EcruteakMart.asm | 14 ++--- maps/EcruteakPokecenter1F.asm | 14 ++--- maps/EcruteakTinTowerEntrance.asm | 14 ++--- maps/ElmsHouse.asm | 14 ++--- maps/ElmsLab.asm | 14 ++--- maps/FastShip1F.asm | 14 ++--- maps/FastShipB1F.asm | 14 ++--- maps/FastShipCabins_NNW_NNE_NE.asm | 14 ++--- maps/FastShipCabins_SE_SSE_CaptainsCabin.asm | 14 ++--- maps/FastShipCabins_SW_SSW_NW.asm | 14 ++--- maps/FightingDojo.asm | 14 ++--- maps/FuchsiaCity.asm | 14 ++--- maps/FuchsiaGym.asm | 14 ++--- maps/FuchsiaMart.asm | 14 ++--- maps/FuchsiaPokecenter1F.asm | 14 ++--- maps/FuchsiaPokecenter2FBeta.asm | 12 ++-- maps/GoldenrodBikeShop.asm | 14 ++--- maps/GoldenrodCity.asm | 14 ++--- maps/GoldenrodDeptStore1F.asm | 14 ++--- maps/GoldenrodDeptStore2F.asm | 14 ++--- maps/GoldenrodDeptStore3F.asm | 14 ++--- maps/GoldenrodDeptStore4F.asm | 14 ++--- maps/GoldenrodDeptStore5F.asm | 14 ++--- maps/GoldenrodDeptStore6F.asm | 14 ++--- maps/GoldenrodDeptStoreB1F.asm | 14 ++--- maps/GoldenrodDeptStoreElevator.asm | 12 ++-- maps/GoldenrodDeptStoreRoof.asm | 14 ++--- maps/GoldenrodFlowerShop.asm | 14 ++--- maps/GoldenrodGameCorner.asm | 14 ++--- maps/GoldenrodGym.asm | 14 ++--- maps/GoldenrodHappinessRater.asm | 14 ++--- maps/GoldenrodMagnetTrainStation.asm | 14 ++--- maps/GoldenrodNameRater.asm | 14 ++--- maps/GoldenrodPPSpeechHouse.asm | 14 ++--- maps/GoldenrodPokecenter1F.asm | 14 ++--- maps/GoldenrodUnderground.asm | 14 ++--- ...oldenrodUndergroundSwitchRoomEntrances.asm | 14 ++--- maps/GoldenrodUndergroundWarehouse.asm | 14 ++--- maps/GuideGentsHouse.asm | 14 ++--- maps/HallOfFame.asm | 14 ++--- maps/IcePath1F.asm | 14 ++--- maps/IcePathB1F.asm | 14 ++--- maps/IcePathB2FBlackthornSide.asm | 14 ++--- maps/IcePathB2FMahoganySide.asm | 14 ++--- maps/IcePathB3F.asm | 14 ++--- maps/IlexForest.asm | 14 ++--- maps/IlexForestAzaleaGate.asm | 14 ++--- maps/IndigoPlateauPokecenter1F.asm | 14 ++--- maps/KarensRoom.asm | 14 ++--- maps/KogasRoom.asm | 14 ++--- maps/KurtsHouse.asm | 14 ++--- maps/LakeOfRage.asm | 14 ++--- maps/LakeOfRageHiddenPowerHouse.asm | 14 ++--- maps/LakeOfRageMagikarpHouse.asm | 14 ++--- maps/LancesRoom.asm | 14 ++--- maps/LavRadioTower1F.asm | 14 ++--- maps/LavenderMart.asm | 14 ++--- maps/LavenderNameRater.asm | 14 ++--- maps/LavenderPokecenter1F.asm | 14 ++--- maps/LavenderPokecenter2FBeta.asm | 12 ++-- maps/LavenderSpeechHouse.asm | 14 ++--- maps/LavenderTown.asm | 14 ++--- maps/MahoganyGym.asm | 14 ++--- maps/MahoganyMart1F.asm | 14 ++--- maps/MahoganyPokecenter1F.asm | 14 ++--- maps/MahoganyRedGyaradosSpeechHouse.asm | 14 ++--- maps/MahoganyTown.asm | 14 ++--- maps/ManiasHouse.asm | 14 ++--- maps/MobileBattleRoom.asm | 12 ++-- maps/MobileTradeRoom.asm | 12 ++-- maps/MountMoon.asm | 14 ++--- maps/MountMoonGiftShop.asm | 14 ++--- maps/MountMoonSquare.asm | 14 ++--- maps/MountMortar1FInside.asm | 14 ++--- maps/MountMortar1FOutside.asm | 14 ++--- maps/MountMortar2FInside.asm | 14 ++--- maps/MountMortarB1F.asm | 14 ++--- maps/MoveDeletersHouse.asm | 14 ++--- maps/MrFujisHouse.asm | 14 ++--- maps/MrPokemonsHouse.asm | 14 ++--- maps/MrPsychicsHouse.asm | 14 ++--- maps/NationalPark.asm | 14 ++--- maps/NationalParkBugContest.asm | 14 ++--- maps/NewBarkTown.asm | 14 ++--- maps/OaksLab.asm | 14 ++--- maps/OlivineCafe.asm | 14 ++--- maps/OlivineCity.asm | 14 ++--- maps/OlivineGoodRodHouse.asm | 14 ++--- maps/OlivineGym.asm | 14 ++--- maps/OlivineHouseBeta.asm | 14 ++--- maps/OlivineLighthouse1F.asm | 14 ++--- maps/OlivineLighthouse2F.asm | 14 ++--- maps/OlivineLighthouse3F.asm | 14 ++--- maps/OlivineLighthouse4F.asm | 14 ++--- maps/OlivineLighthouse5F.asm | 14 ++--- maps/OlivineLighthouse6F.asm | 14 ++--- maps/OlivineMart.asm | 14 ++--- maps/OlivinePokecenter1F.asm | 14 ++--- maps/OlivinePort.asm | 14 ++--- maps/OlivinePortPassage.asm | 14 ++--- maps/OlivinePunishmentSpeechHouse.asm | 14 ++--- maps/OlivineTimsHouse.asm | 14 ++--- maps/PalletTown.asm | 14 ++--- maps/PewterCity.asm | 14 ++--- maps/PewterGym.asm | 14 ++--- maps/PewterMart.asm | 14 ++--- maps/PewterNidoranSpeechHouse.asm | 14 ++--- maps/PewterPokecenter1F.asm | 14 ++--- maps/PewterPokecenter2FBeta.asm | 12 ++-- maps/PewterSnoozeSpeechHouse.asm | 14 ++--- maps/PlayersHouse1F.asm | 14 ++--- maps/PlayersHouse2F.asm | 14 ++--- maps/PlayersNeighborsHouse.asm | 14 ++--- maps/PokeSeersHouse.asm | 14 ++--- maps/Pokecenter2F.asm | 14 ++--- maps/PokecomCenterAdminOfficeMobile.asm | 14 ++--- maps/PokemonFanClub.asm | 14 ++--- maps/PowerPlant.asm | 14 ++--- maps/RadioTower1F.asm | 14 ++--- maps/RadioTower2F.asm | 14 ++--- maps/RadioTower3F.asm | 14 ++--- maps/RadioTower4F.asm | 14 ++--- maps/RadioTower5F.asm | 14 ++--- maps/RedsHouse1F.asm | 14 ++--- maps/RedsHouse2F.asm | 12 ++-- maps/RockTunnel1F.asm | 14 ++--- maps/RockTunnelB1F.asm | 14 ++--- maps/Route1.asm | 14 ++--- maps/Route10North.asm | 12 ++-- maps/Route10Pokecenter1F.asm | 14 ++--- maps/Route10Pokecenter2FBeta.asm | 12 ++-- maps/Route10South.asm | 14 ++--- maps/Route11.asm | 14 ++--- maps/Route12.asm | 14 ++--- maps/Route12SuperRodHouse.asm | 14 ++--- maps/Route13.asm | 14 ++--- maps/Route14.asm | 14 ++--- maps/Route15.asm | 14 ++--- maps/Route15FuchsiaGate.asm | 14 ++--- maps/Route16.asm | 12 ++-- maps/Route16FuchsiaSpeechHouse.asm | 14 ++--- maps/Route16Gate.asm | 14 ++--- maps/Route17.asm | 14 ++--- maps/Route17Route18Gate.asm | 14 ++--- maps/Route18.asm | 14 ++--- maps/Route19.asm | 14 ++--- maps/Route19FuchsiaGate.asm | 14 ++--- maps/Route2.asm | 14 ++--- maps/Route20.asm | 14 ++--- maps/Route21.asm | 14 ++--- maps/Route22.asm | 12 ++-- maps/Route23.asm | 12 ++-- maps/Route24.asm | 14 ++--- maps/Route25.asm | 14 ++--- maps/Route26.asm | 14 ++--- maps/Route26HealHouse.asm | 14 ++--- maps/Route27.asm | 14 ++--- maps/Route27SandstormHouse.asm | 14 ++--- maps/Route28.asm | 12 ++-- maps/Route28SteelWingHouse.asm | 14 ++--- maps/Route29.asm | 14 ++--- maps/Route29Route46Gate.asm | 14 ++--- maps/Route2Gate.asm | 14 ++--- maps/Route2NuggetHouse.asm | 14 ++--- maps/Route3.asm | 14 ++--- maps/Route30.asm | 14 ++--- maps/Route30BerryHouse.asm | 14 ++--- maps/Route31.asm | 14 ++--- maps/Route31VioletGate.asm | 14 ++--- maps/Route32.asm | 14 ++--- maps/Route32Pokecenter1F.asm | 14 ++--- maps/Route32RuinsOfAlphGate.asm | 14 ++--- maps/Route33.asm | 14 ++--- maps/Route34.asm | 14 ++--- maps/Route34IlexForestGate.asm | 14 ++--- maps/Route35.asm | 14 ++--- maps/Route35GoldenrodGate.asm | 14 ++--- maps/Route35NationalParkGate.asm | 14 ++--- maps/Route36.asm | 14 ++--- maps/Route36NationalParkGate.asm | 14 ++--- maps/Route36RuinsOfAlphGate.asm | 14 ++--- maps/Route37.asm | 14 ++--- maps/Route38.asm | 14 ++--- maps/Route38EcruteakGate.asm | 14 ++--- maps/Route39.asm | 14 ++--- maps/Route39Barn.asm | 14 ++--- maps/Route39Farmhouse.asm | 14 ++--- maps/Route4.asm | 14 ++--- maps/Route40.asm | 14 ++--- maps/Route40BattleTowerGate.asm | 14 ++--- maps/Route41.asm | 14 ++--- maps/Route42.asm | 14 ++--- maps/Route42EcruteakGate.asm | 14 ++--- maps/Route43.asm | 14 ++--- maps/Route43Gate.asm | 14 ++--- maps/Route43MahoganyGate.asm | 14 ++--- maps/Route44.asm | 14 ++--- maps/Route45.asm | 14 ++--- maps/Route46.asm | 14 ++--- maps/Route5.asm | 14 ++--- maps/Route5CleanseTagHouse.asm | 14 ++--- maps/Route5SaffronGate.asm | 14 ++--- maps/Route5UndergroundPathEntrance.asm | 14 ++--- maps/Route6.asm | 14 ++--- maps/Route6SaffronGate.asm | 14 ++--- maps/Route6UndergroundPathEntrance.asm | 12 ++-- maps/Route7.asm | 12 ++-- maps/Route7SaffronGate.asm | 14 ++--- maps/Route8.asm | 14 ++--- maps/Route8SaffronGate.asm | 14 ++--- maps/Route9.asm | 14 ++--- maps/RuinsOfAlphAerodactylChamber.asm | 12 ++-- maps/RuinsOfAlphAerodactylItemRoom.asm | 14 ++--- maps/RuinsOfAlphAerodactylWordRoom.asm | 12 ++-- maps/RuinsOfAlphHoOhChamber.asm | 12 ++-- maps/RuinsOfAlphHoOhItemRoom.asm | 14 ++--- maps/RuinsOfAlphHoOhWordRoom.asm | 12 ++-- maps/RuinsOfAlphInnerChamber.asm | 14 ++--- maps/RuinsOfAlphKabutoChamber.asm | 14 ++--- maps/RuinsOfAlphKabutoItemRoom.asm | 14 ++--- maps/RuinsOfAlphKabutoWordRoom.asm | 12 ++-- maps/RuinsOfAlphOmanyteChamber.asm | 12 ++-- maps/RuinsOfAlphOmanyteItemRoom.asm | 14 ++--- maps/RuinsOfAlphOmanyteWordRoom.asm | 12 ++-- maps/RuinsOfAlphOutside.asm | 14 ++--- maps/RuinsOfAlphResearchCenter.asm | 14 ++--- maps/SafariZoneBeta.asm | 12 ++-- maps/SafariZoneFuchsiaGateBeta.asm | 12 ++-- maps/SafariZoneMainOffice.asm | 12 ++-- maps/SafariZoneWardensHome.asm | 14 ++--- maps/SaffronCity.asm | 14 ++--- maps/SaffronGym.asm | 14 ++--- maps/SaffronMagnetTrainStation.asm | 14 ++--- maps/SaffronMart.asm | 14 ++--- maps/SaffronPokecenter1F.asm | 14 ++--- maps/SaffronPokecenter2FBeta.asm | 12 ++-- maps/SeafoamGym.asm | 14 ++--- maps/SilphCo1F.asm | 14 ++--- maps/SilverCaveItemRooms.asm | 14 ++--- maps/SilverCaveOutside.asm | 12 ++-- maps/SilverCavePokecenter1F.asm | 14 ++--- maps/SilverCaveRoom1.asm | 14 ++--- maps/SilverCaveRoom2.asm | 14 ++--- maps/SilverCaveRoom3.asm | 14 ++--- maps/SlowpokeWellB1F.asm | 14 ++--- maps/SlowpokeWellB2F.asm | 14 ++--- maps/SoulHouse.asm | 14 ++--- maps/SproutTower1F.asm | 14 ++--- maps/SproutTower2F.asm | 14 ++--- maps/SproutTower3F.asm | 14 ++--- maps/TeamRocketBaseB1F.asm | 14 ++--- maps/TeamRocketBaseB2F.asm | 14 ++--- maps/TeamRocketBaseB3F.asm | 14 ++--- maps/TimeCapsule.asm | 14 ++--- maps/TinTower1F.asm | 14 ++--- maps/TinTower2F.asm | 12 ++-- maps/TinTower3F.asm | 14 ++--- maps/TinTower4F.asm | 14 ++--- maps/TinTower5F.asm | 14 ++--- maps/TinTower6F.asm | 14 ++--- maps/TinTower7F.asm | 14 ++--- maps/TinTower8F.asm | 14 ++--- maps/TinTower9F.asm | 14 ++--- maps/TinTowerRoof.asm | 14 ++--- maps/TohjoFalls.asm | 14 ++--- maps/TradeCenter.asm | 14 ++--- maps/TrainerHouse1F.asm | 14 ++--- maps/TrainerHouseB1F.asm | 14 ++--- maps/UndergroundPath.asm | 12 ++-- maps/UnionCave1F.asm | 14 ++--- maps/UnionCaveB1F.asm | 14 ++--- maps/UnionCaveB2F.asm | 14 ++--- maps/VermilionCity.asm | 14 ++--- maps/VermilionDiglettsCaveSpeechHouse.asm | 14 ++--- maps/VermilionFishingSpeechHouse.asm | 14 ++--- maps/VermilionGym.asm | 14 ++--- maps/VermilionMagnetTrainSpeechHouse.asm | 14 ++--- maps/VermilionMart.asm | 14 ++--- maps/VermilionPokecenter1F.asm | 14 ++--- maps/VermilionPokecenter2FBeta.asm | 12 ++-- maps/VermilionPort.asm | 14 ++--- maps/VermilionPortPassage.asm | 14 ++--- maps/VictoryRoad.asm | 14 ++--- maps/VictoryRoadGate.asm | 14 ++--- maps/VioletCity.asm | 14 ++--- maps/VioletGym.asm | 14 ++--- maps/VioletKylesHouse.asm | 14 ++--- maps/VioletMart.asm | 14 ++--- maps/VioletNicknameSpeechHouse.asm | 14 ++--- maps/VioletPokecenter1F.asm | 14 ++--- maps/ViridianCity.asm | 14 ++--- maps/ViridianGym.asm | 14 ++--- maps/ViridianMart.asm | 14 ++--- maps/ViridianNicknameSpeechHouse.asm | 14 ++--- maps/ViridianPokecenter1F.asm | 14 ++--- maps/ViridianPokecenter2FBeta.asm | 12 ++-- maps/WhirlIslandB1F.asm | 14 ++--- maps/WhirlIslandB2F.asm | 14 ++--- maps/WhirlIslandCave.asm | 12 ++-- maps/WhirlIslandLugiaChamber.asm | 14 ++--- maps/WhirlIslandNE.asm | 14 ++--- maps/WhirlIslandNW.asm | 12 ++-- maps/WhirlIslandSE.asm | 12 ++-- maps/WhirlIslandSW.asm | 14 ++--- maps/WillsRoom.asm | 14 ++--- maps/WiseTriosRoom.asm | 14 ++--- 392 files changed, 2750 insertions(+), 2695 deletions(-) diff --git a/docs/map_event_scripts.md b/docs/map_event_scripts.md index f85d6a9fc..dce205a1f 100644 --- a/docs/map_event_scripts.md +++ b/docs/map_event_scripts.md @@ -24,7 +24,7 @@ ## Object constants 
-	object_const_def ; object_event constants
+	object_const_def
 	const MAPNAME_OBJECTNAME
@@ -39,7 +39,7 @@ ### Scene scripts 
-	db N ; scene scripts
+	def_scene_scripts
 	scene_script script
@@ -47,7 +47,7 @@ ### Callbacks 
-	db N ; callbacks
+	def_callbacks
 	callback type, script
@@ -105,7 +105,7 @@ ### Warp events 
-	db N ; warp events
+	def_warp_events
 	warp_event x, y, map, warp_id
@@ -113,7 +113,7 @@ ### Coord events 
-	db N ; coord events
+	def_coord_events
 	coord_event x, y, scene_id, script
@@ -121,7 +121,7 @@ ### BG events 
-	db N ; bg events
+	def_bg_events
 	bg_event x, y, type, script
@@ -148,7 +148,7 @@ ### Object events 
-	db N ; object events
+	def_object_events
 	object_event x, y, sprite, movement, rx, ry, h1, h2, palette, type, range, script, event_flag
diff --git a/engine/overworld/player_object.asm b/engine/overworld/player_object.asm index 8bb9d273e..41b8797cf 100644 --- a/engine/overworld/player_object.asm +++ b/engine/overworld/player_object.asm @@ -55,6 +55,7 @@ PlayerObjectTemplate: ; A dummy map object used to initialize the player object. ; Shorter than the actual amount copied by two bytes. ; Said bytes seem to be unused. +_NUM_OBJECT_EVENTS = 0 object_event -4, -4, SPRITE_CHRIS, SPRITEMOVEDATA_PLAYER, 15, 15, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, 0, -1 CopyDECoordsToMapObject:: diff --git a/macros/legacy.asm b/macros/legacy.asm index 6ff29fc5f..a561b3fca 100644 --- a/macros/legacy.asm +++ b/macros/legacy.asm @@ -223,18 +223,12 @@ signpost: MACRO ENDM person_event: MACRO -; object_event \3, \2, \1, \4, \5, \6, \7, \8, \9, \10, \11, \12, \13 - db \1, \2 + 4, \3 + 4, \4 - dn \6, \5 - db \7, \8 - shift - dn \8, \9 - shift - db \9 - shift - dw \9 - shift - dw \9 +_s = \1 +_y = \2 +_x = \3 +_m = \4 + shift 4 + object_event _x, _y, _s, _m, \1, \2, \3, \4, \5, \6, \7, \8, \9 ENDM PERSONTYPE_SCRIPT EQUS "OBJECTTYPE_SCRIPT" diff --git a/macros/scripts/maps.asm b/macros/scripts/maps.asm index edf2b4213..d9ffd83e1 100644 --- a/macros/scripts/maps.asm +++ b/macros/scripts/maps.asm @@ -5,16 +5,45 @@ ENDM object_const_def EQUS "const_def 2" +def_scene_scripts: MACRO +if DEF(_NUM_SCENE_SCRIPTS) + PURGE _NUM_SCENE_SCRIPTS +endc +_NUM_SCENE_SCRIPTS EQUS "_NUM_SCENE_SCRIPTS_\@" + db _NUM_SCENE_SCRIPTS +_NUM_SCENE_SCRIPTS = 0 +ENDM + scene_script: MACRO ;\1: script pointer dw \1 dw 0 ; filler +_NUM_SCENE_SCRIPTS = _NUM_SCENE_SCRIPTS + 1 +ENDM + +def_callbacks: MACRO +if DEF(_NUM_CALLBACKS) + PURGE _NUM_CALLBACKS +endc +_NUM_CALLBACKS EQUS "_NUM_CALLBACKS_\@" + db _NUM_CALLBACKS +_NUM_CALLBACKS = 0 ENDM callback: MACRO ;\1: type: a MAPCALLBACK_* constant ;\2: script pointer dbw \1, \2 +_NUM_CALLBACKS = _NUM_CALLBACKS + 1 +ENDM + +def_warp_events: MACRO +if DEF(_NUM_WARP_EVENTS) + PURGE _NUM_WARP_EVENTS +endc +_NUM_WARP_EVENTS EQUS "_NUM_WARP_EVENTS_\@" + db _NUM_WARP_EVENTS +_NUM_WARP_EVENTS = 0 ENDM warp_event: MACRO @@ -24,6 +53,16 @@ warp_event: MACRO ;\4: warp destination: starts at 1 db \2, \1, \4 map_id \3 +_NUM_WARP_EVENTS = _NUM_WARP_EVENTS + 1 +ENDM + +def_coord_events: MACRO +if DEF(_NUM_COORD_EVENTS) + PURGE _NUM_COORD_EVENTS +endc +_NUM_COORD_EVENTS EQUS "_NUM_COORD_EVENTS_\@" + db _NUM_COORD_EVENTS +_NUM_COORD_EVENTS = 0 ENDM coord_event: MACRO @@ -35,6 +74,16 @@ coord_event: MACRO db 0 ; filler dw \4 dw 0 ; filler +_NUM_COORD_EVENTS = _NUM_COORD_EVENTS + 1 +ENDM + +def_bg_events: MACRO +if DEF(_NUM_BG_EVENTS) + PURGE _NUM_BG_EVENTS +endc +_NUM_BG_EVENTS EQUS "_NUM_BG_EVENTS_\@" + db _NUM_BG_EVENTS +_NUM_BG_EVENTS = 0 ENDM bg_event: MACRO @@ -44,6 +93,16 @@ bg_event: MACRO ;\4: script pointer db \2, \1, \3 dw \4 +_NUM_BG_EVENTS = _NUM_BG_EVENTS + 1 +ENDM + +def_object_events: MACRO +if DEF(_NUM_OBJECT_EVENTS) + PURGE _NUM_OBJECT_EVENTS +endc +_NUM_OBJECT_EVENTS EQUS "_NUM_OBJECT_EVENTS_\@" + db _NUM_OBJECT_EVENTS +_NUM_OBJECT_EVENTS = 0 ENDM object_event: MACRO @@ -74,6 +133,7 @@ object_event: MACRO dw \9 shift dw \9 +_NUM_OBJECT_EVENTS = _NUM_OBJECT_EVENTS + 1 ENDM trainer: MACRO diff --git a/maps/AzaleaGym.asm b/maps/AzaleaGym.asm index 71d29061c..ccb70ebed 100644 --- a/maps/AzaleaGym.asm +++ b/maps/AzaleaGym.asm @@ -1,4 +1,4 @@ - object_const_def ; object_event constants + object_const_def const AZALEAGYM_BUGSY const AZALEAGYM_BUG_CATCHER1 const AZALEAGYM_BUG_CATCHER2 @@ -8,9 +8,9 @@ const AZALEAGYM_GYM_GUIDE AzaleaGym_MapScripts: - db 0 ; scene scripts + def_scene_scripts - db 0 ; callbacks + def_callbacks AzaleaGymBugsyScript: faceplayer @@ -362,17 +362,17 @@ AzaleaGymGuideWinText: AzaleaGym_MapEvents: db 0, 0 ; filler - db 2 ; warp events + def_warp_events warp_event 4, 15, AZALEA_TOWN, 5 warp_event 5, 15, AZALEA_TOWN, 5 - db 0 ; coord events + def_coord_events - db 2 ; bg events + def_bg_events bg_event 3, 13, BGEVENT_READ, AzaleaGymStatue bg_event 6, 13, BGEVENT_READ, AzaleaGymStatue - db 7 ; object events + def_object_events object_event 5, 7, SPRITE_BUGSY, SPRITEMOVEDATA_SPINRANDOM_SLOW, 0, 0, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_SCRIPT, 0, AzaleaGymBugsyScript, -1 object_event 5, 3, SPRITE_BUG_CATCHER, SPRITEMOVEDATA_SPINRANDOM_FAST, 0, 0, -1, -1, PAL_NPC_BROWN, OBJECTTYPE_TRAINER, 2, TrainerBugCatcherBenny, -1 object_event 8, 8, SPRITE_BUG_CATCHER, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_BROWN, OBJECTTYPE_TRAINER, 3, TrainerBugCatcherAl, -1 diff --git a/maps/AzaleaMart.asm b/maps/AzaleaMart.asm index c6d8fbbb4..26d7d2791 100644 --- a/maps/AzaleaMart.asm +++ b/maps/AzaleaMart.asm @@ -1,12 +1,12 @@ - object_const_def ; object_event constants + object_const_def const AZALEAMART_CLERK const AZALEAMART_COOLTRAINER_M const AZALEAMART_BUG_CATCHER AzaleaMart_MapScripts: - db 0 ; scene scripts + def_scene_scripts - db 0 ; callbacks + def_callbacks AzaleaMartClerkScript: opentext @@ -46,15 +46,15 @@ AzaleaMartBugCatcherText: AzaleaMart_MapEvents: db 0, 0 ; filler - db 2 ; warp events + def_warp_events warp_event 2, 7, AZALEA_TOWN, 3 warp_event 3, 7, AZALEA_TOWN, 3 - db 0 ; coord events + def_coord_events - db 0 ; bg events + def_bg_events - db 3 ; object events + def_object_events object_event 1, 3, SPRITE_CLERK, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, AzaleaMartClerkScript, -1 object_event 2, 5, SPRITE_COOLTRAINER_M, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, AzaleaMartCooltrainerMScript, -1 object_event 7, 2, SPRITE_BUG_CATCHER, SPRITEMOVEDATA_WALK_LEFT_RIGHT, 2, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_SCRIPT, 0, AzaleaMartBugCatcherScript, -1 diff --git a/maps/AzaleaPokecenter1F.asm b/maps/AzaleaPokecenter1F.asm index b4b7e0405..bdd5e1281 100644 --- a/maps/AzaleaPokecenter1F.asm +++ b/maps/AzaleaPokecenter1F.asm @@ -1,14 +1,14 @@ - object_const_def ; object_event constants + object_const_def const AZALEAPOKECENTER1F_NURSE const AZALEAPOKECENTER1F_GENTLEMAN const AZALEAPOKECENTER1F_FISHING_GURU const AZALEAPOKECENTER1F_POKEFAN_F AzaleaPokecenter1F_MapScripts: - db 1 ; scene scripts + def_scene_scripts scene_script .DummyScene - db 0 ; callbacks + def_callbacks .DummyScene: end @@ -78,16 +78,16 @@ AzaleaPokecenter1FPokefanFText: AzaleaPokecenter1F_MapEvents: db 0, 0 ; filler - db 3 ; warp events + def_warp_events 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 + def_coord_events - db 0 ; bg events + def_bg_events - db 4 ; object events + def_object_events object_event 3, 1, SPRITE_NURSE, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, AzaleaPokecenter1FNurseScript, -1 object_event 9, 6, SPRITE_GENTLEMAN, SPRITEMOVEDATA_WALK_UP_DOWN, 0, 1, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, AzaleaPokecenter1FGentlemanScript, -1 object_event 6, 1, SPRITE_FISHING_GURU, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, AzaleaPokecenter1FFishingGuruScript, -1 diff --git a/maps/AzaleaTown.asm b/maps/AzaleaTown.asm index da84cf04e..7e771e86a 100644 --- a/maps/AzaleaTown.asm +++ b/maps/AzaleaTown.asm @@ -1,4 +1,4 @@ - object_const_def ; object_event constants + object_const_def const AZALEATOWN_AZALEA_ROCKET1 const AZALEATOWN_GRAMPS const AZALEATOWN_TEACHER @@ -13,12 +13,12 @@ const AZALEATOWN_KURT_OUTSIDE AzaleaTown_MapScripts: - db 3 ; scene scripts + def_scene_scripts scene_script .DummyScene0 ; SCENE_AZALEATOWN_NOTHING scene_script .DummyScene1 ; SCENE_AZALEATOWN_RIVAL_BATTLE scene_script .DummyScene2 ; SCENE_AZALEATOWN_KURT_RETURNS_GS_BALL - db 1 ; callbacks + def_callbacks callback MAPCALLBACK_NEWMAP, .Flypoint .DummyScene0: @@ -456,7 +456,7 @@ AzaleaTownIlexForestSignText: AzaleaTown_MapEvents: db 0, 0 ; filler - db 8 ; warp events + def_warp_events warp_event 15, 9, AZALEA_POKECENTER_1F, 1 warp_event 21, 13, CHARCOAL_KILN, 1 warp_event 21, 5, AZALEA_MART, 2 @@ -466,12 +466,12 @@ AzaleaTown_MapEvents: warp_event 2, 10, ILEX_FOREST_AZALEA_GATE, 3 warp_event 2, 11, ILEX_FOREST_AZALEA_GATE, 4 - db 3 ; coord events + def_coord_events coord_event 5, 10, SCENE_AZALEATOWN_RIVAL_BATTLE, AzaleaTownRivalBattleScene1 coord_event 5, 11, SCENE_AZALEATOWN_RIVAL_BATTLE, AzaleaTownRivalBattleScene2 coord_event 9, 6, SCENE_AZALEATOWN_KURT_RETURNS_GS_BALL, AzaleaTownCelebiScene - db 9 ; bg events + def_bg_events bg_event 19, 9, BGEVENT_READ, AzaleaTownSign bg_event 10, 9, BGEVENT_READ, KurtsHouseSign bg_event 14, 15, BGEVENT_READ, AzaleaGymSign @@ -482,7 +482,7 @@ AzaleaTown_MapEvents: bg_event 3, 9, BGEVENT_READ, AzaleaTownIlextForestSign bg_event 31, 6, BGEVENT_ITEM, AzaleaTownHiddenFullHeal - db 12 ; object events + def_object_events object_event 31, 9, SPRITE_AZALEA_ROCKET, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, AzaleaTownRocket1Script, EVENT_AZALEA_TOWN_SLOWPOKETAIL_ROCKET object_event 21, 9, SPRITE_GRAMPS, SPRITEMOVEDATA_WANDER, 1, 2, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, AzaleaTownGrampsScript, -1 object_event 15, 13, SPRITE_TEACHER, SPRITEMOVEDATA_WALK_UP_DOWN, 0, 2, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_SCRIPT, 0, AzaleaTownTeacherScript, -1 diff --git a/maps/BattleTower1F.asm b/maps/BattleTower1F.asm index a0f27d74d..014c51cc1 100644 --- a/maps/BattleTower1F.asm +++ b/maps/BattleTower1F.asm @@ -1,4 +1,4 @@ - object_const_def ; object_event constants + object_const_def const BATTLETOWER1F_RECEPTIONIST const BATTLETOWER1F_YOUNGSTER const BATTLETOWER1F_COOLTRAINER_F @@ -6,11 +6,11 @@ const BATTLETOWER1F_GRANNY BattleTower1F_MapScripts: - db 2 ; scene scripts + def_scene_scripts scene_script .Scene0 ; SCENE_DEFAULT scene_script .Scene1 ; SCENE_FINISHED - db 0 ; callbacks + def_callbacks .Scene0: setval BATTLETOWERACTION_CHECKSAVEFILEISYOURS @@ -794,17 +794,17 @@ Text_BattleTowerBugCatcher: BattleTower1F_MapEvents: db 0, 0 ; filler - db 3 ; warp events + def_warp_events 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 + def_coord_events - db 1 ; bg events + def_bg_events bg_event 6, 6, BGEVENT_READ, BattleTower1FRulesSign - db 5 ; object events + def_object_events object_event 7, 6, SPRITE_RECEPTIONIST, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, BattleTower1FReceptionistScript, -1 object_event 14, 9, SPRITE_YOUNGSTER, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, PAL_NPC_BROWN, OBJECTTYPE_SCRIPT, 0, BattleTower1FYoungsterScript, -1 object_event 4, 9, SPRITE_COOLTRAINER_F, SPRITEMOVEDATA_WALK_LEFT_RIGHT, 1, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_SCRIPT, 0, BattleTower1FCooltrainerFScript, -1 diff --git a/maps/BattleTowerBattleRoom.asm b/maps/BattleTowerBattleRoom.asm index 0b0cc3cb1..a62182716 100644 --- a/maps/BattleTowerBattleRoom.asm +++ b/maps/BattleTowerBattleRoom.asm @@ -1,13 +1,13 @@ - object_const_def ; object_event constants + object_const_def const BATTLETOWERBATTLEROOM_YOUNGSTER const BATTLETOWERBATTLEROOM_RECEPTIONIST BattleTowerBattleRoom_MapScripts: - db 2 ; scene scripts + def_scene_scripts scene_script .EnterBattleRoom ; SCENE_DEFAULT scene_script .DummyScene ; SCENE_FINISHED - db 0 ; callbacks + def_callbacks .EnterBattleRoom: disappear BATTLETOWERBATTLEROOM_YOUNGSTER @@ -139,14 +139,14 @@ Text_ReturnedAfterSave_Mobile: BattleTowerBattleRoom_MapEvents: db 0, 0 ; filler - db 2 ; warp events + def_warp_events warp_event 3, 7, BATTLE_TOWER_HALLWAY, 4 warp_event 4, 7, BATTLE_TOWER_HALLWAY, 4 - db 0 ; coord events + def_coord_events - db 0 ; bg events + def_bg_events - db 2 ; object events + def_object_events object_event 4, 0, SPRITE_YOUNGSTER, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, ObjectEvent, EVENT_BATTLE_TOWER_BATTLE_ROOM_YOUNGSTER object_event 1, 6, SPRITE_RECEPTIONIST, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, ObjectEvent, -1 diff --git a/maps/BattleTowerElevator.asm b/maps/BattleTowerElevator.asm index 9f1764fbb..e46ed0047 100644 --- a/maps/BattleTowerElevator.asm +++ b/maps/BattleTowerElevator.asm @@ -1,12 +1,12 @@ - object_const_def ; object_event constants + object_const_def const BATTLETOWERELEVATOR_RECEPTIONIST BattleTowerElevator_MapScripts: - db 2 ; scene scripts + def_scene_scripts scene_script .Scene0 ; SCENE_DEFAULT scene_script .Scene1 ; SCENE_FINISHED - db 0 ; callbacks + def_callbacks .Scene0: prioritysjump .RideElevator @@ -44,13 +44,13 @@ MovementData_BattleTowerElevatorPlayerWalksIn: BattleTowerElevator_MapEvents: db 0, 0 ; filler - db 2 ; warp events + def_warp_events warp_event 1, 3, BATTLE_TOWER_HALLWAY, 1 warp_event 2, 3, BATTLE_TOWER_HALLWAY, 1 - db 0 ; coord events + def_coord_events - db 0 ; bg events + def_bg_events - db 1 ; object events + def_object_events object_event 1, 2, SPRITE_RECEPTIONIST, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, MovementData_BattleTowerElevatorReceptionistWalksIn, -1 diff --git a/maps/BattleTowerHallway.asm b/maps/BattleTowerHallway.asm index 92f050580..c00a21b33 100644 --- a/maps/BattleTowerHallway.asm +++ b/maps/BattleTowerHallway.asm @@ -1,12 +1,12 @@ - object_const_def ; object_event constants + object_const_def const BATTLETOWERHALLWAY_RECEPTIONIST BattleTowerHallway_MapScripts: - db 2 ; scene scripts + def_scene_scripts scene_script .Scene0 ; SCENE_DEFAULT scene_script .Scene1 ; SCENE_FINISHED - db 0 ; callbacks + def_callbacks .Scene0: prioritysjump .ChooseBattleRoom @@ -77,7 +77,7 @@ BattleTowerHallway_MapScripts: BattleTowerHallway_MapEvents: db 0, 0 ; filler - db 6 ; warp events + def_warp_events 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 @@ -85,9 +85,9 @@ BattleTowerHallway_MapEvents: warp_event 13, 0, BATTLE_TOWER_BATTLE_ROOM, 1 warp_event 15, 0, BATTLE_TOWER_BATTLE_ROOM, 1 - db 0 ; coord events + def_coord_events - db 0 ; bg events + def_bg_events - db 1 ; object events + def_object_events object_event 11, 2, SPRITE_RECEPTIONIST, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, BattleTowerHallway_MapEvents, -1 diff --git a/maps/BattleTowerOutside.asm b/maps/BattleTowerOutside.asm index f4d7e24a9..e38ab7c61 100644 --- a/maps/BattleTowerOutside.asm +++ b/maps/BattleTowerOutside.asm @@ -1,13 +1,13 @@ - object_const_def ; object_event constants + object_const_def const BATTLETOWEROUTSIDE_STANDING_YOUNGSTER const BATTLETOWEROUTSIDE_BEAUTY const BATTLETOWEROUTSIDE_SAILOR const BATTLETOWEROUTSIDE_LASS BattleTowerOutside_MapScripts: - db 0 ; scene scripts + def_scene_scripts - db 2 ; callbacks + def_callbacks callback MAPCALLBACK_TILES, .Callback1 callback MAPCALLBACK_OBJECTS, .Callback2 @@ -134,18 +134,18 @@ BattleTowerOutsideText_DoorsOpen: BattleTowerOutside_MapEvents: db 0, 0 ; filler - db 4 ; warp events + def_warp_events 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 + def_coord_events - db 1 ; bg events + def_bg_events bg_event 10, 10, BGEVENT_READ, BattleTowerOutsideSign - db 4 ; object events + def_object_events object_event 6, 12, SPRITE_STANDING_YOUNGSTER, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_SCRIPT, 0, BattleTowerOutsideYoungsterScript, -1 object_event 13, 11, SPRITE_BEAUTY, SPRITEMOVEDATA_WANDER, 1, 1, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_SCRIPT, 0, BattleTowerOutsideBeautyScript, -1 object_event 12, 18, SPRITE_SAILOR, SPRITEMOVEDATA_WALK_LEFT_RIGHT, 1, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, BattleTowerOutsideSailorScript, EVENT_BATTLE_TOWER_OUTSIDE_SAILOR diff --git a/maps/BillsBrothersHouse.asm b/maps/BillsBrothersHouse.asm index b9c6d469f..14cf8a3bb 100644 --- a/maps/BillsBrothersHouse.asm +++ b/maps/BillsBrothersHouse.asm @@ -1,11 +1,11 @@ - object_const_def ; object_event constants + object_const_def const BILLSBROTHERSHOUSE_POKEFAN_F const BILLSBROTHERSHOUSE_YOUNGSTER BillsBrothersHouse_MapScripts: - db 0 ; scene scripts + def_scene_scripts - db 0 ; callbacks + def_callbacks BillsBrotherScript: jumptextfaceplayer BillsBrotherText @@ -28,14 +28,14 @@ BillsBrothersHouseYoungsterText: BillsBrothersHouse_MapEvents: db 0, 0 ; filler - db 2 ; warp events + def_warp_events warp_event 2, 7, FUCHSIA_CITY, 4 warp_event 3, 7, FUCHSIA_CITY, 4 - db 0 ; coord events + def_coord_events - db 0 ; bg events + def_bg_events - db 2 ; object events + def_object_events object_event 2, 3, SPRITE_POKEFAN_F, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_SCRIPT, 0, BillsBrotherScript, -1 object_event 6, 4, SPRITE_YOUNGSTER, SPRITEMOVEDATA_WALK_UP_DOWN, 0, 1, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, BillsBrothersHouseYoungsterScript, -1 diff --git a/maps/BillsFamilysHouse.asm b/maps/BillsFamilysHouse.asm index ba36a9876..07e61032e 100644 --- a/maps/BillsFamilysHouse.asm +++ b/maps/BillsFamilysHouse.asm @@ -1,12 +1,12 @@ - object_const_def ; object_event constants + object_const_def const BILLSFAMILYSHOUSE_BILL const BILLSFAMILYSHOUSE_POKEFAN_F const BILLSFAMILYSHOUSE_TWIN BillsFamilysHouse_MapScripts: - db 0 ; scene scripts + def_scene_scripts - db 0 ; callbacks + def_callbacks BillScript: faceplayer @@ -243,18 +243,18 @@ BillsSisterStorageSystemText: BillsFamilysHouse_MapEvents: db 0, 0 ; filler - db 2 ; warp events + def_warp_events warp_event 2, 7, GOLDENROD_CITY, 4 warp_event 3, 7, GOLDENROD_CITY, 4 - db 0 ; coord events + def_coord_events - db 3 ; bg events + def_bg_events bg_event 0, 1, BGEVENT_READ, BillsHouseBookshelf2 bg_event 1, 1, BGEVENT_READ, BillsHouseBookshelf1 bg_event 7, 1, BGEVENT_READ, BillsHouseRadio - db 3 ; object events + def_object_events object_event 2, 3, SPRITE_BILL, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, BillScript, EVENT_MET_BILL object_event 5, 3, SPRITE_POKEFAN_F, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, BillsMomScript, -1 object_event 5, 4, SPRITE_TWIN, SPRITEMOVEDATA_WANDER, 1, 1, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_SCRIPT, 0, BillsSisterScript, -1 diff --git a/maps/BillsHouse.asm b/maps/BillsHouse.asm index 61a81cc5d..3a829434f 100644 --- a/maps/BillsHouse.asm +++ b/maps/BillsHouse.asm @@ -1,10 +1,10 @@ - object_const_def ; object_event constants + object_const_def const BILLSHOUSE_GRAMPS BillsHouse_MapScripts: - db 0 ; scene scripts + def_scene_scripts - db 0 ; callbacks + def_callbacks BillsGrandpa: faceplayer @@ -354,13 +354,13 @@ BillsGrandpaPichuText: BillsHouse_MapEvents: db 0, 0 ; filler - db 2 ; warp events + def_warp_events warp_event 2, 7, ROUTE_25, 1 warp_event 3, 7, ROUTE_25, 1 - db 0 ; coord events + def_coord_events - db 0 ; bg events + def_bg_events - db 1 ; object events + def_object_events object_event 2, 3, SPRITE_GRAMPS, SPRITEMOVEDATA_STANDING_UP, 0, 2, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_SCRIPT, 0, BillsGrandpa, -1 diff --git a/maps/BlackthornCity.asm b/maps/BlackthornCity.asm index c51dba341..4f53b0b44 100644 --- a/maps/BlackthornCity.asm +++ b/maps/BlackthornCity.asm @@ -1,4 +1,4 @@ - object_const_def ; object_event constants + object_const_def const BLACKTHORNCITY_SUPER_NERD1 const BLACKTHORNCITY_SUPER_NERD2 const BLACKTHORNCITY_GRAMPS1 @@ -10,9 +10,9 @@ const BLACKTHORNCITY_COOLTRAINER_F2 BlackthornCity_MapScripts: - db 0 ; scene scripts + def_scene_scripts - db 2 ; callbacks + def_callbacks callback MAPCALLBACK_NEWMAP, .FlyPoint callback MAPCALLBACK_OBJECTS, .Santos @@ -313,7 +313,7 @@ BlackthornCityTrainerTipsText: BlackthornCity_MapEvents: db 0, 0 ; filler - db 8 ; warp events + def_warp_events 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 @@ -323,9 +323,9 @@ BlackthornCity_MapEvents: warp_event 36, 9, ICE_PATH_1F, 2 warp_event 20, 1, DRAGONS_DEN_1F, 1 - db 0 ; coord events + def_coord_events - db 7 ; bg events + def_bg_events bg_event 34, 24, BGEVENT_READ, BlackthornCitySign bg_event 17, 13, BGEVENT_READ, BlackthornGymSign bg_event 7, 31, BGEVENT_READ, MoveDeletersHouseSign @@ -334,7 +334,7 @@ BlackthornCity_MapEvents: bg_event 16, 29, BGEVENT_READ, BlackthornCityMartSign bg_event 22, 29, BGEVENT_READ, BlackthornCityPokecenterSign - db 9 ; object events + def_object_events object_event 18, 12, SPRITE_SUPER_NERD, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_SCRIPT, 0, BlackthornSuperNerdScript, EVENT_BLACKTHORN_CITY_SUPER_NERD_BLOCKS_GYM object_event 19, 12, SPRITE_SUPER_NERD, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_SCRIPT, 0, BlackthornSuperNerdScript, EVENT_BLACKTHORN_CITY_SUPER_NERD_DOES_NOT_BLOCK_GYM object_event 20, 2, SPRITE_GRAMPS, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, BlackthornGramps1Script, EVENT_BLACKTHORN_CITY_GRAMPS_BLOCKS_DRAGONS_DEN diff --git a/maps/BlackthornDragonSpeechHouse.asm b/maps/BlackthornDragonSpeechHouse.asm index a4773cbb9..9c1ed0e0a 100644 --- a/maps/BlackthornDragonSpeechHouse.asm +++ b/maps/BlackthornDragonSpeechHouse.asm @@ -1,11 +1,11 @@ - object_const_def ; object_event constants + object_const_def const BLACKTHORNDRAGONSPEECHHOUSE_GRANNY const BLACKTHORNDRAGONSPEECHHOUSE_EKANS BlackthornDragonSpeechHouse_MapScripts: - db 0 ; scene scripts + def_scene_scripts - db 0 ; callbacks + def_callbacks BlackthornDragonSpeechHouseGrannyScript: jumptextfaceplayer BlackthornDragonSpeechHouseGrannyText @@ -48,14 +48,14 @@ BlackthornDragonSpeechHouseDratiniText: BlackthornDragonSpeechHouse_MapEvents: db 0, 0 ; filler - db 2 ; warp events + def_warp_events warp_event 2, 7, BLACKTHORN_CITY, 2 warp_event 3, 7, BLACKTHORN_CITY, 2 - db 0 ; coord events + def_coord_events - db 0 ; bg events + def_bg_events - db 2 ; object events + def_object_events object_event 2, 3, SPRITE_GRANNY, SPRITEMOVEDATA_SPINRANDOM_SLOW, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, BlackthornDragonSpeechHouseGrannyScript, -1 object_event 5, 5, SPRITE_EKANS, SPRITEMOVEDATA_POKEMON, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_SCRIPT, 0, BlackthornDragonSpeechHouseDratiniScript, -1 diff --git a/maps/BlackthornEmysHouse.asm b/maps/BlackthornEmysHouse.asm index 5ecca7df2..89c8d087a 100644 --- a/maps/BlackthornEmysHouse.asm +++ b/maps/BlackthornEmysHouse.asm @@ -1,10 +1,10 @@ - object_const_def ; object_event constants + object_const_def const BLACKTHORNEMYSHOUSE_EMY BlackthornEmysHouse_MapScripts: - db 0 ; scene scripts + def_scene_scripts - db 0 ; callbacks + def_callbacks Emy: faceplayer @@ -20,15 +20,15 @@ EmysHouseBookshelf: BlackthornEmysHouse_MapEvents: db 0, 0 ; filler - db 2 ; warp events + def_warp_events warp_event 2, 7, BLACKTHORN_CITY, 3 warp_event 3, 7, BLACKTHORN_CITY, 3 - db 0 ; coord events + def_coord_events - db 2 ; bg events + def_bg_events bg_event 0, 1, BGEVENT_READ, EmysHouseBookshelf bg_event 1, 1, BGEVENT_READ, EmysHouseBookshelf - db 1 ; object events + def_object_events object_event 2, 3, SPRITE_LASS, SPRITEMOVEDATA_SPINRANDOM_SLOW, 0, 0, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_SCRIPT, 0, Emy, -1 diff --git a/maps/BlackthornGym1F.asm b/maps/BlackthornGym1F.asm index 39aa23bd4..85e27133b 100644 --- a/maps/BlackthornGym1F.asm +++ b/maps/BlackthornGym1F.asm @@ -1,4 +1,4 @@ - object_const_def ; object_event constants + object_const_def const BLACKTHORNGYM1F_CLAIR const BLACKTHORNGYM1F_COOLTRAINER_M1 const BLACKTHORNGYM1F_COOLTRAINER_M2 @@ -6,9 +6,9 @@ const BLACKTHORNGYM1F_GYM_GUIDE BlackthornGym1F_MapScripts: - db 0 ; scene scripts + def_scene_scripts - db 1 ; callbacks + def_callbacks callback MAPCALLBACK_TILES, .Boulders .Boulders: @@ -387,7 +387,7 @@ BlackthornGymGuideWinText: BlackthornGym1F_MapEvents: db 0, 0 ; filler - db 7 ; warp events + def_warp_events warp_event 4, 17, BLACKTHORN_CITY, 1 warp_event 5, 17, BLACKTHORN_CITY, 1 warp_event 1, 7, BLACKTHORN_GYM_2F, 1 @@ -396,13 +396,13 @@ BlackthornGym1F_MapEvents: warp_event 7, 7, BLACKTHORN_GYM_2F, 4 warp_event 7, 6, BLACKTHORN_GYM_2F, 5 - db 0 ; coord events + def_coord_events - db 2 ; bg events + def_bg_events bg_event 3, 15, BGEVENT_READ, BlackthornGymStatue bg_event 6, 15, BGEVENT_READ, BlackthornGymStatue - db 5 ; object events + def_object_events object_event 5, 3, SPRITE_CLAIR, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_SCRIPT, 0, BlackthornGymClairScript, -1 object_event 6, 6, SPRITE_COOLTRAINER_M, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_TRAINER, 3, TrainerCooltrainermMike, -1 object_event 1, 14, SPRITE_COOLTRAINER_M, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_TRAINER, 3, TrainerCooltrainermPaul, -1 diff --git a/maps/BlackthornGym2F.asm b/maps/BlackthornGym2F.asm index af0e431f7..7dd3ee3d2 100644 --- a/maps/BlackthornGym2F.asm +++ b/maps/BlackthornGym2F.asm @@ -1,4 +1,4 @@ - object_const_def ; object_event constants + object_const_def const BLACKTHORNGYM2F_COOLTRAINER_M const BLACKTHORNGYM2F_COOLTRAINER_F const BLACKTHORNGYM2F_BOULDER1 @@ -9,9 +9,9 @@ const BLACKTHORNGYM2F_BOULDER6 BlackthornGym2F_MapScripts: - db 0 ; scene scripts + def_scene_scripts - db 1 ; callbacks + def_callbacks callback MAPCALLBACK_CMDQUEUE, .SetUpStoneTable .SetUpStoneTable: @@ -126,18 +126,18 @@ BlackthornGym2FBoulderFellText: BlackthornGym2F_MapEvents: db 0, 0 ; filler - db 5 ; warp events + def_warp_events 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 + def_coord_events - db 0 ; bg events + def_bg_events - db 8 ; object events + def_object_events object_event 4, 1, SPRITE_COOLTRAINER_M, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_TRAINER, 1, TrainerCooltrainermCody, -1 object_event 4, 11, SPRITE_COOLTRAINER_F, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_TRAINER, 1, TrainerCooltrainerfFran, -1 object_event 8, 2, SPRITE_BOULDER, SPRITEMOVEDATA_STRENGTH_BOULDER, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, BlackthornGymBoulder, EVENT_BOULDER_IN_BLACKTHORN_GYM_1 diff --git a/maps/BlackthornMart.asm b/maps/BlackthornMart.asm index a05ae1eb2..3c8b0a384 100644 --- a/maps/BlackthornMart.asm +++ b/maps/BlackthornMart.asm @@ -1,12 +1,12 @@ - object_const_def ; object_event constants + object_const_def const BLACKTHORNMART_CLERK const BLACKTHORNMART_COOLTRAINER_M const BLACKTHORNMART_BLACK_BELT BlackthornMart_MapScripts: - db 0 ; scene scripts + def_scene_scripts - db 0 ; callbacks + def_callbacks BlackthornMartClerkScript: opentext @@ -47,15 +47,15 @@ BlackthornMartBlackBeltText: BlackthornMart_MapEvents: db 0, 0 ; filler - db 2 ; warp events + def_warp_events warp_event 2, 7, BLACKTHORN_CITY, 4 warp_event 3, 7, BLACKTHORN_CITY, 4 - db 0 ; coord events + def_coord_events - db 0 ; bg events + def_bg_events - db 3 ; object events + def_object_events object_event 1, 3, SPRITE_CLERK, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, BlackthornMartClerkScript, -1 object_event 7, 6, SPRITE_COOLTRAINER_M, SPRITEMOVEDATA_WALK_LEFT_RIGHT, 2, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, BlackthornMartCooltrainerMScript, -1 object_event 5, 2, SPRITE_BLACK_BELT, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_SCRIPT, 0, BlackthornMartBlackBeltScript, -1 diff --git a/maps/BlackthornPokecenter1F.asm b/maps/BlackthornPokecenter1F.asm index de3ea5c8f..ba28ece9b 100644 --- a/maps/BlackthornPokecenter1F.asm +++ b/maps/BlackthornPokecenter1F.asm @@ -1,13 +1,13 @@ - object_const_def ; object_event constants + object_const_def const BLACKTHORNPOKECENTER1F_NURSE const BLACKTHORNPOKECENTER1F_GENTLEMAN const BLACKTHORNPOKECENTER1F_TWIN const BLACKTHORNPOKECENTER1F_COOLTRAINER_M BlackthornPokecenter1F_MapScripts: - db 0 ; scene scripts + def_scene_scripts - db 0 ; callbacks + def_callbacks BlackthornPokecenter1FNurseScript: jumpstd PokecenterNurseScript @@ -50,16 +50,16 @@ BlackthornPokecenter1FTwinText: BlackthornPokecenter1F_MapEvents: db 0, 0 ; filler - db 3 ; warp events + def_warp_events 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 + def_coord_events - db 0 ; bg events + def_bg_events - db 4 ; object events + def_object_events object_event 3, 1, SPRITE_NURSE, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, BlackthornPokecenter1FNurseScript, -1 object_event 5, 3, SPRITE_GENTLEMAN, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, BlackthornPokecenter1FGentlemanScript, -1 object_event 1, 4, SPRITE_TWIN, SPRITEMOVEDATA_SPINRANDOM_SLOW, 0, 0, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_SCRIPT, 0, BlackthornPokecenter1FTwinScript, -1 diff --git a/maps/BluesHouse.asm b/maps/BluesHouse.asm index 56351efb7..55a38d1d5 100644 --- a/maps/BluesHouse.asm +++ b/maps/BluesHouse.asm @@ -1,10 +1,10 @@ - object_const_def ; object_event constants + object_const_def const BLUESHOUSE_DAISY BluesHouse_MapScripts: - db 0 ; scene scripts + def_scene_scripts - db 0 ; callbacks + def_callbacks DaisyScript: faceplayer @@ -145,13 +145,13 @@ DaisyCantGroomEggText: BluesHouse_MapEvents: db 0, 0 ; filler - db 2 ; warp events + def_warp_events warp_event 2, 7, PALLET_TOWN, 2 warp_event 3, 7, PALLET_TOWN, 2 - db 0 ; coord events + def_coord_events - db 0 ; bg events + def_bg_events - db 1 ; object events + def_object_events object_event 2, 3, SPRITE_DAISY, SPRITEMOVEDATA_SPINRANDOM_SLOW, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, DaisyScript, -1 diff --git a/maps/BrunosRoom.asm b/maps/BrunosRoom.asm index cc92d175e..b8a6d9746 100644 --- a/maps/BrunosRoom.asm +++ b/maps/BrunosRoom.asm @@ -1,12 +1,12 @@ - object_const_def ; object_event constants + object_const_def const BRUNOSROOM_BRUNO BrunosRoom_MapScripts: - db 2 ; scene scripts + def_scene_scripts scene_script .LockDoor ; SCENE_DEFAULT scene_script .DummyScene ; SCENE_FINISHED - db 1 ; callbacks + def_callbacks callback MAPCALLBACK_TILES, .BrunosRoomDoors .LockDoor: @@ -125,15 +125,15 @@ BrunoScript_BrunoDefeatText: BrunosRoom_MapEvents: db 0, 0 ; filler - db 4 ; warp events + def_warp_events 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 + def_coord_events - db 0 ; bg events + def_bg_events - db 1 ; object events + def_object_events object_event 5, 7, SPRITE_BRUNO, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_BROWN, OBJECTTYPE_SCRIPT, 0, BrunoScript_Battle, -1 diff --git a/maps/BurnedTower1F.asm b/maps/BurnedTower1F.asm index be25ab339..ce4b98e6f 100644 --- a/maps/BurnedTower1F.asm +++ b/maps/BurnedTower1F.asm @@ -1,4 +1,4 @@ - object_const_def ; object_event constants + object_const_def const BURNEDTOWER1F_ROCK const BURNEDTOWER1F_EUSINE const BURNEDTOWER1F_SILVER @@ -6,12 +6,12 @@ const BURNEDTOWER1F_POKE_BALL BurnedTower1F_MapScripts: - db 3 ; scene scripts + def_scene_scripts scene_script .EusineScene ; SCENE_DEFAULT scene_script .DummyScene1 ; SCENE_BURNEDTOWER1F_RIVAL_BATTLE scene_script .DummyScene2 ; SCENE_BURNEDTOWER1F_NOTHING - db 1 ; callbacks + def_callbacks callback MAPCALLBACK_TILES, .HoleAndLadder .EusineScene: @@ -278,7 +278,7 @@ BurnedTower1FMortyText: BurnedTower1F_MapEvents: db 0, 0 ; filler - db 14 ; warp events + def_warp_events warp_event 9, 15, ECRUTEAK_CITY, 13 warp_event 10, 15, ECRUTEAK_CITY, 13 warp_event 10, 9, BURNED_TOWER_B1F, 1 @@ -294,14 +294,14 @@ BurnedTower1F_MapEvents: warp_event 15, 14, BURNED_TOWER_B1F, 5 ; inaccessible, left over from G/S warp_event 7, 15, BURNED_TOWER_B1F, 6 ; inaccessible, left over from G/S - db 1 ; coord events + def_coord_events coord_event 11, 9, SCENE_BURNEDTOWER1F_RIVAL_BATTLE, BurnedTowerRivalBattleScript - db 2 ; bg events + def_bg_events bg_event 8, 7, BGEVENT_ITEM, BurnedTower1FHiddenEther bg_event 13, 11, BGEVENT_ITEM, BurnedTower1FHiddenUltraBall - db 5 ; object events + def_object_events object_event 15, 4, SPRITE_ROCK, SPRITEMOVEDATA_SMASHABLE_ROCK, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, BurnedTower1FRock, -1 object_event 12, 12, SPRITE_SUPER_NERD, SPRITEMOVEDATA_SPINRANDOM_SLOW, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_SCRIPT, 0, BurnedTower1FEusineScript, EVENT_BURNED_TOWER_1F_EUSINE object_event 8, 9, SPRITE_SILVER, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, 0, OBJECTTYPE_TRAINER, 3, ObjectEvent, EVENT_RIVAL_BURNED_TOWER diff --git a/maps/BurnedTowerB1F.asm b/maps/BurnedTowerB1F.asm index 747ae6730..6f5535bba 100644 --- a/maps/BurnedTowerB1F.asm +++ b/maps/BurnedTowerB1F.asm @@ -1,4 +1,4 @@ - object_const_def ; object_event constants + object_const_def const BURNEDTOWERB1F_BOULDER const BURNEDTOWERB1F_RAIKOU1 const BURNEDTOWERB1F_ENTEI1 @@ -10,11 +10,11 @@ const BURNEDTOWERB1F_EUSINE BurnedTowerB1F_MapScripts: - db 2 ; scene scripts + def_scene_scripts scene_script .DummyScene0 ; SCENE_DEFAULT scene_script .DummyScene1 ; SCENE_FINISHED - db 1 ; callbacks + def_callbacks callback MAPCALLBACK_TILES, .LadderCallback .DummyScene0: @@ -237,7 +237,7 @@ BurnedTowerB1FEusineText: BurnedTowerB1F_MapEvents: db 0, 0 ; filler - db 6 ; warp events + def_warp_events warp_event 10, 9, BURNED_TOWER_1F, 3 warp_event 17, 7, BURNED_TOWER_1F, 7 warp_event 10, 8, BURNED_TOWER_1F, 9 @@ -245,12 +245,12 @@ BurnedTowerB1F_MapEvents: warp_event 17, 14, BURNED_TOWER_1F, 12 warp_event 7, 15, BURNED_TOWER_1F, 14 - db 1 ; coord events + def_coord_events coord_event 10, 6, SCENE_DEFAULT, ReleaseTheBeasts - db 0 ; bg events + def_bg_events - db 9 ; object events + def_object_events object_event 17, 8, SPRITE_BOULDER, SPRITEMOVEDATA_STRENGTH_BOULDER, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, BurnedTowerB1FBoulder, -1 object_event 7, 3, SPRITE_RAIKOU, SPRITEMOVEDATA_POKEMON, 0, 0, -1, -1, PAL_NPC_BROWN, OBJECTTYPE_SCRIPT, 0, ObjectEvent, EVENT_BURNED_TOWER_B1F_BEASTS_1 object_event 12, 3, SPRITE_ENTEI, SPRITEMOVEDATA_POKEMON, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_SCRIPT, 0, ObjectEvent, EVENT_BURNED_TOWER_B1F_BEASTS_1 diff --git a/maps/CeladonCafe.asm b/maps/CeladonCafe.asm index e006ee114..2eb5359c9 100644 --- a/maps/CeladonCafe.asm +++ b/maps/CeladonCafe.asm @@ -1,4 +1,4 @@ - object_const_def ; object_event constants + object_const_def const CELADONCAFE_SUPER_NERD const CELADONCAFE_FISHER1 const CELADONCAFE_FISHER2 @@ -6,9 +6,9 @@ const CELADONCAFE_TEACHER CeladonCafe_MapScripts: - db 0 ; scene scripts + def_scene_scripts - db 0 ; callbacks + def_callbacks CeladonCafeChef: faceplayer @@ -208,17 +208,17 @@ NoRoomForLeftoversText: CeladonCafe_MapEvents: db 0, 0 ; filler - db 2 ; warp events + def_warp_events warp_event 6, 7, CELADON_CITY, 9 warp_event 7, 7, CELADON_CITY, 9 - db 0 ; coord events + def_coord_events - db 2 ; bg events + def_bg_events bg_event 5, 0, BGEVENT_READ, EatathonContestPoster bg_event 7, 1, BGEVENT_READ, CeladonCafeTrashcan - db 5 ; object events + def_object_events object_event 9, 3, SPRITE_SUPER_NERD, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, PAL_NPC_BROWN, OBJECTTYPE_SCRIPT, 0, CeladonCafeChef, -1 object_event 4, 6, SPRITE_FISHER, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, CeladonCafeFisher1, -1 object_event 1, 7, SPRITE_FISHER, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_SCRIPT, 0, CeladonCafeFisher2, -1 diff --git a/maps/CeladonCity.asm b/maps/CeladonCity.asm index 691b8b8b4..d2c34878e 100644 --- a/maps/CeladonCity.asm +++ b/maps/CeladonCity.asm @@ -1,4 +1,4 @@ - object_const_def ; object_event constants + object_const_def const CELADONCITY_FISHER const CELADONCITY_POLIWAG const CELADONCITY_TEACHER1 @@ -10,9 +10,9 @@ const CELADONCITY_LASS CeladonCity_MapScripts: - db 0 ; scene scripts + def_scene_scripts - db 1 ; callbacks + def_callbacks callback MAPCALLBACK_NEWMAP, .FlyPoint .FlyPoint: @@ -248,7 +248,7 @@ CeladonCityTrainerTipsText: CeladonCity_MapEvents: db 0, 0 ; filler - db 9 ; warp events + def_warp_events 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 @@ -259,9 +259,9 @@ CeladonCity_MapEvents: warp_event 10, 29, CELADON_GYM, 1 warp_event 25, 29, CELADON_CAFE, 1 - db 0 ; coord events + def_coord_events - db 8 ; bg events + def_bg_events bg_event 23, 21, BGEVENT_READ, CeladonCitySign bg_event 11, 31, BGEVENT_READ, CeladonGymSign bg_event 6, 9, BGEVENT_READ, CeladonCityDeptStoreSign @@ -271,7 +271,7 @@ CeladonCity_MapEvents: bg_event 30, 9, BGEVENT_READ, CeladonCityPokecenterSign bg_event 37, 21, BGEVENT_ITEM, CeladonCityHiddenPpUp - db 9 ; object events + def_object_events object_event 26, 11, SPRITE_FISHER, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_SCRIPT, 0, CeladonCityFisherScript, -1 object_event 27, 11, SPRITE_POLIWAG, SPRITEMOVEDATA_POKEMON, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_SCRIPT, 0, CeladonCityPoliwrath, -1 object_event 20, 24, SPRITE_TEACHER, SPRITEMOVEDATA_WALK_LEFT_RIGHT, 2, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_SCRIPT, 0, CeladonCityTeacher1Script, -1 diff --git a/maps/CeladonDeptStore1F.asm b/maps/CeladonDeptStore1F.asm index d7fa08c93..92a592f77 100644 --- a/maps/CeladonDeptStore1F.asm +++ b/maps/CeladonDeptStore1F.asm @@ -1,12 +1,12 @@ - object_const_def ; object_event constants + object_const_def const CELADONDEPTSTORE1F_RECEPTIONIST const CELADONDEPTSTORE1F_GENTLEMAN const CELADONDEPTSTORE1F_TEACHER CeladonDeptStore1F_MapScripts: - db 0 ; scene scripts + def_scene_scripts - db 0 ; callbacks + def_callbacks CeladonDeptStore1FReceptionistScript: jumptextfaceplayer CeladonDeptStore1FReceptionistText @@ -74,19 +74,19 @@ CeladonDeptStore1FDirectoryText: CeladonDeptStore1F_MapEvents: db 0, 0 ; filler - db 4 ; warp events + def_warp_events 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 + def_coord_events - db 2 ; bg events + def_bg_events bg_event 14, 0, BGEVENT_READ, CeladonDeptStore1FDirectory bg_event 3, 0, BGEVENT_READ, CeladonDeptStore1FElevatorButton - db 3 ; object events + def_object_events object_event 10, 1, SPRITE_RECEPTIONIST, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_SCRIPT, 0, CeladonDeptStore1FReceptionistScript, -1 object_event 11, 4, SPRITE_GENTLEMAN, SPRITEMOVEDATA_WANDER, 1, 1, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, CeladonDeptStore1FGentlemanScript, -1 object_event 5, 3, SPRITE_TEACHER, SPRITEMOVEDATA_WALK_LEFT_RIGHT, 1, 0, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_SCRIPT, 0, CeladonDeptStore1FTeacherScript, -1 diff --git a/maps/CeladonDeptStore2F.asm b/maps/CeladonDeptStore2F.asm index 2339c075f..4517930a6 100644 --- a/maps/CeladonDeptStore2F.asm +++ b/maps/CeladonDeptStore2F.asm @@ -1,13 +1,13 @@ - object_const_def ; object_event constants + object_const_def const CELADONDEPTSTORE2F_CLERK1 const CELADONDEPTSTORE2F_CLERK2 const CELADONDEPTSTORE2F_POKEFAN_M const CELADONDEPTSTORE2F_YOUNGSTER CeladonDeptStore2F_MapScripts: - db 0 ; scene scripts + def_scene_scripts - db 0 ; callbacks + def_callbacks CeladonDeptStore2FClerk1Script: faceplayer @@ -69,18 +69,18 @@ CeladonDeptStore2FDirectoryText: CeladonDeptStore2F_MapEvents: db 0, 0 ; filler - db 3 ; warp events + def_warp_events 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 + def_coord_events - db 2 ; bg events + def_bg_events bg_event 14, 0, BGEVENT_READ, CeladonDeptStore2FDirectory bg_event 3, 0, BGEVENT_READ, CeladonDeptStore2FElevatorButton - db 4 ; object events + def_object_events object_event 13, 5, SPRITE_CLERK, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_SCRIPT, 0, CeladonDeptStore2FClerk1Script, -1 object_event 14, 5, SPRITE_CLERK, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_SCRIPT, 0, CeladonDeptStore2FClerk2Script, -1 object_event 5, 2, SPRITE_POKEFAN_M, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_SCRIPT, 0, CeladonDeptStore2FPokefanMScript, -1 diff --git a/maps/CeladonDeptStore3F.asm b/maps/CeladonDeptStore3F.asm index 70522767a..c87739242 100644 --- a/maps/CeladonDeptStore3F.asm +++ b/maps/CeladonDeptStore3F.asm @@ -1,4 +1,4 @@ - object_const_def ; object_event constants + object_const_def const CELADONDEPTSTORE3F_CLERK const CELADONDEPTSTORE3F_YOUNGSTER const CELADONDEPTSTORE3F_GAMEBOY_KID1 @@ -6,9 +6,9 @@ const CELADONDEPTSTORE3F_SUPER_NERD CeladonDeptStore3F_MapScripts: - db 0 ; scene scripts + def_scene_scripts - db 0 ; callbacks + def_callbacks CeladonDeptStore3FClerkScript: faceplayer @@ -95,18 +95,18 @@ CeladonDeptStore3FDirectoryText: CeladonDeptStore3F_MapEvents: db 0, 0 ; filler - db 3 ; warp events + def_warp_events 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 + def_coord_events - db 2 ; bg events + def_bg_events bg_event 14, 0, BGEVENT_READ, CeladonDeptStore3FDirectory bg_event 3, 0, BGEVENT_READ, CeladonDeptStore3FElevatorButton - db 5 ; object events + def_object_events object_event 7, 1, SPRITE_CLERK, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_SCRIPT, 0, CeladonDeptStore3FClerkScript, -1 object_event 6, 4, SPRITE_YOUNGSTER, SPRITEMOVEDATA_WALK_UP_DOWN, 0, 1, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_SCRIPT, 0, CeladonDeptStore3FYoungsterScript, -1 object_event 9, 1, SPRITE_GAMEBOY_KID, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_SCRIPT, 0, CeladonDeptStore3FGameboyKid1Script, -1 diff --git a/maps/CeladonDeptStore4F.asm b/maps/CeladonDeptStore4F.asm index 645ce8287..def1bf72d 100644 --- a/maps/CeladonDeptStore4F.asm +++ b/maps/CeladonDeptStore4F.asm @@ -1,12 +1,12 @@ - object_const_def ; object_event constants + object_const_def const CELADONDEPTSTORE4F_CLERK const CELADONDEPTSTORE4F_SUPER_NERD const CELADONDEPTSTORE4F_YOUNGSTER CeladonDeptStore4F_MapScripts: - db 0 ; scene scripts + def_scene_scripts - db 0 ; callbacks + def_callbacks CeladonDeptStore4FClerkScript: faceplayer @@ -51,18 +51,18 @@ CeladonDeptStore4FDirectoryText: CeladonDeptStore4F_MapEvents: db 0, 0 ; filler - db 3 ; warp events + def_warp_events 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 + def_coord_events - db 2 ; bg events + def_bg_events bg_event 14, 0, BGEVENT_READ, CeladonDeptStore4FDirectory bg_event 3, 0, BGEVENT_READ, CeladonDeptStore4FElevatorButton - db 3 ; object events + def_object_events object_event 13, 5, SPRITE_CLERK, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_SCRIPT, 0, CeladonDeptStore4FClerkScript, -1 object_event 7, 6, SPRITE_SUPER_NERD, SPRITEMOVEDATA_WALK_LEFT_RIGHT, 1, 0, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_SCRIPT, 0, CeladonDeptStore4FSuperNerdScript, -1 object_event 8, 2, SPRITE_YOUNGSTER, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, CeladonDeptStore4FYoungsterScript, -1 diff --git a/maps/CeladonDeptStore5F.asm b/maps/CeladonDeptStore5F.asm index 55cf121f9..bba92d0ad 100644 --- a/maps/CeladonDeptStore5F.asm +++ b/maps/CeladonDeptStore5F.asm @@ -1,4 +1,4 @@ - object_const_def ; object_event constants + object_const_def const CELADONDEPTSTORE5F_CLERK1 const CELADONDEPTSTORE5F_CLERK2 const CELADONDEPTSTORE5F_GENTLEMAN @@ -6,9 +6,9 @@ const CELADONDEPTSTORE5F_TEACHER CeladonDeptStore5F_MapScripts: - db 0 ; scene scripts + def_scene_scripts - db 0 ; callbacks + def_callbacks CeladonDeptStore5FClerk1Script: faceplayer @@ -72,18 +72,18 @@ CeladonDeptStore5FDirectoryText: CeladonDeptStore5F_MapEvents: db 0, 0 ; filler - db 3 ; warp events + def_warp_events 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 + def_coord_events - db 2 ; bg events + def_bg_events bg_event 14, 0, BGEVENT_READ, CeladonDeptStore5FDirectory bg_event 3, 0, BGEVENT_READ, CeladonDeptStore5FElevatorButton - db 5 ; object events + def_object_events object_event 7, 5, SPRITE_CLERK, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_SCRIPT, 0, CeladonDeptStore5FClerk1Script, -1 object_event 8, 5, SPRITE_CLERK, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_SCRIPT, 0, CeladonDeptStore5FClerk2Script, -1 object_event 13, 5, SPRITE_GENTLEMAN, SPRITEMOVEDATA_WANDER, 1, 1, -1, -1, PAL_NPC_RED, OBJECTTYPE_SCRIPT, 0, CeladonDeptStore5FGentlemanScript, -1 diff --git a/maps/CeladonDeptStore6F.asm b/maps/CeladonDeptStore6F.asm index dc5e4e5c0..27948375b 100644 --- a/maps/CeladonDeptStore6F.asm +++ b/maps/CeladonDeptStore6F.asm @@ -2,14 +2,14 @@ CELADONDEPTSTORE6F_FRESH_WATER_PRICE EQU 200 CELADONDEPTSTORE6F_SODA_POP_PRICE EQU 300 CELADONDEPTSTORE6F_LEMONADE_PRICE EQU 350 - object_const_def ; object_event constants + object_const_def const CELADONDEPTSTORE6F_SUPER_NERD const CELADONDEPTSTORE6F_YOUNGSTER CeladonDeptStore6F_MapScripts: - db 0 ; scene scripts + def_scene_scripts - db 1 ; callbacks + def_callbacks callback MAPCALLBACK_TILES, .HideRooftopStairs .HideRooftopStairs: @@ -150,13 +150,13 @@ CeladonDeptStore6FDirectoryText: CeladonDeptStore6F_MapEvents: db 0, 0 ; filler - db 2 ; warp events + def_warp_events warp_event 15, 0, CELADON_DEPT_STORE_5F, 2 warp_event 2, 0, CELADON_DEPT_STORE_ELEVATOR, 1 - db 0 ; coord events + def_coord_events - db 6 ; bg events + def_bg_events bg_event 14, 0, BGEVENT_READ, CeladonDeptStore6FDirectory bg_event 3, 0, BGEVENT_READ, CeladonDeptStore1FElevatorButton bg_event 8, 1, BGEVENT_UP, CeladonDeptStore6FVendingMachine @@ -164,6 +164,6 @@ CeladonDeptStore6F_MapEvents: bg_event 10, 1, BGEVENT_UP, CeladonDeptStore6FVendingMachine bg_event 11, 1, BGEVENT_UP, CeladonDeptStore6FVendingMachine - db 2 ; object events + def_object_events object_event 9, 2, SPRITE_SUPER_NERD, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, CeladonDeptStore6FSuperNerdScript, -1 object_event 12, 5, SPRITE_YOUNGSTER, SPRITEMOVEDATA_WANDER, 2, 1, -1, -1, PAL_NPC_RED, OBJECTTYPE_SCRIPT, 0, CeladonDeptStore6FYoungsterScript, -1 diff --git a/maps/CeladonDeptStoreElevator.asm b/maps/CeladonDeptStoreElevator.asm index d89efe8ee..fbaa64180 100644 --- a/maps/CeladonDeptStoreElevator.asm +++ b/maps/CeladonDeptStoreElevator.asm @@ -1,7 +1,7 @@ CeladonDeptStoreElevator_MapScripts: - db 0 ; scene scripts + def_scene_scripts - db 0 ; callbacks + def_callbacks CeladonDeptStoreElevatorScript: opentext @@ -28,13 +28,13 @@ CeladonDeptStoreElevatorData: CeladonDeptStoreElevator_MapEvents: db 0, 0 ; filler - db 2 ; warp events + def_warp_events warp_event 1, 3, CELADON_DEPT_STORE_1F, -1 warp_event 2, 3, CELADON_DEPT_STORE_1F, -1 - db 0 ; coord events + def_coord_events - db 1 ; bg events + def_bg_events bg_event 3, 0, BGEVENT_READ, CeladonDeptStoreElevatorScript - db 0 ; object events + def_object_events diff --git a/maps/CeladonGameCorner.asm b/maps/CeladonGameCorner.asm index c65afc0a1..e006506bd 100644 --- a/maps/CeladonGameCorner.asm +++ b/maps/CeladonGameCorner.asm @@ -1,4 +1,4 @@ - object_const_def ; object_event constants + object_const_def const CELADONGAMECORNER_CLERK const CELADONGAMECORNER_RECEPTIONIST const CELADONGAMECORNER_POKEFAN_M @@ -10,9 +10,9 @@ const CELADONGAMECORNER_GRAMPS CeladonGameCorner_MapScripts: - db 0 ; scene scripts + def_scene_scripts - db 0 ; callbacks + def_callbacks CeladonGameCornerClerkScript: jumpstd GameCornerCoinVendorScript @@ -324,13 +324,13 @@ CeladonGameCornerSodaCanText: CeladonGameCorner_MapEvents: db 0, 0 ; filler - db 2 ; warp events + def_warp_events warp_event 14, 13, CELADON_CITY, 6 warp_event 15, 13, CELADON_CITY, 6 - db 0 ; coord events + def_coord_events - db 38 ; bg events + def_bg_events bg_event 1, 6, BGEVENT_READ, CeladonGameCornerCardFlipScript bg_event 1, 7, BGEVENT_READ, CeladonGameCornerCardFlipScript bg_event 1, 8, BGEVENT_READ, CeladonGameCornerCardFlipScript @@ -370,7 +370,7 @@ CeladonGameCorner_MapEvents: bg_event 15, 0, BGEVENT_READ, CeladonGameCornerPoster1Script bg_event 9, 0, BGEVENT_READ, CeladonGameCornerPoster2Script - db 9 ; object events + def_object_events object_event 5, 2, SPRITE_CLERK, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_SCRIPT, 0, CeladonGameCornerClerkScript, -1 object_event 3, 2, SPRITE_RECEPTIONIST, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_SCRIPT, 0, CeladonGameCornerReceptionistScript, -1 object_event 14, 10, SPRITE_POKEFAN_M, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_SCRIPT, 0, CeladonGameCornerPokefanMScript, -1 diff --git a/maps/CeladonGameCornerPrizeRoom.asm b/maps/CeladonGameCornerPrizeRoom.asm index 861deb6e4..542b0cf08 100644 --- a/maps/CeladonGameCornerPrizeRoom.asm +++ b/maps/CeladonGameCornerPrizeRoom.asm @@ -5,14 +5,14 @@ CELADONGAMECORNERPRIZEROOM_PIKACHU_COINS EQU 2222 CELADONGAMECORNERPRIZEROOM_PORYGON_COINS EQU 5555 CELADONGAMECORNERPRIZEROOM_LARVITAR_COINS EQU 8888 - object_const_def ; object_event constants + object_const_def const CELADONGAMECORNERPRIZEROOM_GENTLEMAN const CELADONGAMECORNERPRIZEROOM_PHARMACIST CeladonGameCornerPrizeRoom_MapScripts: - db 0 ; scene scripts + def_scene_scripts - db 0 ; callbacks + def_callbacks CeladonGameCornerPrizeRoomGentlemanScript: jumptextfaceplayer CeladonGameCornerPrizeRoomGentlemanText @@ -277,16 +277,16 @@ CeladonPrizeRoom_NoCoinCaseText: CeladonGameCornerPrizeRoom_MapEvents: db 0, 0 ; filler - db 2 ; warp events + def_warp_events warp_event 2, 5, CELADON_CITY, 7 warp_event 3, 5, CELADON_CITY, 7 - db 0 ; coord events + def_coord_events - db 2 ; bg events + def_bg_events bg_event 2, 1, BGEVENT_READ, CeladonGameCornerPrizeRoomTMVendor bg_event 4, 1, BGEVENT_READ, CeladonGameCornerPrizeRoomPokemonVendor - db 2 ; object events + def_object_events object_event 0, 2, SPRITE_GENTLEMAN, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_SCRIPT, 0, CeladonGameCornerPrizeRoomGentlemanScript, -1 object_event 4, 4, SPRITE_PHARMACIST, SPRITEMOVEDATA_WALK_UP_DOWN, 0, 1, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_SCRIPT, 0, CeladonGameCornerPrizeRoomPharmacistScript, -1 diff --git a/maps/CeladonGym.asm b/maps/CeladonGym.asm index ef35bf96e..c03441a70 100644 --- a/maps/CeladonGym.asm +++ b/maps/CeladonGym.asm @@ -1,4 +1,4 @@ - object_const_def ; object_event constants + object_const_def const CELADONGYM_ERIKA const CELADONGYM_LASS1 const CELADONGYM_LASS2 @@ -7,9 +7,9 @@ const CELADONGYM_TWIN2 CeladonGym_MapScripts: - db 0 ; scene scripts + def_scene_scripts - db 0 ; callbacks + def_callbacks CeladonGymErikaScript: faceplayer @@ -268,17 +268,17 @@ TwinsJoAndZoe2AfterBattleText: CeladonGym_MapEvents: db 0, 0 ; filler - db 2 ; warp events + def_warp_events warp_event 4, 17, CELADON_CITY, 8 warp_event 5, 17, CELADON_CITY, 8 - db 0 ; coord events + def_coord_events - db 2 ; bg events + def_bg_events bg_event 3, 15, BGEVENT_READ, CeladonGymStatue bg_event 6, 15, BGEVENT_READ, CeladonGymStatue - db 6 ; object events + def_object_events object_event 5, 3, SPRITE_ERIKA, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_SCRIPT, 0, CeladonGymErikaScript, -1 object_event 7, 8, SPRITE_LASS, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_TRAINER, 2, TrainerLassMichelle, -1 object_event 2, 8, SPRITE_LASS, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_TRAINER, 2, TrainerPicnickerTanya, -1 diff --git a/maps/CeladonMansion1F.asm b/maps/CeladonMansion1F.asm index 56efc6964..67ab33738 100644 --- a/maps/CeladonMansion1F.asm +++ b/maps/CeladonMansion1F.asm @@ -1,13 +1,13 @@ - object_const_def ; object_event constants + object_const_def const CELADONMANSION1F_GRANNY const CELADONMANSION1F_GROWLITHE1 const CELADONMANSION1F_CLEFAIRY const CELADONMANSION1F_GROWLITHE2 CeladonMansion1F_MapScripts: - db 0 ; scene scripts + def_scene_scripts - db 0 ; callbacks + def_callbacks CeladonMansionManager: jumptextfaceplayer CeladonMansionManagerText @@ -75,21 +75,21 @@ CeladonMansionManagersSuiteSignText: CeladonMansion1F_MapEvents: db 0, 0 ; filler - db 5 ; warp events + def_warp_events 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 + def_coord_events - db 3 ; bg events + def_bg_events bg_event 5, 8, BGEVENT_UP, CeladonMansionManagersSuiteSign bg_event 0, 3, BGEVENT_READ, CeladonMansion1FBookshelf bg_event 2, 3, BGEVENT_READ, CeladonMansion1FBookshelf - db 4 ; object events + def_object_events object_event 1, 5, SPRITE_GRANNY, SPRITEMOVEDATA_SPINRANDOM_SLOW, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, CeladonMansionManager, -1 object_event 2, 6, SPRITE_GROWLITHE, SPRITEMOVEDATA_POKEMON, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, CeladonMansion1FMeowth, -1 object_event 3, 4, SPRITE_CLEFAIRY, SPRITEMOVEDATA_POKEMON, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, CeladonMansion1FClefairy, -1 diff --git a/maps/CeladonMansion2F.asm b/maps/CeladonMansion2F.asm index e2c97fdf8..2e3e7c5f9 100644 --- a/maps/CeladonMansion2F.asm +++ b/maps/CeladonMansion2F.asm @@ -1,7 +1,7 @@ CeladonMansion2F_MapScripts: - db 0 ; scene scripts + def_scene_scripts - db 0 ; callbacks + def_callbacks CeladonMansion2FComputer: jumptext CeladonMansion2FComputerText @@ -50,17 +50,17 @@ CeladonMansion2FMeetingRoomSignText: CeladonMansion2F_MapEvents: db 0, 0 ; filler - db 4 ; warp events + def_warp_events 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 + def_coord_events - db 3 ; bg events + def_bg_events bg_event 0, 3, BGEVENT_READ, CeladonMansion2FComputer bg_event 5, 8, BGEVENT_UP, CeladonMansion2FMeetingRoomSign bg_event 2, 3, BGEVENT_READ, CeladonMansion2FBookshelf - db 0 ; object events + def_object_events diff --git a/maps/CeladonMansion3F.asm b/maps/CeladonMansion3F.asm index 59ed7428e..6012e1a75 100644 --- a/maps/CeladonMansion3F.asm +++ b/maps/CeladonMansion3F.asm @@ -1,13 +1,13 @@ - object_const_def ; object_event constants + object_const_def const CELADONMANSION3F_COOLTRAINER_M const CELADONMANSION3F_GYM_GUIDE const CELADONMANSION3F_SUPER_NERD const CELADONMANSION3F_FISHER CeladonMansion3F_MapScripts: - db 0 ; scene scripts + def_scene_scripts - db 0 ; callbacks + def_callbacks GameFreakGameDesignerScript: faceplayer @@ -191,21 +191,21 @@ CeladonMansion3FReferenceMaterialText: CeladonMansion3F_MapEvents: db 0, 0 ; filler - db 4 ; warp events + def_warp_events 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 + def_coord_events - db 4 ; bg events + def_bg_events bg_event 5, 8, BGEVENT_UP, CeladonMansion3FDevRoomSign bg_event 4, 3, BGEVENT_UP, CeladonMansion3FDrawing bg_event 1, 6, BGEVENT_UP, CeladonMansion3FGameProgram bg_event 1, 3, BGEVENT_UP, CeladonMansion3FReferenceMaterial - db 4 ; object events + def_object_events object_event 3, 6, SPRITE_COOLTRAINER_M, SPRITEMOVEDATA_SPINRANDOM_SLOW, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_SCRIPT, 0, GameFreakGameDesignerScript, -1 object_event 3, 4, SPRITE_GYM_GUIDE, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_SCRIPT, 0, GameFreakGraphicArtistScript, -1 object_event 0, 7, SPRITE_SUPER_NERD, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_SCRIPT, 0, GameFreakProgrammerScript, -1 diff --git a/maps/CeladonMansionRoof.asm b/maps/CeladonMansionRoof.asm index abb643aba..c0915d493 100644 --- a/maps/CeladonMansionRoof.asm +++ b/maps/CeladonMansionRoof.asm @@ -1,10 +1,10 @@ - object_const_def ; object_event constants + object_const_def const CELADONMANSIONROOF_FISHER CeladonMansionRoof_MapScripts: - db 0 ; scene scripts + def_scene_scripts - db 0 ; callbacks + def_callbacks CeladonMansionRoofFisherScript: jumptextfaceplayer CeladonMansionRoofFisherText @@ -34,15 +34,15 @@ CeladonMansionRoofGraffitiText: CeladonMansionRoof_MapEvents: db 0, 0 ; filler - db 3 ; warp events + def_warp_events 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 + def_coord_events - db 1 ; bg events + def_bg_events bg_event 6, 1, BGEVENT_LEFT, CeladonMansionRoofGraffiti - db 1 ; object events + def_object_events object_event 7, 5, SPRITE_FISHER, SPRITEMOVEDATA_WALK_UP_DOWN, 0, 1, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_SCRIPT, 0, CeladonMansionRoofFisherScript, -1 diff --git a/maps/CeladonMansionRoofHouse.asm b/maps/CeladonMansionRoofHouse.asm index 6b19b14d2..25c8372fc 100644 --- a/maps/CeladonMansionRoofHouse.asm +++ b/maps/CeladonMansionRoofHouse.asm @@ -1,10 +1,10 @@ - object_const_def ; object_event constants + object_const_def const CELADONMANSIONROOFHOUSE_PHARMACIST CeladonMansionRoofHouse_MapScripts: - db 0 ; scene scripts + def_scene_scripts - db 0 ; callbacks + def_callbacks CeladonMansionRoofHousePharmacistScript: faceplayer @@ -117,13 +117,13 @@ CeladonMansionRoofHousePharmacistCurseText: CeladonMansionRoofHouse_MapEvents: db 0, 0 ; filler - db 2 ; warp events + def_warp_events warp_event 2, 7, CELADON_MANSION_ROOF, 3 warp_event 3, 7, CELADON_MANSION_ROOF, 3 - db 0 ; coord events + def_coord_events - db 0 ; bg events + def_bg_events - db 1 ; object events + def_object_events object_event 3, 2, SPRITE_PHARMACIST, SPRITEMOVEDATA_STANDING_DOWN, 0, 2, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_SCRIPT, 0, CeladonMansionRoofHousePharmacistScript, -1 diff --git a/maps/CeladonPokecenter1F.asm b/maps/CeladonPokecenter1F.asm index 0608b5940..ef3a9c0f2 100644 --- a/maps/CeladonPokecenter1F.asm +++ b/maps/CeladonPokecenter1F.asm @@ -1,4 +1,4 @@ - object_const_def ; object_event constants + object_const_def const CELADONPOKECENTER1F_NURSE const CELADONPOKECENTER1F_GENTLEMAN const CELADONPOKECENTER1F_PHARMACIST @@ -6,9 +6,9 @@ const CELADONPOKECENTER1F_EUSINE CeladonPokecenter1F_MapScripts: - db 0 ; scene scripts + def_scene_scripts - db 0 ; callbacks + def_callbacks CeladonPokecenter1FNurseScript: jumpstd PokecenterNurseScript @@ -146,16 +146,16 @@ NoBeastsText: CeladonPokecenter1F_MapEvents: db 0, 0 ; filler - db 3 ; warp events + def_warp_events 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 + def_coord_events - db 0 ; bg events + def_bg_events - db 5 ; object events + def_object_events object_event 3, 1, SPRITE_NURSE, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, CeladonPokecenter1FNurseScript, -1 object_event 1, 5, SPRITE_GENTLEMAN, SPRITEMOVEDATA_WALK_LEFT_RIGHT, 1, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, CeladonPokecenter1FGentlemanScript, -1 object_event 0, 3, SPRITE_PHARMACIST, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_SCRIPT, 0, CeladonPokecenter1FPharmacistScript, -1 diff --git a/maps/CeladonPokecenter2FBeta.asm b/maps/CeladonPokecenter2FBeta.asm index aec478102..ba4eab25d 100644 --- a/maps/CeladonPokecenter2FBeta.asm +++ b/maps/CeladonPokecenter2FBeta.asm @@ -1,16 +1,16 @@ CeladonPokecenter2FBeta_MapScripts: - db 0 ; scene scripts + def_scene_scripts - db 0 ; callbacks + def_callbacks CeladonPokecenter2FBeta_MapEvents: db 0, 0 ; filler - db 1 ; warp events + def_warp_events warp_event 0, 7, CELADON_POKECENTER_1F, 3 - db 0 ; coord events + def_coord_events - db 0 ; bg events + def_bg_events - db 0 ; object events + def_object_events diff --git a/maps/CeruleanCity.asm b/maps/CeruleanCity.asm index 52c03d273..8267ab9f8 100644 --- a/maps/CeruleanCity.asm +++ b/maps/CeruleanCity.asm @@ -1,4 +1,4 @@ - object_const_def ; object_event constants + object_const_def const CERULEANCITY_COOLTRAINER_M const CERULEANCITY_SUPER_NERD const CERULEANCITY_SLOWPOKE @@ -7,9 +7,9 @@ const CERULEANCITY_YOUNGSTER CeruleanCity_MapScripts: - db 0 ; scene scripts + def_scene_scripts - db 1 ; callbacks + def_callbacks callback MAPCALLBACK_NEWMAP, .FlyPoint .FlyPoint: @@ -276,7 +276,7 @@ CeruleanLockedDoorText: CeruleanCity_MapEvents: db 0, 0 ; filler - db 6 ; warp events + def_warp_events 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 @@ -284,9 +284,9 @@ CeruleanCity_MapEvents: warp_event 30, 23, CERULEAN_GYM, 1 warp_event 25, 29, CERULEAN_MART, 2 - db 0 ; coord events + def_coord_events - db 9 ; bg events + def_bg_events bg_event 23, 23, BGEVENT_READ, CeruleanCitySign bg_event 27, 25, BGEVENT_READ, CeruleanGymSign bg_event 11, 29, BGEVENT_READ, CeruleanBikeShopSign @@ -297,7 +297,7 @@ CeruleanCity_MapEvents: bg_event 26, 29, BGEVENT_READ, CeruleanCityMartSign bg_event 2, 12, BGEVENT_ITEM, CeruleanCityHiddenBerserkGene - db 6 ; object events + def_object_events object_event 15, 23, SPRITE_COOLTRAINER_M, SPRITEMOVEDATA_WANDER, 2, 2, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_SCRIPT, 0, CeruleanCityCooltrainerMScript, -1 object_event 23, 15, SPRITE_SUPER_NERD, SPRITEMOVEDATA_WANDER, 1, 1, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_SCRIPT, 0, CeruleanCitySuperNerdScript, -1 object_event 20, 24, SPRITE_SLOWPOKE, SPRITEMOVEDATA_STILL, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, CeruleanCitySlowbro, -1 diff --git a/maps/CeruleanGym.asm b/maps/CeruleanGym.asm index 471e4f6c7..82c08b381 100644 --- a/maps/CeruleanGym.asm +++ b/maps/CeruleanGym.asm @@ -1,4 +1,4 @@ - object_const_def ; object_event constants + object_const_def const CERULEANGYM_ROCKET const CERULEANGYM_MISTY const CERULEANGYM_SWIMMER_GIRL1 @@ -7,11 +7,11 @@ const CERULEANGYM_GYM_GUIDE CeruleanGym_MapScripts: - db 2 ; scene scripts + def_scene_scripts scene_script .DummyScene0 ; SCENE_CERULEANGYM_NOTHING scene_script .GruntRunsOut ; SCENE_CERULEANGYM_GRUNT_RUNS_OUT - db 0 ; callbacks + def_callbacks .DummyScene0: end @@ -363,18 +363,18 @@ CeruleanGymGuideWinText: CeruleanGym_MapEvents: db 0, 0 ; filler - db 2 ; warp events + def_warp_events warp_event 4, 15, CERULEAN_CITY, 5 warp_event 5, 15, CERULEAN_CITY, 5 - db 0 ; coord events + def_coord_events - db 3 ; bg events + def_bg_events bg_event 3, 8, BGEVENT_ITEM, CeruleanGymHiddenMachinePart bg_event 2, 13, BGEVENT_READ, CeruleanGymStatue1 bg_event 6, 13, BGEVENT_READ, CeruleanGymStatue2 - db 6 ; object events + def_object_events object_event 4, 10, SPRITE_ROCKET, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, ObjectEvent, EVENT_CERULEAN_GYM_ROCKET object_event 5, 3, SPRITE_MISTY, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_SCRIPT, 0, CeruleanGymMistyScript, EVENT_TRAINERS_IN_CERULEAN_GYM object_event 4, 6, SPRITE_SWIMMER_GIRL, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_TRAINER, 3, TrainerSwimmerfDiana, EVENT_TRAINERS_IN_CERULEAN_GYM diff --git a/maps/CeruleanGymBadgeSpeechHouse.asm b/maps/CeruleanGymBadgeSpeechHouse.asm index 33aad16b9..f11063dde 100644 --- a/maps/CeruleanGymBadgeSpeechHouse.asm +++ b/maps/CeruleanGymBadgeSpeechHouse.asm @@ -1,10 +1,10 @@ - object_const_def ; object_event constants + object_const_def const CERULEANGYMBADGESPEECHHOUSE_POKEFAN_M CeruleanGymBadgeSpeechHouse_MapScripts: - db 0 ; scene scripts + def_scene_scripts - db 0 ; callbacks + def_callbacks CeruleanGymBadgeSpeechHousePokefanMScript: jumptextfaceplayer CeruleanGymBadgeSpeechHousePokefanMText @@ -17,13 +17,13 @@ CeruleanGymBadgeSpeechHousePokefanMText: CeruleanGymBadgeSpeechHouse_MapEvents: db 0, 0 ; filler - db 2 ; warp events + def_warp_events warp_event 2, 7, CERULEAN_CITY, 1 warp_event 3, 7, CERULEAN_CITY, 1 - db 0 ; coord events + def_coord_events - db 0 ; bg events + def_bg_events - db 1 ; object events + def_object_events object_event 2, 3, SPRITE_POKEFAN_M, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, CeruleanGymBadgeSpeechHousePokefanMScript, -1 diff --git a/maps/CeruleanMart.asm b/maps/CeruleanMart.asm index 7d55c48b9..62dfe9f36 100644 --- a/maps/CeruleanMart.asm +++ b/maps/CeruleanMart.asm @@ -1,12 +1,12 @@ - object_const_def ; object_event constants + object_const_def const CERULEANMART_CLERK const CERULEANMART_COOLTRAINER_M const CERULEANMART_COOLTRAINER_F CeruleanMart_MapScripts: - db 0 ; scene scripts + def_scene_scripts - db 0 ; callbacks + def_callbacks CeruleanMart_Clerk: opentext @@ -46,15 +46,15 @@ CeruleanMart_CooltrainerFText: CeruleanMart_MapEvents: db 0, 0 ; filler - db 2 ; warp events + def_warp_events warp_event 2, 7, CERULEAN_CITY, 6 warp_event 3, 7, CERULEAN_CITY, 6 - db 0 ; coord events + def_coord_events - db 0 ; bg events + def_bg_events - db 3 ; object events + def_object_events object_event 1, 3, SPRITE_CLERK, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, CeruleanMart_Clerk, -1 object_event 1, 6, SPRITE_COOLTRAINER_M, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_SCRIPT, 0, CeruleanMart_CooltrainerM, -1 object_event 7, 2, SPRITE_COOLTRAINER_F, SPRITEMOVEDATA_WALK_LEFT_RIGHT, 2, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_SCRIPT, 0, CeruleanMart_CooltrainerF, -1 diff --git a/maps/CeruleanPokecenter1F.asm b/maps/CeruleanPokecenter1F.asm index fe2b8b227..885cdc663 100644 --- a/maps/CeruleanPokecenter1F.asm +++ b/maps/CeruleanPokecenter1F.asm @@ -1,12 +1,12 @@ - object_const_def ; object_event constants + object_const_def const CERULEANPOKECENTER1F_NURSE const CERULEANPOKECENTER1F_SUPER_NERD const CERULEANPOKECENTER1F_GYM_GUIDE CeruleanPokecenter1F_MapScripts: - db 0 ; scene scripts + def_scene_scripts - db 0 ; callbacks + def_callbacks CeruleanPokecenter1FNurseScript: jumpstd PokecenterNurseScript @@ -63,16 +63,16 @@ CeruleanPokecenter1FGymGuideText: CeruleanPokecenter1F_MapEvents: db 0, 0 ; filler - db 3 ; warp events + def_warp_events 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 + def_coord_events - db 0 ; bg events + def_bg_events - db 3 ; object events + def_object_events object_event 3, 1, SPRITE_NURSE, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, CeruleanPokecenter1FNurseScript, -1 object_event 8, 4, SPRITE_SUPER_NERD, SPRITEMOVEDATA_WALK_LEFT_RIGHT, 1, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, CeruleanPokecenter1FSuperNerdScript, -1 object_event 1, 5, SPRITE_GYM_GUIDE, SPRITEMOVEDATA_WANDER, 1, 1, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_SCRIPT, 0, CeruleanPokecenter1FGymGuideScript, -1 diff --git a/maps/CeruleanPokecenter2FBeta.asm b/maps/CeruleanPokecenter2FBeta.asm index 135d49d36..dd40d7ccf 100644 --- a/maps/CeruleanPokecenter2FBeta.asm +++ b/maps/CeruleanPokecenter2FBeta.asm @@ -1,16 +1,16 @@ CeruleanPokecenter2FBeta_MapScripts: - db 0 ; scene scripts + def_scene_scripts - db 0 ; callbacks + def_callbacks CeruleanPokecenter2FBeta_MapEvents: db 0, 0 ; filler - db 1 ; warp events + def_warp_events warp_event 0, 7, CERULEAN_POKECENTER_1F, 1 - db 0 ; coord events + def_coord_events - db 0 ; bg events + def_bg_events - db 0 ; object events + def_object_events diff --git a/maps/CeruleanPoliceStation.asm b/maps/CeruleanPoliceStation.asm index 507f0d5b0..6cb5c1977 100644 --- a/maps/CeruleanPoliceStation.asm +++ b/maps/CeruleanPoliceStation.asm @@ -1,12 +1,12 @@ - object_const_def ; object_event constants + object_const_def const CERULEANPOLICESTATION_FISHING_GURU const CERULEANPOLICESTATION_POKEFAN_F const CERULEANPOLICESTATION_DIGLETT CeruleanPoliceStation_MapScripts: - db 0 ; scene scripts + def_scene_scripts - db 0 ; callbacks + def_callbacks CeruleanPoliceStationFishingGuruScript: jumptextfaceplayer CeruleanPoliceStationFishingGuruText @@ -44,15 +44,15 @@ CeruleanDiglettText: CeruleanPoliceStation_MapEvents: db 0, 0 ; filler - db 2 ; warp events + def_warp_events warp_event 2, 7, CERULEAN_CITY, 2 warp_event 3, 7, CERULEAN_CITY, 2 - db 0 ; coord events + def_coord_events - db 0 ; bg events + def_bg_events - db 3 ; object events + def_object_events object_event 5, 1, SPRITE_FISHING_GURU, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_SCRIPT, 0, CeruleanPoliceStationFishingGuruScript, -1 object_event 5, 4, SPRITE_POKEFAN_F, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_SCRIPT, 0, CeruleanPoliceStationPokefanFScript, -1 object_event 3, 5, SPRITE_DIGLETT, SPRITEMOVEDATA_POKEMON, 0, 0, -1, -1, PAL_NPC_BROWN, OBJECTTYPE_SCRIPT, 0, CeruleanDiglett, -1 diff --git a/maps/CeruleanTradeSpeechHouse.asm b/maps/CeruleanTradeSpeechHouse.asm index 97ae15f7d..3bf6cf965 100644 --- a/maps/CeruleanTradeSpeechHouse.asm +++ b/maps/CeruleanTradeSpeechHouse.asm @@ -1,13 +1,13 @@ - object_const_def ; object_event constants + object_const_def const CERULEANTRADESPEECHHOUSE_GRANNY const CERULEANTRADESPEECHHOUSE_GRAMPS const CERULEANTRADESPEECHHOUSE_RHYDON const CERULEANTRADESPEECHHOUSE_ZUBAT CeruleanTradeSpeechHouse_MapScripts: - db 0 ; scene scripts + def_scene_scripts - db 0 ; callbacks + def_callbacks CeruleanTradeSpeechHouseGrannyScript: jumptextfaceplayer CeruleanTradeSpeechHouseGrannyText @@ -54,15 +54,15 @@ CeruleanTradeSpeechHouseZubatText: CeruleanTradeSpeechHouse_MapEvents: db 0, 0 ; filler - db 2 ; warp events + def_warp_events warp_event 2, 7, CERULEAN_CITY, 3 warp_event 3, 7, CERULEAN_CITY, 3 - db 0 ; coord events + def_coord_events - db 0 ; bg events + def_bg_events - db 4 ; object events + def_object_events object_event 2, 4, SPRITE_GRANNY, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_SCRIPT, 0, CeruleanTradeSpeechHouseGrannyScript, -1 object_event 1, 2, SPRITE_GRAMPS, SPRITEMOVEDATA_WANDER, 0, 0, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_SCRIPT, 0, CeruleanTradeSpeechHouseGrampsScript, -1 object_event 5, 2, SPRITE_RHYDON, SPRITEMOVEDATA_POKEMON, 0, 0, -1, -1, PAL_NPC_BROWN, OBJECTTYPE_SCRIPT, 0, CeruleanTradeSpeechHouseRhydonScript, -1 diff --git a/maps/CharcoalKiln.asm b/maps/CharcoalKiln.asm index 24fe8e373..9b6d171ea 100644 --- a/maps/CharcoalKiln.asm +++ b/maps/CharcoalKiln.asm @@ -1,12 +1,12 @@ - object_const_def ; object_event constants + object_const_def const CHARCOALKILN_BLACK_BELT const CHARCOALKILN_YOUNGSTER const CHARCOALKILN_MOLTRES CharcoalKiln_MapScripts: - db 0 ; scene scripts + def_scene_scripts - db 0 ; callbacks + def_callbacks CharcoalKilnBoss: faceplayer @@ -149,18 +149,18 @@ FarfetchdText: CharcoalKiln_MapEvents: db 0, 0 ; filler - db 2 ; warp events + def_warp_events warp_event 2, 7, AZALEA_TOWN, 2 warp_event 3, 7, AZALEA_TOWN, 2 - db 0 ; coord events + def_coord_events - db 3 ; bg events + def_bg_events bg_event 0, 1, BGEVENT_READ, CharcoalKilnBookshelf bg_event 1, 1, BGEVENT_READ, CharcoalKilnBookshelf bg_event 7, 1, BGEVENT_READ, CharcoalKilnRadio - db 3 ; object events + def_object_events object_event 2, 3, SPRITE_BLACK_BELT, SPRITEMOVEDATA_SPINRANDOM_SLOW, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, CharcoalKilnBoss, EVENT_CHARCOAL_KILN_BOSS object_event 5, 3, SPRITE_YOUNGSTER, SPRITEMOVEDATA_WANDER, 1, 1, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, CharcoalKilnApprentice, EVENT_CHARCOAL_KILN_APPRENTICE object_event 5, 6, SPRITE_MOLTRES, SPRITEMOVEDATA_POKEMON, 2, 2, -1, -1, PAL_NPC_BROWN, OBJECTTYPE_SCRIPT, 0, CharcoalKilnFarfetchd, EVENT_CHARCOAL_KILN_FARFETCH_D diff --git a/maps/CherrygroveCity.asm b/maps/CherrygroveCity.asm index e68d3ee82..bbdb46452 100644 --- a/maps/CherrygroveCity.asm +++ b/maps/CherrygroveCity.asm @@ -1,4 +1,4 @@ - object_const_def ; object_event constants + object_const_def const CHERRYGROVECITY_GRAMPS const CHERRYGROVECITY_SILVER const CHERRYGROVECITY_TEACHER @@ -6,11 +6,11 @@ const CHERRYGROVECITY_FISHER CherrygroveCity_MapScripts: - db 2 ; scene scripts + def_scene_scripts scene_script .DummyScene0 ; SCENE_CHERRYGROVECITY_NOTHING scene_script .DummyScene1 ; SCENE_CHERRYGROVECITY_MEET_RIVAL - db 1 ; callbacks + def_callbacks callback MAPCALLBACK_NEWMAP, .FlyPoint .DummyScene0: @@ -547,24 +547,24 @@ GuideGentsHouseSignText: CherrygroveCity_MapEvents: db 0, 0 ; filler - db 5 ; warp events + def_warp_events 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 + def_coord_events coord_event 33, 6, SCENE_CHERRYGROVECITY_MEET_RIVAL, CherrygroveSilverSceneNorth coord_event 33, 7, SCENE_CHERRYGROVECITY_MEET_RIVAL, CherrygroveSilverSceneSouth - db 4 ; bg events + def_bg_events bg_event 30, 8, BGEVENT_READ, CherrygroveCitySign bg_event 23, 9, BGEVENT_READ, GuideGentsHouseSign bg_event 24, 3, BGEVENT_READ, CherrygroveCityMartSign bg_event 30, 3, BGEVENT_READ, CherrygroveCityPokecenterSign - db 5 ; object events + def_object_events object_event 32, 6, SPRITE_GRAMPS, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, CherrygroveCityGuideGent, EVENT_GUIDE_GENT_IN_HIS_HOUSE object_event 39, 6, SPRITE_SILVER, SPRITEMOVEDATA_SPINRANDOM_SLOW, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, ObjectEvent, EVENT_RIVAL_CHERRYGROVE_CITY object_event 27, 12, SPRITE_TEACHER, SPRITEMOVEDATA_WALK_LEFT_RIGHT, 1, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_SCRIPT, 0, CherrygroveTeacherScript, -1 diff --git a/maps/CherrygroveEvolutionSpeechHouse.asm b/maps/CherrygroveEvolutionSpeechHouse.asm index e367a7596..772bd72a2 100644 --- a/maps/CherrygroveEvolutionSpeechHouse.asm +++ b/maps/CherrygroveEvolutionSpeechHouse.asm @@ -1,11 +1,11 @@ - object_const_def ; object_event constants + object_const_def const CHERRYGROVEEVOLUTIONSPEECHHOUSE_LASS const CHERRYGROVEEVOLUTIONSPEECHHOUSE_YOUNGSTER CherrygroveEvolutionSpeechHouse_MapScripts: - db 0 ; scene scripts + def_scene_scripts - db 0 ; callbacks + def_callbacks CherrygroveEvolutionSpeechHouseYoungsterScript: opentext @@ -42,16 +42,16 @@ CherrygroveEvolutionSpeechHouseLassText: CherrygroveEvolutionSpeechHouse_MapEvents: db 0, 0 ; filler - db 2 ; warp events + def_warp_events warp_event 2, 7, CHERRYGROVE_CITY, 5 warp_event 3, 7, CHERRYGROVE_CITY, 5 - db 0 ; coord events + def_coord_events - db 2 ; bg events + def_bg_events bg_event 0, 1, BGEVENT_READ, CherrygroveEvolutionSpeechHouseBookshelf bg_event 1, 1, BGEVENT_READ, CherrygroveEvolutionSpeechHouseBookshelf - db 2 ; object events + def_object_events object_event 3, 5, SPRITE_LASS, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_SCRIPT, 0, CherrygroveEvolutionSpeechHouseLassScript, -1 object_event 2, 5, SPRITE_YOUNGSTER, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_SCRIPT, 0, CherrygroveEvolutionSpeechHouseYoungsterScript, -1 diff --git a/maps/CherrygroveGymSpeechHouse.asm b/maps/CherrygroveGymSpeechHouse.asm index a6232bccd..a6e516916 100644 --- a/maps/CherrygroveGymSpeechHouse.asm +++ b/maps/CherrygroveGymSpeechHouse.asm @@ -1,11 +1,11 @@ - object_const_def ; object_event constants + object_const_def const CHERRYGROVEGYMSPEECHHOUSE_POKEFAN_M const CHERRYGROVEGYMSPEECHHOUSE_BUG_CATCHER CherrygroveGymSpeechHouse_MapScripts: - db 0 ; scene scripts + def_scene_scripts - db 0 ; callbacks + def_callbacks CherrygroveGymSpeechHousePokefanMScript: jumptextfaceplayer CherrygroveGymSpeechHousePokefanMText @@ -45,16 +45,16 @@ CherrygroveGymSpeechHouseBugCatcherText: CherrygroveGymSpeechHouse_MapEvents: db 0, 0 ; filler - db 2 ; warp events + def_warp_events warp_event 2, 7, CHERRYGROVE_CITY, 3 warp_event 3, 7, CHERRYGROVE_CITY, 3 - db 0 ; coord events + def_coord_events - db 2 ; bg events + def_bg_events bg_event 0, 1, BGEVENT_READ, CherrygroveGymSpeechHouseBookshelf bg_event 1, 1, BGEVENT_READ, CherrygroveGymSpeechHouseBookshelf - db 2 ; object events + def_object_events object_event 2, 3, SPRITE_POKEFAN_M, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, CherrygroveGymSpeechHousePokefanMScript, -1 object_event 5, 5, SPRITE_BUG_CATCHER, SPRITEMOVEDATA_WALK_LEFT_RIGHT, 1, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_SCRIPT, 0, CherrygroveGymSpeechHouseBugCatcherScript, -1 diff --git a/maps/CherrygroveMart.asm b/maps/CherrygroveMart.asm index 601ff7534..3f0d3b199 100644 --- a/maps/CherrygroveMart.asm +++ b/maps/CherrygroveMart.asm @@ -1,12 +1,12 @@ - object_const_def ; object_event constants + object_const_def const CHERRYGROVEMART_CLERK const CHERRYGROVEMART_COOLTRAINER_M const CHERRYGROVEMART_YOUNGSTER CherrygroveMart_MapScripts: - db 0 ; scene scripts + def_scene_scripts - db 0 ; callbacks + def_callbacks CherrygroveMartClerkScript: opentext @@ -72,15 +72,15 @@ CherrygroveMartYoungsterText: CherrygroveMart_MapEvents: db 0, 0 ; filler - db 2 ; warp events + def_warp_events warp_event 2, 7, CHERRYGROVE_CITY, 1 warp_event 3, 7, CHERRYGROVE_CITY, 1 - db 0 ; coord events + def_coord_events - db 0 ; bg events + def_bg_events - db 3 ; object events + def_object_events object_event 1, 3, SPRITE_CLERK, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, CherrygroveMartClerkScript, -1 object_event 7, 6, SPRITE_COOLTRAINER_M, SPRITEMOVEDATA_WALK_LEFT_RIGHT, 2, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, CherrygroveMartCooltrainerMScript, -1 object_event 2, 5, SPRITE_YOUNGSTER, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_SCRIPT, 0, CherrygroveMartYoungsterScript, -1 diff --git a/maps/CherrygrovePokecenter1F.asm b/maps/CherrygrovePokecenter1F.asm index 6aa16078d..92f93b924 100644 --- a/maps/CherrygrovePokecenter1F.asm +++ b/maps/CherrygrovePokecenter1F.asm @@ -1,13 +1,13 @@ - object_const_def ; object_event constants + object_const_def const CHERRYGROVEPOKECENTER1F_NURSE const CHERRYGROVEPOKECENTER1F_FISHER const CHERRYGROVEPOKECENTER1F_GENTLEMAN const CHERRYGROVEPOKECENTER1F_TEACHER CherrygrovePokecenter1F_MapScripts: - db 0 ; scene scripts + def_scene_scripts - db 0 ; callbacks + def_callbacks CherrygrovePokecenter1FNurseScript: jumpstd PokecenterNurseScript @@ -69,16 +69,16 @@ CherrygrovePokecenter1FTeacherText_CommCenterOpen: CherrygrovePokecenter1F_MapEvents: db 0, 0 ; filler - db 3 ; warp events + def_warp_events 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 + def_coord_events - db 0 ; bg events + def_bg_events - db 4 ; object events + def_object_events object_event 3, 1, SPRITE_NURSE, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, CherrygrovePokecenter1FNurseScript, -1 object_event 2, 3, SPRITE_FISHER, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_SCRIPT, 0, CherrygrovePokecenter1FFisherScript, -1 object_event 8, 6, SPRITE_GENTLEMAN, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, CherrygrovePokecenter1FGentlemanScript, -1 diff --git a/maps/CianwoodCity.asm b/maps/CianwoodCity.asm index 753242a53..d6d909af6 100644 --- a/maps/CianwoodCity.asm +++ b/maps/CianwoodCity.asm @@ -1,4 +1,4 @@ - object_const_def ; object_event constants + object_const_def const CIANWOODCITY_STANDING_YOUNGSTER const CIANWOODCITY_POKEFAN_M const CIANWOODCITY_LASS @@ -13,11 +13,11 @@ const CIANWOODCITY_SUICUNE CianwoodCity_MapScripts: - db 2 ; scene scripts + def_scene_scripts scene_script .DummyScene0 ; SCENE_CIANWOODCITY_NOTHING scene_script .DummyScene1 ; SCENE_CIANWOODCITY_SUICUNE_AND_EUSINE - db 1 ; callbacks + def_callbacks callback MAPCALLBACK_NEWMAP, .FlyPointAndSuicune .DummyScene0: @@ -382,7 +382,7 @@ CianwoodPokeSeerSignText: CianwoodCity_MapEvents: db 0, 0 ; filler - db 7 ; warp events + def_warp_events warp_event 17, 41, MANIAS_HOUSE, 1 warp_event 8, 43, CIANWOOD_GYM, 1 warp_event 23, 43, CIANWOOD_POKECENTER_1F, 1 @@ -391,10 +391,10 @@ CianwoodCity_MapEvents: warp_event 15, 37, CIANWOOD_LUGIA_SPEECH_HOUSE, 1 warp_event 5, 17, POKE_SEERS_HOUSE, 1 - db 1 ; coord events + def_coord_events coord_event 11, 16, SCENE_CIANWOODCITY_SUICUNE_AND_EUSINE, CianwoodCitySuicuneAndEusine - db 8 ; bg events + def_bg_events bg_event 20, 34, BGEVENT_READ, CianwoodCitySign bg_event 7, 45, BGEVENT_READ, CianwoodGymSign bg_event 24, 43, BGEVENT_READ, CianwoodPokecenterSign @@ -404,7 +404,7 @@ CianwoodCity_MapEvents: bg_event 4, 19, BGEVENT_ITEM, CianwoodCityHiddenRevive bg_event 5, 29, BGEVENT_ITEM, CianwoodCityHiddenMaxEther - db 12 ; object events + def_object_events object_event 21, 37, SPRITE_STANDING_YOUNGSTER, SPRITEMOVEDATA_SPINRANDOM_SLOW, 0, 0, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_SCRIPT, 0, CianwoodCityYoungster, -1 object_event 17, 33, SPRITE_POKEFAN_M, SPRITEMOVEDATA_WALK_LEFT_RIGHT, 1, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, CianwoodCityPokefanM, -1 object_event 14, 42, SPRITE_LASS, SPRITEMOVEDATA_WALK_UP_DOWN, 0, 2, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, CianwoodCityLass, -1 diff --git a/maps/CianwoodGym.asm b/maps/CianwoodGym.asm index 84401c78e..55cc84c99 100644 --- a/maps/CianwoodGym.asm +++ b/maps/CianwoodGym.asm @@ -1,4 +1,4 @@ - object_const_def ; object_event constants + object_const_def const CIANWOODGYM_CHUCK const CIANWOODGYM_BLACK_BELT1 const CIANWOODGYM_BLACK_BELT2 @@ -10,9 +10,9 @@ const CIANWOODGYM_BOULDER4 CianwoodGym_MapScripts: - db 0 ; scene scripts + def_scene_scripts - db 0 ; callbacks + def_callbacks CianwoodGymChuckScript: faceplayer @@ -306,17 +306,17 @@ BlackbeltLungAfterText: CianwoodGym_MapEvents: db 0, 0 ; filler - db 2 ; warp events + def_warp_events warp_event 4, 17, CIANWOOD_CITY, 2 warp_event 5, 17, CIANWOOD_CITY, 2 - db 0 ; coord events + def_coord_events - db 2 ; bg events + def_bg_events bg_event 3, 15, BGEVENT_READ, CianwoodGymStatue bg_event 6, 15, BGEVENT_READ, CianwoodGymStatue - db 9 ; object events + def_object_events object_event 4, 1, SPRITE_CHUCK, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_BROWN, OBJECTTYPE_SCRIPT, 0, CianwoodGymChuckScript, -1 object_event 2, 12, SPRITE_BLACK_BELT, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, PAL_NPC_BROWN, OBJECTTYPE_TRAINER, 3, TrainerBlackbeltYoshi, -1 object_event 7, 12, SPRITE_BLACK_BELT, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, PAL_NPC_BROWN, OBJECTTYPE_TRAINER, 3, TrainerBlackbeltLao, -1 diff --git a/maps/CianwoodLugiaSpeechHouse.asm b/maps/CianwoodLugiaSpeechHouse.asm index 7fa26baa1..f15e06343 100644 --- a/maps/CianwoodLugiaSpeechHouse.asm +++ b/maps/CianwoodLugiaSpeechHouse.asm @@ -1,12 +1,12 @@ - object_const_def ; object_event constants + object_const_def const CIANWOODLUGIASPEECHHOUSE_TEACHER const CIANWOODLUGIASPEECHHOUSE_LASS const CIANWOODLUGIASPEECHHOUSE_TWIN CianwoodLugiaSpeechHouse_MapScripts: - db 0 ; scene scripts + def_scene_scripts - db 0 ; callbacks + def_callbacks CianwoodLugiaSpeechHouseTeacherScript: jumptextfaceplayer CianwoodLugiaSpeechHouseTeacherText @@ -62,17 +62,17 @@ CianwoodLugiaSpeechHouseTwinText: CianwoodLugiaSpeechHouse_MapEvents: db 0, 0 ; filler - db 2 ; warp events + def_warp_events warp_event 2, 7, CIANWOOD_CITY, 6 warp_event 3, 7, CIANWOOD_CITY, 6 - db 0 ; coord events + def_coord_events - db 2 ; bg events + def_bg_events bg_event 0, 1, BGEVENT_READ, CianwoodLugiaSpeechHouseBookshelf bg_event 1, 1, BGEVENT_READ, CianwoodLugiaSpeechHouseBookshelf - db 3 ; object events + def_object_events object_event 2, 4, SPRITE_TEACHER, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, CianwoodLugiaSpeechHouseTeacherScript, -1 object_event 6, 5, SPRITE_LASS, SPRITEMOVEDATA_WALK_LEFT_RIGHT, 1, 0, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_SCRIPT, 0, CianwoodLugiaSpeechHouseLassScript, -1 object_event 0, 2, SPRITE_TWIN, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_SCRIPT, 0, CianwoodLugiaSpeechHouseTwinScript, -1 diff --git a/maps/CianwoodPharmacy.asm b/maps/CianwoodPharmacy.asm index e8c2ad51a..880c6519a 100644 --- a/maps/CianwoodPharmacy.asm +++ b/maps/CianwoodPharmacy.asm @@ -1,11 +1,11 @@ - object_const_def ; object_event constants + object_const_def const CIANWOODPHARMACY_PHARMACIST CianwoodPharmacy_MapScripts: - db 1 ; scene scripts + def_scene_scripts scene_script .DummyScene - db 0 ; callbacks + def_callbacks .DummyScene: end @@ -73,15 +73,15 @@ PharmacistDescribeSecretpotionText: CianwoodPharmacy_MapEvents: db 0, 0 ; filler - db 2 ; warp events + def_warp_events warp_event 2, 7, CIANWOOD_CITY, 4 warp_event 3, 7, CIANWOOD_CITY, 4 - db 0 ; coord events + def_coord_events - db 2 ; bg events + def_bg_events bg_event 0, 1, BGEVENT_READ, CianwoodPharmacyBookshelf bg_event 1, 1, BGEVENT_READ, CianwoodPharmacyBookshelf - db 1 ; object events + def_object_events object_event 2, 3, SPRITE_PHARMACIST, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_SCRIPT, 0, CianwoodPharmacist, -1 diff --git a/maps/CianwoodPhotoStudio.asm b/maps/CianwoodPhotoStudio.asm index 2bbb623a6..fcec56870 100644 --- a/maps/CianwoodPhotoStudio.asm +++ b/maps/CianwoodPhotoStudio.asm @@ -1,10 +1,10 @@ - object_const_def ; object_event constants + object_const_def const CIANWOODPHOTOSTUDIO_FISHING_GURU CianwoodPhotoStudio_MapScripts: - db 0 ; scene scripts + def_scene_scripts - db 0 ; callbacks + def_callbacks CianwoodPhotoStudioFishingGuruScript: faceplayer @@ -49,13 +49,13 @@ CianwoodPhotoStudioFishingGuruText_No: CianwoodPhotoStudio_MapEvents: db 0, 0 ; filler - db 2 ; warp events + def_warp_events warp_event 2, 7, CIANWOOD_CITY, 5 warp_event 3, 7, CIANWOOD_CITY, 5 - db 0 ; coord events + def_coord_events - db 0 ; bg events + def_bg_events - db 1 ; object events + def_object_events object_event 2, 3, SPRITE_FISHING_GURU, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_SCRIPT, 0, CianwoodPhotoStudioFishingGuruScript, -1 diff --git a/maps/CianwoodPokecenter1F.asm b/maps/CianwoodPokecenter1F.asm index d487b1517..afe5c6c69 100644 --- a/maps/CianwoodPokecenter1F.asm +++ b/maps/CianwoodPokecenter1F.asm @@ -1,13 +1,13 @@ - object_const_def ; object_event constants + object_const_def const CIANWOODPOKECENTER1F_NURSE const CIANWOODPOKECENTER1F_LASS const CIANWOODPOKECENTER1F_GYM_GUIDE const CIANWOODPOKECENTER1F_SUPER_NERD CianwoodPokecenter1F_MapScripts: - db 0 ; scene scripts + def_scene_scripts - db 0 ; callbacks + def_callbacks CianwoodPokecenter1FNurseScript: jumpstd PokecenterNurseScript @@ -134,16 +134,16 @@ CianwoodPokecenter1FSuperNerdText: CianwoodPokecenter1F_MapEvents: db 0, 0 ; filler - db 3 ; warp events + def_warp_events 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 + def_coord_events - db 0 ; bg events + def_bg_events - db 4 ; object events + def_object_events object_event 3, 1, SPRITE_NURSE, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, CianwoodPokecenter1FNurseScript, -1 object_event 1, 5, SPRITE_LASS, SPRITEMOVEDATA_WALK_UP_DOWN, 0, 1, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_SCRIPT, 0, CianwoodPokecenter1FLassScript, -1 object_event 5, 3, SPRITE_GYM_GUIDE, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_SCRIPT, 0, CianwoodGymGuideScript, -1 diff --git a/maps/CinnabarIsland.asm b/maps/CinnabarIsland.asm index 8284266d7..a364b427a 100644 --- a/maps/CinnabarIsland.asm +++ b/maps/CinnabarIsland.asm @@ -1,10 +1,10 @@ - object_const_def ; object_event constants + object_const_def const CINNABARISLAND_BLUE CinnabarIsland_MapScripts: - db 0 ; scene scripts + def_scene_scripts - db 1 ; callbacks + def_callbacks callback MAPCALLBACK_NEWMAP, .FlyPoint .FlyPoint: @@ -128,16 +128,16 @@ CinnabarIslandSignText: CinnabarIsland_MapEvents: db 0, 0 ; filler - db 1 ; warp events + def_warp_events warp_event 11, 11, CINNABAR_POKECENTER_1F, 1 - db 0 ; coord events + def_coord_events - db 4 ; bg events + def_bg_events bg_event 12, 11, BGEVENT_READ, CinnabarIslandPokecenterSign bg_event 9, 11, BGEVENT_READ, CinnabarIslandGymSign bg_event 7, 7, BGEVENT_READ, CinnabarIslandSign bg_event 9, 1, BGEVENT_ITEM, CinnabarIslandHiddenRareCandy - db 1 ; object events + def_object_events object_event 9, 6, SPRITE_BLUE, SPRITEMOVEDATA_SPINRANDOM_SLOW, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, CinnabarIslandBlue, EVENT_BLUE_IN_CINNABAR diff --git a/maps/CinnabarPokecenter1F.asm b/maps/CinnabarPokecenter1F.asm index ac8f4432a..beabb1ce3 100644 --- a/maps/CinnabarPokecenter1F.asm +++ b/maps/CinnabarPokecenter1F.asm @@ -1,12 +1,12 @@ - object_const_def ; object_event constants + object_const_def const CINNABARPOKECENTER1F_NURSE const CINNABARPOKECENTER1F_COOLTRAINER_F const CINNABARPOKECENTER1F_FISHER CinnabarPokecenter1F_MapScripts: - db 0 ; scene scripts + def_scene_scripts - db 0 ; callbacks + def_callbacks CinnabarPokecenter1FNurseScript: jumpstd PokecenterNurseScript @@ -35,16 +35,16 @@ CinnabarPokecenter1FFisherText: CinnabarPokecenter1F_MapEvents: db 0, 0 ; filler - db 3 ; warp events + def_warp_events 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 + def_coord_events - db 0 ; bg events + def_bg_events - db 3 ; object events + def_object_events object_event 3, 1, SPRITE_NURSE, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, CinnabarPokecenter1FNurseScript, -1 object_event 7, 6, SPRITE_COOLTRAINER_F, SPRITEMOVEDATA_WALK_LEFT_RIGHT, 2, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_SCRIPT, 0, CinnabarPokecenter1FCooltrainerFScript, -1 object_event 2, 4, SPRITE_FISHER, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_SCRIPT, 0, CinnabarPokecenter1FFisherScript, -1 diff --git a/maps/CinnabarPokecenter2FBeta.asm b/maps/CinnabarPokecenter2FBeta.asm index cf100a4a8..c17adbeab 100644 --- a/maps/CinnabarPokecenter2FBeta.asm +++ b/maps/CinnabarPokecenter2FBeta.asm @@ -1,16 +1,16 @@ CinnabarPokecenter2FBeta_MapScripts: - db 0 ; scene scripts + def_scene_scripts - db 0 ; callbacks + def_callbacks CinnabarPokecenter2FBeta_MapEvents: db 0, 0 ; filler - db 1 ; warp events + def_warp_events warp_event 0, 7, CINNABAR_POKECENTER_1F, 3 - db 0 ; coord events + def_coord_events - db 0 ; bg events + def_bg_events - db 0 ; object events + def_object_events diff --git a/maps/Colosseum.asm b/maps/Colosseum.asm index a26dcec34..85f1b2c27 100644 --- a/maps/Colosseum.asm +++ b/maps/Colosseum.asm @@ -1,14 +1,14 @@ - object_const_def ; object_event constants + object_const_def const COLOSSEUM_CHRIS1 const COLOSSEUM_CHRIS2 Colosseum_MapScripts: - db 3 ; scene scripts + def_scene_scripts scene_script .InitializeColosseum ; SCENE_DEFAULT scene_script .DummyScene1 ; SCENE_FINISHED scene_script .DummyScene2 ; unused - db 2 ; callbacks + def_callbacks callback MAPCALLBACK_OBJECTS, .SetWhichChris callback MAPCALLBACK_NEWMAP, .PreparePokecenter2F @@ -63,16 +63,16 @@ CableClubFriendScript: Colosseum_MapEvents: db 0, 0 ; filler - db 2 ; warp events + def_warp_events warp_event 4, 7, POKECENTER_2F, 3 warp_event 5, 7, POKECENTER_2F, 3 - db 0 ; coord events + def_coord_events - db 2 ; bg events + def_bg_events bg_event 4, 4, BGEVENT_RIGHT, ColosseumConsoleScript bg_event 5, 4, BGEVENT_LEFT, ColosseumConsoleScript - db 2 ; object events + def_object_events object_event 3, 4, SPRITE_CHRIS, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, CableClubFriendScript, EVENT_TEMPORARY_UNTIL_MAP_RELOAD_1 object_event 6, 4, SPRITE_CHRIS, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, CableClubFriendScript, EVENT_TEMPORARY_UNTIL_MAP_RELOAD_2 diff --git a/maps/CopycatsHouse1F.asm b/maps/CopycatsHouse1F.asm index 0d0d9596d..8c21178f4 100644 --- a/maps/CopycatsHouse1F.asm +++ b/maps/CopycatsHouse1F.asm @@ -1,12 +1,12 @@ - object_const_def ; object_event constants + object_const_def const COPYCATSHOUSE1F_POKEFAN_M const COPYCATSHOUSE1F_POKEFAN_F const COPYCATSHOUSE1F_CLEFAIRY CopycatsHouse1F_MapScripts: - db 0 ; scene scripts + def_scene_scripts - db 0 ; callbacks + def_callbacks CopycatsHouse1FPokefanMScript: jumptextfaceplayer CopycatsHouse1FPokefanMText @@ -73,16 +73,16 @@ CopycatsHouse1FBlisseyText: CopycatsHouse1F_MapEvents: db 0, 0 ; filler - db 3 ; warp events + def_warp_events 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 + def_coord_events - db 0 ; bg events + def_bg_events - db 3 ; object events + def_object_events object_event 2, 3, SPRITE_POKEFAN_M, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, CopycatsHouse1FPokefanMScript, -1 object_event 5, 4, SPRITE_POKEFAN_F, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_SCRIPT, 0, CopycatsHouse1FPokefanFScript, -1 object_event 6, 6, SPRITE_CLEFAIRY, SPRITEMOVEDATA_POKEMON, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, CopycatsHouse1FBlisseyScript, -1 diff --git a/maps/CopycatsHouse2F.asm b/maps/CopycatsHouse2F.asm index 18393892f..16d40103f 100644 --- a/maps/CopycatsHouse2F.asm +++ b/maps/CopycatsHouse2F.asm @@ -1,4 +1,4 @@ - object_const_def ; object_event constants + object_const_def const COPYCATSHOUSE2F_COPYCAT1 ; if player is male const COPYCATSHOUSE2F_DODRIO const COPYCATSHOUSE2F_FAIRYDOLL ; lost item @@ -7,9 +7,9 @@ const COPYCATSHOUSE2F_COPYCAT2 ; if player is female CopycatsHouse2F_MapScripts: - db 0 ; scene scripts + def_scene_scripts - db 1 ; callbacks + def_callbacks callback MAPCALLBACK_OBJECTS, .Callback .Callback: @@ -361,16 +361,16 @@ CopycatsHouse2FDollText: CopycatsHouse2F_MapEvents: db 0, 0 ; filler - db 1 ; warp events + def_warp_events warp_event 3, 0, COPYCATS_HOUSE_1F, 3 - db 0 ; coord events + def_coord_events - db 2 ; bg events + def_bg_events bg_event 0, 1, BGEVENT_READ, CopycatsHouse2FBookshelf bg_event 1, 1, BGEVENT_READ, CopycatsHouse2FBookshelf - db 6 ; object events + def_object_events object_event 4, 3, SPRITE_COPYCAT, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_SCRIPT, 0, Copycat, EVENT_COPYCAT_1 object_event 6, 4, SPRITE_MOLTRES, SPRITEMOVEDATA_POKEMON, 0, 0, -1, -1, PAL_NPC_BROWN, OBJECTTYPE_SCRIPT, 0, CopycatsDodrio, -1 object_event 6, 1, SPRITE_FAIRY, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_SCRIPT, 0, CopycatsHouse2FDoll, EVENT_COPYCATS_HOUSE_2F_DOLL diff --git a/maps/DanceTheatre.asm b/maps/DanceTheatre.asm index a4ff53bd4..2853ca5c8 100644 --- a/maps/DanceTheatre.asm +++ b/maps/DanceTheatre.asm @@ -1,4 +1,4 @@ - object_const_def ; object_event constants + object_const_def const DANCETHEATRE_KIMONO_GIRL1 const DANCETHEATRE_KIMONO_GIRL2 const DANCETHEATRE_KIMONO_GIRL3 @@ -10,9 +10,9 @@ const DANCETHEATRE_GRANNY DanceTheatre_MapScripts: - db 0 ; scene scripts + def_scene_scripts - db 0 ; callbacks + def_callbacks TrainerKimonoGirlNaoko2: trainer KIMONO_GIRL, NAOKO2, EVENT_BEAT_KIMONO_GIRL_NAOKO, KimonoGirlNaoko2SeenText, KimonoGirlNaoko2BeatenText, 0, .Script @@ -338,17 +338,17 @@ DanceTheatreFancyPanelText: DanceTheatre_MapEvents: db 0, 0 ; filler - db 2 ; warp events + def_warp_events warp_event 5, 13, ECRUTEAK_CITY, 8 warp_event 6, 13, ECRUTEAK_CITY, 8 - db 0 ; coord events + def_coord_events - db 2 ; bg events + def_bg_events bg_event 5, 6, BGEVENT_UP, DanceTheatreFancyPanel bg_event 6, 6, BGEVENT_UP, DanceTheatreFancyPanel - db 9 ; object events + def_object_events object_event 0, 2, SPRITE_KIMONO_GIRL, SPRITEMOVEDATA_SPINCOUNTERCLOCKWISE, 0, 0, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_TRAINER, 0, TrainerKimonoGirlNaoko2, -1 object_event 2, 1, SPRITE_KIMONO_GIRL, SPRITEMOVEDATA_SPINRANDOM_FAST, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_TRAINER, 0, TrainerKimonoGirlSayo, -1 object_event 6, 2, SPRITE_KIMONO_GIRL, SPRITEMOVEDATA_SPINRANDOM_SLOW, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_TRAINER, 0, TrainerKimonoGirlZuki, -1 diff --git a/maps/DarkCaveBlackthornEntrance.asm b/maps/DarkCaveBlackthornEntrance.asm index 196c352f7..d7107003e 100644 --- a/maps/DarkCaveBlackthornEntrance.asm +++ b/maps/DarkCaveBlackthornEntrance.asm @@ -1,12 +1,12 @@ - object_const_def ; object_event constants + object_const_def const DARKCAVEBLACKTHORNENTRANCE_PHARMACIST const DARKCAVEBLACKTHORNENTRANCE_POKE_BALL1 const DARKCAVEBLACKTHORNENTRANCE_POKE_BALL2 DarkCaveBlackthornEntrance_MapScripts: - db 0 ; scene scripts + def_scene_scripts - db 0 ; callbacks + def_callbacks DarkCaveBlackthornEntrancePharmacistScript: faceplayer @@ -62,15 +62,15 @@ DarkCaveBlackthornEntrancePharmacistText2: DarkCaveBlackthornEntrance_MapEvents: db 0, 0 ; filler - db 2 ; warp events + def_warp_events warp_event 23, 3, ROUTE_45, 1 warp_event 3, 25, DARK_CAVE_VIOLET_ENTRANCE, 2 - db 0 ; coord events + def_coord_events - db 0 ; bg events + def_bg_events - db 3 ; object events + def_object_events object_event 7, 3, SPRITE_PHARMACIST, SPRITEMOVEDATA_SPINRANDOM_SLOW, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, DarkCaveBlackthornEntrancePharmacistScript, -1 object_event 21, 24, SPRITE_POKE_BALL, SPRITEMOVEDATA_STILL, 0, 0, -1, -1, 0, OBJECTTYPE_ITEMBALL, 0, DarkCaveBlackthornEntranceRevive, EVENT_DARK_CAVE_BLACKTHORN_ENTRANCE_REVIVE object_event 7, 22, SPRITE_POKE_BALL, SPRITEMOVEDATA_STILL, 0, 0, -1, -1, 0, OBJECTTYPE_ITEMBALL, 0, DarkCaveBlackthornEntranceTMSnore, EVENT_DARK_CAVE_BLACKTHORN_ENTRANCE_TM_SNORE diff --git a/maps/DarkCaveVioletEntrance.asm b/maps/DarkCaveVioletEntrance.asm index 6a8f6400c..572b54613 100644 --- a/maps/DarkCaveVioletEntrance.asm +++ b/maps/DarkCaveVioletEntrance.asm @@ -1,4 +1,4 @@ - object_const_def ; object_event constants + object_const_def const DARKCAVEVIOLETENTRANCE_POKE_BALL1 const DARKCAVEVIOLETENTRANCE_ROCK1 const DARKCAVEVIOLETENTRANCE_ROCK2 @@ -9,9 +9,9 @@ const DARKCAVEVIOLETENTRANCE_POKE_BALL4 DarkCaveVioletEntrance_MapScripts: - db 0 ; scene scripts + def_scene_scripts - db 0 ; callbacks + def_callbacks DarkCaveVioletEntrancePotion: itemball POTION @@ -34,17 +34,17 @@ DarkCaveVioletEntranceHiddenElixer: DarkCaveVioletEntrance_MapEvents: db 0, 0 ; filler - db 3 ; warp events + def_warp_events 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 + def_coord_events - db 1 ; bg events + def_bg_events bg_event 26, 3, BGEVENT_ITEM, DarkCaveVioletEntranceHiddenElixer - db 8 ; object events + def_object_events object_event 6, 8, SPRITE_POKE_BALL, SPRITEMOVEDATA_STILL, 0, 0, -1, -1, 0, OBJECTTYPE_ITEMBALL, 0, DarkCaveVioletEntrancePotion, EVENT_DARK_CAVE_VIOLET_ENTRANCE_POTION object_event 16, 14, SPRITE_ROCK, SPRITEMOVEDATA_SMASHABLE_ROCK, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, DarkCaveVioletEntranceRock, -1 object_event 27, 6, SPRITE_ROCK, SPRITEMOVEDATA_SMASHABLE_ROCK, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, DarkCaveVioletEntranceRock, -1 diff --git a/maps/DayCare.asm b/maps/DayCare.asm index 0f7b22f6b..45c2e37e8 100644 --- a/maps/DayCare.asm +++ b/maps/DayCare.asm @@ -1,11 +1,11 @@ - object_const_def ; object_event constants + object_const_def const DAYCARE_GRAMPS const DAYCARE_GRANNY DayCare_MapScripts: - db 0 ; scene scripts + def_scene_scripts - db 1 ; callbacks + def_callbacks callback MAPCALLBACK_OBJECTS, .EggCheckCallback .EggCheckCallback: @@ -156,18 +156,18 @@ DayCareText_PartyFull: DayCare_MapEvents: db 0, 0 ; filler - db 4 ; warp events + def_warp_events 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 + def_coord_events - db 2 ; bg events + def_bg_events bg_event 0, 1, BGEVENT_READ, DayCareBookshelf bg_event 1, 1, BGEVENT_READ, DayCareBookshelf - db 2 ; object events + def_object_events object_event 2, 3, SPRITE_GRAMPS, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, DayCareManScript_Inside, EVENT_DAY_CARE_MAN_IN_DAY_CARE object_event 5, 3, SPRITE_GRANNY, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_SCRIPT, 0, DayCareLadyScript, -1 diff --git a/maps/DayOfWeekSiblingsHouse.asm b/maps/DayOfWeekSiblingsHouse.asm index 299e0e1c3..c020552df 100644 --- a/maps/DayOfWeekSiblingsHouse.asm +++ b/maps/DayOfWeekSiblingsHouse.asm @@ -1,10 +1,10 @@ - object_const_def ; object_event constants + object_const_def const DAYOFWEEKSIBLINGSHOUSE_POKEDEX DayOfWeekSiblingsHouse_MapScripts: - db 0 ; scene scripts + def_scene_scripts - db 0 ; callbacks + def_callbacks DayOfWeekSiblingsHousePokedexScript: opentext @@ -71,13 +71,13 @@ DayOfWeekSiblingsHousePokedexText3: DayOfWeekSiblingsHouse_MapEvents: db 0, 0 ; filler - db 2 ; warp events + def_warp_events warp_event 2, 7, ROUTE_26, 3 warp_event 3, 7, ROUTE_26, 3 - db 0 ; coord events + def_coord_events - db 0 ; bg events + def_bg_events - db 1 ; object events + def_object_events object_event 3, 3, SPRITE_POKEDEX, SPRITEMOVEDATA_STILL, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, DayOfWeekSiblingsHousePokedexScript, -1 diff --git a/maps/DiglettsCave.asm b/maps/DiglettsCave.asm index d77f3e8e4..970afd4fd 100644 --- a/maps/DiglettsCave.asm +++ b/maps/DiglettsCave.asm @@ -1,10 +1,10 @@ - object_const_def ; object_event constants + object_const_def const DIGLETTSCAVE_POKEFAN_M DiglettsCave_MapScripts: - db 0 ; scene scripts + def_scene_scripts - db 0 ; callbacks + def_callbacks DiglettsCavePokefanMScript: jumptextfaceplayer DiglettsCavePokefanMText @@ -23,7 +23,7 @@ DiglettsCavePokefanMText: DiglettsCave_MapEvents: db 0, 0 ; filler - db 6 ; warp events + def_warp_events warp_event 3, 33, VERMILION_CITY, 10 warp_event 5, 31, DIGLETTS_CAVE, 5 warp_event 15, 5, ROUTE_2, 5 @@ -31,10 +31,10 @@ DiglettsCave_MapEvents: warp_event 17, 33, DIGLETTS_CAVE, 2 warp_event 3, 3, DIGLETTS_CAVE, 4 - db 0 ; coord events + def_coord_events - db 1 ; bg events + def_bg_events bg_event 6, 11, BGEVENT_ITEM, DiglettsCaveHiddenMaxRevive - db 1 ; object events + def_object_events object_event 3, 31, SPRITE_POKEFAN_M, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, DiglettsCavePokefanMScript, -1 diff --git a/maps/DragonShrine.asm b/maps/DragonShrine.asm index 5bfcd111e..a5531bf78 100644 --- a/maps/DragonShrine.asm +++ b/maps/DragonShrine.asm @@ -1,15 +1,15 @@ - object_const_def ; object_event constants + object_const_def const DRAGONSHRINE_ELDER1 const DRAGONSHRINE_ELDER2 const DRAGONSHRINE_ELDER3 const DRAGONSHRINE_CLAIR DragonShrine_MapScripts: - db 2 ; scene scripts + def_scene_scripts scene_script .DragonShrineTest ; SCENE_DEFAULT scene_script .DummyScene ; SCENE_FINISHED - db 0 ; callbacks + def_callbacks .DragonShrineTest: prioritysjump .DragonShrineTestScript @@ -658,15 +658,15 @@ DragonShrineSpeechlessText: DragonShrine_MapEvents: db 0, 0 ; filler - db 2 ; warp events + def_warp_events warp_event 4, 9, DRAGONS_DEN_B1F, 2 warp_event 5, 9, DRAGONS_DEN_B1F, 2 - db 0 ; coord events + def_coord_events - db 0 ; bg events + def_bg_events - db 4 ; object events + def_object_events object_event 5, 1, SPRITE_ELDER, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, DragonShrineElder1Script, EVENT_TEMPORARY_UNTIL_MAP_RELOAD_1 object_event 2, 4, SPRITE_ELDER, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, DragonShrineElder2Script, EVENT_TEMPORARY_UNTIL_MAP_RELOAD_1 object_event 7, 4, SPRITE_ELDER, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, DragonShrineElder3Script, EVENT_TEMPORARY_UNTIL_MAP_RELOAD_1 diff --git a/maps/DragonsDen1F.asm b/maps/DragonsDen1F.asm index 2fbc62dfe..4e353ca6b 100644 --- a/maps/DragonsDen1F.asm +++ b/maps/DragonsDen1F.asm @@ -1,19 +1,19 @@ DragonsDen1F_MapScripts: - db 0 ; scene scripts + def_scene_scripts - db 0 ; callbacks + def_callbacks DragonsDen1F_MapEvents: db 0, 0 ; filler - db 4 ; warp events + def_warp_events 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 + def_coord_events - db 0 ; bg events + def_bg_events - db 0 ; object events + def_object_events diff --git a/maps/DragonsDenB1F.asm b/maps/DragonsDenB1F.asm index 00a8c149f..5daa2bc13 100644 --- a/maps/DragonsDenB1F.asm +++ b/maps/DragonsDenB1F.asm @@ -1,4 +1,4 @@ - object_const_def ; object_event constants + object_const_def const DRAGONSDENB1F_POKE_BALL1 const DRAGONSDENB1F_CLAIR const DRAGONSDENB1F_SILVER @@ -10,11 +10,11 @@ const DRAGONSDENB1F_POKE_BALL3 DragonsDenB1F_MapScripts: - db 2 ; scene scripts + def_scene_scripts scene_script .DummyScene0 ; SCENE_DRAGONSDENB1F_NOTHING scene_script .DummyScene1 ; SCENE_DRAGONSDENB1F_CLAIR_GIVES_TM - db 1 ; callbacks + def_callbacks callback MAPCALLBACK_NEWMAP, .CheckSilver .DummyScene0: @@ -406,20 +406,20 @@ Text_NoRoomForDragonFang: DragonsDenB1F_MapEvents: db 0, 0 ; filler - db 2 ; warp events + def_warp_events warp_event 20, 3, DRAGONS_DEN_1F, 3 warp_event 19, 29, DRAGON_SHRINE, 1 - db 1 ; coord events + def_coord_events coord_event 19, 30, SCENE_DRAGONSDENB1F_CLAIR_GIVES_TM, DragonsDenB1F_ClairScene - db 4 ; bg events + def_bg_events bg_event 18, 24, BGEVENT_READ, DragonShrineSignpost bg_event 33, 29, BGEVENT_ITEM, DragonsDenB1FHiddenRevive bg_event 21, 17, BGEVENT_ITEM, DragonsDenB1FHiddenMaxPotion bg_event 31, 15, BGEVENT_ITEM, DragonsDenB1FHiddenMaxElixer - db 9 ; object events + def_object_events object_event 35, 16, SPRITE_POKE_BALL, SPRITEMOVEDATA_STILL, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, DragonsDenB1FDragonFangScript, EVENT_DRAGONS_DEN_B1F_DRAGON_FANG object_event 14, 30, SPRITE_CLAIR, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_SCRIPT, 0, ObjectEvent, EVENT_DRAGONS_DEN_CLAIR object_event 20, 23, SPRITE_SILVER, SPRITEMOVEDATA_WANDER, 2, 2, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, DragonsDenB1FSilverScript, EVENT_RIVAL_DRAGONS_DEN diff --git a/maps/EarlsPokemonAcademy.asm b/maps/EarlsPokemonAcademy.asm index 696100f17..ea5dc81c3 100644 --- a/maps/EarlsPokemonAcademy.asm +++ b/maps/EarlsPokemonAcademy.asm @@ -1,4 +1,4 @@ - object_const_def ; object_event constants + object_const_def const EARLSPOKEMONACADEMY_EARL const EARLSPOKEMONACADEMY_YOUNGSTER1 const EARLSPOKEMONACADEMY_GAMEBOY_KID1 @@ -7,9 +7,9 @@ const EARLSPOKEMONACADEMY_POKEDEX EarlsPokemonAcademy_MapScripts: - db 0 ; scene scripts + def_scene_scripts - db 0 ; callbacks + def_callbacks AcademyEarl: applymovement EARLSPOKEMONACADEMY_EARL, AcademyEarlSpinMovement @@ -412,19 +412,19 @@ AcademyStickerMachineText: EarlsPokemonAcademy_MapEvents: db 0, 0 ; filler - db 2 ; warp events + def_warp_events warp_event 3, 15, VIOLET_CITY, 3 warp_event 4, 15, VIOLET_CITY, 3 - db 0 ; coord events + def_coord_events - db 4 ; bg events + def_bg_events bg_event 0, 1, BGEVENT_READ, AcademyBookshelf bg_event 1, 1, BGEVENT_READ, AcademyBookshelf bg_event 3, 0, BGEVENT_READ, AcademyBlackboard bg_event 4, 0, BGEVENT_READ, AcademyBlackboard - db 6 ; object events + def_object_events object_event 4, 2, SPRITE_FISHER, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_SCRIPT, 0, AcademyEarl, EVENT_EARLS_ACADEMY_EARL object_event 2, 5, SPRITE_YOUNGSTER, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_SCRIPT, 0, EarlsPokemonAcademyYoungster1Script, -1 object_event 3, 11, SPRITE_GAMEBOY_KID, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, EarlsPokemonAcademyGameboyKid1Script, -1 diff --git a/maps/EcruteakCity.asm b/maps/EcruteakCity.asm index 44795e43a..fec6d0bc3 100644 --- a/maps/EcruteakCity.asm +++ b/maps/EcruteakCity.asm @@ -1,4 +1,4 @@ - object_const_def ; object_event constants + object_const_def const ECRUTEAKCITY_GRAMPS1 const ECRUTEAKCITY_GRAMPS2 const ECRUTEAKCITY_LASS1 @@ -8,9 +8,9 @@ const ECRUTEAKCITY_GRAMPS3 EcruteakCity_MapScripts: - db 0 ; scene scripts + def_scene_scripts - db 1 ; callbacks + def_callbacks callback MAPCALLBACK_NEWMAP, .FlyPoint .FlyPoint: @@ -260,7 +260,7 @@ BurnedTowerSignText: EcruteakCity_MapEvents: db 0, 0 ; filler - db 15 ; warp events + def_warp_events 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 @@ -277,9 +277,9 @@ EcruteakCity_MapEvents: warp_event 0, 18, ROUTE_38_ECRUTEAK_GATE, 3 warp_event 0, 19, ROUTE_38_ECRUTEAK_GATE, 4 - db 0 ; coord events + def_coord_events - db 8 ; bg events + def_bg_events bg_event 15, 21, BGEVENT_READ, EcruteakCitySign bg_event 38, 10, BGEVENT_READ, TinTowerSign bg_event 8, 28, BGEVENT_READ, EcruteakGymSign @@ -289,7 +289,7 @@ EcruteakCity_MapEvents: bg_event 30, 21, BGEVENT_READ, EcruteakCityMartSign bg_event 23, 14, BGEVENT_ITEM, EcruteakCityHiddenHyperPotion - db 7 ; object events + def_object_events object_event 18, 15, SPRITE_GRAMPS, SPRITEMOVEDATA_WANDER, 1, 1, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, EcruteakCityGramps1Script, -1 object_event 20, 21, SPRITE_GRAMPS, SPRITEMOVEDATA_SPINRANDOM_SLOW, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, EcruteakCityGramps2Script, -1 object_event 21, 29, SPRITE_LASS, SPRITEMOVEDATA_WALK_LEFT_RIGHT, 2, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_SCRIPT, 0, EcruteakCityLass1Script, -1 diff --git a/maps/EcruteakGym.asm b/maps/EcruteakGym.asm index 56811df7c..b9c30f4e1 100644 --- a/maps/EcruteakGym.asm +++ b/maps/EcruteakGym.asm @@ -1,4 +1,4 @@ - object_const_def ; object_event constants + object_const_def const ECRUTEAKGYM_MORTY const ECRUTEAKGYM_SAGE1 const ECRUTEAKGYM_SAGE2 @@ -8,11 +8,11 @@ const ECRUTEAKGYM_GRAMPS EcruteakGym_MapScripts: - db 2 ; scene scripts + def_scene_scripts scene_script .ForcedToLeave ; SCENE_DEFAULT scene_script .DummyScene ; SCENE_FINISHED - db 0 ; callbacks + def_callbacks .ForcedToLeave: prioritysjump EcruteakGymClosed @@ -387,7 +387,7 @@ EcruteakGymClosedText: EcruteakGym_MapEvents: db 0, 0 ; filler - db 33 ; warp events + def_warp_events warp_event 4, 17, ECRUTEAK_CITY, 10 warp_event 5, 17, ECRUTEAK_CITY, 10 warp_event 4, 14, ECRUTEAK_GYM, 4 @@ -422,13 +422,13 @@ EcruteakGym_MapEvents: warp_event 7, 12, ECRUTEAK_GYM, 3 warp_event 7, 13, ECRUTEAK_GYM, 3 - db 0 ; coord events + def_coord_events - db 2 ; bg events + def_bg_events bg_event 3, 15, BGEVENT_READ, EcruteakGymStatue bg_event 6, 15, BGEVENT_READ, EcruteakGymStatue - db 7 ; object events + def_object_events object_event 5, 1, SPRITE_MORTY, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_BROWN, OBJECTTYPE_SCRIPT, 0, EcruteakGymMortyScript, -1 object_event 2, 7, SPRITE_SAGE, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_TRAINER, 1, TrainerSageJeffrey, -1 object_event 3, 13, SPRITE_SAGE, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_TRAINER, 3, TrainerSagePing, -1 diff --git a/maps/EcruteakItemfinderHouse.asm b/maps/EcruteakItemfinderHouse.asm index 96140f997..97410729b 100644 --- a/maps/EcruteakItemfinderHouse.asm +++ b/maps/EcruteakItemfinderHouse.asm @@ -1,11 +1,11 @@ - object_const_def ; object_event constants + object_const_def const ECRUTEAKITEMFINDERHOUSE_COOLTRAINER_M const ECRUTEAKITEMFINDERHOUSE_POKEDEX EcruteakItemfinderHouse_MapScripts: - db 0 ; scene scripts + def_scene_scripts - db 0 ; callbacks + def_callbacks EcruteakItemfinderGuy: faceplayer @@ -163,15 +163,15 @@ EcruteakThreeMonText: EcruteakItemfinderHouse_MapEvents: db 0, 0 ; filler - db 2 ; warp events + def_warp_events warp_event 3, 7, ECRUTEAK_CITY, 11 warp_event 4, 7, ECRUTEAK_CITY, 11 - db 0 ; coord events + def_coord_events - db 1 ; bg events + def_bg_events bg_event 2, 1, BGEVENT_READ, ItemFinderHouseRadio - db 2 ; object events + def_object_events object_event 2, 3, SPRITE_COOLTRAINER_M, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_SCRIPT, 0, EcruteakItemfinderGuy, -1 object_event 3, 3, SPRITE_POKEDEX, SPRITEMOVEDATA_STILL, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, EcruteakHistoryBook, -1 diff --git a/maps/EcruteakLugiaSpeechHouse.asm b/maps/EcruteakLugiaSpeechHouse.asm index 4083a56de..ad47d2d3a 100644 --- a/maps/EcruteakLugiaSpeechHouse.asm +++ b/maps/EcruteakLugiaSpeechHouse.asm @@ -1,11 +1,11 @@ - object_const_def ; object_event constants + object_const_def const ECRUTEAKLUGIASPEECHHOUSE_GRAMPS const ECRUTEAKLUGIASPEECHHOUSE_YOUNGSTER EcruteakLugiaSpeechHouse_MapScripts: - db 0 ; scene scripts + def_scene_scripts - db 0 ; callbacks + def_callbacks EcruteakLugiaSpeechHouseGrampsScript: jumptextfaceplayer EcruteakLugiaSpeechHouseGrampsText @@ -45,15 +45,15 @@ EcruteakLugiaSpeechHouseYoungsterText: EcruteakLugiaSpeechHouse_MapEvents: db 0, 0 ; filler - db 2 ; warp events + def_warp_events warp_event 3, 7, ECRUTEAK_CITY, 7 warp_event 4, 7, ECRUTEAK_CITY, 7 - db 0 ; coord events + def_coord_events - db 1 ; bg events + def_bg_events bg_event 2, 1, BGEVENT_READ, LugiaSpeechHouseRadio - db 2 ; object events + def_object_events object_event 2, 3, SPRITE_GRAMPS, SPRITEMOVEDATA_SPINRANDOM_SLOW, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, EcruteakLugiaSpeechHouseGrampsScript, -1 object_event 5, 4, SPRITE_YOUNGSTER, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, EcruteakLugiaSpeechHouseYoungsterScript, -1 diff --git a/maps/EcruteakMart.asm b/maps/EcruteakMart.asm index 34cb3e60a..e1a9328fa 100644 --- a/maps/EcruteakMart.asm +++ b/maps/EcruteakMart.asm @@ -1,12 +1,12 @@ - object_const_def ; object_event constants + object_const_def const ECRUTEAKMART_CLERK const ECRUTEAKMART_SUPER_NERD const ECRUTEAKMART_GRANNY EcruteakMart_MapScripts: - db 0 ; scene scripts + def_scene_scripts - db 0 ; callbacks + def_callbacks EcruteakMartClerkScript: opentext @@ -46,15 +46,15 @@ EcruteakMartGrannyText: EcruteakMart_MapEvents: db 0, 0 ; filler - db 2 ; warp events + def_warp_events warp_event 2, 7, ECRUTEAK_CITY, 9 warp_event 3, 7, ECRUTEAK_CITY, 9 - db 0 ; coord events + def_coord_events - db 0 ; bg events + def_bg_events - db 3 ; object events + def_object_events object_event 1, 3, SPRITE_CLERK, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, EcruteakMartClerkScript, -1 object_event 5, 2, SPRITE_SUPER_NERD, SPRITEMOVEDATA_WALK_LEFT_RIGHT, 1, 0, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_SCRIPT, 0, EcruteakMartSuperNerdScript, -1 object_event 6, 6, SPRITE_GRANNY, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, EcruteakMartGrannyScript, -1 diff --git a/maps/EcruteakPokecenter1F.asm b/maps/EcruteakPokecenter1F.asm index b428524c4..0624b6eac 100644 --- a/maps/EcruteakPokecenter1F.asm +++ b/maps/EcruteakPokecenter1F.asm @@ -1,4 +1,4 @@ - object_const_def ; object_event constants + object_const_def const ECRUTEAKPOKECENTER1F_NURSE const ECRUTEAKPOKECENTER1F_POKEFAN_M const ECRUTEAKPOKECENTER1F_COOLTRAINER_F @@ -6,11 +6,11 @@ const ECRUTEAKPOKECENTER1F_BILL EcruteakPokecenter1F_MapScripts: - db 2 ; scene scripts + def_scene_scripts scene_script .MeetBill ; SCENE_DEFAULT scene_script .DummyScene ; SCENE_FINISHED - db 0 ; callbacks + def_callbacks .MeetBill: prioritysjump .BillActivatesTimeCapsule @@ -207,16 +207,16 @@ EcruteakPokecenter1FGymGuideText: EcruteakPokecenter1F_MapEvents: db 0, 0 ; filler - db 3 ; warp events + def_warp_events 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 + def_coord_events - db 0 ; bg events + def_bg_events - db 5 ; object events + def_object_events object_event 3, 1, SPRITE_NURSE, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, EcruteakPokecenter1FNurseScript, -1 object_event 7, 6, SPRITE_POKEFAN_M, SPRITEMOVEDATA_SPINRANDOM_FAST, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, EcruteakPokecenter1FPokefanMScript, -1 object_event 1, 4, SPRITE_COOLTRAINER_F, SPRITEMOVEDATA_SPINRANDOM_SLOW, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, EcruteakPokecenter1FCooltrainerFScript, -1 diff --git a/maps/EcruteakTinTowerEntrance.asm b/maps/EcruteakTinTowerEntrance.asm index 1bcb066ac..2dc64249c 100644 --- a/maps/EcruteakTinTowerEntrance.asm +++ b/maps/EcruteakTinTowerEntrance.asm @@ -1,15 +1,15 @@ - object_const_def ; object_event constants + object_const_def const ECRUTEAKTINTOWERENTRANCE_SAGE1 const ECRUTEAKTINTOWERENTRANCE_SAGE2 const ECRUTEAKTINTOWERENTRANCE_SAGE3 const ECRUTEAKTINTOWERENTRANCE_GRAMPS EcruteakTinTowerEntrance_MapScripts: - db 2 ; scene scripts + def_scene_scripts scene_script .DummyScene0 ; SCENE_DEFAULT scene_script .DummyScene1 ; SCENE_FINISHED - db 1 ; callbacks + def_callbacks callback MAPCALLBACK_OBJECTS, .InitializeSages .DummyScene0: @@ -278,20 +278,20 @@ EcruteakTinTowerEntranceGrampsText: EcruteakTinTowerEntrance_MapEvents: db 0, 0 ; filler - db 5 ; warp events + def_warp_events 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 + def_coord_events coord_event 4, 7, SCENE_DEFAULT, EcruteakTinTowerEntrance_CoordEvent1 coord_event 5, 7, SCENE_DEFAULT, EcruteakTinTowerEntrance_CoordEvent2 - db 0 ; bg events + def_bg_events - db 4 ; object events + def_object_events object_event 4, 6, SPRITE_SAGE, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, EcruteakTinTowerEntranceSageScript, EVENT_RANG_CLEAR_BELL_1 object_event 5, 6, SPRITE_SAGE, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, EcruteakTinTowerEntranceSageScript, EVENT_RANG_CLEAR_BELL_2 object_event 6, 9, SPRITE_SAGE, SPRITEMOVEDATA_WANDER, 1, 1, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, EcruteakTinTowerEntranceWanderingSageScript, EVENT_ECRUTEAK_TIN_TOWER_ENTRANCE_WANDERING_SAGE diff --git a/maps/ElmsHouse.asm b/maps/ElmsHouse.asm index 24a3ffd6a..1b2502435 100644 --- a/maps/ElmsHouse.asm +++ b/maps/ElmsHouse.asm @@ -1,11 +1,11 @@ - object_const_def ; object_event constants + object_const_def const ELMSHOUSE_ELMS_WIFE const ELMSHOUSE_ELMS_SON ElmsHouse_MapScripts: - db 0 ; scene scripts + def_scene_scripts - db 0 ; callbacks + def_callbacks ElmsWife: jumptextfaceplayer ElmsWifeText @@ -84,17 +84,17 @@ ElmsHousePCText: ElmsHouse_MapEvents: db 0, 0 ; filler - db 2 ; warp events + def_warp_events warp_event 2, 7, NEW_BARK_TOWN, 4 warp_event 3, 7, NEW_BARK_TOWN, 4 - db 0 ; coord events + def_coord_events - db 3 ; bg events + def_bg_events bg_event 0, 1, BGEVENT_READ, ElmsHousePC bg_event 6, 1, BGEVENT_READ, ElmsHouseBookshelf bg_event 7, 1, BGEVENT_READ, ElmsHouseBookshelf - db 2 ; object events + def_object_events object_event 1, 5, SPRITE_TEACHER, SPRITEMOVEDATA_WALK_UP_DOWN, 0, 1, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_SCRIPT, 0, ElmsWife, -1 object_event 5, 4, SPRITE_BUG_CATCHER, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, ElmsSon, -1 diff --git a/maps/ElmsLab.asm b/maps/ElmsLab.asm index 53eb11006..48dfb226c 100644 --- a/maps/ElmsLab.asm +++ b/maps/ElmsLab.asm @@ -1,4 +1,4 @@ - object_const_def ; object_event constants + object_const_def const ELMSLAB_ELM const ELMSLAB_ELMS_AIDE const ELMSLAB_POKE_BALL1 @@ -7,7 +7,7 @@ const ELMSLAB_OFFICER ElmsLab_MapScripts: - db 6 ; scene scripts + def_scene_scripts scene_script .MeetElm ; SCENE_DEFAULT scene_script .DummyScene1 ; SCENE_ELMSLAB_CANT_LEAVE scene_script .DummyScene2 ; SCENE_ELMSLAB_NOTHING @@ -15,7 +15,7 @@ ElmsLab_MapScripts: scene_script .DummyScene4 ; SCENE_ELMSLAB_UNUSED scene_script .DummyScene5 ; SCENE_ELMSLAB_AIDE_GIVES_POTION - db 1 ; callbacks + def_callbacks callback MAPCALLBACK_OBJECTS, .MoveElmCallback .MeetElm: @@ -1371,11 +1371,11 @@ ElmsLabPCText: ElmsLab_MapEvents: db 0, 0 ; filler - db 2 ; warp events + def_warp_events warp_event 4, 11, NEW_BARK_TOWN, 1 warp_event 5, 11, NEW_BARK_TOWN, 1 - db 8 ; coord events + def_coord_events coord_event 4, 6, SCENE_ELMSLAB_CANT_LEAVE, LabTryToLeaveScript coord_event 5, 6, SCENE_ELMSLAB_CANT_LEAVE, LabTryToLeaveScript coord_event 4, 5, SCENE_ELMSLAB_MEET_OFFICER, MeetCopScript @@ -1385,7 +1385,7 @@ ElmsLab_MapEvents: coord_event 4, 8, SCENE_ELMSLAB_AIDE_GIVES_POKE_BALLS, AideScript_WalkBalls1 coord_event 5, 8, SCENE_ELMSLAB_AIDE_GIVES_POKE_BALLS, AideScript_WalkBalls2 - db 16 ; bg events + def_bg_events bg_event 2, 1, BGEVENT_READ, ElmsLabHealingMachine bg_event 6, 1, BGEVENT_READ, ElmsLabBookshelf bg_event 7, 1, BGEVENT_READ, ElmsLabBookshelf @@ -1403,7 +1403,7 @@ ElmsLab_MapEvents: bg_event 5, 0, BGEVENT_READ, ElmsLabWindow bg_event 3, 5, BGEVENT_DOWN, ElmsLabPC - db 6 ; object events + def_object_events object_event 5, 2, SPRITE_ELM, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, ProfElmScript, -1 object_event 2, 9, SPRITE_SCIENTIST, SPRITEMOVEDATA_SPINRANDOM_SLOW, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_SCRIPT, 0, ElmsAideScript, EVENT_ELMS_AIDE_IN_LAB object_event 6, 3, SPRITE_POKE_BALL, SPRITEMOVEDATA_STILL, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, CyndaquilPokeBallScript, EVENT_CYNDAQUIL_POKEBALL_IN_ELMS_LAB diff --git a/maps/FastShip1F.asm b/maps/FastShip1F.asm index 34cea5467..dd3aca706 100644 --- a/maps/FastShip1F.asm +++ b/maps/FastShip1F.asm @@ -1,16 +1,16 @@ - object_const_def ; object_event constants + object_const_def const FASTSHIP1F_SAILOR1 const FASTSHIP1F_SAILOR2 const FASTSHIP1F_SAILOR3 const FASTSHIP1F_GENTLEMAN FastShip1F_MapScripts: - db 3 ; scene scripts + def_scene_scripts scene_script .DummyScene0 ; SCENE_DEFAULT scene_script .EnterFastShip ; SCENE_FASTSHIP1F_ENTER_SHIP scene_script .DummyScene2 ; SCENE_FASTSHIP1F_MEET_GRANDPA - db 0 ; callbacks + def_callbacks .DummyScene0: end @@ -286,7 +286,7 @@ FastShip1FSailor1Text_InVermilion: FastShip1F_MapEvents: db 0, 0 ; filler - db 12 ; warp events + def_warp_events 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 @@ -300,13 +300,13 @@ FastShip1F_MapEvents: warp_event 6, 12, FAST_SHIP_B1F, 1 warp_event 30, 14, FAST_SHIP_B1F, 2 - db 2 ; coord events + def_coord_events coord_event 24, 6, SCENE_FASTSHIP1F_MEET_GRANDPA, WorriedGrandpaSceneLeft coord_event 25, 6, SCENE_FASTSHIP1F_MEET_GRANDPA, WorriedGrandpaSceneRight - db 0 ; bg events + def_bg_events - db 4 ; object events + def_object_events object_event 25, 2, SPRITE_SAILOR, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, FastShip1FSailor1Script, -1 object_event 14, 7, SPRITE_SAILOR, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, FastShip1FSailor2Script, -1 object_event 22, 17, SPRITE_SAILOR, SPRITEMOVEDATA_WALK_LEFT_RIGHT, 2, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, FastShip1FSailor3Script, -1 diff --git a/maps/FastShipB1F.asm b/maps/FastShipB1F.asm index b10c1921b..34f938314 100644 --- a/maps/FastShipB1F.asm +++ b/maps/FastShipB1F.asm @@ -1,4 +1,4 @@ - object_const_def ; object_event constants + object_const_def const FASTSHIPB1F_SAILOR1 const FASTSHIPB1F_SAILOR2 const FASTSHIPB1F_SAILOR3 @@ -13,11 +13,11 @@ const FASTSHIPB1F_YOUNGSTER2 FastShipB1F_MapScripts: - db 2 ; scene scripts + def_scene_scripts scene_script .DummyScene0 ; SCENE_DEFAULT scene_script .DummyScene1 ; SCENE_FINISHED - db 0 ; callbacks + def_callbacks .DummyScene0: end @@ -449,18 +449,18 @@ SchoolboyRickyAfterBattleText: FastShipB1F_MapEvents: db 0, 0 ; filler - db 2 ; warp events + def_warp_events warp_event 5, 11, FAST_SHIP_1F, 11 warp_event 31, 13, FAST_SHIP_1F, 12 - db 2 ; coord events + def_coord_events coord_event 30, 7, SCENE_DEFAULT, FastShipB1FSailorBlocksLeft coord_event 31, 7, SCENE_DEFAULT, FastShipB1FSailorBlocksRight - db 1 ; bg events + def_bg_events bg_event 27, 9, BGEVENT_READ, FastShipB1FTrashcan - db 12 ; object events + def_object_events object_event 30, 6, SPRITE_SAILOR, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_SCRIPT, 0, FastShipB1FSailorScript, EVENT_FAST_SHIP_B1F_SAILOR_LEFT object_event 31, 6, SPRITE_SAILOR, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_SCRIPT, 0, FastShipB1FSailorScript, EVENT_FAST_SHIP_B1F_SAILOR_RIGHT object_event 9, 11, SPRITE_SAILOR, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_TRAINER, 3, TrainerSailorJeff, EVENT_FAST_SHIP_PASSENGERS_FIRST_TRIP diff --git a/maps/FastShipCabins_NNW_NNE_NE.asm b/maps/FastShipCabins_NNW_NNE_NE.asm index 6f4435bcc..a8035f3fa 100644 --- a/maps/FastShipCabins_NNW_NNE_NE.asm +++ b/maps/FastShipCabins_NNW_NNE_NE.asm @@ -1,4 +1,4 @@ - object_const_def ; object_event constants + object_const_def const FASTSHIPCABINS_NNW_NNE_NE_COOLTRAINER_M const FASTSHIPCABINS_NNW_NNE_NE_COOLTRAINER_F const FASTSHIPCABINS_NNW_NNE_NE_SUPER_NERD @@ -8,9 +8,9 @@ const FASTSHIPCABINS_NNW_NNE_NE_PHARMACIST FastShipCabins_NNW_NNE_NE_MapScripts: - db 0 ; scene scripts + def_scene_scripts - db 0 ; callbacks + def_callbacks TrainerCooltrainermSean: trainer COOLTRAINERM, SEAN, EVENT_BEAT_COOLTRAINERM_SEAN, CooltrainermSeanSeenText, CooltrainermSeanBeatenText, 0, .Script @@ -267,19 +267,19 @@ BurglarCoreyAfterBattleText: FastShipCabins_NNW_NNE_NE_MapEvents: db 0, 0 ; filler - db 3 ; warp events + def_warp_events 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 + def_coord_events - db 3 ; bg events + def_bg_events bg_event 6, 13, BGEVENT_READ, FastShipCabins_NNW_NNE_NETrashcan bg_event 7, 19, BGEVENT_READ, FastShipCabins_NNW_NNE_NETrashcan bg_event 7, 31, BGEVENT_READ, FastShipCabins_NNW_NNE_NETrashcan - db 7 ; object events + def_object_events object_event 4, 3, SPRITE_COOLTRAINER_M, SPRITEMOVEDATA_SPINRANDOM_FAST, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_TRAINER, 2, TrainerCooltrainermSean, EVENT_FAST_SHIP_PASSENGERS_EASTBOUND object_event 1, 5, SPRITE_COOLTRAINER_F, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_TRAINER, 3, TrainerCooltrainerfCarol, EVENT_FAST_SHIP_PASSENGERS_EASTBOUND object_event 1, 5, SPRITE_SUPER_NERD, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_TRAINER, 3, TrainerPokemaniacEthan, EVENT_FAST_SHIP_PASSENGERS_WESTBOUND diff --git a/maps/FastShipCabins_SE_SSE_CaptainsCabin.asm b/maps/FastShipCabins_SE_SSE_CaptainsCabin.asm index 84adc5975..d1d65ac90 100644 --- a/maps/FastShipCabins_SE_SSE_CaptainsCabin.asm +++ b/maps/FastShipCabins_SE_SSE_CaptainsCabin.asm @@ -1,4 +1,4 @@ - object_const_def ; object_event constants + object_const_def const FASTSHIPCABINS_SE_SSE_CAPTAINSCABIN_CAPTAIN const FASTSHIPCABINS_SE_SSE_CAPTAINSCABIN_GENTLEMAN const FASTSHIPCABINS_SE_SSE_CAPTAINSCABIN_TWIN1 @@ -12,9 +12,9 @@ const FASTSHIPCABINS_SE_SSE_CAPTAINSCABIN_SUPER_NERD2 FastShipCabins_SE_SSE_CaptainsCabin_MapScripts: - db 0 ; scene scripts + def_scene_scripts - db 0 ; callbacks + def_callbacks .DummyScene: ; unreferenced end @@ -463,7 +463,7 @@ SSAquaHasArrivedVermilionText: FastShipCabins_SE_SSE_CaptainsCabin_MapEvents: db 0, 0 ; filler - db 6 ; warp events + def_warp_events warp_event 2, 7, FAST_SHIP_1F, 8 warp_event 3, 7, FAST_SHIP_1F, 8 warp_event 2, 19, FAST_SHIP_1F, 9 @@ -471,12 +471,12 @@ FastShipCabins_SE_SSE_CaptainsCabin_MapEvents: warp_event 2, 33, FAST_SHIP_1F, 10 warp_event 3, 33, FAST_SHIP_1F, 10 - db 0 ; coord events + def_coord_events - db 1 ; bg events + def_bg_events bg_event 4, 25, BGEVENT_READ, FastShipCaptainsCabinTrashcan - db 11 ; object events + def_object_events object_event 3, 25, SPRITE_CAPTAIN, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_SCRIPT, 0, SSAquaCaptain, -1 object_event 2, 17, SPRITE_GENTLEMAN, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_SCRIPT, 0, SSAquaGrandpa, EVENT_FAST_SHIP_CABINS_SE_SSE_GENTLEMAN object_event 3, 17, SPRITE_TWIN, SPRITEMOVEDATA_SPINRANDOM_FAST, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, SSAquaGranddaughterAfter, EVENT_FAST_SHIP_CABINS_SE_SSE_CAPTAINS_CABIN_TWIN_1 diff --git a/maps/FastShipCabins_SW_SSW_NW.asm b/maps/FastShipCabins_SW_SSW_NW.asm index 31128c14b..339d0519d 100644 --- a/maps/FastShipCabins_SW_SSW_NW.asm +++ b/maps/FastShipCabins_SW_SSW_NW.asm @@ -1,13 +1,13 @@ - object_const_def ; object_event constants + object_const_def const FASTSHIPCABINS_SW_SSW_NW_FISHER const FASTSHIPCABINS_SW_SSW_NW_BUG_CATCHER const FASTSHIPCABINS_SW_SSW_NW_BEAUTY const FASTSHIPCABINS_SW_SSW_NW_ROCKER FastShipCabins_SW_SSW_NW_MapScripts: - db 0 ; scene scripts + def_scene_scripts - db 0 ; callbacks + def_callbacks TrainerFirebreatherLyle: trainer FIREBREATHER, LYLE, EVENT_BEAT_FIREBREATHER_LYLE, FirebreatherLyleSeenText, FirebreatherLyleBeatenText, 0, .Script @@ -223,21 +223,21 @@ FastShipArrivedVermilionText: FastShipCabins_SW_SSW_NW_MapEvents: db 0, 0 ; filler - db 5 ; warp events + def_warp_events 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 + def_coord_events - db 3 ; bg events + def_bg_events bg_event 7, 1, BGEVENT_READ, FastShipBed bg_event 7, 2, BGEVENT_READ, FastShipBed bg_event 7, 7, BGEVENT_READ, FastShipCabinsNorthwestCabinTrashcan - db 4 ; object events + def_object_events object_event 1, 15, SPRITE_FISHER, SPRITEMOVEDATA_SPINCOUNTERCLOCKWISE, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_TRAINER, 2, TrainerFirebreatherLyle, EVENT_FAST_SHIP_PASSENGERS_FIRST_TRIP object_event 6, 15, SPRITE_BUG_CATCHER, SPRITEMOVEDATA_SPINRANDOM_FAST, 0, 0, -1, -1, PAL_NPC_BROWN, OBJECTTYPE_TRAINER, 2, TrainerBugCatcherKen, EVENT_FAST_SHIP_PASSENGERS_WESTBOUND object_event 1, 26, SPRITE_BEAUTY, SPRITEMOVEDATA_SPINRANDOM_FAST, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_TRAINER, 3, TrainerBeautyCassie, EVENT_FAST_SHIP_PASSENGERS_EASTBOUND diff --git a/maps/FightingDojo.asm b/maps/FightingDojo.asm index 7b81f5f4b..afb87b450 100644 --- a/maps/FightingDojo.asm +++ b/maps/FightingDojo.asm @@ -1,11 +1,11 @@ - object_const_def ; object_event constants + object_const_def const FIGHTINGDOJO_BLACK_BELT const FIGHTINGDOJO_POKE_BALL FightingDojo_MapScripts: - db 0 ; scene scripts + def_scene_scripts - db 0 ; callbacks + def_callbacks FightingDojoBlackBelt: jumptextfaceplayer FightingDojoBlackBeltText @@ -43,16 +43,16 @@ FightingDojoSign2Text: FightingDojo_MapEvents: db 0, 0 ; filler - db 2 ; warp events + def_warp_events warp_event 4, 11, SAFFRON_CITY, 1 warp_event 5, 11, SAFFRON_CITY, 1 - db 0 ; coord events + def_coord_events - db 2 ; bg events + def_bg_events bg_event 4, 0, BGEVENT_READ, FightingDojoSign1 bg_event 5, 0, BGEVENT_READ, FightingDojoSign2 - db 2 ; object events + def_object_events object_event 4, 4, SPRITE_BLACK_BELT, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_SCRIPT, 0, FightingDojoBlackBelt, -1 object_event 3, 1, SPRITE_POKE_BALL, SPRITEMOVEDATA_STILL, 0, 0, -1, -1, 0, OBJECTTYPE_ITEMBALL, 0, FightingDojoFocusBand, EVENT_PICKED_UP_FOCUS_BAND diff --git a/maps/FuchsiaCity.asm b/maps/FuchsiaCity.asm index f3a2dfb2a..0b74c2506 100644 --- a/maps/FuchsiaCity.asm +++ b/maps/FuchsiaCity.asm @@ -1,13 +1,13 @@ - object_const_def ; object_event constants + object_const_def const FUCHSIACITY_YOUNGSTER const FUCHSIACITY_POKEFAN_M const FUCHSIACITY_TEACHER const FUCHSIACITY_FRUIT_TREE FuchsiaCity_MapScripts: - db 0 ; scene scripts + def_scene_scripts - db 1 ; callbacks + def_callbacks callback MAPCALLBACK_NEWMAP, .FlyPoint .FlyPoint: @@ -125,7 +125,7 @@ NoLitteringSignText: FuchsiaCity_MapEvents: db 0, 0 ; filler - db 11 ; warp events + def_warp_events warp_event 5, 13, FUCHSIA_MART, 2 warp_event 22, 13, SAFARI_ZONE_MAIN_OFFICE, 1 warp_event 8, 27, FUCHSIA_GYM, 1 @@ -138,9 +138,9 @@ FuchsiaCity_MapEvents: warp_event 7, 35, ROUTE_19_FUCHSIA_GATE, 1 warp_event 8, 35, ROUTE_19_FUCHSIA_GATE, 2 - db 0 ; coord events + def_coord_events - db 8 ; bg events + def_bg_events bg_event 21, 15, BGEVENT_READ, FuchsiaCitySign bg_event 5, 29, BGEVENT_READ, FuchsiaGymSign bg_event 25, 15, BGEVENT_READ, SafariZoneOfficeSign @@ -150,7 +150,7 @@ FuchsiaCity_MapEvents: bg_event 20, 27, BGEVENT_READ, FuchsiaCityPokecenterSign bg_event 6, 13, BGEVENT_READ, FuchsiaCityMartSign - db 4 ; object events + def_object_events object_event 23, 18, SPRITE_YOUNGSTER, SPRITEMOVEDATA_WANDER, 1, 1, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_SCRIPT, 0, FuchsiaCityYoungster, -1 object_event 13, 8, SPRITE_POKEFAN_M, SPRITEMOVEDATA_WANDER, 1, 1, -1, -1, PAL_NPC_BROWN, OBJECTTYPE_SCRIPT, 0, FuchsiaCityPokefanM, -1 object_event 16, 14, SPRITE_TEACHER, SPRITEMOVEDATA_WANDER, 1, 1, -1, -1, PAL_NPC_RED, OBJECTTYPE_SCRIPT, 0, FuchsiaCityTeacher, -1 diff --git a/maps/FuchsiaGym.asm b/maps/FuchsiaGym.asm index 35f9e835c..1560c98a6 100644 --- a/maps/FuchsiaGym.asm +++ b/maps/FuchsiaGym.asm @@ -1,4 +1,4 @@ - object_const_def ; object_event constants + object_const_def const FUCHSIAGYM_JANINE const FUCHSIAGYM_FUCHSIA_GYM_1 const FUCHSIAGYM_FUCHSIA_GYM_2 @@ -7,9 +7,9 @@ const FUCHSIAGYM_GYM_GUIDE FuchsiaGym_MapScripts: - db 0 ; scene scripts + def_scene_scripts - db 0 ; callbacks + def_callbacks FuchsiaGymJanineScript: checkflag ENGINE_SOULBADGE @@ -381,17 +381,17 @@ FuchsiaGymGuideWinText: FuchsiaGym_MapEvents: db 0, 0 ; filler - db 2 ; warp events + def_warp_events warp_event 4, 17, FUCHSIA_CITY, 3 warp_event 5, 17, FUCHSIA_CITY, 3 - db 0 ; coord events + def_coord_events - db 2 ; bg events + def_bg_events bg_event 3, 15, BGEVENT_READ, FuchsiaGymStatue bg_event 6, 15, BGEVENT_READ, FuchsiaGymStatue - db 6 ; object events + def_object_events object_event 1, 10, SPRITE_JANINE, SPRITEMOVEDATA_SPINRANDOM_SLOW, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_SCRIPT, 0, FuchsiaGymJanineScript, -1 object_event 5, 7, SPRITE_FUCHSIA_GYM_1, SPRITEMOVEDATA_SPINRANDOM_FAST, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_SCRIPT, 0, LassAliceScript, -1 object_event 5, 11, SPRITE_FUCHSIA_GYM_2, SPRITEMOVEDATA_SPINRANDOM_FAST, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_SCRIPT, 0, LassLindaScript, -1 diff --git a/maps/FuchsiaMart.asm b/maps/FuchsiaMart.asm index 413aed07f..30443e4bf 100644 --- a/maps/FuchsiaMart.asm +++ b/maps/FuchsiaMart.asm @@ -1,12 +1,12 @@ - object_const_def ; object_event constants + object_const_def const FUCHSIAMART_CLERK const FUCHSIAMART_FISHER const FUCHSIAMART_COOLTRAINER_F FuchsiaMart_MapScripts: - db 0 ; scene scripts + def_scene_scripts - db 0 ; callbacks + def_callbacks FuchsiaMartClerkScript: opentext @@ -38,15 +38,15 @@ FuchsiaMartCooltrainerFText: FuchsiaMart_MapEvents: db 0, 0 ; filler - db 2 ; warp events + def_warp_events warp_event 2, 7, FUCHSIA_CITY, 1 warp_event 3, 7, FUCHSIA_CITY, 1 - db 0 ; coord events + def_coord_events - db 0 ; bg events + def_bg_events - db 3 ; object events + def_object_events object_event 1, 3, SPRITE_CLERK, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, FuchsiaMartClerkScript, -1 object_event 3, 2, SPRITE_FISHER, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_SCRIPT, 0, FuchsiaMartFisherScript, -1 object_event 7, 6, SPRITE_COOLTRAINER_F, SPRITEMOVEDATA_WALK_LEFT_RIGHT, 2, 0, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_SCRIPT, 0, FuchsiaMartCooltrainerFScript, -1 diff --git a/maps/FuchsiaPokecenter1F.asm b/maps/FuchsiaPokecenter1F.asm index 4c9336d90..704dd6a97 100644 --- a/maps/FuchsiaPokecenter1F.asm +++ b/maps/FuchsiaPokecenter1F.asm @@ -1,14 +1,14 @@ - object_const_def ; object_event constants + object_const_def const FUCHSIAPOKECENTER1F_NURSE const FUCHSIAPOKECENTER1F_COOLTRAINER_M const FUCHSIAPOKECENTER1F_COOLTRAINER_F const FUCHSIAPOKECENTER1F_JANINE_IMPERSONATOR FuchsiaPokecenter1F_MapScripts: - db 1 ; scene scripts + def_scene_scripts scene_script .DummyScene - db 0 ; callbacks + def_callbacks .DummyScene: end @@ -89,16 +89,16 @@ FuchsiaPokecenter1FJanineImpersonatorText2: FuchsiaPokecenter1F_MapEvents: db 0, 0 ; filler - db 3 ; warp events + def_warp_events 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 + def_coord_events - db 0 ; bg events + def_bg_events - db 4 ; object events + def_object_events object_event 3, 1, SPRITE_NURSE, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_SCRIPT, 0, FuchsiaPokecenter1FNurseScript, -1 object_event 8, 4, SPRITE_COOLTRAINER_M, SPRITEMOVEDATA_WALK_LEFT_RIGHT, 1, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, FuchsiaPokecenter1FCooltrainerMScript, -1 object_event 1, 4, SPRITE_COOLTRAINER_F, SPRITEMOVEDATA_WALK_LEFT_RIGHT, 1, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, FuchsiaPokecenter1FCooltrainerFScript, -1 diff --git a/maps/FuchsiaPokecenter2FBeta.asm b/maps/FuchsiaPokecenter2FBeta.asm index bfa6be81e..be01e1c42 100644 --- a/maps/FuchsiaPokecenter2FBeta.asm +++ b/maps/FuchsiaPokecenter2FBeta.asm @@ -1,16 +1,16 @@ FuchsiaPokecenter2FBeta_MapScripts: - db 0 ; scene scripts + def_scene_scripts - db 0 ; callbacks + def_callbacks FuchsiaPokecenter2FBeta_MapEvents: db 0, 0 ; filler - db 1 ; warp events + def_warp_events warp_event 0, 7, FUCHSIA_POKECENTER_1F, 3 - db 0 ; coord events + def_coord_events - db 0 ; bg events + def_bg_events - db 0 ; object events + def_object_events diff --git a/maps/GoldenrodBikeShop.asm b/maps/GoldenrodBikeShop.asm index 06f2d0e67..14121e027 100644 --- a/maps/GoldenrodBikeShop.asm +++ b/maps/GoldenrodBikeShop.asm @@ -1,10 +1,10 @@ - object_const_def ; object_event constants + object_const_def const GOLDENRODBIKESHOP_CLERK GoldenrodBikeShop_MapScripts: - db 0 ; scene scripts + def_scene_scripts - db 0 ; callbacks + def_callbacks .DummyScene: ; unreferenced end @@ -102,13 +102,13 @@ GoldenrodBikeShopBicycleText: GoldenrodBikeShop_MapEvents: db 0, 0 ; filler - db 2 ; warp events + def_warp_events warp_event 2, 7, GOLDENROD_CITY, 2 warp_event 3, 7, GOLDENROD_CITY, 2 - db 0 ; coord events + def_coord_events - db 9 ; bg events + def_bg_events bg_event 1, 2, BGEVENT_READ, GoldenrodBikeShopBicycle bg_event 0, 3, BGEVENT_READ, GoldenrodBikeShopBicycle bg_event 1, 3, BGEVENT_READ, GoldenrodBikeShopBicycle @@ -119,5 +119,5 @@ GoldenrodBikeShop_MapEvents: bg_event 6, 6, BGEVENT_READ, GoldenrodBikeShopBicycle bg_event 7, 6, BGEVENT_READ, GoldenrodBikeShopBicycle - db 1 ; object events + def_object_events object_event 7, 2, SPRITE_CLERK, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_SCRIPT, 0, GoldenrodBikeShopClerkScript, -1 diff --git a/maps/GoldenrodCity.asm b/maps/GoldenrodCity.asm index 1fcb8130d..70f2d9ecc 100644 --- a/maps/GoldenrodCity.asm +++ b/maps/GoldenrodCity.asm @@ -1,4 +1,4 @@ - object_const_def ; object_event constants + object_const_def const GOLDENRODCITY_POKEFAN_M1 const GOLDENRODCITY_YOUNGSTER1 const GOLDENRODCITY_COOLTRAINER_F1 @@ -16,9 +16,9 @@ const GOLDENRODCITY_MOVETUTOR GoldenrodCity_MapScripts: - db 0 ; scene scripts + def_scene_scripts - db 2 ; callbacks + def_callbacks callback MAPCALLBACK_NEWMAP, .FlyPointAndFloria callback MAPCALLBACK_OBJECTS, .MoveTutor @@ -552,7 +552,7 @@ GoldenrodCityMoveTutorMoveText: GoldenrodCity_MapEvents: db 0, 0 ; filler - db 15 ; warp events + def_warp_events warp_event 24, 7, GOLDENROD_GYM, 1 warp_event 29, 29, GOLDENROD_BIKE_SHOP, 1 warp_event 31, 21, GOLDENROD_HAPPINESS_RATER, 1 @@ -569,9 +569,9 @@ GoldenrodCity_MapEvents: warp_event 11, 29, GOLDENROD_UNDERGROUND_SWITCH_ROOM_ENTRANCES, 5 warp_event 15, 27, GOLDENROD_POKECENTER_1F, 1 - db 0 ; coord events + def_coord_events - db 12 ; bg events + def_bg_events bg_event 10, 14, BGEVENT_READ, GoldenrodCityStationSign bg_event 4, 17, BGEVENT_READ, GoldenrodCityRadioTowerSign bg_event 26, 27, BGEVENT_READ, GoldenrodDeptStoreSign @@ -585,7 +585,7 @@ GoldenrodCity_MapEvents: bg_event 16, 27, BGEVENT_UP, GoldenrodCityPokecenterSign bg_event 30, 6, BGEVENT_READ, GoldenrodCityFlowerShopSign - db 15 ; object events + def_object_events object_event 7, 18, SPRITE_POKEFAN_M, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, GoldenrodCityPokefanMScript, EVENT_GOLDENROD_CITY_CIVILIANS object_event 30, 17, SPRITE_YOUNGSTER, SPRITEMOVEDATA_WANDER, 1, 1, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, GoldenrodCityYoungster1Script, EVENT_GOLDENROD_CITY_CIVILIANS object_event 12, 16, SPRITE_COOLTRAINER_F, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_SCRIPT, 0, GoldenrodCityCooltrainerF1Script, EVENT_GOLDENROD_CITY_CIVILIANS diff --git a/maps/GoldenrodDeptStore1F.asm b/maps/GoldenrodDeptStore1F.asm index 707ef22ed..293b8cd33 100644 --- a/maps/GoldenrodDeptStore1F.asm +++ b/maps/GoldenrodDeptStore1F.asm @@ -1,13 +1,13 @@ - object_const_def ; object_event constants + object_const_def const GOLDENRODDEPTSTORE1F_RECEPTIONIST const GOLDENRODDEPTSTORE1F_POKEFAN_F const GOLDENRODDEPTSTORE1F_BUG_CATCHER const GOLDENRODDEPTSTORE1F_GENTLEMAN GoldenrodDeptStore1F_MapScripts: - db 0 ; scene scripts + def_scene_scripts - db 0 ; callbacks + def_callbacks GoldenrodDeptStore1FReceptionistScript: jumptextfaceplayer GoldenrodDeptStore1FReceptionistText @@ -79,19 +79,19 @@ GoldenrodDeptStore1FDirectoryText: GoldenrodDeptStore1F_MapEvents: db 0, 0 ; filler - db 4 ; warp events + def_warp_events 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 + def_coord_events - db 2 ; bg events + def_bg_events bg_event 14, 0, BGEVENT_READ, GoldenrodDeptStore1FDirectory bg_event 3, 0, BGEVENT_READ, GoldenrodDeptStore1FElevatorButton - db 4 ; object events + def_object_events object_event 10, 1, SPRITE_RECEPTIONIST, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, GoldenrodDeptStore1FReceptionistScript, -1 object_event 5, 4, SPRITE_POKEFAN_F, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, GoldenrodDeptStore1FPokefanFScript, -1 object_event 5, 5, SPRITE_BUG_CATCHER, SPRITEMOVEDATA_WALK_LEFT_RIGHT, 1, 0, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_SCRIPT, 0, GoldenrodDeptStore1FBugCatcherScript, -1 diff --git a/maps/GoldenrodDeptStore2F.asm b/maps/GoldenrodDeptStore2F.asm index d409e6173..facb495b1 100644 --- a/maps/GoldenrodDeptStore2F.asm +++ b/maps/GoldenrodDeptStore2F.asm @@ -1,4 +1,4 @@ - object_const_def ; object_event constants + object_const_def const GOLDENRODDEPTSTORE2F_CLERK1 const GOLDENRODDEPTSTORE2F_CLERK2 const GOLDENRODDEPTSTORE2F_YOUNGSTER @@ -6,9 +6,9 @@ const GOLDENRODDEPTSTORE2F_GENTLEMAN GoldenrodDeptStore2F_MapScripts: - db 0 ; scene scripts + def_scene_scripts - db 0 ; callbacks + def_callbacks GoldenrodDeptStore2FClerk1Script: faceplayer @@ -101,18 +101,18 @@ GoldenrodDeptStore2FDirectoryText: GoldenrodDeptStore2F_MapEvents: db 0, 0 ; filler - db 3 ; warp events + def_warp_events 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 + def_coord_events - db 2 ; bg events + def_bg_events bg_event 14, 0, BGEVENT_READ, GoldenrodDeptStore2FDirectory bg_event 3, 0, BGEVENT_READ, GoldenrodDeptStore2FElevatorButton - db 5 ; object events + def_object_events object_event 13, 5, SPRITE_CLERK, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, GoldenrodDeptStore2FClerk1Script, -1 object_event 13, 6, SPRITE_CLERK, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, GoldenrodDeptStore2FClerk2Script, -1 object_event 9, 6, SPRITE_YOUNGSTER, SPRITEMOVEDATA_WALK_UP_DOWN, 0, 1, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, GoldenrodDeptStore2FYoungsterScript, -1 diff --git a/maps/GoldenrodDeptStore3F.asm b/maps/GoldenrodDeptStore3F.asm index 683339bf9..edc48d602 100644 --- a/maps/GoldenrodDeptStore3F.asm +++ b/maps/GoldenrodDeptStore3F.asm @@ -1,12 +1,12 @@ - object_const_def ; object_event constants + object_const_def const GOLDENRODDEPTSTORE3F_CLERK const GOLDENRODDEPTSTORE3F_SUPER_NERD const GOLDENRODDEPTSTORE3F_ROCKER GoldenrodDeptStore3F_MapScripts: - db 0 ; scene scripts + def_scene_scripts - db 0 ; callbacks + def_callbacks GoldenrodDeptStore3FClerkScript: faceplayer @@ -57,18 +57,18 @@ GoldenrodDeptStore3FDirectoryText: GoldenrodDeptStore3F_MapEvents: db 0, 0 ; filler - db 3 ; warp events + def_warp_events 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 + def_coord_events - db 2 ; bg events + def_bg_events bg_event 14, 0, BGEVENT_READ, GoldenrodDeptStore3FDirectory bg_event 3, 0, BGEVENT_READ, GoldenrodDeptStore3FElevatorButton - db 3 ; object events + def_object_events object_event 6, 1, SPRITE_CLERK, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, GoldenrodDeptStore3FClerkScript, -1 object_event 12, 5, SPRITE_SUPER_NERD, SPRITEMOVEDATA_SPINRANDOM_FAST, 0, 1, -1, -1, PAL_NPC_RED, OBJECTTYPE_SCRIPT, 0, GoldenrodDeptStore3FSuperNerdScript, -1 object_event 2, 5, SPRITE_ROCKER, SPRITEMOVEDATA_WALK_UP_DOWN, 0, 1, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, GoldenrodDeptStore3FRockerScript, -1 diff --git a/maps/GoldenrodDeptStore4F.asm b/maps/GoldenrodDeptStore4F.asm index baad0b78d..a65e56061 100644 --- a/maps/GoldenrodDeptStore4F.asm +++ b/maps/GoldenrodDeptStore4F.asm @@ -1,13 +1,13 @@ - object_const_def ; object_event constants + object_const_def const GOLDENRODDEPTSTORE4F_CLERK const GOLDENRODDEPTSTORE4F_COOLTRAINER_M const GOLDENRODDEPTSTORE4F_BUG_CATCHER const GOLDENRODDEPTSTORE4F_GAMEBOY_KID GoldenrodDeptStore4F_MapScripts: - db 0 ; scene scripts + def_scene_scripts - db 0 ; callbacks + def_callbacks GoldenrodDeptStore4FClerkScript: faceplayer @@ -78,18 +78,18 @@ GoldenrodDeptStore4FDirectoryText: GoldenrodDeptStore4F_MapEvents: db 0, 0 ; filler - db 3 ; warp events + def_warp_events 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 + def_coord_events - db 2 ; bg events + def_bg_events bg_event 14, 0, BGEVENT_READ, GoldenrodDeptStore4FDirectory bg_event 3, 0, BGEVENT_READ, GoldenrodDeptStore4FElevatorButton - db 4 ; object events + def_object_events object_event 13, 5, SPRITE_CLERK, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, GoldenrodDeptStore4FClerkScript, -1 object_event 11, 7, SPRITE_COOLTRAINER_M, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, GoldenrodDeptStore4FCooltrainerMScript, -1 object_event 7, 2, SPRITE_BUG_CATCHER, SPRITEMOVEDATA_WALK_LEFT_RIGHT, 1, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, GoldenrodDeptStore4FBugCatcherScript, -1 diff --git a/maps/GoldenrodDeptStore5F.asm b/maps/GoldenrodDeptStore5F.asm index a398243a1..f35c0af1b 100644 --- a/maps/GoldenrodDeptStore5F.asm +++ b/maps/GoldenrodDeptStore5F.asm @@ -1,4 +1,4 @@ - object_const_def ; object_event constants + object_const_def const GOLDENRODDEPTSTORE5F_CLERK const GOLDENRODDEPTSTORE5F_LASS const GOLDENRODDEPTSTORE5F_MIKE @@ -7,9 +7,9 @@ const GOLDENRODDEPTSTORE5F_RECEPTIONIST GoldenrodDeptStore5F_MapScripts: - db 0 ; scene scripts + def_scene_scripts - db 1 ; callbacks + def_callbacks callback MAPCALLBACK_OBJECTS, .CheckIfSunday .CheckIfSunday: @@ -218,18 +218,18 @@ GoldenrodDeptStore5FDirectoryText: GoldenrodDeptStore5F_MapEvents: db 0, 0 ; filler - db 3 ; warp events + def_warp_events 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 + def_coord_events - db 2 ; bg events + def_bg_events bg_event 14, 0, BGEVENT_READ, GoldenrodDeptStore5FDirectory bg_event 3, 0, BGEVENT_READ, GoldenrodDeptStore5FElevatorButton - db 6 ; object events + def_object_events object_event 8, 5, SPRITE_CLERK, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, GoldenrodDeptStore5FClerkScript, -1 object_event 3, 6, SPRITE_LASS, SPRITEMOVEDATA_WANDER, 1, 1, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, GoldenrodDeptStore5FLassScript, -1 object_event 6, 3, SPRITE_COOLTRAINER_M, SPRITEMOVEDATA_SPINRANDOM_SLOW, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, Mike, -1 diff --git a/maps/GoldenrodDeptStore6F.asm b/maps/GoldenrodDeptStore6F.asm index b2a223060..9f87055d1 100644 --- a/maps/GoldenrodDeptStore6F.asm +++ b/maps/GoldenrodDeptStore6F.asm @@ -2,14 +2,14 @@ GOLDENRODDEPTSTORE6F_FRESH_WATER_PRICE EQU 200 GOLDENRODDEPTSTORE6F_SODA_POP_PRICE EQU 300 GOLDENRODDEPTSTORE6F_LEMONADE_PRICE EQU 350 - object_const_def ; object_event constants + object_const_def const GOLDENRODDEPTSTORE6F_LASS const GOLDENRODDEPTSTORE6F_SUPER_NERD GoldenrodDeptStore6F_MapScripts: - db 0 ; scene scripts + def_scene_scripts - db 0 ; callbacks + def_callbacks GoldenrodVendingMachine: opentext @@ -152,14 +152,14 @@ GoldenrodDeptStore6FDirectoryText: GoldenrodDeptStore6F_MapEvents: db 0, 0 ; filler - db 3 ; warp events + def_warp_events 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 + def_coord_events - db 6 ; bg events + def_bg_events bg_event 14, 0, BGEVENT_READ, GoldenrodDeptStore6FDirectory bg_event 3, 0, BGEVENT_READ, GoldenrodDeptStore6FElevatorButton bg_event 8, 1, BGEVENT_UP, GoldenrodVendingMachine @@ -167,6 +167,6 @@ GoldenrodDeptStore6F_MapEvents: bg_event 10, 1, BGEVENT_UP, GoldenrodVendingMachine bg_event 11, 1, BGEVENT_UP, GoldenrodVendingMachine - db 2 ; object events + def_object_events object_event 10, 2, SPRITE_LASS, SPRITEMOVEDATA_WALK_LEFT_RIGHT, 1, 0, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_SCRIPT, 0, GoldenrodDeptStore6FLassScript, -1 object_event 8, 2, SPRITE_SUPER_NERD, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_SCRIPT, 0, GoldenrodDeptStore6FSuperNerdScript, -1 diff --git a/maps/GoldenrodDeptStoreB1F.asm b/maps/GoldenrodDeptStoreB1F.asm index 5584a8734..21259c2ba 100644 --- a/maps/GoldenrodDeptStoreB1F.asm +++ b/maps/GoldenrodDeptStoreB1F.asm @@ -1,4 +1,4 @@ - object_const_def ; object_event constants + object_const_def const GOLDENRODDEPTSTOREB1F_POKE_BALL1 const GOLDENRODDEPTSTOREB1F_POKE_BALL2 const GOLDENRODDEPTSTOREB1F_POKE_BALL3 @@ -9,9 +9,9 @@ const GOLDENRODDEPTSTOREB1F_MACHOP GoldenrodDeptStoreB1F_MapScripts: - db 0 ; scene scripts + def_scene_scripts - db 2 ; callbacks + def_callbacks callback MAPCALLBACK_TILES, .ClearBoxes callback MAPCALLBACK_NEWMAP, .Unblock @@ -110,16 +110,16 @@ GoldenrodDeptStoreB1FMachokeText: GoldenrodDeptStoreB1F_MapEvents: db 0, 0 ; filler - db 3 ; warp events + def_warp_events 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 + def_coord_events - db 0 ; bg events + def_bg_events - db 8 ; object events + def_object_events object_event 10, 15, SPRITE_POKE_BALL, SPRITEMOVEDATA_STILL, 0, 0, -1, -1, 0, OBJECTTYPE_ITEMBALL, 0, GoldenrodDeptStoreB1FEther, EVENT_GOLDENROD_DEPT_STORE_B1F_ETHER object_event 14, 2, SPRITE_POKE_BALL, SPRITEMOVEDATA_STILL, 0, 0, -1, -1, 0, OBJECTTYPE_ITEMBALL, 0, GoldenrodDeptStoreB1FAmuletCoin, EVENT_GOLDENROD_DEPT_STORE_B1F_AMULET_COIN object_event 6, 3, SPRITE_POKE_BALL, SPRITEMOVEDATA_STILL, 0, 0, -1, -1, 0, OBJECTTYPE_ITEMBALL, 0, GoldenrodDeptStoreB1FBurnHeal, EVENT_GOLDENROD_DEPT_STORE_B1F_BURN_HEAL diff --git a/maps/GoldenrodDeptStoreElevator.asm b/maps/GoldenrodDeptStoreElevator.asm index e9d5e9d37..f29a1d8a4 100644 --- a/maps/GoldenrodDeptStoreElevator.asm +++ b/maps/GoldenrodDeptStoreElevator.asm @@ -1,7 +1,7 @@ GoldenrodDeptStoreElevator_MapScripts: - db 0 ; scene scripts + def_scene_scripts - db 0 ; callbacks + def_callbacks GoldenrodDeptStoreElevatorScript: opentext @@ -55,13 +55,13 @@ GoldenrodDeptStoreElevatorData: GoldenrodDeptStoreElevator_MapEvents: db 0, 0 ; filler - db 2 ; warp events + def_warp_events warp_event 1, 3, GOLDENROD_DEPT_STORE_1F, -1 warp_event 2, 3, GOLDENROD_DEPT_STORE_1F, -1 - db 0 ; coord events + def_coord_events - db 1 ; bg events + def_bg_events bg_event 3, 0, BGEVENT_READ, GoldenrodDeptStoreElevatorScript - db 0 ; object events + def_object_events diff --git a/maps/GoldenrodDeptStoreRoof.asm b/maps/GoldenrodDeptStoreRoof.asm index 5acb53312..0b31c12ee 100644 --- a/maps/GoldenrodDeptStoreRoof.asm +++ b/maps/GoldenrodDeptStoreRoof.asm @@ -1,4 +1,4 @@ - object_const_def ; object_event constants + object_const_def const GOLDENRODDEPTSTOREROOF_CLERK const GOLDENRODDEPTSTOREROOF_POKEFAN_F const GOLDENRODDEPTSTOREROOF_FISHER @@ -9,9 +9,9 @@ const GOLDENRODDEPTSTOREROOF_BUG_CATCHER GoldenrodDeptStoreRoof_MapScripts: - db 0 ; scene scripts + def_scene_scripts - db 2 ; callbacks + def_callbacks callback MAPCALLBACK_TILES, .CheckSaleChangeBlock callback MAPCALLBACK_OBJECTS, .CheckSaleChangeClerk @@ -212,18 +212,18 @@ PokeDollVendingMachineText: GoldenrodDeptStoreRoof_MapEvents: db 0, 0 ; filler - db 1 ; warp events + def_warp_events warp_event 13, 1, GOLDENROD_DEPT_STORE_6F, 3 - db 0 ; coord events + def_coord_events - db 4 ; bg events + def_bg_events bg_event 15, 3, BGEVENT_RIGHT, Binoculars1 bg_event 15, 5, BGEVENT_RIGHT, Binoculars2 bg_event 15, 6, BGEVENT_RIGHT, Binoculars3 bg_event 3, 0, BGEVENT_UP, PokeDollVendingMachine - db 8 ; object events + def_object_events object_event 1, 4, SPRITE_CLERK, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, GoldenrodDeptStoreRoofClerkScript, EVENT_GOLDENROD_SALE_OFF object_event 10, 3, SPRITE_POKEFAN_F, SPRITEMOVEDATA_WALK_LEFT_RIGHT, 1, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_SCRIPT, 0, GoldenrodDeptStoreRoofPokefanFScript, -1 object_event 2, 1, SPRITE_FISHER, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_SCRIPT, 0, GoldenrodDeptStoreRoofFisherScript, -1 diff --git a/maps/GoldenrodFlowerShop.asm b/maps/GoldenrodFlowerShop.asm index 863c0a9a6..0c915e52f 100644 --- a/maps/GoldenrodFlowerShop.asm +++ b/maps/GoldenrodFlowerShop.asm @@ -1,11 +1,11 @@ - object_const_def ; object_event constants + object_const_def const GOLDENRODFLOWERSHOP_TEACHER const GOLDENRODFLOWERSHOP_FLORIA GoldenrodFlowerShop_MapScripts: - db 0 ; scene scripts + def_scene_scripts - db 0 ; callbacks + def_callbacks FlowerShopTeacherScript: checkevent EVENT_FOUGHT_SUDOWOODO @@ -160,14 +160,14 @@ GoldenrodFlowerShopFloriaItReallyWasAMonText: GoldenrodFlowerShop_MapEvents: db 0, 0 ; filler - db 2 ; warp events + def_warp_events warp_event 2, 7, GOLDENROD_CITY, 6 warp_event 3, 7, GOLDENROD_CITY, 6 - db 0 ; coord events + def_coord_events - db 0 ; bg events + def_bg_events - db 2 ; object events + def_object_events object_event 2, 4, SPRITE_TEACHER, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, FlowerShopTeacherScript, -1 object_event 5, 6, SPRITE_LASS, SPRITEMOVEDATA_WANDER, 1, 1, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_SCRIPT, 0, FlowerShopFloriaScript, EVENT_FLORIA_AT_FLOWER_SHOP diff --git a/maps/GoldenrodGameCorner.asm b/maps/GoldenrodGameCorner.asm index 482cfd792..19689a706 100644 --- a/maps/GoldenrodGameCorner.asm +++ b/maps/GoldenrodGameCorner.asm @@ -5,7 +5,7 @@ GOLDENRODGAMECORNER_ABRA_COINS EQU 100 GOLDENRODGAMECORNER_CUBONE_COINS EQU 800 GOLDENRODGAMECORNER_WOBBUFFET_COINS EQU 1500 - object_const_def ; object_event constants + object_const_def const GOLDENRODGAMECORNER_CLERK const GOLDENRODGAMECORNER_RECEPTIONIST1 const GOLDENRODGAMECORNER_RECEPTIONIST2 @@ -20,9 +20,9 @@ GOLDENRODGAMECORNER_WOBBUFFET_COINS EQU 1500 const GOLDENRODGAMECORNER_MOVETUTOR GoldenrodGameCorner_MapScripts: - db 0 ; scene scripts + def_scene_scripts - db 1 ; callbacks + def_callbacks callback MAPCALLBACK_OBJECTS, .MoveTutor .MoveTutor: @@ -479,13 +479,13 @@ GoldenrodGameCornerLeftTheirDrinkText: GoldenrodGameCorner_MapEvents: db 0, 0 ; filler - db 2 ; warp events + def_warp_events warp_event 2, 13, GOLDENROD_CITY, 10 warp_event 3, 13, GOLDENROD_CITY, 10 - db 0 ; coord events + def_coord_events - db 31 ; bg events + def_bg_events bg_event 6, 6, BGEVENT_READ, GoldenrodGameCornerSlotsMachineScript bg_event 6, 7, BGEVENT_READ, GoldenrodGameCornerSlotsMachineScript bg_event 6, 8, BGEVENT_READ, GoldenrodGameCornerSlotsMachineScript @@ -518,7 +518,7 @@ GoldenrodGameCorner_MapEvents: bg_event 18, 11, BGEVENT_RIGHT, GoldenrodGameCornerCardFlipMachineScript bg_event 12, 1, BGEVENT_LEFT, GoldenrodGameCornerLeftTheirDrinkScript - db 12 ; object events + def_object_events object_event 3, 2, SPRITE_CLERK, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_SCRIPT, 0, GoldenrodGameCornerCoinVendorScript, -1 object_event 16, 2, SPRITE_RECEPTIONIST, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_SCRIPT, 0, GoldenrodGameCornerTMVendorScript, -1 object_event 18, 2, SPRITE_RECEPTIONIST, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_SCRIPT, 0, GoldenrodGameCornerPrizeMonVendorScript, -1 diff --git a/maps/GoldenrodGym.asm b/maps/GoldenrodGym.asm index d1544ddfa..f57321c00 100644 --- a/maps/GoldenrodGym.asm +++ b/maps/GoldenrodGym.asm @@ -1,4 +1,4 @@ - object_const_def ; object_event constants + object_const_def const GOLDENRODGYM_WHITNEY const GOLDENRODGYM_LASS1 const GOLDENRODGYM_LASS2 @@ -7,11 +7,11 @@ const GOLDENRODGYM_GYM_GUIDE GoldenrodGym_MapScripts: - db 2 ; scene scripts + def_scene_scripts scene_script .DummyScene0 ; SCENE_GOLDENRODGYM_NOTHING scene_script .DummyScene1 ; SCENE_GOLDENRODGYM_WHITNEY_STOPS_CRYING - db 0 ; callbacks + def_callbacks .DummyScene0: end @@ -380,18 +380,18 @@ GoldenrodGymGuideWinText: GoldenrodGym_MapEvents: db 0, 0 ; filler - db 2 ; warp events + def_warp_events warp_event 2, 17, GOLDENROD_CITY, 1 warp_event 3, 17, GOLDENROD_CITY, 1 - db 1 ; coord events + def_coord_events coord_event 8, 5, SCENE_GOLDENRODGYM_WHITNEY_STOPS_CRYING, WhitneyCriesScript - db 2 ; bg events + def_bg_events bg_event 1, 15, BGEVENT_READ, GoldenrodGymStatue bg_event 4, 15, BGEVENT_READ, GoldenrodGymStatue - db 6 ; object events + def_object_events object_event 8, 3, SPRITE_WHITNEY, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_SCRIPT, 0, GoldenrodGymWhitneyScript, -1 object_event 9, 13, SPRITE_LASS, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_TRAINER, 4, TrainerLassCarrie, -1 object_event 9, 6, SPRITE_LASS, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_TRAINER, 1, TrainerLassBridget, -1 diff --git a/maps/GoldenrodHappinessRater.asm b/maps/GoldenrodHappinessRater.asm index 18068b3cd..019e55397 100644 --- a/maps/GoldenrodHappinessRater.asm +++ b/maps/GoldenrodHappinessRater.asm @@ -1,12 +1,12 @@ - object_const_def ; object_event constants + object_const_def const GOLDENRODHAPPINESSRATER_TEACHER const GOLDENRODHAPPINESSRATER_POKEFAN_M const GOLDENRODHAPPINESSRATER_TWIN GoldenrodHappinessRater_MapScripts: - db 0 ; scene scripts + def_scene_scripts - db 0 ; callbacks + def_callbacks GoldenrodHappinessRaterTeacherScript: faceplayer @@ -137,18 +137,18 @@ GoldenrodHappinessRaterTwinText: GoldenrodHappinessRater_MapEvents: db 0, 0 ; filler - db 2 ; warp events + def_warp_events warp_event 2, 7, GOLDENROD_CITY, 3 warp_event 3, 7, GOLDENROD_CITY, 3 - db 0 ; coord events + def_coord_events - db 3 ; bg events + def_bg_events bg_event 0, 1, BGEVENT_READ, HappinessRatersHouseBookshelf bg_event 1, 1, BGEVENT_READ, HappinessRatersHouseBookshelf bg_event 7, 1, BGEVENT_READ, HappinessRatersHouseRadio - db 3 ; object events + def_object_events object_event 2, 4, SPRITE_TEACHER, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_SCRIPT, 0, GoldenrodHappinessRaterTeacherScript, -1 object_event 5, 3, SPRITE_POKEFAN_M, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, GoldenrodHappinessRaterPokefanMScript, -1 object_event 5, 6, SPRITE_TWIN, SPRITEMOVEDATA_WALK_LEFT_RIGHT, 1, 0, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_SCRIPT, 0, GoldenrodHappinessRaterTwinScript, -1 diff --git a/maps/GoldenrodMagnetTrainStation.asm b/maps/GoldenrodMagnetTrainStation.asm index 550e308e4..e7818e8a0 100644 --- a/maps/GoldenrodMagnetTrainStation.asm +++ b/maps/GoldenrodMagnetTrainStation.asm @@ -1,12 +1,12 @@ - object_const_def ; object_event constants + object_const_def const GOLDENRODMAGNETTRAINSTATION_OFFICER const GOLDENRODMAGNETTRAINSTATION_GENTLEMAN GoldenrodMagnetTrainStation_MapScripts: - db 1 ; scene scripts + def_scene_scripts scene_script .DummyScene ; SCENE_DEFAULT - db 0 ; callbacks + def_callbacks .DummyScene: end @@ -165,17 +165,17 @@ GoldenrodMagnetTrainStationGentlemanText: GoldenrodMagnetTrainStation_MapEvents: db 0, 0 ; filler - db 4 ; warp events + def_warp_events 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 + def_coord_events coord_event 11, 6, SCENE_DEFAULT, Script_ArriveFromSaffron - db 0 ; bg events + def_bg_events - db 2 ; object events + def_object_events object_event 9, 9, SPRITE_OFFICER, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, GoldenrodMagnetTrainStationOfficerScript, -1 object_event 11, 14, SPRITE_GENTLEMAN, SPRITEMOVEDATA_WANDER, 2, 2, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, GoldenrodMagnetTrainStationGentlemanScript, EVENT_GOLDENROD_TRAIN_STATION_GENTLEMAN diff --git a/maps/GoldenrodNameRater.asm b/maps/GoldenrodNameRater.asm index 283cdeb27..b97db97b3 100644 --- a/maps/GoldenrodNameRater.asm +++ b/maps/GoldenrodNameRater.asm @@ -1,10 +1,10 @@ - object_const_def ; object_event constants + object_const_def const GOLDENRODNAMERATER_NAME_RATER GoldenrodNameRater_MapScripts: - db 0 ; scene scripts + def_scene_scripts - db 0 ; callbacks + def_callbacks GoldenrodNameRater: faceplayer @@ -25,16 +25,16 @@ INCLUDE "data/text/unused_sweet_honey.asm" GoldenrodNameRater_MapEvents: db 0, 0 ; filler - db 2 ; warp events + def_warp_events warp_event 2, 7, GOLDENROD_CITY, 8 warp_event 3, 7, GOLDENROD_CITY, 8 - db 0 ; coord events + def_coord_events - db 3 ; bg events + def_bg_events bg_event 0, 1, BGEVENT_READ, GoldenrodNameRaterBookshelf bg_event 1, 1, BGEVENT_READ, GoldenrodNameRaterBookshelf bg_event 7, 1, BGEVENT_READ, GoldenrodNameRaterRadio - db 1 ; object events + def_object_events object_event 2, 4, SPRITE_GENTLEMAN, SPRITEMOVEDATA_STANDING_DOWN, 2, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, GoldenrodNameRater, -1 diff --git a/maps/GoldenrodPPSpeechHouse.asm b/maps/GoldenrodPPSpeechHouse.asm index 584477c58..42510afe9 100644 --- a/maps/GoldenrodPPSpeechHouse.asm +++ b/maps/GoldenrodPPSpeechHouse.asm @@ -1,11 +1,11 @@ - object_const_def ; object_event constants + object_const_def const GOLDENRODPPSPEECHHOUSE_FISHER const GOLDENRODPPSPEECHHOUSE_LASS GoldenrodPPSpeechHouse_MapScripts: - db 0 ; scene scripts + def_scene_scripts - db 0 ; callbacks + def_callbacks GoldenrodPPSpeechHouseFisherScript: jumptextfaceplayer GoldenrodPPSpeechHouseFisherText @@ -52,17 +52,17 @@ GoldenrodPPSpeechHouseLassText: GoldenrodPPSpeechHouse_MapEvents: db 0, 0 ; filler - db 2 ; warp events + def_warp_events warp_event 2, 7, GOLDENROD_CITY, 7 warp_event 3, 7, GOLDENROD_CITY, 7 - db 0 ; coord events + def_coord_events - db 3 ; bg events + def_bg_events bg_event 0, 1, BGEVENT_READ, GoldenrodPPSpeechHouseBookshelf1 bg_event 1, 1, BGEVENT_READ, GoldenrodPPSpeechHouseBookshelf2 bg_event 7, 1, BGEVENT_READ, GoldenrodPPSpeechHouseRadio - db 2 ; object events + def_object_events object_event 2, 4, SPRITE_FISHER, SPRITEMOVEDATA_WALK_UP_DOWN, 0, 1, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_SCRIPT, 0, GoldenrodPPSpeechHouseFisherScript, -1 object_event 5, 3, SPRITE_LASS, SPRITEMOVEDATA_STANDING_LEFT, 0, 1, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, GoldenrodPPSpeechHouseLassScript, -1 diff --git a/maps/GoldenrodPokecenter1F.asm b/maps/GoldenrodPokecenter1F.asm index 7c736143a..8547606b4 100644 --- a/maps/GoldenrodPokecenter1F.asm +++ b/maps/GoldenrodPokecenter1F.asm @@ -1,4 +1,4 @@ - object_const_def ; object_event constants + object_const_def const GOLDENRODPOKECENTER1F_NURSE const GOLDENRODPOKECENTER1F_LINK_RECEPTIONIST const GOLDENRODPOKECENTER1F_GAMEBOY_KID @@ -6,9 +6,9 @@ const GOLDENRODPOKECENTER1F_POKEFAN_F GoldenrodPokecenter1F_MapScripts: - db 0 ; scene scripts + def_scene_scripts - db 0 ; callbacks + def_callbacks GoldenrodPokecenter1FNurseScript: jumpstd PokecenterNurseScript @@ -805,19 +805,19 @@ GoldenrodPokecenter1FPlayerGaveAwayTheEonMailText: GoldenrodPokecenter1F_MapEvents: db 0, 0 ; filler - db 4 ; warp events + def_warp_events warp_event 3, 7, GOLDENROD_CITY, 15 warp_event 4, 7, GOLDENROD_CITY, 15 warp_event 0, 6, POKECOM_CENTER_ADMIN_OFFICE_MOBILE, 1 warp_event 0, 7, POKECENTER_2F, 1 - db 2 ; coord events + def_coord_events coord_event 3, 7, SCENE_DEFAULT, GoldenrodPokecenter1F_GSBallSceneLeft coord_event 4, 7, SCENE_DEFAULT, GoldenrodPokecenter1F_GSBallSceneRight - db 0 ; bg events + def_bg_events - db 5 ; object events + def_object_events object_event 3, 1, SPRITE_NURSE, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, GoldenrodPokecenter1FNurseScript, -1 object_event 16, 8, SPRITE_LINK_RECEPTIONIST, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_SCRIPT, 0, ObjectEvent, -1 object_event 6, 1, SPRITE_GAMEBOY_KID, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_SCRIPT, 0, GoldenrodPokecenter1FGameboyKidScript, -1 diff --git a/maps/GoldenrodUnderground.asm b/maps/GoldenrodUnderground.asm index 04f5dbd87..9a457e068 100644 --- a/maps/GoldenrodUnderground.asm +++ b/maps/GoldenrodUnderground.asm @@ -1,7 +1,7 @@ GOLDENRODUNDERGROUND_OLDER_HAIRCUT_PRICE EQU 500 GOLDENRODUNDERGROUND_YOUNGER_HAIRCUT_PRICE EQU 300 - object_const_def ; object_event constants + object_const_def const GOLDENRODUNDERGROUND_SUPER_NERD1 const GOLDENRODUNDERGROUND_SUPER_NERD2 const GOLDENRODUNDERGROUND_SUPER_NERD3 @@ -13,9 +13,9 @@ GOLDENRODUNDERGROUND_YOUNGER_HAIRCUT_PRICE EQU 300 const GOLDENRODUNDERGROUND_GRANNY GoldenrodUnderground_MapScripts: - db 0 ; scene scripts + def_scene_scripts - db 3 ; callbacks + def_callbacks callback MAPCALLBACK_NEWMAP, .ResetSwitches callback MAPCALLBACK_TILES, .CheckBasementKey callback MAPCALLBACK_OBJECTS, .CheckDayOfWeek @@ -650,7 +650,7 @@ GoldenrodUndergroundNoEntryText: GoldenrodUnderground_MapEvents: db 0, 0 ; filler - db 6 ; warp events + def_warp_events 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 @@ -658,16 +658,16 @@ GoldenrodUnderground_MapEvents: warp_event 22, 31, GOLDENROD_UNDERGROUND, 3 warp_event 22, 27, GOLDENROD_UNDERGROUND_SWITCH_ROOM_ENTRANCES, 1 - db 0 ; coord events + def_coord_events - db 5 ; bg events + def_bg_events bg_event 18, 6, BGEVENT_READ, BasementDoorScript bg_event 19, 6, BGEVENT_READ, GoldenrodUndergroundNoEntrySign bg_event 6, 13, BGEVENT_ITEM, GoldenrodUndergroundHiddenParlyzHeal bg_event 4, 18, BGEVENT_ITEM, GoldenrodUndergroundHiddenSuperPotion bg_event 17, 8, BGEVENT_ITEM, GoldenrodUndergroundHiddenAntidote - db 9 ; object events + def_object_events object_event 5, 31, SPRITE_SUPER_NERD, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, PAL_NPC_BROWN, OBJECTTYPE_TRAINER, 3, TrainerSupernerdEric, -1 object_event 6, 9, SPRITE_SUPER_NERD, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, PAL_NPC_BROWN, OBJECTTYPE_TRAINER, 2, TrainerSupernerdTeru, -1 object_event 3, 27, SPRITE_SUPER_NERD, SPRITEMOVEDATA_SPINRANDOM_FAST, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_TRAINER, 2, TrainerPokemaniacIssac, -1 diff --git a/maps/GoldenrodUndergroundSwitchRoomEntrances.asm b/maps/GoldenrodUndergroundSwitchRoomEntrances.asm index bc7a35f4a..d78f78386 100644 --- a/maps/GoldenrodUndergroundSwitchRoomEntrances.asm +++ b/maps/GoldenrodUndergroundSwitchRoomEntrances.asm @@ -31,7 +31,7 @@ doorstate: MACRO changeblock UGDOOR_\1_YCOORD, UGDOOR_\1_XCOORD, UNDERGROUND_DOOR_\2 ENDM - object_const_def ; object_event constants + object_const_def const GOLDENRODUNDERGROUNDSWITCHROOMENTRANCES_PHARMACIST1 const GOLDENRODUNDERGROUNDSWITCHROOMENTRANCES_PHARMACIST2 const GOLDENRODUNDERGROUNDSWITCHROOMENTRANCES_ROCKET1 @@ -45,11 +45,11 @@ ENDM const GOLDENRODUNDERGROUNDSWITCHROOMENTRANCES_SILVER GoldenrodUndergroundSwitchRoomEntrances_MapScripts: - db 2 ; scene scripts + def_scene_scripts scene_script .DummyScene0 ; SCENE_DEFAULT scene_script .DummyScene1 ; SCENE_FINISHED - db 1 ; callbacks + def_callbacks callback MAPCALLBACK_TILES, .UpdateDoorPositions .DummyScene0: @@ -931,7 +931,7 @@ SwitchRoomText_Emergency: GoldenrodUndergroundSwitchRoomEntrances_MapEvents: db 0, 0 ; filler - db 9 ; warp events + def_warp_events warp_event 23, 3, GOLDENROD_UNDERGROUND, 6 warp_event 22, 10, GOLDENROD_UNDERGROUND_WAREHOUSE, 1 warp_event 23, 10, GOLDENROD_UNDERGROUND_WAREHOUSE, 2 @@ -942,11 +942,11 @@ GoldenrodUndergroundSwitchRoomEntrances_MapEvents: warp_event 20, 29, GOLDENROD_CITY, 13 warp_event 21, 29, GOLDENROD_CITY, 13 - db 2 ; coord events + def_coord_events coord_event 19, 4, SCENE_DEFAULT, UndergroundSilverScene1 coord_event 19, 5, SCENE_DEFAULT, UndergroundSilverScene2 - db 6 ; bg events + def_bg_events bg_event 16, 1, BGEVENT_READ, Switch1Script bg_event 10, 1, BGEVENT_READ, Switch2Script bg_event 2, 1, BGEVENT_READ, Switch3Script @@ -954,7 +954,7 @@ GoldenrodUndergroundSwitchRoomEntrances_MapEvents: bg_event 8, 9, BGEVENT_ITEM, GoldenrodUndergroundSwitchRoomEntrancesHiddenMaxPotion bg_event 1, 8, BGEVENT_ITEM, GoldenrodUndergroundSwitchRoomEntrancesHiddenRevive - db 11 ; object events + def_object_events object_event 9, 12, SPRITE_PHARMACIST, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_TRAINER, 2, TrainerBurglarDuncan, EVENT_RADIO_TOWER_ROCKET_TAKEOVER object_event 4, 8, SPRITE_PHARMACIST, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_TRAINER, 2, TrainerBurglarEddie, EVENT_RADIO_TOWER_ROCKET_TAKEOVER object_event 17, 2, SPRITE_ROCKET, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, 0, OBJECTTYPE_TRAINER, 3, TrainerGruntM13, EVENT_RADIO_TOWER_ROCKET_TAKEOVER diff --git a/maps/GoldenrodUndergroundWarehouse.asm b/maps/GoldenrodUndergroundWarehouse.asm index 0a5cbe2a2..57eec6c78 100644 --- a/maps/GoldenrodUndergroundWarehouse.asm +++ b/maps/GoldenrodUndergroundWarehouse.asm @@ -1,4 +1,4 @@ - object_const_def ; object_event constants + object_const_def const GOLDENRODUNDERGROUNDWAREHOUSE_ROCKET1 const GOLDENRODUNDERGROUNDWAREHOUSE_ROCKET2 const GOLDENRODUNDERGROUNDWAREHOUSE_ROCKET3 @@ -8,9 +8,9 @@ const GOLDENRODUNDERGROUNDWAREHOUSE_POKE_BALL3 GoldenrodUndergroundWarehouse_MapScripts: - db 0 ; scene scripts + def_scene_scripts - db 1 ; callbacks + def_callbacks callback MAPCALLBACK_NEWMAP, .ResetSwitches .ResetSwitches: @@ -211,16 +211,16 @@ DirectorAfterText: GoldenrodUndergroundWarehouse_MapEvents: db 0, 0 ; filler - db 3 ; warp events + def_warp_events 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 + def_coord_events - db 0 ; bg events + def_bg_events - db 7 ; object events + def_object_events object_event 9, 8, SPRITE_ROCKET, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, 0, OBJECTTYPE_TRAINER, 3, TrainerGruntM24, EVENT_RADIO_TOWER_ROCKET_TAKEOVER object_event 8, 15, SPRITE_ROCKET, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, 0, OBJECTTYPE_TRAINER, 3, TrainerGruntM14, EVENT_RADIO_TOWER_ROCKET_TAKEOVER object_event 14, 3, SPRITE_ROCKET, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, 0, OBJECTTYPE_TRAINER, 4, TrainerGruntM15, EVENT_RADIO_TOWER_ROCKET_TAKEOVER diff --git a/maps/GuideGentsHouse.asm b/maps/GuideGentsHouse.asm index 91fdb6a6e..ee25b0d2d 100644 --- a/maps/GuideGentsHouse.asm +++ b/maps/GuideGentsHouse.asm @@ -1,10 +1,10 @@ - object_const_def ; object_event constants + object_const_def const GUIDEGENTSHOUSE_GRAMPS GuideGentsHouse_MapScripts: - db 0 ; scene scripts + def_scene_scripts - db 0 ; callbacks + def_callbacks GuideGentsHouseGuideGent: jumptextfaceplayer GuideGentsHouseGuideGentText @@ -28,15 +28,15 @@ GuideGentsHouseGuideGentText: GuideGentsHouse_MapEvents: db 0, 0 ; filler - db 2 ; warp events + def_warp_events warp_event 2, 7, CHERRYGROVE_CITY, 4 warp_event 3, 7, CHERRYGROVE_CITY, 4 - db 0 ; coord events + def_coord_events - db 2 ; bg events + def_bg_events bg_event 0, 1, BGEVENT_READ, GuideGentsHouseBookshelf bg_event 1, 1, BGEVENT_READ, GuideGentsHouseBookshelf - db 1 ; object events + def_object_events object_event 2, 3, SPRITE_GRAMPS, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, GuideGentsHouseGuideGent, EVENT_GUIDE_GENT_VISIBLE_IN_CHERRYGROVE diff --git a/maps/HallOfFame.asm b/maps/HallOfFame.asm index e25576ad4..ceaab6531 100644 --- a/maps/HallOfFame.asm +++ b/maps/HallOfFame.asm @@ -1,12 +1,12 @@ - object_const_def ; object_event constants + object_const_def const HALLOFFAME_LANCE HallOfFame_MapScripts: - db 2 ; scene scripts + def_scene_scripts scene_script .EnterHallOfFame ; SCENE_DEFAULT scene_script .DummyScene ; SCENE_FINISHED - db 0 ; callbacks + def_callbacks .EnterHallOfFame: prioritysjump .EnterHallOfFameScript @@ -111,13 +111,13 @@ HallOfFame_LanceText: HallOfFame_MapEvents: db 0, 0 ; filler - db 2 ; warp events + def_warp_events warp_event 4, 13, LANCES_ROOM, 3 warp_event 5, 13, LANCES_ROOM, 4 - db 0 ; coord events + def_coord_events - db 0 ; bg events + def_bg_events - db 1 ; object events + def_object_events object_event 4, 12, SPRITE_LANCE, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, ObjectEvent, -1 diff --git a/maps/IcePath1F.asm b/maps/IcePath1F.asm index a0f02ff0c..afe0ced73 100644 --- a/maps/IcePath1F.asm +++ b/maps/IcePath1F.asm @@ -1,12 +1,12 @@ - object_const_def ; object_event constants + object_const_def const ICEPATH1F_POKE_BALL1 const ICEPATH1F_POKE_BALL2 const ICEPATH1F_POKE_BALL3 IcePath1F_MapScripts: - db 0 ; scene scripts + def_scene_scripts - db 0 ; callbacks + def_callbacks IcePath1FHMWaterfall: itemball HM_WATERFALL @@ -20,17 +20,17 @@ IcePath1FProtein: IcePath1F_MapEvents: db 0, 0 ; filler - db 4 ; warp events + def_warp_events 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 + def_coord_events - db 0 ; bg events + def_bg_events - db 3 ; object events + def_object_events object_event 31, 7, SPRITE_POKE_BALL, SPRITEMOVEDATA_STILL, 0, 0, -1, -1, 0, OBJECTTYPE_ITEMBALL, 0, IcePath1FHMWaterfall, EVENT_GOT_HM07_WATERFALL object_event 32, 23, SPRITE_POKE_BALL, SPRITEMOVEDATA_STILL, 0, 0, -1, -1, 0, OBJECTTYPE_ITEMBALL, 0, IcePath1FPPUp, EVENT_ICE_PATH_1F_PP_UP object_event 35, 9, SPRITE_POKE_BALL, SPRITEMOVEDATA_STILL, 0, 0, -1, -1, 0, OBJECTTYPE_ITEMBALL, 0, IcePath1FProtein, EVENT_ICE_PATH_1F_PROTEIN diff --git a/maps/IcePathB1F.asm b/maps/IcePathB1F.asm index 71f1c6b07..e0e03b58f 100644 --- a/maps/IcePathB1F.asm +++ b/maps/IcePathB1F.asm @@ -1,4 +1,4 @@ - object_const_def ; object_event constants + object_const_def const ICEPATHB1F_BOULDER1 const ICEPATHB1F_BOULDER2 const ICEPATHB1F_BOULDER3 @@ -6,9 +6,9 @@ const ICEPATHB1F_POKE_BALL IcePathB1F_MapScripts: - db 0 ; scene scripts + def_scene_scripts - db 1 ; callbacks + def_callbacks callback MAPCALLBACK_CMDQUEUE, .SetUpStoneTable .SetUpStoneTable: @@ -76,7 +76,7 @@ IcePathBoulderFellThroughText: IcePathB1F_MapEvents: db 0, 0 ; filler - db 8 ; warp events + def_warp_events 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 @@ -86,12 +86,12 @@ IcePathB1F_MapEvents: warp_event 5, 25, ICE_PATH_1F, 4 warp_event 11, 27, ICE_PATH_B2F_BLACKTHORN_SIDE, 1 - db 0 ; coord events + def_coord_events - db 1 ; bg events + def_bg_events bg_event 17, 30, BGEVENT_ITEM, IcePathB1FHiddenMaxPotion - db 5 ; object events + def_object_events object_event 11, 7, SPRITE_BOULDER, SPRITEMOVEDATA_STRENGTH_BOULDER, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, IcePathB1FBoulder, EVENT_BOULDER_IN_ICE_PATH_1 object_event 7, 8, SPRITE_BOULDER, SPRITEMOVEDATA_STRENGTH_BOULDER, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, IcePathB1FBoulder, EVENT_BOULDER_IN_ICE_PATH_2 object_event 8, 9, SPRITE_BOULDER, SPRITEMOVEDATA_STRENGTH_BOULDER, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, IcePathB1FBoulder, EVENT_BOULDER_IN_ICE_PATH_3 diff --git a/maps/IcePathB2FBlackthornSide.asm b/maps/IcePathB2FBlackthornSide.asm index deb4f3cc5..292026405 100644 --- a/maps/IcePathB2FBlackthornSide.asm +++ b/maps/IcePathB2FBlackthornSide.asm @@ -1,10 +1,10 @@ - object_const_def ; object_event constants + object_const_def const ICEPATHB2FBLACKTHORNSIDE_POKE_BALL IcePathB2FBlackthornSide_MapScripts: - db 0 ; scene scripts + def_scene_scripts - db 0 ; callbacks + def_callbacks IcePathB2FBlackthornSideTMRest: itemball TM_REST @@ -15,14 +15,14 @@ IcePathB2FBlackthornSideHiddenIceHeal: IcePathB2FBlackthornSide_MapEvents: db 0, 0 ; filler - db 2 ; warp events + def_warp_events warp_event 3, 15, ICE_PATH_B1F, 8 warp_event 3, 3, ICE_PATH_B3F, 2 - db 0 ; coord events + def_coord_events - db 1 ; bg events + def_bg_events bg_event 2, 10, BGEVENT_ITEM, IcePathB2FBlackthornSideHiddenIceHeal - db 1 ; object events + def_object_events object_event 8, 16, SPRITE_POKE_BALL, SPRITEMOVEDATA_STILL, 0, 0, -1, -1, 0, OBJECTTYPE_ITEMBALL, 0, IcePathB2FBlackthornSideTMRest, EVENT_ICE_PATH_B2F_BLACKTHORN_SIDE_TM_REST diff --git a/maps/IcePathB2FMahoganySide.asm b/maps/IcePathB2FMahoganySide.asm index c9a60a181..28a9eee0c 100644 --- a/maps/IcePathB2FMahoganySide.asm +++ b/maps/IcePathB2FMahoganySide.asm @@ -1,4 +1,4 @@ - object_const_def ; object_event constants + object_const_def const ICEPATHB2FMAHOGANYSIDE_BOULDER1 const ICEPATHB2FMAHOGANYSIDE_BOULDER2 const ICEPATHB2FMAHOGANYSIDE_BOULDER3 @@ -7,9 +7,9 @@ const ICEPATHB2FMAHOGANYSIDE_POKE_BALL2 IcePathB2FMahoganySide_MapScripts: - db 0 ; scene scripts + def_scene_scripts - db 0 ; callbacks + def_callbacks IcePathB2FMahoganySideBoulder: jumptext IcePathB2FMahoganySideBoulderText @@ -31,7 +31,7 @@ IcePathB2FMahoganySideBoulderText: IcePathB2FMahoganySide_MapEvents: db 0, 0 ; filler - db 6 ; warp events + def_warp_events warp_event 17, 1, ICE_PATH_B1F, 2 warp_event 9, 11, ICE_PATH_B3F, 1 warp_event 11, 4, ICE_PATH_B1F, 3 @@ -39,12 +39,12 @@ IcePathB2FMahoganySide_MapEvents: warp_event 4, 12, ICE_PATH_B1F, 5 warp_event 12, 12, ICE_PATH_B1F, 6 - db 0 ; coord events + def_coord_events - db 1 ; bg events + def_bg_events bg_event 0, 17, BGEVENT_ITEM, IcePathB2FMahoganySideHiddenCarbos - db 6 ; object events + def_object_events object_event 11, 3, SPRITE_BOULDER, SPRITEMOVEDATA_STILL, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, IcePathB2FMahoganySideBoulder, EVENT_BOULDER_IN_ICE_PATH_1A object_event 4, 7, SPRITE_BOULDER, SPRITEMOVEDATA_STILL, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, IcePathB2FMahoganySideBoulder, EVENT_BOULDER_IN_ICE_PATH_2A object_event 3, 12, SPRITE_BOULDER, SPRITEMOVEDATA_STILL, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, IcePathB2FMahoganySideBoulder, EVENT_BOULDER_IN_ICE_PATH_3A diff --git a/maps/IcePathB3F.asm b/maps/IcePathB3F.asm index b361dc863..ba606dfa8 100644 --- a/maps/IcePathB3F.asm +++ b/maps/IcePathB3F.asm @@ -1,11 +1,11 @@ - object_const_def ; object_event constants + object_const_def const ICEPATHB3F_POKE_BALL const ICEPATHB3F_ROCK IcePathB3F_MapScripts: - db 0 ; scene scripts + def_scene_scripts - db 0 ; callbacks + def_callbacks IcePathB3FNevermeltice: itemball NEVERMELTICE @@ -16,14 +16,14 @@ IcePathB3FRock: IcePathB3F_MapEvents: db 0, 0 ; filler - db 2 ; warp events + def_warp_events warp_event 3, 5, ICE_PATH_B2F_MAHOGANY_SIDE, 2 warp_event 15, 5, ICE_PATH_B2F_BLACKTHORN_SIDE, 2 - db 0 ; coord events + def_coord_events - db 0 ; bg events + def_bg_events - db 2 ; object events + def_object_events object_event 5, 7, SPRITE_POKE_BALL, SPRITEMOVEDATA_STILL, 0, 0, -1, -1, 0, OBJECTTYPE_ITEMBALL, 0, IcePathB3FNevermeltice, EVENT_ICE_PATH_B3F_NEVERMELTICE object_event 6, 6, SPRITE_ROCK, SPRITEMOVEDATA_SMASHABLE_ROCK, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, IcePathB3FRock, -1 diff --git a/maps/IlexForest.asm b/maps/IlexForest.asm index 9e07bac1b..d26d18e8a 100644 --- a/maps/IlexForest.asm +++ b/maps/IlexForest.asm @@ -1,4 +1,4 @@ - object_const_def ; object_event constants + object_const_def const ILEXFOREST_FARFETCHD const ILEXFOREST_YOUNGSTER1 const ILEXFOREST_BLACK_BELT @@ -12,9 +12,9 @@ const ILEXFOREST_POKE_BALL4 IlexForest_MapScripts: - db 0 ; scene scripts + def_scene_scripts - db 1 ; callbacks + def_callbacks callback MAPCALLBACK_OBJECTS, .FarfetchdCallback .FarfetchdCallback: @@ -938,21 +938,21 @@ BugCatcherWayneAfterBattleText: IlexForest_MapEvents: db 0, 0 ; filler - db 3 ; warp events + def_warp_events 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 + def_coord_events - db 5 ; bg events + def_bg_events bg_event 3, 17, BGEVENT_READ, IlexForestSignpost bg_event 11, 7, BGEVENT_ITEM, IlexForestHiddenEther bg_event 22, 14, BGEVENT_ITEM, IlexForestHiddenSuperPotion bg_event 1, 17, BGEVENT_ITEM, IlexForestHiddenFullHeal bg_event 8, 22, BGEVENT_UP, IlexForestShrineScript - db 11 ; object events + def_object_events object_event 14, 31, SPRITE_BIRD, SPRITEMOVEDATA_SPINRANDOM_SLOW, 0, 0, -1, -1, PAL_NPC_BROWN, OBJECTTYPE_SCRIPT, 0, IlexForestFarfetchdScript, EVENT_ILEX_FOREST_FARFETCHD object_event 7, 28, SPRITE_YOUNGSTER, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_SCRIPT, 0, IlexForestCharcoalApprenticeScript, EVENT_ILEX_FOREST_APPRENTICE object_event 5, 28, SPRITE_BLACK_BELT, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, IlexForestCharcoalMasterScript, EVENT_ILEX_FOREST_CHARCOAL_MASTER diff --git a/maps/IlexForestAzaleaGate.asm b/maps/IlexForestAzaleaGate.asm index 33f7bf9c1..730eeee74 100644 --- a/maps/IlexForestAzaleaGate.asm +++ b/maps/IlexForestAzaleaGate.asm @@ -1,11 +1,11 @@ - object_const_def ; object_event constants + object_const_def const ILEXFORESTAZALEAGATE_OFFICER const ILEXFORESTAZALEAGATE_GRANNY IlexForestAzaleaGate_MapScripts: - db 0 ; scene scripts + def_scene_scripts - db 0 ; callbacks + def_callbacks IlexForestAzaleaGateOfficerScript: jumptextfaceplayer IlexForestAzaleaGateOfficerText @@ -31,16 +31,16 @@ IlexForestAzaleaGateGrannyText: IlexForestAzaleaGate_MapEvents: db 0, 0 ; filler - db 4 ; warp events + def_warp_events 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 + def_coord_events - db 0 ; bg events + def_bg_events - db 2 ; object events + def_object_events object_event 5, 2, SPRITE_OFFICER, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_SCRIPT, 0, IlexForestAzaleaGateOfficerScript, -1 object_event 1, 3, SPRITE_GRANNY, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_BROWN, OBJECTTYPE_SCRIPT, 0, IlexForestAzaleaGateGrannyScript, -1 diff --git a/maps/IndigoPlateauPokecenter1F.asm b/maps/IndigoPlateauPokecenter1F.asm index 7a745462d..c06096df0 100644 --- a/maps/IndigoPlateauPokecenter1F.asm +++ b/maps/IndigoPlateauPokecenter1F.asm @@ -1,4 +1,4 @@ - object_const_def ; object_event constants + object_const_def const INDIGOPLATEAUPOKECENTER1F_NURSE const INDIGOPLATEAUPOKECENTER1F_CLERK const INDIGOPLATEAUPOKECENTER1F_COOLTRAINER_M @@ -7,10 +7,10 @@ const INDIGOPLATEAUPOKECENTER1F_ABRA IndigoPlateauPokecenter1F_MapScripts: - db 1 ; scene scripts + def_scene_scripts scene_script .DummyScene ; SCENE_DEFAULT - db 1 ; callbacks + def_callbacks callback MAPCALLBACK_NEWMAP, .PrepareElite4 .DummyScene: @@ -303,19 +303,19 @@ AbraText: IndigoPlateauPokecenter1F_MapEvents: db 0, 0 ; filler - db 4 ; warp events + def_warp_events 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 + def_coord_events coord_event 16, 4, SCENE_DEFAULT, PlateauRivalBattle1 coord_event 17, 4, SCENE_DEFAULT, PlateauRivalBattle2 - db 0 ; bg events + def_bg_events - db 6 ; object events + def_object_events object_event 3, 7, SPRITE_NURSE, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, IndigoPlateauPokecenter1FNurseScript, -1 object_event 11, 7, SPRITE_CLERK, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, IndigoPlateauPokecenter1FClerkScript, -1 object_event 11, 11, SPRITE_COOLTRAINER_M, SPRITEMOVEDATA_WANDER, 2, 2, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, IndigoPlateauPokecenter1FCooltrainerMScript, -1 diff --git a/maps/KarensRoom.asm b/maps/KarensRoom.asm index dbfa9824e..abe4bc976 100644 --- a/maps/KarensRoom.asm +++ b/maps/KarensRoom.asm @@ -1,12 +1,12 @@ - object_const_def ; object_event constants + object_const_def const KARENSROOM_KAREN KarensRoom_MapScripts: - db 2 ; scene scripts + def_scene_scripts scene_script .LockDoor ; SCENE_DEFAULT scene_script .DummyScene ; SCENE_FINISHED - db 1 ; callbacks + def_callbacks callback MAPCALLBACK_TILES, .KarensRoomDoors .LockDoor: @@ -133,15 +133,15 @@ KarenScript_KarenDefeatText: KarensRoom_MapEvents: db 0, 0 ; filler - db 4 ; warp events + def_warp_events 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 + def_coord_events - db 0 ; bg events + def_bg_events - db 1 ; object events + def_object_events object_event 5, 7, SPRITE_KAREN, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_SCRIPT, 0, KarenScript_Battle, -1 diff --git a/maps/KogasRoom.asm b/maps/KogasRoom.asm index 5dd900337..23b5afc3d 100644 --- a/maps/KogasRoom.asm +++ b/maps/KogasRoom.asm @@ -1,12 +1,12 @@ - object_const_def ; object_event constants + object_const_def const KOGASROOM_KOGA KogasRoom_MapScripts: - db 2 ; scene scripts + def_scene_scripts scene_script .LockDoor ; SCENE_DEFAULT scene_script .DummyScene ; SCENE_FINISHED - db 1 ; callbacks + def_callbacks callback MAPCALLBACK_TILES, .KogasRoomDoors .LockDoor: @@ -130,15 +130,15 @@ KogaScript_KogaDefeatText: KogasRoom_MapEvents: db 0, 0 ; filler - db 4 ; warp events + def_warp_events 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 + def_coord_events - db 0 ; bg events + def_bg_events - db 1 ; object events + def_object_events object_event 5, 7, SPRITE_KOGA, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_SCRIPT, 0, KogaScript_Battle, -1 diff --git a/maps/KurtsHouse.asm b/maps/KurtsHouse.asm index 3b522a19b..41667205e 100644 --- a/maps/KurtsHouse.asm +++ b/maps/KurtsHouse.asm @@ -1,4 +1,4 @@ - object_const_def ; object_event constants + object_const_def const KURTSHOUSE_KURT1 const KURTSHOUSE_TWIN1 const KURTSHOUSE_SLOWPOKE @@ -6,9 +6,9 @@ const KURTSHOUSE_TWIN2 KurtsHouse_MapScripts: - db 0 ; scene scripts + def_scene_scripts - db 1 ; callbacks + def_callbacks callback MAPCALLBACK_OBJECTS, .KurtCallback .KurtCallback: @@ -677,13 +677,13 @@ KurtsHouseCelebiStatueText: KurtsHouse_MapEvents: db 0, 0 ; filler - db 2 ; warp events + def_warp_events warp_event 3, 7, AZALEA_TOWN, 4 warp_event 4, 7, AZALEA_TOWN, 4 - db 0 ; coord events + def_coord_events - db 7 ; bg events + def_bg_events bg_event 6, 1, BGEVENT_READ, KurtsHouseRadio bg_event 8, 0, BGEVENT_READ, KurtsHouseOakPhoto bg_event 9, 0, BGEVENT_READ, KurtsHouseOakPhoto @@ -692,7 +692,7 @@ KurtsHouse_MapEvents: bg_event 3, 1, BGEVENT_READ, KurtsHouseBookshelf bg_event 4, 1, BGEVENT_READ, KurtsHouseCelebiStatue - db 5 ; object events + def_object_events object_event 3, 2, SPRITE_KURT, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, Kurt1, EVENT_KURTS_HOUSE_KURT_1 object_event 5, 3, SPRITE_TWIN, SPRITEMOVEDATA_SPINRANDOM_SLOW, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, KurtsGranddaughter1, EVENT_KURTS_HOUSE_GRANDDAUGHTER_1 object_event 6, 3, SPRITE_SLOWPOKE, SPRITEMOVEDATA_STILL, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, KurtsHouseSlowpoke, EVENT_KURTS_HOUSE_SLOWPOKE diff --git a/maps/LakeOfRage.asm b/maps/LakeOfRage.asm index 38cc24060..23e32d407 100644 --- a/maps/LakeOfRage.asm +++ b/maps/LakeOfRage.asm @@ -1,4 +1,4 @@ - object_const_def ; object_event constants + object_const_def const LAKEOFRAGE_LANCE const LAKEOFRAGE_GRAMPS const LAKEOFRAGE_SUPER_NERD1 @@ -13,11 +13,11 @@ const LAKEOFRAGE_POKE_BALL2 LakeOfRage_MapScripts: - db 2 ; scene scripts + def_scene_scripts scene_script .DummyScene0 ; unusable scene_script .DummyScene1 ; unusable - db 2 ; callbacks + def_callbacks callback MAPCALLBACK_NEWMAP, .FlyPoint callback MAPCALLBACK_OBJECTS, .Wesley @@ -494,20 +494,20 @@ FishingGurusHouseSignText: LakeOfRage_MapEvents: db 0, 0 ; filler - db 2 ; warp events + def_warp_events 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 + def_coord_events - db 5 ; bg events + def_bg_events bg_event 21, 27, BGEVENT_READ, LakeOfRageSign bg_event 25, 31, BGEVENT_READ, MagikarpHouseSignScript bg_event 11, 28, BGEVENT_ITEM, LakeOfRageHiddenFullRestore bg_event 4, 4, BGEVENT_ITEM, LakeOfRageHiddenRareCandy bg_event 35, 5, BGEVENT_ITEM, LakeOfRageHiddenMaxPotion - db 12 ; object events + def_object_events object_event 21, 28, SPRITE_LANCE, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, LakeOfRageLanceScript, EVENT_LAKE_OF_RAGE_LANCE object_event 20, 26, SPRITE_GRAMPS, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, LakeOfRageGrampsScript, -1 object_event 36, 13, SPRITE_SUPER_NERD, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, LakeOfRageSuperNerdScript, -1 diff --git a/maps/LakeOfRageHiddenPowerHouse.asm b/maps/LakeOfRageHiddenPowerHouse.asm index dc3f75925..65d3d9fe5 100644 --- a/maps/LakeOfRageHiddenPowerHouse.asm +++ b/maps/LakeOfRageHiddenPowerHouse.asm @@ -1,10 +1,10 @@ - object_const_def ; object_event constants + object_const_def const LAKEOFRAGEHIDDENPOWERHOUSE_FISHER LakeOfRageHiddenPowerHouse_MapScripts: - db 0 ; scene scripts + def_scene_scripts - db 0 ; callbacks + def_callbacks HiddenPowerGuy: faceplayer @@ -68,15 +68,15 @@ HiddenPowerGuyText3: LakeOfRageHiddenPowerHouse_MapEvents: db 0, 0 ; filler - db 2 ; warp events + def_warp_events warp_event 2, 7, LAKE_OF_RAGE, 1 warp_event 3, 7, LAKE_OF_RAGE, 1 - db 0 ; coord events + def_coord_events - db 2 ; bg events + def_bg_events bg_event 0, 1, BGEVENT_READ, HiddenPowerHouseBookshelf bg_event 1, 1, BGEVENT_READ, HiddenPowerHouseBookshelf - db 1 ; object events + def_object_events object_event 2, 3, SPRITE_FISHER, SPRITEMOVEDATA_SPINRANDOM_SLOW, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, HiddenPowerGuy, -1 diff --git a/maps/LakeOfRageMagikarpHouse.asm b/maps/LakeOfRageMagikarpHouse.asm index 648afb0b3..efcb8699c 100644 --- a/maps/LakeOfRageMagikarpHouse.asm +++ b/maps/LakeOfRageMagikarpHouse.asm @@ -1,10 +1,10 @@ - object_const_def ; object_event constants + object_const_def const LAKEOFRAGEMAGIKARPHOUSE_FISHING_GURU LakeOfRageMagikarpHouse_MapScripts: - db 0 ; scene scripts + def_scene_scripts - db 0 ; callbacks + def_callbacks MagikarpLengthRaterScript: faceplayer @@ -210,15 +210,15 @@ LakeOfRageMagikarpHouseUnusedRecordText: LakeOfRageMagikarpHouse_MapEvents: db 0, 0 ; filler - db 2 ; warp events + def_warp_events warp_event 2, 7, LAKE_OF_RAGE, 2 warp_event 3, 7, LAKE_OF_RAGE, 2 - db 0 ; coord events + def_coord_events - db 2 ; bg events + def_bg_events bg_event 0, 1, BGEVENT_READ, MagikarpHouseBookshelf bg_event 1, 1, BGEVENT_READ, MagikarpHouseBookshelf - db 1 ; object events + def_object_events object_event 2, 3, SPRITE_FISHING_GURU, SPRITEMOVEDATA_SPINRANDOM_SLOW, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, MagikarpLengthRaterScript, -1 diff --git a/maps/LancesRoom.asm b/maps/LancesRoom.asm index 5f58da8e5..487ac39f8 100644 --- a/maps/LancesRoom.asm +++ b/maps/LancesRoom.asm @@ -1,14 +1,14 @@ - object_const_def ; object_event constants + object_const_def const LANCESROOM_LANCE const LANCESROOM_MARY const LANCESROOM_OAK LancesRoom_MapScripts: - db 2 ; scene scripts + def_scene_scripts scene_script .LockDoor ; SCENE_DEFAULT scene_script .DummyScene ; SCENE_LANCESROOM_APPROACH_LANCE - db 1 ; callbacks + def_callbacks callback MAPCALLBACK_TILES, .LancesRoomDoors .LockDoor: @@ -338,19 +338,19 @@ LancesRoomMaryNoInterviewText: LancesRoom_MapEvents: db 0, 0 ; filler - db 4 ; warp events + def_warp_events 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 + def_coord_events coord_event 4, 5, SCENE_LANCESROOM_APPROACH_LANCE, Script_ApproachLanceFromLeft coord_event 5, 5, SCENE_LANCESROOM_APPROACH_LANCE, Script_ApproachLanceFromRight - db 0 ; bg events + def_bg_events - db 3 ; object events + def_object_events object_event 5, 3, SPRITE_LANCE, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, LancesRoomLanceScript, -1 object_event 4, 7, SPRITE_TEACHER, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_SCRIPT, 0, ObjectEvent, EVENT_LANCES_ROOM_OAK_AND_MARY object_event 4, 7, SPRITE_OAK, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, ObjectEvent, EVENT_LANCES_ROOM_OAK_AND_MARY diff --git a/maps/LavRadioTower1F.asm b/maps/LavRadioTower1F.asm index 188fb11f8..346ef5768 100644 --- a/maps/LavRadioTower1F.asm +++ b/maps/LavRadioTower1F.asm @@ -1,4 +1,4 @@ - object_const_def ; object_event constants + object_const_def const LAVRADIOTOWER1F_RECEPTIONIST const LAVRADIOTOWER1F_OFFICER const LAVRADIOTOWER1F_SUPER_NERD1 @@ -6,9 +6,9 @@ const LAVRADIOTOWER1F_SUPER_NERD2 LavRadioTower1F_MapScripts: - db 0 ; scene scripts + def_scene_scripts - db 0 ; callbacks + def_callbacks LavRadioTower1FReceptionistScript: jumptextfaceplayer LavRadioTower1FReceptionistText @@ -223,17 +223,17 @@ LavRadioTower1FReferenceLibraryText: LavRadioTower1F_MapEvents: db 0, 0 ; filler - db 2 ; warp events + def_warp_events warp_event 2, 7, LAVENDER_TOWN, 7 warp_event 3, 7, LAVENDER_TOWN, 7 - db 0 ; coord events + def_coord_events - db 2 ; bg events + def_bg_events bg_event 11, 0, BGEVENT_READ, LavRadioTower1FDirectory bg_event 5, 0, BGEVENT_READ, LavRadioTower1FPokeFluteSign - db 5 ; object events + def_object_events object_event 6, 6, SPRITE_RECEPTIONIST, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_SCRIPT, 0, LavRadioTower1FReceptionistScript, -1 object_event 15, 1, SPRITE_OFFICER, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_SCRIPT, 0, LavRadioTower1FOfficerScript, -1 object_event 1, 3, SPRITE_SUPER_NERD, SPRITEMOVEDATA_WANDER, 1, 1, -1, -1, PAL_NPC_RED, OBJECTTYPE_SCRIPT, 0, LavRadioTower1FSuperNerd1Script, -1 diff --git a/maps/LavenderMart.asm b/maps/LavenderMart.asm index 0ec281ed1..a296a1bb2 100644 --- a/maps/LavenderMart.asm +++ b/maps/LavenderMart.asm @@ -1,12 +1,12 @@ - object_const_def ; object_event constants + object_const_def const LAVENDERMART_CLERK const LAVENDERMART_POKEFAN_M const LAVENDERMART_ROCKER LavenderMart_MapScripts: - db 0 ; scene scripts + def_scene_scripts - db 0 ; callbacks + def_callbacks LavenderMartClerkScript: opentext @@ -48,15 +48,15 @@ LavenderMartRockerText: LavenderMart_MapEvents: db 0, 0 ; filler - db 2 ; warp events + def_warp_events warp_event 2, 7, LAVENDER_TOWN, 5 warp_event 3, 7, LAVENDER_TOWN, 5 - db 0 ; coord events + def_coord_events - db 0 ; bg events + def_bg_events - db 3 ; object events + def_object_events object_event 1, 3, SPRITE_CLERK, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, LavenderMartClerkScript, -1 object_event 6, 6, SPRITE_POKEFAN_M, SPRITEMOVEDATA_WALK_LEFT_RIGHT, 2, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_SCRIPT, 0, LavenderMartPokefanMScript, -1 object_event 9, 2, SPRITE_ROCKER, SPRITEMOVEDATA_SPINRANDOM_SLOW, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, LavenderMartRockerScript, -1 diff --git a/maps/LavenderNameRater.asm b/maps/LavenderNameRater.asm index bff586aa6..2809d3152 100644 --- a/maps/LavenderNameRater.asm +++ b/maps/LavenderNameRater.asm @@ -1,11 +1,11 @@ - object_const_def ; object_event constants + object_const_def const LAVENDERNAMERATER_NAME_RATER LavenderNameRater_MapScripts: - db 1 ; scene scripts + def_scene_scripts scene_script .DummyScene - db 0 ; callbacks + def_callbacks .DummyScene: end @@ -25,13 +25,13 @@ LavenderNameRaterUnusedBookshelf: LavenderNameRater_MapEvents: db 0, 0 ; filler - db 2 ; warp events + def_warp_events warp_event 2, 7, LAVENDER_TOWN, 4 warp_event 3, 7, LAVENDER_TOWN, 4 - db 0 ; coord events + def_coord_events - db 0 ; bg events + def_bg_events - db 1 ; object events + def_object_events object_event 2, 3, SPRITE_GENTLEMAN, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_SCRIPT, 0, LavenderNameRater, -1 diff --git a/maps/LavenderPokecenter1F.asm b/maps/LavenderPokecenter1F.asm index 31b1724f2..f112e9a74 100644 --- a/maps/LavenderPokecenter1F.asm +++ b/maps/LavenderPokecenter1F.asm @@ -1,13 +1,13 @@ - object_const_def ; object_event constants + object_const_def const LAVENDERPOKECENTER1F_NURSE const LAVENDERPOKECENTER1F_GENTLEMAN const LAVENDERPOKECENTER1F_TEACHER const LAVENDERPOKECENTER1F_YOUNGSTER LavenderPokecenter1F_MapScripts: - db 0 ; scene scripts + def_scene_scripts - db 0 ; callbacks + def_callbacks LavenderPokecenter1FNurseScript: jumpstd PokecenterNurseScript @@ -81,16 +81,16 @@ LavenderPokecenter1FYoungsterText_ReturnedMachinePart: LavenderPokecenter1F_MapEvents: db 0, 0 ; filler - db 3 ; warp events + def_warp_events 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 + def_coord_events - db 0 ; bg events + def_bg_events - db 4 ; object events + def_object_events object_event 3, 1, SPRITE_NURSE, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, LavenderPokecenter1FNurseScript, -1 object_event 7, 6, SPRITE_GENTLEMAN, SPRITEMOVEDATA_WALK_LEFT_RIGHT, 1, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, LavenderPokecenter1FGentlemanScript, -1 object_event 5, 3, SPRITE_TEACHER, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_SCRIPT, 0, LavenderPokecenter1FTeacherScript, -1 diff --git a/maps/LavenderPokecenter2FBeta.asm b/maps/LavenderPokecenter2FBeta.asm index 7157b4735..6e084f520 100644 --- a/maps/LavenderPokecenter2FBeta.asm +++ b/maps/LavenderPokecenter2FBeta.asm @@ -1,16 +1,16 @@ LavenderPokecenter2FBeta_MapScripts: - db 0 ; scene scripts + def_scene_scripts - db 0 ; callbacks + def_callbacks LavenderPokecenter2FBeta_MapEvents: db 0, 0 ; filler - db 1 ; warp events + def_warp_events warp_event 0, 7, LAVENDER_POKECENTER_1F, 3 - db 0 ; coord events + def_coord_events - db 0 ; bg events + def_bg_events - db 0 ; object events + def_object_events diff --git a/maps/LavenderSpeechHouse.asm b/maps/LavenderSpeechHouse.asm index 1be5c7edb..44c60b40f 100644 --- a/maps/LavenderSpeechHouse.asm +++ b/maps/LavenderSpeechHouse.asm @@ -1,10 +1,10 @@ - object_const_def ; object_event constants + object_const_def const LAVENDERSPEECHHOUSE_POKEFAN_F LavenderSpeechHouse_MapScripts: - db 0 ; scene scripts + def_scene_scripts - db 0 ; callbacks + def_callbacks LavenderSpeechHousePokefanFScript: jumptextfaceplayer LavenderSpeechHousePokefanFText @@ -29,15 +29,15 @@ LavenderSpeechHousePokefanFText: LavenderSpeechHouse_MapEvents: db 0, 0 ; filler - db 2 ; warp events + def_warp_events warp_event 2, 7, LAVENDER_TOWN, 3 warp_event 3, 7, LAVENDER_TOWN, 3 - db 0 ; coord events + def_coord_events - db 2 ; bg events + def_bg_events bg_event 0, 1, BGEVENT_READ, LavenderSpeechHouseBookshelf bg_event 1, 1, BGEVENT_READ, LavenderSpeechHouseBookshelf - db 1 ; object events + def_object_events object_event 2, 3, SPRITE_POKEFAN_F, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_SCRIPT, 0, LavenderSpeechHousePokefanFScript, -1 diff --git a/maps/LavenderTown.asm b/maps/LavenderTown.asm index a5ee59269..38f24ff1a 100644 --- a/maps/LavenderTown.asm +++ b/maps/LavenderTown.asm @@ -1,13 +1,13 @@ - object_const_def ; object_event constants + object_const_def const LAVENDERTOWN_POKEFAN_M const LAVENDERTOWN_TEACHER const LAVENDERTOWN_GRAMPS const LAVENDERTOWN_YOUNGSTER LavenderTown_MapScripts: - db 0 ; scene scripts + def_scene_scripts - db 1 ; callbacks + def_callbacks callback MAPCALLBACK_NEWMAP, .FlyPoint .FlyPoint: @@ -106,7 +106,7 @@ SoulHouseSignText: LavenderTown_MapEvents: db 0, 0 ; filler - db 7 ; warp events + def_warp_events warp_event 5, 5, LAVENDER_POKECENTER_1F, 1 warp_event 5, 9, MR_FUJIS_HOUSE, 1 warp_event 3, 13, LAVENDER_SPEECH_HOUSE, 1 @@ -115,9 +115,9 @@ LavenderTown_MapEvents: warp_event 13, 11, SOUL_HOUSE, 1 warp_event 14, 5, LAV_RADIO_TOWER_1F, 1 - db 0 ; coord events + def_coord_events - db 6 ; bg events + def_bg_events bg_event 11, 3, BGEVENT_READ, LavenderTownSign bg_event 15, 7, BGEVENT_READ, KantoRadioStationSign bg_event 3, 9, BGEVENT_READ, VolunteerPokemonHouseSign @@ -125,7 +125,7 @@ LavenderTown_MapEvents: bg_event 6, 5, BGEVENT_READ, LavenderPokecenterSignText bg_event 2, 5, BGEVENT_READ, LavenderMartSignText - db 4 ; object events + def_object_events object_event 12, 7, SPRITE_POKEFAN_M, SPRITEMOVEDATA_WALK_LEFT_RIGHT, 1, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_SCRIPT, 0, LavenderTownPokefanMScript, -1 object_event 2, 15, SPRITE_TEACHER, SPRITEMOVEDATA_WALK_LEFT_RIGHT, 1, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_SCRIPT, 0, LavenderTownTeacherScript, -1 object_event 14, 12, SPRITE_GRAMPS, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, LavenderTownGrampsScript, -1 diff --git a/maps/MahoganyGym.asm b/maps/MahoganyGym.asm index 59273ba8f..7c5cf037f 100644 --- a/maps/MahoganyGym.asm +++ b/maps/MahoganyGym.asm @@ -1,4 +1,4 @@ - object_const_def ; object_event constants + object_const_def const MAHOGANYGYM_PRYCE const MAHOGANYGYM_BEAUTY1 const MAHOGANYGYM_ROCKER1 @@ -8,9 +8,9 @@ const MAHOGANYGYM_GYM_GUIDE MahoganyGym_MapScripts: - db 0 ; scene scripts + def_scene_scripts - db 0 ; callbacks + def_callbacks MahoganyGymPryceScript: faceplayer @@ -373,17 +373,17 @@ MahoganyGymGuideWinText: MahoganyGym_MapEvents: db 0, 0 ; filler - db 2 ; warp events + def_warp_events warp_event 4, 17, MAHOGANY_TOWN, 3 warp_event 5, 17, MAHOGANY_TOWN, 3 - db 0 ; coord events + def_coord_events - db 2 ; bg events + def_bg_events bg_event 3, 15, BGEVENT_READ, MahoganyGymStatue bg_event 6, 15, BGEVENT_READ, MahoganyGymStatue - db 7 ; object events + def_object_events object_event 5, 3, SPRITE_PRYCE, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_BROWN, OBJECTTYPE_SCRIPT, 0, MahoganyGymPryceScript, -1 object_event 4, 6, SPRITE_BEAUTY, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_TRAINER, 1, TrainerSkierRoxanne, -1 object_event 0, 17, SPRITE_ROCKER, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_TRAINER, 1, TrainerBoarderRonald, -1 diff --git a/maps/MahoganyMart1F.asm b/maps/MahoganyMart1F.asm index 75036f2d0..9d8ad1256 100644 --- a/maps/MahoganyMart1F.asm +++ b/maps/MahoganyMart1F.asm @@ -1,4 +1,4 @@ - object_const_def ; object_event constants + object_const_def const MAHOGANYMART1F_PHARMACIST const MAHOGANYMART1F_BLACK_BELT const MAHOGANYMART1F_LANCE @@ -6,11 +6,11 @@ const MAHOGANYMART1F_GRANNY MahoganyMart1F_MapScripts: - db 2 ; scene scripts + def_scene_scripts scene_script .DummyScene0 ; SCENE_MAHOGANYMART1F_NOTHING scene_script .LanceUncoversStaircase ; SCENE_MAHOGANYMART1F_LANCE_UNCOVERS_STAIRS - db 1 ; callbacks + def_callbacks callback MAPCALLBACK_TILES, .MahoganyMart1FStaircase .DummyScene0: @@ -221,16 +221,16 @@ MahoganyMart1FLanceSplitUpText: MahoganyMart1F_MapEvents: db 0, 0 ; filler - db 3 ; warp events + def_warp_events 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 + def_coord_events - db 0 ; bg events + def_bg_events - db 5 ; object events + def_object_events object_event 4, 3, SPRITE_PHARMACIST, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, MahoganyMart1FPharmacistScript, EVENT_TEAM_ROCKET_BASE_POPULATION object_event 1, 6, SPRITE_BLACK_BELT, SPRITEMOVEDATA_SPINRANDOM_SLOW, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, MahoganyMart1FBlackBeltScript, EVENT_TEAM_ROCKET_BASE_POPULATION object_event 4, 6, SPRITE_LANCE, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, ObjectEvent, EVENT_MAHOGANY_MART_LANCE_AND_DRAGONITE diff --git a/maps/MahoganyPokecenter1F.asm b/maps/MahoganyPokecenter1F.asm index 8459eff3f..d61d09ca5 100644 --- a/maps/MahoganyPokecenter1F.asm +++ b/maps/MahoganyPokecenter1F.asm @@ -1,13 +1,13 @@ - object_const_def ; object_event constants + object_const_def const MAHOGANYPOKECENTER1F_NURSE const MAHOGANYPOKECENTER1F_POKEFAN_M const MAHOGANYPOKECENTER1F_YOUNGSTER const MAHOGANYPOKECENTER1F_COOLTRAINER_F MahoganyPokecenter1F_MapScripts: - db 0 ; scene scripts + def_scene_scripts - db 0 ; callbacks + def_callbacks MahoganyPokecenter1FNurseScript: jumpstd PokecenterNurseScript @@ -54,16 +54,16 @@ MahoganyPokecenter1FCooltrainerFText: MahoganyPokecenter1F_MapEvents: db 0, 0 ; filler - db 3 ; warp events + def_warp_events 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 + def_coord_events - db 0 ; bg events + def_bg_events - db 4 ; object events + def_object_events object_event 3, 1, SPRITE_NURSE, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, MahoganyPokecenter1FNurseScript, -1 object_event 7, 2, SPRITE_POKEFAN_M, SPRITEMOVEDATA_WANDER, 1, 1, -1, -1, PAL_NPC_RED, OBJECTTYPE_SCRIPT, 0, MahoganyPokecenter1FPokefanMScript, -1 object_event 1, 3, SPRITE_YOUNGSTER, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_SCRIPT, 0, MahoganyPokecenter1FYoungsterScript, -1 diff --git a/maps/MahoganyRedGyaradosSpeechHouse.asm b/maps/MahoganyRedGyaradosSpeechHouse.asm index 33e76ec3e..78ddf6ced 100644 --- a/maps/MahoganyRedGyaradosSpeechHouse.asm +++ b/maps/MahoganyRedGyaradosSpeechHouse.asm @@ -1,11 +1,11 @@ - object_const_def ; object_event constants + object_const_def const MAHOGANYREDGYARADOSSPEECHHOUSE_BLACK_BELT const MAHOGANYREDGYARADOSSPEECHHOUSE_TEACHER MahoganyRedGyaradosSpeechHouse_MapScripts: - db 0 ; scene scripts + def_scene_scripts - db 0 ; callbacks + def_callbacks MahoganyRedGyaradosSpeechHouseBlackBeltScript: jumptextfaceplayer MahoganyRedGyaradosSpeechHouseBlackBeltText @@ -63,14 +63,14 @@ MahoganyRedGyaradosSpeechHouseTeacherText_RocketsInRadioTower: MahoganyRedGyaradosSpeechHouse_MapEvents: db 0, 0 ; filler - db 2 ; warp events + def_warp_events warp_event 2, 7, MAHOGANY_TOWN, 2 warp_event 3, 7, MAHOGANY_TOWN, 2 - db 0 ; coord events + def_coord_events - db 0 ; bg events + def_bg_events - db 2 ; object events + def_object_events object_event 2, 3, SPRITE_BLACK_BELT, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, MahoganyRedGyaradosSpeechHouseBlackBeltScript, -1 object_event 6, 5, SPRITE_TEACHER, SPRITEMOVEDATA_WALK_UP_DOWN, 0, 1, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_SCRIPT, 0, MahoganyRedGyaradosSpeechHouseTeacherScript, -1 diff --git a/maps/MahoganyTown.asm b/maps/MahoganyTown.asm index 275697b07..6cd75d075 100644 --- a/maps/MahoganyTown.asm +++ b/maps/MahoganyTown.asm @@ -1,17 +1,17 @@ MAHOGANYTOWN_RAGECANDYBAR_PRICE EQU 300 - object_const_def ; object_event constants + object_const_def const MAHOGANYTOWN_POKEFAN_M const MAHOGANYTOWN_GRAMPS const MAHOGANYTOWN_FISHER const MAHOGANYTOWN_LASS MahoganyTown_MapScripts: - db 2 ; scene scripts + def_scene_scripts scene_script .DummyScene0 ; SCENE_DEFAULT scene_script .DummyScene1 ; SCENE_FINISHED - db 1 ; callbacks + def_callbacks callback MAPCALLBACK_NEWMAP, .FlyPoint .DummyScene0: @@ -247,24 +247,24 @@ MahoganyGymSignText: MahoganyTown_MapEvents: db 0, 0 ; filler - db 5 ; warp events + def_warp_events 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 + def_coord_events coord_event 19, 8, SCENE_DEFAULT, MahoganyTownTryARageCandyBarScript coord_event 19, 9, SCENE_DEFAULT, MahoganyTownTryARageCandyBarScript - db 4 ; bg events + def_bg_events bg_event 1, 5, BGEVENT_READ, MahoganyTownSign bg_event 9, 7, BGEVENT_READ, MahoganyTownRagecandybarSign bg_event 3, 13, BGEVENT_READ, MahoganyGymSign bg_event 16, 13, BGEVENT_READ, MahoganyTownPokecenterSign - db 4 ; object events + def_object_events object_event 19, 8, SPRITE_POKEFAN_M, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, MahoganyTownPokefanMScript, EVENT_MAHOGANY_TOWN_POKEFAN_M_BLOCKS_EAST object_event 6, 9, SPRITE_GRAMPS, SPRITEMOVEDATA_WALK_LEFT_RIGHT, 1, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, MahoganyTownGrampsScript, -1 object_event 6, 14, SPRITE_FISHER, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_SCRIPT, 0, MahoganyTownFisherScript, EVENT_MAHOGANY_TOWN_POKEFAN_M_BLOCKS_GYM diff --git a/maps/ManiasHouse.asm b/maps/ManiasHouse.asm index b390051e4..7d8cfee43 100644 --- a/maps/ManiasHouse.asm +++ b/maps/ManiasHouse.asm @@ -1,10 +1,10 @@ - object_const_def ; object_event constants + object_const_def const MANIASHOUSE_ROCKER ManiasHouse_MapScripts: - db 0 ; scene scripts + def_scene_scripts - db 0 ; callbacks + def_callbacks ManiaScript: faceplayer @@ -201,13 +201,13 @@ ManiaText_ShuckleIsYourLastMon: ManiasHouse_MapEvents: db 0, 0 ; filler - db 2 ; warp events + def_warp_events warp_event 2, 7, CIANWOOD_CITY, 1 warp_event 3, 7, CIANWOOD_CITY, 1 - db 0 ; coord events + def_coord_events - db 0 ; bg events + def_bg_events - db 1 ; object events + def_object_events object_event 2, 4, SPRITE_ROCKER, SPRITEMOVEDATA_SPINRANDOM_SLOW, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, ManiaScript, -1 diff --git a/maps/MobileBattleRoom.asm b/maps/MobileBattleRoom.asm index 196929d65..82e2a6335 100644 --- a/maps/MobileBattleRoom.asm +++ b/maps/MobileBattleRoom.asm @@ -1,9 +1,9 @@ MobileBattleRoom_MapScripts: - db 2 ; scene scripts + def_scene_scripts scene_script .InitializeMobileBattleRoom ; SCENE_DEFAULT scene_script .DummyScene ; SCENE_FINISHED - db 0 ; callbacks + def_callbacks .InitializeMobileBattleRoom: prioritysjump .InitializeAndPreparePokecenter2F @@ -67,13 +67,13 @@ MobileBattleRoom_HealText: MobileBattleRoom_MapEvents: db 0, 0 ; filler - db 2 ; warp events + def_warp_events warp_event 4, 7, POKECENTER_2F, 6 warp_event 5, 7, POKECENTER_2F, 6 - db 0 ; coord events + def_coord_events - db 1 ; bg events + def_bg_events bg_event 4, 2, BGEVENT_UP, MobileBattleRoomConsoleScript - db 0 ; object events + def_object_events diff --git a/maps/MobileTradeRoom.asm b/maps/MobileTradeRoom.asm index 03e71bcbb..37cfc1347 100644 --- a/maps/MobileTradeRoom.asm +++ b/maps/MobileTradeRoom.asm @@ -1,9 +1,9 @@ MobileTradeRoom_MapScripts: - db 2 ; scene scripts + def_scene_scripts scene_script .InitializeMobileTradeRoom ; SCENE_DEFAULT scene_script .DummyScene ; SCENE_FINISHED - db 0 ; callbacks + def_callbacks .InitializeMobileTradeRoom: prioritysjump .InitializeAndPreparePokecenter2F @@ -35,13 +35,13 @@ MobileTradeRoom_EstablishingCommsText: MobileTradeRoom_MapEvents: db 0, 0 ; filler - db 2 ; warp events + def_warp_events warp_event 4, 7, POKECENTER_2F, 5 warp_event 5, 7, POKECENTER_2F, 5 - db 0 ; coord events + def_coord_events - db 1 ; bg events + def_bg_events bg_event 4, 2, BGEVENT_UP, MobileTradeRoomConsoleScript - db 0 ; object events + def_object_events diff --git a/maps/MountMoon.asm b/maps/MountMoon.asm index c0c5df796..25a3080fa 100644 --- a/maps/MountMoon.asm +++ b/maps/MountMoon.asm @@ -1,12 +1,12 @@ - object_const_def ; object_event constants + object_const_def const MOUNTMOON_SILVER MountMoon_MapScripts: - db 2 ; scene scripts + def_scene_scripts scene_script .RivalEncounter ; SCENE_DEFAULT scene_script .DummyScene ; SCENE_FINISHED - db 0 ; callbacks + def_callbacks .RivalEncounter: prioritysjump .RivalBattle @@ -161,7 +161,7 @@ MountMoonSilverTextLoss: MountMoon_MapEvents: db 0, 0 ; filler - db 8 ; warp events + def_warp_events warp_event 3, 3, ROUTE_3, 1 warp_event 15, 15, ROUTE_4, 1 warp_event 13, 3, MOUNT_MOON, 7 @@ -171,9 +171,9 @@ MountMoon_MapEvents: warp_event 25, 3, MOUNT_MOON, 3 warp_event 25, 13, MOUNT_MOON, 4 - db 0 ; coord events + def_coord_events - db 0 ; bg events + def_bg_events - db 1 ; object events + def_object_events object_event 7, 3, SPRITE_SILVER, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, ObjectEvent, EVENT_MT_MOON_RIVAL diff --git a/maps/MountMoonGiftShop.asm b/maps/MountMoonGiftShop.asm index 01b881f84..7c42d917b 100644 --- a/maps/MountMoonGiftShop.asm +++ b/maps/MountMoonGiftShop.asm @@ -1,13 +1,13 @@ - object_const_def ; object_event constants + object_const_def const MOUNTMOONGIFTSHOP_GRAMPS1 ; morning only const MOUNTMOONGIFTSHOP_GRAMPS2 ; day only const MOUNTMOONGIFTSHOP_LASS1 ; morning only const MOUNTMOONGIFTSHOP_LASS2 ; day only MountMoonGiftShop_MapScripts: - db 0 ; scene scripts + def_scene_scripts - db 0 ; callbacks + def_callbacks MountMoonGiftShopClerkScript: faceplayer @@ -28,15 +28,15 @@ MountMoonGiftShopLassText: MountMoonGiftShop_MapEvents: db 0, 0 ; filler - db 2 ; warp events + def_warp_events warp_event 3, 7, MOUNT_MOON_SQUARE, 3 warp_event 4, 7, MOUNT_MOON_SQUARE, 3 - db 0 ; coord events + def_coord_events - db 0 ; bg events + def_bg_events - db 4 ; object events + def_object_events object_event 4, 3, SPRITE_GRAMPS, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, MORN, 0, OBJECTTYPE_SCRIPT, 0, MountMoonGiftShopClerkScript, -1 object_event 1, 2, SPRITE_GRAMPS, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, DAY, 0, OBJECTTYPE_SCRIPT, 0, MountMoonGiftShopClerkScript, -1 object_event 1, 6, SPRITE_LASS, SPRITEMOVEDATA_WALK_LEFT_RIGHT, 1, 0, -1, MORN, 0, OBJECTTYPE_SCRIPT, 0, MountMoonGiftShopLassScript, -1 diff --git a/maps/MountMoonSquare.asm b/maps/MountMoonSquare.asm index f30358597..bc0728b75 100644 --- a/maps/MountMoonSquare.asm +++ b/maps/MountMoonSquare.asm @@ -1,13 +1,13 @@ - object_const_def ; object_event constants + object_const_def const MOUNTMOONSQUARE_FAIRY1 const MOUNTMOONSQUARE_FAIRY2 const MOUNTMOONSQUARE_ROCK MountMoonSquare_MapScripts: - db 1 ; scene scripts + def_scene_scripts scene_script .DummyScene ; SCENE_DEFAULT - db 2 ; callbacks + def_callbacks callback MAPCALLBACK_NEWMAP, .DisappearMoonStone callback MAPCALLBACK_OBJECTS, .DisappearRock @@ -133,19 +133,19 @@ DontLitterSignText: MountMoonSquare_MapEvents: db 0, 0 ; filler - db 3 ; warp events + def_warp_events 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 + def_coord_events coord_event 7, 11, SCENE_DEFAULT, ClefairyDance - db 2 ; bg events + def_bg_events bg_event 7, 7, BGEVENT_ITEM, MountMoonSquareHiddenMoonStone bg_event 17, 7, BGEVENT_READ, DontLitterSign - db 3 ; object events + def_object_events object_event 6, 6, SPRITE_FAIRY, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, ObjectEvent, EVENT_MT_MOON_SQUARE_CLEFAIRY object_event 7, 6, SPRITE_FAIRY, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, ObjectEvent, EVENT_MT_MOON_SQUARE_CLEFAIRY object_event 7, 7, SPRITE_ROCK, SPRITEMOVEDATA_SMASHABLE_ROCK, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, MtMoonSquareRock, EVENT_MT_MOON_SQUARE_ROCK diff --git a/maps/MountMortar1FInside.asm b/maps/MountMortar1FInside.asm index fbbda22f8..7cdbd1c3e 100644 --- a/maps/MountMortar1FInside.asm +++ b/maps/MountMortar1FInside.asm @@ -1,4 +1,4 @@ - object_const_def ; object_event constants + object_const_def const MOUNTMORTAR1FINSIDE_BOULDER const MOUNTMORTAR1FINSIDE_POKE_BALL1 const MOUNTMORTAR1FINSIDE_POKE_BALL2 @@ -11,9 +11,9 @@ const MOUNTMORTAR1FINSIDE_POKE_BALL7 MountMortar1FInside_MapScripts: - db 0 ; scene scripts + def_scene_scripts - db 0 ; callbacks + def_callbacks TrainerPokemaniacMiller: trainer POKEMANIAC, MILLER, EVENT_BEAT_POKEMANIAC_MILLER, PokemaniacMillerSeenText, PokemaniacMillerBeatenText, 0, .Script @@ -117,7 +117,7 @@ SupernerdMarkusAfterBattleText: MountMortar1FInside_MapEvents: db 0, 0 ; filler - db 6 ; warp events + def_warp_events 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 @@ -125,12 +125,12 @@ MountMortar1FInside_MapEvents: warp_event 3, 19, MOUNT_MORTAR_B1F, 1 warp_event 9, 9, MOUNT_MORTAR_2F_INSIDE, 2 - db 0 ; coord events + def_coord_events - db 1 ; bg events + def_bg_events bg_event 30, 11, BGEVENT_ITEM, MountMortar1FInsideHiddenMaxRepel - db 10 ; object events + def_object_events object_event 21, 43, SPRITE_BOULDER, SPRITEMOVEDATA_STRENGTH_BOULDER, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, MountMortar1FBoulder, -1 object_event 35, 38, SPRITE_POKE_BALL, SPRITEMOVEDATA_STILL, 0, 0, -1, -1, 0, OBJECTTYPE_ITEMBALL, 0, MountMortar1FInsideEscapeRope, EVENT_MOUNT_MORTAR_1F_INSIDE_ESCAPE_ROPE object_event 16, 10, SPRITE_POKE_BALL, SPRITEMOVEDATA_STILL, 0, 0, -1, -1, 0, OBJECTTYPE_ITEMBALL, 0, MountMortar1FInsideMaxRevive, EVENT_MOUNT_MORTAR_1F_INSIDE_MAX_REVIVE diff --git a/maps/MountMortar1FOutside.asm b/maps/MountMortar1FOutside.asm index c3f99274a..4436c3d70 100644 --- a/maps/MountMortar1FOutside.asm +++ b/maps/MountMortar1FOutside.asm @@ -1,11 +1,11 @@ - object_const_def ; object_event constants + object_const_def const MOUNTMORTAR1FOUTSIDE_POKE_BALL1 const MOUNTMORTAR1FOUTSIDE_POKE_BALL2 MountMortar1FOutside_MapScripts: - db 0 ; scene scripts + def_scene_scripts - db 0 ; callbacks + def_callbacks MountMortar1FOutsideEther: itemball ETHER @@ -19,7 +19,7 @@ MountMortar1FOutsideHiddenHyperPotion: MountMortar1FOutside_MapEvents: db 0, 0 ; filler - db 9 ; warp events + def_warp_events warp_event 3, 33, ROUTE_42, 3 warp_event 17, 33, ROUTE_42, 4 warp_event 37, 33, ROUTE_42, 5 @@ -30,11 +30,11 @@ MountMortar1FOutside_MapEvents: warp_event 7, 13, MOUNT_MORTAR_1F_INSIDE, 3 warp_event 33, 13, MOUNT_MORTAR_1F_INSIDE, 4 - db 0 ; coord events + def_coord_events - db 1 ; bg events + def_bg_events bg_event 25, 22, BGEVENT_ITEM, MountMortar1FOutsideHiddenHyperPotion - db 2 ; object events + def_object_events object_event 13, 15, SPRITE_POKE_BALL, SPRITEMOVEDATA_STILL, 0, 0, -1, -1, 0, OBJECTTYPE_ITEMBALL, 0, MountMortar1FOutsideEther, EVENT_MOUNT_MORTAR_1F_OUTSIDE_ETHER object_event 31, 18, SPRITE_POKE_BALL, SPRITEMOVEDATA_STILL, 0, 0, -1, -1, 0, OBJECTTYPE_ITEMBALL, 0, MountMortar1FOutsideRevive, EVENT_MOUNT_MORTAR_1F_OUTSIDE_REVIVE diff --git a/maps/MountMortar2FInside.asm b/maps/MountMortar2FInside.asm index a293ea430..2b159fc6c 100644 --- a/maps/MountMortar2FInside.asm +++ b/maps/MountMortar2FInside.asm @@ -1,4 +1,4 @@ - object_const_def ; object_event constants + object_const_def const MOUNTMORTAR2FINSIDE_POKE_BALL1 const MOUNTMORTAR2FINSIDE_POKE_BALL2 const MOUNTMORTAR2FINSIDE_POKE_BALL3 @@ -8,9 +8,9 @@ const MOUNTMORTAR2FINSIDE_SUPER_NERD MountMortar2FInside_MapScripts: - db 0 ; scene scripts + def_scene_scripts - db 0 ; callbacks + def_callbacks TrainerSupernerdHugh: trainer SUPER_NERD, HUGH, EVENT_BEAT_SUPER_NERD_HUGH, SupernerdHughSeenText, SupernerdHughBeatenText, 0, .Script @@ -67,16 +67,16 @@ SupernerdHughAfterBattleText: MountMortar2FInside_MapEvents: db 0, 0 ; filler - db 2 ; warp events + def_warp_events warp_event 17, 33, MOUNT_MORTAR_1F_OUTSIDE, 4 warp_event 3, 5, MOUNT_MORTAR_1F_INSIDE, 6 - db 0 ; coord events + def_coord_events - db 1 ; bg events + def_bg_events bg_event 24, 8, BGEVENT_ITEM, MountMortar2FInsideHiddenFullRestore - db 7 ; object events + def_object_events object_event 28, 22, SPRITE_POKE_BALL, SPRITEMOVEDATA_STILL, 0, 0, -1, -1, 0, OBJECTTYPE_ITEMBALL, 0, MountMortar2FInsideMaxPotion, EVENT_MOUNT_MORTAR_2F_INSIDE_MAX_POTION object_event 2, 33, SPRITE_POKE_BALL, SPRITEMOVEDATA_STILL, 0, 0, -1, -1, 0, OBJECTTYPE_ITEMBALL, 0, MountMortar2FInsideRareCandy, EVENT_MOUNT_MORTAR_2F_INSIDE_RARE_CANDY object_event 19, 17, SPRITE_POKE_BALL, SPRITEMOVEDATA_STILL, 0, 0, -1, -1, 0, OBJECTTYPE_ITEMBALL, 0, MountMortar2FInsideTMDefenseCurl, EVENT_MOUNT_MORTAR_2F_INSIDE_TM_DEFENSE_CURL diff --git a/maps/MountMortarB1F.asm b/maps/MountMortarB1F.asm index ccff6f6b7..d4e4c9dd2 100644 --- a/maps/MountMortarB1F.asm +++ b/maps/MountMortarB1F.asm @@ -1,4 +1,4 @@ - object_const_def ; object_event constants + object_const_def const MOUNTMORTARB1F_POKE_BALL1 const MOUNTMORTARB1F_POKE_BALL2 const MOUNTMORTARB1F_BOULDER @@ -8,9 +8,9 @@ const MOUNTMORTARB1F_POKE_BALL5 MountMortarB1F_MapScripts: - db 0 ; scene scripts + def_scene_scripts - db 0 ; callbacks + def_callbacks MountMortarB1FKiyoScript: faceplayer @@ -135,16 +135,16 @@ MountMortarB1FKiyoFullPartyText: MountMortarB1F_MapEvents: db 0, 0 ; filler - db 2 ; warp events + def_warp_events warp_event 3, 3, MOUNT_MORTAR_1F_INSIDE, 5 warp_event 19, 29, MOUNT_MORTAR_1F_OUTSIDE, 7 - db 0 ; coord events + def_coord_events - db 1 ; bg events + def_bg_events bg_event 4, 6, BGEVENT_ITEM, MountMortarB1FHiddenMaxRevive - db 7 ; object events + def_object_events object_event 29, 12, SPRITE_POKE_BALL, SPRITEMOVEDATA_STILL, 0, 0, -1, -1, 0, OBJECTTYPE_ITEMBALL, 0, MountMortarB1FHyperPotion, EVENT_MOUNT_MORTAR_B1F_HYPER_POTION object_event 4, 16, SPRITE_POKE_BALL, SPRITEMOVEDATA_STILL, 0, 0, -1, -1, 0, OBJECTTYPE_ITEMBALL, 0, MountMortarB1FCarbos, EVENT_MOUNT_MORTAR_B1F_CARBOS object_event 9, 10, SPRITE_BOULDER, SPRITEMOVEDATA_STRENGTH_BOULDER, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, MountMortarB1FBoulder, -1 diff --git a/maps/MoveDeletersHouse.asm b/maps/MoveDeletersHouse.asm index 1e9f0849f..4786394f1 100644 --- a/maps/MoveDeletersHouse.asm +++ b/maps/MoveDeletersHouse.asm @@ -1,10 +1,10 @@ - object_const_def ; object_event constants + object_const_def const MOVEDELETERSHOUSE_SUPER_NERD MoveDeletersHouse_MapScripts: - db 0 ; scene scripts + def_scene_scripts - db 0 ; callbacks + def_callbacks MoveDeleter: faceplayer @@ -20,15 +20,15 @@ MoveDeletersHouseBookshelf: MoveDeletersHouse_MapEvents: db 0, 0 ; filler - db 2 ; warp events + def_warp_events warp_event 2, 7, BLACKTHORN_CITY, 6 warp_event 3, 7, BLACKTHORN_CITY, 6 - db 0 ; coord events + def_coord_events - db 2 ; bg events + def_bg_events bg_event 0, 1, BGEVENT_READ, MoveDeletersHouseBookshelf bg_event 1, 1, BGEVENT_READ, MoveDeletersHouseBookshelf - db 1 ; object events + def_object_events object_event 2, 3, SPRITE_SUPER_NERD, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, MoveDeleter, -1 diff --git a/maps/MrFujisHouse.asm b/maps/MrFujisHouse.asm index 40812e704..28f359115 100644 --- a/maps/MrFujisHouse.asm +++ b/maps/MrFujisHouse.asm @@ -1,4 +1,4 @@ - object_const_def ; object_event constants + object_const_def const MRFUJISHOUSE_SUPER_NERD const MRFUJISHOUSE_LASS const MRFUJISHOUSE_PSYDUCK @@ -6,9 +6,9 @@ const MRFUJISHOUSE_PIDGEY MrFujisHouse_MapScripts: - db 0 ; scene scripts + def_scene_scripts - db 0 ; callbacks + def_callbacks MrFujisHouseSuperNerdScript: jumptextfaceplayer MrFujisHouseSuperNerdText @@ -80,17 +80,17 @@ MrFujisPidgeyText: MrFujisHouse_MapEvents: db 0, 0 ; filler - db 2 ; warp events + def_warp_events warp_event 2, 7, LAVENDER_TOWN, 2 warp_event 3, 7, LAVENDER_TOWN, 2 - db 0 ; coord events + def_coord_events - db 2 ; bg events + def_bg_events bg_event 0, 1, BGEVENT_READ, MrFujisHouseBookshelf bg_event 1, 1, BGEVENT_READ, MrFujisHouseBookshelf - db 5 ; object events + def_object_events object_event 4, 1, SPRITE_SUPER_NERD, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_SCRIPT, 0, MrFujisHouseSuperNerdScript, -1 object_event 3, 4, SPRITE_LASS, SPRITEMOVEDATA_WANDER, 1, 1, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, MrFujisHouseLassScript, -1 object_event 7, 4, SPRITE_RHYDON, SPRITEMOVEDATA_POKEMON, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, MrFujisPsyduck, -1 diff --git a/maps/MrPokemonsHouse.asm b/maps/MrPokemonsHouse.asm index 3313a8238..7563f6895 100644 --- a/maps/MrPokemonsHouse.asm +++ b/maps/MrPokemonsHouse.asm @@ -1,13 +1,13 @@ - object_const_def ; object_event constants + object_const_def const MRPOKEMONSHOUSE_GENTLEMAN const MRPOKEMONSHOUSE_OAK MrPokemonsHouse_MapScripts: - db 2 ; scene scripts + def_scene_scripts scene_script .MeetMrPokemon ; SCENE_DEFAULT scene_script .DummyScene ; SCENE_FINISHED - db 0 ; callbacks + def_callbacks .MeetMrPokemon: prioritysjump .MrPokemonEvent @@ -373,19 +373,19 @@ MrPokemonsHouse_StrangeCoinsText: MrPokemonsHouse_MapEvents: db 0, 0 ; filler - db 2 ; warp events + def_warp_events warp_event 2, 7, ROUTE_30, 2 warp_event 3, 7, ROUTE_30, 2 - db 0 ; coord events + def_coord_events - db 5 ; bg events + def_bg_events bg_event 0, 1, BGEVENT_READ, MrPokemonsHouse_ForeignMagazines bg_event 1, 1, BGEVENT_READ, MrPokemonsHouse_ForeignMagazines bg_event 6, 1, BGEVENT_READ, MrPokemonsHouse_BrokenComputer bg_event 7, 1, BGEVENT_READ, MrPokemonsHouse_BrokenComputer bg_event 6, 4, BGEVENT_READ, MrPokemonsHouse_StrangeCoins - db 2 ; object events + def_object_events object_event 3, 5, SPRITE_GENTLEMAN, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, MrPokemonsHouse_MrPokemonScript, -1 object_event 6, 5, SPRITE_OAK, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, ObjectEvent, EVENT_MR_POKEMONS_HOUSE_OAK diff --git a/maps/MrPsychicsHouse.asm b/maps/MrPsychicsHouse.asm index 35218ee6f..dc33ffdb7 100644 --- a/maps/MrPsychicsHouse.asm +++ b/maps/MrPsychicsHouse.asm @@ -1,10 +1,10 @@ - object_const_def ; object_event constants + object_const_def const MRPSYCHICSHOUSE_FISHING_GURU MrPsychicsHouse_MapScripts: - db 0 ; scene scripts + def_scene_scripts - db 0 ; callbacks + def_callbacks MrPsychic: faceplayer @@ -48,15 +48,15 @@ MrPsychicText2: MrPsychicsHouse_MapEvents: db 0, 0 ; filler - db 2 ; warp events + def_warp_events warp_event 2, 7, SAFFRON_CITY, 5 warp_event 3, 7, SAFFRON_CITY, 5 - db 0 ; coord events + def_coord_events - db 2 ; bg events + def_bg_events bg_event 0, 1, BGEVENT_READ, MrPsychicsHouseBookshelf bg_event 1, 1, BGEVENT_READ, MrPsychicsHouseBookshelf - db 1 ; object events + def_object_events object_event 5, 3, SPRITE_FISHING_GURU, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_SCRIPT, 0, MrPsychic, -1 diff --git a/maps/NationalPark.asm b/maps/NationalPark.asm index 3b3342950..6da166f9e 100644 --- a/maps/NationalPark.asm +++ b/maps/NationalPark.asm @@ -1,4 +1,4 @@ - object_const_def ; object_event constants + object_const_def const NATIONALPARK_LASS1 const NATIONALPARK_POKEFAN_F1 const NATIONALPARK_TEACHER1 @@ -15,9 +15,9 @@ const NATIONALPARK_POKE_BALL2 NationalPark_MapScripts: - db 0 ; scene scripts + def_scene_scripts - db 0 ; callbacks + def_callbacks NationalParkLassScript: jumptextfaceplayer NationalParkLassText @@ -514,21 +514,21 @@ NationalParkTrainerTipsText: NationalPark_MapEvents: db 0, 0 ; filler - db 4 ; warp events + def_warp_events 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 + def_coord_events - db 4 ; bg events + def_bg_events bg_event 14, 44, BGEVENT_READ, NationalParkRelaxationSquareSign bg_event 27, 31, BGEVENT_READ, NationalParkBattleNoticeSign bg_event 6, 47, BGEVENT_ITEM, NationalParkHiddenFullHeal bg_event 12, 4, BGEVENT_READ, NationalParkTrainerTipsSign - db 14 ; object events + def_object_events object_event 15, 24, SPRITE_LASS, SPRITEMOVEDATA_WALK_LEFT_RIGHT, 1, 0, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_SCRIPT, 0, NationalParkLassScript, -1 object_event 14, 4, SPRITE_POKEFAN_F, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, NationalParkPokefanFScript, -1 object_event 27, 40, SPRITE_TEACHER, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_SCRIPT, 0, NationalParkTeacher1Script, -1 diff --git a/maps/NationalParkBugContest.asm b/maps/NationalParkBugContest.asm index 2a234d7cc..ba623ea77 100644 --- a/maps/NationalParkBugContest.asm +++ b/maps/NationalParkBugContest.asm @@ -1,4 +1,4 @@ - object_const_def ; object_event constants + object_const_def const NATIONALPARKBUGCONTEST_YOUNGSTER1 const NATIONALPARKBUGCONTEST_YOUNGSTER2 const NATIONALPARKBUGCONTEST_ROCKER @@ -13,9 +13,9 @@ const NATIONALPARKBUGCONTEST_POKE_BALL2 NationalParkBugContest_MapScripts: - db 0 ; scene scripts + def_scene_scripts - db 0 ; callbacks + def_callbacks BugCatchingContestant1AScript: faceplayer @@ -221,21 +221,21 @@ NationalParkBugContestTrainerTipsText: NationalParkBugContest_MapEvents: db 0, 0 ; filler - db 4 ; warp events + def_warp_events 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 + def_coord_events - db 4 ; bg events + def_bg_events bg_event 14, 44, BGEVENT_READ, NationalParkBugContestRelaxationSquareSign bg_event 27, 31, BGEVENT_READ, NationalParkBugContestBattleNoticeSign bg_event 6, 47, BGEVENT_ITEM, NationalParkBugContestHiddenFullHeal bg_event 12, 4, BGEVENT_READ, NationalParkBugContestTrainerTipsSign - db 12 ; object events + def_object_events object_event 19, 29, SPRITE_YOUNGSTER, SPRITEMOVEDATA_WANDER, 2, 2, -1, -1, PAL_NPC_RED, OBJECTTYPE_SCRIPT, 0, BugCatchingContestant1AScript, EVENT_BUG_CATCHING_CONTESTANT_1A object_event 28, 22, SPRITE_YOUNGSTER, SPRITEMOVEDATA_WANDER, 2, 2, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_SCRIPT, 0, BugCatchingContestant2AScript, EVENT_BUG_CATCHING_CONTESTANT_2A object_event 9, 18, SPRITE_ROCKER, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_SCRIPT, 0, BugCatchingContestant3AScript, EVENT_BUG_CATCHING_CONTESTANT_3A diff --git a/maps/NewBarkTown.asm b/maps/NewBarkTown.asm index c728fb9ae..ca233a96a 100644 --- a/maps/NewBarkTown.asm +++ b/maps/NewBarkTown.asm @@ -1,14 +1,14 @@ - object_const_def ; object_event constants + object_const_def const NEWBARKTOWN_TEACHER const NEWBARKTOWN_FISHER const NEWBARKTOWN_SILVER NewBarkTown_MapScripts: - db 2 ; scene scripts + def_scene_scripts scene_script .DummyScene0 ; SCENE_DEFAULT scene_script .DummyScene1 ; SCENE_FINISHED - db 1 ; callbacks + def_callbacks callback MAPCALLBACK_NEWMAP, .FlyPoint .DummyScene0: @@ -282,23 +282,23 @@ NewBarkTownElmsHouseSignText: NewBarkTown_MapEvents: db 0, 0 ; filler - db 4 ; warp events + def_warp_events 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 + def_coord_events coord_event 1, 8, SCENE_DEFAULT, NewBarkTown_TeacherStopsYouScene1 coord_event 1, 9, SCENE_DEFAULT, NewBarkTown_TeacherStopsYouScene2 - db 4 ; bg events + def_bg_events bg_event 8, 8, BGEVENT_READ, NewBarkTownSign bg_event 11, 5, BGEVENT_READ, NewBarkTownPlayersHouseSign bg_event 3, 3, BGEVENT_READ, NewBarkTownElmsLabSign bg_event 9, 13, BGEVENT_READ, NewBarkTownElmsHouseSign - db 3 ; object events + def_object_events object_event 6, 8, SPRITE_TEACHER, SPRITEMOVEDATA_SPINRANDOM_SLOW, 1, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, NewBarkTownTeacherScript, -1 object_event 12, 9, SPRITE_FISHER, SPRITEMOVEDATA_WALK_UP_DOWN, 0, 1, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_SCRIPT, 0, NewBarkTownFisherScript, -1 object_event 3, 2, SPRITE_SILVER, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, NewBarkTownSilverScript, EVENT_RIVAL_NEW_BARK_TOWN diff --git a/maps/OaksLab.asm b/maps/OaksLab.asm index a6a2539e6..06d2345f5 100644 --- a/maps/OaksLab.asm +++ b/maps/OaksLab.asm @@ -1,13 +1,13 @@ - object_const_def ; object_event constants + object_const_def const OAKSLAB_OAK const OAKSLAB_SCIENTIST1 const OAKSLAB_SCIENTIST2 const OAKSLAB_SCIENTIST3 OaksLab_MapScripts: - db 0 ; scene scripts + def_scene_scripts - db 0 ; callbacks + def_callbacks .DummyScene: end @@ -257,13 +257,13 @@ OaksLabPCText: OaksLab_MapEvents: db 0, 0 ; filler - db 2 ; warp events + def_warp_events warp_event 4, 11, PALLET_TOWN, 3 warp_event 5, 11, PALLET_TOWN, 3 - db 0 ; coord events + def_coord_events - db 16 ; bg events + def_bg_events bg_event 6, 1, BGEVENT_READ, OaksLabBookshelf bg_event 7, 1, BGEVENT_READ, OaksLabBookshelf bg_event 8, 1, BGEVENT_READ, OaksLabBookshelf @@ -281,7 +281,7 @@ OaksLab_MapEvents: bg_event 9, 3, BGEVENT_READ, OaksLabTrashcan bg_event 0, 1, BGEVENT_READ, OaksLabPC - db 4 ; object events + def_object_events object_event 4, 2, SPRITE_OAK, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, Oak, -1 object_event 1, 8, SPRITE_SCIENTIST, SPRITEMOVEDATA_WALK_LEFT_RIGHT, 1, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_SCRIPT, 0, OaksAssistant1Script, -1 object_event 8, 9, SPRITE_SCIENTIST, SPRITEMOVEDATA_WALK_UP_DOWN, 0, 1, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_SCRIPT, 0, OaksAssistant2Script, -1 diff --git a/maps/OlivineCafe.asm b/maps/OlivineCafe.asm index 3a2d34ae4..f58eee8b2 100644 --- a/maps/OlivineCafe.asm +++ b/maps/OlivineCafe.asm @@ -1,12 +1,12 @@ - object_const_def ; object_event constants + object_const_def const OLIVINECAFE_SAILOR1 const OLIVINECAFE_FISHING_GURU const OLIVINECAFE_SAILOR2 OlivineCafe_MapScripts: - db 0 ; scene scripts + def_scene_scripts - db 0 ; callbacks + def_callbacks OlivineCafeStrengthSailorScript: faceplayer @@ -79,15 +79,15 @@ OlivineCafeSailorText: OlivineCafe_MapEvents: db 0, 0 ; filler - db 2 ; warp events + def_warp_events warp_event 2, 7, OLIVINE_CITY, 7 warp_event 3, 7, OLIVINE_CITY, 7 - db 0 ; coord events + def_coord_events - db 0 ; bg events + def_bg_events - db 3 ; object events + def_object_events object_event 4, 3, SPRITE_SAILOR, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, OlivineCafeStrengthSailorScript, -1 object_event 7, 3, SPRITE_FISHING_GURU, SPRITEMOVEDATA_WALK_UP_DOWN, 0, 1, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, OlivineCafeFishingGuruScript, -1 object_event 6, 6, SPRITE_SAILOR, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, OlivineCafeSailorScript, -1 diff --git a/maps/OlivineCity.asm b/maps/OlivineCity.asm index 9a9ddefd9..b1809ab63 100644 --- a/maps/OlivineCity.asm +++ b/maps/OlivineCity.asm @@ -1,15 +1,15 @@ - object_const_def ; object_event constants + object_const_def const OLIVINECITY_SAILOR1 const OLIVINECITY_STANDING_YOUNGSTER const OLIVINECITY_SAILOR2 const OLIVINECITY_OLIVINE_RIVAL OlivineCity_MapScripts: - db 2 ; scene scripts + def_scene_scripts scene_script .DummyScene0 ; SCENE_DEFAULT scene_script .DummyScene1 ; SCENE_FINISHED - db 1 ; callbacks + def_callbacks callback MAPCALLBACK_NEWMAP, .FlyPoint .DummyScene0: @@ -289,7 +289,7 @@ OlivineCityBattleTowerSignText_NotYetOpen: OlivineCity_MapEvents: db 0, 0 ; filler - db 11 ; warp events + def_warp_events warp_event 13, 21, OLIVINE_POKECENTER_1F, 1 warp_event 10, 11, OLIVINE_GYM, 1 warp_event 25, 11, OLIVINE_TIMS_HOUSE, 1 @@ -302,11 +302,11 @@ OlivineCity_MapEvents: warp_event 19, 27, OLIVINE_PORT_PASSAGE, 1 warp_event 20, 27, OLIVINE_PORT_PASSAGE, 2 - db 2 ; coord events + def_coord_events coord_event 13, 12, SCENE_DEFAULT, OlivineCityRivalSceneTop coord_event 13, 13, SCENE_DEFAULT, OlivineCityRivalSceneBottom - db 7 ; bg events + def_bg_events bg_event 17, 11, BGEVENT_READ, OlivineCitySign bg_event 20, 24, BGEVENT_READ, OlivineCityPortSign bg_event 7, 11, BGEVENT_READ, OlivineGymSign @@ -315,7 +315,7 @@ OlivineCity_MapEvents: bg_event 14, 21, BGEVENT_READ, OlivineCityPokecenterSign bg_event 20, 17, BGEVENT_READ, OlivineCityMartSign - db 4 ; object events + def_object_events object_event 26, 27, SPRITE_SAILOR, SPRITEMOVEDATA_WALK_UP_DOWN, 0, 1, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, OlivineCitySailor1Script, -1 object_event 20, 13, SPRITE_STANDING_YOUNGSTER, SPRITEMOVEDATA_SPINRANDOM_SLOW, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_SCRIPT, 0, OlivineCityStandingYoungsterScript, -1 object_event 17, 21, SPRITE_SAILOR, SPRITEMOVEDATA_WANDER, 1, 1, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, OlivineCitySailor2Script, -1 diff --git a/maps/OlivineGoodRodHouse.asm b/maps/OlivineGoodRodHouse.asm index 511d3c6e4..8c1289921 100644 --- a/maps/OlivineGoodRodHouse.asm +++ b/maps/OlivineGoodRodHouse.asm @@ -1,10 +1,10 @@ - object_const_def ; object_event constants + object_const_def const OLIVINEGOODRODHOUSE_FISHING_GURU OlivineGoodRodHouse_MapScripts: - db 0 ; scene scripts + def_scene_scripts - db 0 ; callbacks + def_callbacks GoodRodGuru: faceplayer @@ -83,13 +83,13 @@ HaveGoodRodText: OlivineGoodRodHouse_MapEvents: db 0, 0 ; filler - db 2 ; warp events + def_warp_events warp_event 2, 7, OLIVINE_CITY, 6 warp_event 3, 7, OLIVINE_CITY, 6 - db 0 ; coord events + def_coord_events - db 0 ; bg events + def_bg_events - db 1 ; object events + def_object_events object_event 2, 3, SPRITE_FISHING_GURU, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_SCRIPT, 0, GoodRodGuru, -1 diff --git a/maps/OlivineGym.asm b/maps/OlivineGym.asm index db552a462..27bb61006 100644 --- a/maps/OlivineGym.asm +++ b/maps/OlivineGym.asm @@ -1,11 +1,11 @@ - object_const_def ; object_event constants + object_const_def const OLIVINEGYM_JASMINE const OLIVINEGYM_GYM_GUIDE OlivineGym_MapScripts: - db 0 ; scene scripts + def_scene_scripts - db 0 ; callbacks + def_callbacks OlivineGymJasmineScript: faceplayer @@ -198,16 +198,16 @@ OlivineGymGuidePreText: OlivineGym_MapEvents: db 0, 0 ; filler - db 2 ; warp events + def_warp_events warp_event 4, 15, OLIVINE_CITY, 2 warp_event 5, 15, OLIVINE_CITY, 2 - db 0 ; coord events + def_coord_events - db 2 ; bg events + def_bg_events bg_event 3, 13, BGEVENT_READ, OlivineGymStatue bg_event 6, 13, BGEVENT_READ, OlivineGymStatue - db 2 ; object events + def_object_events object_event 5, 3, SPRITE_JASMINE, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_SCRIPT, 0, OlivineGymJasmineScript, EVENT_OLIVINE_GYM_JASMINE object_event 7, 13, SPRITE_GYM_GUIDE, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_SCRIPT, 0, OlivineGymGuideScript, -1 diff --git a/maps/OlivineHouseBeta.asm b/maps/OlivineHouseBeta.asm index 3b197da3b..b0dae23a1 100644 --- a/maps/OlivineHouseBeta.asm +++ b/maps/OlivineHouseBeta.asm @@ -1,11 +1,11 @@ - object_const_def ; object_event constants + object_const_def const OLIVINEHOUSEBETA_TEACHER const OLIVINEHOUSEBETA_RHYDON OlivineHouseBeta_MapScripts: - db 0 ; scene scripts + def_scene_scripts - db 0 ; callbacks + def_callbacks OlivineHouseBetaTeacherScript: jumptextfaceplayer OlivineHouseBetaTeacherText @@ -40,16 +40,16 @@ OlivineHouseBetaRhydonText: OlivineHouseBeta_MapEvents: db 0, 0 ; filler - db 2 ; warp events + def_warp_events warp_event 2, 7, OLIVINE_CITY, 4 warp_event 3, 7, OLIVINE_CITY, 4 - db 0 ; coord events + def_coord_events - db 2 ; bg events + def_bg_events bg_event 0, 1, BGEVENT_READ, OlivineHouseBetaBookshelf1 bg_event 1, 1, BGEVENT_READ, OlivineHouseBetaBookshelf2 - db 2 ; object events + def_object_events object_event 2, 3, SPRITE_TEACHER, SPRITEMOVEDATA_SPINRANDOM_SLOW, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, OlivineHouseBetaTeacherScript, -1 object_event 6, 4, SPRITE_RHYDON, SPRITEMOVEDATA_WALK_UP_DOWN, 0, 2, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, OlivineHouseBetaRhydonScript, -1 diff --git a/maps/OlivineLighthouse1F.asm b/maps/OlivineLighthouse1F.asm index 6e1a2c728..d0fa12d1f 100644 --- a/maps/OlivineLighthouse1F.asm +++ b/maps/OlivineLighthouse1F.asm @@ -1,11 +1,11 @@ - object_const_def ; object_event constants + object_const_def const OLIVINELIGHTHOUSE1F_SAILOR const OLIVINELIGHTHOUSE1F_POKEFAN_F OlivineLighthouse1F_MapScripts: - db 0 ; scene scripts + def_scene_scripts - db 0 ; callbacks + def_callbacks OlivineLighthouse1FSailorScript: jumptextfaceplayer OlivineLighthouse1FSailorText @@ -37,17 +37,17 @@ OlivineLighthouse1FPokefanFText: OlivineLighthouse1F_MapEvents: db 0, 0 ; filler - db 5 ; warp events + def_warp_events 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 + def_coord_events - db 0 ; bg events + def_bg_events - db 2 ; object events + def_object_events object_event 8, 2, SPRITE_SAILOR, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, OlivineLighthouse1FSailorScript, -1 object_event 16, 9, SPRITE_POKEFAN_F, SPRITEMOVEDATA_WALK_UP_DOWN, 0, 2, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, OlivineLighthouse1FPokefanFScript, -1 diff --git a/maps/OlivineLighthouse2F.asm b/maps/OlivineLighthouse2F.asm index 7ca44d323..0529cb493 100644 --- a/maps/OlivineLighthouse2F.asm +++ b/maps/OlivineLighthouse2F.asm @@ -1,11 +1,11 @@ - object_const_def ; object_event constants + object_const_def const OLIVINELIGHTHOUSE2F_SAILOR const OLIVINELIGHTHOUSE2F_GENTLEMAN OlivineLighthouse2F_MapScripts: - db 0 ; scene scripts + def_scene_scripts - db 0 ; callbacks + def_callbacks TrainerGentlemanAlfred: trainer GENTLEMAN, ALFRED, EVENT_BEAT_GENTLEMAN_ALFRED, GentlemanAlfredSeenText, GentlemanAlfredBeatenText, 0, .Script @@ -205,7 +205,7 @@ SailorHueyGiveProteinText: OlivineLighthouse2F_MapEvents: db 0, 0 ; filler - db 6 ; warp events + def_warp_events warp_event 3, 11, OLIVINE_LIGHTHOUSE_1F, 3 warp_event 5, 3, OLIVINE_LIGHTHOUSE_3F, 2 warp_event 16, 13, OLIVINE_LIGHTHOUSE_1F, 4 @@ -213,10 +213,10 @@ OlivineLighthouse2F_MapEvents: warp_event 16, 11, OLIVINE_LIGHTHOUSE_3F, 4 warp_event 17, 11, OLIVINE_LIGHTHOUSE_3F, 5 - db 0 ; coord events + def_coord_events - db 0 ; bg events + def_bg_events - db 2 ; object events + def_object_events object_event 9, 3, SPRITE_SAILOR, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_TRAINER, 3, TrainerSailorHuey, -1 object_event 17, 8, SPRITE_GENTLEMAN, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_TRAINER, 3, TrainerGentlemanAlfred, -1 diff --git a/maps/OlivineLighthouse3F.asm b/maps/OlivineLighthouse3F.asm index 3d71124f2..f905c97df 100644 --- a/maps/OlivineLighthouse3F.asm +++ b/maps/OlivineLighthouse3F.asm @@ -1,13 +1,13 @@ - object_const_def ; object_event constants + object_const_def const OLIVINELIGHTHOUSE3F_SAILOR const OLIVINELIGHTHOUSE3F_GENTLEMAN const OLIVINELIGHTHOUSE3F_YOUNGSTER const OLIVINELIGHTHOUSE3F_POKE_BALL OlivineLighthouse3F_MapScripts: - db 0 ; scene scripts + def_scene_scripts - db 0 ; callbacks + def_callbacks TrainerBirdKeeperTheo: trainer BIRD_KEEPER, THEO, EVENT_BEAT_BIRD_KEEPER_THEO, BirdKeeperTheoSeenText, BirdKeeperTheoBeatenText, 0, .Script @@ -113,7 +113,7 @@ GentlemanPrestonAfterBattleText: OlivineLighthouse3F_MapEvents: db 0, 0 ; filler - db 9 ; warp events + def_warp_events warp_event 13, 3, OLIVINE_LIGHTHOUSE_4F, 1 warp_event 5, 3, OLIVINE_LIGHTHOUSE_2F, 2 warp_event 9, 5, OLIVINE_LIGHTHOUSE_4F, 4 @@ -124,11 +124,11 @@ OlivineLighthouse3F_MapEvents: warp_event 8, 3, OLIVINE_LIGHTHOUSE_4F, 7 warp_event 9, 3, OLIVINE_LIGHTHOUSE_4F, 8 - db 0 ; coord events + def_coord_events - db 0 ; bg events + def_bg_events - db 4 ; object events + def_object_events object_event 9, 2, SPRITE_SAILOR, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_TRAINER, 1, TrainerSailorTerrell, -1 object_event 13, 5, SPRITE_GENTLEMAN, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_TRAINER, 4, TrainerGentlemanPreston, -1 object_event 3, 9, SPRITE_YOUNGSTER, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_TRAINER, 3, TrainerBirdKeeperTheo, -1 diff --git a/maps/OlivineLighthouse4F.asm b/maps/OlivineLighthouse4F.asm index 6d74f53f6..69a48aaca 100644 --- a/maps/OlivineLighthouse4F.asm +++ b/maps/OlivineLighthouse4F.asm @@ -1,11 +1,11 @@ - object_const_def ; object_event constants + object_const_def const OLIVINELIGHTHOUSE4F_SAILOR const OLIVINELIGHTHOUSE4F_LASS OlivineLighthouse4F_MapScripts: - db 0 ; scene scripts + def_scene_scripts - db 0 ; callbacks + def_callbacks TrainerLassConnie: trainer LASS, CONNIE1, EVENT_BEAT_LASS_CONNIE, LassConnie1SeenText, LassConnie1BeatenText, 0, .Script @@ -82,7 +82,7 @@ LassConnie1AfterBattleText: OlivineLighthouse4F_MapEvents: db 0, 0 ; filler - db 10 ; warp events + def_warp_events warp_event 13, 3, OLIVINE_LIGHTHOUSE_3F, 1 warp_event 3, 5, OLIVINE_LIGHTHOUSE_5F, 2 warp_event 9, 7, OLIVINE_LIGHTHOUSE_5F, 3 @@ -94,10 +94,10 @@ OlivineLighthouse4F_MapEvents: warp_event 16, 7, OLIVINE_LIGHTHOUSE_5F, 4 warp_event 17, 7, OLIVINE_LIGHTHOUSE_5F, 5 - db 0 ; coord events + def_coord_events - db 0 ; bg events + def_bg_events - db 2 ; object events + def_object_events object_event 7, 14, SPRITE_SAILOR, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_TRAINER, 3, TrainerSailorKent, -1 object_event 11, 2, SPRITE_LASS, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_TRAINER, 1, TrainerLassConnie, -1 diff --git a/maps/OlivineLighthouse5F.asm b/maps/OlivineLighthouse5F.asm index 7a3cfdf86..5f01ebdab 100644 --- a/maps/OlivineLighthouse5F.asm +++ b/maps/OlivineLighthouse5F.asm @@ -1,4 +1,4 @@ - object_const_def ; object_event constants + object_const_def const OLIVINELIGHTHOUSE5F_SAILOR const OLIVINELIGHTHOUSE5F_YOUNGSTER const OLIVINELIGHTHOUSE5F_POKE_BALL1 @@ -6,9 +6,9 @@ const OLIVINELIGHTHOUSE5F_POKE_BALL3 OlivineLighthouse5F_MapScripts: - db 0 ; scene scripts + def_scene_scripts - db 0 ; callbacks + def_callbacks TrainerBirdKeeperDenis: trainer BIRD_KEEPER, DENIS, EVENT_BEAT_BIRD_KEEPER_DENIS, BirdKeeperDenisSeenText, BirdKeeperDenisBeatenText, 0, .Script @@ -91,7 +91,7 @@ BirdKeeperDenisAfterBattleText: OlivineLighthouse5F_MapEvents: db 0, 0 ; filler - db 7 ; warp events + def_warp_events warp_event 9, 15, OLIVINE_LIGHTHOUSE_6F, 1 warp_event 3, 5, OLIVINE_LIGHTHOUSE_4F, 2 warp_event 9, 7, OLIVINE_LIGHTHOUSE_4F, 3 @@ -100,12 +100,12 @@ OlivineLighthouse5F_MapEvents: warp_event 16, 5, OLIVINE_LIGHTHOUSE_6F, 2 warp_event 17, 5, OLIVINE_LIGHTHOUSE_6F, 3 - db 0 ; coord events + def_coord_events - db 1 ; bg events + def_bg_events bg_event 3, 13, BGEVENT_ITEM, OlivineLighthouse5FHiddenHyperPotion - db 5 ; object events + def_object_events object_event 8, 11, SPRITE_SAILOR, SPRITEMOVEDATA_SPINRANDOM_FAST, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_TRAINER, 3, TrainerSailorErnest, -1 object_event 8, 3, SPRITE_YOUNGSTER, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_TRAINER, 4, TrainerBirdKeeperDenis, -1 object_event 15, 12, SPRITE_POKE_BALL, SPRITEMOVEDATA_STILL, 0, 0, -1, -1, 0, OBJECTTYPE_ITEMBALL, 0, OlivineLighthouse5FRareCandy, EVENT_OLIVINE_LIGHTHOUSE_5F_RARE_CANDY diff --git a/maps/OlivineLighthouse6F.asm b/maps/OlivineLighthouse6F.asm index 94792f8bf..62b7b3d2c 100644 --- a/maps/OlivineLighthouse6F.asm +++ b/maps/OlivineLighthouse6F.asm @@ -1,12 +1,12 @@ - object_const_def ; object_event constants + object_const_def const OLIVINELIGHTHOUSE6F_JASMINE const OLIVINELIGHTHOUSE6F_MONSTER const OLIVINELIGHTHOUSE6F_POKE_BALL OlivineLighthouse6F_MapScripts: - db 0 ; scene scripts + def_scene_scripts - db 0 ; callbacks + def_callbacks OlivineLighthouseJasmine: faceplayer @@ -259,16 +259,16 @@ AmphyPaluPaluluText: OlivineLighthouse6F_MapEvents: db 0, 0 ; filler - db 3 ; warp events + def_warp_events 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 + def_coord_events - db 0 ; bg events + def_bg_events - db 3 ; object events + def_object_events object_event 8, 8, SPRITE_JASMINE, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_SCRIPT, 0, OlivineLighthouseJasmine, EVENT_OLIVINE_LIGHTHOUSE_JASMINE object_event 9, 8, SPRITE_MONSTER, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_BROWN, OBJECTTYPE_SCRIPT, 0, OlivineLighthouseAmphy, -1 object_event 3, 4, SPRITE_POKE_BALL, SPRITEMOVEDATA_STILL, 0, 0, -1, -1, 0, OBJECTTYPE_ITEMBALL, 0, OlivineLighthouse6FSuperPotion, EVENT_OLIVINE_LIGHTHOUSE_6F_SUPER_POTION diff --git a/maps/OlivineMart.asm b/maps/OlivineMart.asm index 3f331f77a..094db19e6 100644 --- a/maps/OlivineMart.asm +++ b/maps/OlivineMart.asm @@ -1,12 +1,12 @@ - object_const_def ; object_event constants + object_const_def const OLIVINEMART_CLERK const OLIVINEMART_COOLTRAINER_F const OLIVINEMART_LASS OlivineMart_MapScripts: - db 0 ; scene scripts + def_scene_scripts - db 0 ; callbacks + def_callbacks OlivineMartClerkScript: opentext @@ -46,15 +46,15 @@ OlivineMartLassText: OlivineMart_MapEvents: db 0, 0 ; filler - db 2 ; warp events + def_warp_events warp_event 2, 7, OLIVINE_CITY, 8 warp_event 3, 7, OLIVINE_CITY, 8 - db 0 ; coord events + def_coord_events - db 0 ; bg events + def_bg_events - db 3 ; object events + def_object_events object_event 1, 3, SPRITE_CLERK, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, OlivineMartClerkScript, -1 object_event 6, 2, SPRITE_COOLTRAINER_F, SPRITEMOVEDATA_WALK_LEFT_RIGHT, 2, 0, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_SCRIPT, 0, OlivineMartCooltrainerFScript, -1 object_event 1, 6, SPRITE_LASS, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, OlivineMartLassScript, -1 diff --git a/maps/OlivinePokecenter1F.asm b/maps/OlivinePokecenter1F.asm index cfcc153f2..995fc69b1 100644 --- a/maps/OlivinePokecenter1F.asm +++ b/maps/OlivinePokecenter1F.asm @@ -1,13 +1,13 @@ - object_const_def ; object_event constants + object_const_def const OLIVINEPOKECENTER1F_NURSE const OLIVINEPOKECENTER1F_FISHING_GURU const OLIVINEPOKECENTER1F_FISHER const OLIVINEPOKECENTER1F_TEACHER OlivinePokecenter1F_MapScripts: - db 0 ; scene scripts + def_scene_scripts - db 0 ; callbacks + def_callbacks OlivinePokecenter1FNurseScript: jumpstd PokecenterNurseScript @@ -48,16 +48,16 @@ OlivinePokecenter1FTeacherText: OlivinePokecenter1F_MapEvents: db 0, 0 ; filler - db 3 ; warp events + def_warp_events 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 + def_coord_events - db 0 ; bg events + def_bg_events - db 4 ; object events + def_object_events object_event 3, 1, SPRITE_NURSE, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, OlivinePokecenter1FNurseScript, -1 object_event 8, 4, SPRITE_FISHING_GURU, SPRITEMOVEDATA_WALK_LEFT_RIGHT, 1, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, OlivinePokecenter1FFishingGuruScript, -1 object_event 2, 3, SPRITE_FISHER, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_SCRIPT, 0, OlivinePokecenter1FFisherScript, -1 diff --git a/maps/OlivinePort.asm b/maps/OlivinePort.asm index 3847566d4..a87f08ba2 100644 --- a/maps/OlivinePort.asm +++ b/maps/OlivinePort.asm @@ -1,4 +1,4 @@ - object_const_def ; object_event constants + object_const_def const OLIVINEPORT_SAILOR1 const OLIVINEPORT_SAILOR2 const OLIVINEPORT_SAILOR3 @@ -8,11 +8,11 @@ const OLIVINEPORT_COOLTRAINER_F OlivinePort_MapScripts: - db 2 ; scene scripts + def_scene_scripts scene_script .DummyScene0 ; SCENE_DEFAULT scene_script .LeaveFastShip ; SCENE_OLIVINEPORT_LEAVE_SHIP - db 0 ; callbacks + def_callbacks .DummyScene0: end @@ -385,17 +385,17 @@ OlivinePortSailorBeforeHOFText: OlivinePort_MapEvents: db 0, 0 ; filler - db 2 ; warp events + def_warp_events warp_event 11, 7, OLIVINE_PORT_PASSAGE, 5 warp_event 7, 23, FAST_SHIP_1F, 1 - db 1 ; coord events + def_coord_events coord_event 7, 15, SCENE_DEFAULT, OlivinePortWalkUpToShipScript - db 1 ; bg events + def_bg_events bg_event 1, 22, BGEVENT_ITEM, OlivinePortHiddenProtein - db 7 ; object events + def_object_events object_event 7, 23, SPRITE_SAILOR, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, OlivinePortSailorAtGangwayScript, EVENT_OLIVINE_PORT_SAILOR_AT_GANGWAY object_event 7, 15, SPRITE_SAILOR, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, OlivinePortSailorBeforeHOFScript, EVENT_OLIVINE_PORT_SPRITES_BEFORE_HALL_OF_FAME object_event 6, 15, SPRITE_SAILOR, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, OlivinePortSailorAfterHOFScript, EVENT_OLIVINE_PORT_SPRITES_AFTER_HALL_OF_FAME diff --git a/maps/OlivinePortPassage.asm b/maps/OlivinePortPassage.asm index a92b5d459..2b1cf0a41 100644 --- a/maps/OlivinePortPassage.asm +++ b/maps/OlivinePortPassage.asm @@ -1,10 +1,10 @@ - object_const_def ; object_event constants + object_const_def const OLIVINEPORTPASSAGE_POKEFAN_M OlivinePortPassage_MapScripts: - db 0 ; scene scripts + def_scene_scripts - db 0 ; callbacks + def_callbacks OlivinePortPassagePokefanMScript: jumptextfaceplayer OlivinePortPassagePokefanMText @@ -20,16 +20,16 @@ OlivinePortPassagePokefanMText: OlivinePortPassage_MapEvents: db 0, 0 ; filler - db 5 ; warp events + def_warp_events 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 + def_coord_events - db 0 ; bg events + def_bg_events - db 1 ; object events + def_object_events object_event 17, 1, SPRITE_POKEFAN_M, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, OlivinePortPassagePokefanMScript, EVENT_OLIVINE_PORT_PASSAGE_POKEFAN_M diff --git a/maps/OlivinePunishmentSpeechHouse.asm b/maps/OlivinePunishmentSpeechHouse.asm index ae80898f0..ce96ac54e 100644 --- a/maps/OlivinePunishmentSpeechHouse.asm +++ b/maps/OlivinePunishmentSpeechHouse.asm @@ -1,11 +1,11 @@ - object_const_def ; object_event constants + object_const_def const OLIVINEPUNISHMENTSPEECHHOUSE_POKEFAN_M const OLIVINEPUNISHMENTSPEECHHOUSE_LASS OlivinePunishmentSpeechHouse_MapScripts: - db 0 ; scene scripts + def_scene_scripts - db 0 ; callbacks + def_callbacks OlivinePunishmentSpeechHouseDad: jumptextfaceplayer OlivinePunishmentSpeechHouseDadText @@ -40,16 +40,16 @@ OlivinePunishmentSpeechHouseDaughterText: OlivinePunishmentSpeechHouse_MapEvents: db 0, 0 ; filler - db 2 ; warp events + def_warp_events warp_event 2, 7, OLIVINE_CITY, 5 warp_event 3, 7, OLIVINE_CITY, 5 - db 0 ; coord events + def_coord_events - db 2 ; bg events + def_bg_events bg_event 0, 1, BGEVENT_READ, OlivinePunishmentSpeechHouseBookshelf1 bg_event 1, 1, BGEVENT_READ, OlivinePunishmentSpeechHouseBookshelf2 - db 2 ; object events + def_object_events object_event 1, 2, SPRITE_POKEFAN_M, SPRITEMOVEDATA_SPINRANDOM_SLOW, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, OlivinePunishmentSpeechHouseDad, -1 object_event 5, 5, SPRITE_LASS, SPRITEMOVEDATA_WALK_LEFT_RIGHT, 2, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, OlivinePunishmentSpeechHouseDaughter, -1 diff --git a/maps/OlivineTimsHouse.asm b/maps/OlivineTimsHouse.asm index 9e9c0edaf..082ae5248 100644 --- a/maps/OlivineTimsHouse.asm +++ b/maps/OlivineTimsHouse.asm @@ -1,10 +1,10 @@ - object_const_def ; object_event constants + object_const_def const OLIVINETIMSHOUSE_TIM OlivineTimsHouse_MapScripts: - db 0 ; scene scripts + def_scene_scripts - db 0 ; callbacks + def_callbacks Tim: faceplayer @@ -20,15 +20,15 @@ TimsHouseBookshelf: OlivineTimsHouse_MapEvents: db 0, 0 ; filler - db 2 ; warp events + def_warp_events warp_event 2, 7, OLIVINE_CITY, 3 warp_event 3, 7, OLIVINE_CITY, 3 - db 0 ; coord events + def_coord_events - db 2 ; bg events + def_bg_events bg_event 0, 1, BGEVENT_READ, TimsHouseBookshelf bg_event 1, 1, BGEVENT_READ, TimsHouseBookshelf - db 1 ; object events + def_object_events object_event 2, 3, SPRITE_FISHING_GURU, SPRITEMOVEDATA_SPINRANDOM_SLOW, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_SCRIPT, 0, Tim, -1 diff --git a/maps/PalletTown.asm b/maps/PalletTown.asm index edf67d2a5..9f075b977 100644 --- a/maps/PalletTown.asm +++ b/maps/PalletTown.asm @@ -1,11 +1,11 @@ - object_const_def ; object_event constants + object_const_def const PALLETTOWN_TEACHER const PALLETTOWN_FISHER PalletTown_MapScripts: - db 0 ; scene scripts + def_scene_scripts - db 1 ; callbacks + def_callbacks callback MAPCALLBACK_NEWMAP, .FlyPoint .FlyPoint: @@ -70,19 +70,19 @@ BluesHouseSignText: PalletTown_MapEvents: db 0, 0 ; filler - db 3 ; warp events + def_warp_events 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 + def_coord_events - db 4 ; bg events + def_bg_events bg_event 7, 9, BGEVENT_READ, PalletTownSign bg_event 3, 5, BGEVENT_READ, RedsHouseSign bg_event 13, 13, BGEVENT_READ, OaksLabSign bg_event 11, 5, BGEVENT_READ, BluesHouseSign - db 2 ; object events + def_object_events object_event 3, 8, SPRITE_TEACHER, SPRITEMOVEDATA_WANDER, 2, 2, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, PalletTownTeacherScript, -1 object_event 12, 14, SPRITE_FISHER, SPRITEMOVEDATA_WALK_LEFT_RIGHT, 2, 0, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_SCRIPT, 0, PalletTownFisherScript, -1 diff --git a/maps/PewterCity.asm b/maps/PewterCity.asm index fed0ef4b9..cf194fb2e 100644 --- a/maps/PewterCity.asm +++ b/maps/PewterCity.asm @@ -1,4 +1,4 @@ - object_const_def ; object_event constants + object_const_def const PEWTERCITY_COOLTRAINER_F const PEWTERCITY_BUG_CATCHER const PEWTERCITY_GRAMPS @@ -6,9 +6,9 @@ const PEWTERCITY_FRUIT_TREE2 PewterCity_MapScripts: - db 0 ; scene scripts + def_scene_scripts - db 1 ; callbacks + def_callbacks callback MAPCALLBACK_NEWMAP, .FlyPoint .FlyPoint: @@ -153,16 +153,16 @@ PewterCityWelcomeSignText: PewterCity_MapEvents: db 0, 0 ; filler - db 5 ; warp events + def_warp_events 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 + def_coord_events - db 7 ; bg events + def_bg_events bg_event 25, 23, BGEVENT_READ, PewterCitySign bg_event 11, 17, BGEVENT_READ, PewterGymSign bg_event 15, 9, BGEVENT_READ, PewterMuseumSign @@ -171,7 +171,7 @@ PewterCity_MapEvents: bg_event 14, 25, BGEVENT_READ, PewterCityPokecenterSign bg_event 24, 17, BGEVENT_READ, PewterCityMartSign - db 5 ; object events + def_object_events object_event 19, 11, SPRITE_COOLTRAINER_F, SPRITEMOVEDATA_WANDER, 2, 2, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_SCRIPT, 0, PewterCityCooltrainerFScript, -1 object_event 14, 29, SPRITE_BUG_CATCHER, SPRITEMOVEDATA_WANDER, 2, 2, -1, -1, PAL_NPC_RED, OBJECTTYPE_SCRIPT, 0, PewterCityBugCatcherScript, -1 object_event 29, 17, SPRITE_GRAMPS, SPRITEMOVEDATA_WALK_LEFT_RIGHT, 2, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_SCRIPT, 0, PewterCityGrampsScript, -1 diff --git a/maps/PewterGym.asm b/maps/PewterGym.asm index d7f705dd5..40b8b34ff 100644 --- a/maps/PewterGym.asm +++ b/maps/PewterGym.asm @@ -1,12 +1,12 @@ - object_const_def ; object_event constants + object_const_def const PEWTERGYM_BROCK const PEWTERGYM_YOUNGSTER const PEWTERGYM_GYM_GUIDE PewterGym_MapScripts: - db 0 ; scene scripts + def_scene_scripts - db 0 ; callbacks + def_callbacks PewterGymBrockScript: faceplayer @@ -209,17 +209,17 @@ PewterGymGuideWinText: PewterGym_MapEvents: db 0, 0 ; filler - db 2 ; warp events + def_warp_events warp_event 4, 13, PEWTER_CITY, 2 warp_event 5, 13, PEWTER_CITY, 2 - db 0 ; coord events + def_coord_events - db 2 ; bg events + def_bg_events bg_event 2, 11, BGEVENT_READ, PewterGymStatue bg_event 7, 11, BGEVENT_READ, PewterGymStatue - db 3 ; object events + def_object_events object_event 5, 1, SPRITE_BROCK, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_BROWN, OBJECTTYPE_SCRIPT, 0, PewterGymBrockScript, -1 object_event 2, 5, SPRITE_YOUNGSTER, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_TRAINER, 3, TrainerCamperJerry, -1 object_event 6, 11, SPRITE_GYM_GUIDE, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_SCRIPT, 1, PewterGymGuideScript, -1 diff --git a/maps/PewterMart.asm b/maps/PewterMart.asm index 26fe796e1..448227418 100644 --- a/maps/PewterMart.asm +++ b/maps/PewterMart.asm @@ -1,12 +1,12 @@ - object_const_def ; object_event constants + object_const_def const PEWTERMART_CLERK const PEWTERMART_YOUNGSTER const PEWTERMART_SUPER_NERD PewterMart_MapScripts: - db 0 ; scene scripts + def_scene_scripts - db 0 ; callbacks + def_callbacks PewterMartClerkScript: opentext @@ -46,15 +46,15 @@ PewterMartSuperNerdText: PewterMart_MapEvents: db 0, 0 ; filler - db 2 ; warp events + def_warp_events warp_event 2, 7, PEWTER_CITY, 3 warp_event 3, 7, PEWTER_CITY, 3 - db 0 ; coord events + def_coord_events - db 0 ; bg events + def_bg_events - db 3 ; object events + def_object_events object_event 1, 3, SPRITE_CLERK, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, PewterMartClerkScript, -1 object_event 9, 2, SPRITE_YOUNGSTER, SPRITEMOVEDATA_WALK_LEFT_RIGHT, 2, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, PewterMartYoungsterScript, -1 object_event 6, 6, SPRITE_SUPER_NERD, SPRITEMOVEDATA_SPINRANDOM_SLOW, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_SCRIPT, 0, PewterMartSuperNerdScript, -1 diff --git a/maps/PewterNidoranSpeechHouse.asm b/maps/PewterNidoranSpeechHouse.asm index b9376def4..e8793eed2 100644 --- a/maps/PewterNidoranSpeechHouse.asm +++ b/maps/PewterNidoranSpeechHouse.asm @@ -1,11 +1,11 @@ - object_const_def ; object_event constants + object_const_def const PEWTERNIDORANSPEECHHOUSE_SUPER_NERD const PEWTERNIDORANSPEECHHOUSE_NIDORAN_M PewterNidoranSpeechHouse_MapScripts: - db 0 ; scene scripts + def_scene_scripts - db 0 ; callbacks + def_callbacks PewterNidoranSpeechHouseSuperNerdScript: jumptextfaceplayer PewterNidoranSpeechHouseSuperNerdText @@ -29,14 +29,14 @@ PewterNidoranText: PewterNidoranSpeechHouse_MapEvents: db 0, 0 ; filler - db 2 ; warp events + def_warp_events warp_event 2, 7, PEWTER_CITY, 1 warp_event 3, 7, PEWTER_CITY, 1 - db 0 ; coord events + def_coord_events - db 0 ; bg events + def_bg_events - db 2 ; object events + def_object_events object_event 3, 5, SPRITE_SUPER_NERD, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_SCRIPT, 0, PewterNidoranSpeechHouseSuperNerdScript, -1 object_event 4, 5, SPRITE_GROWLITHE, SPRITEMOVEDATA_POKEMON, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_SCRIPT, 0, PewterNidoran, -1 diff --git a/maps/PewterPokecenter1F.asm b/maps/PewterPokecenter1F.asm index 06ae5b0de..236e41dce 100644 --- a/maps/PewterPokecenter1F.asm +++ b/maps/PewterPokecenter1F.asm @@ -1,4 +1,4 @@ - object_const_def ; object_event constants + object_const_def const PEWTERPOKECENTER1F_NURSE const PEWTERPOKECENTER1F_TEACHER const PEWTERPOKECENTER1F_JIGGLYPUFF @@ -6,9 +6,9 @@ const PEWTERPOKECENTER1F_CHRIS PewterPokecenter1F_MapScripts: - db 0 ; scene scripts + def_scene_scripts - db 0 ; callbacks + def_callbacks PewterPokecenter1FNurseScript: jumpstd PokecenterNurseScript @@ -68,16 +68,16 @@ PewterPokecenter1FBugCatcherText: PewterPokecenter1F_MapEvents: db 0, 0 ; filler - db 3 ; warp events + def_warp_events 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 + def_coord_events - db 0 ; bg events + def_bg_events - db 5 ; object events + def_object_events object_event 3, 1, SPRITE_NURSE, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, PewterPokecenter1FNurseScript, -1 object_event 8, 6, SPRITE_TEACHER, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_SCRIPT, 0, PewterPokecenter1FTeacherScript, -1 object_event 1, 3, SPRITE_JIGGLYPUFF, SPRITEMOVEDATA_POKEMON, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, PewterJigglypuff, -1 diff --git a/maps/PewterPokecenter2FBeta.asm b/maps/PewterPokecenter2FBeta.asm index 6e5e6c14a..0bf6d608a 100644 --- a/maps/PewterPokecenter2FBeta.asm +++ b/maps/PewterPokecenter2FBeta.asm @@ -1,16 +1,16 @@ PewterPokecenter2FBeta_MapScripts: - db 0 ; scene scripts + def_scene_scripts - db 0 ; callbacks + def_callbacks PewterPokecenter2FBeta_MapEvents: db 0, 0 ; filler - db 1 ; warp events + def_warp_events warp_event 0, 7, PEWTER_POKECENTER_1F, 3 - db 0 ; coord events + def_coord_events - db 0 ; bg events + def_bg_events - db 0 ; object events + def_object_events diff --git a/maps/PewterSnoozeSpeechHouse.asm b/maps/PewterSnoozeSpeechHouse.asm index 6ac84910e..e32ca7292 100644 --- a/maps/PewterSnoozeSpeechHouse.asm +++ b/maps/PewterSnoozeSpeechHouse.asm @@ -1,10 +1,10 @@ - object_const_def ; object_event constants + object_const_def const PEWTERSNOOZESPEECHHOUSE_GRAMPS PewterSnoozeSpeechHouse_MapScripts: - db 0 ; scene scripts + def_scene_scripts - db 0 ; callbacks + def_callbacks PewterSnoozeSpeechHouseGrampsScript: jumptextfaceplayer PewterSnoozeSpeechHouseGrampsText @@ -21,15 +21,15 @@ PewterSnoozeSpeechHouseGrampsText: PewterSnoozeSpeechHouse_MapEvents: db 0, 0 ; filler - db 2 ; warp events + def_warp_events warp_event 2, 7, PEWTER_CITY, 5 warp_event 3, 7, PEWTER_CITY, 5 - db 0 ; coord events + def_coord_events - db 2 ; bg events + def_bg_events bg_event 0, 1, BGEVENT_READ, PewterSnoozeSpeechHouseBookshelf bg_event 1, 1, BGEVENT_READ, PewterSnoozeSpeechHouseBookshelf - db 1 ; object events + def_object_events object_event 5, 3, SPRITE_GRAMPS, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_SCRIPT, 0, PewterSnoozeSpeechHouseGrampsScript, -1 diff --git a/maps/PlayersHouse1F.asm b/maps/PlayersHouse1F.asm index 1e8f5e1c9..707a4c552 100644 --- a/maps/PlayersHouse1F.asm +++ b/maps/PlayersHouse1F.asm @@ -1,4 +1,4 @@ - object_const_def ; object_event constants + object_const_def const PLAYERSHOUSE1F_MOM1 const PLAYERSHOUSE1F_MOM2 const PLAYERSHOUSE1F_MOM3 @@ -6,11 +6,11 @@ const PLAYERSHOUSE1F_POKEFAN_F PlayersHouse1F_MapScripts: - db 2 ; scene scripts + def_scene_scripts scene_script .DummyScene0 ; SCENE_DEFAULT scene_script .DummyScene1 ; SCENE_FINISHED - db 0 ; callbacks + def_callbacks .DummyScene0: end @@ -386,22 +386,22 @@ PlayersHouse1FTVText: PlayersHouse1F_MapEvents: db 0, 0 ; filler - db 3 ; warp events + def_warp_events 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 + def_coord_events coord_event 8, 4, SCENE_DEFAULT, MeetMomLeftScript coord_event 9, 4, SCENE_DEFAULT, MeetMomRightScript - db 4 ; bg events + def_bg_events bg_event 0, 1, BGEVENT_READ, PlayersHouse1FStoveScript bg_event 1, 1, BGEVENT_READ, PlayersHouse1FSinkScript bg_event 2, 1, BGEVENT_READ, PlayersHouse1FFridgeScript bg_event 4, 1, BGEVENT_READ, PlayersHouse1FTVScript - db 5 ; object events + def_object_events object_event 7, 4, SPRITE_MOM, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, MomScript, EVENT_PLAYERS_HOUSE_MOM_1 object_event 2, 2, SPRITE_MOM, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, MORN, 0, OBJECTTYPE_SCRIPT, 0, MomScript, EVENT_PLAYERS_HOUSE_MOM_2 object_event 7, 4, SPRITE_MOM, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, DAY, 0, OBJECTTYPE_SCRIPT, 0, MomScript, EVENT_PLAYERS_HOUSE_MOM_2 diff --git a/maps/PlayersHouse2F.asm b/maps/PlayersHouse2F.asm index 4791d9c43..6d87dcdd0 100644 --- a/maps/PlayersHouse2F.asm +++ b/maps/PlayersHouse2F.asm @@ -1,13 +1,13 @@ - object_const_def ; object_event constants + object_const_def const PLAYERSHOUSE2F_CONSOLE const PLAYERSHOUSE2F_DOLL_1 const PLAYERSHOUSE2F_DOLL_2 const PLAYERSHOUSE2F_BIG_DOLL PlayersHouse2F_MapScripts: - db 0 ; scene scripts + def_scene_scripts - db 2 ; callbacks + def_callbacks callback MAPCALLBACK_NEWMAP, .InitializeRoom callback MAPCALLBACK_TILES, .SetUpTileDecorations @@ -116,18 +116,18 @@ PlayersRadioText4: PlayersHouse2F_MapEvents: db 0, 0 ; filler - db 1 ; warp events + def_warp_events warp_event 7, 0, PLAYERS_HOUSE_1F, 3 - db 0 ; coord events + def_coord_events - db 4 ; bg events + def_bg_events bg_event 2, 1, BGEVENT_UP, PlayersHousePCScript bg_event 3, 1, BGEVENT_READ, PlayersHouseRadioScript bg_event 5, 1, BGEVENT_READ, PlayersHouseBookshelfScript bg_event 6, 0, BGEVENT_IFSET, PosterScript - db 4 ; object events + def_object_events object_event 4, 2, SPRITE_CONSOLE, SPRITEMOVEDATA_STILL, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, GameConsoleScript, EVENT_PLAYERS_HOUSE_2F_CONSOLE object_event 4, 4, SPRITE_DOLL_1, SPRITEMOVEDATA_STILL, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, Doll1Script, EVENT_PLAYERS_HOUSE_2F_DOLL_1 object_event 5, 4, SPRITE_DOLL_2, SPRITEMOVEDATA_STILL, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, Doll2Script, EVENT_PLAYERS_HOUSE_2F_DOLL_2 diff --git a/maps/PlayersNeighborsHouse.asm b/maps/PlayersNeighborsHouse.asm index d2b7138e3..2c09a5570 100644 --- a/maps/PlayersNeighborsHouse.asm +++ b/maps/PlayersNeighborsHouse.asm @@ -1,11 +1,11 @@ - object_const_def ; object_event constants + object_const_def const PLAYERSNEIGHBORSHOUSE_COOLTRAINER_F const PLAYERSNEIGHBORSHOUSE_POKEFAN_F PlayersNeighborsHouse_MapScripts: - db 0 ; scene scripts + def_scene_scripts - db 0 ; callbacks + def_callbacks PlayersNeighborsDaughterScript: jumptextfaceplayer PlayersNeighborsDaughterText @@ -99,17 +99,17 @@ PlayerNeighborRadioText4: PlayersNeighborsHouse_MapEvents: db 0, 0 ; filler - db 2 ; warp events + def_warp_events warp_event 2, 7, NEW_BARK_TOWN, 3 warp_event 3, 7, NEW_BARK_TOWN, 3 - db 0 ; coord events + def_coord_events - db 3 ; bg events + def_bg_events bg_event 0, 1, BGEVENT_READ, PlayersNeighborsHouseBookshelfScript bg_event 1, 1, BGEVENT_READ, PlayersNeighborsHouseBookshelfScript bg_event 7, 1, BGEVENT_READ, PlayersNeighborsHouseRadioScript - db 2 ; object events + def_object_events object_event 2, 3, SPRITE_COOLTRAINER_F, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_SCRIPT, 0, PlayersNeighborsDaughterScript, -1 object_event 5, 3, SPRITE_POKEFAN_F, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_SCRIPT, 0, PlayersNeighborScript, EVENT_PLAYERS_NEIGHBORS_HOUSE_NEIGHBOR diff --git a/maps/PokeSeersHouse.asm b/maps/PokeSeersHouse.asm index 7bd18f97e..e098272e4 100644 --- a/maps/PokeSeersHouse.asm +++ b/maps/PokeSeersHouse.asm @@ -1,10 +1,10 @@ - object_const_def ; object_event constants + object_const_def const POKESEERSHOUSE_GRANNY PokeSeersHouse_MapScripts: - db 0 ; scene scripts + def_scene_scripts - db 0 ; callbacks + def_callbacks SeerScript: faceplayer @@ -17,13 +17,13 @@ SeerScript: PokeSeersHouse_MapEvents: db 0, 0 ; filler - db 2 ; warp events + def_warp_events warp_event 2, 7, CIANWOOD_CITY, 7 warp_event 3, 7, CIANWOOD_CITY, 7 - db 0 ; coord events + def_coord_events - db 0 ; bg events + def_bg_events - db 1 ; object events + def_object_events object_event 2, 3, SPRITE_GRANNY, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_SCRIPT, 0, SeerScript, -1 diff --git a/maps/Pokecenter2F.asm b/maps/Pokecenter2F.asm index 20b796e1b..f7a65b4d9 100644 --- a/maps/Pokecenter2F.asm +++ b/maps/Pokecenter2F.asm @@ -1,11 +1,11 @@ - object_const_def ; object_event constants + object_const_def const POKECENTER2F_TRADE_RECEPTIONIST const POKECENTER2F_BATTLE_RECEPTIONIST const POKECENTER2F_TIME_CAPSULE_RECEPTIONIST const POKECENTER2F_OFFICER Pokecenter2F_MapScripts: - db 6 ; scene scripts + def_scene_scripts scene_script .Scene0 ; SCENE_DEFAULT scene_script .Scene1 ; SCENE_POKECENTER2F_LEAVE_TRADE_CENTER scene_script .Scene2 ; SCENE_POKECENTER2F_LEAVE_COLOSSEUM @@ -13,7 +13,7 @@ Pokecenter2F_MapScripts: scene_script .Scene4 ; SCENE_POKECENTER2F_LEAVE_MOBILE_TRADE_ROOM scene_script .Scene5 ; SCENE_POKECENTER2F_LEAVE_MOBILE_BATTLE_ROOM - db 0 ; callbacks + def_callbacks .Scene0: special CheckMysteryGift @@ -1023,7 +1023,7 @@ Text_BrokeStadiumRules: Pokecenter2F_MapEvents: db 0, 0 ; filler - db 6 ; warp events + def_warp_events warp_event 0, 7, POKECENTER_2F, -1 warp_event 5, 0, TRADE_CENTER, 1 warp_event 9, 0, COLOSSEUM, 1 @@ -1031,12 +1031,12 @@ Pokecenter2F_MapEvents: warp_event 6, 0, MOBILE_TRADE_ROOM, 1 warp_event 10, 0, MOBILE_BATTLE_ROOM, 1 - db 0 ; coord events + def_coord_events - db 1 ; bg events + def_bg_events bg_event 7, 3, BGEVENT_READ, Pokecenter2FLinkRecordSign - db 4 ; object events + def_object_events object_event 5, 2, SPRITE_LINK_RECEPTIONIST, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_SCRIPT, 0, LinkReceptionistScript_Trade, -1 object_event 9, 2, SPRITE_LINK_RECEPTIONIST, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_SCRIPT, 0, LinkReceptionistScript_Battle, -1 object_event 13, 3, SPRITE_LINK_RECEPTIONIST, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_SCRIPT, 0, LinkReceptionistScript_TimeCapsule, -1 diff --git a/maps/PokecomCenterAdminOfficeMobile.asm b/maps/PokecomCenterAdminOfficeMobile.asm index c6c815ab2..605cc7b32 100644 --- a/maps/PokecomCenterAdminOfficeMobile.asm +++ b/maps/PokecomCenterAdminOfficeMobile.asm @@ -1,12 +1,12 @@ - object_const_def ; object_event constants + object_const_def const POKECOMCENTERADMINOFFICEMOBILE_SCIENTIST1 const POKECOMCENTERADMINOFFICEMOBILE_SCIENTIST2 const POKECOMCENTERADMINOFFICEMOBILE_SCIENTIST3 PokecomCenterAdminOfficeMobile_MapScripts: - db 0 ; scene scripts + def_scene_scripts - db 0 ; callbacks + def_callbacks PokecomCenterAdminOfficeMobileScientist1Script: jumptextfaceplayer PokecomCenterAdminOfficeMobileScientist1Text @@ -263,18 +263,18 @@ PokecomCenterAdminOfficeMobileComputer3Text: PokecomCenterAdminOfficeMobile_MapEvents: db 0, 0 ; filler - db 2 ; warp events + def_warp_events warp_event 0, 31, GOLDENROD_POKECENTER_1F, 3 warp_event 1, 31, GOLDENROD_POKECENTER_1F, 3 - db 0 ; coord events + def_coord_events - db 3 ; bg events + def_bg_events bg_event 6, 26, BGEVENT_UP, PokecomCenterAdminOfficeMobileComputer1 bg_event 6, 28, BGEVENT_UP, PokecomCenterAdminOfficeMobileComputer2 bg_event 3, 26, BGEVENT_UP, PokecomCenterAdminOfficeMobileComputer3 - db 3 ; object events + def_object_events object_event 4, 28, SPRITE_SCIENTIST, SPRITEMOVEDATA_WALK_UP_DOWN, 0, 1, -1, -1, PAL_NPC_RED, OBJECTTYPE_SCRIPT, 0, PokecomCenterAdminOfficeMobileScientist1Script, -1 object_event 7, 27, SPRITE_SCIENTIST, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_SCRIPT, 0, PokecomCenterAdminOfficeMobileScientist2Script, -1 object_event 7, 29, SPRITE_SCIENTIST, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_SCRIPT, 0, PokecomCenterAdminOfficeMobileScientist3Script, -1 diff --git a/maps/PokemonFanClub.asm b/maps/PokemonFanClub.asm index d3988ab90..f109baec9 100644 --- a/maps/PokemonFanClub.asm +++ b/maps/PokemonFanClub.asm @@ -1,4 +1,4 @@ - object_const_def ; object_event constants + object_const_def const POKEMONFANCLUB_CHAIRMAN const POKEMONFANCLUB_RECEPTIONIST const POKEMONFANCLUB_CLEFAIRY_GUY @@ -7,9 +7,9 @@ const POKEMONFANCLUB_ODDISH PokemonFanClub_MapScripts: - db 0 ; scene scripts + def_scene_scripts - db 0 ; callbacks + def_callbacks PokemonFanClubChairmanScript: faceplayer @@ -297,17 +297,17 @@ PokemonFanClubBraggingSignText: PokemonFanClub_MapEvents: db 0, 0 ; filler - db 2 ; warp events + def_warp_events warp_event 2, 7, VERMILION_CITY, 3 warp_event 3, 7, VERMILION_CITY, 3 - db 0 ; coord events + def_coord_events - db 2 ; bg events + def_bg_events bg_event 7, 0, BGEVENT_READ, PokemonFanClubListenSign bg_event 9, 0, BGEVENT_READ, PokemonFanClubBraggingSign - db 6 ; object events + def_object_events object_event 3, 1, SPRITE_GENTLEMAN, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, PokemonFanClubChairmanScript, -1 object_event 4, 1, SPRITE_RECEPTIONIST, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_SCRIPT, 0, PokemonFanClubReceptionistScript, -1 object_event 2, 3, SPRITE_FISHER, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, PokemonFanClubClefairyGuyScript, -1 diff --git a/maps/PowerPlant.asm b/maps/PowerPlant.asm index 7b6bb6e4e..e75cd310d 100644 --- a/maps/PowerPlant.asm +++ b/maps/PowerPlant.asm @@ -1,4 +1,4 @@ - object_const_def ; object_event constants + object_const_def const POWERPLANT_OFFICER1 const POWERPLANT_GYM_GUIDE1 const POWERPLANT_GYM_GUIDE2 @@ -8,11 +8,11 @@ const POWERPLANT_FOREST PowerPlant_MapScripts: - db 2 ; scene scripts + def_scene_scripts scene_script .DummyScene0 ; SCENE_POWERPLANT_NOTHING scene_script .DummyScene1 ; SCENE_POWERPLANT_GUARD_GETS_PHONE_CALL - db 0 ; callbacks + def_callbacks .DummyScene0: end @@ -389,18 +389,18 @@ PowerPlantManagerMyBelovedGeneratorText: PowerPlant_MapEvents: db 0, 0 ; filler - db 2 ; warp events + def_warp_events warp_event 2, 17, ROUTE_10_NORTH, 2 warp_event 3, 17, ROUTE_10_NORTH, 2 - db 1 ; coord events + def_coord_events coord_event 5, 12, SCENE_POWERPLANT_GUARD_GETS_PHONE_CALL, PowerPlantGuardPhoneScript - db 2 ; bg events + def_bg_events bg_event 0, 1, BGEVENT_READ, PowerPlantBookshelf bg_event 1, 1, BGEVENT_READ, PowerPlantBookshelf - db 7 ; object events + def_object_events object_event 4, 14, SPRITE_OFFICER, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_SCRIPT, 0, PowerPlantOfficerScript, -1 object_event 2, 9, SPRITE_GYM_GUIDE, SPRITEMOVEDATA_SPINRANDOM_SLOW, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_SCRIPT, 0, PowerPlantGymGuide1Script, -1 object_event 6, 11, SPRITE_GYM_GUIDE, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_SCRIPT, 0, PowerPlantGymGuide2Script, -1 diff --git a/maps/RadioTower1F.asm b/maps/RadioTower1F.asm index baf03643a..da7777de1 100644 --- a/maps/RadioTower1F.asm +++ b/maps/RadioTower1F.asm @@ -1,4 +1,4 @@ - object_const_def ; object_event constants + object_const_def const RADIOTOWER1F_RECEPTIONIST const RADIOTOWER1F_LASS const RADIOTOWER1F_YOUNGSTER @@ -7,9 +7,9 @@ const RADIOTOWER1F_CARD_WOMAN RadioTower1F_MapScripts: - db 0 ; scene scripts + def_scene_scripts - db 0 ; callbacks + def_callbacks RadioTower1FReceptionistScript: faceplayer @@ -473,18 +473,18 @@ RadioTower1FLuckyChannelSignText: RadioTower1F_MapEvents: db 0, 0 ; filler - db 3 ; warp events + def_warp_events 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 + def_coord_events - db 2 ; bg events + def_bg_events bg_event 3, 0, BGEVENT_READ, RadioTower1FDirectory bg_event 13, 0, BGEVENT_READ, RadioTower1FLuckyChannelSign - db 6 ; object events + def_object_events object_event 5, 6, SPRITE_RECEPTIONIST, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_SCRIPT, 0, RadioTower1FReceptionistScript, -1 object_event 16, 4, SPRITE_LASS, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_SCRIPT, 0, RadioTower1FLassScript, EVENT_GOLDENROD_CITY_CIVILIANS object_event 15, 4, SPRITE_YOUNGSTER, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_SCRIPT, 0, RadioTower1FYoungsterScript, EVENT_GOLDENROD_CITY_CIVILIANS diff --git a/maps/RadioTower2F.asm b/maps/RadioTower2F.asm index e0d6f179e..bf963d13b 100644 --- a/maps/RadioTower2F.asm +++ b/maps/RadioTower2F.asm @@ -1,4 +1,4 @@ - object_const_def ; object_event constants + object_const_def const RADIOTOWER2F_SUPER_NERD const RADIOTOWER2F_TEACHER const RADIOTOWER2F_ROCKET1 @@ -12,9 +12,9 @@ const RADIOTOWER2F_RECEPTIONIST RadioTower2F_MapScripts: - db 0 ; scene scripts + def_scene_scripts - db 0 ; callbacks + def_callbacks RadioTower2FUnusedDummyScene: ; unused @@ -712,13 +712,13 @@ RadioTower2FPokemonRadioSignText: RadioTower2F_MapEvents: db 0, 0 ; filler - db 2 ; warp events + def_warp_events warp_event 0, 0, RADIO_TOWER_3F, 1 warp_event 15, 0, RADIO_TOWER_1F, 3 - db 0 ; coord events + def_coord_events - db 6 ; bg events + def_bg_events bg_event 3, 0, BGEVENT_READ, RadioTower2FSalesSign bg_event 5, 0, BGEVENT_READ, RadioTower2FOaksPKMNTalkSign bg_event 9, 1, BGEVENT_READ, RadioTower2FBookshelf @@ -726,7 +726,7 @@ RadioTower2F_MapEvents: bg_event 11, 1, BGEVENT_READ, RadioTower2FBookshelf bg_event 13, 0, BGEVENT_READ, RadioTower2FPokemonRadioSign - db 11 ; object events + def_object_events object_event 6, 6, SPRITE_SUPER_NERD, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_SCRIPT, 0, RadioTower2FSuperNerdScript, EVENT_GOLDENROD_CITY_CIVILIANS object_event 17, 2, SPRITE_TEACHER, SPRITEMOVEDATA_WALK_LEFT_RIGHT, 1, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_SCRIPT, 0, RadioTower2FTeacherScript, -1 object_event 1, 4, SPRITE_ROCKET, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, 0, OBJECTTYPE_TRAINER, 3, TrainerGruntM4, EVENT_RADIO_TOWER_ROCKET_TAKEOVER diff --git a/maps/RadioTower3F.asm b/maps/RadioTower3F.asm index 29ac43330..4f0215d9a 100644 --- a/maps/RadioTower3F.asm +++ b/maps/RadioTower3F.asm @@ -1,4 +1,4 @@ - object_const_def ; object_event constants + object_const_def const RADIOTOWER3F_SUPER_NERD const RADIOTOWER3F_GYM_GUIDE const RADIOTOWER3F_COOLTRAINER_F @@ -8,9 +8,9 @@ const RADIOTOWER3F_SCIENTIST RadioTower3F_MapScripts: - db 0 ; scene scripts + def_scene_scripts - db 1 ; callbacks + def_callbacks callback MAPCALLBACK_TILES, .CardKeyShutterCallback .CardKeyShutterCallback: @@ -329,19 +329,19 @@ RadioTower3FPokemonMusicSignText: RadioTower3F_MapEvents: db 0, 0 ; filler - db 3 ; warp events + def_warp_events 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 + def_coord_events - db 3 ; bg events + def_bg_events bg_event 3, 0, BGEVENT_READ, RadioTower3FPersonnelSign bg_event 9, 0, BGEVENT_READ, RadioTower3FPokemonMusicSign bg_event 14, 2, BGEVENT_UP, CardKeySlotScript - db 7 ; object events + def_object_events object_event 7, 4, SPRITE_SUPER_NERD, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_SCRIPT, 0, RadioTower3FSuperNerdScript, EVENT_RADIO_TOWER_CIVILIANS_AFTER object_event 3, 4, SPRITE_GYM_GUIDE, SPRITEMOVEDATA_SPINRANDOM_FAST, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_SCRIPT, 0, RadioTower3FGymGuideScript, -1 object_event 11, 3, SPRITE_COOLTRAINER_F, SPRITEMOVEDATA_WANDER, 1, 1, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_SCRIPT, 0, RadioTower3FCooltrainerFScript, -1 diff --git a/maps/RadioTower4F.asm b/maps/RadioTower4F.asm index 3def3cc4f..d630073c3 100644 --- a/maps/RadioTower4F.asm +++ b/maps/RadioTower4F.asm @@ -1,4 +1,4 @@ - object_const_def ; object_event constants + object_const_def const RADIOTOWER4F_FISHER const RADIOTOWER4F_TEACHER const RADIOTOWER4F_GROWLITHE @@ -8,9 +8,9 @@ const RADIOTOWER4F_SCIENTIST RadioTower4F_MapScripts: - db 0 ; scene scripts + def_scene_scripts - db 0 ; callbacks + def_callbacks RadioTower4FFisherScript: jumptextfaceplayer RadioTower4FFisherText @@ -246,19 +246,19 @@ RadioTower4FStudio2SignText: RadioTower4F_MapEvents: db 0, 0 ; filler - db 4 ; warp events + def_warp_events 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 + def_coord_events - db 2 ; bg events + def_bg_events bg_event 7, 0, BGEVENT_READ, RadioTower4FProductionSign bg_event 15, 0, BGEVENT_READ, RadioTower4FStudio2Sign - db 7 ; object events + def_object_events object_event 6, 4, SPRITE_FISHER, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_SCRIPT, 0, RadioTower4FFisherScript, EVENT_RADIO_TOWER_CIVILIANS_AFTER object_event 14, 6, SPRITE_TEACHER, SPRITEMOVEDATA_SPINRANDOM_SLOW, 0, 0, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_SCRIPT, 0, RadioTower4FDJMaryScript, -1 object_event 12, 7, SPRITE_GROWLITHE, SPRITEMOVEDATA_POKEMON, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_SCRIPT, 0, RadioTowerMeowth, -1 diff --git a/maps/RadioTower5F.asm b/maps/RadioTower5F.asm index 0b15d9792..db0059511 100644 --- a/maps/RadioTower5F.asm +++ b/maps/RadioTower5F.asm @@ -1,4 +1,4 @@ - object_const_def ; object_event constants + object_const_def const RADIOTOWER5F_DIRECTOR const RADIOTOWER5F_ROCKET const RADIOTOWER5F_ROCKET_GIRL @@ -6,12 +6,12 @@ const RADIOTOWER5F_POKE_BALL RadioTower5F_MapScripts: - db 3 ; scene scripts + def_scene_scripts scene_script .DummyScene0 ; SCENE_DEFAULT scene_script .DummyScene1 ; SCENE_RADIOTOWER5F_ROCKET_BOSS scene_script .DummyScene2 ; SCENE_RADIOTOWER5F_NOTHING - db 0 ; callbacks + def_callbacks .DummyScene0: end @@ -421,22 +421,22 @@ RadioTower5FStudio1SignText: RadioTower5F_MapEvents: db 0, 0 ; filler - db 2 ; warp events + def_warp_events warp_event 0, 0, RADIO_TOWER_4F, 1 warp_event 12, 0, RADIO_TOWER_4F, 3 - db 2 ; coord events + def_coord_events coord_event 0, 3, SCENE_DEFAULT, FakeDirectorScript coord_event 16, 5, SCENE_RADIOTOWER5F_ROCKET_BOSS, RadioTower5FRocketBossScene - db 5 ; bg events + def_bg_events bg_event 3, 0, BGEVENT_READ, RadioTower5FDirectorsOfficeSign bg_event 11, 0, BGEVENT_READ, RadioTower5FStudio1Sign bg_event 15, 0, BGEVENT_READ, RadioTower5FStudio1Sign bg_event 16, 1, BGEVENT_READ, RadioTower5FBookshelf bg_event 17, 1, BGEVENT_READ, RadioTower5FBookshelf - db 5 ; object events + def_object_events object_event 3, 6, SPRITE_GENTLEMAN, SPRITEMOVEDATA_SPINRANDOM_SLOW, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, Director, -1 object_event 13, 5, SPRITE_ROCKET, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, ObjectEvent, EVENT_RADIO_TOWER_ROCKET_TAKEOVER object_event 17, 2, SPRITE_ROCKET_GIRL, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_TRAINER, 1, TrainerExecutivef1, EVENT_RADIO_TOWER_ROCKET_TAKEOVER diff --git a/maps/RedsHouse1F.asm b/maps/RedsHouse1F.asm index 17b8537a9..d5db9ead1 100644 --- a/maps/RedsHouse1F.asm +++ b/maps/RedsHouse1F.asm @@ -1,11 +1,11 @@ - object_const_def ; object_event constants + object_const_def const REDSHOUSE1F_REDS_MOM RedsHouse1F_MapScripts: - db 1 ; scene scripts + def_scene_scripts scene_script .DummyScene - db 0 ; callbacks + def_callbacks .DummyScene: end @@ -75,17 +75,17 @@ RedsHouse1FTVText: RedsHouse1F_MapEvents: db 0, 0 ; filler - db 3 ; warp events + def_warp_events 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 + def_coord_events - db 3 ; bg events + def_bg_events bg_event 0, 1, BGEVENT_READ, RedsHouse1FBookshelf bg_event 1, 1, BGEVENT_READ, RedsHouse1FBookshelf bg_event 2, 1, BGEVENT_READ, RedsHouse1FTV - db 1 ; object events + def_object_events object_event 5, 3, SPRITE_REDS_MOM, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, RedsMom, -1 diff --git a/maps/RedsHouse2F.asm b/maps/RedsHouse2F.asm index 6ff76ec80..da0f012c6 100644 --- a/maps/RedsHouse2F.asm +++ b/maps/RedsHouse2F.asm @@ -1,7 +1,7 @@ RedsHouse2F_MapScripts: - db 0 ; scene scripts + def_scene_scripts - db 0 ; callbacks + def_callbacks RedsHouse2FN64Script: jumptext RedsHouse2FN64Text @@ -26,13 +26,13 @@ RedsHouse2FPCText: RedsHouse2F_MapEvents: db 0, 0 ; filler - db 1 ; warp events + def_warp_events warp_event 7, 0, REDS_HOUSE_1F, 3 - db 0 ; coord events + def_coord_events - db 2 ; bg events + def_bg_events bg_event 3, 5, BGEVENT_READ, RedsHouse2FN64Script bg_event 0, 1, BGEVENT_READ, RedsHouse2FPCScript - db 0 ; object events + def_object_events diff --git a/maps/RockTunnel1F.asm b/maps/RockTunnel1F.asm index aa5d81472..3dbcf926b 100644 --- a/maps/RockTunnel1F.asm +++ b/maps/RockTunnel1F.asm @@ -1,11 +1,11 @@ - object_const_def ; object_event constants + object_const_def const ROCKTUNNEL1F_POKE_BALL1 const ROCKTUNNEL1F_POKE_BALL2 RockTunnel1F_MapScripts: - db 0 ; scene scripts + def_scene_scripts - db 0 ; callbacks + def_callbacks RockTunnel1FElixer: itemball ELIXER @@ -22,7 +22,7 @@ RockTunnel1FHiddenXDefend: RockTunnel1F_MapEvents: db 0, 0 ; filler - db 6 ; warp events + def_warp_events warp_event 15, 3, ROUTE_9, 1 warp_event 11, 25, ROUTE_10_SOUTH, 1 warp_event 5, 3, ROCK_TUNNEL_B1F, 3 @@ -30,12 +30,12 @@ RockTunnel1F_MapEvents: warp_event 27, 3, ROCK_TUNNEL_B1F, 4 warp_event 27, 13, ROCK_TUNNEL_B1F, 1 - db 0 ; coord events + def_coord_events - db 2 ; bg events + def_bg_events bg_event 24, 4, BGEVENT_ITEM, RockTunnel1FHiddenXAccuracy bg_event 21, 15, BGEVENT_ITEM, RockTunnel1FHiddenXDefend - db 2 ; object events + def_object_events object_event 4, 18, SPRITE_POKE_BALL, SPRITEMOVEDATA_STILL, 0, 0, -1, -1, 0, OBJECTTYPE_ITEMBALL, 0, RockTunnel1FElixer, EVENT_ROCK_TUNNEL_1F_ELIXER object_event 10, 15, SPRITE_POKE_BALL, SPRITEMOVEDATA_STILL, 0, 0, -1, -1, 0, OBJECTTYPE_ITEMBALL, 0, RockTunnel1FTMSteelWing, EVENT_ROCK_TUNNEL_1F_TM_STEEL_WING diff --git a/maps/RockTunnelB1F.asm b/maps/RockTunnelB1F.asm index 0a0707452..88693aaa9 100644 --- a/maps/RockTunnelB1F.asm +++ b/maps/RockTunnelB1F.asm @@ -1,12 +1,12 @@ - object_const_def ; object_event constants + object_const_def const ROCKTUNNELB1F_POKE_BALL1 const ROCKTUNNELB1F_POKE_BALL2 const ROCKTUNNELB1F_POKE_BALL3 RockTunnelB1F_MapScripts: - db 0 ; scene scripts + def_scene_scripts - db 0 ; callbacks + def_callbacks RockTunnelB1FIron: itemball IRON @@ -23,18 +23,18 @@ RockTunnelB1FHiddenMaxPotion: RockTunnelB1F_MapEvents: db 0, 0 ; filler - db 4 ; warp events + def_warp_events 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 + def_coord_events - db 1 ; bg events + def_bg_events bg_event 4, 14, BGEVENT_ITEM, RockTunnelB1FHiddenMaxPotion - db 3 ; object events + def_object_events object_event 7, 25, SPRITE_POKE_BALL, SPRITEMOVEDATA_STILL, 0, 0, -1, -1, 0, OBJECTTYPE_ITEMBALL, 0, RockTunnelB1FIron, EVENT_ROCK_TUNNEL_B1F_IRON object_event 6, 17, SPRITE_POKE_BALL, SPRITEMOVEDATA_STILL, 0, 0, -1, -1, 0, OBJECTTYPE_ITEMBALL, 0, RockTunnelB1FPPUp, EVENT_ROCK_TUNNEL_B1F_PP_UP object_event 15, 2, SPRITE_POKE_BALL, SPRITEMOVEDATA_STILL, 0, 0, -1, -1, 0, OBJECTTYPE_ITEMBALL, 0, RockTunnelB1FRevive, EVENT_ROCK_TUNNEL_B1F_REVIVE diff --git a/maps/Route1.asm b/maps/Route1.asm index f77eb7f1e..42a0a4121 100644 --- a/maps/Route1.asm +++ b/maps/Route1.asm @@ -1,12 +1,12 @@ - object_const_def ; object_event constants + object_const_def const ROUTE1_YOUNGSTER const ROUTE1_COOLTRAINER_F const ROUTE1_FRUIT_TREE Route1_MapScripts: - db 0 ; scene scripts + def_scene_scripts - db 0 ; callbacks + def_callbacks TrainerSchoolboyDanny: trainer SCHOOLBOY, DANNY, EVENT_BEAT_SCHOOLBOY_DANNY, SchoolboyDannySeenText, SchoolboyDannyBeatenText, 0, .Script @@ -81,14 +81,14 @@ Route1SignText: Route1_MapEvents: db 0, 0 ; filler - db 0 ; warp events + def_warp_events - db 0 ; coord events + def_coord_events - db 1 ; bg events + def_bg_events bg_event 7, 27, BGEVENT_READ, Route1Sign - db 3 ; object events + def_object_events object_event 4, 12, SPRITE_YOUNGSTER, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_TRAINER, 4, TrainerSchoolboyDanny, -1 object_event 9, 25, SPRITE_COOLTRAINER_F, SPRITEMOVEDATA_SPINRANDOM_FAST, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_TRAINER, 2, TrainerCooltrainerfQuinn, -1 object_event 3, 7, SPRITE_FRUIT_TREE, SPRITEMOVEDATA_STILL, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, Route1FruitTree, -1 diff --git a/maps/Route10North.asm b/maps/Route10North.asm index 4b22ac18c..49404a8b4 100644 --- a/maps/Route10North.asm +++ b/maps/Route10North.asm @@ -1,7 +1,7 @@ Route10North_MapScripts: - db 0 ; scene scripts + def_scene_scripts - db 0 ; callbacks + def_callbacks PowerPlantSign: jumptext PowerPlantSignText @@ -16,14 +16,14 @@ PowerPlantSignText: Route10North_MapEvents: db 0, 0 ; filler - db 2 ; warp events + def_warp_events warp_event 11, 1, ROUTE_10_POKECENTER_1F, 1 warp_event 3, 9, POWER_PLANT, 1 - db 0 ; coord events + def_coord_events - db 2 ; bg events + def_bg_events bg_event 5, 11, BGEVENT_READ, PowerPlantSign bg_event 12, 1, BGEVENT_READ, Route10PokecenterSign - db 0 ; object events + def_object_events diff --git a/maps/Route10Pokecenter1F.asm b/maps/Route10Pokecenter1F.asm index 5b7786c33..8a2680541 100644 --- a/maps/Route10Pokecenter1F.asm +++ b/maps/Route10Pokecenter1F.asm @@ -1,13 +1,13 @@ - object_const_def ; object_event constants + object_const_def const ROUTE10POKECENTER1F_NURSE const ROUTE10POKECENTER1F_GENTLEMAN const ROUTE10POKECENTER1F_GYM_GUIDE const ROUTE10POKECENTER1F_COOLTRAINER_F Route10Pokecenter1F_MapScripts: - db 0 ; scene scripts + def_scene_scripts - db 0 ; callbacks + def_callbacks Route10Pokecenter1FNurseScript: jumpstd PokecenterNurseScript @@ -81,16 +81,16 @@ Route10Pokecenter1FCooltrainerFText: Route10Pokecenter1F_MapEvents: db 0, 0 ; filler - db 3 ; warp events + def_warp_events 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 + def_coord_events - db 0 ; bg events + def_bg_events - db 4 ; object events + def_object_events object_event 3, 1, SPRITE_NURSE, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, Route10Pokecenter1FNurseScript, -1 object_event 7, 6, SPRITE_GENTLEMAN, SPRITEMOVEDATA_WALK_LEFT_RIGHT, 1, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_SCRIPT, 0, Route10Pokecenter1FGentlemanScript, -1 object_event 7, 2, SPRITE_GYM_GUIDE, SPRITEMOVEDATA_SPINRANDOM_SLOW, 0, 0, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_SCRIPT, 0, Route10Pokecenter1FGymGuideScript, -1 diff --git a/maps/Route10Pokecenter2FBeta.asm b/maps/Route10Pokecenter2FBeta.asm index 86927bb5a..4cf3a2a31 100644 --- a/maps/Route10Pokecenter2FBeta.asm +++ b/maps/Route10Pokecenter2FBeta.asm @@ -1,16 +1,16 @@ Route10Pokecenter2FBeta_MapScripts: - db 0 ; scene scripts + def_scene_scripts - db 0 ; callbacks + def_callbacks Route10Pokecenter2FBeta_MapEvents: db 0, 0 ; filler - db 1 ; warp events + def_warp_events warp_event 0, 7, ROUTE_10_POKECENTER_1F, 3 - db 0 ; coord events + def_coord_events - db 0 ; bg events + def_bg_events - db 0 ; object events + def_object_events diff --git a/maps/Route10South.asm b/maps/Route10South.asm index 186cf0c5d..57310ea7f 100644 --- a/maps/Route10South.asm +++ b/maps/Route10South.asm @@ -1,11 +1,11 @@ - object_const_def ; object_event constants + object_const_def const ROUTE10SOUTH_POKEFAN_M1 const ROUTE10SOUTH_POKEFAN_M2 Route10South_MapScripts: - db 0 ; scene scripts + def_scene_scripts - db 0 ; callbacks + def_callbacks TrainerHikerJim: trainer HIKER, JIM, EVENT_BEAT_HIKER_JIM, HikerJimSeenText, HikerJimBeatenText, 0, .Script @@ -76,14 +76,14 @@ Route10SignText: Route10South_MapEvents: db 0, 0 ; filler - db 1 ; warp events + def_warp_events warp_event 6, 1, ROCK_TUNNEL_1F, 2 - db 0 ; coord events + def_coord_events - db 1 ; bg events + def_bg_events bg_event 5, 3, BGEVENT_READ, Route10Sign - db 2 ; object events + def_object_events object_event 17, 3, SPRITE_POKEFAN_M, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, PAL_NPC_BROWN, OBJECTTYPE_TRAINER, 3, TrainerHikerJim, -1 object_event 8, 10, SPRITE_POKEFAN_M, SPRITEMOVEDATA_SPINRANDOM_FAST, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_TRAINER, 3, TrainerPokefanmRobert, -1 diff --git a/maps/Route11.asm b/maps/Route11.asm index aba97eccf..02237fc9b 100644 --- a/maps/Route11.asm +++ b/maps/Route11.asm @@ -1,4 +1,4 @@ - object_const_def ; object_event constants + object_const_def const ROUTE11_YOUNGSTER1 const ROUTE11_YOUNGSTER2 const ROUTE11_YOUNGSTER3 @@ -6,9 +6,9 @@ const ROUTE11_FRUIT_TREE Route11_MapScripts: - db 0 ; scene scripts + def_scene_scripts - db 0 ; callbacks + def_callbacks TrainerYoungsterOwen: trainer YOUNGSTER, OWEN, EVENT_BEAT_YOUNGSTER_OWEN, YoungsterOwenSeenText, YoungsterOwenBeatenText, 0, .Script @@ -146,15 +146,15 @@ Route11SignText: Route11_MapEvents: db 0, 0 ; filler - db 0 ; warp events + def_warp_events - db 0 ; coord events + def_coord_events - db 2 ; bg events + def_bg_events bg_event 3, 7, BGEVENT_READ, Route11Sign bg_event 32, 5, BGEVENT_ITEM, Route11HiddenRevive - db 5 ; object events + def_object_events object_event 22, 14, SPRITE_YOUNGSTER, SPRITEMOVEDATA_SPINRANDOM_FAST, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_TRAINER, 3, TrainerYoungsterOwen, -1 object_event 20, 4, SPRITE_YOUNGSTER, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_TRAINER, 3, TrainerYoungsterJason, -1 object_event 28, 7, SPRITE_YOUNGSTER, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_TRAINER, 1, TrainerPsychicHerman, -1 diff --git a/maps/Route12.asm b/maps/Route12.asm index 449d515bd..ea992c2fe 100644 --- a/maps/Route12.asm +++ b/maps/Route12.asm @@ -1,4 +1,4 @@ - object_const_def ; object_event constants + object_const_def const ROUTE12_FISHER1 const ROUTE12_FISHER2 const ROUTE12_FISHER3 @@ -7,9 +7,9 @@ const ROUTE12_POKE_BALL2 Route12_MapScripts: - db 0 ; scene scripts + def_scene_scripts - db 0 ; callbacks + def_callbacks TrainerFisherKyle: trainer FISHER, KYLE, EVENT_BEAT_FISHER_KYLE, FisherKyleSeenText, FisherKyleBeatenText, 0, .Script @@ -167,17 +167,17 @@ FishingSpotSignText: Route12_MapEvents: db 0, 0 ; filler - db 1 ; warp events + def_warp_events warp_event 11, 33, ROUTE_12_SUPER_ROD_HOUSE, 1 - db 0 ; coord events + def_coord_events - db 3 ; bg events + def_bg_events bg_event 11, 27, BGEVENT_READ, Route12Sign bg_event 13, 9, BGEVENT_READ, FishingSpotSign bg_event 14, 13, BGEVENT_ITEM, Route12HiddenElixer - db 6 ; object events + def_object_events object_event 5, 13, SPRITE_FISHER, SPRITEMOVEDATA_SPINRANDOM_FAST, 0, 0, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_TRAINER, 1, TrainerFisherMartin, -1 object_event 14, 23, SPRITE_FISHER, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_TRAINER, 1, TrainerFisherStephen, -1 object_event 10, 38, SPRITE_FISHER, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_TRAINER, 5, TrainerFisherBarney, -1 diff --git a/maps/Route12SuperRodHouse.asm b/maps/Route12SuperRodHouse.asm index 1efe79911..cef05c182 100644 --- a/maps/Route12SuperRodHouse.asm +++ b/maps/Route12SuperRodHouse.asm @@ -1,10 +1,10 @@ - object_const_def ; object_event constants + object_const_def const ROUTE12SUPERRODHOUSE_FISHING_GURU Route12SuperRodHouse_MapScripts: - db 0 ; scene scripts + def_scene_scripts - db 0 ; callbacks + def_callbacks Route12SuperRodHouseFishingGuruScript: faceplayer @@ -80,13 +80,13 @@ DontWantSuperRodText: Route12SuperRodHouse_MapEvents: db 0, 0 ; filler - db 2 ; warp events + def_warp_events warp_event 2, 7, ROUTE_12, 1 warp_event 3, 7, ROUTE_12, 1 - db 0 ; coord events + def_coord_events - db 0 ; bg events + def_bg_events - db 1 ; object events + def_object_events object_event 5, 3, SPRITE_FISHING_GURU, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_SCRIPT, 0, Route12SuperRodHouseFishingGuruScript, -1 diff --git a/maps/Route13.asm b/maps/Route13.asm index 214a845fc..029484444 100644 --- a/maps/Route13.asm +++ b/maps/Route13.asm @@ -1,4 +1,4 @@ - object_const_def ; object_event constants + object_const_def const ROUTE13_YOUNGSTER1 const ROUTE13_YOUNGSTER2 const ROUTE13_POKEFAN_M1 @@ -6,9 +6,9 @@ const ROUTE13_POKEFAN_M3 Route13_MapScripts: - db 0 ; scene scripts + def_scene_scripts - db 0 ; callbacks + def_callbacks TrainerPokefanmAlex: trainer POKEFANM, ALEX, EVENT_BEAT_POKEFANM_ALEX, PokefanmAlexSeenText, PokefanmAlexBeatenText, 0, .Script @@ -192,17 +192,17 @@ Route13DirectionsSignText: Route13_MapEvents: db 0, 0 ; filler - db 0 ; warp events + def_warp_events - db 0 ; coord events + def_coord_events - db 4 ; bg events + def_bg_events bg_event 29, 13, BGEVENT_READ, Route13TrainerTips bg_event 41, 11, BGEVENT_READ, Route13Sign bg_event 17, 13, BGEVENT_READ, Route13DirectionsSign bg_event 30, 13, BGEVENT_ITEM, Route13HiddenCalcium - db 5 ; object events + def_object_events object_event 42, 6, SPRITE_YOUNGSTER, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_TRAINER, 2, TrainerBirdKeeperPerry, -1 object_event 43, 6, SPRITE_YOUNGSTER, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_TRAINER, 2, TrainerBirdKeeperBret, -1 object_event 32, 8, SPRITE_POKEFAN_M, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_TRAINER, 3, TrainerPokefanmJoshua, -1 diff --git a/maps/Route14.asm b/maps/Route14.asm index 10c449e2e..f4e2627ef 100644 --- a/maps/Route14.asm +++ b/maps/Route14.asm @@ -1,13 +1,13 @@ - object_const_def ; object_event constants + object_const_def const ROUTE14_POKEFAN_M1 const ROUTE14_YOUNGSTER const ROUTE14_POKEFAN_M2 const ROUTE14_KIM Route14_MapScripts: - db 0 ; scene scripts + def_scene_scripts - db 0 ; callbacks + def_callbacks Kim: faceplayer @@ -116,13 +116,13 @@ PokefanmTrevorAfterBattleText: Route14_MapEvents: db 0, 0 ; filler - db 0 ; warp events + def_warp_events - db 0 ; coord events + def_coord_events - db 0 ; bg events + def_bg_events - db 4 ; object events + def_object_events object_event 11, 15, SPRITE_POKEFAN_M, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_TRAINER, 3, TrainerPokefanmCarter, -1 object_event 11, 27, SPRITE_YOUNGSTER, SPRITEMOVEDATA_SPINRANDOM_FAST, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_TRAINER, 3, TrainerBirdKeeperRoy, -1 object_event 6, 11, SPRITE_POKEFAN_M, SPRITEMOVEDATA_SPINRANDOM_FAST, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_TRAINER, 3, TrainerPokefanmTrevor, -1 diff --git a/maps/Route15.asm b/maps/Route15.asm index 7f960d4b2..93cddf8a1 100644 --- a/maps/Route15.asm +++ b/maps/Route15.asm @@ -1,4 +1,4 @@ - object_const_def ; object_event constants + object_const_def const ROUTE15_YOUNGSTER1 const ROUTE15_YOUNGSTER2 const ROUTE15_YOUNGSTER3 @@ -8,9 +8,9 @@ const ROUTE15_POKE_BALL Route15_MapScripts: - db 0 ; scene scripts + def_scene_scripts - db 0 ; callbacks + def_callbacks TrainerTeacherColette: trainer TEACHER, COLETTE, EVENT_BEAT_TEACHER_COLETTE, TeacherColetteSeenText, TeacherColetteBeatenText, 0, .Script @@ -202,16 +202,16 @@ Route15SignText: Route15_MapEvents: db 0, 0 ; filler - db 2 ; warp events + def_warp_events warp_event 2, 4, ROUTE_15_FUCHSIA_GATE, 3 warp_event 2, 5, ROUTE_15_FUCHSIA_GATE, 4 - db 0 ; coord events + def_coord_events - db 1 ; bg events + def_bg_events bg_event 19, 9, BGEVENT_READ, Route15Sign - db 7 ; object events + def_object_events object_event 10, 10, SPRITE_YOUNGSTER, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_TRAINER, 4, TrainerSchoolboyKipp, -1 object_event 15, 13, SPRITE_YOUNGSTER, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_TRAINER, 3, TrainerSchoolboyTommy, -1 object_event 33, 10, SPRITE_YOUNGSTER, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_TRAINER, 3, TrainerSchoolboyJohnny, -1 diff --git a/maps/Route15FuchsiaGate.asm b/maps/Route15FuchsiaGate.asm index e9f03e5f0..91a4f8d99 100644 --- a/maps/Route15FuchsiaGate.asm +++ b/maps/Route15FuchsiaGate.asm @@ -1,10 +1,10 @@ - object_const_def ; object_event constants + object_const_def const ROUTE15FUCHSIAGATE_OFFICER Route15FuchsiaGate_MapScripts: - db 0 ; scene scripts + def_scene_scripts - db 0 ; callbacks + def_callbacks Route15FuchsiaGateOfficerScript: jumptextfaceplayer Route15FuchsiaGateOfficerText @@ -20,15 +20,15 @@ Route15FuchsiaGateOfficerText: Route15FuchsiaGate_MapEvents: db 0, 0 ; filler - db 4 ; warp events + def_warp_events 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 + def_coord_events - db 0 ; bg events + def_bg_events - db 1 ; object events + def_object_events object_event 5, 2, SPRITE_OFFICER, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_SCRIPT, 0, Route15FuchsiaGateOfficerScript, -1 diff --git a/maps/Route16.asm b/maps/Route16.asm index 76ab15dae..982fbd626 100644 --- a/maps/Route16.asm +++ b/maps/Route16.asm @@ -1,7 +1,7 @@ Route16_MapScripts: - db 0 ; scene scripts + def_scene_scripts - db 1 ; callbacks + def_callbacks callback MAPCALLBACK_NEWMAP, .AlwaysOnBike .AlwaysOnBike: @@ -29,16 +29,16 @@ CyclingRoadSignText: Route16_MapEvents: db 0, 0 ; filler - db 5 ; warp events + def_warp_events 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 + def_coord_events - db 1 ; bg events + def_bg_events bg_event 5, 5, BGEVENT_READ, CyclingRoadSign - db 0 ; object events + def_object_events diff --git a/maps/Route16FuchsiaSpeechHouse.asm b/maps/Route16FuchsiaSpeechHouse.asm index 755d25ecc..6b9644a34 100644 --- a/maps/Route16FuchsiaSpeechHouse.asm +++ b/maps/Route16FuchsiaSpeechHouse.asm @@ -1,10 +1,10 @@ - object_const_def ; object_event constants + object_const_def const ROUTE16FUCHSIASPEECHHOUSE_SUPER_NERD Route16FuchsiaSpeechHouse_MapScripts: - db 0 ; scene scripts + def_scene_scripts - db 0 ; callbacks + def_callbacks Route16FuchsiaSpeechHouseSuperNerdScript: jumptextfaceplayer Route16FuchsiaSpeechHouseSuperNerdText @@ -23,15 +23,15 @@ Route16FuchsiaSpeechHouseSuperNerdText: Route16FuchsiaSpeechHouse_MapEvents: db 0, 0 ; filler - db 2 ; warp events + def_warp_events warp_event 2, 7, ROUTE_16, 1 warp_event 3, 7, ROUTE_16, 1 - db 0 ; coord events + def_coord_events - db 2 ; bg events + def_bg_events bg_event 0, 1, BGEVENT_READ, Route16FuchsiaSpeechHouseBookshelf bg_event 1, 1, BGEVENT_READ, Route16FuchsiaSpeechHouseBookshelf - db 1 ; object events + def_object_events object_event 2, 3, SPRITE_SUPER_NERD, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_SCRIPT, 0, Route16FuchsiaSpeechHouseSuperNerdScript, -1 diff --git a/maps/Route16Gate.asm b/maps/Route16Gate.asm index 878ac4689..be7c71537 100644 --- a/maps/Route16Gate.asm +++ b/maps/Route16Gate.asm @@ -1,11 +1,11 @@ - object_const_def ; object_event constants + object_const_def const ROUTE16GATE_OFFICER Route16Gate_MapScripts: - db 1 ; scene scripts + def_scene_scripts scene_script .DummyScene ; SCENE_DEFAULT - db 0 ; callbacks + def_callbacks .DummyScene: end @@ -61,17 +61,17 @@ Route16GateCannotPassText: Route16Gate_MapEvents: db 0, 0 ; filler - db 4 ; warp events + def_warp_events 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 + def_coord_events coord_event 5, 4, SCENE_DEFAULT, Route16GateBicycleCheck coord_event 5, 5, SCENE_DEFAULT, Route16GateBicycleCheck - db 0 ; bg events + def_bg_events - db 1 ; object events + def_object_events object_event 5, 2, SPRITE_OFFICER, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_SCRIPT, 0, Route16GateOfficerScript, -1 diff --git a/maps/Route17.asm b/maps/Route17.asm index fae28f684..098895db9 100644 --- a/maps/Route17.asm +++ b/maps/Route17.asm @@ -1,13 +1,13 @@ - object_const_def ; object_event constants + object_const_def const ROUTE17_BIKER1 const ROUTE17_BIKER2 const ROUTE17_BIKER3 const ROUTE17_BIKER4 Route17_MapScripts: - db 0 ; scene scripts + def_scene_scripts - db 1 ; callbacks + def_callbacks callback MAPCALLBACK_NEWMAP, .AlwaysOnBike .AlwaysOnBike: @@ -133,17 +133,17 @@ BikerCharlesAfterBattleText: Route17_MapEvents: db 0, 0 ; filler - db 2 ; warp events + def_warp_events warp_event 17, 82, ROUTE_17_ROUTE_18_GATE, 1 warp_event 17, 83, ROUTE_17_ROUTE_18_GATE, 2 - db 0 ; coord events + def_coord_events - db 2 ; bg events + def_bg_events bg_event 9, 54, BGEVENT_ITEM, Route17HiddenMaxEther bg_event 8, 77, BGEVENT_ITEM, Route17HiddenMaxElixer - db 4 ; object events + def_object_events object_event 4, 17, SPRITE_BIKER, SPRITEMOVEDATA_SPINRANDOM_FAST, 0, 0, -1, -1, PAL_NPC_BROWN, OBJECTTYPE_TRAINER, 4, TrainerBikerRiley, -1 object_event 9, 68, SPRITE_BIKER, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_BROWN, OBJECTTYPE_TRAINER, 1, TrainerBikerJoel, -1 object_event 3, 53, SPRITE_BIKER, SPRITEMOVEDATA_SPINRANDOM_FAST, 0, 0, -1, -1, PAL_NPC_BROWN, OBJECTTYPE_TRAINER, 3, TrainerBikerGlenn, -1 diff --git a/maps/Route17Route18Gate.asm b/maps/Route17Route18Gate.asm index be69ccdff..86d030bf3 100644 --- a/maps/Route17Route18Gate.asm +++ b/maps/Route17Route18Gate.asm @@ -1,11 +1,11 @@ - object_const_def ; object_event constants + object_const_def const ROUTE17ROUTE18GATE_OFFICER Route17Route18Gate_MapScripts: - db 1 ; scene scripts + def_scene_scripts scene_script .DummyScene ; SCENE_DEFAULT - db 0 ; callbacks + def_callbacks .DummyScene: end @@ -52,17 +52,17 @@ Route17Route18GateCannotPassText: Route17Route18Gate_MapEvents: db 0, 0 ; filler - db 4 ; warp events + def_warp_events 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 + def_coord_events coord_event 5, 4, SCENE_DEFAULT, Route17Route18GateBicycleCheck coord_event 5, 5, SCENE_DEFAULT, Route17Route18GateBicycleCheck - db 0 ; bg events + def_bg_events - db 1 ; object events + def_object_events object_event 5, 2, SPRITE_OFFICER, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_SCRIPT, 0, Route17Route18GateOfficerScript, -1 diff --git a/maps/Route18.asm b/maps/Route18.asm index af529282d..ecad39368 100644 --- a/maps/Route18.asm +++ b/maps/Route18.asm @@ -1,11 +1,11 @@ - object_const_def ; object_event constants + object_const_def const ROUTE18_YOUNGSTER1 const ROUTE18_YOUNGSTER2 Route18_MapScripts: - db 0 ; scene scripts + def_scene_scripts - db 0 ; callbacks + def_callbacks TrainerBirdKeeperBoris: trainer BIRD_KEEPER, BORIS, EVENT_BEAT_BIRD_KEEPER_BORIS, BirdKeeperBorisSeenText, BirdKeeperBorisBeatenText, 0, .Script @@ -78,15 +78,15 @@ Route18SignText: Route18_MapEvents: db 0, 0 ; filler - db 2 ; warp events + def_warp_events warp_event 2, 6, ROUTE_17_ROUTE_18_GATE, 3 warp_event 2, 7, ROUTE_17_ROUTE_18_GATE, 4 - db 0 ; coord events + def_coord_events - db 1 ; bg events + def_bg_events bg_event 9, 5, BGEVENT_READ, Route18Sign - db 2 ; object events + def_object_events object_event 9, 12, SPRITE_YOUNGSTER, SPRITEMOVEDATA_SPINRANDOM_FAST, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_TRAINER, 3, TrainerBirdKeeperBoris, -1 object_event 13, 6, SPRITE_YOUNGSTER, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_TRAINER, 3, TrainerBirdKeeperBob, -1 diff --git a/maps/Route19.asm b/maps/Route19.asm index 11e669603..7818167dc 100644 --- a/maps/Route19.asm +++ b/maps/Route19.asm @@ -1,4 +1,4 @@ - object_const_def ; object_event constants + object_const_def const ROUTE19_SWIMMER_GIRL const ROUTE19_SWIMMER_GUY1 const ROUTE19_SWIMMER_GUY2 @@ -7,9 +7,9 @@ const ROUTE19_FISHER2 Route19_MapScripts: - db 0 ; scene scripts + def_scene_scripts - db 1 ; callbacks + def_callbacks callback MAPCALLBACK_TILES, .ClearRocks .ClearRocks: @@ -235,16 +235,16 @@ CarefulSwimmingSignText: Route19_MapEvents: db 0, 0 ; filler - db 1 ; warp events + def_warp_events warp_event 7, 3, ROUTE_19_FUCHSIA_GATE, 3 - db 0 ; coord events + def_coord_events - db 2 ; bg events + def_bg_events bg_event 11, 13, BGEVENT_READ, Route19Sign bg_event 11, 1, BGEVENT_READ, CarefulSwimmingSign - db 6 ; object events + def_object_events object_event 9, 23, SPRITE_SWIMMER_GIRL, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_TRAINER, 0, TrainerSwimmerfDawn, -1 object_event 13, 28, SPRITE_SWIMMER_GUY, SPRITEMOVEDATA_SPINRANDOM_FAST, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_TRAINER, 3, TrainerSwimmermHarold, -1 object_event 11, 17, SPRITE_SWIMMER_GUY, SPRITEMOVEDATA_SPINRANDOM_FAST, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_TRAINER, 3, TrainerSwimmermJerome, -1 diff --git a/maps/Route19FuchsiaGate.asm b/maps/Route19FuchsiaGate.asm index a65a847c2..d1c654452 100644 --- a/maps/Route19FuchsiaGate.asm +++ b/maps/Route19FuchsiaGate.asm @@ -1,10 +1,10 @@ - object_const_def ; object_event constants + object_const_def const ROUTE19FUCHSIAGATE_OFFICER Route19FuchsiaGate_MapScripts: - db 0 ; scene scripts + def_scene_scripts - db 0 ; callbacks + def_callbacks Route19FuchsiaGateOfficerScript: faceplayer @@ -46,15 +46,15 @@ Route19FuchsiaGateOfficerText_RocksCleared: Route19FuchsiaGate_MapEvents: db 0, 0 ; filler - db 4 ; warp events + def_warp_events 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 + def_coord_events - db 0 ; bg events + def_bg_events - db 1 ; object events + def_object_events object_event 0, 4, SPRITE_OFFICER, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_SCRIPT, 0, Route19FuchsiaGateOfficerScript, -1 diff --git a/maps/Route2.asm b/maps/Route2.asm index 2c697d3e7..045c3c285 100644 --- a/maps/Route2.asm +++ b/maps/Route2.asm @@ -1,4 +1,4 @@ - object_const_def ; object_event constants + object_const_def const ROUTE2_BUG_CATCHER1 const ROUTE2_BUG_CATCHER2 const ROUTE2_BUG_CATCHER3 @@ -9,9 +9,9 @@ const ROUTE2_FRUIT_TREE Route2_MapScripts: - db 0 ; scene scripts + def_scene_scripts - db 0 ; callbacks + def_callbacks TrainerBugCatcherRob: trainer BUG_CATCHER, ROB, EVENT_BEAT_BUG_CATCHER_ROB, BugCatcherRobSeenText, BugCatcherRobBeatenText, 0, .Script @@ -147,16 +147,16 @@ Route2DiglettsCaveSignText: Route2_MapEvents: db 0, 0 ; filler - db 5 ; warp events + def_warp_events 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 + def_coord_events - db 6 ; bg events + def_bg_events bg_event 7, 51, BGEVENT_READ, Route2Sign bg_event 11, 9, BGEVENT_READ, Route2DiglettsCaveSign bg_event 7, 23, BGEVENT_ITEM, Route2HiddenMaxEther @@ -164,7 +164,7 @@ Route2_MapEvents: bg_event 4, 27, BGEVENT_ITEM, Route2HiddenFullRestore bg_event 11, 30, BGEVENT_ITEM, Route2HiddenRevive - db 8 ; object events + def_object_events object_event 10, 45, SPRITE_BUG_CATCHER, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, PAL_NPC_BROWN, OBJECTTYPE_TRAINER, 5, TrainerBugCatcherRob, -1 object_event 6, 4, SPRITE_BUG_CATCHER, SPRITEMOVEDATA_SPINCLOCKWISE, 0, 0, -1, -1, PAL_NPC_BROWN, OBJECTTYPE_TRAINER, 3, TrainerBugCatcherEd, -1 object_event 0, 40, SPRITE_BUG_CATCHER, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, PAL_NPC_BROWN, OBJECTTYPE_TRAINER, 3, TrainerBugCatcherDoug, -1 diff --git a/maps/Route20.asm b/maps/Route20.asm index d04bc01cf..2b22c2bee 100644 --- a/maps/Route20.asm +++ b/maps/Route20.asm @@ -1,12 +1,12 @@ - object_const_def ; object_event constants + object_const_def const ROUTE20_SWIMMER_GIRL1 const ROUTE20_SWIMMER_GIRL2 const ROUTE20_SWIMMER_GUY Route20_MapScripts: - db 0 ; scene scripts + def_scene_scripts - db 1 ; callbacks + def_callbacks callback MAPCALLBACK_NEWMAP, .ClearRocks .ClearRocks: @@ -113,15 +113,15 @@ CinnabarGymSignText: Route20_MapEvents: db 0, 0 ; filler - db 1 ; warp events + def_warp_events warp_event 38, 7, SEAFOAM_GYM, 1 - db 0 ; coord events + def_coord_events - db 1 ; bg events + def_bg_events bg_event 37, 11, BGEVENT_READ, CinnabarGymSign - db 3 ; object events + def_object_events object_event 52, 8, SPRITE_SWIMMER_GIRL, SPRITEMOVEDATA_SPINRANDOM_FAST, 0, 0, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_TRAINER, 3, TrainerSwimmerfNicole, -1 object_event 45, 13, SPRITE_SWIMMER_GIRL, SPRITEMOVEDATA_SPINRANDOM_FAST, 0, 0, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_TRAINER, 3, TrainerSwimmerfLori, -1 object_event 12, 13, SPRITE_SWIMMER_GUY, SPRITEMOVEDATA_SPINRANDOM_FAST, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_TRAINER, 3, TrainerSwimmermCameron, -1 diff --git a/maps/Route21.asm b/maps/Route21.asm index a4436d9af..3c5ea1d98 100644 --- a/maps/Route21.asm +++ b/maps/Route21.asm @@ -1,12 +1,12 @@ - object_const_def ; object_event constants + object_const_def const ROUTE21_SWIMMER_GIRL const ROUTE21_SWIMMER_GUY const ROUTE21_FISHER Route21_MapScripts: - db 0 ; scene scripts + def_scene_scripts - db 0 ; callbacks + def_callbacks TrainerSwimmermSeth: trainer SWIMMERM, SETH, EVENT_BEAT_SWIMMERM_SETH, SwimmermSethSeenText, SwimmermSethBeatenText, 0, .Script @@ -90,13 +90,13 @@ FisherArnoldAfterBattleText: Route21_MapEvents: db 0, 0 ; filler - db 0 ; warp events + def_warp_events - db 0 ; coord events + def_coord_events - db 0 ; bg events + def_bg_events - db 3 ; object events + def_object_events object_event 11, 16, SPRITE_SWIMMER_GIRL, SPRITEMOVEDATA_SPINRANDOM_FAST, 0, 0, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_TRAINER, 3, TrainerSwimmerfNikki, -1 object_event 2, 30, SPRITE_SWIMMER_GUY, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_TRAINER, 4, TrainerSwimmermSeth, -1 object_event 14, 22, SPRITE_FISHER, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_TRAINER, 1, TrainerFisherArnold, -1 diff --git a/maps/Route22.asm b/maps/Route22.asm index 8402f5e4c..fa2181615 100644 --- a/maps/Route22.asm +++ b/maps/Route22.asm @@ -1,7 +1,7 @@ Route22_MapScripts: - db 0 ; scene scripts + def_scene_scripts - db 0 ; callbacks + def_callbacks VictoryRoadEntranceSign: jumptext VictoryRoadEntranceSignText @@ -16,12 +16,12 @@ VictoryRoadEntranceSignText: Route22_MapEvents: db 0, 0 ; filler - db 1 ; warp events + def_warp_events warp_event 13, 5, VICTORY_ROAD_GATE, 1 - db 0 ; coord events + def_coord_events - db 1 ; bg events + def_bg_events bg_event 15, 7, BGEVENT_READ, VictoryRoadEntranceSign - db 0 ; object events + def_object_events diff --git a/maps/Route23.asm b/maps/Route23.asm index 267accbe1..525d11407 100644 --- a/maps/Route23.asm +++ b/maps/Route23.asm @@ -1,7 +1,7 @@ Route23_MapScripts: - db 0 ; scene scripts + def_scene_scripts - db 1 ; callbacks + def_callbacks callback MAPCALLBACK_NEWMAP, .FlyPoint .FlyPoint: @@ -23,15 +23,15 @@ IndigoPlateauSignText: Route23_MapEvents: db 0, 0 ; filler - db 4 ; warp events + def_warp_events 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 + def_coord_events - db 1 ; bg events + def_bg_events bg_event 11, 7, BGEVENT_READ, IndigoPlateauSign - db 0 ; object events + def_object_events diff --git a/maps/Route24.asm b/maps/Route24.asm index b4ceb8294..826cfaeea 100644 --- a/maps/Route24.asm +++ b/maps/Route24.asm @@ -1,10 +1,10 @@ - object_const_def ; object_event constants + object_const_def const ROUTE24_ROCKET Route24_MapScripts: - db 0 ; scene scripts + def_scene_scripts - db 0 ; callbacks + def_callbacks Route24RocketScript: faceplayer @@ -119,11 +119,11 @@ Route24RocketDisappearsText: Route24_MapEvents: db 0, 0 ; filler - db 0 ; warp events + def_warp_events - db 0 ; coord events + def_coord_events - db 0 ; bg events + def_bg_events - db 1 ; object events + def_object_events object_event 8, 7, SPRITE_ROCKET, SPRITEMOVEDATA_SPINRANDOM_SLOW, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, Route24RocketScript, EVENT_ROUTE_24_ROCKET diff --git a/maps/Route25.asm b/maps/Route25.asm index 91126ef40..a95e08d1d 100644 --- a/maps/Route25.asm +++ b/maps/Route25.asm @@ -1,4 +1,4 @@ - object_const_def ; object_event constants + object_const_def const ROUTE25_MISTY const ROUTE25_COOLTRAINER_M1 const ROUTE25_YOUNGSTER1 @@ -12,11 +12,11 @@ const ROUTE25_POKE_BALL Route25_MapScripts: - db 2 ; scene scripts + def_scene_scripts scene_script .DummyScene0 ; SCENE_ROUTE25_NOTHING scene_script .DummyScene1 ; SCENE_ROUTE25_MISTYS_DATE - db 0 ; callbacks + def_callbacks .DummyScene0: end @@ -430,18 +430,18 @@ BillsHouseSignText: Route25_MapEvents: db 0, 0 ; filler - db 1 ; warp events + def_warp_events warp_event 47, 5, BILLS_HOUSE, 1 - db 2 ; coord events + def_coord_events coord_event 42, 6, SCENE_ROUTE25_MISTYS_DATE, Route25MistyDate1Script coord_event 42, 7, SCENE_ROUTE25_MISTYS_DATE, Route25MistyDate2Script - db 2 ; bg events + def_bg_events bg_event 45, 5, BGEVENT_READ, BillsHouseSign bg_event 4, 5, BGEVENT_ITEM, Route25HiddenPotion - db 11 ; object events + def_object_events object_event 46, 9, SPRITE_MISTY, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_SCRIPT, 0, ObjectEvent, EVENT_ROUTE_25_MISTY_BOYFRIEND object_event 46, 10, SPRITE_COOLTRAINER_M, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_SCRIPT, 0, ObjectEvent, EVENT_ROUTE_25_MISTY_BOYFRIEND object_event 12, 8, SPRITE_YOUNGSTER, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_TRAINER, 3, TrainerSchoolboyDudley, -1 diff --git a/maps/Route26.asm b/maps/Route26.asm index 7bb3ff25b..77677df5f 100644 --- a/maps/Route26.asm +++ b/maps/Route26.asm @@ -1,4 +1,4 @@ - object_const_def ; object_event constants + object_const_def const ROUTE26_COOLTRAINER_M1 const ROUTE26_COOLTRAINER_M2 const ROUTE26_COOLTRAINER_F1 @@ -9,9 +9,9 @@ const ROUTE26_POKE_BALL Route26_MapScripts: - db 0 ; scene scripts + def_scene_scripts - db 0 ; callbacks + def_callbacks TrainerCooltrainermJake: trainer COOLTRAINERM, JAKE, EVENT_BEAT_COOLTRAINERM_JAKE, CooltrainermJakeSeenText, CooltrainermJakeBeatenText, 0, .Script @@ -413,17 +413,17 @@ Route26SignText: Route26_MapEvents: db 0, 0 ; filler - db 3 ; warp events + def_warp_events 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 + def_coord_events - db 1 ; bg events + def_bg_events bg_event 8, 6, BGEVENT_READ, Route26Sign - db 8 ; object events + def_object_events object_event 14, 24, SPRITE_COOLTRAINER_M, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_TRAINER, 2, TrainerCooltrainermJake, -1 object_event 9, 38, SPRITE_COOLTRAINER_M, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_TRAINER, 3, TrainerCooltrainermGaven3, -1 object_event 10, 56, SPRITE_COOLTRAINER_F, SPRITEMOVEDATA_SPINRANDOM_FAST, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_TRAINER, 3, TrainerCooltrainerfJoyce, -1 diff --git a/maps/Route26HealHouse.asm b/maps/Route26HealHouse.asm index e3d35d12c..1135febf5 100644 --- a/maps/Route26HealHouse.asm +++ b/maps/Route26HealHouse.asm @@ -1,10 +1,10 @@ - object_const_def ; object_event constants + object_const_def const ROUTE26HEALHOUSE_TEACHER Route26HealHouse_MapScripts: - db 0 ; scene scripts + def_scene_scripts - db 0 ; callbacks + def_callbacks Route26HealHouseTeacherScript: faceplayer @@ -49,15 +49,15 @@ Route26HealHouseKeepAtItText: Route26HealHouse_MapEvents: db 0, 0 ; filler - db 2 ; warp events + def_warp_events warp_event 2, 7, ROUTE_26, 2 warp_event 3, 7, ROUTE_26, 2 - db 0 ; coord events + def_coord_events - db 2 ; bg events + def_bg_events bg_event 0, 1, BGEVENT_READ, Route26HealHouseBookshelf bg_event 1, 1, BGEVENT_READ, Route26HealHouseBookshelf - db 1 ; object events + def_object_events object_event 2, 3, SPRITE_TEACHER, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_SCRIPT, 0, Route26HealHouseTeacherScript, -1 diff --git a/maps/Route27.asm b/maps/Route27.asm index 4bc974290..5cca7b1ed 100644 --- a/maps/Route27.asm +++ b/maps/Route27.asm @@ -1,4 +1,4 @@ - object_const_def ; object_event constants + object_const_def const ROUTE27_COOLTRAINER_M1 const ROUTE27_COOLTRAINER_M2 const ROUTE27_COOLTRAINER_F1 @@ -10,11 +10,11 @@ const ROUTE27_FISHER Route27_MapScripts: - db 2 ; scene scripts + def_scene_scripts scene_script .DummyScene0 ; SCENE_DEFAULT scene_script .DummyScene1 ; SCENE_FINISHED - db 0 ; callbacks + def_callbacks .DummyScene0: end @@ -468,19 +468,19 @@ TohjoFallsSignText: Route27_MapEvents: db 0, 0 ; filler - db 3 ; warp events + def_warp_events 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 + def_coord_events coord_event 18, 10, SCENE_DEFAULT, FirstStepIntoKantoLeftScene coord_event 19, 10, SCENE_DEFAULT, FirstStepIntoKantoRightScene - db 1 ; bg events + def_bg_events bg_event 25, 7, BGEVENT_READ, TohjoFallsSign - db 9 ; object events + def_object_events object_event 48, 7, SPRITE_COOLTRAINER_M, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_TRAINER, 3, TrainerCooltrainermBlake, -1 object_event 58, 6, SPRITE_COOLTRAINER_M, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_TRAINER, 4, TrainerCooltrainermBrian, -1 object_event 72, 10, SPRITE_COOLTRAINER_F, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_TRAINER, 4, TrainerCooltrainerfReena, -1 diff --git a/maps/Route27SandstormHouse.asm b/maps/Route27SandstormHouse.asm index ab6a03c45..561d3b9a8 100644 --- a/maps/Route27SandstormHouse.asm +++ b/maps/Route27SandstormHouse.asm @@ -1,10 +1,10 @@ - object_const_def ; object_event constants + object_const_def const ROUTE27SANDSTORMHOUSE_GRANNY Route27SandstormHouse_MapScripts: - db 0 ; scene scripts + def_scene_scripts - db 0 ; callbacks + def_callbacks SandstormHouseWoman: faceplayer @@ -94,15 +94,15 @@ SandstormHouseWomanDisloyalText: Route27SandstormHouse_MapEvents: db 0, 0 ; filler - db 2 ; warp events + def_warp_events warp_event 2, 7, ROUTE_27, 1 warp_event 3, 7, ROUTE_27, 1 - db 0 ; coord events + def_coord_events - db 2 ; bg events + def_bg_events bg_event 0, 1, BGEVENT_READ, SandstormHouseBookshelf bg_event 1, 1, BGEVENT_READ, SandstormHouseBookshelf - db 1 ; object events + def_object_events object_event 2, 4, SPRITE_GRANNY, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, SandstormHouseWoman, -1 diff --git a/maps/Route28.asm b/maps/Route28.asm index af41de7c5..b84ff6f7f 100644 --- a/maps/Route28.asm +++ b/maps/Route28.asm @@ -1,7 +1,7 @@ Route28_MapScripts: - db 0 ; scene scripts + def_scene_scripts - db 0 ; callbacks + def_callbacks Route28Sign: jumptext Route28SignText @@ -16,14 +16,14 @@ Route28SignText: Route28_MapEvents: db 0, 0 ; filler - db 2 ; warp events + def_warp_events warp_event 7, 3, ROUTE_28_STEEL_WING_HOUSE, 1 warp_event 33, 5, VICTORY_ROAD_GATE, 7 - db 0 ; coord events + def_coord_events - db 2 ; bg events + def_bg_events bg_event 31, 5, BGEVENT_READ, Route28Sign bg_event 25, 2, BGEVENT_ITEM, Route28HiddenRareCandy - db 0 ; object events + def_object_events diff --git a/maps/Route28SteelWingHouse.asm b/maps/Route28SteelWingHouse.asm index 72f67e865..f2cc056c5 100644 --- a/maps/Route28SteelWingHouse.asm +++ b/maps/Route28SteelWingHouse.asm @@ -1,12 +1,12 @@ - object_const_def ; object_event constants + object_const_def const ROUTE28STEELWINGHOUSE_CELEBRITY const ROUTE28STEELWINGHOUSE_FEAROW Route28SteelWingHouse_MapScripts: - db 1 ; scene scripts + def_scene_scripts scene_script .DummyScene - db 0 ; callbacks + def_callbacks .DummyScene: end @@ -71,16 +71,16 @@ CelebritysFearowText: Route28SteelWingHouse_MapEvents: db 0, 0 ; filler - db 2 ; warp events + def_warp_events warp_event 2, 7, ROUTE_28, 1 warp_event 3, 7, ROUTE_28, 1 - db 0 ; coord events + def_coord_events - db 2 ; bg events + def_bg_events bg_event 0, 1, BGEVENT_READ, CelebrityHouseBookshelf bg_event 1, 1, BGEVENT_READ, CelebrityHouseBookshelf - db 2 ; object events + def_object_events object_event 2, 3, SPRITE_COOLTRAINER_F, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_SCRIPT, 0, Celebrity, -1 object_event 6, 5, SPRITE_MOLTRES, SPRITEMOVEDATA_POKEMON, 0, 0, -1, -1, PAL_NPC_BROWN, OBJECTTYPE_SCRIPT, 0, CelebritysFearow, -1 diff --git a/maps/Route29.asm b/maps/Route29.asm index 8273a4fc9..4b8d6bb1c 100644 --- a/maps/Route29.asm +++ b/maps/Route29.asm @@ -1,4 +1,4 @@ - object_const_def ; object_event constants + object_const_def const ROUTE29_COOLTRAINER_M1 const ROUTE29_YOUNGSTER const ROUTE29_TEACHER1 @@ -9,11 +9,11 @@ const ROUTE29_POKE_BALL Route29_MapScripts: - db 2 ; scene scripts + def_scene_scripts scene_script .DummyScene0 ; SCENE_ROUTE29_NOTHING scene_script .DummyScene1 ; SCENE_ROUTE29_CATCH_TUTORIAL - db 1 ; callbacks + def_callbacks callback MAPCALLBACK_OBJECTS, .Tuscany .DummyScene0: @@ -416,18 +416,18 @@ Route29Sign2Text: Route29_MapEvents: db 0, 0 ; filler - db 1 ; warp events + def_warp_events warp_event 27, 1, ROUTE_29_ROUTE_46_GATE, 3 - db 2 ; coord events + def_coord_events coord_event 53, 8, SCENE_ROUTE29_CATCH_TUTORIAL, Route29Tutorial1 coord_event 53, 9, SCENE_ROUTE29_CATCH_TUTORIAL, Route29Tutorial2 - db 2 ; bg events + def_bg_events bg_event 51, 7, BGEVENT_READ, Route29Sign1 bg_event 3, 5, BGEVENT_READ, Route29Sign2 - db 8 ; object events + def_object_events object_event 50, 12, SPRITE_COOLTRAINER_M, SPRITEMOVEDATA_SPINRANDOM_SLOW, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_SCRIPT, 0, CatchingTutorialDudeScript, -1 object_event 27, 16, SPRITE_YOUNGSTER, SPRITEMOVEDATA_WALK_UP_DOWN, 0, 1, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_SCRIPT, 0, Route29YoungsterScript, -1 object_event 15, 11, SPRITE_TEACHER, SPRITEMOVEDATA_WALK_LEFT_RIGHT, 1, 0, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_SCRIPT, 0, Route29TeacherScript, -1 diff --git a/maps/Route29Route46Gate.asm b/maps/Route29Route46Gate.asm index 46f34df1f..b0bdd7bba 100644 --- a/maps/Route29Route46Gate.asm +++ b/maps/Route29Route46Gate.asm @@ -1,11 +1,11 @@ - object_const_def ; object_event constants + object_const_def const ROUTE29ROUTE46GATE_OFFICER const ROUTE29ROUTE46GATE_YOUNGSTER Route29Route46Gate_MapScripts: - db 0 ; scene scripts + def_scene_scripts - db 0 ; callbacks + def_callbacks Route29Route46GateOfficerScript: jumptextfaceplayer Route29Route46GateOfficerText @@ -37,16 +37,16 @@ Route29Route46GateYoungsterText: Route29Route46Gate_MapEvents: db 0, 0 ; filler - db 4 ; warp events + def_warp_events 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 + def_coord_events - db 0 ; bg events + def_bg_events - db 2 ; object events + def_object_events object_event 0, 4, SPRITE_OFFICER, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_SCRIPT, 0, Route29Route46GateOfficerScript, -1 object_event 6, 4, SPRITE_YOUNGSTER, SPRITEMOVEDATA_WALK_UP_DOWN, 0, 1, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_SCRIPT, 0, Route29Route46GateYoungsterScript, -1 diff --git a/maps/Route2Gate.asm b/maps/Route2Gate.asm index 0bc8e9fd4..a037c6023 100644 --- a/maps/Route2Gate.asm +++ b/maps/Route2Gate.asm @@ -1,10 +1,10 @@ - object_const_def ; object_event constants + object_const_def const ROUTE2GATE_SCIENTIST Route2Gate_MapScripts: - db 0 ; scene scripts + def_scene_scripts - db 0 ; callbacks + def_callbacks Route2GateScientistScript: jumptextfaceplayer Route2GateScientistText @@ -26,15 +26,15 @@ Route2GateScientistText: Route2Gate_MapEvents: db 0, 0 ; filler - db 4 ; warp events + def_warp_events 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 + def_coord_events - db 0 ; bg events + def_bg_events - db 1 ; object events + def_object_events object_event 6, 4, SPRITE_SCIENTIST, SPRITEMOVEDATA_WALK_UP_DOWN, 0, 2, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_SCRIPT, 0, Route2GateScientistScript, -1 diff --git a/maps/Route2NuggetHouse.asm b/maps/Route2NuggetHouse.asm index 681ba49af..147d72d69 100644 --- a/maps/Route2NuggetHouse.asm +++ b/maps/Route2NuggetHouse.asm @@ -1,10 +1,10 @@ - object_const_def ; object_event constants + object_const_def const ROUTE2NUGGETHOUSE_FISHER Route2NuggetHouse_MapScripts: - db 0 ; scene scripts + def_scene_scripts - db 0 ; callbacks + def_callbacks Route2NuggetHouseFisherScript: faceplayer @@ -53,13 +53,13 @@ Route2NuggetHouseFisherText_GotNugget: Route2NuggetHouse_MapEvents: db 0, 0 ; filler - db 2 ; warp events + def_warp_events warp_event 2, 7, ROUTE_2, 1 warp_event 3, 7, ROUTE_2, 1 - db 0 ; coord events + def_coord_events - db 0 ; bg events + def_bg_events - db 1 ; object events + def_object_events object_event 2, 4, SPRITE_FISHER, SPRITEMOVEDATA_WALK_UP_DOWN, 0, 2, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_SCRIPT, 0, Route2NuggetHouseFisherScript, -1 diff --git a/maps/Route3.asm b/maps/Route3.asm index fcf114bfe..a670cd8ba 100644 --- a/maps/Route3.asm +++ b/maps/Route3.asm @@ -1,13 +1,13 @@ - object_const_def ; object_event constants + object_const_def const ROUTE3_FISHER1 const ROUTE3_YOUNGSTER1 const ROUTE3_YOUNGSTER2 const ROUTE3_FISHER2 Route3_MapScripts: - db 0 ; scene scripts + def_scene_scripts - db 0 ; callbacks + def_callbacks TrainerFirebreatherOtis: trainer FIREBREATHER, OTIS, EVENT_BEAT_FIREBREATHER_OTIS, FirebreatherOtisSeenText, FirebreatherOtisBeatenText, 0, .Script @@ -133,15 +133,15 @@ Route3MtMoonSquareSignText: Route3_MapEvents: db 0, 0 ; filler - db 1 ; warp events + def_warp_events warp_event 52, 1, MOUNT_MOON, 1 - db 0 ; coord events + def_coord_events - db 1 ; bg events + def_bg_events bg_event 49, 13, BGEVENT_READ, Route3MtMoonSquareSign - db 4 ; object events + def_object_events object_event 26, 12, SPRITE_FISHER, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_TRAINER, 2, TrainerFirebreatherOtis, -1 object_event 10, 7, SPRITE_YOUNGSTER, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_TRAINER, 3, TrainerYoungsterWarren, -1 object_event 16, 3, SPRITE_YOUNGSTER, SPRITEMOVEDATA_SPINRANDOM_FAST, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_TRAINER, 1, TrainerYoungsterJimmy, -1 diff --git a/maps/Route30.asm b/maps/Route30.asm index a0e5195f3..e34e62410 100644 --- a/maps/Route30.asm +++ b/maps/Route30.asm @@ -1,4 +1,4 @@ - object_const_def ; object_event constants + object_const_def const ROUTE30_YOUNGSTER1 const ROUTE30_YOUNGSTER2 const ROUTE30_YOUNGSTER3 @@ -12,9 +12,9 @@ const ROUTE30_POKE_BALL Route30_MapScripts: - db 0 ; scene scripts + def_scene_scripts - db 0 ; callbacks + def_callbacks YoungsterJoey_ImportantBattleScript: waitsfx @@ -407,20 +407,20 @@ YoungsterJoeyText_GiveHPUpAfterBattle: Route30_MapEvents: db 0, 0 ; filler - db 2 ; warp events + def_warp_events warp_event 7, 39, ROUTE_30_BERRY_HOUSE, 1 warp_event 17, 5, MR_POKEMONS_HOUSE, 1 - db 0 ; coord events + def_coord_events - db 5 ; bg events + def_bg_events bg_event 9, 43, BGEVENT_READ, Route30Sign bg_event 13, 29, BGEVENT_READ, MrPokemonsHouseDirectionsSign bg_event 15, 5, BGEVENT_READ, MrPokemonsHouseSign bg_event 3, 21, BGEVENT_READ, Route30TrainerTips bg_event 14, 9, BGEVENT_ITEM, Route30HiddenPotion - db 11 ; object events + def_object_events object_event 5, 26, SPRITE_YOUNGSTER, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_SCRIPT, 0, YoungsterJoey_ImportantBattleScript, EVENT_ROUTE_30_BATTLE object_event 2, 28, SPRITE_YOUNGSTER, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_TRAINER, 3, TrainerYoungsterJoey, EVENT_ROUTE_30_YOUNGSTER_JOEY object_event 5, 23, SPRITE_YOUNGSTER, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_TRAINER, 1, TrainerYoungsterMikey, -1 diff --git a/maps/Route30BerryHouse.asm b/maps/Route30BerryHouse.asm index a996067a5..d7c68d2af 100644 --- a/maps/Route30BerryHouse.asm +++ b/maps/Route30BerryHouse.asm @@ -1,10 +1,10 @@ - object_const_def ; object_event constants + object_const_def const ROUTE30BERRYHOUSE_POKEFAN_M Route30BerryHouse_MapScripts: - db 0 ; scene scripts + def_scene_scripts - db 0 ; callbacks + def_callbacks Route30BerryHousePokefanMScript: faceplayer @@ -47,15 +47,15 @@ Route30BerrySpeechHouseCheckTreesText: Route30BerryHouse_MapEvents: db 0, 0 ; filler - db 2 ; warp events + def_warp_events warp_event 2, 7, ROUTE_30, 1 warp_event 3, 7, ROUTE_30, 1 - db 0 ; coord events + def_coord_events - db 2 ; bg events + def_bg_events bg_event 0, 1, BGEVENT_READ, Route30BerryHouseBookshelf bg_event 1, 1, BGEVENT_READ, Route30BerryHouseBookshelf - db 1 ; object events + def_object_events object_event 2, 3, SPRITE_POKEFAN_M, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_BROWN, OBJECTTYPE_SCRIPT, 0, Route30BerryHousePokefanMScript, -1 diff --git a/maps/Route31.asm b/maps/Route31.asm index f95485af9..a3b52349a 100644 --- a/maps/Route31.asm +++ b/maps/Route31.asm @@ -1,4 +1,4 @@ - object_const_def ; object_event constants + object_const_def const ROUTE31_FISHER const ROUTE31_YOUNGSTER const ROUTE31_BUG_CATCHER @@ -8,9 +8,9 @@ const ROUTE31_POKE_BALL2 Route31_MapScripts: - db 0 ; scene scripts + def_scene_scripts - db 1 ; callbacks + def_callbacks callback MAPCALLBACK_NEWMAP, .CheckMomCall .CheckMomCall: @@ -418,18 +418,18 @@ DarkCaveSignText: Route31_MapEvents: db 0, 0 ; filler - db 3 ; warp events + def_warp_events 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 + def_coord_events - db 2 ; bg events + def_bg_events bg_event 7, 5, BGEVENT_READ, Route31Sign bg_event 31, 5, BGEVENT_READ, DarkCaveSign - db 7 ; object events + def_object_events object_event 17, 7, SPRITE_FISHER, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, Route31MailRecipientScript, -1 object_event 9, 5, SPRITE_YOUNGSTER, SPRITEMOVEDATA_WANDER, 1, 1, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, Route31YoungsterScript, -1 object_event 21, 13, SPRITE_BUG_CATCHER, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, PAL_NPC_BROWN, OBJECTTYPE_TRAINER, 5, TrainerBugCatcherWade1, -1 diff --git a/maps/Route31VioletGate.asm b/maps/Route31VioletGate.asm index c8b4fedcf..59a67e947 100644 --- a/maps/Route31VioletGate.asm +++ b/maps/Route31VioletGate.asm @@ -1,11 +1,11 @@ - object_const_def ; object_event constants + object_const_def const ROUTE31VIOLETGATE_OFFICER const ROUTE31VIOLETGATE_COOLTRAINER_F Route31VioletGate_MapScripts: - db 0 ; scene scripts + def_scene_scripts - db 0 ; callbacks + def_callbacks Route31VioletGateOfficerScript: jumptextfaceplayer Route31VioletGateOfficerText @@ -28,16 +28,16 @@ Route31VioletGateCooltrainerFText: Route31VioletGate_MapEvents: db 0, 0 ; filler - db 4 ; warp events + def_warp_events 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 + def_coord_events - db 0 ; bg events + def_bg_events - db 2 ; object events + def_object_events object_event 5, 2, SPRITE_OFFICER, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_SCRIPT, 0, Route31VioletGateOfficerScript, -1 object_event 1, 2, SPRITE_COOLTRAINER_F, SPRITEMOVEDATA_SPINRANDOM_SLOW, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_SCRIPT, 0, Route31VioletGateCooltrainerFScript, -1 diff --git a/maps/Route32.asm b/maps/Route32.asm index ab94162cf..2caaf96d5 100644 --- a/maps/Route32.asm +++ b/maps/Route32.asm @@ -1,4 +1,4 @@ - object_const_def ; object_event constants + object_const_def const ROUTE32_FISHER1 const ROUTE32_FISHER2 const ROUTE32_FISHER3 @@ -15,12 +15,12 @@ const ROUTE32_POKE_BALL2 Route32_MapScripts: - db 3 ; scene scripts + def_scene_scripts scene_script .DummyScene0 ; SCENE_DEFAULT scene_script .DummyScene1 ; SCENE_ROUTE32_OFFER_SLOWPOKETAIL scene_script .DummyScene2 ; SCENE_ROUTE32_NOTHING - db 1 ; callbacks + def_callbacks callback MAPCALLBACK_OBJECTS, .Frieda .DummyScene0: @@ -929,17 +929,17 @@ Route32UnionCaveSignText: Route32_MapEvents: db 0, 0 ; filler - db 4 ; warp events + def_warp_events 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 + def_coord_events coord_event 18, 8, SCENE_DEFAULT, Route32CooltrainerMStopsYouScene coord_event 7, 71, SCENE_ROUTE32_OFFER_SLOWPOKETAIL, Route32WannaBuyASlowpokeTailScript - db 6 ; bg events + def_bg_events bg_event 13, 5, BGEVENT_READ, Route32Sign bg_event 9, 1, BGEVENT_READ, Route32RuinsSign bg_event 10, 84, BGEVENT_READ, Route32UnionCaveSign @@ -947,7 +947,7 @@ Route32_MapEvents: bg_event 12, 67, BGEVENT_ITEM, Route32HiddenGreatBall bg_event 11, 40, BGEVENT_ITEM, Route32HiddenSuperPotion - db 14 ; object events + def_object_events object_event 8, 49, SPRITE_FISHER, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_TRAINER, 1, TrainerFisherJustin, -1 object_event 12, 56, SPRITE_FISHER, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_TRAINER, 3, TrainerFisherRalph1, -1 object_event 6, 48, SPRITE_FISHER, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_TRAINER, 1, TrainerFisherHenry, -1 diff --git a/maps/Route32Pokecenter1F.asm b/maps/Route32Pokecenter1F.asm index 0ddb77895..640def5ad 100644 --- a/maps/Route32Pokecenter1F.asm +++ b/maps/Route32Pokecenter1F.asm @@ -1,12 +1,12 @@ - object_const_def ; object_event constants + object_const_def const ROUTE32POKECENTER1F_NURSE const ROUTE32POKECENTER1F_FISHING_GURU const ROUTE32POKECENTER1F_COOLTRAINER_F Route32Pokecenter1F_MapScripts: - db 0 ; scene scripts + def_scene_scripts - db 0 ; callbacks + def_callbacks Route32Pokecenter1FNurseScript: jumpstd PokecenterNurseScript @@ -95,16 +95,16 @@ Route32Pokecenter1FCooltrainerFText: Route32Pokecenter1F_MapEvents: db 0, 0 ; filler - db 3 ; warp events + def_warp_events 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 + def_coord_events - db 0 ; bg events + def_bg_events - db 3 ; object events + def_object_events object_event 3, 1, SPRITE_NURSE, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, Route32Pokecenter1FNurseScript, -1 object_event 1, 4, SPRITE_FISHING_GURU, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_SCRIPT, 0, Route32Pokecenter1FFishingGuruScript, -1 object_event 6, 2, SPRITE_COOLTRAINER_F, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_SCRIPT, 0, Route32Pokecenter1FCooltrainerFScript, -1 diff --git a/maps/Route32RuinsOfAlphGate.asm b/maps/Route32RuinsOfAlphGate.asm index f35403baf..c30f4cb43 100644 --- a/maps/Route32RuinsOfAlphGate.asm +++ b/maps/Route32RuinsOfAlphGate.asm @@ -1,12 +1,12 @@ - object_const_def ; object_event constants + object_const_def const ROUTE32RUINSOFALPHGATE_OFFICER const ROUTE32RUINSOFALPHGATE_POKEFAN_M const ROUTE32RUINSOFALPHGATE_YOUNGSTER Route32RuinsOfAlphGate_MapScripts: - db 0 ; scene scripts + def_scene_scripts - db 0 ; callbacks + def_callbacks Route32RuinsOfAlphGateOfficerScript: jumptextfaceplayer Route32RuinsOfAlphGateOfficerText @@ -47,17 +47,17 @@ Route32RuinsOfAlphGateYoungsterText: Route32RuinsOfAlphGate_MapEvents: db 0, 0 ; filler - db 4 ; warp events + def_warp_events 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 + def_coord_events - db 0 ; bg events + def_bg_events - db 3 ; object events + def_object_events object_event 5, 2, SPRITE_OFFICER, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_SCRIPT, 0, Route32RuinsOfAlphGateOfficerScript, -1 object_event 8, 2, SPRITE_POKEFAN_M, SPRITEMOVEDATA_WALK_UP_DOWN, 0, 1, -1, -1, PAL_NPC_BROWN, OBJECTTYPE_SCRIPT, 0, Route32RuinsOfAlphGatePokefanMScript, -1 object_event 1, 6, SPRITE_YOUNGSTER, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_SCRIPT, 0, Route32RuinsOfAlphGateYoungsterScript, -1 diff --git a/maps/Route33.asm b/maps/Route33.asm index daf4224d9..389f8658a 100644 --- a/maps/Route33.asm +++ b/maps/Route33.asm @@ -1,12 +1,12 @@ - object_const_def ; object_event constants + object_const_def const ROUTE33_POKEFAN_M const ROUTE33_LASS const ROUTE33_FRUIT_TREE Route33_MapScripts: - db 0 ; scene scripts + def_scene_scripts - db 0 ; callbacks + def_callbacks Route33LassScript: jumptextfaceplayer Route33LassText @@ -195,15 +195,15 @@ Route33SignText: Route33_MapEvents: db 0, 0 ; filler - db 1 ; warp events + def_warp_events warp_event 11, 9, UNION_CAVE_1F, 3 - db 0 ; coord events + def_coord_events - db 1 ; bg events + def_bg_events bg_event 11, 11, BGEVENT_READ, Route33Sign - db 3 ; object events + def_object_events object_event 6, 13, SPRITE_POKEFAN_M, SPRITEMOVEDATA_SPINRANDOM_FAST, 0, 0, -1, -1, PAL_NPC_BROWN, OBJECTTYPE_TRAINER, 2, TrainerHikerAnthony, -1 object_event 13, 16, SPRITE_LASS, SPRITEMOVEDATA_WANDER, 1, 1, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_SCRIPT, 0, Route33LassScript, -1 object_event 14, 16, SPRITE_FRUIT_TREE, SPRITEMOVEDATA_STILL, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, Route33FruitTree, -1 diff --git a/maps/Route34.asm b/maps/Route34.asm index 84c70d1a8..a688bbb49 100644 --- a/maps/Route34.asm +++ b/maps/Route34.asm @@ -1,4 +1,4 @@ - object_const_def ; object_event constants + object_const_def const ROUTE34_YOUNGSTER1 const ROUTE34_YOUNGSTER2 const ROUTE34_YOUNGSTER3 @@ -14,9 +14,9 @@ const ROUTE34_POKE_BALL Route34_MapScripts: - db 0 ; scene scripts + def_scene_scripts - db 1 ; callbacks + def_callbacks callback MAPCALLBACK_OBJECTS, .EggCheckCallback .EggCheckCallback: @@ -763,23 +763,23 @@ DayCareSignText: Route34_MapEvents: db 0, 0 ; filler - db 5 ; warp events + def_warp_events 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 + def_coord_events - db 5 ; bg events + def_bg_events bg_event 12, 6, BGEVENT_READ, Route34Sign bg_event 13, 33, BGEVENT_READ, Route34TrainerTips bg_event 10, 13, BGEVENT_READ, DayCareSign bg_event 8, 32, BGEVENT_ITEM, Route34HiddenRareCandy bg_event 17, 19, BGEVENT_ITEM, Route34HiddenSuperPotion - db 13 ; object events + def_object_events object_event 13, 7, SPRITE_YOUNGSTER, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_TRAINER, 5, TrainerCamperTodd1, -1 object_event 15, 32, SPRITE_YOUNGSTER, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_TRAINER, 3, TrainerYoungsterSamuel, -1 object_event 11, 20, SPRITE_YOUNGSTER, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_TRAINER, 3, TrainerYoungsterIan, -1 diff --git a/maps/Route34IlexForestGate.asm b/maps/Route34IlexForestGate.asm index f018dc650..6c84c5646 100644 --- a/maps/Route34IlexForestGate.asm +++ b/maps/Route34IlexForestGate.asm @@ -1,13 +1,13 @@ - object_const_def ; object_event constants + object_const_def const ROUTE34ILEXFORESTGATE_TEACHER1 const ROUTE34ILEXFORESTGATE_BUTTERFREE const ROUTE34ILEXFORESTGATE_LASS const ROUTE34ILEXFORESTGATE_TEACHER2 Route34IlexForestGate_MapScripts: - db 0 ; scene scripts + def_scene_scripts - db 1 ; callbacks + def_callbacks callback MAPCALLBACK_OBJECTS, .IsForestRestless .IsForestRestless: @@ -136,18 +136,18 @@ Route34IlexForestGateLassText: Route34IlexForestGate_MapEvents: db 0, 0 ; filler - db 4 ; warp events + def_warp_events 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 + def_coord_events coord_event 4, 7, SCENE_DEFAULT, Route34IlexForestGateCelebiEvent - db 0 ; bg events + def_bg_events - db 4 ; object events + def_object_events object_event 9, 3, SPRITE_TEACHER, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_SCRIPT, 0, Route34IlexForestGateTeacherScript, EVENT_ROUTE_34_ILEX_FOREST_GATE_TEACHER_BEHIND_COUNTER object_event 9, 4, SPRITE_BUTTERFREE, SPRITEMOVEDATA_POKEMON, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_SCRIPT, 0, Route34IlexForestGateButterfreeScript, -1 object_event 3, 4, SPRITE_LASS, SPRITEMOVEDATA_WALK_UP_DOWN, 0, 1, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_SCRIPT, 0, Route34IlexForestGateLassScript, EVENT_ROUTE_34_ILEX_FOREST_GATE_LASS diff --git a/maps/Route35.asm b/maps/Route35.asm index b0caa4127..2fe0d50c7 100644 --- a/maps/Route35.asm +++ b/maps/Route35.asm @@ -1,4 +1,4 @@ - object_const_def ; object_event constants + object_const_def const ROUTE35_YOUNGSTER1 const ROUTE35_YOUNGSTER2 const ROUTE35_LASS1 @@ -12,9 +12,9 @@ const ROUTE35_POKE_BALL Route35_MapScripts: - db 0 ; scene scripts + def_scene_scripts - db 0 ; callbacks + def_callbacks TrainerBirdKeeperBryan: trainer BIRD_KEEPER, BRYAN, EVENT_BEAT_BIRD_KEEPER_BRYAN, BirdKeeperBryanSeenText, BirdKeeperBryanBeatenText, 0, .Script @@ -463,18 +463,18 @@ Route35SignText: Route35_MapEvents: db 0, 0 ; filler - db 3 ; warp events + def_warp_events 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 + def_coord_events - db 2 ; bg events + def_bg_events bg_event 1, 7, BGEVENT_READ, Route35Sign bg_event 11, 31, BGEVENT_READ, Route35Sign - db 11 ; object events + def_object_events object_event 4, 19, SPRITE_YOUNGSTER, SPRITEMOVEDATA_SPINRANDOM_FAST, 0, 0, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_TRAINER, 2, TrainerCamperIvan, -1 object_event 8, 20, SPRITE_YOUNGSTER, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_TRAINER, 3, TrainerCamperElliot, -1 object_event 7, 20, SPRITE_LASS, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_TRAINER, 3, TrainerPicnickerBrooke, -1 diff --git a/maps/Route35GoldenrodGate.asm b/maps/Route35GoldenrodGate.asm index b45970af2..eedbbddd4 100644 --- a/maps/Route35GoldenrodGate.asm +++ b/maps/Route35GoldenrodGate.asm @@ -1,12 +1,12 @@ - object_const_def ; object_event constants + object_const_def const ROUTE35GOLDENRODGATE_RANDY const ROUTE35GOLDENRODGATE_POKEFAN_F const ROUTE35GOLDENRODGATE_FISHER Route35GoldenrodGate_MapScripts: - db 0 ; scene scripts + def_scene_scripts - db 0 ; callbacks + def_callbacks RandyScript: faceplayer @@ -198,17 +198,17 @@ Route35GoldenrodGateFisherText: Route35GoldenrodGate_MapEvents: db 0, 0 ; filler - db 4 ; warp events + def_warp_events 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 + def_coord_events - db 0 ; bg events + def_bg_events - db 3 ; object events + def_object_events object_event 0, 4, SPRITE_OFFICER, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_SCRIPT, 0, RandyScript, -1 object_event 6, 4, SPRITE_POKEFAN_F, SPRITEMOVEDATA_WALK_UP_DOWN, 0, 1, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_SCRIPT, 0, Route35GoldenrodGatePokefanFScript, -1 object_event 3, 2, SPRITE_FISHER, SPRITEMOVEDATA_SPINRANDOM_SLOW, 0, 0, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_SCRIPT, 0, Route35GoldenrodGateFisherScript, -1 diff --git a/maps/Route35NationalParkGate.asm b/maps/Route35NationalParkGate.asm index 05588b51c..7d231254c 100644 --- a/maps/Route35NationalParkGate.asm +++ b/maps/Route35NationalParkGate.asm @@ -1,15 +1,15 @@ - object_const_def ; object_event constants + object_const_def const ROUTE35NATIONALPARKGATE_OFFICER1 const ROUTE35NATIONALPARKGATE_YOUNGSTER const ROUTE35NATIONALPARKGATE_OFFICER2 Route35NationalParkGate_MapScripts: - db 3 ; scene scripts + def_scene_scripts scene_script .DummyScene0 ; SCENE_ROUTE35NATIONALPARKGATE_NOTHING scene_script .DummyScene1 ; SCENE_ROUTE35NATIONALPARKGATE_UNUSED scene_script .LeaveContestEarly ; SCENE_ROUTE35NATIONALPARKGATE_LEAVE_CONTEST_EARLY - db 2 ; callbacks + def_callbacks callback MAPCALLBACK_NEWMAP, .CheckIfContestRunning callback MAPCALLBACK_OBJECTS, .CheckIfContestAvailable @@ -438,18 +438,18 @@ BugCatchingContestExplanationText: Route35NationalParkGate_MapEvents: db 0, 0 ; filler - db 4 ; warp events + def_warp_events 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 + def_coord_events - db 1 ; bg events + def_bg_events bg_event 5, 0, BGEVENT_READ, BugCatchingContestExplanationSign - db 3 ; object events + def_object_events object_event 2, 1, SPRITE_OFFICER, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_SCRIPT, 0, Route35OfficerScriptContest, EVENT_ROUTE_35_NATIONAL_PARK_GATE_OFFICER_CONTEST_DAY object_event 6, 5, SPRITE_YOUNGSTER, SPRITEMOVEDATA_WANDER, 1, 1, -1, -1, PAL_NPC_RED, OBJECTTYPE_SCRIPT, 0, Route35NationalParkGateYoungsterScript, EVENT_ROUTE_35_NATIONAL_PARK_GATE_YOUNGSTER object_event 0, 3, SPRITE_OFFICER, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_SCRIPT, 0, Route35NationalParkGateOfficerScript, EVENT_ROUTE_35_NATIONAL_PARK_GATE_OFFICER_NOT_CONTEST_DAY diff --git a/maps/Route36.asm b/maps/Route36.asm index 68132ef83..9ad2c83f4 100644 --- a/maps/Route36.asm +++ b/maps/Route36.asm @@ -1,4 +1,4 @@ - object_const_def ; object_event constants + object_const_def const ROUTE36_YOUNGSTER1 const ROUTE36_YOUNGSTER2 const ROUTE36_WEIRD_TREE @@ -10,11 +10,11 @@ const ROUTE36_SUICUNE Route36_MapScripts: - db 2 ; scene scripts + def_scene_scripts scene_script .DummyScene0 ; SCENE_ROUTE36_NOTHING scene_script .DummyScene1 ; SCENE_ROUTE36_SUICUNE - db 1 ; callbacks + def_callbacks callback MAPCALLBACK_OBJECTS, .ArthurCallback .DummyScene0: @@ -660,23 +660,23 @@ Route36TrainerTips2Text: Route36_MapEvents: db 0, 0 ; filler - db 4 ; warp events + def_warp_events 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 + def_coord_events coord_event 20, 7, SCENE_ROUTE36_SUICUNE, Route36SuicuneScript coord_event 22, 7, SCENE_ROUTE36_SUICUNE, Route36SuicuneScript - db 4 ; bg events + def_bg_events bg_event 29, 1, BGEVENT_READ, Route36TrainerTips2 bg_event 45, 11, BGEVENT_READ, RuinsOfAlphNorthSign bg_event 55, 7, BGEVENT_READ, Route36Sign bg_event 21, 7, BGEVENT_READ, Route36TrainerTips1 - db 9 ; object events + def_object_events object_event 20, 13, SPRITE_YOUNGSTER, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_TRAINER, 3, TrainerPsychicMark, -1 object_event 31, 14, SPRITE_YOUNGSTER, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_TRAINER, 5, TrainerSchoolboyAlan1, -1 object_event 35, 9, SPRITE_WEIRD_TREE, SPRITEMOVEDATA_SUDOWOODO, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, SudowoodoScript, EVENT_ROUTE_36_SUDOWOODO diff --git a/maps/Route36NationalParkGate.asm b/maps/Route36NationalParkGate.asm index adf57ce0d..c0fd51773 100644 --- a/maps/Route36NationalParkGate.asm +++ b/maps/Route36NationalParkGate.asm @@ -1,4 +1,4 @@ - object_const_def ; object_event constants + object_const_def const ROUTE36NATIONALPARKGATE_OFFICER1 const ROUTE36NATIONALPARKGATE_YOUNGSTER1 const ROUTE36NATIONALPARKGATE_YOUNGSTER2 @@ -13,12 +13,12 @@ const ROUTE36NATIONALPARKGATE_OFFICER2 Route36NationalParkGate_MapScripts: - db 3 ; scene scripts + def_scene_scripts scene_script .DummyScene0 ; SCENE_ROUTE36NATIONALPARKGATE_NOTHING scene_script .DummyScene1 ; SCENE_ROUTE36NATIONALPARKGATE_UNUSED scene_script .LeaveContestEarly ; SCENE_ROUTE36NATIONALPARKGATE_LEAVE_CONTEST_EARLY - db 2 ; callbacks + def_callbacks callback MAPCALLBACK_NEWMAP, .CheckIfContestRunning callback MAPCALLBACK_OBJECTS, .CheckIfContestAvailable @@ -852,18 +852,18 @@ Route36NationalParkGateOfficer1HeresThePrizeText: Route36NationalParkGate_MapEvents: db 0, 0 ; filler - db 4 ; warp events + def_warp_events 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 + def_coord_events - db 1 ; bg events + def_bg_events bg_event 6, 0, BGEVENT_READ, BugCatchingContestExplanationSign - db 12 ; object events + def_object_events object_event 0, 3, SPRITE_OFFICER, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_SCRIPT, 0, Route36OfficerScriptContest, EVENT_ROUTE_36_NATIONAL_PARK_GATE_OFFICER_CONTEST_DAY object_event 2, 5, SPRITE_YOUNGSTER, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_SCRIPT, 0, BugCatchingContestant1BScript, EVENT_BUG_CATCHING_CONTESTANT_1B object_event 4, 5, SPRITE_YOUNGSTER, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_SCRIPT, 0, BugCatchingContestant2BScript, EVENT_BUG_CATCHING_CONTESTANT_2B diff --git a/maps/Route36RuinsOfAlphGate.asm b/maps/Route36RuinsOfAlphGate.asm index bced6d8d0..a33a3ce80 100644 --- a/maps/Route36RuinsOfAlphGate.asm +++ b/maps/Route36RuinsOfAlphGate.asm @@ -1,11 +1,11 @@ - object_const_def ; object_event constants + object_const_def const ROUTE36RUINSOFALPHGATE_OFFICER const ROUTE36RUINSOFALPHGATE_GRAMPS Route36RuinsOfAlphGate_MapScripts: - db 0 ; scene scripts + def_scene_scripts - db 0 ; callbacks + def_callbacks Route36RuinsOfAlphGateOfficerScript: jumptextfaceplayer Route36RuinsOfAlphGateOfficerText @@ -35,16 +35,16 @@ Route36RuinsOfAlphGateGrampsText: Route36RuinsOfAlphGate_MapEvents: db 0, 0 ; filler - db 4 ; warp events + def_warp_events 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 + def_coord_events - db 0 ; bg events + def_bg_events - db 2 ; object events + def_object_events object_event 0, 4, SPRITE_OFFICER, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_SCRIPT, 0, Route36RuinsOfAlphGateOfficerScript, -1 object_event 7, 5, SPRITE_GRAMPS, SPRITEMOVEDATA_WANDER, 1, 2, -1, -1, PAL_NPC_BROWN, OBJECTTYPE_SCRIPT, 0, Route36RuinsOfAlphGateGrampsScript, -1 diff --git a/maps/Route37.asm b/maps/Route37.asm index 257007dc6..f1e7f96f9 100644 --- a/maps/Route37.asm +++ b/maps/Route37.asm @@ -1,4 +1,4 @@ - object_const_def ; object_event constants + object_const_def const ROUTE37_WEIRD_TREE1 const ROUTE37_WEIRD_TREE2 const ROUTE37_YOUNGSTER @@ -8,9 +8,9 @@ const ROUTE37_FRUIT_TREE3 Route37_MapScripts: - db 0 ; scene scripts + def_scene_scripts - db 1 ; callbacks + def_callbacks callback MAPCALLBACK_OBJECTS, .Sunny .Sunny: @@ -238,15 +238,15 @@ Route37SignText: Route37_MapEvents: db 0, 0 ; filler - db 0 ; warp events + def_warp_events - db 0 ; coord events + def_coord_events - db 2 ; bg events + def_bg_events bg_event 5, 3, BGEVENT_READ, Route37Sign bg_event 4, 2, BGEVENT_ITEM, Route37HiddenEther - db 7 ; object events + def_object_events object_event 6, 12, SPRITE_WEIRD_TREE, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_TRAINER, 1, TrainerTwinsAnnandanne1, -1 object_event 7, 12, SPRITE_WEIRD_TREE, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_TRAINER, 1, TrainerTwinsAnnandanne2, -1 object_event 6, 6, SPRITE_YOUNGSTER, SPRITEMOVEDATA_SPINRANDOM_FAST, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_TRAINER, 1, TrainerPsychicGreg, -1 diff --git a/maps/Route38.asm b/maps/Route38.asm index 508c8684c..4e6902b6a 100644 --- a/maps/Route38.asm +++ b/maps/Route38.asm @@ -1,4 +1,4 @@ - object_const_def ; object_event constants + object_const_def const ROUTE38_STANDING_YOUNGSTER1 const ROUTE38_LASS const ROUTE38_STANDING_YOUNGSTER2 @@ -8,9 +8,9 @@ const ROUTE38_BEAUTY2 Route38_MapScripts: - db 0 ; scene scripts + def_scene_scripts - db 0 ; callbacks + def_callbacks TrainerBirdKeeperToby: trainer BIRD_KEEPER, TOBY, EVENT_BEAT_BIRD_KEEPER_TOBY, BirdKeeperTobySeenText, BirdKeeperTobyBeatenText, 0, .Script @@ -473,17 +473,17 @@ Route38TrainerTipsText: Route38_MapEvents: db 0, 0 ; filler - db 2 ; warp events + def_warp_events warp_event 35, 8, ROUTE_38_ECRUTEAK_GATE, 1 warp_event 35, 9, ROUTE_38_ECRUTEAK_GATE, 2 - db 0 ; coord events + def_coord_events - db 2 ; bg events + def_bg_events bg_event 33, 7, BGEVENT_READ, Route38Sign bg_event 5, 13, BGEVENT_READ, Route38TrainerTips - db 7 ; object events + def_object_events object_event 4, 1, SPRITE_STANDING_YOUNGSTER, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_TRAINER, 1, TrainerSchoolboyChad1, -1 object_event 15, 3, SPRITE_LASS, SPRITEMOVEDATA_SPINRANDOM_FAST, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_TRAINER, 2, TrainerLassDana1, -1 object_event 12, 15, SPRITE_STANDING_YOUNGSTER, SPRITEMOVEDATA_SPINRANDOM_FAST, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_TRAINER, 1, TrainerBirdKeeperToby, -1 diff --git a/maps/Route38EcruteakGate.asm b/maps/Route38EcruteakGate.asm index 7b6aaee40..c7467a427 100644 --- a/maps/Route38EcruteakGate.asm +++ b/maps/Route38EcruteakGate.asm @@ -1,10 +1,10 @@ - object_const_def ; object_event constants + object_const_def const ROUTE38ECRUTEAKGATE_OFFICER Route38EcruteakGate_MapScripts: - db 0 ; scene scripts + def_scene_scripts - db 0 ; callbacks + def_callbacks Route38EcruteakGateOfficerScript: jumptextfaceplayer Route38EcruteakGateOfficerText @@ -25,15 +25,15 @@ Route38EcruteakGateOfficerText: Route38EcruteakGate_MapEvents: db 0, 0 ; filler - db 4 ; warp events + def_warp_events 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 + def_coord_events - db 0 ; bg events + def_bg_events - db 1 ; object events + def_object_events object_event 5, 2, SPRITE_OFFICER, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_SCRIPT, 0, Route38EcruteakGateOfficerScript, -1 diff --git a/maps/Route39.asm b/maps/Route39.asm index 650bf5079..0e19773ac 100644 --- a/maps/Route39.asm +++ b/maps/Route39.asm @@ -1,4 +1,4 @@ - object_const_def ; object_event constants + object_const_def const ROUTE39_SAILOR const ROUTE39_POKEFAN_M const ROUTE39_POKEFAN_F1 @@ -11,9 +11,9 @@ const ROUTE39_POKEFAN_F2 Route39_MapScripts: - db 0 ; scene scripts + def_scene_scripts - db 0 ; callbacks + def_callbacks Route39Miltank: opentext @@ -344,19 +344,19 @@ Route39TrainerTipsText: Route39_MapEvents: db 0, 0 ; filler - db 2 ; warp events + def_warp_events warp_event 1, 3, ROUTE_39_BARN, 1 warp_event 5, 3, ROUTE_39_FARMHOUSE, 1 - db 0 ; coord events + def_coord_events - db 4 ; bg events + def_bg_events bg_event 5, 31, BGEVENT_READ, Route39TrainerTips bg_event 9, 5, BGEVENT_READ, MoomooFarmSign bg_event 15, 7, BGEVENT_READ, Route39Sign bg_event 5, 13, BGEVENT_ITEM, Route39HiddenNugget - db 10 ; object events + def_object_events object_event 13, 29, SPRITE_SAILOR, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_TRAINER, 5, TrainerSailorEugene, -1 object_event 10, 22, SPRITE_POKEFAN_M, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_TRAINER, 4, TrainerPokefanmDerek, -1 object_event 11, 19, SPRITE_POKEFAN_F, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_TRAINER, 4, TrainerPokefanfRuth, -1 diff --git a/maps/Route39Barn.asm b/maps/Route39Barn.asm index 0bbfe0e59..33c838904 100644 --- a/maps/Route39Barn.asm +++ b/maps/Route39Barn.asm @@ -1,12 +1,12 @@ - object_const_def ; object_event constants + object_const_def const ROUTE39BARN_TWIN1 const ROUTE39BARN_TWIN2 const ROUTE39BARN_MOOMOO Route39Barn_MapScripts: - db 0 ; scene scripts + def_scene_scripts - db 0 ; callbacks + def_callbacks Route39BarnTwin1Script: faceplayer @@ -189,15 +189,15 @@ Route39BarnRefusedBerryText: Route39Barn_MapEvents: db 0, 0 ; filler - db 2 ; warp events + def_warp_events warp_event 3, 7, ROUTE_39, 1 warp_event 4, 7, ROUTE_39, 1 - db 0 ; coord events + def_coord_events - db 0 ; bg events + def_bg_events - db 3 ; object events + def_object_events object_event 2, 3, SPRITE_TWIN, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, Route39BarnTwin1Script, -1 object_event 4, 3, SPRITE_TWIN, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_SCRIPT, 0, Route39BarnTwin2Script, -1 object_event 3, 3, SPRITE_TAUROS, SPRITEMOVEDATA_POKEMON, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, MoomooScript, -1 diff --git a/maps/Route39Farmhouse.asm b/maps/Route39Farmhouse.asm index 5f62637fe..29f08d911 100644 --- a/maps/Route39Farmhouse.asm +++ b/maps/Route39Farmhouse.asm @@ -1,13 +1,13 @@ ROUTE39FARMHOUSE_MILK_PRICE EQU 500 - object_const_def ; object_event constants + object_const_def const ROUTE39FARMHOUSE_POKEFAN_M const ROUTE39FARMHOUSE_POKEFAN_F Route39Farmhouse_MapScripts: - db 0 ; scene scripts + def_scene_scripts - db 0 ; callbacks + def_callbacks PokefanM_DairyFarmer: faceplayer @@ -195,16 +195,16 @@ FarmerFText_SnoreSpeech: Route39Farmhouse_MapEvents: db 0, 0 ; filler - db 2 ; warp events + def_warp_events warp_event 2, 7, ROUTE_39, 2 warp_event 3, 7, ROUTE_39, 2 - db 0 ; coord events + def_coord_events - db 2 ; bg events + def_bg_events bg_event 0, 1, BGEVENT_READ, FarmhouseBookshelf bg_event 1, 1, BGEVENT_READ, FarmhouseBookshelf - db 2 ; object events + def_object_events object_event 3, 2, SPRITE_POKEFAN_M, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_SCRIPT, 0, PokefanM_DairyFarmer, -1 object_event 5, 4, SPRITE_POKEFAN_F, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, PAL_NPC_BROWN, OBJECTTYPE_SCRIPT, 0, PokefanF_SnoreFarmer, -1 diff --git a/maps/Route4.asm b/maps/Route4.asm index b39beb7f6..4f86bf502 100644 --- a/maps/Route4.asm +++ b/maps/Route4.asm @@ -1,13 +1,13 @@ - object_const_def ; object_event constants + object_const_def const ROUTE4_YOUNGSTER const ROUTE4_LASS1 const ROUTE4_LASS2 const ROUTE4_POKE_BALL Route4_MapScripts: - db 0 ; scene scripts + def_scene_scripts - db 0 ; callbacks + def_callbacks TrainerBirdKeeperHank: trainer BIRD_KEEPER, HANK, EVENT_BEAT_BIRD_KEEPER_HANK, BirdKeeperHankSeenText, BirdKeeperHankBeatenText, 0, .Script @@ -121,16 +121,16 @@ MtMoonSquareSignText: Route4_MapEvents: db 0, 0 ; filler - db 1 ; warp events + def_warp_events warp_event 2, 5, MOUNT_MOON, 2 - db 0 ; coord events + def_coord_events - db 2 ; bg events + def_bg_events bg_event 3, 7, BGEVENT_READ, MtMoonSquareSign bg_event 10, 3, BGEVENT_ITEM, Route4HiddenUltraBall - db 4 ; object events + def_object_events object_event 17, 9, SPRITE_YOUNGSTER, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_TRAINER, 3, TrainerBirdKeeperHank, -1 object_event 9, 8, SPRITE_LASS, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_TRAINER, 4, TrainerPicnickerHope, -1 object_event 21, 6, SPRITE_LASS, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_TRAINER, 4, TrainerPicnickerSharon, -1 diff --git a/maps/Route40.asm b/maps/Route40.asm index 7f0563f60..4e9abcade 100644 --- a/maps/Route40.asm +++ b/maps/Route40.asm @@ -1,4 +1,4 @@ - object_const_def ; object_event constants + object_const_def const ROUTE40_OLIVINE_RIVAL1 const ROUTE40_OLIVINE_RIVAL2 const ROUTE40_SWIMMER_GIRL1 @@ -13,9 +13,9 @@ const ROUTE40_STANDING_YOUNGSTER Route40_MapScripts: - db 0 ; scene scripts + def_scene_scripts - db 1 ; callbacks + def_callbacks callback MAPCALLBACK_OBJECTS, .MonicaCallback .MonicaCallback: @@ -338,16 +338,16 @@ Route40SignText: Route40_MapEvents: db 0, 0 ; filler - db 1 ; warp events + def_warp_events warp_event 9, 5, ROUTE_40_BATTLE_TOWER_GATE, 1 - db 0 ; coord events + def_coord_events - db 2 ; bg events + def_bg_events bg_event 14, 10, BGEVENT_READ, Route40Sign bg_event 7, 8, BGEVENT_ITEM, Route40HiddenHyperPotion - db 12 ; object events + def_object_events object_event 14, 15, SPRITE_OLIVINE_RIVAL, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_TRAINER, 4, TrainerSwimmermSimon, -1 object_event 18, 30, SPRITE_OLIVINE_RIVAL, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_TRAINER, 5, TrainerSwimmermRandall, -1 object_event 3, 19, SPRITE_SWIMMER_GIRL, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_TRAINER, 4, TrainerSwimmerfElaine, -1 diff --git a/maps/Route40BattleTowerGate.asm b/maps/Route40BattleTowerGate.asm index e37ad9bc0..b2da1a5eb 100644 --- a/maps/Route40BattleTowerGate.asm +++ b/maps/Route40BattleTowerGate.asm @@ -1,11 +1,11 @@ - object_const_def ; object_event constants + object_const_def const ROUTE40BATTLETOWERGATE_ROCKER const ROUTE40BATTLETOWERGATE_TWIN Route40BattleTowerGate_MapScripts: - db 0 ; scene scripts + def_scene_scripts - db 1 ; callbacks + def_callbacks callback MAPCALLBACK_OBJECTS, .ShowSailor .ShowSailor: @@ -71,16 +71,16 @@ Route40BattleTowerGateTwinText: Route40BattleTowerGate_MapEvents: db 0, 0 ; filler - db 4 ; warp events + def_warp_events 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 + def_coord_events - db 0 ; bg events + def_bg_events - db 2 ; object events + def_object_events object_event 3, 3, SPRITE_ROCKER, SPRITEMOVEDATA_SPINRANDOM_SLOW, 0, 0, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_SCRIPT, 0, Route40BattleTowerGateRockerScript, EVENT_BATTLE_TOWER_OUTSIDE_SAILOR object_event 7, 5, SPRITE_TWIN, SPRITEMOVEDATA_WALK_UP_DOWN, 0, 1, -1, -1, PAL_NPC_RED, OBJECTTYPE_SCRIPT, 0, Route40BattleTowerGateTwinScript, -1 diff --git a/maps/Route41.asm b/maps/Route41.asm index 85fc32422..8272b93a6 100644 --- a/maps/Route41.asm +++ b/maps/Route41.asm @@ -1,4 +1,4 @@ - object_const_def ; object_event constants + object_const_def const ROUTE41_OLIVINE_RIVAL1 const ROUTE41_OLIVINE_RIVAL2 const ROUTE41_OLIVINE_RIVAL3 @@ -11,9 +11,9 @@ const ROUTE41_SWIMMER_GIRL5 Route41_MapScripts: - db 0 ; scene scripts + def_scene_scripts - db 0 ; callbacks + def_callbacks TrainerSwimmerfKaylee: trainer SWIMMERF, KAYLEE, EVENT_BEAT_SWIMMERF_KAYLEE, SwimmerfKayleeSeenText, SwimmerfKayleeBeatenText, 0, .Script @@ -342,18 +342,18 @@ SwimmerfWendyAfterBattleText: Route41_MapEvents: db 0, 0 ; filler - db 4 ; warp events + def_warp_events 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 + def_coord_events - db 1 ; bg events + def_bg_events bg_event 9, 35, BGEVENT_ITEM, Route41HiddenMaxEther - db 10 ; object events + def_object_events object_event 32, 6, SPRITE_OLIVINE_RIVAL, SPRITEMOVEDATA_SPINRANDOM_FAST, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_TRAINER, 3, TrainerSwimmermCharlie, -1 object_event 46, 8, SPRITE_OLIVINE_RIVAL, SPRITEMOVEDATA_SPINRANDOM_FAST, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_TRAINER, 3, TrainerSwimmermGeorge, -1 object_event 20, 26, SPRITE_OLIVINE_RIVAL, SPRITEMOVEDATA_SPINCOUNTERCLOCKWISE, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_TRAINER, 3, TrainerSwimmermBerke, -1 diff --git a/maps/Route42.asm b/maps/Route42.asm index c988209d9..a5ae86182 100644 --- a/maps/Route42.asm +++ b/maps/Route42.asm @@ -1,4 +1,4 @@ - object_const_def ; object_event constants + object_const_def const ROUTE42_FISHER const ROUTE42_POKEFAN_M const ROUTE42_SUPER_NERD @@ -10,11 +10,11 @@ const ROUTE42_SUICUNE Route42_MapScripts: - db 2 ; scene scripts + def_scene_scripts scene_script .DummyScene0 ; SCENE_ROUTE42_NOTHING scene_script .DummyScene1 ; SCENE_ROUTE42_SUICUNE - db 0 ; callbacks + def_callbacks .DummyScene0: end @@ -319,24 +319,24 @@ Route42Sign2Text: Route42_MapEvents: db 0, 0 ; filler - db 5 ; warp events + def_warp_events 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 + def_coord_events coord_event 24, 14, SCENE_ROUTE42_SUICUNE, Route42SuicuneScript - db 5 ; bg events + def_bg_events bg_event 4, 10, BGEVENT_READ, Route42Sign1 bg_event 7, 5, BGEVENT_READ, MtMortarSign1 bg_event 45, 9, BGEVENT_READ, MtMortarSign2 bg_event 54, 8, BGEVENT_READ, Route42Sign2 bg_event 16, 11, BGEVENT_ITEM, Route42HiddenMaxPotion - db 9 ; object events + def_object_events object_event 40, 10, SPRITE_FISHER, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_TRAINER, 1, TrainerFisherTully, -1 object_event 51, 9, SPRITE_POKEFAN_M, SPRITEMOVEDATA_SPINRANDOM_FAST, 0, 0, -1, -1, PAL_NPC_BROWN, OBJECTTYPE_TRAINER, 3, TrainerHikerBenjamin, -1 object_event 47, 8, SPRITE_SUPER_NERD, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_TRAINER, 3, TrainerPokemaniacShane, -1 diff --git a/maps/Route42EcruteakGate.asm b/maps/Route42EcruteakGate.asm index e38aa7d79..6eb1c8958 100644 --- a/maps/Route42EcruteakGate.asm +++ b/maps/Route42EcruteakGate.asm @@ -1,10 +1,10 @@ - object_const_def ; object_event constants + object_const_def const ROUTE42ECRUTEAKGATE_OFFICER Route42EcruteakGate_MapScripts: - db 0 ; scene scripts + def_scene_scripts - db 0 ; callbacks + def_callbacks Route42EcruteakGateOfficerScript: jumptextfaceplayer Route42EcruteakGateOfficerText @@ -20,15 +20,15 @@ Route42EcruteakGateOfficerText: Route42EcruteakGate_MapEvents: db 0, 0 ; filler - db 4 ; warp events + def_warp_events 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 + def_coord_events - db 0 ; bg events + def_bg_events - db 1 ; object events + def_object_events object_event 5, 2, SPRITE_OFFICER, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_SCRIPT, 0, Route42EcruteakGateOfficerScript, -1 diff --git a/maps/Route43.asm b/maps/Route43.asm index 712e9fcc6..8dde5cca4 100644 --- a/maps/Route43.asm +++ b/maps/Route43.asm @@ -1,4 +1,4 @@ - object_const_def ; object_event constants + object_const_def const ROUTE43_SUPER_NERD1 const ROUTE43_SUPER_NERD2 const ROUTE43_SUPER_NERD3 @@ -9,9 +9,9 @@ const ROUTE43_POKE_BALL Route43_MapScripts: - db 0 ; scene scripts + def_scene_scripts - db 1 ; callbacks + def_callbacks callback MAPCALLBACK_NEWMAP, .CheckIfRockets .CheckIfRockets: @@ -501,21 +501,21 @@ Route43TrainerTipsText: Route43_MapEvents: db 0, 0 ; filler - db 5 ; warp events + def_warp_events 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 + def_coord_events - db 3 ; bg events + def_bg_events bg_event 13, 3, BGEVENT_READ, Route43Sign1 bg_event 11, 49, BGEVENT_READ, Route43Sign2 bg_event 16, 38, BGEVENT_READ, Route43TrainerTips - db 8 ; object events + def_object_events object_event 13, 5, SPRITE_SUPER_NERD, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_TRAINER, 2, TrainerPokemaniacBen, -1 object_event 13, 20, SPRITE_SUPER_NERD, SPRITEMOVEDATA_SPINRANDOM_FAST, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_TRAINER, 3, TrainerPokemaniacBrent, -1 object_event 14, 7, SPRITE_SUPER_NERD, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_TRAINER, 2, TrainerPokemaniacRon, -1 diff --git a/maps/Route43Gate.asm b/maps/Route43Gate.asm index 747dd3f45..7645fdcc4 100644 --- a/maps/Route43Gate.asm +++ b/maps/Route43Gate.asm @@ -1,16 +1,16 @@ ROUTE43GATE_TOLL EQU 1000 - object_const_def ; object_event constants + object_const_def const ROUTE43GATE_OFFICER const ROUTE43GATE_ROCKET1 const ROUTE43GATE_ROCKET2 Route43Gate_MapScripts: - db 2 ; scene scripts + def_scene_scripts scene_script .RocketShakedown ; SCENE_DEFAULT scene_script .DummyScene ; SCENE_FINISHED - db 1 ; callbacks + def_callbacks callback MAPCALLBACK_NEWMAP, .CheckIfRockets .RocketShakedown: @@ -248,17 +248,17 @@ OfficerText_AvoidGrass: Route43Gate_MapEvents: db 0, 0 ; filler - db 4 ; warp events + def_warp_events 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 + def_coord_events - db 0 ; bg events + def_bg_events - db 3 ; object events + def_object_events object_event 0, 4, SPRITE_OFFICER, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_SCRIPT, 0, OfficerScript_GuardWithSludgeBomb, EVENT_LAKE_OF_RAGE_CIVILIANS object_event 2, 4, SPRITE_ROCKET, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, RocketScript_MakingABundle, EVENT_ROUTE_43_GATE_ROCKETS object_event 7, 4, SPRITE_ROCKET, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, RocketScript_MakingABundle, EVENT_ROUTE_43_GATE_ROCKETS diff --git a/maps/Route43MahoganyGate.asm b/maps/Route43MahoganyGate.asm index 971cd85b8..65a634068 100644 --- a/maps/Route43MahoganyGate.asm +++ b/maps/Route43MahoganyGate.asm @@ -1,10 +1,10 @@ - object_const_def ; object_event constants + object_const_def const ROUTE43MAHOGANYGATE_OFFICER Route43MahoganyGate_MapScripts: - db 0 ; scene scripts + def_scene_scripts - db 0 ; callbacks + def_callbacks Route43MahoganyGateOfficer: faceplayer @@ -39,15 +39,15 @@ Route43MahoganyGateOfficerRocketsClearedText: Route43MahoganyGate_MapEvents: db 0, 0 ; filler - db 4 ; warp events + def_warp_events 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 + def_coord_events - db 0 ; bg events + def_bg_events - db 1 ; object events + def_object_events object_event 0, 4, SPRITE_OFFICER, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_SCRIPT, 0, Route43MahoganyGateOfficer, -1 diff --git a/maps/Route44.asm b/maps/Route44.asm index 54fc0bbbe..099d59a7b 100644 --- a/maps/Route44.asm +++ b/maps/Route44.asm @@ -1,4 +1,4 @@ - object_const_def ; object_event constants + object_const_def const ROUTE44_FISHER1 const ROUTE44_FISHER2 const ROUTE44_YOUNGSTER1 @@ -12,9 +12,9 @@ const ROUTE44_POKE_BALL3 Route44_MapScripts: - db 0 ; scene scripts + def_scene_scripts - db 0 ; callbacks + def_callbacks TrainerBirdKeeperVance1: trainer BIRD_KEEPER, VANCE1, EVENT_BEAT_BIRD_KEEPER_VANCE, BirdKeeperVance1SeenText, BirdKeeperVance1BeatenText, 0, .Script @@ -507,17 +507,17 @@ Route44Sign2Text: Route44_MapEvents: db 0, 0 ; filler - db 1 ; warp events + def_warp_events warp_event 56, 7, ICE_PATH_1F, 1 - db 0 ; coord events + def_coord_events - db 3 ; bg events + def_bg_events bg_event 53, 7, BGEVENT_READ, Route44Sign1 bg_event 6, 10, BGEVENT_READ, Route44Sign2 bg_event 32, 9, BGEVENT_ITEM, Route44HiddenElixer - db 11 ; object events + def_object_events object_event 35, 3, SPRITE_FISHER, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_TRAINER, 1, TrainerFisherWilton1, -1 object_event 19, 13, SPRITE_FISHER, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_TRAINER, 1, TrainerFisherEdgar, -1 object_event 10, 9, SPRITE_YOUNGSTER, SPRITEMOVEDATA_SPINCLOCKWISE, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_TRAINER, 3, TrainerPsychicPhil, -1 diff --git a/maps/Route45.asm b/maps/Route45.asm index 23ec17bde..827758ede 100644 --- a/maps/Route45.asm +++ b/maps/Route45.asm @@ -1,4 +1,4 @@ - object_const_def ; object_event constants + object_const_def const ROUTE45_POKEFAN_M1 const ROUTE45_POKEFAN_M2 const ROUTE45_POKEFAN_M3 @@ -14,9 +14,9 @@ const ROUTE45_YOUNGSTER Route45_MapScripts: - db 0 ; scene scripts + def_scene_scripts - db 0 ; callbacks + def_callbacks TrainerBlackbeltKenji: trainer BLACKBELT_T, KENJI3, EVENT_BEAT_BLACKBELT_KENJI, BlackbeltKenji3SeenText, BlackbeltKenji3BeatenText, 0, .Script @@ -532,16 +532,16 @@ Route45SignText: Route45_MapEvents: db 0, 0 ; filler - db 1 ; warp events + def_warp_events warp_event 2, 5, DARK_CAVE_BLACKTHORN_ENTRANCE, 1 - db 0 ; coord events + def_coord_events - db 2 ; bg events + def_bg_events bg_event 10, 4, BGEVENT_READ, Route45Sign bg_event 13, 80, BGEVENT_ITEM, Route45HiddenPpUp - db 13 ; object events + def_object_events object_event 10, 16, SPRITE_POKEFAN_M, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, PAL_NPC_BROWN, OBJECTTYPE_TRAINER, 1, TrainerHikerErik, -1 object_event 15, 65, SPRITE_POKEFAN_M, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, PAL_NPC_BROWN, OBJECTTYPE_TRAINER, 2, TrainerHikerMichael, -1 object_event 5, 28, SPRITE_POKEFAN_M, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, PAL_NPC_BROWN, OBJECTTYPE_TRAINER, 2, TrainerHikerParry, -1 diff --git a/maps/Route46.asm b/maps/Route46.asm index 27f1180e0..4418595d1 100644 --- a/maps/Route46.asm +++ b/maps/Route46.asm @@ -1,4 +1,4 @@ - object_const_def ; object_event constants + object_const_def const ROUTE46_POKEFAN_M const ROUTE46_YOUNGSTER const ROUTE46_LASS @@ -7,9 +7,9 @@ const ROUTE46_POKE_BALL Route46_MapScripts: - db 0 ; scene scripts + def_scene_scripts - db 0 ; callbacks + def_callbacks TrainerCamperTed: trainer CAMPER, TED, EVENT_BEAT_CAMPER_TED, CamperTedSeenText, CamperTedBeatenText, 0, .Script @@ -251,17 +251,17 @@ Route46SignText: Route46_MapEvents: db 0, 0 ; filler - db 3 ; warp events + def_warp_events 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 + def_coord_events - db 1 ; bg events + def_bg_events bg_event 9, 27, BGEVENT_READ, Route46Sign - db 6 ; object events + def_object_events object_event 12, 19, SPRITE_POKEFAN_M, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, PAL_NPC_BROWN, OBJECTTYPE_TRAINER, 2, TrainerHikerBailey, -1 object_event 4, 14, SPRITE_YOUNGSTER, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_TRAINER, 2, TrainerCamperTed, -1 object_event 2, 13, SPRITE_LASS, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_TRAINER, 2, TrainerPicnickerErin1, -1 diff --git a/maps/Route5.asm b/maps/Route5.asm index 5806ddb91..ae2912bd8 100644 --- a/maps/Route5.asm +++ b/maps/Route5.asm @@ -1,10 +1,10 @@ - object_const_def ; object_event constants + object_const_def const ROUTE5_POKEFAN_M Route5_MapScripts: - db 0 ; scene scripts + def_scene_scripts - db 0 ; callbacks + def_callbacks Route5PokefanMScript: jumptextfaceplayer Route5PokefanMText @@ -40,17 +40,17 @@ HouseForSaleSignText: Route5_MapEvents: db 0, 0 ; filler - db 4 ; warp events + def_warp_events 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 + def_coord_events - db 2 ; bg events + def_bg_events bg_event 17, 17, BGEVENT_READ, Route5UndergroundPathSign bg_event 10, 11, BGEVENT_READ, HouseForSaleSign - db 1 ; object events + def_object_events object_event 17, 16, SPRITE_POKEFAN_M, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_SCRIPT, 0, Route5PokefanMScript, EVENT_ROUTE_5_6_POKEFAN_M_BLOCKS_UNDERGROUND_PATH diff --git a/maps/Route5CleanseTagHouse.asm b/maps/Route5CleanseTagHouse.asm index 5baa6c9a9..69eecff1b 100644 --- a/maps/Route5CleanseTagHouse.asm +++ b/maps/Route5CleanseTagHouse.asm @@ -1,11 +1,11 @@ - object_const_def ; object_event constants + object_const_def const ROUTE5CLEANSETAGHOUSE_GRANNY const ROUTE5CLEANSETAGHOUSE_TEACHER Route5CleanseTagHouse_MapScripts: - db 0 ; scene scripts + def_scene_scripts - db 0 ; callbacks + def_callbacks Route5CleanseTagHouseGrannyScript: faceplayer @@ -61,16 +61,16 @@ Route5CleanseTagHouseTeacherText: Route5CleanseTagHouse_MapEvents: db 0, 0 ; filler - db 2 ; warp events + def_warp_events warp_event 2, 7, ROUTE_5, 4 warp_event 3, 7, ROUTE_5, 4 - db 0 ; coord events + def_coord_events - db 2 ; bg events + def_bg_events bg_event 0, 1, BGEVENT_READ, HouseForSaleBookshelf bg_event 1, 1, BGEVENT_READ, HouseForSaleBookshelf - db 2 ; object events + def_object_events object_event 2, 5, SPRITE_GRANNY, SPRITEMOVEDATA_SPINCLOCKWISE, 0, 0, -1, -1, PAL_NPC_BROWN, OBJECTTYPE_SCRIPT, 0, Route5CleanseTagHouseGrannyScript, -1 object_event 5, 3, SPRITE_TEACHER, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_SCRIPT, 0, Route5CleanseTagHouseTeacherScript, -1 diff --git a/maps/Route5SaffronGate.asm b/maps/Route5SaffronGate.asm index 2c8898b9f..485717a3c 100644 --- a/maps/Route5SaffronGate.asm +++ b/maps/Route5SaffronGate.asm @@ -1,10 +1,10 @@ - object_const_def ; object_event constants + object_const_def const ROUTE5SAFFRONGATE_OFFICER Route5SaffronGate_MapScripts: - db 0 ; scene scripts + def_scene_scripts - db 0 ; callbacks + def_callbacks Route5SaffronGateOfficerScript: jumptextfaceplayer Route5SaffronGateOfficerText @@ -21,15 +21,15 @@ Route5SaffronGateOfficerText: Route5SaffronGate_MapEvents: db 0, 0 ; filler - db 4 ; warp events + def_warp_events 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 + def_coord_events - db 0 ; bg events + def_bg_events - db 1 ; object events + def_object_events object_event 0, 4, SPRITE_OFFICER, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_SCRIPT, 0, Route5SaffronGateOfficerScript, -1 diff --git a/maps/Route5UndergroundPathEntrance.asm b/maps/Route5UndergroundPathEntrance.asm index 3f5544d05..ec1b391d0 100644 --- a/maps/Route5UndergroundPathEntrance.asm +++ b/maps/Route5UndergroundPathEntrance.asm @@ -1,10 +1,10 @@ - object_const_def ; object_event constants + object_const_def const ROUTE5UNDERGROUNDPATHENTRANCE_TEACHER Route5UndergroundPathEntrance_MapScripts: - db 0 ; scene scripts + def_scene_scripts - db 0 ; callbacks + def_callbacks Route5UndergroundPathEntranceTeacherScript: jumptextfaceplayer Route5UndergroundPathEntranceTeacherText @@ -20,14 +20,14 @@ Route5UndergroundPathEntranceTeacherText: Route5UndergroundPathEntrance_MapEvents: db 0, 0 ; filler - db 3 ; warp events + def_warp_events 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 + def_coord_events - db 0 ; bg events + def_bg_events - db 1 ; object events + def_object_events object_event 2, 2, SPRITE_TEACHER, SPRITEMOVEDATA_WANDER, 1, 1, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_SCRIPT, 0, Route5UndergroundPathEntranceTeacherScript, -1 diff --git a/maps/Route6.asm b/maps/Route6.asm index e11b7d412..bc694e55d 100644 --- a/maps/Route6.asm +++ b/maps/Route6.asm @@ -1,12 +1,12 @@ - object_const_def ; object_event constants + object_const_def const ROUTE6_POKEFAN_M1 const ROUTE6_POKEFAN_M2 const ROUTE6_POKEFAN_M3 Route6_MapScripts: - db 0 ; scene scripts + def_scene_scripts - db 0 ; callbacks + def_callbacks TrainerPokefanmRex: trainer POKEFANM, REX, EVENT_BEAT_POKEFANM_REX, PokefanmRexSeenText, PokefanmRexBeatenText, 0, .Script @@ -92,16 +92,16 @@ PokefanmAllanAfterBattleText: Route6_MapEvents: db 0, 0 ; filler - db 2 ; warp events + def_warp_events warp_event 17, 3, ROUTE_6_UNDERGROUND_PATH_ENTRANCE, 1 warp_event 6, 1, ROUTE_6_SAFFRON_GATE, 3 - db 0 ; coord events + def_coord_events - db 1 ; bg events + def_bg_events bg_event 19, 5, BGEVENT_READ, Route6UndergroundPathSign - db 3 ; object events + def_object_events object_event 17, 4, SPRITE_POKEFAN_M, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_BROWN, OBJECTTYPE_SCRIPT, 2, Route6PokefanMScript, EVENT_ROUTE_5_6_POKEFAN_M_BLOCKS_UNDERGROUND_PATH object_event 9, 12, SPRITE_POKEFAN_M, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_TRAINER, 0, TrainerPokefanmRex, -1 object_event 10, 12, SPRITE_POKEFAN_M, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_TRAINER, 0, TrainerPokefanmAllan, -1 diff --git a/maps/Route6SaffronGate.asm b/maps/Route6SaffronGate.asm index 555fce4c6..47b4cf736 100644 --- a/maps/Route6SaffronGate.asm +++ b/maps/Route6SaffronGate.asm @@ -1,11 +1,11 @@ - object_const_def ; object_event constants + object_const_def const ROUTE6SAFFRONGATE_OFFICER Route6SaffronGate_MapScripts: - db 1 ; scene scripts + def_scene_scripts scene_script .DummyScene - db 0 ; callbacks + def_callbacks .DummyScene: end @@ -58,15 +58,15 @@ Route6SaffronGuardMagnetTrainText: Route6SaffronGate_MapEvents: db 0, 0 ; filler - db 4 ; warp events + def_warp_events 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 + def_coord_events - db 0 ; bg events + def_bg_events - db 1 ; object events + def_object_events object_event 0, 4, SPRITE_OFFICER, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_SCRIPT, 0, Route6SaffronGuardScript, -1 diff --git a/maps/Route6UndergroundPathEntrance.asm b/maps/Route6UndergroundPathEntrance.asm index 7e04b3fb1..52ef605a2 100644 --- a/maps/Route6UndergroundPathEntrance.asm +++ b/maps/Route6UndergroundPathEntrance.asm @@ -1,18 +1,18 @@ Route6UndergroundPathEntrance_MapScripts: - db 0 ; scene scripts + def_scene_scripts - db 0 ; callbacks + def_callbacks Route6UndergroundPathEntrance_MapEvents: db 0, 0 ; filler - db 3 ; warp events + def_warp_events 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 + def_coord_events - db 0 ; bg events + def_bg_events - db 0 ; object events + def_object_events diff --git a/maps/Route7.asm b/maps/Route7.asm index 6f1c5251f..ff87a54af 100644 --- a/maps/Route7.asm +++ b/maps/Route7.asm @@ -1,7 +1,7 @@ Route7_MapScripts: - db 0 ; scene scripts + def_scene_scripts - db 0 ; callbacks + def_callbacks Route7UndergroundPathSign: jumptext Route7UndergroundPathSignText @@ -35,14 +35,14 @@ Route7LockedDoorText: Route7_MapEvents: db 0, 0 ; filler - db 2 ; warp events + def_warp_events warp_event 15, 6, ROUTE_7_SAFFRON_GATE, 1 warp_event 15, 7, ROUTE_7_SAFFRON_GATE, 2 - db 0 ; coord events + def_coord_events - db 2 ; bg events + def_bg_events bg_event 5, 11, BGEVENT_READ, Route7UndergroundPathSign bg_event 6, 9, BGEVENT_READ, Route7LockedDoor - db 0 ; object events + def_object_events diff --git a/maps/Route7SaffronGate.asm b/maps/Route7SaffronGate.asm index 4835a87ed..7aca3e901 100644 --- a/maps/Route7SaffronGate.asm +++ b/maps/Route7SaffronGate.asm @@ -1,10 +1,10 @@ - object_const_def ; object_event constants + object_const_def const ROUTE7SAFFRONGATE_OFFICER Route7SaffronGate_MapScripts: - db 0 ; scene scripts + def_scene_scripts - db 0 ; callbacks + def_callbacks Route7SaffronGuardScript: faceplayer @@ -46,15 +46,15 @@ Route7SaffronGuardSeriousText: Route7SaffronGate_MapEvents: db 0, 0 ; filler - db 4 ; warp events + def_warp_events 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 + def_coord_events - db 0 ; bg events + def_bg_events - db 1 ; object events + def_object_events object_event 5, 2, SPRITE_OFFICER, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_SCRIPT, 0, Route7SaffronGuardScript, -1 diff --git a/maps/Route8.asm b/maps/Route8.asm index fbfe3ebcf..9e20e004a 100644 --- a/maps/Route8.asm +++ b/maps/Route8.asm @@ -1,4 +1,4 @@ - object_const_def ; object_event constants + object_const_def const ROUTE8_BIKER1 const ROUTE8_BIKER2 const ROUTE8_BIKER3 @@ -7,9 +7,9 @@ const ROUTE8_FRUIT_TREE Route8_MapScripts: - db 0 ; scene scripts + def_scene_scripts - db 0 ; callbacks + def_callbacks TrainerBikerDwayne: trainer BIKER, DWAYNE, EVENT_BEAT_BIKER_DWAYNE, BikerDwayneSeenText, BikerDwayneBeatenText, 0, .Script @@ -173,17 +173,17 @@ Route8UndergroundPathSignText: Route8_MapEvents: db 0, 0 ; filler - db 2 ; warp events + def_warp_events warp_event 4, 4, ROUTE_8_SAFFRON_GATE, 3 warp_event 4, 5, ROUTE_8_SAFFRON_GATE, 4 - db 0 ; coord events + def_coord_events - db 2 ; bg events + def_bg_events bg_event 11, 7, BGEVENT_READ, Route8UndergroundPathSign bg_event 10, 5, BGEVENT_READ, Route8LockedDoor - db 6 ; object events + def_object_events object_event 10, 8, SPRITE_BIKER, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_TRAINER, 5, TrainerBikerDwayne, -1 object_event 10, 9, SPRITE_BIKER, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_TRAINER, 5, TrainerBikerHarris, -1 object_event 10, 10, SPRITE_BIKER, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_TRAINER, 5, TrainerBikerZeke, -1 diff --git a/maps/Route8SaffronGate.asm b/maps/Route8SaffronGate.asm index 83f4492a5..49df57d9f 100644 --- a/maps/Route8SaffronGate.asm +++ b/maps/Route8SaffronGate.asm @@ -1,10 +1,10 @@ - object_const_def ; object_event constants + object_const_def const ROUTE8SAFFRONGATE_OFFICER Route8SaffronGate_MapScripts: - db 0 ; scene scripts + def_scene_scripts - db 0 ; callbacks + def_callbacks Route8SaffronGateOfficerScript: jumptextfaceplayer Route8SaffronGateOfficerText @@ -20,15 +20,15 @@ Route8SaffronGateOfficerText: Route8SaffronGate_MapEvents: db 0, 0 ; filler - db 4 ; warp events + def_warp_events 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 + def_coord_events - db 0 ; bg events + def_bg_events - db 1 ; object events + def_object_events object_event 5, 2, SPRITE_OFFICER, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_SCRIPT, 0, Route8SaffronGateOfficerScript, -1 diff --git a/maps/Route9.asm b/maps/Route9.asm index 44e214435..e14f05953 100644 --- a/maps/Route9.asm +++ b/maps/Route9.asm @@ -1,4 +1,4 @@ - object_const_def ; object_event constants + object_const_def const ROUTE9_YOUNGSTER1 const ROUTE9_LASS1 const ROUTE9_YOUNGSTER2 @@ -7,9 +7,9 @@ const ROUTE9_POKEFAN_M2 Route9_MapScripts: - db 0 ; scene scripts + def_scene_scripts - db 0 ; callbacks + def_callbacks TrainerCamperDean: trainer CAMPER, DEAN, EVENT_BEAT_CAMPER_DEAN, CamperDeanSeenText, CamperDeanBeatenText, 0, .Script @@ -206,16 +206,16 @@ Route9SignText: Route9_MapEvents: db 0, 0 ; filler - db 1 ; warp events + def_warp_events warp_event 48, 15, ROCK_TUNNEL_1F, 1 - db 0 ; coord events + def_coord_events - db 2 ; bg events + def_bg_events bg_event 15, 7, BGEVENT_READ, Route9Sign bg_event 41, 15, BGEVENT_ITEM, Route9HiddenEther - db 6 ; object events + def_object_events object_event 23, 11, SPRITE_YOUNGSTER, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_TRAINER, 3, TrainerCamperDean, -1 object_event 39, 8, SPRITE_LASS, SPRITEMOVEDATA_SPINRANDOM_FAST, 0, 0, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_TRAINER, 3, TrainerPicnickerHeidi, -1 object_event 11, 4, SPRITE_YOUNGSTER, SPRITEMOVEDATA_SPINRANDOM_FAST, 0, 0, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_TRAINER, 5, TrainerCamperSid, -1 diff --git a/maps/RuinsOfAlphAerodactylChamber.asm b/maps/RuinsOfAlphAerodactylChamber.asm index 610a28bf6..ae75c199f 100644 --- a/maps/RuinsOfAlphAerodactylChamber.asm +++ b/maps/RuinsOfAlphAerodactylChamber.asm @@ -1,9 +1,9 @@ RuinsOfAlphAerodactylChamber_MapScripts: - db 2 ; scene scripts + def_scene_scripts scene_script .CheckWall ; SCENE_DEFAULT scene_script .DummyScene ; SCENE_FINISHED - db 1 ; callbacks + def_callbacks callback MAPCALLBACK_TILES, .HiddenDoors .CheckWall: @@ -144,16 +144,16 @@ RuinsOfAlphAerodactylChamberDescriptionText: RuinsOfAlphAerodactylChamber_MapEvents: db 0, 0 ; filler - db 5 ; warp events + def_warp_events 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 + def_coord_events - db 6 ; bg events + def_bg_events bg_event 2, 3, BGEVENT_READ, RuinsOfAlphAerodactylChamberAncientReplica bg_event 5, 3, BGEVENT_READ, RuinsOfAlphAerodactylChamberAncientReplica bg_event 3, 2, BGEVENT_UP, RuinsOfAlphAerodactylChamberPuzzle @@ -161,4 +161,4 @@ RuinsOfAlphAerodactylChamber_MapEvents: bg_event 3, 0, BGEVENT_UP, RuinsOfAlphAerodactylChamberWallPatternLeft bg_event 4, 0, BGEVENT_UP, RuinsOfAlphAerodactylChamberWallPatternRight - db 0 ; object events + def_object_events diff --git a/maps/RuinsOfAlphAerodactylItemRoom.asm b/maps/RuinsOfAlphAerodactylItemRoom.asm index e959faf3b..4eaee2b80 100644 --- a/maps/RuinsOfAlphAerodactylItemRoom.asm +++ b/maps/RuinsOfAlphAerodactylItemRoom.asm @@ -1,13 +1,13 @@ - object_const_def ; object_event constants + object_const_def const RUINSOFALPHAERODACTYLITEMROOM_POKE_BALL1 const RUINSOFALPHAERODACTYLITEMROOM_POKE_BALL2 const RUINSOFALPHAERODACTYLITEMROOM_POKE_BALL3 const RUINSOFALPHAERODACTYLITEMROOM_POKE_BALL4 RuinsOfAlphAerodactylItemRoom_MapScripts: - db 0 ; scene scripts + def_scene_scripts - db 0 ; callbacks + def_callbacks RuinsOfAlphAerodactylItemRoomGoldBerry: itemball GOLD_BERRY @@ -33,19 +33,19 @@ RuinsOfAlphAerodactylItemRoomAncientReplicaText: RuinsOfAlphAerodactylItemRoom_MapEvents: db 0, 0 ; filler - db 4 ; warp events + def_warp_events 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 + def_coord_events - db 2 ; bg events + def_bg_events bg_event 2, 1, BGEVENT_READ, RuinsOfAlphAerodactylItemRoomAncientReplica bg_event 5, 1, BGEVENT_READ, RuinsOfAlphAerodactylItemRoomAncientReplica - db 4 ; object events + def_object_events object_event 2, 6, SPRITE_POKE_BALL, SPRITEMOVEDATA_STILL, 0, 0, -1, -1, 0, OBJECTTYPE_ITEMBALL, 0, RuinsOfAlphAerodactylItemRoomGoldBerry, EVENT_PICKED_UP_GOLD_BERRY_FROM_AERODACTYL_ITEM_ROOM object_event 5, 6, SPRITE_POKE_BALL, SPRITEMOVEDATA_STILL, 0, 0, -1, -1, 0, OBJECTTYPE_ITEMBALL, 0, RuinsOfAlphAerodactylItemRoomMoonStone, EVENT_PICKED_UP_MOON_STONE_FROM_AERODACTYL_ITEM_ROOM object_event 2, 4, SPRITE_POKE_BALL, SPRITEMOVEDATA_STILL, 0, 0, -1, -1, 0, OBJECTTYPE_ITEMBALL, 0, RuinsOfAlphAerodactylItemRoomHealPowder, EVENT_PICKED_UP_HEAL_POWDER_FROM_AERODACTYL_ITEM_ROOM diff --git a/maps/RuinsOfAlphAerodactylWordRoom.asm b/maps/RuinsOfAlphAerodactylWordRoom.asm index 96dc3eaef..b0ac65024 100644 --- a/maps/RuinsOfAlphAerodactylWordRoom.asm +++ b/maps/RuinsOfAlphAerodactylWordRoom.asm @@ -1,18 +1,18 @@ RuinsOfAlphAerodactylWordRoom_MapScripts: - db 0 ; scene scripts + def_scene_scripts - db 0 ; callbacks + def_callbacks RuinsOfAlphAerodactylWordRoom_MapEvents: db 0, 0 ; filler - db 3 ; warp events + def_warp_events 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 + def_coord_events - db 0 ; bg events + def_bg_events - db 0 ; object events + def_object_events diff --git a/maps/RuinsOfAlphHoOhChamber.asm b/maps/RuinsOfAlphHoOhChamber.asm index 6b4218608..78ae152cf 100644 --- a/maps/RuinsOfAlphHoOhChamber.asm +++ b/maps/RuinsOfAlphHoOhChamber.asm @@ -1,9 +1,9 @@ RuinsOfAlphHoOhChamber_MapScripts: - db 2 ; scene scripts + def_scene_scripts scene_script .CheckWall ; SCENE_DEFAULT scene_script .DummyScene ; SCENE_FINISHED - db 1 ; callbacks + def_callbacks callback MAPCALLBACK_TILES, .HiddenDoors .CheckWall: @@ -145,16 +145,16 @@ RuinsOfAlphHoOhChamberDescriptionText: RuinsOfAlphHoOhChamber_MapEvents: db 0, 0 ; filler - db 5 ; warp events + def_warp_events 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 + def_coord_events - db 6 ; bg events + def_bg_events bg_event 2, 3, BGEVENT_READ, RuinsOfAlphHoOhChamberAncientReplica bg_event 5, 3, BGEVENT_READ, RuinsOfAlphHoOhChamberAncientReplica bg_event 3, 2, BGEVENT_UP, RuinsOfAlphHoOhChamberPuzzle @@ -162,4 +162,4 @@ RuinsOfAlphHoOhChamber_MapEvents: bg_event 3, 0, BGEVENT_UP, RuinsOfAlphHoOhChamberWallPatternLeft bg_event 4, 0, BGEVENT_UP, RuinsOfAlphHoOhChamberWallPatternRight - db 0 ; object events + def_object_events diff --git a/maps/RuinsOfAlphHoOhItemRoom.asm b/maps/RuinsOfAlphHoOhItemRoom.asm index 8e1f5f192..d0469d688 100644 --- a/maps/RuinsOfAlphHoOhItemRoom.asm +++ b/maps/RuinsOfAlphHoOhItemRoom.asm @@ -1,13 +1,13 @@ - object_const_def ; object_event constants + object_const_def const RUINSOFALPHHOOHITEMROOM_POKE_BALL1 const RUINSOFALPHHOOHITEMROOM_POKE_BALL2 const RUINSOFALPHHOOHITEMROOM_POKE_BALL3 const RUINSOFALPHHOOHITEMROOM_POKE_BALL4 RuinsOfAlphHoOhItemRoom_MapScripts: - db 0 ; scene scripts + def_scene_scripts - db 0 ; callbacks + def_callbacks RuinsOfAlphHoOhItemRoomGoldBerry: itemball GOLD_BERRY @@ -33,19 +33,19 @@ RuinsOfAlphHoOhItemRoomAncientReplicaText: RuinsOfAlphHoOhItemRoom_MapEvents: db 0, 0 ; filler - db 4 ; warp events + def_warp_events 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 + def_coord_events - db 2 ; bg events + def_bg_events bg_event 2, 1, BGEVENT_READ, RuinsOfAlphHoOhItemRoomAncientReplica bg_event 5, 1, BGEVENT_READ, RuinsOfAlphHoOhItemRoomAncientReplica - db 4 ; object events + def_object_events object_event 2, 6, SPRITE_POKE_BALL, SPRITEMOVEDATA_STILL, 0, 0, -1, -1, 0, OBJECTTYPE_ITEMBALL, 0, RuinsOfAlphHoOhItemRoomGoldBerry, EVENT_PICKED_UP_GOLD_BERRY_FROM_HO_OH_ITEM_ROOM object_event 5, 6, SPRITE_POKE_BALL, SPRITEMOVEDATA_STILL, 0, 0, -1, -1, 0, OBJECTTYPE_ITEMBALL, 0, RuinsOfAlphHoOhItemRoomMysteryberry, EVENT_PICKED_UP_MYSTERYBERRY_FROM_HO_OH_ITEM_ROOM object_event 2, 4, SPRITE_POKE_BALL, SPRITEMOVEDATA_STILL, 0, 0, -1, -1, 0, OBJECTTYPE_ITEMBALL, 0, RuinsOfAlphHoOhItemRoomRevivalHerb, EVENT_PICKED_UP_REVIVAL_HERB_FROM_HO_OH_ITEM_ROOM diff --git a/maps/RuinsOfAlphHoOhWordRoom.asm b/maps/RuinsOfAlphHoOhWordRoom.asm index d5492dbf9..e6f3f6230 100644 --- a/maps/RuinsOfAlphHoOhWordRoom.asm +++ b/maps/RuinsOfAlphHoOhWordRoom.asm @@ -1,18 +1,18 @@ RuinsOfAlphHoOhWordRoom_MapScripts: - db 0 ; scene scripts + def_scene_scripts - db 0 ; callbacks + def_callbacks RuinsOfAlphHoOhWordRoom_MapEvents: db 0, 0 ; filler - db 3 ; warp events + def_warp_events 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 + def_coord_events - db 0 ; bg events + def_bg_events - db 0 ; object events + def_object_events diff --git a/maps/RuinsOfAlphInnerChamber.asm b/maps/RuinsOfAlphInnerChamber.asm index c140874e6..a843e0ccc 100644 --- a/maps/RuinsOfAlphInnerChamber.asm +++ b/maps/RuinsOfAlphInnerChamber.asm @@ -1,14 +1,14 @@ - object_const_def ; object_event constants + object_const_def const RUINSOFALPHINNERCHAMBER_FISHER const RUINSOFALPHINNERCHAMBER_TEACHER const RUINSOFALPHINNERCHAMBER_GRAMPS RuinsOfAlphInnerChamber_MapScripts: - db 2 ; scene scripts + def_scene_scripts scene_script .DummyScene0 ; SCENE_RUINSOFALPHINNERCHAMBER_NOTHING scene_script .UnownAppear ; SCENE_RUINSOFALPHINNERCHAMBER_STRANGE_PRESENCE - db 0 ; callbacks + def_callbacks .DummyScene0: end @@ -77,7 +77,7 @@ RuinsOfAlphInnerChamberStatueText: RuinsOfAlphInnerChamber_MapEvents: db 0, 0 ; filler - db 9 ; warp events + def_warp_events 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 @@ -88,9 +88,9 @@ RuinsOfAlphInnerChamber_MapEvents: warp_event 15, 24, RUINS_OF_ALPH_AERODACTYL_CHAMBER, 3 warp_event 16, 24, RUINS_OF_ALPH_AERODACTYL_CHAMBER, 4 - db 0 ; coord events + def_coord_events - db 26 ; bg events + def_bg_events bg_event 2, 3, BGEVENT_READ, RuinsOfAlphInnerChamberStatue bg_event 5, 3, BGEVENT_READ, RuinsOfAlphInnerChamberStatue bg_event 8, 3, BGEVENT_READ, RuinsOfAlphInnerChamberStatue @@ -118,7 +118,7 @@ RuinsOfAlphInnerChamber_MapEvents: bg_event 14, 24, BGEVENT_READ, RuinsOfAlphInnerChamberStatue bg_event 17, 24, BGEVENT_READ, RuinsOfAlphInnerChamberStatue - db 3 ; object events + def_object_events object_event 3, 7, SPRITE_FISHER, SPRITEMOVEDATA_SPINRANDOM_SLOW, 0, 0, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_SCRIPT, 0, RuinsOfAlphInnerChamberFisherScript, EVENT_RUINS_OF_ALPH_INNER_CHAMBER_TOURISTS object_event 14, 13, SPRITE_TEACHER, SPRITEMOVEDATA_WANDER, 1, 1, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, RuinsOfAlphInnerChamberTeacherScript, EVENT_RUINS_OF_ALPH_INNER_CHAMBER_TOURISTS object_event 11, 19, SPRITE_GRAMPS, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, PAL_NPC_BROWN, OBJECTTYPE_SCRIPT, 0, RuinsOfAlphInnerChamberGrampsScript, EVENT_RUINS_OF_ALPH_INNER_CHAMBER_TOURISTS diff --git a/maps/RuinsOfAlphKabutoChamber.asm b/maps/RuinsOfAlphKabutoChamber.asm index d95b4f66e..8e29a90ae 100644 --- a/maps/RuinsOfAlphKabutoChamber.asm +++ b/maps/RuinsOfAlphKabutoChamber.asm @@ -1,13 +1,13 @@ - object_const_def ; object_event constants + object_const_def const RUINSOFALPHKABUTOCHAMBER_RECEPTIONIST const RUINSOFALPHKABUTOCHAMBER_SCIENTIST RuinsOfAlphKabutoChamber_MapScripts: - db 2 ; scene scripts + def_scene_scripts scene_script .CheckWall ; SCENE_DEFAULT scene_script .DummyScene ; SCENE_FINISHED - db 1 ; callbacks + def_callbacks callback MAPCALLBACK_TILES, .HiddenDoors .CheckWall: @@ -256,16 +256,16 @@ RuinsOfAlphKabutoChamberDescriptionText: RuinsOfAlphKabutoChamber_MapEvents: db 0, 0 ; filler - db 5 ; warp events + def_warp_events 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 + def_coord_events - db 6 ; bg events + def_bg_events bg_event 2, 3, BGEVENT_READ, RuinsOfAlphKabutoChamberAncientReplica bg_event 5, 3, BGEVENT_READ, RuinsOfAlphKabutoChamberAncientReplica bg_event 3, 2, BGEVENT_UP, RuinsOfAlphKabutoChamberPuzzle @@ -273,6 +273,6 @@ RuinsOfAlphKabutoChamber_MapEvents: bg_event 3, 0, BGEVENT_UP, RuinsOfAlphKabutoChamberWallPatternLeft bg_event 4, 0, BGEVENT_UP, RuinsOfAlphKabutoChamberWallPatternRight - db 2 ; object events + def_object_events object_event 5, 5, SPRITE_RECEPTIONIST, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, RuinsOfAlphKabutoChamberReceptionistScript, EVENT_RUINS_OF_ALPH_KABUTO_CHAMBER_RECEPTIONIST object_event 3, 1, SPRITE_SCIENTIST, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_SCRIPT, 0, RuinsOfAlphKabutoChamberScientistScript, -1 diff --git a/maps/RuinsOfAlphKabutoItemRoom.asm b/maps/RuinsOfAlphKabutoItemRoom.asm index f3dcee3a3..21eee98e8 100644 --- a/maps/RuinsOfAlphKabutoItemRoom.asm +++ b/maps/RuinsOfAlphKabutoItemRoom.asm @@ -1,13 +1,13 @@ - object_const_def ; object_event constants + object_const_def const RUINSOFALPHKABUTOITEMROOM_POKE_BALL1 const RUINSOFALPHKABUTOITEMROOM_POKE_BALL2 const RUINSOFALPHKABUTOITEMROOM_POKE_BALL3 const RUINSOFALPHKABUTOITEMROOM_POKE_BALL4 RuinsOfAlphKabutoItemRoom_MapScripts: - db 0 ; scene scripts + def_scene_scripts - db 0 ; callbacks + def_callbacks RuinsOfAlphKabutoItemRoomBerry: itemball BERRY @@ -33,19 +33,19 @@ RuinsOfAlphKabutoItemRoomAncientReplicaText: RuinsOfAlphKabutoItemRoom_MapEvents: db 0, 0 ; filler - db 4 ; warp events + def_warp_events 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 + def_coord_events - db 2 ; bg events + def_bg_events bg_event 2, 1, BGEVENT_READ, RuinsOfAlphKabutoItemRoomAncientReplica bg_event 5, 1, BGEVENT_READ, RuinsOfAlphKabutoItemRoomAncientReplica - db 4 ; object events + def_object_events object_event 2, 6, SPRITE_POKE_BALL, SPRITEMOVEDATA_STILL, 0, 0, -1, -1, 0, OBJECTTYPE_ITEMBALL, 0, RuinsOfAlphKabutoItemRoomBerry, EVENT_PICKED_UP_BERRY_FROM_KABUTO_ITEM_ROOM object_event 5, 6, SPRITE_POKE_BALL, SPRITEMOVEDATA_STILL, 0, 0, -1, -1, 0, OBJECTTYPE_ITEMBALL, 0, RuinsOfAlphKabutoItemRoomPsncureberry, EVENT_PICKED_UP_PSNCUREBERRY_FROM_KABUTO_ITEM_ROOM object_event 2, 4, SPRITE_POKE_BALL, SPRITEMOVEDATA_STILL, 0, 0, -1, -1, 0, OBJECTTYPE_ITEMBALL, 0, RuinsOfAlphKabutoItemRoomHealPowder, EVENT_PICKED_UP_HEAL_POWDER_FROM_KABUTO_ITEM_ROOM diff --git a/maps/RuinsOfAlphKabutoWordRoom.asm b/maps/RuinsOfAlphKabutoWordRoom.asm index 086ae4c2d..06d281a19 100644 --- a/maps/RuinsOfAlphKabutoWordRoom.asm +++ b/maps/RuinsOfAlphKabutoWordRoom.asm @@ -1,18 +1,18 @@ RuinsOfAlphKabutoWordRoom_MapScripts: - db 0 ; scene scripts + def_scene_scripts - db 0 ; callbacks + def_callbacks RuinsOfAlphKabutoWordRoom_MapEvents: db 0, 0 ; filler - db 3 ; warp events + def_warp_events 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 + def_coord_events - db 0 ; bg events + def_bg_events - db 0 ; object events + def_object_events diff --git a/maps/RuinsOfAlphOmanyteChamber.asm b/maps/RuinsOfAlphOmanyteChamber.asm index 5d2958c4c..4b7872912 100644 --- a/maps/RuinsOfAlphOmanyteChamber.asm +++ b/maps/RuinsOfAlphOmanyteChamber.asm @@ -1,9 +1,9 @@ RuinsOfAlphOmanyteChamber_MapScripts: - db 2 ; scene scripts + def_scene_scripts scene_script .CheckWall ; SCENE_DEFAULT scene_script .DummyScene ; SCENE_FINISHED - db 1 ; callbacks + def_callbacks callback MAPCALLBACK_TILES, .HiddenDoors .CheckWall: @@ -145,16 +145,16 @@ RuinsOfAlphOmanyteChamberDescriptionText: RuinsOfAlphOmanyteChamber_MapEvents: db 0, 0 ; filler - db 5 ; warp events + def_warp_events 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 + def_coord_events - db 6 ; bg events + def_bg_events bg_event 2, 3, BGEVENT_READ, RuinsOfAlphOmanyteChamberAncientReplica bg_event 5, 3, BGEVENT_READ, RuinsOfAlphOmanyteChamberAncientReplica bg_event 3, 2, BGEVENT_UP, RuinsOfAlphOmanyteChamberPuzzle @@ -162,4 +162,4 @@ RuinsOfAlphOmanyteChamber_MapEvents: bg_event 3, 0, BGEVENT_UP, RuinsOfAlphOmanyteChamberWallPatternLeft bg_event 4, 0, BGEVENT_UP, RuinsOfAlphOmanyteChamberWallPatternRight - db 0 ; object events + def_object_events diff --git a/maps/RuinsOfAlphOmanyteItemRoom.asm b/maps/RuinsOfAlphOmanyteItemRoom.asm index 48e4d6fd4..c6e6714bd 100644 --- a/maps/RuinsOfAlphOmanyteItemRoom.asm +++ b/maps/RuinsOfAlphOmanyteItemRoom.asm @@ -1,13 +1,13 @@ - object_const_def ; object_event constants + object_const_def const RUINSOFALPHOMANYTEITEMROOM_POKE_BALL1 const RUINSOFALPHOMANYTEITEMROOM_POKE_BALL2 const RUINSOFALPHOMANYTEITEMROOM_POKE_BALL3 const RUINSOFALPHOMANYTEITEMROOM_POKE_BALL4 RuinsOfAlphOmanyteItemRoom_MapScripts: - db 0 ; scene scripts + def_scene_scripts - db 0 ; callbacks + def_callbacks RuinsOfAlphOmanyteItemRoomMysteryberry: itemball MYSTERYBERRY @@ -33,19 +33,19 @@ RuinsOfAlphOmanyteItemRoomAncientReplicaText: RuinsOfAlphOmanyteItemRoom_MapEvents: db 0, 0 ; filler - db 4 ; warp events + def_warp_events 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 + def_coord_events - db 2 ; bg events + def_bg_events bg_event 2, 1, BGEVENT_READ, RuinsOfAlphOmanyteItemRoomAncientReplica bg_event 5, 1, BGEVENT_READ, RuinsOfAlphOmanyteItemRoomAncientReplica - db 4 ; object events + def_object_events object_event 2, 6, SPRITE_POKE_BALL, SPRITEMOVEDATA_STILL, 0, 0, -1, -1, 0, OBJECTTYPE_ITEMBALL, 0, RuinsOfAlphOmanyteItemRoomMysteryberry, EVENT_PICKED_UP_MYSTERYBERRY_FROM_OMANYTE_ITEM_ROOM object_event 5, 6, SPRITE_POKE_BALL, SPRITEMOVEDATA_STILL, 0, 0, -1, -1, 0, OBJECTTYPE_ITEMBALL, 0, RuinsOfAlphOmanyteItemRoomMysticWater, EVENT_PICKED_UP_MYSTIC_WATER_FROM_OMANYTE_ITEM_ROOM object_event 2, 4, SPRITE_POKE_BALL, SPRITEMOVEDATA_STILL, 0, 0, -1, -1, 0, OBJECTTYPE_ITEMBALL, 0, RuinsOfAlphOmanyteItemRoomStardust, EVENT_PICKED_UP_STARDUST_FROM_OMANYTE_ITEM_ROOM diff --git a/maps/RuinsOfAlphOmanyteWordRoom.asm b/maps/RuinsOfAlphOmanyteWordRoom.asm index b5e0f4d2e..b1d85fdb0 100644 --- a/maps/RuinsOfAlphOmanyteWordRoom.asm +++ b/maps/RuinsOfAlphOmanyteWordRoom.asm @@ -1,18 +1,18 @@ RuinsOfAlphOmanyteWordRoom_MapScripts: - db 0 ; scene scripts + def_scene_scripts - db 0 ; callbacks + def_callbacks RuinsOfAlphOmanyteWordRoom_MapEvents: db 0, 0 ; filler - db 3 ; warp events + def_warp_events 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 + def_coord_events - db 0 ; bg events + def_bg_events - db 0 ; object events + def_object_events diff --git a/maps/RuinsOfAlphOutside.asm b/maps/RuinsOfAlphOutside.asm index 5b98b0a41..02c75fe4b 100644 --- a/maps/RuinsOfAlphOutside.asm +++ b/maps/RuinsOfAlphOutside.asm @@ -1,4 +1,4 @@ - object_const_def ; object_event constants + object_const_def const RUINSOFALPHOUTSIDE_YOUNGSTER1 const RUINSOFALPHOUTSIDE_SCIENTIST const RUINSOFALPHOUTSIDE_FISHER @@ -6,11 +6,11 @@ const RUINSOFALPHOUTSIDE_YOUNGSTER3 RuinsOfAlphOutside_MapScripts: - db 2 ; scene scripts + def_scene_scripts scene_script .DummyScene0 ; SCENE_RUINSOFALPHOUTSIDE_NOTHING scene_script .DummyScene1 ; SCENE_RUINSOFALPHOUTSIDE_GET_UNOWN_DEX - db 1 ; callbacks + def_callbacks callback MAPCALLBACK_OBJECTS, .ScientistCallback .DummyScene0: @@ -281,7 +281,7 @@ RuinsOfAlphOutsideYoungster2Text: RuinsOfAlphOutside_MapEvents: db 0, 0 ; filler - db 11 ; warp events + def_warp_events 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 @@ -294,16 +294,16 @@ RuinsOfAlphOutside_MapEvents: 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 + def_coord_events coord_event 11, 14, SCENE_RUINSOFALPHOUTSIDE_GET_UNOWN_DEX, RuinsOfAlphOutsideScientistScene1 coord_event 10, 15, SCENE_RUINSOFALPHOUTSIDE_GET_UNOWN_DEX, RuinsOfAlphOutsideScientistScene2 - db 3 ; bg events + def_bg_events bg_event 16, 8, BGEVENT_READ, RuinsOfAlphOutsideMysteryChamberSign bg_event 12, 16, BGEVENT_READ, RuinsOfAlphSign bg_event 18, 12, BGEVENT_READ, RuinsOfAlphResearchCenterSign - db 5 ; object events + def_object_events object_event 4, 20, SPRITE_YOUNGSTER, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, 0, OBJECTTYPE_TRAINER, 1, TrainerPsychicNathan, -1 object_event 11, 15, SPRITE_SCIENTIST, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, RuinsOfAlphOutsideScientistScript, EVENT_RUINS_OF_ALPH_OUTSIDE_SCIENTIST object_event 13, 17, SPRITE_FISHER, SPRITEMOVEDATA_SPINRANDOM_SLOW, 0, 0, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_SCRIPT, 0, RuinsOfAlphOutsideFisherScript, EVENT_RUINS_OF_ALPH_OUTSIDE_TOURIST_FISHER diff --git a/maps/RuinsOfAlphResearchCenter.asm b/maps/RuinsOfAlphResearchCenter.asm index b05fee90c..956551e1c 100644 --- a/maps/RuinsOfAlphResearchCenter.asm +++ b/maps/RuinsOfAlphResearchCenter.asm @@ -1,14 +1,14 @@ - object_const_def ; object_event constants + object_const_def const RUINSOFALPHRESEARCHCENTER_SCIENTIST1 const RUINSOFALPHRESEARCHCENTER_SCIENTIST2 const RUINSOFALPHRESEARCHCENTER_SCIENTIST3 RuinsOfAlphResearchCenter_MapScripts: - db 2 ; scene scripts + def_scene_scripts scene_script .DummyScene0 ; SCENE_RUINSOFALPHRESEARCHCENTER_NOTHING scene_script .GetUnownDex ; SCENE_RUINSOFALPHRESEARCHCENTER_GET_UNOWN_DEX - db 1 ; callbacks + def_callbacks callback MAPCALLBACK_OBJECTS, .ScientistCallback .DummyScene0: @@ -394,18 +394,18 @@ RuinsOfAlphResearchCenterAcademicBooksText: RuinsOfAlphResearchCenter_MapEvents: db 0, 0 ; filler - db 2 ; warp events + def_warp_events warp_event 2, 7, RUINS_OF_ALPH_OUTSIDE, 6 warp_event 3, 7, RUINS_OF_ALPH_OUTSIDE, 6 - db 0 ; coord events + def_coord_events - db 3 ; bg events + def_bg_events bg_event 6, 5, BGEVENT_READ, RuinsOfAlphResearchCenterBookshelf bg_event 3, 4, BGEVENT_READ, RuinsOfAlphResearchCenterComputer bg_event 7, 1, BGEVENT_READ, RuinsOfAlphResearchCenterPrinter - db 3 ; object events + def_object_events object_event 4, 5, SPRITE_SCIENTIST, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_SCRIPT, 0, RuinsOfAlphResearchCenterScientist1Script, -1 object_event 5, 2, SPRITE_SCIENTIST, SPRITEMOVEDATA_WANDER, 2, 1, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_SCRIPT, 0, RuinsOfAlphResearchCenterScientist2Script, -1 object_event 2, 5, SPRITE_SCIENTIST, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_SCRIPT, 0, RuinsOfAlphResearchCenterScientist3Script, EVENT_RUINS_OF_ALPH_RESEARCH_CENTER_SCIENTIST diff --git a/maps/SafariZoneBeta.asm b/maps/SafariZoneBeta.asm index 32627af69..eca291c75 100644 --- a/maps/SafariZoneBeta.asm +++ b/maps/SafariZoneBeta.asm @@ -1,17 +1,17 @@ SafariZoneBeta_MapScripts: - db 0 ; scene scripts + def_scene_scripts - db 0 ; callbacks + def_callbacks SafariZoneBeta_MapEvents: db 0, 0 ; filler - db 2 ; warp events + def_warp_events warp_event 9, 23, SAFARI_ZONE_FUCHSIA_GATE_BETA, 1 warp_event 10, 23, SAFARI_ZONE_FUCHSIA_GATE_BETA, 2 - db 0 ; coord events + def_coord_events - db 0 ; bg events + def_bg_events - db 0 ; object events + def_object_events diff --git a/maps/SafariZoneFuchsiaGateBeta.asm b/maps/SafariZoneFuchsiaGateBeta.asm index 547ed5bd2..d11041e4f 100644 --- a/maps/SafariZoneFuchsiaGateBeta.asm +++ b/maps/SafariZoneFuchsiaGateBeta.asm @@ -1,19 +1,19 @@ SafariZoneFuchsiaGateBeta_MapScripts: - db 0 ; scene scripts + def_scene_scripts - db 0 ; callbacks + def_callbacks SafariZoneFuchsiaGateBeta_MapEvents: db 0, 0 ; filler - db 4 ; warp events + def_warp_events 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 + def_coord_events - db 0 ; bg events + def_bg_events - db 0 ; object events + def_object_events diff --git a/maps/SafariZoneMainOffice.asm b/maps/SafariZoneMainOffice.asm index 270fc0267..6263e68de 100644 --- a/maps/SafariZoneMainOffice.asm +++ b/maps/SafariZoneMainOffice.asm @@ -1,17 +1,17 @@ SafariZoneMainOffice_MapScripts: - db 0 ; scene scripts + def_scene_scripts - db 0 ; callbacks + def_callbacks SafariZoneMainOffice_MapEvents: db 0, 0 ; filler - db 2 ; warp events + def_warp_events warp_event 2, 7, FUCHSIA_CITY, 2 warp_event 3, 7, FUCHSIA_CITY, 2 - db 0 ; coord events + def_coord_events - db 0 ; bg events + def_bg_events - db 0 ; object events + def_object_events diff --git a/maps/SafariZoneWardensHome.asm b/maps/SafariZoneWardensHome.asm index eb442a813..9419483fe 100644 --- a/maps/SafariZoneWardensHome.asm +++ b/maps/SafariZoneWardensHome.asm @@ -1,10 +1,10 @@ - object_const_def ; object_event constants + object_const_def const SAFARIZONEWARDENSHOME_LASS SafariZoneWardensHome_MapScripts: - db 0 ; scene scripts + def_scene_scripts - db 0 ; callbacks + def_callbacks WardensGranddaughter: faceplayer @@ -77,17 +77,17 @@ SafariZonePhotoText: SafariZoneWardensHome_MapEvents: db 0, 0 ; filler - db 2 ; warp events + def_warp_events warp_event 2, 7, FUCHSIA_CITY, 6 warp_event 3, 7, FUCHSIA_CITY, 6 - db 0 ; coord events + def_coord_events - db 4 ; bg events + def_bg_events bg_event 0, 1, BGEVENT_READ, WardensHomeBookshelf bg_event 1, 1, BGEVENT_READ, WardensHomeBookshelf bg_event 7, 0, BGEVENT_READ, WardenPhoto bg_event 9, 0, BGEVENT_READ, SafariZonePhoto - db 1 ; object events + def_object_events object_event 2, 4, SPRITE_LASS, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_SCRIPT, 0, WardensGranddaughter, -1 diff --git a/maps/SaffronCity.asm b/maps/SaffronCity.asm index d88284716..f89227a0b 100644 --- a/maps/SaffronCity.asm +++ b/maps/SaffronCity.asm @@ -1,4 +1,4 @@ - object_const_def ; object_event constants + object_const_def const SAFFRONCITY_LASS1 const SAFFRONCITY_POKEFAN_M const SAFFRONCITY_COOLTRAINER_M @@ -9,9 +9,9 @@ const SAFFRONCITY_LASS2 SaffronCity_MapScripts: - db 0 ; scene scripts + def_scene_scripts - db 1 ; callbacks + def_callbacks callback MAPCALLBACK_NEWMAP, .FlyPoint .FlyPoint: @@ -266,7 +266,7 @@ SaffronCityMagnetTrainStationSignText: SaffronCity_MapEvents: db 0, 0 ; filler - db 15 ; warp events + def_warp_events warp_event 26, 3, FIGHTING_DOJO, 1 warp_event 34, 3, SAFFRON_GYM, 1 warp_event 25, 11, SAFFRON_MART, 2 @@ -283,9 +283,9 @@ SaffronCity_MapEvents: warp_event 39, 22, ROUTE_8_SAFFRON_GATE, 1 warp_event 39, 23, ROUTE_8_SAFFRON_GATE, 2 - db 0 ; coord events + def_coord_events - db 8 ; bg events + def_bg_events bg_event 21, 5, BGEVENT_READ, SaffronCitySign bg_event 33, 5, BGEVENT_READ, SaffronGymSign bg_event 25, 5, BGEVENT_READ, FightingDojoSign @@ -295,7 +295,7 @@ SaffronCity_MapEvents: bg_event 10, 29, BGEVENT_READ, SaffronCityPokecenterSign bg_event 26, 11, BGEVENT_READ, SaffronCityMartSign - db 8 ; object events + def_object_events object_event 7, 14, SPRITE_LASS, SPRITEMOVEDATA_WALK_LEFT_RIGHT, 2, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_SCRIPT, 0, SaffronCityLass1Script, -1 object_event 19, 30, SPRITE_POKEFAN_M, SPRITEMOVEDATA_WALK_LEFT_RIGHT, 2, 0, -1, -1, PAL_NPC_BROWN, OBJECTTYPE_SCRIPT, 0, SaffronCityPokefanMScript, -1 object_event 32, 7, SPRITE_COOLTRAINER_M, SPRITEMOVEDATA_WALK_LEFT_RIGHT, 1, 0, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_SCRIPT, 0, SaffronCityCooltrainerMScript, -1 diff --git a/maps/SaffronGym.asm b/maps/SaffronGym.asm index b5af54c6f..32f501044 100644 --- a/maps/SaffronGym.asm +++ b/maps/SaffronGym.asm @@ -1,4 +1,4 @@ - object_const_def ; object_event constants + object_const_def const SAFFRONGYM_SABRINA const SAFFRONGYM_GRANNY1 const SAFFRONGYM_YOUNGSTER1 @@ -7,9 +7,9 @@ const SAFFRONGYM_GYM_GUIDE SaffronGym_MapScripts: - db 0 ; scene scripts + def_scene_scripts - db 0 ; callbacks + def_callbacks SaffronGymSabrinaScript: faceplayer @@ -291,7 +291,7 @@ SaffronGymGuideWinText: SaffronGym_MapEvents: db 0, 0 ; filler - db 32 ; warp events + def_warp_events warp_event 8, 17, SAFFRON_CITY, 2 warp_event 9, 17, SAFFRON_CITY, 2 warp_event 11, 15, SAFFRON_GYM, 18 @@ -325,12 +325,12 @@ SaffronGym_MapEvents: warp_event 1, 3, SAFFRON_GYM, 16 warp_event 11, 9, SAFFRON_GYM, 17 - db 0 ; coord events + def_coord_events - db 1 ; bg events + def_bg_events bg_event 8, 15, BGEVENT_READ, SaffronGymStatue - db 6 ; object events + def_object_events object_event 9, 8, SPRITE_SABRINA, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_SCRIPT, 0, SaffronGymSabrinaScript, -1 object_event 17, 16, SPRITE_GRANNY, SPRITEMOVEDATA_SPINRANDOM_FAST, 0, 0, -1, -1, PAL_NPC_BROWN, OBJECTTYPE_TRAINER, 3, TrainerMediumRebecca, -1 object_event 3, 16, SPRITE_YOUNGSTER, SPRITEMOVEDATA_SPINRANDOM_FAST, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_TRAINER, 3, TrainerPsychicFranklin, -1 diff --git a/maps/SaffronMagnetTrainStation.asm b/maps/SaffronMagnetTrainStation.asm index 7bf570237..805f59548 100644 --- a/maps/SaffronMagnetTrainStation.asm +++ b/maps/SaffronMagnetTrainStation.asm @@ -1,14 +1,14 @@ - object_const_def ; object_event constants + object_const_def const SAFFRONMAGNETTRAINSTATION_OFFICER const SAFFRONMAGNETTRAINSTATION_GYM_GUIDE const SAFFRONMAGNETTRAINSTATION_TEACHER const SAFFRONMAGNETTRAINSTATION_LASS SaffronMagnetTrainStation_MapScripts: - db 1 ; scene scripts + def_scene_scripts scene_script .DummyScene ; SCENE_DEFAULT - db 0 ; callbacks + def_callbacks .DummyScene: end @@ -216,18 +216,18 @@ SaffronMagnetTrainStationLassText: SaffronMagnetTrainStation_MapEvents: db 0, 0 ; filler - db 4 ; warp events + def_warp_events 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 + def_coord_events coord_event 11, 6, SCENE_DEFAULT, Script_ArriveFromGoldenrod - db 0 ; bg events + def_bg_events - db 4 ; object events + def_object_events object_event 9, 9, SPRITE_OFFICER, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, SaffronMagnetTrainStationOfficerScript, -1 object_event 10, 14, SPRITE_GYM_GUIDE, SPRITEMOVEDATA_WANDER, 1, 1, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, SaffronMagnetTrainStationGymGuideScript, -1 object_event 6, 11, SPRITE_TEACHER, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, SaffronMagnetTrainStationTeacherScript, EVENT_SAFFRON_TRAIN_STATION_POPULATION diff --git a/maps/SaffronMart.asm b/maps/SaffronMart.asm index 35dbfb22e..9bd6a2f56 100644 --- a/maps/SaffronMart.asm +++ b/maps/SaffronMart.asm @@ -1,12 +1,12 @@ - object_const_def ; object_event constants + object_const_def const SAFFRONMART_CLERK const SAFFRONMART_COOLTRAINER_M const SAFFRONMART_COOLTRAINER_F SaffronMart_MapScripts: - db 0 ; scene scripts + def_scene_scripts - db 0 ; callbacks + def_callbacks SaffronMartClerkScript: opentext @@ -38,15 +38,15 @@ SaffronMartCooltrainerFText: SaffronMart_MapEvents: db 0, 0 ; filler - db 2 ; warp events + def_warp_events warp_event 2, 7, SAFFRON_CITY, 3 warp_event 3, 7, SAFFRON_CITY, 3 - db 0 ; coord events + def_coord_events - db 0 ; bg events + def_bg_events - db 3 ; object events + def_object_events object_event 1, 3, SPRITE_CLERK, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, SaffronMartClerkScript, -1 object_event 7, 2, SPRITE_COOLTRAINER_M, SPRITEMOVEDATA_SPINRANDOM_SLOW, 0, 0, -1, -1, PAL_NPC_BROWN, OBJECTTYPE_SCRIPT, 0, SaffronMartCooltrainerMScript, -1 object_event 7, 6, SPRITE_COOLTRAINER_F, SPRITEMOVEDATA_WALK_LEFT_RIGHT, 1, 0, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_SCRIPT, 0, SaffronMartCooltrainerFScript, -1 diff --git a/maps/SaffronPokecenter1F.asm b/maps/SaffronPokecenter1F.asm index 243f0452c..a7d483d74 100644 --- a/maps/SaffronPokecenter1F.asm +++ b/maps/SaffronPokecenter1F.asm @@ -1,13 +1,13 @@ - object_const_def ; object_event constants + object_const_def const SAFFRONPOKECENTER1F_NURSE const SAFFRONPOKECENTER1F_TEACHER const SAFFRONPOKECENTER1F_FISHER const SAFFRONPOKECENTER1F_YOUNGSTER SaffronPokecenter1F_MapScripts: - db 0 ; scene scripts + def_scene_scripts - db 0 ; callbacks + def_callbacks SaffronPokecenter1FNurseScript: jumpstd PokecenterNurseScript @@ -112,16 +112,16 @@ SaffronPokecenter1FYoungsterText: SaffronPokecenter1F_MapEvents: db 0, 0 ; filler - db 3 ; warp events + def_warp_events 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 + def_coord_events - db 0 ; bg events + def_bg_events - db 4 ; object events + def_object_events object_event 3, 1, SPRITE_NURSE, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, SaffronPokecenter1FNurseScript, -1 object_event 7, 2, SPRITE_TEACHER, SPRITEMOVEDATA_WANDER, 1, 1, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_SCRIPT, 0, SaffronPokecenter1FTeacherScript, -1 object_event 8, 6, SPRITE_FISHER, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_SCRIPT, 0, SaffronPokecenter1FFisherScript, -1 diff --git a/maps/SaffronPokecenter2FBeta.asm b/maps/SaffronPokecenter2FBeta.asm index 912f1281a..0e520a5a4 100644 --- a/maps/SaffronPokecenter2FBeta.asm +++ b/maps/SaffronPokecenter2FBeta.asm @@ -1,16 +1,16 @@ SaffronPokecenter2FBeta_MapScripts: - db 0 ; scene scripts + def_scene_scripts - db 0 ; callbacks + def_callbacks SaffronPokecenter2FBeta_MapEvents: db 0, 0 ; filler - db 1 ; warp events + def_warp_events warp_event 0, 7, SAFFRON_POKECENTER_1F, 3 - db 0 ; coord events + def_coord_events - db 0 ; bg events + def_bg_events - db 0 ; object events + def_object_events diff --git a/maps/SeafoamGym.asm b/maps/SeafoamGym.asm index c402b2a65..31cda7494 100644 --- a/maps/SeafoamGym.asm +++ b/maps/SeafoamGym.asm @@ -1,12 +1,12 @@ - object_const_def ; object_event constants + object_const_def const SEAFOAMGYM_BLAINE const SEAFOAMGYM_GYM_GUIDE SeafoamGym_MapScripts: - db 1 ; scene scripts + def_scene_scripts scene_script .DummyScene - db 0 ; callbacks + def_callbacks .DummyScene: end @@ -158,13 +158,13 @@ SeafoamGymGuideWinText2: SeafoamGym_MapEvents: db 0, 0 ; filler - db 1 ; warp events + def_warp_events warp_event 5, 5, ROUTE_20, 1 - db 0 ; coord events + def_coord_events - db 0 ; bg events + def_bg_events - db 2 ; object events + def_object_events object_event 5, 2, SPRITE_BLAINE, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_BROWN, OBJECTTYPE_SCRIPT, 0, SeafoamGymBlaineScript, -1 object_event 6, 5, SPRITE_GYM_GUIDE, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_SCRIPT, 0, SeafoamGymGuideScript, EVENT_SEAFOAM_GYM_GYM_GUIDE diff --git a/maps/SilphCo1F.asm b/maps/SilphCo1F.asm index 2ede997a4..5edaffe8a 100644 --- a/maps/SilphCo1F.asm +++ b/maps/SilphCo1F.asm @@ -1,11 +1,11 @@ - object_const_def ; object_event constants + object_const_def const SILPHCO1F_RECEPTIONIST const SILPHCO1F_OFFICER SilphCo1F_MapScripts: - db 0 ; scene scripts + def_scene_scripts - db 0 ; callbacks + def_callbacks SilphCoReceptionistScript: jumptextfaceplayer SilphCoReceptionistText @@ -56,14 +56,14 @@ SilphCoOfficerText_GotUpGrade: SilphCo1F_MapEvents: db 0, 0 ; filler - db 2 ; warp events + def_warp_events warp_event 2, 7, SAFFRON_CITY, 7 warp_event 3, 7, SAFFRON_CITY, 7 - db 0 ; coord events + def_coord_events - db 0 ; bg events + def_bg_events - db 2 ; object events + def_object_events object_event 4, 2, SPRITE_RECEPTIONIST, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_SCRIPT, 0, SilphCoReceptionistScript, -1 object_event 13, 1, SPRITE_OFFICER, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_SCRIPT, 0, SilphCoOfficerScript, -1 diff --git a/maps/SilverCaveItemRooms.asm b/maps/SilverCaveItemRooms.asm index eded4deee..dd9323f2a 100644 --- a/maps/SilverCaveItemRooms.asm +++ b/maps/SilverCaveItemRooms.asm @@ -1,11 +1,11 @@ - object_const_def ; object_event constants + object_const_def const SILVERCAVEITEMROOMS_POKE_BALL1 const SILVERCAVEITEMROOMS_POKE_BALL2 SilverCaveItemRooms_MapScripts: - db 0 ; scene scripts + def_scene_scripts - db 0 ; callbacks + def_callbacks SilverCaveItemRoomsMaxRevive: itemball MAX_REVIVE @@ -16,14 +16,14 @@ SilverCaveItemRoomsFullRestore: SilverCaveItemRooms_MapEvents: db 0, 0 ; filler - db 2 ; warp events + def_warp_events warp_event 13, 3, SILVER_CAVE_ROOM_2, 3 warp_event 7, 15, SILVER_CAVE_ROOM_2, 4 - db 0 ; coord events + def_coord_events - db 0 ; bg events + def_bg_events - db 2 ; object events + def_object_events object_event 6, 3, SPRITE_POKE_BALL, SPRITEMOVEDATA_STILL, 0, 0, -1, -1, 0, OBJECTTYPE_ITEMBALL, 0, SilverCaveItemRoomsMaxRevive, EVENT_SILVER_CAVE_ITEM_ROOMS_MAX_REVIVE object_event 15, 11, SPRITE_POKE_BALL, SPRITEMOVEDATA_STILL, 0, 0, -1, -1, 0, OBJECTTYPE_ITEMBALL, 0, SilverCaveItemRoomsFullRestore, EVENT_SILVER_CAVE_ITEM_ROOMS_FULL_RESTORE diff --git a/maps/SilverCaveOutside.asm b/maps/SilverCaveOutside.asm index a578b0261..e22f8be67 100644 --- a/maps/SilverCaveOutside.asm +++ b/maps/SilverCaveOutside.asm @@ -1,7 +1,7 @@ SilverCaveOutside_MapScripts: - db 0 ; scene scripts + def_scene_scripts - db 1 ; callbacks + def_callbacks callback MAPCALLBACK_NEWMAP, .FlyPoint .FlyPoint: @@ -24,15 +24,15 @@ MtSilverSignText: SilverCaveOutside_MapEvents: db 0, 0 ; filler - db 2 ; warp events + def_warp_events warp_event 23, 19, SILVER_CAVE_POKECENTER_1F, 1 warp_event 18, 11, SILVER_CAVE_ROOM_1, 1 - db 0 ; coord events + def_coord_events - db 3 ; bg events + def_bg_events bg_event 24, 19, BGEVENT_READ, MtSilverPokecenterSign bg_event 17, 13, BGEVENT_READ, MtSilverSign bg_event 9, 25, BGEVENT_ITEM, SilverCaveOutsideHiddenFullRestore - db 0 ; object events + def_object_events diff --git a/maps/SilverCavePokecenter1F.asm b/maps/SilverCavePokecenter1F.asm index b3297234a..8d2d3b61e 100644 --- a/maps/SilverCavePokecenter1F.asm +++ b/maps/SilverCavePokecenter1F.asm @@ -1,11 +1,11 @@ - object_const_def ; object_event constants + object_const_def const SILVERCAVEPOKECENTER1F_NURSE const SILVERCAVEPOKECENTER1F_GRANNY SilverCavePokecenter1F_MapScripts: - db 0 ; scene scripts + def_scene_scripts - db 0 ; callbacks + def_callbacks SilverCavePokecenter1FNurseScript: jumpstd PokecenterNurseScript @@ -30,15 +30,15 @@ SilverCavePokecenter1FGrannyText: SilverCavePokecenter1F_MapEvents: db 0, 0 ; filler - db 3 ; warp events + def_warp_events 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 + def_coord_events - db 0 ; bg events + def_bg_events - db 2 ; object events + def_object_events object_event 3, 1, SPRITE_NURSE, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, SilverCavePokecenter1FNurseScript, -1 object_event 1, 5, SPRITE_GRANNY, SPRITEMOVEDATA_STANDING_LEFT, 2, 1, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, SilverCavePokecenter1FGrannyScript, -1 diff --git a/maps/SilverCaveRoom1.asm b/maps/SilverCaveRoom1.asm index 1765b2ac6..944b3a2fc 100644 --- a/maps/SilverCaveRoom1.asm +++ b/maps/SilverCaveRoom1.asm @@ -1,13 +1,13 @@ - object_const_def ; object_event constants + object_const_def const SILVERCAVEROOM1_POKE_BALL1 const SILVERCAVEROOM1_POKE_BALL2 const SILVERCAVEROOM1_POKE_BALL3 const SILVERCAVEROOM1_POKE_BALL4 SilverCaveRoom1_MapScripts: - db 0 ; scene scripts + def_scene_scripts - db 0 ; callbacks + def_callbacks SilverCaveRoom1MaxElixer: itemball MAX_ELIXER @@ -30,17 +30,17 @@ SilverCaveRoom1HiddenUltraBall: SilverCaveRoom1_MapEvents: db 0, 0 ; filler - db 2 ; warp events + def_warp_events warp_event 9, 33, SILVER_CAVE_OUTSIDE, 2 warp_event 15, 1, SILVER_CAVE_ROOM_2, 1 - db 0 ; coord events + def_coord_events - db 2 ; bg events + def_bg_events bg_event 16, 23, BGEVENT_ITEM, SilverCaveRoom1HiddenDireHit bg_event 17, 12, BGEVENT_ITEM, SilverCaveRoom1HiddenUltraBall - db 4 ; object events + def_object_events object_event 4, 9, SPRITE_POKE_BALL, SPRITEMOVEDATA_STILL, 0, 0, -1, -1, 0, OBJECTTYPE_ITEMBALL, 0, SilverCaveRoom1MaxElixer, EVENT_SILVER_CAVE_ROOM_1_MAX_ELIXER object_event 15, 29, SPRITE_POKE_BALL, SPRITEMOVEDATA_STILL, 0, 0, -1, -1, 0, OBJECTTYPE_ITEMBALL, 0, SilverCaveRoom1Protein, EVENT_SILVER_CAVE_ROOM_1_PROTEIN object_event 5, 30, SPRITE_POKE_BALL, SPRITEMOVEDATA_STILL, 0, 0, -1, -1, 0, OBJECTTYPE_ITEMBALL, 0, SilverCaveRoom1EscapeRope, EVENT_SILVER_CAVE_ROOM_1_ESCAPE_ROPE diff --git a/maps/SilverCaveRoom2.asm b/maps/SilverCaveRoom2.asm index a56b9e4b8..07a2c2cb4 100644 --- a/maps/SilverCaveRoom2.asm +++ b/maps/SilverCaveRoom2.asm @@ -1,12 +1,12 @@ - object_const_def ; object_event constants + object_const_def const SILVERCAVEROOM2_POKE_BALL1 const SILVERCAVEROOM2_POKE_BALL2 const SILVERCAVEROOM2_POKE_BALL3 SilverCaveRoom2_MapScripts: - db 0 ; scene scripts + def_scene_scripts - db 0 ; callbacks + def_callbacks SilverCaveRoom2Calcium: itemball CALCIUM @@ -23,18 +23,18 @@ SilverCaveRoom2HiddenMaxPotion: SilverCaveRoom2_MapEvents: db 0, 0 ; filler - db 4 ; warp events + def_warp_events 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 + def_coord_events - db 1 ; bg events + def_bg_events bg_event 14, 31, BGEVENT_ITEM, SilverCaveRoom2HiddenMaxPotion - db 3 ; object events + def_object_events object_event 24, 10, SPRITE_POKE_BALL, SPRITEMOVEDATA_STILL, 0, 0, -1, -1, 0, OBJECTTYPE_ITEMBALL, 0, SilverCaveRoom2Calcium, EVENT_SILVER_CAVE_ROOM_2_CALCIUM object_event 22, 24, SPRITE_POKE_BALL, SPRITEMOVEDATA_STILL, 0, 0, -1, -1, 0, OBJECTTYPE_ITEMBALL, 0, SilverCaveRoom2UltraBall, EVENT_SILVER_CAVE_ROOM_2_ULTRA_BALL object_event 4, 20, SPRITE_POKE_BALL, SPRITEMOVEDATA_STILL, 0, 0, -1, -1, 0, OBJECTTYPE_ITEMBALL, 0, SilverCaveRoom2PPUp, EVENT_SILVER_CAVE_ROOM_2_PP_UP diff --git a/maps/SilverCaveRoom3.asm b/maps/SilverCaveRoom3.asm index 45acce4af..f471bd8b1 100644 --- a/maps/SilverCaveRoom3.asm +++ b/maps/SilverCaveRoom3.asm @@ -1,10 +1,10 @@ - object_const_def ; object_event constants + object_const_def const SILVERCAVEROOM3_RED SilverCaveRoom3_MapScripts: - db 0 ; scene scripts + def_scene_scripts - db 0 ; callbacks + def_callbacks Red: special FadeOutMusic @@ -51,12 +51,12 @@ RedLeavesText: SilverCaveRoom3_MapEvents: db 0, 0 ; filler - db 1 ; warp events + def_warp_events warp_event 9, 33, SILVER_CAVE_ROOM_2, 2 - db 0 ; coord events + def_coord_events - db 0 ; bg events + def_bg_events - db 1 ; object events + def_object_events object_event 9, 10, SPRITE_RED, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_SCRIPT, 0, Red, EVENT_RED_IN_MT_SILVER diff --git a/maps/SlowpokeWellB1F.asm b/maps/SlowpokeWellB1F.asm index f498b2483..67caf5a27 100644 --- a/maps/SlowpokeWellB1F.asm +++ b/maps/SlowpokeWellB1F.asm @@ -1,4 +1,4 @@ - object_const_def ; object_event constants + object_const_def const SLOWPOKEWELLB1F_ROCKET1 const SLOWPOKEWELLB1F_ROCKET2 const SLOWPOKEWELLB1F_ROCKET3 @@ -10,9 +10,9 @@ const SLOWPOKEWELLB1F_POKE_BALL SlowpokeWellB1F_MapScripts: - db 0 ; scene scripts + def_scene_scripts - db 0 ; callbacks + def_callbacks SlowpokeWellB1FKurtScript: jumptextfaceplayer SlowpokeWellB1FKurtText @@ -321,15 +321,15 @@ SlowpokeWellB1FTaillessSlowpokeText: SlowpokeWellB1F_MapEvents: db 0, 0 ; filler - db 2 ; warp events + def_warp_events warp_event 17, 15, AZALEA_TOWN, 6 warp_event 7, 11, SLOWPOKE_WELL_B2F, 1 - db 0 ; coord events + def_coord_events - db 0 ; bg events + def_bg_events - db 9 ; object events + def_object_events object_event 15, 7, SPRITE_ROCKET, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, 0, OBJECTTYPE_TRAINER, 3, TrainerGruntM29, EVENT_SLOWPOKE_WELL_ROCKETS object_event 5, 2, SPRITE_ROCKET, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, 0, OBJECTTYPE_TRAINER, 1, TrainerGruntM1, EVENT_SLOWPOKE_WELL_ROCKETS object_event 5, 6, SPRITE_ROCKET, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, 0, OBJECTTYPE_TRAINER, 2, TrainerGruntM2, EVENT_SLOWPOKE_WELL_ROCKETS diff --git a/maps/SlowpokeWellB2F.asm b/maps/SlowpokeWellB2F.asm index 3b7035b49..f9c8ff289 100644 --- a/maps/SlowpokeWellB2F.asm +++ b/maps/SlowpokeWellB2F.asm @@ -1,11 +1,11 @@ - object_const_def ; object_event constants + object_const_def const SLOWPOKEWELLB2F_GYM_GUIDE const SLOWPOKEWELLB2F_POKE_BALL SlowpokeWellB2F_MapScripts: - db 0 ; scene scripts + def_scene_scripts - db 0 ; callbacks + def_callbacks SlowpokeWellB2FGymGuideScript: faceplayer @@ -62,13 +62,13 @@ SlowpokeWellB2FGymGuideText_GotKingsRock: SlowpokeWellB2F_MapEvents: db 0, 0 ; filler - db 1 ; warp events + def_warp_events warp_event 9, 11, SLOWPOKE_WELL_B1F, 2 - db 0 ; coord events + def_coord_events - db 0 ; bg events + def_bg_events - db 2 ; object events + def_object_events object_event 5, 4, SPRITE_GYM_GUIDE, SPRITEMOVEDATA_WANDER, 1, 2, -1, -1, 0, OBJECTTYPE_SCRIPT, 1, SlowpokeWellB2FGymGuideScript, -1 object_event 15, 5, SPRITE_POKE_BALL, SPRITEMOVEDATA_STILL, 0, 0, -1, -1, 0, OBJECTTYPE_ITEMBALL, 0, SlowpokeWellB2FTMRainDance, EVENT_SLOWPOKE_WELL_B2F_TM_RAIN_DANCE diff --git a/maps/SoulHouse.asm b/maps/SoulHouse.asm index 314900518..f23c59215 100644 --- a/maps/SoulHouse.asm +++ b/maps/SoulHouse.asm @@ -1,13 +1,13 @@ - object_const_def ; object_event constants + object_const_def const SOULHOUSE_MRFUJI const SOULHOUSE_TEACHER const SOULHOUSE_LASS const SOULHOUSE_GRANNY SoulHouse_MapScripts: - db 0 ; scene scripts + def_scene_scripts - db 0 ; callbacks + def_callbacks MrFuji: jumptextfaceplayer MrFujiText @@ -73,15 +73,15 @@ SoulHouseGrannyText: SoulHouse_MapEvents: db 0, 0 ; filler - db 2 ; warp events + def_warp_events warp_event 4, 7, LAVENDER_TOWN, 6 warp_event 5, 7, LAVENDER_TOWN, 6 - db 0 ; coord events + def_coord_events - db 0 ; bg events + def_bg_events - db 4 ; object events + def_object_events object_event 4, 2, SPRITE_GRAMPS, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_SCRIPT, 0, MrFuji, -1 object_event 7, 3, SPRITE_TEACHER, SPRITEMOVEDATA_WALK_LEFT_RIGHT, 1, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_SCRIPT, 0, SoulHouseTeacherScript, -1 object_event 2, 5, SPRITE_LASS, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_SCRIPT, 0, SoulHouseLassScript, -1 diff --git a/maps/SproutTower1F.asm b/maps/SproutTower1F.asm index 5bb526ee6..e816548a9 100644 --- a/maps/SproutTower1F.asm +++ b/maps/SproutTower1F.asm @@ -1,4 +1,4 @@ - object_const_def ; object_event constants + object_const_def const SPROUTTOWER1F_SAGE1 const SPROUTTOWER1F_SAGE2 const SPROUTTOWER1F_GRANNY @@ -7,9 +7,9 @@ const SPROUTTOWER1F_POKE_BALL SproutTower1F_MapScripts: - db 0 ; scene scripts + def_scene_scripts - db 0 ; callbacks + def_callbacks SproutTower1FSage1Script: jumptextfaceplayer SproutTower1FSage1Text @@ -103,20 +103,20 @@ SproutTower1FStatueText: SproutTower1F_MapEvents: db 0, 0 ; filler - db 5 ; warp events + def_warp_events 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 + def_coord_events - db 2 ; bg events + def_bg_events bg_event 7, 15, BGEVENT_READ, SproutTower1FStatue bg_event 12, 15, BGEVENT_READ, SproutTower1FStatue - db 6 ; object events + def_object_events object_event 7, 4, SPRITE_SAGE, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_SCRIPT, 0, SproutTower1FSage1Script, -1 object_event 6, 7, SPRITE_SAGE, SPRITEMOVEDATA_WANDER, 1, 1, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_SCRIPT, 0, SproutTower1FSage2Script, -1 object_event 11, 12, SPRITE_GRANNY, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, SproutTower1FGrannyScript, -1 diff --git a/maps/SproutTower2F.asm b/maps/SproutTower2F.asm index c2dfa415d..3bab7133a 100644 --- a/maps/SproutTower2F.asm +++ b/maps/SproutTower2F.asm @@ -1,12 +1,12 @@ - object_const_def ; object_event constants + object_const_def const SPROUTTOWER2F_SAGE1 const SPROUTTOWER2F_SAGE2 const SPROUTTOWER2F_POKE_BALL SproutTower2F_MapScripts: - db 0 ; scene scripts + def_scene_scripts - db 0 ; callbacks + def_callbacks TrainerSageNico: trainer SAGE, NICO, EVENT_BEAT_SAGE_NICO, SageNicoSeenText, SageNicoBeatenText, 0, .Script @@ -85,18 +85,18 @@ SproutTower2FStatueText: SproutTower2F_MapEvents: db 0, 0 ; filler - db 4 ; warp events + def_warp_events 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 + def_coord_events - db 1 ; bg events + def_bg_events bg_event 12, 15, BGEVENT_READ, SproutTower2FStatue - db 3 ; object events + def_object_events object_event 12, 3, SPRITE_SAGE, SPRITEMOVEDATA_SPINRANDOM_FAST, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_TRAINER, 4, TrainerSageNico, -1 object_event 9, 14, SPRITE_SAGE, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_TRAINER, 5, TrainerSageEdmond, -1 object_event 3, 1, SPRITE_POKE_BALL, SPRITEMOVEDATA_STILL, 0, 0, -1, -1, 0, OBJECTTYPE_ITEMBALL, 0, SproutTower2FXAccuracy, EVENT_SPROUT_TOWER_2F_X_ACCURACY diff --git a/maps/SproutTower3F.asm b/maps/SproutTower3F.asm index 0815a4289..b79433e5b 100644 --- a/maps/SproutTower3F.asm +++ b/maps/SproutTower3F.asm @@ -1,4 +1,4 @@ - object_const_def ; object_event constants + object_const_def const SPROUTTOWER3F_SAGE1 const SPROUTTOWER3F_SAGE2 const SPROUTTOWER3F_SAGE3 @@ -8,11 +8,11 @@ const SPROUTTOWER3F_SILVER SproutTower3F_MapScripts: - db 2 ; scene scripts + def_scene_scripts scene_script .DummyScene0 ; SCENE_DEFAULT scene_script .DummyScene1 ; SCENE_FINISHED - db 0 ; callbacks + def_callbacks .DummyScene0: end @@ -330,13 +330,13 @@ SproutTower3FStatueText: SproutTower3F_MapEvents: db 0, 0 ; filler - db 1 ; warp events + def_warp_events warp_event 10, 14, SPROUT_TOWER_2F, 4 - db 1 ; coord events + def_coord_events coord_event 11, 9, SCENE_DEFAULT, SproutTower3FRivalScene - db 6 ; bg events + def_bg_events bg_event 8, 1, BGEVENT_READ, SproutTower3FStatue bg_event 11, 1, BGEVENT_READ, SproutTower3FStatue bg_event 9, 0, BGEVENT_READ, SproutTower3FPainting @@ -344,7 +344,7 @@ SproutTower3F_MapEvents: bg_event 5, 15, BGEVENT_READ, SproutTower3FStatue bg_event 14, 15, BGEVENT_READ, SproutTower3FStatue - db 7 ; object events + def_object_events object_event 8, 13, SPRITE_SAGE, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_TRAINER, 3, TrainerSageJin, -1 object_event 8, 8, SPRITE_SAGE, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_TRAINER, 2, TrainerSageTroy, -1 object_event 10, 2, SPRITE_SAGE, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_SCRIPT, 0, SageLiScript, -1 diff --git a/maps/TeamRocketBaseB1F.asm b/maps/TeamRocketBaseB1F.asm index 8f29f4c1a..19509866a 100644 --- a/maps/TeamRocketBaseB1F.asm +++ b/maps/TeamRocketBaseB1F.asm @@ -1,4 +1,4 @@ - object_const_def ; object_event constants + object_const_def const TEAMROCKETBASEB1F_ROCKET1 const TEAMROCKETBASEB1F_ROCKET2 const TEAMROCKETBASEB1F_SCIENTIST @@ -7,10 +7,10 @@ const TEAMROCKETBASEB1F_POKE_BALL3 TeamRocketBaseB1F_MapScripts: - db 1 ; scene scripts + def_scene_scripts scene_script .DummyScene ; SCENE_DEFAULT - db 1 ; callbacks + def_callbacks callback MAPCALLBACK_OBJECTS, .HideSecurityGrunt .DummyScene: @@ -727,13 +727,13 @@ TeamRocketBaseB1FSwitchOffText: TeamRocketBaseB1F_MapEvents: db 0, 0 ; filler - db 4 ; warp events + def_warp_events 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 + def_coord_events ; There are five security cameras in the base. ; Walking in front of one triggers two Rocket Grunts. coord_event 24, 2, SCENE_DEFAULT, SecurityCamera1a @@ -769,7 +769,7 @@ TeamRocketBaseB1F_MapEvents: coord_event 4, 13, SCENE_DEFAULT, ExplodingTrap21 coord_event 5, 13, SCENE_DEFAULT, ExplodingTrap22 - db 9 ; bg events + def_bg_events bg_event 19, 11, BGEVENT_READ, TeamRocketBaseB1FSecretSwitch bg_event 24, 1, BGEVENT_UP, TeamRocketBaseB1FSecurityCamera bg_event 6, 1, BGEVENT_UP, TeamRocketBaseB1FSecurityCamera @@ -780,7 +780,7 @@ TeamRocketBaseB1F_MapEvents: bg_event 21, 11, BGEVENT_READ, TeamRocketBaseB1FBookshelf bg_event 3, 11, BGEVENT_ITEM, TeamRocketBaseB1FHiddenRevive - db 6 ; object events + def_object_events object_event 0, 0, SPRITE_ROCKET, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, ObjectEvent, EVENT_TEAM_ROCKET_BASE_SECURITY_GRUNTS object_event 2, 4, SPRITE_ROCKET, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, 0, OBJECTTYPE_TRAINER, 3, TrainerGruntM16, EVENT_TEAM_ROCKET_BASE_POPULATION object_event 18, 12, SPRITE_SCIENTIST, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_TRAINER, 3, TrainerScientistJed, EVENT_TEAM_ROCKET_BASE_POPULATION diff --git a/maps/TeamRocketBaseB2F.asm b/maps/TeamRocketBaseB2F.asm index 9f8beea70..899c47d73 100644 --- a/maps/TeamRocketBaseB2F.asm +++ b/maps/TeamRocketBaseB2F.asm @@ -1,4 +1,4 @@ - object_const_def ; object_event constants + object_const_def const TEAMROCKETBASEB2F_ROCKET1 const TEAMROCKETBASEB2F_ROCKET_GIRL const TEAMROCKETBASEB2F_LANCE @@ -15,13 +15,13 @@ const TEAMROCKETBASEB2F_POKE_BALL TeamRocketBaseB2F_MapScripts: - db 4 ; scene scripts + def_scene_scripts scene_script .DummyScene0 ; SCENE_DEFAULT scene_script .DummyScene1 ; SCENE_TEAMROCKETBASEB2F_ROCKET_BOSS scene_script .DummyScene2 ; SCENE_TEAMROCKETBASEB2F_ELECTRODES scene_script .DummyScene3 ; SCENE_TEAMROCKETBASEB2F_NOTHING - db 1 ; callbacks + def_callbacks callback MAPCALLBACK_TILES, .TransmitterDoorCallback .DummyScene0: @@ -909,14 +909,14 @@ RocketBaseB2FDeactivateTransmitterText: TeamRocketBaseB2F_MapEvents: db 0, 0 ; filler - db 5 ; warp events + def_warp_events 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 + def_coord_events coord_event 5, 14, SCENE_DEFAULT, LanceHealsScript1 coord_event 4, 13, SCENE_DEFAULT, LanceHealsScript2 coord_event 14, 11, SCENE_TEAMROCKETBASEB2F_ROCKET_BOSS, RocketBaseBossFLeft @@ -927,7 +927,7 @@ TeamRocketBaseB2F_MapEvents: coord_event 12, 10, SCENE_TEAMROCKETBASEB2F_ELECTRODES, RocketBaseLancesSideScript coord_event 12, 11, SCENE_TEAMROCKETBASEB2F_ELECTRODES, RocketBaseLancesSideScript - db 23 ; bg events + def_bg_events bg_event 14, 12, BGEVENT_IFNOTSET, TeamRocketBaseB2FLockedDoor bg_event 15, 12, BGEVENT_IFNOTSET, TeamRocketBaseB2FLockedDoor bg_event 17, 9, BGEVENT_READ, TeamRocketBaseB2FTransmitterScript @@ -952,7 +952,7 @@ TeamRocketBaseB2F_MapEvents: bg_event 17, 8, BGEVENT_READ, TeamRocketBaseB2FTransmitterScript bg_event 26, 7, BGEVENT_ITEM, TeamRocketBaseB2FHiddenFullHeal - db 14 ; object events + def_object_events object_event 20, 16, SPRITE_ROCKET, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, ObjectEvent, EVENT_TEAM_ROCKET_BASE_B2F_GRUNT_WITH_EXECUTIVE object_event 20, 16, SPRITE_ROCKET_GIRL, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_SCRIPT, 0, ObjectEvent, EVENT_TEAM_ROCKET_BASE_B2F_EXECUTIVE object_event 5, 13, SPRITE_LANCE, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, ObjectEvent, EVENT_TEAM_ROCKET_BASE_B2F_LANCE diff --git a/maps/TeamRocketBaseB3F.asm b/maps/TeamRocketBaseB3F.asm index 15ea71c94..34c996feb 100644 --- a/maps/TeamRocketBaseB3F.asm +++ b/maps/TeamRocketBaseB3F.asm @@ -1,4 +1,4 @@ - object_const_def ; object_event constants + object_const_def const TEAMROCKETBASEB3F_LANCE const TEAMROCKETBASEB3F_ROCKET1 const TEAMROCKETBASEB3F_MOLTRES @@ -15,13 +15,13 @@ const TEAMROCKETBASEB3F_POKE_BALL5 TeamRocketBaseB3F_MapScripts: - db 4 ; scene scripts + def_scene_scripts scene_script .LanceGetsPassword ; SCENE_DEFAULT scene_script .DummyScene1 ; SCENE_TEAMROCKETBASEB3F_RIVAL_ENCOUNTER scene_script .DummyScene2 ; SCENE_TEAMROCKETBASEB3F_ROCKET_BOSS scene_script .DummyScene3 ; SCENE_TEAMROCKETBASEB3F_NOTHING - db 1 ; callbacks + def_callbacks callback MAPCALLBACK_TILES, .CheckGiovanniDoor .LanceGetsPassword: @@ -566,18 +566,18 @@ TeamRocketBaseB3FLockedDoorOpenSesameText: TeamRocketBaseB3F_MapEvents: db 0, 0 ; filler - db 4 ; warp events + def_warp_events 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 + def_coord_events coord_event 10, 8, SCENE_TEAMROCKETBASEB3F_ROCKET_BOSS, RocketBaseBossLeft coord_event 11, 8, SCENE_TEAMROCKETBASEB3F_ROCKET_BOSS, RocketBaseBossRight coord_event 8, 10, SCENE_TEAMROCKETBASEB3F_RIVAL_ENCOUNTER, RocketBaseRival - db 10 ; bg events + def_bg_events bg_event 10, 9, BGEVENT_IFNOTSET, TeamRocketBaseB3FLockedDoor bg_event 11, 9, BGEVENT_IFNOTSET, TeamRocketBaseB3FLockedDoor bg_event 10, 1, BGEVENT_READ, TeamRocketBaseB3FOathScript @@ -589,7 +589,7 @@ TeamRocketBaseB3F_MapEvents: bg_event 6, 13, BGEVENT_READ, TeamRocketBaseB3FOathScript bg_event 7, 13, BGEVENT_READ, TeamRocketBaseB3FOathScript - db 14 ; object events + def_object_events object_event 25, 14, SPRITE_LANCE, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, LanceGetPasswordScript, EVENT_TEAM_ROCKET_BASE_B3F_LANCE_PASSWORDS object_event 8, 3, SPRITE_ROCKET, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, ObjectEvent, EVENT_TEAM_ROCKET_BASE_B3F_EXECUTIVE object_event 7, 2, SPRITE_MOLTRES, SPRITEMOVEDATA_POKEMON, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_SCRIPT, 0, RocketBaseMurkrow, EVENT_TEAM_ROCKET_BASE_POPULATION diff --git a/maps/TimeCapsule.asm b/maps/TimeCapsule.asm index ca6c897ef..be95db858 100644 --- a/maps/TimeCapsule.asm +++ b/maps/TimeCapsule.asm @@ -1,13 +1,13 @@ - object_const_def ; object_event constants + object_const_def const TIMECAPSULE_CHRIS1 const TIMECAPSULE_CHRIS2 TimeCapsule_MapScripts: - db 2 ; scene scripts + def_scene_scripts scene_script .InitializeTimeCapsule ; SCENE_DEFAULT scene_script .DummyScene ; SCENE_FINISHED - db 1 ; callbacks + def_callbacks callback MAPCALLBACK_OBJECTS, .SetWhichChris .InitializeTimeCapsule: @@ -54,16 +54,16 @@ TimeCapsuleFriendScript: TimeCapsule_MapEvents: db 0, 0 ; filler - db 2 ; warp events + def_warp_events warp_event 4, 7, POKECENTER_2F, 4 warp_event 5, 7, POKECENTER_2F, 4 - db 0 ; coord events + def_coord_events - db 2 ; bg events + def_bg_events bg_event 4, 4, BGEVENT_RIGHT, TimeCapsuleConsoleScript bg_event 5, 4, BGEVENT_LEFT, TimeCapsuleConsoleScript - db 2 ; object events + def_object_events object_event 3, 4, SPRITE_CHRIS, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, TimeCapsuleFriendScript, EVENT_TEMPORARY_UNTIL_MAP_RELOAD_1 object_event 6, 4, SPRITE_CHRIS, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, TimeCapsuleFriendScript, EVENT_TEMPORARY_UNTIL_MAP_RELOAD_2 diff --git a/maps/TinTower1F.asm b/maps/TinTower1F.asm index 5acfea1fb..5a2ef43d6 100644 --- a/maps/TinTower1F.asm +++ b/maps/TinTower1F.asm @@ -1,4 +1,4 @@ - object_const_def ; object_event constants + object_const_def const TINTOWER1F_SUICUNE const TINTOWER1F_RAIKOU const TINTOWER1F_ENTEI @@ -11,11 +11,11 @@ const TINTOWER1F_SAGE6 TinTower1F_MapScripts: - db 2 ; scene scripts + def_scene_scripts scene_script .FaceSuicune ; SCENE_DEFAULT scene_script .DummyScene ; SCENE_FINISHED - db 2 ; callbacks + def_callbacks callback MAPCALLBACK_OBJECTS, .NPCsCallback callback MAPCALLBACK_TILES, .StairsCallback @@ -523,16 +523,16 @@ TinTower1FSage6Text2: TinTower1F_MapEvents: db 0, 0 ; filler - db 3 ; warp events + def_warp_events 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 + def_coord_events - db 0 ; bg events + def_bg_events - db 10 ; object events + def_object_events object_event 9, 9, SPRITE_SUICUNE, SPRITEMOVEDATA_STILL, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_SCRIPT, 0, ObjectEvent, EVENT_TIN_TOWER_1F_SUICUNE object_event 7, 9, SPRITE_RAIKOU, SPRITEMOVEDATA_STILL, 0, 0, -1, -1, PAL_NPC_BROWN, OBJECTTYPE_SCRIPT, 0, ObjectEvent, EVENT_TIN_TOWER_1F_RAIKOU object_event 12, 9, SPRITE_ENTEI, SPRITEMOVEDATA_STILL, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_SCRIPT, 0, ObjectEvent, EVENT_TIN_TOWER_1F_ENTEI diff --git a/maps/TinTower2F.asm b/maps/TinTower2F.asm index 280ab059c..4d749faa1 100644 --- a/maps/TinTower2F.asm +++ b/maps/TinTower2F.asm @@ -1,17 +1,17 @@ TinTower2F_MapScripts: - db 0 ; scene scripts + def_scene_scripts - db 0 ; callbacks + def_callbacks TinTower2F_MapEvents: db 0, 0 ; filler - db 2 ; warp events + def_warp_events warp_event 10, 14, TIN_TOWER_3F, 1 warp_event 10, 2, TIN_TOWER_1F, 3 - db 0 ; coord events + def_coord_events - db 0 ; bg events + def_bg_events - db 0 ; object events + def_object_events diff --git a/maps/TinTower3F.asm b/maps/TinTower3F.asm index 59ee1d491..9b9f74b92 100644 --- a/maps/TinTower3F.asm +++ b/maps/TinTower3F.asm @@ -1,10 +1,10 @@ - object_const_def ; object_event constants + object_const_def const TINTOWER3F_POKE_BALL TinTower3F_MapScripts: - db 0 ; scene scripts + def_scene_scripts - db 0 ; callbacks + def_callbacks TinTower3FFullHeal: itemball FULL_HEAL @@ -12,13 +12,13 @@ TinTower3FFullHeal: TinTower3F_MapEvents: db 0, 0 ; filler - db 2 ; warp events + def_warp_events warp_event 10, 14, TIN_TOWER_2F, 1 warp_event 16, 2, TIN_TOWER_4F, 2 - db 0 ; coord events + def_coord_events - db 0 ; bg events + def_bg_events - db 1 ; object events + def_object_events object_event 3, 14, SPRITE_POKE_BALL, SPRITEMOVEDATA_STILL, 0, 0, -1, -1, 0, OBJECTTYPE_ITEMBALL, 0, TinTower3FFullHeal, EVENT_TIN_TOWER_3F_FULL_HEAL diff --git a/maps/TinTower4F.asm b/maps/TinTower4F.asm index 12f22ad45..8793e6657 100644 --- a/maps/TinTower4F.asm +++ b/maps/TinTower4F.asm @@ -1,12 +1,12 @@ - object_const_def ; object_event constants + object_const_def const TINTOWER4F_POKE_BALL1 const TINTOWER4F_POKE_BALL2 const TINTOWER4F_POKE_BALL3 TinTower4F_MapScripts: - db 0 ; scene scripts + def_scene_scripts - db 0 ; callbacks + def_callbacks TinTower4FUltraBall: itemball ULTRA_BALL @@ -23,18 +23,18 @@ TinTower4FHiddenMaxPotion: TinTower4F_MapEvents: db 0, 0 ; filler - db 4 ; warp events + def_warp_events 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 + def_coord_events - db 1 ; bg events + def_bg_events bg_event 11, 6, BGEVENT_ITEM, TinTower4FHiddenMaxPotion - db 3 ; object events + def_object_events object_event 14, 10, SPRITE_POKE_BALL, SPRITEMOVEDATA_STILL, 0, 0, -1, -1, 0, OBJECTTYPE_ITEMBALL, 0, TinTower4FUltraBall, EVENT_TIN_TOWER_4F_ULTRA_BALL object_event 17, 14, SPRITE_POKE_BALL, SPRITEMOVEDATA_STILL, 0, 0, -1, -1, 0, OBJECTTYPE_ITEMBALL, 0, TinTower4FPPUp, EVENT_TIN_TOWER_4F_PP_UP object_event 2, 12, SPRITE_POKE_BALL, SPRITEMOVEDATA_STILL, 0, 0, -1, -1, 0, OBJECTTYPE_ITEMBALL, 0, TinTower4FEscapeRope, EVENT_TIN_TOWER_4F_ESCAPE_ROPE diff --git a/maps/TinTower5F.asm b/maps/TinTower5F.asm index 4cab0c3bf..1d74df64b 100644 --- a/maps/TinTower5F.asm +++ b/maps/TinTower5F.asm @@ -1,10 +1,10 @@ - object_const_def ; object_event constants + object_const_def const TINTOWER5F_POKE_BALL TinTower5F_MapScripts: - db 0 ; scene scripts + def_scene_scripts - db 0 ; callbacks + def_callbacks TinTower5FRareCandy: itemball RARE_CANDY @@ -18,17 +18,17 @@ TinTower5FHiddenCarbos: TinTower5F_MapEvents: db 0, 0 ; filler - db 4 ; warp events + def_warp_events 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 + def_coord_events - db 2 ; bg events + def_bg_events bg_event 16, 14, BGEVENT_ITEM, TinTower5FHiddenFullRestore bg_event 3, 15, BGEVENT_ITEM, TinTower5FHiddenCarbos - db 1 ; object events + def_object_events object_event 9, 9, SPRITE_POKE_BALL, SPRITEMOVEDATA_STILL, 0, 0, -1, -1, 0, OBJECTTYPE_ITEMBALL, 0, TinTower5FRareCandy, EVENT_TIN_TOWER_5F_RARE_CANDY diff --git a/maps/TinTower6F.asm b/maps/TinTower6F.asm index 0d433fa00..17570b5cf 100644 --- a/maps/TinTower6F.asm +++ b/maps/TinTower6F.asm @@ -1,10 +1,10 @@ - object_const_def ; object_event constants + object_const_def const TINTOWER6F_POKE_BALL TinTower6F_MapScripts: - db 0 ; scene scripts + def_scene_scripts - db 0 ; callbacks + def_callbacks TinTower6FMaxPotion: itemball MAX_POTION @@ -12,13 +12,13 @@ TinTower6FMaxPotion: TinTower6F_MapEvents: db 0, 0 ; filler - db 2 ; warp events + def_warp_events warp_event 3, 9, TIN_TOWER_7F, 1 warp_event 11, 15, TIN_TOWER_5F, 1 - db 0 ; coord events + def_coord_events - db 0 ; bg events + def_bg_events - db 1 ; object events + def_object_events object_event 8, 8, SPRITE_POKE_BALL, SPRITEMOVEDATA_STILL, 0, 0, -1, -1, 0, OBJECTTYPE_ITEMBALL, 0, TinTower6FMaxPotion, EVENT_TIN_TOWER_6F_MAX_POTION diff --git a/maps/TinTower7F.asm b/maps/TinTower7F.asm index 04ea5c50f..2ff0da508 100644 --- a/maps/TinTower7F.asm +++ b/maps/TinTower7F.asm @@ -1,10 +1,10 @@ - object_const_def ; object_event constants + object_const_def const TINTOWER7F_POKE_BALL TinTower7F_MapScripts: - db 0 ; scene scripts + def_scene_scripts - db 0 ; callbacks + def_callbacks TinTower7FMaxRevive: itemball MAX_REVIVE @@ -12,16 +12,16 @@ TinTower7FMaxRevive: TinTower7F_MapEvents: db 0, 0 ; filler - db 5 ; warp events + def_warp_events 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 + def_coord_events - db 0 ; bg events + def_bg_events - db 1 ; object events + def_object_events object_event 16, 1, SPRITE_POKE_BALL, SPRITEMOVEDATA_STILL, 0, 0, -1, -1, 0, OBJECTTYPE_ITEMBALL, 0, TinTower7FMaxRevive, EVENT_TIN_TOWER_7F_MAX_REVIVE diff --git a/maps/TinTower8F.asm b/maps/TinTower8F.asm index 5cb76ca3d..fa82d7804 100644 --- a/maps/TinTower8F.asm +++ b/maps/TinTower8F.asm @@ -1,12 +1,12 @@ - object_const_def ; object_event constants + object_const_def const TINTOWER8F_POKE_BALL1 const TINTOWER8F_POKE_BALL2 const TINTOWER8F_POKE_BALL3 TinTower8F_MapScripts: - db 0 ; scene scripts + def_scene_scripts - db 0 ; callbacks + def_callbacks TinTower8FNugget: itemball NUGGET @@ -20,7 +20,7 @@ TinTower8FFullRestore: TinTower8F_MapEvents: db 0, 0 ; filler - db 6 ; warp events + def_warp_events warp_event 2, 5, TIN_TOWER_7F, 2 warp_event 2, 11, TIN_TOWER_9F, 1 warp_event 16, 7, TIN_TOWER_9F, 2 @@ -28,11 +28,11 @@ TinTower8F_MapEvents: warp_event 14, 15, TIN_TOWER_9F, 6 warp_event 6, 9, TIN_TOWER_9F, 7 - db 0 ; coord events + def_coord_events - db 0 ; bg events + def_bg_events - db 3 ; object events + def_object_events object_event 7, 13, SPRITE_POKE_BALL, SPRITEMOVEDATA_STILL, 0, 0, -1, -1, 0, OBJECTTYPE_ITEMBALL, 0, TinTower8FNugget, EVENT_TIN_TOWER_8F_NUGGET object_event 11, 6, SPRITE_POKE_BALL, SPRITEMOVEDATA_STILL, 0, 0, -1, -1, 0, OBJECTTYPE_ITEMBALL, 0, TinTower8FMaxElixer, EVENT_TIN_TOWER_8F_MAX_ELIXER object_event 3, 1, SPRITE_POKE_BALL, SPRITEMOVEDATA_STILL, 0, 0, -1, -1, 0, OBJECTTYPE_ITEMBALL, 0, TinTower8FFullRestore, EVENT_TIN_TOWER_8F_FULL_RESTORE diff --git a/maps/TinTower9F.asm b/maps/TinTower9F.asm index fec180c83..908f1a6dd 100644 --- a/maps/TinTower9F.asm +++ b/maps/TinTower9F.asm @@ -1,10 +1,10 @@ - object_const_def ; object_event constants + object_const_def const TINTOWER9F_POKE_BALL TinTower9F_MapScripts: - db 0 ; scene scripts + def_scene_scripts - db 0 ; callbacks + def_callbacks TinTower9FHPUp: itemball HP_UP @@ -22,7 +22,7 @@ TinTower9FUnusedLugiaText: TinTower9F_MapEvents: db 0, 0 ; filler - db 7 ; warp events + def_warp_events warp_event 12, 3, TIN_TOWER_8F, 2 warp_event 2, 5, TIN_TOWER_8F, 3 warp_event 12, 7, TIN_TOWER_8F, 4 @@ -31,9 +31,9 @@ TinTower9F_MapEvents: warp_event 6, 13, TIN_TOWER_8F, 5 warp_event 8, 13, TIN_TOWER_8F, 6 - db 0 ; coord events + def_coord_events - db 0 ; bg events + def_bg_events - db 1 ; object events + def_object_events object_event 9, 1, SPRITE_POKE_BALL, SPRITEMOVEDATA_STILL, 0, 0, -1, -1, 0, OBJECTTYPE_ITEMBALL, 0, TinTower9FHPUp, EVENT_TIN_TOWER_9F_HP_UP diff --git a/maps/TinTowerRoof.asm b/maps/TinTowerRoof.asm index ec41f2072..8d68d764a 100644 --- a/maps/TinTowerRoof.asm +++ b/maps/TinTowerRoof.asm @@ -1,10 +1,10 @@ - object_const_def ; object_event constants + object_const_def const TINTOWERROOF_HO_OH TinTowerRoof_MapScripts: - db 0 ; scene scripts + def_scene_scripts - db 1 ; callbacks + def_callbacks callback MAPCALLBACK_OBJECTS, .HoOh .HoOh: @@ -45,12 +45,12 @@ HoOhText: TinTowerRoof_MapEvents: db 0, 0 ; filler - db 1 ; warp events + def_warp_events warp_event 9, 13, TIN_TOWER_9F, 4 - db 0 ; coord events + def_coord_events - db 0 ; bg events + def_bg_events - db 1 ; object events + def_object_events object_event 9, 5, SPRITE_HO_OH, SPRITEMOVEDATA_POKEMON, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_SCRIPT, 0, TinTowerHoOh, EVENT_TIN_TOWER_ROOF_HO_OH diff --git a/maps/TohjoFalls.asm b/maps/TohjoFalls.asm index 7a743151d..6819a6478 100644 --- a/maps/TohjoFalls.asm +++ b/maps/TohjoFalls.asm @@ -1,10 +1,10 @@ - object_const_def ; object_event constants + object_const_def const TOHJOFALLS_POKE_BALL TohjoFalls_MapScripts: - db 0 ; scene scripts + def_scene_scripts - db 0 ; callbacks + def_callbacks TohjoFallsMoonStone: itemball MOON_STONE @@ -12,13 +12,13 @@ TohjoFallsMoonStone: TohjoFalls_MapEvents: db 0, 0 ; filler - db 2 ; warp events + def_warp_events warp_event 13, 15, ROUTE_27, 2 warp_event 25, 15, ROUTE_27, 3 - db 0 ; coord events + def_coord_events - db 0 ; bg events + def_bg_events - db 1 ; object events + def_object_events object_event 2, 6, SPRITE_POKE_BALL, SPRITEMOVEDATA_STILL, 0, 0, -1, -1, 0, OBJECTTYPE_ITEMBALL, 0, TohjoFallsMoonStone, EVENT_TOHJO_FALLS_MOON_STONE diff --git a/maps/TradeCenter.asm b/maps/TradeCenter.asm index 4ac5ad2af..2282d9d5c 100644 --- a/maps/TradeCenter.asm +++ b/maps/TradeCenter.asm @@ -1,13 +1,13 @@ - object_const_def ; object_event constants + object_const_def const TRADECENTER_CHRIS1 const TRADECENTER_CHRIS2 TradeCenter_MapScripts: - db 2 ; scene scripts + def_scene_scripts scene_script .InitializeTradeCenter ; SCENE_DEFAULT scene_script .DummyScene ; SCENE_FINISHED - db 1 ; callbacks + def_callbacks callback MAPCALLBACK_OBJECTS, .SetWhichChris .InitializeTradeCenter: @@ -55,16 +55,16 @@ TradeCenterFriendScript: TradeCenter_MapEvents: db 0, 0 ; filler - db 2 ; warp events + def_warp_events warp_event 4, 7, POKECENTER_2F, 2 warp_event 5, 7, POKECENTER_2F, 2 - db 0 ; coord events + def_coord_events - db 2 ; bg events + def_bg_events bg_event 4, 4, BGEVENT_RIGHT, TradeCenterConsoleScript bg_event 5, 4, BGEVENT_LEFT, TradeCenterConsoleScript - db 2 ; object events + def_object_events object_event 3, 4, SPRITE_CHRIS, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, CableClubFriendScript, EVENT_TEMPORARY_UNTIL_MAP_RELOAD_1 object_event 6, 4, SPRITE_CHRIS, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, CableClubFriendScript, EVENT_TEMPORARY_UNTIL_MAP_RELOAD_2 diff --git a/maps/TrainerHouse1F.asm b/maps/TrainerHouse1F.asm index d38b45112..fbf544970 100644 --- a/maps/TrainerHouse1F.asm +++ b/maps/TrainerHouse1F.asm @@ -1,4 +1,4 @@ - object_const_def ; object_event constants + object_const_def const TRAINERHOUSE1F_RECEPTIONIST const TRAINERHOUSE1F_COOLTRAINER_M const TRAINERHOUSE1F_COOLTRAINER_F @@ -6,9 +6,9 @@ const TRAINERHOUSE1F_GENTLEMAN TrainerHouse1F_MapScripts: - db 0 ; scene scripts + def_scene_scripts - db 0 ; callbacks + def_callbacks TrainerHouse1FReceptionistScript: jumptextfaceplayer TrainerHouse1FReceptionistText @@ -138,19 +138,19 @@ TrainerHouseIllegibleText: TrainerHouse1F_MapEvents: db 0, 0 ; filler - db 3 ; warp events + def_warp_events 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 + def_coord_events - db 3 ; bg events + def_bg_events bg_event 5, 0, BGEVENT_READ, TrainerHouseSign1 bg_event 7, 0, BGEVENT_READ, TrainerHouseSign2 bg_event 7, 10, BGEVENT_READ, TrainerHouseIllegibleBook - db 5 ; object events + def_object_events object_event 0, 11, SPRITE_RECEPTIONIST, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_SCRIPT, 0, TrainerHouse1FReceptionistScript, -1 object_event 7, 11, SPRITE_COOLTRAINER_M, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, TrainerHouse1FCooltrainerMScript, -1 object_event 6, 2, SPRITE_COOLTRAINER_F, SPRITEMOVEDATA_STANDING_DOWN, 2, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_SCRIPT, 0, TrainerHouse1FCooltrainerFScript, -1 diff --git a/maps/TrainerHouseB1F.asm b/maps/TrainerHouseB1F.asm index a17c9473b..0d8fa0eea 100644 --- a/maps/TrainerHouseB1F.asm +++ b/maps/TrainerHouseB1F.asm @@ -1,12 +1,12 @@ - object_const_def ; object_event constants + object_const_def const TRAINERHOUSEB1F_RECEPTIONIST const TRAINERHOUSEB1F_CHRIS TrainerHouseB1F_MapScripts: - db 1 ; scene scripts + def_scene_scripts scene_script .DummyScene ; SCENE_DEFAULT - db 0 ; callbacks + def_callbacks .DummyScene: end @@ -170,14 +170,14 @@ TrainerHouseB1FCalBeforeText: TrainerHouseB1F_MapEvents: db 0, 0 ; filler - db 1 ; warp events + def_warp_events warp_event 9, 4, TRAINER_HOUSE_1F, 3 - db 1 ; coord events + def_coord_events coord_event 7, 3, SCENE_DEFAULT, TrainerHouseReceptionistScript - db 0 ; bg events + def_bg_events - db 2 ; object events + def_object_events object_event 7, 1, SPRITE_RECEPTIONIST, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_SCRIPT, 0, ObjectEvent, -1 object_event 6, 11, SPRITE_CHRIS, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_SCRIPT, 0, ObjectEvent, -1 diff --git a/maps/UndergroundPath.asm b/maps/UndergroundPath.asm index 72e8cd749..4dcb7070a 100644 --- a/maps/UndergroundPath.asm +++ b/maps/UndergroundPath.asm @@ -1,7 +1,7 @@ UndergroundPath_MapScripts: - db 0 ; scene scripts + def_scene_scripts - db 0 ; callbacks + def_callbacks UndergroundPathHiddenFullRestore: hiddenitem FULL_RESTORE, EVENT_UNDERGROUND_PATH_HIDDEN_FULL_RESTORE @@ -12,14 +12,14 @@ UndergroundPathHiddenXSpecial: UndergroundPath_MapEvents: db 0, 0 ; filler - db 2 ; warp events + def_warp_events warp_event 3, 2, ROUTE_5_UNDERGROUND_PATH_ENTRANCE, 3 warp_event 3, 24, ROUTE_6_UNDERGROUND_PATH_ENTRANCE, 3 - db 0 ; coord events + def_coord_events - db 2 ; bg events + def_bg_events bg_event 3, 9, BGEVENT_ITEM, UndergroundPathHiddenFullRestore bg_event 1, 19, BGEVENT_ITEM, UndergroundPathHiddenXSpecial - db 0 ; object events + def_object_events diff --git a/maps/UnionCave1F.asm b/maps/UnionCave1F.asm index 46119367a..862afd58a 100644 --- a/maps/UnionCave1F.asm +++ b/maps/UnionCave1F.asm @@ -1,4 +1,4 @@ - object_const_def ; object_event constants + object_const_def const UNIONCAVE1F_POKEFAN_M1 const UNIONCAVE1F_SUPER_NERD const UNIONCAVE1F_POKEFAN_M2 @@ -10,9 +10,9 @@ const UNIONCAVE1F_POKE_BALL4 UnionCave1F_MapScripts: - db 0 ; scene scripts + def_scene_scripts - db 0 ; callbacks + def_callbacks TrainerPokemaniacLarry: trainer POKEMANIAC, LARRY, EVENT_BEAT_POKEMANIAC_LARRY, PokemaniacLarrySeenText, PokemaniacLarryBeatenText, 0, .Script @@ -201,17 +201,17 @@ UnionCave1FUnusedSignText: UnionCave1F_MapEvents: db 0, 0 ; filler - db 4 ; warp events + def_warp_events 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 + def_coord_events - db 0 ; bg events + def_bg_events - db 9 ; object events + def_object_events object_event 3, 6, SPRITE_POKEFAN_M, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, PAL_NPC_BROWN, OBJECTTYPE_TRAINER, 2, TrainerHikerDaniel, -1 object_event 4, 21, SPRITE_SUPER_NERD, SPRITEMOVEDATA_SPINRANDOM_FAST, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_TRAINER, 3, TrainerPokemaniacLarry, -1 object_event 11, 8, SPRITE_POKEFAN_M, SPRITEMOVEDATA_SPINRANDOM_FAST, 0, 0, -1, -1, PAL_NPC_BROWN, OBJECTTYPE_TRAINER, 1, TrainerHikerRussell, -1 diff --git a/maps/UnionCaveB1F.asm b/maps/UnionCaveB1F.asm index dff3c2e0f..18441ba95 100644 --- a/maps/UnionCaveB1F.asm +++ b/maps/UnionCaveB1F.asm @@ -1,4 +1,4 @@ - object_const_def ; object_event constants + object_const_def const UNIONCAVEB1F_POKEFAN_M1 const UNIONCAVEB1F_POKEFAN_M2 const UNIONCAVEB1F_SUPER_NERD1 @@ -8,9 +8,9 @@ const UNIONCAVEB1F_POKE_BALL2 UnionCaveB1F_MapScripts: - db 0 ; scene scripts + def_scene_scripts - db 0 ; callbacks + def_callbacks TrainerPokemaniacAndrew: trainer POKEMANIAC, ANDREW, EVENT_BEAT_POKEMANIAC_ANDREW, PokemaniacAndrewSeenText, PokemaniacAndrewBeatenText, 0, .Script @@ -153,18 +153,18 @@ PokemaniacCalvinAfterBattleText: UnionCaveB1F_MapEvents: db 0, 0 ; filler - db 5 ; warp events + def_warp_events 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 + def_coord_events - db 0 ; bg events + def_bg_events - db 7 ; object events + def_object_events object_event 9, 4, SPRITE_POKEFAN_M, SPRITEMOVEDATA_SPINRANDOM_FAST, 0, 0, -1, -1, PAL_NPC_BROWN, OBJECTTYPE_TRAINER, 3, TrainerHikerPhillip, -1 object_event 16, 7, SPRITE_POKEFAN_M, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_BROWN, OBJECTTYPE_TRAINER, 3, TrainerHikerLeonard, -1 object_event 5, 32, SPRITE_SUPER_NERD, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_TRAINER, 3, TrainerPokemaniacAndrew, -1 diff --git a/maps/UnionCaveB2F.asm b/maps/UnionCaveB2F.asm index 2e431ba4d..3d882839a 100644 --- a/maps/UnionCaveB2F.asm +++ b/maps/UnionCaveB2F.asm @@ -1,4 +1,4 @@ - object_const_def ; object_event constants + object_const_def const UNIONCAVEB2F_ROCKER const UNIONCAVEB2F_COOLTRAINER_F1 const UNIONCAVEB2F_COOLTRAINER_F2 @@ -7,9 +7,9 @@ const UNIONCAVEB2F_LAPRAS UnionCaveB2F_MapScripts: - db 0 ; scene scripts + def_scene_scripts - db 1 ; callbacks + def_callbacks callback MAPCALLBACK_OBJECTS, .Lapras .Lapras: @@ -142,14 +142,14 @@ CooltrainerfEmmaAfterBattleText: UnionCaveB2F_MapEvents: db 0, 0 ; filler - db 1 ; warp events + def_warp_events warp_event 5, 3, UNION_CAVE_B1F, 5 - db 0 ; coord events + def_coord_events - db 0 ; bg events + def_bg_events - db 6 ; object events + def_object_events object_event 15, 19, SPRITE_ROCKER, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_TRAINER, 3, TrainerCooltrainermNick, -1 object_event 5, 13, SPRITE_COOLTRAINER_F, SPRITEMOVEDATA_SPINRANDOM_FAST, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_TRAINER, 1, TrainerCooltrainerfGwen, -1 object_event 3, 30, SPRITE_COOLTRAINER_F, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_TRAINER, 3, TrainerCooltrainerfEmma, -1 diff --git a/maps/VermilionCity.asm b/maps/VermilionCity.asm index 63dd15bee..385a33571 100644 --- a/maps/VermilionCity.asm +++ b/maps/VermilionCity.asm @@ -1,4 +1,4 @@ - object_const_def ; object_event constants + object_const_def const VERMILIONCITY_TEACHER const VERMILIONCITY_GRAMPS const VERMILIONCITY_MACHOP @@ -7,9 +7,9 @@ const VERMILIONCITY_POKEFAN_M VermilionCity_MapScripts: - db 0 ; scene scripts + def_scene_scripts - db 1 ; callbacks + def_callbacks callback MAPCALLBACK_NEWMAP, .FlyPoint .FlyPoint: @@ -268,7 +268,7 @@ VermilionCityPortSignText: VermilionCity_MapEvents: db 0, 0 ; filler - db 10 ; warp events + def_warp_events 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 @@ -280,9 +280,9 @@ VermilionCity_MapEvents: warp_event 20, 31, VERMILION_PORT_PASSAGE, 2 warp_event 34, 7, DIGLETTS_CAVE, 1 - db 0 ; coord events + def_coord_events - db 8 ; bg events + def_bg_events bg_event 25, 3, BGEVENT_READ, VermilionCitySign bg_event 5, 19, BGEVENT_READ, VermilionGymSign bg_event 5, 13, BGEVENT_READ, PokemonFanClubSign @@ -292,7 +292,7 @@ VermilionCity_MapEvents: bg_event 22, 13, BGEVENT_READ, VermilionCityMartSign bg_event 12, 19, BGEVENT_ITEM, VermilionCityHiddenFullHeal - db 6 ; object events + def_object_events object_event 18, 9, SPRITE_TEACHER, SPRITEMOVEDATA_WANDER, 1, 1, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, VermilionCityTeacherScript, -1 object_event 23, 6, SPRITE_GRAMPS, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, VermilionMachopOwner, -1 object_event 26, 7, SPRITE_MACHOP, SPRITEMOVEDATA_POKEMON, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_SCRIPT, 0, VermilionMachop, -1 diff --git a/maps/VermilionDiglettsCaveSpeechHouse.asm b/maps/VermilionDiglettsCaveSpeechHouse.asm index 1113ef8b7..c428999c3 100644 --- a/maps/VermilionDiglettsCaveSpeechHouse.asm +++ b/maps/VermilionDiglettsCaveSpeechHouse.asm @@ -1,10 +1,10 @@ - object_const_def ; object_event constants + object_const_def const VERMILIONDIGLETTSCAVESPEECHHOUSE_GENTLEMAN VermilionDiglettsCaveSpeechHouse_MapScripts: - db 0 ; scene scripts + def_scene_scripts - db 0 ; callbacks + def_callbacks VermilionDiglettsCaveSpeechHouseGentlemanScript: jumptextfaceplayer VermilionDiglettsCaveSpeechHouseGentlemanText @@ -21,13 +21,13 @@ VermilionDiglettsCaveSpeechHouseGentlemanText: VermilionDiglettsCaveSpeechHouse_MapEvents: db 0, 0 ; filler - db 2 ; warp events + def_warp_events warp_event 2, 7, VERMILION_CITY, 6 warp_event 3, 7, VERMILION_CITY, 6 - db 0 ; coord events + def_coord_events - db 0 ; bg events + def_bg_events - db 1 ; object events + def_object_events object_event 1, 3, SPRITE_GENTLEMAN, SPRITEMOVEDATA_WALK_UP_DOWN, 0, 1, -1, -1, PAL_NPC_RED, OBJECTTYPE_SCRIPT, 0, VermilionDiglettsCaveSpeechHouseGentlemanScript, -1 diff --git a/maps/VermilionFishingSpeechHouse.asm b/maps/VermilionFishingSpeechHouse.asm index f1f9351a1..14715e116 100644 --- a/maps/VermilionFishingSpeechHouse.asm +++ b/maps/VermilionFishingSpeechHouse.asm @@ -1,10 +1,10 @@ - object_const_def ; object_event constants + object_const_def const VERMILIONFISHINGSPEECHHOUSE_FISHING_GURU VermilionFishingSpeechHouse_MapScripts: - db 0 ; scene scripts + def_scene_scripts - db 0 ; callbacks + def_callbacks FishingDude: jumptextfaceplayer FishingDudeText @@ -51,14 +51,14 @@ FishingDudesHousePhotoText: VermilionFishingSpeechHouse_MapEvents: db 0, 0 ; filler - db 2 ; warp events + def_warp_events warp_event 2, 7, VERMILION_CITY, 1 warp_event 3, 7, VERMILION_CITY, 1 - db 0 ; coord events + def_coord_events - db 1 ; bg events + def_bg_events bg_event 3, 0, BGEVENT_READ, FishingDudesHousePhoto - db 1 ; object events + def_object_events object_event 2, 4, SPRITE_FISHING_GURU, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_SCRIPT, 0, FishingDude, -1 diff --git a/maps/VermilionGym.asm b/maps/VermilionGym.asm index 703185e8a..68ae33a86 100644 --- a/maps/VermilionGym.asm +++ b/maps/VermilionGym.asm @@ -1,4 +1,4 @@ - object_const_def ; object_event constants + object_const_def const VERMILIONGYM_SURGE const VERMILIONGYM_GENTLEMAN const VERMILIONGYM_ROCKER @@ -6,9 +6,9 @@ const VERMILIONGYM_GYM_GUIDE VermilionGym_MapScripts: - db 0 ; scene scripts + def_scene_scripts - db 0 ; callbacks + def_callbacks VermilionGymSurgeScript: faceplayer @@ -261,13 +261,13 @@ VermilionGymTrashCanText: VermilionGym_MapEvents: db 0, 0 ; filler - db 2 ; warp events + def_warp_events warp_event 4, 17, VERMILION_CITY, 7 warp_event 5, 17, VERMILION_CITY, 7 - db 0 ; coord events + def_coord_events - db 17 ; bg events + def_bg_events bg_event 1, 7, BGEVENT_READ, VermilionGymTrashCan bg_event 3, 7, BGEVENT_READ, VermilionGymTrashCan bg_event 5, 7, BGEVENT_READ, VermilionGymTrashCan @@ -286,7 +286,7 @@ VermilionGym_MapEvents: bg_event 3, 15, BGEVENT_READ, VermilionGymStatue bg_event 6, 15, BGEVENT_READ, VermilionGymStatue - db 5 ; object events + def_object_events object_event 5, 2, SPRITE_SURGE, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_BROWN, OBJECTTYPE_SCRIPT, 0, VermilionGymSurgeScript, -1 object_event 8, 8, SPRITE_GENTLEMAN, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_TRAINER, 4, TrainerGentlemanGregory, -1 object_event 4, 7, SPRITE_ROCKER, SPRITEMOVEDATA_STANDING_DOWN, 3, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_TRAINER, 3, TrainerGuitaristVincent, -1 diff --git a/maps/VermilionMagnetTrainSpeechHouse.asm b/maps/VermilionMagnetTrainSpeechHouse.asm index 426aa6cfd..8688d8dc7 100644 --- a/maps/VermilionMagnetTrainSpeechHouse.asm +++ b/maps/VermilionMagnetTrainSpeechHouse.asm @@ -1,11 +1,11 @@ - object_const_def ; object_event constants + object_const_def const VERMILIONMAGNETTRAINSPEECHHOUSE_POKEFAN_F const VERMILIONMAGNETTRAINSPEECHHOUSE_YOUNGSTER VermilionMagnetTrainSpeechHouse_MapScripts: - db 0 ; scene scripts + def_scene_scripts - db 0 ; callbacks + def_callbacks VermilionMagnetTrainSpeechHousePokefanFScript: jumptextfaceplayer VermilionMagnetTrainSpeechHousePokefanFText @@ -34,16 +34,16 @@ VermilionMagnetTrainSpeechHouseYoungsterText: VermilionMagnetTrainSpeechHouse_MapEvents: db 0, 0 ; filler - db 2 ; warp events + def_warp_events warp_event 2, 7, VERMILION_CITY, 4 warp_event 3, 7, VERMILION_CITY, 4 - db 0 ; coord events + def_coord_events - db 2 ; bg events + def_bg_events bg_event 0, 1, BGEVENT_READ, VermilionMagnetTrainSpeechHouseBookshelf bg_event 1, 1, BGEVENT_READ, VermilionMagnetTrainSpeechHouseBookshelf - db 2 ; object events + def_object_events object_event 2, 3, SPRITE_POKEFAN_F, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, VermilionMagnetTrainSpeechHousePokefanFScript, -1 object_event 0, 3, SPRITE_YOUNGSTER, SPRITEMOVEDATA_SPINRANDOM_FAST, 0, 0, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_SCRIPT, 0, VermilionMagnetTrainSpeechHouseYoungsterScript, -1 diff --git a/maps/VermilionMart.asm b/maps/VermilionMart.asm index f809e992c..8d0526fe7 100644 --- a/maps/VermilionMart.asm +++ b/maps/VermilionMart.asm @@ -1,12 +1,12 @@ - object_const_def ; object_event constants + object_const_def const VERMILIONMART_CLERK const VERMILIONMART_SUPER_NERD const VERMILIONMART_BEAUTY VermilionMart_MapScripts: - db 0 ; scene scripts + def_scene_scripts - db 0 ; callbacks + def_callbacks VermilionMartClerkScript: opentext @@ -37,15 +37,15 @@ VermilionMartBeautyText: VermilionMart_MapEvents: db 0, 0 ; filler - db 2 ; warp events + def_warp_events warp_event 2, 7, VERMILION_CITY, 5 warp_event 3, 7, VERMILION_CITY, 5 - db 0 ; coord events + def_coord_events - db 0 ; bg events + def_bg_events - db 3 ; object events + def_object_events object_event 1, 3, SPRITE_CLERK, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, VermilionMartClerkScript, -1 object_event 5, 2, SPRITE_SUPER_NERD, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_SCRIPT, 0, VermilionMartSuperNerdScript, -1 object_event 8, 6, SPRITE_BEAUTY, SPRITEMOVEDATA_WALK_LEFT_RIGHT, 1, 0, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_SCRIPT, 0, VermilionMartBeautyScript, -1 diff --git a/maps/VermilionPokecenter1F.asm b/maps/VermilionPokecenter1F.asm index 4a18e271c..41533c281 100644 --- a/maps/VermilionPokecenter1F.asm +++ b/maps/VermilionPokecenter1F.asm @@ -1,13 +1,13 @@ - object_const_def ; object_event constants + object_const_def const VERMILIONPOKECENTER1F_NURSE const VERMILIONPOKECENTER1F_FISHING_GURU const VERMILIONPOKECENTER1F_SAILOR const VERMILIONPOKECENTER1F_BUG_CATCHER VermilionPokecenter1F_MapScripts: - db 0 ; scene scripts + def_scene_scripts - db 0 ; callbacks + def_callbacks VermilionPokecenter1FNurseScript: jumpstd PokecenterNurseScript @@ -77,16 +77,16 @@ VermilionPokecenter1FBugCatcherText: VermilionPokecenter1F_MapEvents: db 0, 0 ; filler - db 3 ; warp events + def_warp_events 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 + def_coord_events - db 0 ; bg events + def_bg_events - db 4 ; object events + def_object_events object_event 3, 1, SPRITE_NURSE, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, VermilionPokecenter1FNurseScript, -1 object_event 7, 2, SPRITE_FISHING_GURU, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_SCRIPT, 0, VermilionPokecenter1FFishingGuruScript, -1 object_event 6, 5, SPRITE_SAILOR, SPRITEMOVEDATA_WALK_UP_DOWN, 0, 1, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_SCRIPT, 0, VermilionPokecenter1FSailorScript, -1 diff --git a/maps/VermilionPokecenter2FBeta.asm b/maps/VermilionPokecenter2FBeta.asm index 6bca09fd0..1e1f42ddc 100644 --- a/maps/VermilionPokecenter2FBeta.asm +++ b/maps/VermilionPokecenter2FBeta.asm @@ -1,16 +1,16 @@ VermilionPokecenter2FBeta_MapScripts: - db 0 ; scene scripts + def_scene_scripts - db 0 ; callbacks + def_callbacks VermilionPokecenter2FBeta_MapEvents: db 0, 0 ; filler - db 1 ; warp events + def_warp_events warp_event 0, 7, VERMILION_POKECENTER_1F, 3 - db 0 ; coord events + def_coord_events - db 0 ; bg events + def_bg_events - db 0 ; object events + def_object_events diff --git a/maps/VermilionPort.asm b/maps/VermilionPort.asm index 12930be18..043c8ee0b 100644 --- a/maps/VermilionPort.asm +++ b/maps/VermilionPort.asm @@ -1,14 +1,14 @@ - object_const_def ; object_event constants + object_const_def const VERMILIONPORT_SAILOR1 const VERMILIONPORT_SAILOR2 const VERMILIONPORT_SUPER_NERD VermilionPort_MapScripts: - db 2 ; scene scripts + def_scene_scripts scene_script .DummyScene0 ; SCENE_DEFAULT scene_script .LeaveFastShip ; SCENE_VERMILIONPORT_LEAVE_SHIP - db 1 ; callbacks + def_callbacks callback MAPCALLBACK_NEWMAP, .FlyPoint .DummyScene0: @@ -299,17 +299,17 @@ VermilionPortSuperNerdText: VermilionPort_MapEvents: db 0, 0 ; filler - db 2 ; warp events + def_warp_events warp_event 9, 5, VERMILION_PORT_PASSAGE, 5 warp_event 7, 17, FAST_SHIP_1F, 1 - db 1 ; coord events + def_coord_events coord_event 7, 11, SCENE_DEFAULT, VermilionPortWalkUpToShipScript - db 1 ; bg events + def_bg_events bg_event 16, 13, BGEVENT_ITEM, VermilionPortHiddenIron - db 3 ; object events + def_object_events object_event 7, 17, SPRITE_SAILOR, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, VermilionPortSailorAtGangwayScript, EVENT_VERMILION_PORT_SAILOR_AT_GANGWAY object_event 6, 11, SPRITE_SAILOR, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, VermilionPortSailorScript, -1 object_event 11, 11, SPRITE_SUPER_NERD, SPRITEMOVEDATA_WALK_LEFT_RIGHT, 2, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, VermilionPortSuperNerdScript, -1 diff --git a/maps/VermilionPortPassage.asm b/maps/VermilionPortPassage.asm index 09894fdd5..1b59b7a69 100644 --- a/maps/VermilionPortPassage.asm +++ b/maps/VermilionPortPassage.asm @@ -1,10 +1,10 @@ - object_const_def ; object_event constants + object_const_def const VERMILIONPORTPASSAGE_TEACHER VermilionPortPassage_MapScripts: - db 0 ; scene scripts + def_scene_scripts - db 0 ; callbacks + def_callbacks VermilionPortPassageTeacherScript: jumptextfaceplayer VermilionPortPassageTeacherText @@ -19,16 +19,16 @@ VermilionPortPassageTeacherText: VermilionPortPassage_MapEvents: db 0, 0 ; filler - db 5 ; warp events + def_warp_events 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 + def_coord_events - db 0 ; bg events + def_bg_events - db 1 ; object events + def_object_events object_event 17, 1, SPRITE_TEACHER, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, VermilionPortPassageTeacherScript, -1 diff --git a/maps/VictoryRoad.asm b/maps/VictoryRoad.asm index 7b0e8495e..2f4df02ce 100644 --- a/maps/VictoryRoad.asm +++ b/maps/VictoryRoad.asm @@ -1,4 +1,4 @@ - object_const_def ; object_event constants + object_const_def const VICTORYROAD_SILVER const VICTORYROAD_POKE_BALL1 const VICTORYROAD_POKE_BALL2 @@ -7,11 +7,11 @@ const VICTORYROAD_POKE_BALL5 VictoryRoad_MapScripts: - db 2 ; scene scripts + def_scene_scripts scene_script .DummyScene0 ; SCENE_DEFAULT scene_script .DummyScene1 ; SCENE_FINISHED - db 0 ; callbacks + def_callbacks .DummyScene0: end @@ -239,7 +239,7 @@ VictoryRoadRivalVictoryText: VictoryRoad_MapEvents: db 0, 0 ; filler - db 10 ; warp events + def_warp_events warp_event 9, 67, VICTORY_ROAD_GATE, 5 warp_event 1, 49, VICTORY_ROAD, 3 warp_event 1, 35, VICTORY_ROAD, 2 @@ -251,15 +251,15 @@ VictoryRoad_MapEvents: warp_event 0, 27, VICTORY_ROAD, 8 warp_event 13, 5, ROUTE_23, 3 - db 2 ; coord events + def_coord_events coord_event 12, 8, SCENE_DEFAULT, VictoryRoadRivalLeft coord_event 13, 8, SCENE_DEFAULT, VictoryRoadRivalRight - db 2 ; bg events + def_bg_events bg_event 3, 29, BGEVENT_ITEM, VictoryRoadHiddenMaxPotion bg_event 3, 65, BGEVENT_ITEM, VictoryRoadHiddenFullHeal - db 6 ; object events + def_object_events object_event 18, 13, SPRITE_SILVER, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, ObjectEvent, EVENT_RIVAL_VICTORY_ROAD object_event 3, 28, SPRITE_POKE_BALL, SPRITEMOVEDATA_STILL, 0, 0, -1, -1, 0, OBJECTTYPE_ITEMBALL, 0, VictoryRoadTMEarthquake, EVENT_VICTORY_ROAD_TM_EARTHQUAKE object_event 12, 48, SPRITE_POKE_BALL, SPRITEMOVEDATA_STILL, 0, 0, -1, -1, 0, OBJECTTYPE_ITEMBALL, 0, VictoryRoadMaxRevive, EVENT_VICTORY_ROAD_MAX_REVIVE diff --git a/maps/VictoryRoadGate.asm b/maps/VictoryRoadGate.asm index 60465f375..7765e69a1 100644 --- a/maps/VictoryRoadGate.asm +++ b/maps/VictoryRoadGate.asm @@ -1,14 +1,14 @@ - object_const_def ; object_event constants + object_const_def const VICTORYROADGATE_OFFICER const VICTORYROADGATE_BLACK_BELT1 const VICTORYROADGATE_BLACK_BELT2 VictoryRoadGate_MapScripts: - db 2 ; scene scripts + def_scene_scripts scene_script .DummyScene0 ; SCENE_DEFAULT scene_script .DummyScene1 ; SCENE_FINISHED - db 0 ; callbacks + def_callbacks .DummyScene0: end @@ -98,7 +98,7 @@ VictoryRoadGateRightBlackBeltText: VictoryRoadGate_MapEvents: db 0, 0 ; filler - db 8 ; warp events + def_warp_events warp_event 17, 7, ROUTE_22, 1 warp_event 18, 7, ROUTE_22, 1 warp_event 9, 17, ROUTE_26, 1 @@ -108,12 +108,12 @@ VictoryRoadGate_MapEvents: warp_event 1, 7, ROUTE_28, 2 warp_event 2, 7, ROUTE_28, 2 - db 1 ; coord events + def_coord_events coord_event 10, 11, SCENE_DEFAULT, VictoryRoadGateBadgeCheckScene - db 0 ; bg events + def_bg_events - db 3 ; object events + def_object_events object_event 8, 11, SPRITE_OFFICER, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, VictoryRoadGateOfficerScript, -1 object_event 7, 5, SPRITE_BLACK_BELT, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, VictoryRoadGateLeftBlackBeltScript, EVENT_OPENED_MT_SILVER object_event 12, 5, SPRITE_BLACK_BELT, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, VictoryRoadGateRightBlackBeltScript, EVENT_FOUGHT_SNORLAX diff --git a/maps/VioletCity.asm b/maps/VioletCity.asm index a0b311e77..dd688ade0 100644 --- a/maps/VioletCity.asm +++ b/maps/VioletCity.asm @@ -1,4 +1,4 @@ - object_const_def ; object_event constants + object_const_def const VIOLETCITY_EARL const VIOLETCITY_LASS const VIOLETCITY_SUPER_NERD @@ -9,9 +9,9 @@ const VIOLETCITY_POKE_BALL2 VioletCity_MapScripts: - db 0 ; scene scripts + def_scene_scripts - db 1 ; callbacks + def_callbacks callback MAPCALLBACK_NEWMAP, .FlyPoint .FlyPoint: @@ -279,7 +279,7 @@ EarlsPokemonAcademySignText: VioletCity_MapEvents: db 0, 0 ; filler - db 9 ; warp events + def_warp_events warp_event 9, 17, VIOLET_MART, 2 warp_event 18, 17, VIOLET_GYM, 1 warp_event 30, 17, EARLS_POKEMON_ACADEMY, 1 @@ -290,9 +290,9 @@ VioletCity_MapEvents: warp_event 39, 24, ROUTE_31_VIOLET_GATE, 1 warp_event 39, 25, ROUTE_31_VIOLET_GATE, 2 - db 0 ; coord events + def_coord_events - db 7 ; bg events + def_bg_events bg_event 24, 20, BGEVENT_READ, VioletCitySign bg_event 15, 17, BGEVENT_READ, VioletGymSign bg_event 24, 8, BGEVENT_READ, SproutTowerSign @@ -301,7 +301,7 @@ VioletCity_MapEvents: bg_event 10, 17, BGEVENT_READ, VioletCityMartSign bg_event 37, 14, BGEVENT_ITEM, VioletCityHiddenHyperPotion - db 8 ; object events + def_object_events object_event 13, 16, SPRITE_FISHER, SPRITEMOVEDATA_SPINRANDOM_SLOW, 0, 0, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_SCRIPT, 0, VioletCityEarlScript, EVENT_VIOLET_CITY_EARL object_event 28, 28, SPRITE_LASS, SPRITEMOVEDATA_WANDER, 2, 2, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_SCRIPT, 0, VioletCityLassScript, -1 object_event 24, 14, SPRITE_SUPER_NERD, SPRITEMOVEDATA_WANDER, 1, 2, -1, -1, PAL_NPC_RED, OBJECTTYPE_SCRIPT, 0, VioletCitySuperNerdScript, -1 diff --git a/maps/VioletGym.asm b/maps/VioletGym.asm index 217619ac6..961e9add2 100644 --- a/maps/VioletGym.asm +++ b/maps/VioletGym.asm @@ -1,13 +1,13 @@ - object_const_def ; object_event constants + object_const_def const VIOLETGYM_FALKNER const VIOLETGYM_YOUNGSTER1 const VIOLETGYM_YOUNGSTER2 const VIOLETGYM_GYM_GUIDE VioletGym_MapScripts: - db 0 ; scene scripts + def_scene_scripts - db 0 ; callbacks + def_callbacks VioletGymFalknerScript: faceplayer @@ -282,17 +282,17 @@ VioletGymGuideWinText: VioletGym_MapEvents: db 0, 0 ; filler - db 2 ; warp events + def_warp_events warp_event 4, 15, VIOLET_CITY, 2 warp_event 5, 15, VIOLET_CITY, 2 - db 0 ; coord events + def_coord_events - db 2 ; bg events + def_bg_events bg_event 3, 13, BGEVENT_READ, VioletGymStatue bg_event 6, 13, BGEVENT_READ, VioletGymStatue - db 4 ; object events + def_object_events object_event 5, 1, SPRITE_FALKNER, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_SCRIPT, 0, VioletGymFalknerScript, -1 object_event 7, 6, SPRITE_YOUNGSTER, SPRITEMOVEDATA_STANDING_LEFT, 2, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_TRAINER, 3, TrainerBirdKeeperRod, -1 object_event 2, 10, SPRITE_YOUNGSTER, SPRITEMOVEDATA_STANDING_RIGHT, 2, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_TRAINER, 3, TrainerBirdKeeperAbe, -1 diff --git a/maps/VioletKylesHouse.asm b/maps/VioletKylesHouse.asm index 95dc95e8f..25e4115d2 100644 --- a/maps/VioletKylesHouse.asm +++ b/maps/VioletKylesHouse.asm @@ -1,11 +1,11 @@ - object_const_def ; object_event constants + object_const_def const VIOLETKYLESHOUSE_POKEFAN_M const VIOLETKYLESHOUSE_KYLE VioletKylesHouse_MapScripts: - db 0 ; scene scripts + def_scene_scripts - db 0 ; callbacks + def_callbacks VioletKylesHousePokefanMScript: jumptextfaceplayer VioletKylesHousePokefanMText @@ -33,14 +33,14 @@ VioletKylesHousePokefanMText: VioletKylesHouse_MapEvents: db 0, 0 ; filler - db 2 ; warp events + def_warp_events warp_event 3, 7, VIOLET_CITY, 6 warp_event 4, 7, VIOLET_CITY, 6 - db 0 ; coord events + def_coord_events - db 0 ; bg events + def_bg_events - db 2 ; object events + def_object_events object_event 2, 3, SPRITE_POKEFAN_M, SPRITEMOVEDATA_SPINRANDOM_SLOW, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, VioletKylesHousePokefanMScript, -1 object_event 6, 5, SPRITE_YOUNGSTER, SPRITEMOVEDATA_WALK_UP_DOWN, 0, 2, -1, -1, PAL_NPC_RED, OBJECTTYPE_SCRIPT, 0, Kyle, -1 diff --git a/maps/VioletMart.asm b/maps/VioletMart.asm index ff3898753..575d19b91 100644 --- a/maps/VioletMart.asm +++ b/maps/VioletMart.asm @@ -1,12 +1,12 @@ - object_const_def ; object_event constants + object_const_def const VIOLETMART_CLERK const VIOLETMART_GRANNY const VIOLETMART_COOLTRAINER_M VioletMart_MapScripts: - db 0 ; scene scripts + def_scene_scripts - db 0 ; callbacks + def_callbacks VioletMartClerkScript: opentext @@ -49,15 +49,15 @@ VioletMartCooltrainerMText: VioletMart_MapEvents: db 0, 0 ; filler - db 2 ; warp events + def_warp_events warp_event 2, 7, VIOLET_CITY, 1 warp_event 3, 7, VIOLET_CITY, 1 - db 0 ; coord events + def_coord_events - db 0 ; bg events + def_bg_events - db 3 ; object events + def_object_events object_event 1, 3, SPRITE_CLERK, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, VioletMartClerkScript, -1 object_event 7, 6, SPRITE_GRANNY, SPRITEMOVEDATA_WALK_LEFT_RIGHT, 1, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, VioletMartGrannyScript, -1 object_event 5, 2, SPRITE_COOLTRAINER_M, SPRITEMOVEDATA_SPINRANDOM_SLOW, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_SCRIPT, 0, VioletMartCooltrainerMScript, -1 diff --git a/maps/VioletNicknameSpeechHouse.asm b/maps/VioletNicknameSpeechHouse.asm index b193bf01d..1495855f9 100644 --- a/maps/VioletNicknameSpeechHouse.asm +++ b/maps/VioletNicknameSpeechHouse.asm @@ -1,12 +1,12 @@ - object_const_def ; object_event constants + object_const_def const VIOLETNICKNAMESPEECHHOUSE_TEACHER const VIOLETNICKNAMESPEECHHOUSE_LASS const VIOLETNICKNAMESPEECHHOUSE_BIRD VioletNicknameSpeechHouse_MapScripts: - db 0 ; scene scripts + def_scene_scripts - db 0 ; callbacks + def_callbacks VioletNicknameSpeechHouseTeacherScript: jumptextfaceplayer VioletNicknameSpeechHouseTeacherText @@ -45,15 +45,15 @@ VioletNicknameSpeechHouseBirdText: VioletNicknameSpeechHouse_MapEvents: db 0, 0 ; filler - db 2 ; warp events + def_warp_events warp_event 3, 7, VIOLET_CITY, 4 warp_event 4, 7, VIOLET_CITY, 4 - db 0 ; coord events + def_coord_events - db 0 ; bg events + def_bg_events - db 3 ; object events + def_object_events object_event 2, 3, SPRITE_TEACHER, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, VioletNicknameSpeechHouseTeacherScript, -1 object_event 6, 4, SPRITE_LASS, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_SCRIPT, 0, VioletNicknameSpeechHouseLassScript, -1 object_event 5, 2, SPRITE_BIRD, SPRITEMOVEDATA_WALK_LEFT_RIGHT, 1, 0, -1, -1, PAL_NPC_BROWN, OBJECTTYPE_SCRIPT, 0, VioletNicknameSpeechHouseBirdScript, -1 diff --git a/maps/VioletPokecenter1F.asm b/maps/VioletPokecenter1F.asm index afc901179..e98d2ca1f 100644 --- a/maps/VioletPokecenter1F.asm +++ b/maps/VioletPokecenter1F.asm @@ -1,4 +1,4 @@ - object_const_def ; object_event constants + object_const_def const VIOLETPOKECENTER1F_NURSE const VIOLETPOKECENTER1F_GAMEBOY_KID const VIOLETPOKECENTER1F_GENTLEMAN @@ -6,9 +6,9 @@ const VIOLETPOKECENTER1F_ELMS_AIDE VioletPokecenter1F_MapScripts: - db 0 ; scene scripts + def_scene_scripts - db 0 ; callbacks + def_callbacks VioletPokecenterNurse: jumpstd PokecenterNurseScript @@ -218,16 +218,16 @@ VioletPokecenter1FYoungsterText: VioletPokecenter1F_MapEvents: db 0, 0 ; filler - db 3 ; warp events + def_warp_events 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 + def_coord_events - db 0 ; bg events + def_bg_events - db 5 ; object events + def_object_events object_event 3, 1, SPRITE_NURSE, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, VioletPokecenterNurse, -1 object_event 7, 6, SPRITE_GAMEBOY_KID, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_SCRIPT, 0, VioletPokecenter1FGameboyKidScript, -1 object_event 1, 4, SPRITE_GENTLEMAN, SPRITEMOVEDATA_SPINRANDOM_SLOW, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, VioletPokecenter1FGentlemanScript, -1 diff --git a/maps/ViridianCity.asm b/maps/ViridianCity.asm index 3b8a56ac4..0ba93996d 100644 --- a/maps/ViridianCity.asm +++ b/maps/ViridianCity.asm @@ -1,13 +1,13 @@ - object_const_def ; object_event constants + object_const_def const VIRIDIANCITY_GRAMPS1 const VIRIDIANCITY_GRAMPS2 const VIRIDIANCITY_FISHER const VIRIDIANCITY_YOUNGSTER ViridianCity_MapScripts: - db 0 ; scene scripts + def_scene_scripts - db 1 ; callbacks + def_callbacks callback MAPCALLBACK_NEWMAP, .FlyPoint .FlyPoint: @@ -216,16 +216,16 @@ TrainerHouseSignText: ViridianCity_MapEvents: db 0, 0 ; filler - db 5 ; warp events + def_warp_events 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 + def_coord_events - db 6 ; bg events + def_bg_events bg_event 17, 17, BGEVENT_READ, ViridianCitySign bg_event 27, 7, BGEVENT_READ, ViridianGymSign bg_event 19, 1, BGEVENT_READ, ViridianCityWelcomeSign @@ -233,7 +233,7 @@ ViridianCity_MapEvents: bg_event 24, 25, BGEVENT_READ, ViridianCityPokecenterSign bg_event 30, 19, BGEVENT_READ, ViridianCityMartSign - db 4 ; object events + def_object_events object_event 18, 5, SPRITE_GRAMPS, SPRITEMOVEDATA_WANDER, 2, 2, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, ViridianCityCoffeeGramps, -1 object_event 30, 8, SPRITE_GRAMPS, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_SCRIPT, 0, ViridianCityGrampsNearGym, -1 object_event 6, 23, SPRITE_FISHER, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_SCRIPT, 0, ViridianCityDreamEaterFisher, -1 diff --git a/maps/ViridianGym.asm b/maps/ViridianGym.asm index 25e34fac0..4df71b62c 100644 --- a/maps/ViridianGym.asm +++ b/maps/ViridianGym.asm @@ -1,11 +1,11 @@ - object_const_def ; object_event constants + object_const_def const VIRIDIANGYM_BLUE const VIRIDIANGYM_GYM_GUIDE ViridianGym_MapScripts: - db 0 ; scene scripts + def_scene_scripts - db 0 ; callbacks + def_callbacks ViridianGymBlueScript: faceplayer @@ -170,16 +170,16 @@ ViridianGymGuideWinText: ViridianGym_MapEvents: db 0, 0 ; filler - db 2 ; warp events + def_warp_events warp_event 4, 17, VIRIDIAN_CITY, 1 warp_event 5, 17, VIRIDIAN_CITY, 1 - db 0 ; coord events + def_coord_events - db 2 ; bg events + def_bg_events bg_event 3, 13, BGEVENT_READ, ViridianGymStatue bg_event 6, 13, BGEVENT_READ, ViridianGymStatue - db 2 ; object events + def_object_events object_event 5, 3, SPRITE_BLUE, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, ViridianGymBlueScript, EVENT_VIRIDIAN_GYM_BLUE object_event 7, 13, SPRITE_GYM_GUIDE, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_SCRIPT, 0, ViridianGymGuideScript, EVENT_VIRIDIAN_GYM_BLUE diff --git a/maps/ViridianMart.asm b/maps/ViridianMart.asm index 82bbf896b..8e801dab6 100644 --- a/maps/ViridianMart.asm +++ b/maps/ViridianMart.asm @@ -1,12 +1,12 @@ - object_const_def ; object_event constants + object_const_def const VIRIDIANMART_CLERK const VIRIDIANMART_LASS const VIRIDIANMART_COOLTRAINER_M ViridianMart_MapScripts: - db 0 ; scene scripts + def_scene_scripts - db 0 ; callbacks + def_callbacks ViridianMartClerkScript: opentext @@ -37,15 +37,15 @@ ViridianMartCooltrainerMText: ViridianMart_MapEvents: db 0, 0 ; filler - db 2 ; warp events + def_warp_events warp_event 2, 7, VIRIDIAN_CITY, 4 warp_event 3, 7, VIRIDIAN_CITY, 4 - db 0 ; coord events + def_coord_events - db 0 ; bg events + def_bg_events - db 3 ; object events + def_object_events object_event 1, 3, SPRITE_CLERK, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, ViridianMartClerkScript, -1 object_event 7, 2, SPRITE_LASS, SPRITEMOVEDATA_WALK_LEFT_RIGHT, 2, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, ViridianMartLassScript, -1 object_event 1, 6, SPRITE_COOLTRAINER_M, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, ViridianMartCooltrainerMScript, -1 diff --git a/maps/ViridianNicknameSpeechHouse.asm b/maps/ViridianNicknameSpeechHouse.asm index 58472619b..943a78cb8 100644 --- a/maps/ViridianNicknameSpeechHouse.asm +++ b/maps/ViridianNicknameSpeechHouse.asm @@ -1,13 +1,13 @@ - object_const_def ; object_event constants + object_const_def const VIRIDIANNICKNAMESPEECHHOUSE_POKEFAN_M const VIRIDIANNICKNAMESPEECHHOUSE_LASS const VIRIDIANNICKNAMESPEECHHOUSE_SPEARY const VIRIDIANNICKNAMESPEECHHOUSE_RATTEY ViridianNicknameSpeechHouse_MapScripts: - db 0 ; scene scripts + def_scene_scripts - db 0 ; callbacks + def_callbacks ViridianNicknameSpeechHousePokefanMScript: jumptextfaceplayer ViridianNicknameSpeechHousePokefanMText @@ -62,15 +62,15 @@ RatteyText: ViridianNicknameSpeechHouse_MapEvents: db 0, 0 ; filler - db 2 ; warp events + def_warp_events warp_event 2, 7, VIRIDIAN_CITY, 2 warp_event 3, 7, VIRIDIAN_CITY, 2 - db 0 ; coord events + def_coord_events - db 0 ; bg events + def_bg_events - db 4 ; object events + def_object_events object_event 2, 4, SPRITE_POKEFAN_M, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_SCRIPT, 0, ViridianNicknameSpeechHousePokefanMScript, -1 object_event 5, 4, SPRITE_LASS, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_SCRIPT, 0, ViridianNicknameSpeechHouseLassScript, -1 object_event 5, 2, SPRITE_MOLTRES, SPRITEMOVEDATA_POKEMON, 2, 0, -1, -1, PAL_NPC_BROWN, OBJECTTYPE_SCRIPT, 0, Speary, -1 diff --git a/maps/ViridianPokecenter1F.asm b/maps/ViridianPokecenter1F.asm index 66ddecfd9..fcd32fc38 100644 --- a/maps/ViridianPokecenter1F.asm +++ b/maps/ViridianPokecenter1F.asm @@ -1,13 +1,13 @@ - object_const_def ; object_event constants + object_const_def const VIRIDIANPOKECENTER1F_NURSE const VIRIDIANPOKECENTER1F_COOLTRAINER_M const VIRIDIANPOKECENTER1F_COOLTRAINER_F const VIRIDIANPOKECENTER1F_BUG_CATCHER ViridianPokecenter1F_MapScripts: - db 0 ; scene scripts + def_scene_scripts - db 0 ; callbacks + def_callbacks ViridianPokecenter1FNurseScript: jumpstd PokecenterNurseScript @@ -72,16 +72,16 @@ ViridianPokecenter1FBugCatcherText: ViridianPokecenter1F_MapEvents: db 0, 0 ; filler - db 3 ; warp events + def_warp_events 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 + def_coord_events - db 0 ; bg events + def_bg_events - db 4 ; object events + def_object_events object_event 3, 1, SPRITE_NURSE, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, ViridianPokecenter1FNurseScript, -1 object_event 8, 4, SPRITE_COOLTRAINER_M, SPRITEMOVEDATA_WALK_LEFT_RIGHT, 1, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_SCRIPT, 0, ViridianPokecenter1FCooltrainerMScript, -1 object_event 5, 3, SPRITE_COOLTRAINER_F, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_SCRIPT, 0, ViridianPokecenter1FCooltrainerFScript, -1 diff --git a/maps/ViridianPokecenter2FBeta.asm b/maps/ViridianPokecenter2FBeta.asm index 1c22d7dd1..95886fbcc 100644 --- a/maps/ViridianPokecenter2FBeta.asm +++ b/maps/ViridianPokecenter2FBeta.asm @@ -1,16 +1,16 @@ ViridianPokecenter2FBeta_MapScripts: - db 0 ; scene scripts + def_scene_scripts - db 0 ; callbacks + def_callbacks ViridianPokecenter2FBeta_MapEvents: db 0, 0 ; filler - db 1 ; warp events + def_warp_events warp_event 0, 7, VIRIDIAN_POKECENTER_1F, 3 - db 0 ; coord events + def_coord_events - db 0 ; bg events + def_bg_events - db 0 ; object events + def_object_events diff --git a/maps/WhirlIslandB1F.asm b/maps/WhirlIslandB1F.asm index 953fb89c9..d077c6467 100644 --- a/maps/WhirlIslandB1F.asm +++ b/maps/WhirlIslandB1F.asm @@ -1,4 +1,4 @@ - object_const_def ; object_event constants + object_const_def const WHIRLISLANDB1F_POKE_BALL1 const WHIRLISLANDB1F_POKE_BALL2 const WHIRLISLANDB1F_POKE_BALL3 @@ -7,9 +7,9 @@ const WHIRLISLANDB1F_BOULDER WhirlIslandB1F_MapScripts: - db 0 ; scene scripts + def_scene_scripts - db 0 ; callbacks + def_callbacks WhirlIslandB1FFullRestore: itemball FULL_RESTORE @@ -41,7 +41,7 @@ WhirlIslandB1FHiddenFullRestore: WhirlIslandB1F_MapEvents: db 0, 0 ; filler - db 9 ; warp events + def_warp_events warp_event 5, 5, WHIRL_ISLAND_NW, 2 warp_event 35, 3, WHIRL_ISLAND_NE, 2 warp_event 29, 9, WHIRL_ISLAND_NE, 3 @@ -52,14 +52,14 @@ WhirlIslandB1F_MapEvents: warp_event 13, 27, WHIRL_ISLAND_B2F, 2 warp_event 17, 21, WHIRL_ISLAND_CAVE, 1 - db 0 ; coord events + def_coord_events - db 3 ; bg events + def_bg_events bg_event 30, 4, BGEVENT_ITEM, WhirlIslandB1FHiddenRareCandy bg_event 36, 18, BGEVENT_ITEM, WhirlIslandB1FHiddenUltraBall bg_event 2, 23, BGEVENT_ITEM, WhirlIslandB1FHiddenFullRestore - db 6 ; object events + def_object_events object_event 7, 13, SPRITE_POKE_BALL, SPRITEMOVEDATA_STILL, 0, 0, -1, -1, 0, OBJECTTYPE_ITEMBALL, 0, WhirlIslandB1FFullRestore, EVENT_WHIRL_ISLAND_B1F_FULL_RESTORE object_event 2, 18, SPRITE_POKE_BALL, SPRITEMOVEDATA_STILL, 0, 0, -1, -1, 0, OBJECTTYPE_ITEMBALL, 0, WhirlIslandB1FCarbos, EVENT_WHIRL_ISLAND_B1F_CARBOS object_event 33, 23, SPRITE_POKE_BALL, SPRITEMOVEDATA_STILL, 0, 0, -1, -1, 0, OBJECTTYPE_ITEMBALL, 0, WhirlIslandB1FCalcium, EVENT_WHIRL_ISLAND_B1F_CALCIUM diff --git a/maps/WhirlIslandB2F.asm b/maps/WhirlIslandB2F.asm index 87c3ca911..db9f9d896 100644 --- a/maps/WhirlIslandB2F.asm +++ b/maps/WhirlIslandB2F.asm @@ -1,12 +1,12 @@ - object_const_def ; object_event constants + object_const_def const WHIRLISLANDB2F_POKE_BALL1 const WHIRLISLANDB2F_POKE_BALL2 const WHIRLISLANDB2F_POKE_BALL3 WhirlIslandB2F_MapScripts: - db 0 ; scene scripts + def_scene_scripts - db 0 ; callbacks + def_callbacks WhirlIslandB2FFullRestore: itemball FULL_RESTORE @@ -20,17 +20,17 @@ WhirlIslandB2FMaxElixer: WhirlIslandB2F_MapEvents: db 0, 0 ; filler - db 4 ; warp events + def_warp_events 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 + def_coord_events - db 0 ; bg events + def_bg_events - db 3 ; object events + def_object_events object_event 10, 11, SPRITE_POKE_BALL, SPRITEMOVEDATA_STILL, 0, 0, -1, -1, 0, OBJECTTYPE_ITEMBALL, 0, WhirlIslandB2FFullRestore, EVENT_WHIRL_ISLAND_B2F_FULL_RESTORE object_event 6, 4, SPRITE_POKE_BALL, SPRITEMOVEDATA_STILL, 0, 0, -1, -1, 0, OBJECTTYPE_ITEMBALL, 0, WhirlIslandB2FMaxRevive, EVENT_WHIRL_ISLAND_B2F_MAX_REVIVE object_event 5, 12, SPRITE_POKE_BALL, SPRITEMOVEDATA_STILL, 0, 0, -1, -1, 0, OBJECTTYPE_ITEMBALL, 0, WhirlIslandB2FMaxElixer, EVENT_WHIRL_ISLAND_B2F_MAX_ELIXER diff --git a/maps/WhirlIslandCave.asm b/maps/WhirlIslandCave.asm index 35e726b5c..3e6cc1de2 100644 --- a/maps/WhirlIslandCave.asm +++ b/maps/WhirlIslandCave.asm @@ -1,17 +1,17 @@ WhirlIslandCave_MapScripts: - db 0 ; scene scripts + def_scene_scripts - db 0 ; callbacks + def_callbacks WhirlIslandCave_MapEvents: db 0, 0 ; filler - db 2 ; warp events + def_warp_events warp_event 7, 5, WHIRL_ISLAND_B1F, 9 warp_event 3, 13, WHIRL_ISLAND_NW, 4 - db 0 ; coord events + def_coord_events - db 0 ; bg events + def_bg_events - db 0 ; object events + def_object_events diff --git a/maps/WhirlIslandLugiaChamber.asm b/maps/WhirlIslandLugiaChamber.asm index 45308af81..e58a6b4db 100644 --- a/maps/WhirlIslandLugiaChamber.asm +++ b/maps/WhirlIslandLugiaChamber.asm @@ -1,10 +1,10 @@ - object_const_def ; object_event constants + object_const_def const WHIRLISLANDLUGIACHAMBER_LUGIA WhirlIslandLugiaChamber_MapScripts: - db 0 ; scene scripts + def_scene_scripts - db 1 ; callbacks + def_callbacks callback MAPCALLBACK_OBJECTS, .Lugia .Lugia: @@ -44,12 +44,12 @@ LugiaText: WhirlIslandLugiaChamber_MapEvents: db 0, 0 ; filler - db 1 ; warp events + def_warp_events warp_event 9, 13, WHIRL_ISLAND_B2F, 3 - db 0 ; coord events + def_coord_events - db 0 ; bg events + def_bg_events - db 1 ; object events + def_object_events object_event 9, 5, SPRITE_LUGIA, SPRITEMOVEDATA_POKEMON, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_SCRIPT, 0, Lugia, EVENT_WHIRL_ISLAND_LUGIA_CHAMBER_LUGIA diff --git a/maps/WhirlIslandNE.asm b/maps/WhirlIslandNE.asm index 212a35c33..4907ce793 100644 --- a/maps/WhirlIslandNE.asm +++ b/maps/WhirlIslandNE.asm @@ -1,10 +1,10 @@ - object_const_def ; object_event constants + object_const_def const WHIRLISLANDNE_POKE_BALL WhirlIslandNE_MapScripts: - db 0 ; scene scripts + def_scene_scripts - db 0 ; callbacks + def_callbacks WhirlIslandNEUltraBall: itemball ULTRA_BALL @@ -12,14 +12,14 @@ WhirlIslandNEUltraBall: WhirlIslandNE_MapEvents: db 0, 0 ; filler - db 3 ; warp events + def_warp_events 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 + def_coord_events - db 0 ; bg events + def_bg_events - db 1 ; object events + def_object_events object_event 11, 11, SPRITE_POKE_BALL, SPRITEMOVEDATA_STILL, 0, 0, -1, -1, 0, OBJECTTYPE_ITEMBALL, 0, WhirlIslandNEUltraBall, EVENT_WHIRL_ISLAND_NE_ULTRA_BALL diff --git a/maps/WhirlIslandNW.asm b/maps/WhirlIslandNW.asm index 55e4f2d0b..0a78ec933 100644 --- a/maps/WhirlIslandNW.asm +++ b/maps/WhirlIslandNW.asm @@ -1,19 +1,19 @@ WhirlIslandNW_MapScripts: - db 0 ; scene scripts + def_scene_scripts - db 0 ; callbacks + def_callbacks WhirlIslandNW_MapEvents: db 0, 0 ; filler - db 4 ; warp events + def_warp_events 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 + def_coord_events - db 0 ; bg events + def_bg_events - db 0 ; object events + def_object_events diff --git a/maps/WhirlIslandSE.asm b/maps/WhirlIslandSE.asm index be43871ce..5e7baafb1 100644 --- a/maps/WhirlIslandSE.asm +++ b/maps/WhirlIslandSE.asm @@ -1,17 +1,17 @@ WhirlIslandSE_MapScripts: - db 0 ; scene scripts + def_scene_scripts - db 0 ; callbacks + def_callbacks WhirlIslandSE_MapEvents: db 0, 0 ; filler - db 2 ; warp events + def_warp_events warp_event 5, 13, ROUTE_41, 4 warp_event 5, 3, WHIRL_ISLAND_B1F, 6 - db 0 ; coord events + def_coord_events - db 0 ; bg events + def_bg_events - db 0 ; object events + def_object_events diff --git a/maps/WhirlIslandSW.asm b/maps/WhirlIslandSW.asm index ba81cae7e..1ed273840 100644 --- a/maps/WhirlIslandSW.asm +++ b/maps/WhirlIslandSW.asm @@ -1,10 +1,10 @@ - object_const_def ; object_event constants + object_const_def const WHIRLISLANDSW_POKE_BALL WhirlIslandSW_MapScripts: - db 0 ; scene scripts + def_scene_scripts - db 0 ; callbacks + def_callbacks WhirlIslandSWUltraBall: itemball ULTRA_BALL @@ -12,16 +12,16 @@ WhirlIslandSWUltraBall: WhirlIslandSW_MapEvents: db 0, 0 ; filler - db 5 ; warp events + def_warp_events 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 + def_coord_events - db 0 ; bg events + def_bg_events - db 1 ; object events + def_object_events object_event 15, 2, SPRITE_POKE_BALL, SPRITEMOVEDATA_STILL, 0, 0, -1, -1, 0, OBJECTTYPE_ITEMBALL, 0, WhirlIslandSWUltraBall, EVENT_WHIRL_ISLAND_SW_ULTRA_BALL diff --git a/maps/WillsRoom.asm b/maps/WillsRoom.asm index 7cb76b35d..bd45ea09c 100644 --- a/maps/WillsRoom.asm +++ b/maps/WillsRoom.asm @@ -1,12 +1,12 @@ - object_const_def ; object_event constants + object_const_def const WILLSROOM_WILL WillsRoom_MapScripts: - db 2 ; scene scripts + def_scene_scripts scene_script .LockDoor ; SCENE_DEFAULT scene_script .DummyScene ; SCENE_FINISHED - db 1 ; callbacks + def_callbacks callback MAPCALLBACK_TILES, .WillsRoomDoors .LockDoor: @@ -129,14 +129,14 @@ WillScript_WillDefeatText: WillsRoom_MapEvents: db 0, 0 ; filler - db 3 ; warp events + def_warp_events 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 + def_coord_events - db 0 ; bg events + def_bg_events - db 1 ; object events + def_object_events object_event 5, 7, SPRITE_WILL, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_SCRIPT, 0, WillScript_Battle, -1 diff --git a/maps/WiseTriosRoom.asm b/maps/WiseTriosRoom.asm index 42ee77e57..31022587d 100644 --- a/maps/WiseTriosRoom.asm +++ b/maps/WiseTriosRoom.asm @@ -1,4 +1,4 @@ - object_const_def ; object_event constants + object_const_def const WISETRIOSROOM_SAGE1 const WISETRIOSROOM_SAGE2 const WISETRIOSROOM_SAGE3 @@ -7,11 +7,11 @@ const WISETRIOSROOM_SAGE6 WiseTriosRoom_MapScripts: - db 2 ; scene scripts + def_scene_scripts scene_script .DummyScene0 ; SCENE_DEFAULT scene_script .DummyScene1 ; SCENE_FINISHED - db 1 ; callbacks + def_callbacks callback MAPCALLBACK_OBJECTS, .WiseTrioCallback .DummyScene0: @@ -345,17 +345,17 @@ SageKojiAfterBattleFinalText: WiseTriosRoom_MapEvents: db 0, 0 ; filler - db 3 ; warp events + def_warp_events 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 + def_coord_events coord_event 7, 4, SCENE_DEFAULT, WiseTriosRoom_CannotEnterTinTowerScript - db 0 ; bg events + def_bg_events - db 6 ; object events + def_object_events object_event 6, 2, SPRITE_SAGE, SPRITEMOVEDATA_SPINRANDOM_SLOW, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, WiseTriosRoomSage1Script, EVENT_WISE_TRIOS_ROOM_WISE_TRIO_1 object_event 6, 7, SPRITE_SAGE, SPRITEMOVEDATA_WALK_LEFT_RIGHT, 1, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, WiseTriosRoomSage2Script, EVENT_WISE_TRIOS_ROOM_WISE_TRIO_1 object_event 7, 5, SPRITE_SAGE, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, WiseTriosRoomSage3Script, EVENT_WISE_TRIOS_ROOM_WISE_TRIO_1