From 745339014c39a4d47d8a4bdee05bbe8e573933ec Mon Sep 17 00:00:00 2001 From: Rangi Date: Sun, 21 Apr 2019 17:42:25 -0400 Subject: [PATCH] "object_const_def" instead of "const_def 2" --- docs/map_event_scripts.md | 2 +- macros/scripts/maps.asm | 2 ++ maps/AzaleaGym.asm | 2 +- maps/AzaleaMart.asm | 2 +- maps/AzaleaPokecenter1F.asm | 2 +- maps/AzaleaTown.asm | 2 +- maps/BattleTower1F.asm | 2 +- maps/BattleTowerBattleRoom.asm | 2 +- maps/BattleTowerElevator.asm | 2 +- maps/BattleTowerHallway.asm | 2 +- maps/BattleTowerOutside.asm | 2 +- maps/BillsBrothersHouse.asm | 2 +- maps/BillsFamilysHouse.asm | 2 +- maps/BillsHouse.asm | 2 +- maps/BlackthornCity.asm | 2 +- maps/BlackthornDragonSpeechHouse.asm | 2 +- maps/BlackthornEmysHouse.asm | 2 +- maps/BlackthornGym1F.asm | 2 +- maps/BlackthornGym2F.asm | 2 +- maps/BlackthornMart.asm | 2 +- maps/BlackthornPokecenter1F.asm | 2 +- maps/BluesHouse.asm | 2 +- maps/BrunosRoom.asm | 2 +- maps/BurnedTower1F.asm | 2 +- maps/BurnedTowerB1F.asm | 2 +- maps/CeladonCafe.asm | 2 +- maps/CeladonCity.asm | 2 +- maps/CeladonDeptStore1F.asm | 2 +- maps/CeladonDeptStore2F.asm | 2 +- maps/CeladonDeptStore3F.asm | 2 +- maps/CeladonDeptStore4F.asm | 2 +- maps/CeladonDeptStore5F.asm | 2 +- maps/CeladonDeptStore6F.asm | 2 +- maps/CeladonGameCorner.asm | 2 +- maps/CeladonGameCornerPrizeRoom.asm | 2 +- maps/CeladonGym.asm | 2 +- maps/CeladonMansion1F.asm | 2 +- maps/CeladonMansion3F.asm | 2 +- maps/CeladonMansionRoof.asm | 2 +- maps/CeladonMansionRoofHouse.asm | 2 +- maps/CeladonPokecenter1F.asm | 2 +- maps/CeruleanCity.asm | 2 +- maps/CeruleanGym.asm | 2 +- maps/CeruleanGymBadgeSpeechHouse.asm | 2 +- maps/CeruleanMart.asm | 2 +- maps/CeruleanPokecenter1F.asm | 2 +- maps/CeruleanPoliceStation.asm | 2 +- maps/CeruleanTradeSpeechHouse.asm | 2 +- maps/CharcoalKiln.asm | 2 +- maps/CherrygroveCity.asm | 2 +- maps/CherrygroveEvolutionSpeechHouse.asm | 2 +- maps/CherrygroveGymSpeechHouse.asm | 2 +- maps/CherrygroveMart.asm | 2 +- maps/CherrygrovePokecenter1F.asm | 2 +- maps/CianwoodCity.asm | 2 +- maps/CianwoodGym.asm | 2 +- maps/CianwoodLugiaSpeechHouse.asm | 2 +- maps/CianwoodPharmacy.asm | 2 +- maps/CianwoodPhotoStudio.asm | 2 +- maps/CianwoodPokecenter1F.asm | 2 +- maps/CinnabarIsland.asm | 2 +- maps/CinnabarPokecenter1F.asm | 2 +- maps/Colosseum.asm | 2 +- maps/CopycatsHouse1F.asm | 2 +- maps/CopycatsHouse2F.asm | 2 +- maps/DanceTheatre.asm | 2 +- maps/DarkCaveBlackthornEntrance.asm | 2 +- maps/DarkCaveVioletEntrance.asm | 2 +- maps/DayCare.asm | 2 +- maps/DayOfWeekSiblingsHouse.asm | 2 +- maps/DiglettsCave.asm | 2 +- maps/DragonShrine.asm | 2 +- maps/DragonsDenB1F.asm | 2 +- maps/EarlsPokemonAcademy.asm | 2 +- maps/EcruteakCity.asm | 2 +- maps/EcruteakGym.asm | 2 +- maps/EcruteakItemfinderHouse.asm | 2 +- maps/EcruteakLugiaSpeechHouse.asm | 2 +- maps/EcruteakMart.asm | 2 +- maps/EcruteakPokecenter1F.asm | 2 +- maps/EcruteakTinTowerEntrance.asm | 2 +- maps/ElmsHouse.asm | 2 +- maps/ElmsLab.asm | 2 +- maps/FastShip1F.asm | 2 +- maps/FastShipB1F.asm | 2 +- maps/FastShipCabins_NNW_NNE_NE.asm | 2 +- maps/FastShipCabins_SE_SSE_CaptainsCabin.asm | 2 +- maps/FastShipCabins_SW_SSW_NW.asm | 2 +- maps/FightingDojo.asm | 2 +- maps/FuchsiaCity.asm | 2 +- maps/FuchsiaGym.asm | 2 +- maps/FuchsiaMart.asm | 2 +- maps/FuchsiaPokecenter1F.asm | 2 +- maps/GoldenrodBikeShop.asm | 2 +- maps/GoldenrodCity.asm | 2 +- maps/GoldenrodDeptStore1F.asm | 2 +- maps/GoldenrodDeptStore2F.asm | 2 +- maps/GoldenrodDeptStore3F.asm | 2 +- maps/GoldenrodDeptStore4F.asm | 2 +- maps/GoldenrodDeptStore5F.asm | 2 +- maps/GoldenrodDeptStore6F.asm | 2 +- maps/GoldenrodDeptStoreB1F.asm | 2 +- maps/GoldenrodDeptStoreRoof.asm | 2 +- maps/GoldenrodFlowerShop.asm | 2 +- maps/GoldenrodGameCorner.asm | 2 +- maps/GoldenrodGym.asm | 2 +- maps/GoldenrodHappinessRater.asm | 2 +- maps/GoldenrodMagnetTrainStation.asm | 2 +- maps/GoldenrodNameRater.asm | 2 +- maps/GoldenrodPPSpeechHouse.asm | 2 +- maps/GoldenrodPokecenter1F.asm | 2 +- maps/GoldenrodUnderground.asm | 2 +- maps/GoldenrodUndergroundSwitchRoomEntrances.asm | 2 +- maps/GoldenrodUndergroundWarehouse.asm | 2 +- maps/GuideGentsHouse.asm | 2 +- maps/HallOfFame.asm | 2 +- maps/IcePath1F.asm | 2 +- maps/IcePathB1F.asm | 2 +- maps/IcePathB2FBlackthornSide.asm | 2 +- maps/IcePathB2FMahoganySide.asm | 2 +- maps/IcePathB3F.asm | 2 +- maps/IlexForest.asm | 2 +- maps/IlexForestAzaleaGate.asm | 2 +- maps/IndigoPlateauPokecenter1F.asm | 2 +- maps/KarensRoom.asm | 2 +- maps/KogasRoom.asm | 2 +- maps/KurtsHouse.asm | 2 +- maps/LakeOfRage.asm | 2 +- maps/LakeOfRageHiddenPowerHouse.asm | 2 +- maps/LakeOfRageMagikarpHouse.asm | 2 +- maps/LancesRoom.asm | 2 +- maps/LavRadioTower1F.asm | 2 +- maps/LavenderMart.asm | 2 +- maps/LavenderNameRater.asm | 2 +- maps/LavenderPokecenter1F.asm | 2 +- maps/LavenderSpeechHouse.asm | 2 +- maps/LavenderTown.asm | 2 +- maps/MahoganyGym.asm | 2 +- maps/MahoganyMart1F.asm | 2 +- maps/MahoganyPokecenter1F.asm | 2 +- maps/MahoganyRedGyaradosSpeechHouse.asm | 2 +- maps/MahoganyTown.asm | 2 +- maps/ManiasHouse.asm | 2 +- maps/MountMoon.asm | 2 +- maps/MountMoonGiftShop.asm | 2 +- maps/MountMoonSquare.asm | 2 +- maps/MountMortar1FInside.asm | 2 +- maps/MountMortar1FOutside.asm | 2 +- maps/MountMortar2FInside.asm | 2 +- maps/MountMortarB1F.asm | 2 +- maps/MoveDeletersHouse.asm | 2 +- maps/MrFujisHouse.asm | 2 +- maps/MrPokemonsHouse.asm | 2 +- maps/MrPsychicsHouse.asm | 2 +- maps/NationalPark.asm | 2 +- maps/NationalParkBugContest.asm | 2 +- maps/NewBarkTown.asm | 2 +- maps/OaksLab.asm | 2 +- maps/OlivineCafe.asm | 2 +- maps/OlivineCity.asm | 2 +- maps/OlivineGoodRodHouse.asm | 2 +- maps/OlivineGym.asm | 2 +- maps/OlivineHouseBeta.asm | 2 +- maps/OlivineLighthouse1F.asm | 2 +- maps/OlivineLighthouse2F.asm | 2 +- maps/OlivineLighthouse3F.asm | 2 +- maps/OlivineLighthouse4F.asm | 2 +- maps/OlivineLighthouse5F.asm | 2 +- maps/OlivineLighthouse6F.asm | 2 +- maps/OlivineMart.asm | 2 +- maps/OlivinePokecenter1F.asm | 2 +- maps/OlivinePort.asm | 2 +- maps/OlivinePortPassage.asm | 2 +- maps/OlivinePunishmentSpeechHouse.asm | 2 +- maps/OlivineTimsHouse.asm | 2 +- maps/PalletTown.asm | 2 +- maps/PewterCity.asm | 2 +- maps/PewterGym.asm | 2 +- maps/PewterMart.asm | 2 +- maps/PewterNidoranSpeechHouse.asm | 2 +- maps/PewterPokecenter1F.asm | 2 +- maps/PewterSnoozeSpeechHouse.asm | 2 +- maps/PlayersHouse1F.asm | 2 +- maps/PlayersHouse2F.asm | 2 +- maps/PlayersNeighborsHouse.asm | 2 +- maps/PokeSeersHouse.asm | 2 +- maps/Pokecenter2F.asm | 2 +- maps/PokecomCenterAdminOfficeMobile.asm | 2 +- maps/PokemonFanClub.asm | 2 +- maps/PowerPlant.asm | 2 +- maps/RadioTower1F.asm | 2 +- maps/RadioTower2F.asm | 2 +- maps/RadioTower3F.asm | 2 +- maps/RadioTower4F.asm | 2 +- maps/RadioTower5F.asm | 2 +- maps/RedsHouse1F.asm | 2 +- maps/RockTunnel1F.asm | 2 +- maps/RockTunnelB1F.asm | 2 +- maps/Route1.asm | 2 +- maps/Route10Pokecenter1F.asm | 2 +- maps/Route10South.asm | 2 +- maps/Route11.asm | 2 +- maps/Route12.asm | 2 +- maps/Route12SuperRodHouse.asm | 2 +- maps/Route13.asm | 2 +- maps/Route14.asm | 2 +- maps/Route15.asm | 2 +- maps/Route15FuchsiaGate.asm | 2 +- maps/Route16FuchsiaSpeechHouse.asm | 2 +- maps/Route16Gate.asm | 2 +- maps/Route17.asm | 2 +- maps/Route17Route18Gate.asm | 2 +- maps/Route18.asm | 2 +- maps/Route19.asm | 2 +- maps/Route19FuchsiaGate.asm | 2 +- maps/Route2.asm | 2 +- maps/Route20.asm | 2 +- maps/Route21.asm | 2 +- maps/Route24.asm | 2 +- maps/Route25.asm | 2 +- maps/Route26.asm | 2 +- maps/Route26HealHouse.asm | 2 +- maps/Route27.asm | 2 +- maps/Route27SandstormHouse.asm | 2 +- maps/Route28SteelWingHouse.asm | 2 +- maps/Route29.asm | 2 +- maps/Route29Route46Gate.asm | 2 +- maps/Route2Gate.asm | 2 +- maps/Route2NuggetHouse.asm | 2 +- maps/Route3.asm | 2 +- maps/Route30.asm | 2 +- maps/Route30BerryHouse.asm | 2 +- maps/Route31.asm | 2 +- maps/Route31VioletGate.asm | 2 +- maps/Route32.asm | 2 +- maps/Route32Pokecenter1F.asm | 2 +- maps/Route32RuinsOfAlphGate.asm | 2 +- maps/Route33.asm | 2 +- maps/Route34.asm | 2 +- maps/Route34IlexForestGate.asm | 2 +- maps/Route35.asm | 2 +- maps/Route35GoldenrodGate.asm | 2 +- maps/Route35NationalParkGate.asm | 2 +- maps/Route36.asm | 2 +- maps/Route36NationalParkGate.asm | 2 +- maps/Route36RuinsOfAlphGate.asm | 2 +- maps/Route37.asm | 2 +- maps/Route38.asm | 2 +- maps/Route38EcruteakGate.asm | 2 +- maps/Route39.asm | 2 +- maps/Route39Barn.asm | 2 +- maps/Route39Farmhouse.asm | 2 +- maps/Route4.asm | 2 +- maps/Route40.asm | 2 +- maps/Route40BattleTowerGate.asm | 2 +- maps/Route41.asm | 2 +- maps/Route42.asm | 2 +- maps/Route42EcruteakGate.asm | 2 +- maps/Route43.asm | 2 +- maps/Route43Gate.asm | 2 +- maps/Route43MahoganyGate.asm | 2 +- maps/Route44.asm | 2 +- maps/Route45.asm | 2 +- maps/Route46.asm | 2 +- maps/Route5.asm | 2 +- maps/Route5CleanseTagHouse.asm | 2 +- maps/Route5SaffronGate.asm | 2 +- maps/Route5UndergroundPathEntrance.asm | 2 +- maps/Route6.asm | 2 +- maps/Route6SaffronGate.asm | 2 +- maps/Route7SaffronGate.asm | 2 +- maps/Route8.asm | 2 +- maps/Route8SaffronGate.asm | 2 +- maps/Route9.asm | 2 +- maps/RuinsOfAlphAerodactylItemRoom.asm | 2 +- maps/RuinsOfAlphHoOhItemRoom.asm | 2 +- maps/RuinsOfAlphInnerChamber.asm | 2 +- maps/RuinsOfAlphKabutoChamber.asm | 2 +- maps/RuinsOfAlphKabutoItemRoom.asm | 2 +- maps/RuinsOfAlphOmanyteItemRoom.asm | 2 +- maps/RuinsOfAlphOutside.asm | 2 +- maps/RuinsOfAlphResearchCenter.asm | 2 +- maps/SafariZoneWardensHome.asm | 2 +- maps/SaffronCity.asm | 2 +- maps/SaffronGym.asm | 2 +- maps/SaffronMagnetTrainStation.asm | 2 +- maps/SaffronMart.asm | 2 +- maps/SaffronPokecenter1F.asm | 2 +- maps/SeafoamGym.asm | 2 +- maps/SilphCo1F.asm | 2 +- maps/SilverCaveItemRooms.asm | 2 +- maps/SilverCavePokecenter1F.asm | 2 +- maps/SilverCaveRoom1.asm | 2 +- maps/SilverCaveRoom2.asm | 2 +- maps/SilverCaveRoom3.asm | 2 +- maps/SlowpokeWellB1F.asm | 2 +- maps/SlowpokeWellB2F.asm | 2 +- maps/SoulHouse.asm | 2 +- maps/SproutTower1F.asm | 2 +- maps/SproutTower2F.asm | 2 +- maps/SproutTower3F.asm | 2 +- maps/TeamRocketBaseB1F.asm | 2 +- maps/TeamRocketBaseB2F.asm | 2 +- maps/TeamRocketBaseB3F.asm | 2 +- maps/TimeCapsule.asm | 2 +- maps/TinTower1F.asm | 2 +- maps/TinTower3F.asm | 2 +- maps/TinTower4F.asm | 2 +- maps/TinTower5F.asm | 2 +- maps/TinTower6F.asm | 2 +- maps/TinTower7F.asm | 2 +- maps/TinTower8F.asm | 2 +- maps/TinTower9F.asm | 2 +- maps/TinTowerRoof.asm | 2 +- maps/TohjoFalls.asm | 2 +- maps/TradeCenter.asm | 2 +- maps/TrainerHouse1F.asm | 2 +- maps/TrainerHouseB1F.asm | 2 +- maps/UnionCave1F.asm | 2 +- maps/UnionCaveB1F.asm | 2 +- maps/UnionCaveB2F.asm | 2 +- maps/VermilionCity.asm | 2 +- maps/VermilionDiglettsCaveSpeechHouse.asm | 2 +- maps/VermilionFishingSpeechHouse.asm | 2 +- maps/VermilionGym.asm | 2 +- maps/VermilionMagnetTrainSpeechHouse.asm | 2 +- maps/VermilionMart.asm | 2 +- maps/VermilionPokecenter1F.asm | 2 +- maps/VermilionPort.asm | 2 +- maps/VermilionPortPassage.asm | 2 +- maps/VictoryRoad.asm | 2 +- maps/VictoryRoadGate.asm | 2 +- maps/VioletCity.asm | 2 +- maps/VioletGym.asm | 2 +- maps/VioletKylesHouse.asm | 2 +- maps/VioletMart.asm | 2 +- maps/VioletNicknameSpeechHouse.asm | 2 +- maps/VioletPokecenter1F.asm | 2 +- maps/ViridianCity.asm | 2 +- maps/ViridianGym.asm | 2 +- maps/ViridianMart.asm | 2 +- maps/ViridianNicknameSpeechHouse.asm | 2 +- maps/ViridianPokecenter1F.asm | 2 +- maps/WhirlIslandB1F.asm | 2 +- maps/WhirlIslandB2F.asm | 2 +- maps/WhirlIslandLugiaChamber.asm | 2 +- maps/WhirlIslandNE.asm | 2 +- maps/WhirlIslandSW.asm | 2 +- maps/WillsRoom.asm | 2 +- maps/WiseTriosRoom.asm | 2 +- 350 files changed, 351 insertions(+), 349 deletions(-) diff --git a/docs/map_event_scripts.md b/docs/map_event_scripts.md index a77f74503..b748adefb 100644 --- a/docs/map_event_scripts.md +++ b/docs/map_event_scripts.md @@ -24,7 +24,7 @@ ## Object constants 
-	const_def 2 ; object constants
+	object_const_def ; object_event constants
 	const MAPNAME_OBJECTNAME
diff --git a/macros/scripts/maps.asm b/macros/scripts/maps.asm index 1dd8a4ce8..edf2b4213 100644 --- a/macros/scripts/maps.asm +++ b/macros/scripts/maps.asm @@ -3,6 +3,8 @@ map_id: MACRO db GROUP_\1, MAP_\1 ENDM +object_const_def EQUS "const_def 2" + scene_script: MACRO ;\1: script pointer dw \1 diff --git a/maps/AzaleaGym.asm b/maps/AzaleaGym.asm index 7e2381d37..86db44670 100644 --- a/maps/AzaleaGym.asm +++ b/maps/AzaleaGym.asm @@ -1,4 +1,4 @@ - const_def 2 ; object constants + object_const_def ; object_event constants const AZALEAGYM_BUGSY const AZALEAGYM_BUG_CATCHER1 const AZALEAGYM_BUG_CATCHER2 diff --git a/maps/AzaleaMart.asm b/maps/AzaleaMart.asm index c98ff31ac..c6d8fbbb4 100644 --- a/maps/AzaleaMart.asm +++ b/maps/AzaleaMart.asm @@ -1,4 +1,4 @@ - const_def 2 ; object constants + object_const_def ; object_event constants const AZALEAMART_CLERK const AZALEAMART_COOLTRAINER_M const AZALEAMART_BUG_CATCHER diff --git a/maps/AzaleaPokecenter1F.asm b/maps/AzaleaPokecenter1F.asm index dbae15320..7ea58a927 100644 --- a/maps/AzaleaPokecenter1F.asm +++ b/maps/AzaleaPokecenter1F.asm @@ -1,4 +1,4 @@ - const_def 2 ; object constants + object_const_def ; object_event constants const AZALEAPOKECENTER1F_NURSE const AZALEAPOKECENTER1F_GENTLEMAN const AZALEAPOKECENTER1F_FISHING_GURU diff --git a/maps/AzaleaTown.asm b/maps/AzaleaTown.asm index 33263de62..85bf39cd7 100644 --- a/maps/AzaleaTown.asm +++ b/maps/AzaleaTown.asm @@ -1,4 +1,4 @@ - const_def 2 ; object constants + object_const_def ; object_event constants const AZALEATOWN_AZALEA_ROCKET1 const AZALEATOWN_GRAMPS const AZALEATOWN_TEACHER diff --git a/maps/BattleTower1F.asm b/maps/BattleTower1F.asm index 3c24a7271..b79f835d7 100644 --- a/maps/BattleTower1F.asm +++ b/maps/BattleTower1F.asm @@ -1,4 +1,4 @@ - const_def 2 ; object constants + object_const_def ; object_event constants const BATTLETOWER1F_RECEPTIONIST const BATTLETOWER1F_YOUNGSTER const BATTLETOWER1F_COOLTRAINER_F diff --git a/maps/BattleTowerBattleRoom.asm b/maps/BattleTowerBattleRoom.asm index 6f1b63639..3f9c17f06 100644 --- a/maps/BattleTowerBattleRoom.asm +++ b/maps/BattleTowerBattleRoom.asm @@ -1,4 +1,4 @@ - const_def 2 ; object constants + object_const_def ; object_event constants const BATTLETOWERBATTLEROOM_YOUNGSTER const BATTLETOWERBATTLEROOM_RECEPTIONIST diff --git a/maps/BattleTowerElevator.asm b/maps/BattleTowerElevator.asm index 42c10cc44..9f1764fbb 100644 --- a/maps/BattleTowerElevator.asm +++ b/maps/BattleTowerElevator.asm @@ -1,4 +1,4 @@ - const_def 2 ; object constants + object_const_def ; object_event constants const BATTLETOWERELEVATOR_RECEPTIONIST BattleTowerElevator_MapScripts: diff --git a/maps/BattleTowerHallway.asm b/maps/BattleTowerHallway.asm index e030f4fce..92f050580 100644 --- a/maps/BattleTowerHallway.asm +++ b/maps/BattleTowerHallway.asm @@ -1,4 +1,4 @@ - const_def 2 ; object constants + object_const_def ; object_event constants const BATTLETOWERHALLWAY_RECEPTIONIST BattleTowerHallway_MapScripts: diff --git a/maps/BattleTowerOutside.asm b/maps/BattleTowerOutside.asm index eb067af19..47ba8facf 100644 --- a/maps/BattleTowerOutside.asm +++ b/maps/BattleTowerOutside.asm @@ -1,4 +1,4 @@ - const_def 2 ; object constants + object_const_def ; object_event constants const BATTLETOWEROUTSIDE_STANDING_YOUNGSTER const BATTLETOWEROUTSIDE_BUENA const BATTLETOWEROUTSIDE_SAILOR diff --git a/maps/BillsBrothersHouse.asm b/maps/BillsBrothersHouse.asm index e669586e0..b9c6d469f 100644 --- a/maps/BillsBrothersHouse.asm +++ b/maps/BillsBrothersHouse.asm @@ -1,4 +1,4 @@ - const_def 2 ; object constants + object_const_def ; object_event constants const BILLSBROTHERSHOUSE_POKEFAN_F const BILLSBROTHERSHOUSE_YOUNGSTER diff --git a/maps/BillsFamilysHouse.asm b/maps/BillsFamilysHouse.asm index e4ad3d34d..9ac4792cf 100644 --- a/maps/BillsFamilysHouse.asm +++ b/maps/BillsFamilysHouse.asm @@ -1,4 +1,4 @@ - const_def 2 ; object constants + object_const_def ; object_event constants const BILLSFAMILYSHOUSE_BILL const BILLSFAMILYSHOUSE_POKEFAN_F const BILLSFAMILYSHOUSE_TWIN diff --git a/maps/BillsHouse.asm b/maps/BillsHouse.asm index b72221fbd..7a2d88837 100644 --- a/maps/BillsHouse.asm +++ b/maps/BillsHouse.asm @@ -1,4 +1,4 @@ - const_def 2 ; object constants + object_const_def ; object_event constants const BILLSHOUSE_GRAMPS BillsHouse_MapScripts: diff --git a/maps/BlackthornCity.asm b/maps/BlackthornCity.asm index 2c9ff1e4c..b0df5b9c5 100644 --- a/maps/BlackthornCity.asm +++ b/maps/BlackthornCity.asm @@ -1,4 +1,4 @@ - const_def 2 ; object constants + object_const_def ; object_event constants const BLACKTHORNCITY_SUPER_NERD1 const BLACKTHORNCITY_SUPER_NERD2 const BLACKTHORNCITY_GRAMPS1 diff --git a/maps/BlackthornDragonSpeechHouse.asm b/maps/BlackthornDragonSpeechHouse.asm index 8b4575611..cecbdcc61 100644 --- a/maps/BlackthornDragonSpeechHouse.asm +++ b/maps/BlackthornDragonSpeechHouse.asm @@ -1,4 +1,4 @@ - const_def 2 ; object constants + object_const_def ; object_event constants const BLACKTHORNDRAGONSPEECHHOUSE_GRANNY const BLACKTHORNDRAGONSPEECHHOUSE_EKANS diff --git a/maps/BlackthornEmysHouse.asm b/maps/BlackthornEmysHouse.asm index 01fffb4de..f59ef4b8a 100644 --- a/maps/BlackthornEmysHouse.asm +++ b/maps/BlackthornEmysHouse.asm @@ -1,4 +1,4 @@ - const_def 2 ; object constants + object_const_def ; object_event constants const BLACKTHORNEMYSHOUSE_EMY BlackthornEmysHouse_MapScripts: diff --git a/maps/BlackthornGym1F.asm b/maps/BlackthornGym1F.asm index 76d574990..35c467ad5 100644 --- a/maps/BlackthornGym1F.asm +++ b/maps/BlackthornGym1F.asm @@ -1,4 +1,4 @@ - const_def 2 ; object constants + object_const_def ; object_event constants const BLACKTHORNGYM1F_CLAIR const BLACKTHORNGYM1F_COOLTRAINER_M1 const BLACKTHORNGYM1F_COOLTRAINER_M2 diff --git a/maps/BlackthornGym2F.asm b/maps/BlackthornGym2F.asm index 9216832cf..6d5997038 100644 --- a/maps/BlackthornGym2F.asm +++ b/maps/BlackthornGym2F.asm @@ -1,4 +1,4 @@ - const_def 2 ; object constants + object_const_def ; object_event constants const BLACKTHORNGYM2F_COOLTRAINER_M const BLACKTHORNGYM2F_COOLTRAINER_F const BLACKTHORNGYM2F_BOULDER1 diff --git a/maps/BlackthornMart.asm b/maps/BlackthornMart.asm index c7a61af05..a05ae1eb2 100644 --- a/maps/BlackthornMart.asm +++ b/maps/BlackthornMart.asm @@ -1,4 +1,4 @@ - const_def 2 ; object constants + object_const_def ; object_event constants const BLACKTHORNMART_CLERK const BLACKTHORNMART_COOLTRAINER_M const BLACKTHORNMART_BLACK_BELT diff --git a/maps/BlackthornPokecenter1F.asm b/maps/BlackthornPokecenter1F.asm index a6e44a881..530736ddf 100644 --- a/maps/BlackthornPokecenter1F.asm +++ b/maps/BlackthornPokecenter1F.asm @@ -1,4 +1,4 @@ - const_def 2 ; object constants + object_const_def ; object_event constants const BLACKTHORNPOKECENTER1F_NURSE const BLACKTHORNPOKECENTER1F_GENTLEMAN const BLACKTHORNPOKECENTER1F_TWIN diff --git a/maps/BluesHouse.asm b/maps/BluesHouse.asm index 15bf19aa1..a56f10fe3 100644 --- a/maps/BluesHouse.asm +++ b/maps/BluesHouse.asm @@ -1,4 +1,4 @@ - const_def 2 ; object constants + object_const_def ; object_event constants const BLUESHOUSE_DAISY BluesHouse_MapScripts: diff --git a/maps/BrunosRoom.asm b/maps/BrunosRoom.asm index 522aa9fb2..7eeec6b8d 100644 --- a/maps/BrunosRoom.asm +++ b/maps/BrunosRoom.asm @@ -1,4 +1,4 @@ - const_def 2 ; object constants + object_const_def ; object_event constants const BRUNOSROOM_BRUNO BrunosRoom_MapScripts: diff --git a/maps/BurnedTower1F.asm b/maps/BurnedTower1F.asm index 7eab73050..846b4621d 100644 --- a/maps/BurnedTower1F.asm +++ b/maps/BurnedTower1F.asm @@ -1,4 +1,4 @@ - const_def 2 ; object constants + object_const_def ; object_event constants const BURNEDTOWER1F_ROCK const BURNEDTOWER1F_EUSINE const BURNEDTOWER1F_SILVER diff --git a/maps/BurnedTowerB1F.asm b/maps/BurnedTowerB1F.asm index 60670b463..bf06be788 100644 --- a/maps/BurnedTowerB1F.asm +++ b/maps/BurnedTowerB1F.asm @@ -1,4 +1,4 @@ - const_def 2 ; object constants + object_const_def ; object_event constants const BURNEDTOWERB1F_BOULDER const BURNEDTOWERB1F_RAIKOU1 const BURNEDTOWERB1F_ENTEI1 diff --git a/maps/CeladonCafe.asm b/maps/CeladonCafe.asm index 5ee69cddc..8795ed931 100644 --- a/maps/CeladonCafe.asm +++ b/maps/CeladonCafe.asm @@ -1,4 +1,4 @@ - const_def 2 ; object constants + object_const_def ; object_event constants const CELADONCAFE_SUPER_NERD const CELADONCAFE_FISHER1 const CELADONCAFE_FISHER2 diff --git a/maps/CeladonCity.asm b/maps/CeladonCity.asm index 491791264..3a7366ead 100644 --- a/maps/CeladonCity.asm +++ b/maps/CeladonCity.asm @@ -1,4 +1,4 @@ - const_def 2 ; object constants + object_const_def ; object_event constants const CELADONCITY_FISHER const CELADONCITY_POLIWAG const CELADONCITY_TEACHER1 diff --git a/maps/CeladonDeptStore1F.asm b/maps/CeladonDeptStore1F.asm index ba347458a..90f102728 100644 --- a/maps/CeladonDeptStore1F.asm +++ b/maps/CeladonDeptStore1F.asm @@ -1,4 +1,4 @@ - const_def 2 ; object constants + object_const_def ; object_event constants const CELADONDEPTSTORE1F_RECEPTIONIST const CELADONDEPTSTORE1F_GENTLEMAN const CELADONDEPTSTORE1F_TEACHER diff --git a/maps/CeladonDeptStore2F.asm b/maps/CeladonDeptStore2F.asm index cdbadd700..b83d4cfad 100644 --- a/maps/CeladonDeptStore2F.asm +++ b/maps/CeladonDeptStore2F.asm @@ -1,4 +1,4 @@ - const_def 2 ; object constants + object_const_def ; object_event constants const CELADONDEPTSTORE2F_CLERK1 const CELADONDEPTSTORE2F_CLERK2 const CELADONDEPTSTORE2F_POKEFAN_M diff --git a/maps/CeladonDeptStore3F.asm b/maps/CeladonDeptStore3F.asm index 638ff3c34..4fd72c8c8 100644 --- a/maps/CeladonDeptStore3F.asm +++ b/maps/CeladonDeptStore3F.asm @@ -1,4 +1,4 @@ - const_def 2 ; object constants + object_const_def ; object_event constants const CELADONDEPTSTORE3F_CLERK const CELADONDEPTSTORE3F_YOUNGSTER const CELADONDEPTSTORE3F_GAMEBOY_KID1 diff --git a/maps/CeladonDeptStore4F.asm b/maps/CeladonDeptStore4F.asm index 9e7dddc29..8c6f1c647 100644 --- a/maps/CeladonDeptStore4F.asm +++ b/maps/CeladonDeptStore4F.asm @@ -1,4 +1,4 @@ - const_def 2 ; object constants + object_const_def ; object_event constants const CELADONDEPTSTORE4F_CLERK const CELADONDEPTSTORE4F_SUPER_NERD const CELADONDEPTSTORE4F_YOUNGSTER diff --git a/maps/CeladonDeptStore5F.asm b/maps/CeladonDeptStore5F.asm index 2c5ae22f8..7704d9422 100644 --- a/maps/CeladonDeptStore5F.asm +++ b/maps/CeladonDeptStore5F.asm @@ -1,4 +1,4 @@ - const_def 2 ; object constants + object_const_def ; object_event constants const CELADONDEPTSTORE5F_CLERK1 const CELADONDEPTSTORE5F_CLERK2 const CELADONDEPTSTORE5F_GENTLEMAN diff --git a/maps/CeladonDeptStore6F.asm b/maps/CeladonDeptStore6F.asm index 0aed4f770..d488a39e5 100644 --- a/maps/CeladonDeptStore6F.asm +++ b/maps/CeladonDeptStore6F.asm @@ -2,7 +2,7 @@ CELADONDEPTSTORE6F_FRESH_WATER_PRICE EQU 200 CELADONDEPTSTORE6F_SODA_POP_PRICE EQU 300 CELADONDEPTSTORE6F_LEMONADE_PRICE EQU 350 - const_def 2 ; object constants + object_const_def ; object_event constants const CELADONDEPTSTORE6F_SUPER_NERD const CELADONDEPTSTORE6F_YOUNGSTER diff --git a/maps/CeladonGameCorner.asm b/maps/CeladonGameCorner.asm index 0325be7be..657a2ca7c 100644 --- a/maps/CeladonGameCorner.asm +++ b/maps/CeladonGameCorner.asm @@ -1,4 +1,4 @@ - const_def 2 ; object constants + object_const_def ; object_event constants const CELADONGAMECORNER_CLERK const CELADONGAMECORNER_RECEPTIONIST const CELADONGAMECORNER_POKEFAN_M diff --git a/maps/CeladonGameCornerPrizeRoom.asm b/maps/CeladonGameCornerPrizeRoom.asm index 018573798..861deb6e4 100644 --- a/maps/CeladonGameCornerPrizeRoom.asm +++ b/maps/CeladonGameCornerPrizeRoom.asm @@ -5,7 +5,7 @@ CELADONGAMECORNERPRIZEROOM_PIKACHU_COINS EQU 2222 CELADONGAMECORNERPRIZEROOM_PORYGON_COINS EQU 5555 CELADONGAMECORNERPRIZEROOM_LARVITAR_COINS EQU 8888 - const_def 2 ; object constants + object_const_def ; object_event constants const CELADONGAMECORNERPRIZEROOM_GENTLEMAN const CELADONGAMECORNERPRIZEROOM_PHARMACIST diff --git a/maps/CeladonGym.asm b/maps/CeladonGym.asm index 741985bbb..7aabd24be 100644 --- a/maps/CeladonGym.asm +++ b/maps/CeladonGym.asm @@ -1,4 +1,4 @@ - const_def 2 ; object constants + object_const_def ; object_event constants const CELADONGYM_ERIKA const CELADONGYM_LASS1 const CELADONGYM_LASS2 diff --git a/maps/CeladonMansion1F.asm b/maps/CeladonMansion1F.asm index 0494249ec..edadecedf 100644 --- a/maps/CeladonMansion1F.asm +++ b/maps/CeladonMansion1F.asm @@ -1,4 +1,4 @@ - const_def 2 ; object constants + object_const_def ; object_event constants const CELADONMANSION1F_GRANNY const CELADONMANSION1F_GROWLITHE1 const CELADONMANSION1F_CLEFAIRY diff --git a/maps/CeladonMansion3F.asm b/maps/CeladonMansion3F.asm index 2bd6719c7..5e0c273c8 100644 --- a/maps/CeladonMansion3F.asm +++ b/maps/CeladonMansion3F.asm @@ -1,4 +1,4 @@ - const_def 2 ; object constants + object_const_def ; object_event constants const CELADONMANSION3F_COOLTRAINER_M const CELADONMANSION3F_GYM_GUY const CELADONMANSION3F_SUPER_NERD diff --git a/maps/CeladonMansionRoof.asm b/maps/CeladonMansionRoof.asm index be2514f36..abb643aba 100644 --- a/maps/CeladonMansionRoof.asm +++ b/maps/CeladonMansionRoof.asm @@ -1,4 +1,4 @@ - const_def 2 ; object constants + object_const_def ; object_event constants const CELADONMANSIONROOF_FISHER CeladonMansionRoof_MapScripts: diff --git a/maps/CeladonMansionRoofHouse.asm b/maps/CeladonMansionRoofHouse.asm index 31bda62b8..73c18f8bf 100644 --- a/maps/CeladonMansionRoofHouse.asm +++ b/maps/CeladonMansionRoofHouse.asm @@ -1,4 +1,4 @@ - const_def 2 ; object constants + object_const_def ; object_event constants const CELADONMANSIONROOFHOUSE_PHARMACIST CeladonMansionRoofHouse_MapScripts: diff --git a/maps/CeladonPokecenter1F.asm b/maps/CeladonPokecenter1F.asm index d476a6f03..8f0719d66 100644 --- a/maps/CeladonPokecenter1F.asm +++ b/maps/CeladonPokecenter1F.asm @@ -1,4 +1,4 @@ - const_def 2 ; object constants + object_const_def ; object_event constants const CELADONPOKECENTER1F_NURSE const CELADONPOKECENTER1F_GENTLEMAN const CELADONPOKECENTER1F_PHARMACIST diff --git a/maps/CeruleanCity.asm b/maps/CeruleanCity.asm index 38fdc9a41..989602102 100644 --- a/maps/CeruleanCity.asm +++ b/maps/CeruleanCity.asm @@ -1,4 +1,4 @@ - const_def 2 ; object constants + object_const_def ; object_event constants const CERULEANCITY_COOLTRAINER_M const CERULEANCITY_SUPER_NERD const CERULEANCITY_SLOWPOKE diff --git a/maps/CeruleanGym.asm b/maps/CeruleanGym.asm index 265d5472b..aa2fee465 100644 --- a/maps/CeruleanGym.asm +++ b/maps/CeruleanGym.asm @@ -1,4 +1,4 @@ - const_def 2 ; object constants + object_const_def ; object_event constants const CERULEANGYM_ROCKET const CERULEANGYM_MISTY const CERULEANGYM_SWIMMER_GIRL1 diff --git a/maps/CeruleanGymBadgeSpeechHouse.asm b/maps/CeruleanGymBadgeSpeechHouse.asm index 6d94bae06..33aad16b9 100644 --- a/maps/CeruleanGymBadgeSpeechHouse.asm +++ b/maps/CeruleanGymBadgeSpeechHouse.asm @@ -1,4 +1,4 @@ - const_def 2 ; object constants + object_const_def ; object_event constants const CERULEANGYMBADGESPEECHHOUSE_POKEFAN_M CeruleanGymBadgeSpeechHouse_MapScripts: diff --git a/maps/CeruleanMart.asm b/maps/CeruleanMart.asm index 6fd5c9b87..7d55c48b9 100644 --- a/maps/CeruleanMart.asm +++ b/maps/CeruleanMart.asm @@ -1,4 +1,4 @@ - const_def 2 ; object constants + object_const_def ; object_event constants const CERULEANMART_CLERK const CERULEANMART_COOLTRAINER_M const CERULEANMART_COOLTRAINER_F diff --git a/maps/CeruleanPokecenter1F.asm b/maps/CeruleanPokecenter1F.asm index c7bf9738e..3f62449b2 100644 --- a/maps/CeruleanPokecenter1F.asm +++ b/maps/CeruleanPokecenter1F.asm @@ -1,4 +1,4 @@ - const_def 2 ; object constants + object_const_def ; object_event constants const CERULEANPOKECENTER1F_NURSE const CERULEANPOKECENTER1F_SUPER_NERD const CERULEANPOKECENTER1F_GYM_GUY diff --git a/maps/CeruleanPoliceStation.asm b/maps/CeruleanPoliceStation.asm index 1c97dc0e5..507f0d5b0 100644 --- a/maps/CeruleanPoliceStation.asm +++ b/maps/CeruleanPoliceStation.asm @@ -1,4 +1,4 @@ - const_def 2 ; object constants + object_const_def ; object_event constants const CERULEANPOLICESTATION_FISHING_GURU const CERULEANPOLICESTATION_POKEFAN_F const CERULEANPOLICESTATION_DIGLETT diff --git a/maps/CeruleanTradeSpeechHouse.asm b/maps/CeruleanTradeSpeechHouse.asm index d1a3caea6..97ae15f7d 100644 --- a/maps/CeruleanTradeSpeechHouse.asm +++ b/maps/CeruleanTradeSpeechHouse.asm @@ -1,4 +1,4 @@ - const_def 2 ; object constants + object_const_def ; object_event constants const CERULEANTRADESPEECHHOUSE_GRANNY const CERULEANTRADESPEECHHOUSE_GRAMPS const CERULEANTRADESPEECHHOUSE_RHYDON diff --git a/maps/CharcoalKiln.asm b/maps/CharcoalKiln.asm index dda289377..9db4ac573 100644 --- a/maps/CharcoalKiln.asm +++ b/maps/CharcoalKiln.asm @@ -1,4 +1,4 @@ - const_def 2 ; object constants + object_const_def ; object_event constants const CHARCOALKILN_BLACK_BELT const CHARCOALKILN_YOUNGSTER const CHARCOALKILN_MOLTRES diff --git a/maps/CherrygroveCity.asm b/maps/CherrygroveCity.asm index 1ef3077e7..da8500eec 100644 --- a/maps/CherrygroveCity.asm +++ b/maps/CherrygroveCity.asm @@ -1,4 +1,4 @@ - const_def 2 ; object constants + object_const_def ; object_event constants const CHERRYGROVECITY_GRAMPS const CHERRYGROVECITY_SILVER const CHERRYGROVECITY_TEACHER diff --git a/maps/CherrygroveEvolutionSpeechHouse.asm b/maps/CherrygroveEvolutionSpeechHouse.asm index 78ea3fc6c..3612f3157 100644 --- a/maps/CherrygroveEvolutionSpeechHouse.asm +++ b/maps/CherrygroveEvolutionSpeechHouse.asm @@ -1,4 +1,4 @@ - const_def 2 ; object constants + object_const_def ; object_event constants const CHERRYGROVEEVOLUTIONSPEECHHOUSE_LASS const CHERRYGROVEEVOLUTIONSPEECHHOUSE_YOUNGSTER diff --git a/maps/CherrygroveGymSpeechHouse.asm b/maps/CherrygroveGymSpeechHouse.asm index 95aa6c91a..28bf6153c 100644 --- a/maps/CherrygroveGymSpeechHouse.asm +++ b/maps/CherrygroveGymSpeechHouse.asm @@ -1,4 +1,4 @@ - const_def 2 ; object constants + object_const_def ; object_event constants const CHERRYGROVEGYMSPEECHHOUSE_POKEFAN_M const CHERRYGROVEGYMSPEECHHOUSE_BUG_CATCHER diff --git a/maps/CherrygroveMart.asm b/maps/CherrygroveMart.asm index 366df35e7..601ff7534 100644 --- a/maps/CherrygroveMart.asm +++ b/maps/CherrygroveMart.asm @@ -1,4 +1,4 @@ - const_def 2 ; object constants + object_const_def ; object_event constants const CHERRYGROVEMART_CLERK const CHERRYGROVEMART_COOLTRAINER_M const CHERRYGROVEMART_YOUNGSTER diff --git a/maps/CherrygrovePokecenter1F.asm b/maps/CherrygrovePokecenter1F.asm index cfd02430b..60c6414ed 100644 --- a/maps/CherrygrovePokecenter1F.asm +++ b/maps/CherrygrovePokecenter1F.asm @@ -1,4 +1,4 @@ - const_def 2 ; object constants + object_const_def ; object_event constants const CHERRYGROVEPOKECENTER1F_NURSE const CHERRYGROVEPOKECENTER1F_FISHER const CHERRYGROVEPOKECENTER1F_GENTLEMAN diff --git a/maps/CianwoodCity.asm b/maps/CianwoodCity.asm index dfb743e2a..1feb8597c 100644 --- a/maps/CianwoodCity.asm +++ b/maps/CianwoodCity.asm @@ -1,4 +1,4 @@ - const_def 2 ; object constants + object_const_def ; object_event constants const CIANWOODCITY_STANDING_YOUNGSTER const CIANWOODCITY_POKEFAN_M const CIANWOODCITY_LASS diff --git a/maps/CianwoodGym.asm b/maps/CianwoodGym.asm index bd94710c6..6fcaa55e1 100644 --- a/maps/CianwoodGym.asm +++ b/maps/CianwoodGym.asm @@ -1,4 +1,4 @@ - const_def 2 ; object constants + object_const_def ; object_event constants const CIANWOODGYM_CHUCK const CIANWOODGYM_BLACK_BELT1 const CIANWOODGYM_BLACK_BELT2 diff --git a/maps/CianwoodLugiaSpeechHouse.asm b/maps/CianwoodLugiaSpeechHouse.asm index 8eb9bffaf..46b832ea7 100644 --- a/maps/CianwoodLugiaSpeechHouse.asm +++ b/maps/CianwoodLugiaSpeechHouse.asm @@ -1,4 +1,4 @@ - const_def 2 ; object constants + object_const_def ; object_event constants const CIANWOODLUGIASPEECHHOUSE_TEACHER const CIANWOODLUGIASPEECHHOUSE_LASS const CIANWOODLUGIASPEECHHOUSE_TWIN diff --git a/maps/CianwoodPharmacy.asm b/maps/CianwoodPharmacy.asm index ef00ba49d..367586179 100644 --- a/maps/CianwoodPharmacy.asm +++ b/maps/CianwoodPharmacy.asm @@ -1,4 +1,4 @@ - const_def 2 ; object constants + object_const_def ; object_event constants const CIANWOODPHARMACY_PHARMACIST CianwoodPharmacy_MapScripts: diff --git a/maps/CianwoodPhotoStudio.asm b/maps/CianwoodPhotoStudio.asm index d59df9b9c..2bbb623a6 100644 --- a/maps/CianwoodPhotoStudio.asm +++ b/maps/CianwoodPhotoStudio.asm @@ -1,4 +1,4 @@ - const_def 2 ; object constants + object_const_def ; object_event constants const CIANWOODPHOTOSTUDIO_FISHING_GURU CianwoodPhotoStudio_MapScripts: diff --git a/maps/CianwoodPokecenter1F.asm b/maps/CianwoodPokecenter1F.asm index e5bc22c37..f894fde75 100644 --- a/maps/CianwoodPokecenter1F.asm +++ b/maps/CianwoodPokecenter1F.asm @@ -1,4 +1,4 @@ - const_def 2 ; object constants + object_const_def ; object_event constants const CIANWOODPOKECENTER1F_NURSE const CIANWOODPOKECENTER1F_LASS const CIANWOODPOKECENTER1F_GYM_GUY diff --git a/maps/CinnabarIsland.asm b/maps/CinnabarIsland.asm index 54656768b..0cd60316b 100644 --- a/maps/CinnabarIsland.asm +++ b/maps/CinnabarIsland.asm @@ -1,4 +1,4 @@ - const_def 2 ; object constants + object_const_def ; object_event constants const CINNABARISLAND_BLUE CinnabarIsland_MapScripts: diff --git a/maps/CinnabarPokecenter1F.asm b/maps/CinnabarPokecenter1F.asm index 9100f73b4..f6ca9554c 100644 --- a/maps/CinnabarPokecenter1F.asm +++ b/maps/CinnabarPokecenter1F.asm @@ -1,4 +1,4 @@ - const_def 2 ; object constants + object_const_def ; object_event constants const CINNABARPOKECENTER1F_NURSE const CINNABARPOKECENTER1F_COOLTRAINER_F const CINNABARPOKECENTER1F_FISHER diff --git a/maps/Colosseum.asm b/maps/Colosseum.asm index 73c73ba93..3eac0765b 100644 --- a/maps/Colosseum.asm +++ b/maps/Colosseum.asm @@ -1,4 +1,4 @@ - const_def 2 ; object constants + object_const_def ; object_event constants const COLOSSEUM_CHRIS1 const COLOSSEUM_CHRIS2 diff --git a/maps/CopycatsHouse1F.asm b/maps/CopycatsHouse1F.asm index f35fa487d..0d0d9596d 100644 --- a/maps/CopycatsHouse1F.asm +++ b/maps/CopycatsHouse1F.asm @@ -1,4 +1,4 @@ - const_def 2 ; object constants + object_const_def ; object_event constants const COPYCATSHOUSE1F_POKEFAN_M const COPYCATSHOUSE1F_POKEFAN_F const COPYCATSHOUSE1F_CLEFAIRY diff --git a/maps/CopycatsHouse2F.asm b/maps/CopycatsHouse2F.asm index 3029ac6f5..a0ce78706 100644 --- a/maps/CopycatsHouse2F.asm +++ b/maps/CopycatsHouse2F.asm @@ -1,4 +1,4 @@ - const_def 2 ; object constants + object_const_def ; object_event constants const COPYCATSHOUSE2F_COPYCAT1 ; if player is male const COPYCATSHOUSE2F_DODRIO const COPYCATSHOUSE2F_FAIRYDOLL ; lost item diff --git a/maps/DanceTheatre.asm b/maps/DanceTheatre.asm index 9284eb271..f379488c6 100644 --- a/maps/DanceTheatre.asm +++ b/maps/DanceTheatre.asm @@ -1,4 +1,4 @@ - const_def 2 ; object constants + object_const_def ; object_event constants const DANCETHEATRE_KIMONO_GIRL1 const DANCETHEATRE_KIMONO_GIRL2 const DANCETHEATRE_KIMONO_GIRL3 diff --git a/maps/DarkCaveBlackthornEntrance.asm b/maps/DarkCaveBlackthornEntrance.asm index 84daa17de..b100b89ca 100644 --- a/maps/DarkCaveBlackthornEntrance.asm +++ b/maps/DarkCaveBlackthornEntrance.asm @@ -1,4 +1,4 @@ - const_def 2 ; object constants + object_const_def ; object_event constants const DARKCAVEBLACKTHORNENTRANCE_PHARMACIST const DARKCAVEBLACKTHORNENTRANCE_POKE_BALL1 const DARKCAVEBLACKTHORNENTRANCE_POKE_BALL2 diff --git a/maps/DarkCaveVioletEntrance.asm b/maps/DarkCaveVioletEntrance.asm index 10bbfb607..a5c6ecc33 100644 --- a/maps/DarkCaveVioletEntrance.asm +++ b/maps/DarkCaveVioletEntrance.asm @@ -1,4 +1,4 @@ - const_def 2 ; object constants + object_const_def ; object_event constants const DARKCAVEVIOLETENTRANCE_POKE_BALL1 const DARKCAVEVIOLETENTRANCE_ROCK1 const DARKCAVEVIOLETENTRANCE_ROCK2 diff --git a/maps/DayCare.asm b/maps/DayCare.asm index 7c6591184..bb5cf8bfe 100644 --- a/maps/DayCare.asm +++ b/maps/DayCare.asm @@ -1,4 +1,4 @@ - const_def 2 ; object constants + object_const_def ; object_event constants const DAYCARE_GRAMPS const DAYCARE_GRANNY diff --git a/maps/DayOfWeekSiblingsHouse.asm b/maps/DayOfWeekSiblingsHouse.asm index 73eca15d4..299e0e1c3 100644 --- a/maps/DayOfWeekSiblingsHouse.asm +++ b/maps/DayOfWeekSiblingsHouse.asm @@ -1,4 +1,4 @@ - const_def 2 ; object constants + object_const_def ; object_event constants const DAYOFWEEKSIBLINGSHOUSE_POKEDEX DayOfWeekSiblingsHouse_MapScripts: diff --git a/maps/DiglettsCave.asm b/maps/DiglettsCave.asm index 8475c1411..d77f3e8e4 100644 --- a/maps/DiglettsCave.asm +++ b/maps/DiglettsCave.asm @@ -1,4 +1,4 @@ - const_def 2 ; object constants + object_const_def ; object_event constants const DIGLETTSCAVE_POKEFAN_M DiglettsCave_MapScripts: diff --git a/maps/DragonShrine.asm b/maps/DragonShrine.asm index 8cfe9368a..b00feaad9 100644 --- a/maps/DragonShrine.asm +++ b/maps/DragonShrine.asm @@ -1,4 +1,4 @@ - const_def 2 ; object constants + object_const_def ; object_event constants const DRAGONSHRINE_ELDER1 const DRAGONSHRINE_ELDER2 const DRAGONSHRINE_ELDER3 diff --git a/maps/DragonsDenB1F.asm b/maps/DragonsDenB1F.asm index c4405842e..6a64b9a09 100644 --- a/maps/DragonsDenB1F.asm +++ b/maps/DragonsDenB1F.asm @@ -1,4 +1,4 @@ - const_def 2 ; object constants + object_const_def ; object_event constants const DRAGONSDENB1F_POKE_BALL1 const DRAGONSDENB1F_CLAIR const DRAGONSDENB1F_SILVER diff --git a/maps/EarlsPokemonAcademy.asm b/maps/EarlsPokemonAcademy.asm index eced6f751..e06ca993f 100644 --- a/maps/EarlsPokemonAcademy.asm +++ b/maps/EarlsPokemonAcademy.asm @@ -1,4 +1,4 @@ - const_def 2 ; object constants + object_const_def ; object_event constants const EARLSPOKEMONACADEMY_EARL const EARLSPOKEMONACADEMY_YOUNGSTER1 const EARLSPOKEMONACADEMY_GAMEBOY_KID1 diff --git a/maps/EcruteakCity.asm b/maps/EcruteakCity.asm index fdc2bba86..46acf910b 100644 --- a/maps/EcruteakCity.asm +++ b/maps/EcruteakCity.asm @@ -1,4 +1,4 @@ - const_def 2 ; object constants + object_const_def ; object_event constants const ECRUTEAKCITY_GRAMPS1 const ECRUTEAKCITY_GRAMPS2 const ECRUTEAKCITY_LASS1 diff --git a/maps/EcruteakGym.asm b/maps/EcruteakGym.asm index da7fcf5ea..5f8b16000 100644 --- a/maps/EcruteakGym.asm +++ b/maps/EcruteakGym.asm @@ -1,4 +1,4 @@ - const_def 2 ; object constants + object_const_def ; object_event constants const ECRUTEAKGYM_MORTY const ECRUTEAKGYM_SAGE1 const ECRUTEAKGYM_SAGE2 diff --git a/maps/EcruteakItemfinderHouse.asm b/maps/EcruteakItemfinderHouse.asm index 0ae99bd65..9d61a244f 100644 --- a/maps/EcruteakItemfinderHouse.asm +++ b/maps/EcruteakItemfinderHouse.asm @@ -1,4 +1,4 @@ - const_def 2 ; object constants + object_const_def ; object_event constants const ECRUTEAKITEMFINDERHOUSE_COOLTRAINER_M const ECRUTEAKITEMFINDERHOUSE_POKEDEX diff --git a/maps/EcruteakLugiaSpeechHouse.asm b/maps/EcruteakLugiaSpeechHouse.asm index 8b02bd15c..cd93d0d04 100644 --- a/maps/EcruteakLugiaSpeechHouse.asm +++ b/maps/EcruteakLugiaSpeechHouse.asm @@ -1,4 +1,4 @@ - const_def 2 ; object constants + object_const_def ; object_event constants const ECRUTEAKLUGIASPEECHHOUSE_GRAMPS const ECRUTEAKLUGIASPEECHHOUSE_YOUNGSTER diff --git a/maps/EcruteakMart.asm b/maps/EcruteakMart.asm index 13259932a..34cb3e60a 100644 --- a/maps/EcruteakMart.asm +++ b/maps/EcruteakMart.asm @@ -1,4 +1,4 @@ - const_def 2 ; object constants + object_const_def ; object_event constants const ECRUTEAKMART_CLERK const ECRUTEAKMART_SUPER_NERD const ECRUTEAKMART_GRANNY diff --git a/maps/EcruteakPokecenter1F.asm b/maps/EcruteakPokecenter1F.asm index 5f257606d..c6f6b6da2 100644 --- a/maps/EcruteakPokecenter1F.asm +++ b/maps/EcruteakPokecenter1F.asm @@ -1,4 +1,4 @@ - const_def 2 ; object constants + object_const_def ; object_event constants const ECRUTEAKPOKECENTER1F_NURSE const ECRUTEAKPOKECENTER1F_POKEFAN_M const ECRUTEAKPOKECENTER1F_COOLTRAINER_F diff --git a/maps/EcruteakTinTowerEntrance.asm b/maps/EcruteakTinTowerEntrance.asm index 8b58d49ee..812313d58 100644 --- a/maps/EcruteakTinTowerEntrance.asm +++ b/maps/EcruteakTinTowerEntrance.asm @@ -1,4 +1,4 @@ - const_def 2 ; object constants + object_const_def ; object_event constants const ECRUTEAKTINTOWERENTRANCE_SAGE1 const ECRUTEAKTINTOWERENTRANCE_SAGE2 const ECRUTEAKTINTOWERENTRANCE_SAGE3 diff --git a/maps/ElmsHouse.asm b/maps/ElmsHouse.asm index 544de62fb..a191cd820 100644 --- a/maps/ElmsHouse.asm +++ b/maps/ElmsHouse.asm @@ -1,4 +1,4 @@ - const_def 2 ; object constants + object_const_def ; object_event constants const ELMSHOUSE_ELMS_WIFE const ELMSHOUSE_ELMS_SON diff --git a/maps/ElmsLab.asm b/maps/ElmsLab.asm index 19221ee43..9dda3c0b5 100644 --- a/maps/ElmsLab.asm +++ b/maps/ElmsLab.asm @@ -1,4 +1,4 @@ - const_def 2 ; object constants + object_const_def ; object_event constants const ELMSLAB_ELM const ELMSLAB_ELMS_AIDE const ELMSLAB_POKE_BALL1 diff --git a/maps/FastShip1F.asm b/maps/FastShip1F.asm index 4862dfe5b..34cea5467 100644 --- a/maps/FastShip1F.asm +++ b/maps/FastShip1F.asm @@ -1,4 +1,4 @@ - const_def 2 ; object constants + object_const_def ; object_event constants const FASTSHIP1F_SAILOR1 const FASTSHIP1F_SAILOR2 const FASTSHIP1F_SAILOR3 diff --git a/maps/FastShipB1F.asm b/maps/FastShipB1F.asm index a8c1cafdd..ba0d10e82 100644 --- a/maps/FastShipB1F.asm +++ b/maps/FastShipB1F.asm @@ -1,4 +1,4 @@ - const_def 2 ; object constants + object_const_def ; object_event constants const FASTSHIPB1F_SAILOR1 const FASTSHIPB1F_SAILOR2 const FASTSHIPB1F_SAILOR3 diff --git a/maps/FastShipCabins_NNW_NNE_NE.asm b/maps/FastShipCabins_NNW_NNE_NE.asm index a277873c0..48aaf9d7b 100644 --- a/maps/FastShipCabins_NNW_NNE_NE.asm +++ b/maps/FastShipCabins_NNW_NNE_NE.asm @@ -1,4 +1,4 @@ - const_def 2 ; object constants + object_const_def ; object_event constants const FASTSHIPCABINS_NNW_NNE_NE_COOLTRAINER_M const FASTSHIPCABINS_NNW_NNE_NE_COOLTRAINER_F const FASTSHIPCABINS_NNW_NNE_NE_SUPER_NERD diff --git a/maps/FastShipCabins_SE_SSE_CaptainsCabin.asm b/maps/FastShipCabins_SE_SSE_CaptainsCabin.asm index b6820a64d..a21c8fbae 100644 --- a/maps/FastShipCabins_SE_SSE_CaptainsCabin.asm +++ b/maps/FastShipCabins_SE_SSE_CaptainsCabin.asm @@ -1,4 +1,4 @@ - const_def 2 ; object constants + object_const_def ; object_event constants const FASTSHIPCABINS_SE_SSE_CAPTAINSCABIN_CAPTAIN const FASTSHIPCABINS_SE_SSE_CAPTAINSCABIN_GENTLEMAN const FASTSHIPCABINS_SE_SSE_CAPTAINSCABIN_TWIN1 diff --git a/maps/FastShipCabins_SW_SSW_NW.asm b/maps/FastShipCabins_SW_SSW_NW.asm index 2d38d5439..955de02fb 100644 --- a/maps/FastShipCabins_SW_SSW_NW.asm +++ b/maps/FastShipCabins_SW_SSW_NW.asm @@ -1,4 +1,4 @@ - const_def 2 ; object constants + object_const_def ; object_event constants const FASTSHIPCABINS_SW_SSW_NW_FISHER const FASTSHIPCABINS_SW_SSW_NW_BUG_CATCHER const FASTSHIPCABINS_SW_SSW_NW_BUENA diff --git a/maps/FightingDojo.asm b/maps/FightingDojo.asm index e097febbe..7b81f5f4b 100644 --- a/maps/FightingDojo.asm +++ b/maps/FightingDojo.asm @@ -1,4 +1,4 @@ - const_def 2 ; object constants + object_const_def ; object_event constants const FIGHTINGDOJO_BLACK_BELT const FIGHTINGDOJO_POKE_BALL diff --git a/maps/FuchsiaCity.asm b/maps/FuchsiaCity.asm index 0d44b0e8f..e5a96e9f6 100644 --- a/maps/FuchsiaCity.asm +++ b/maps/FuchsiaCity.asm @@ -1,4 +1,4 @@ - const_def 2 ; object constants + object_const_def ; object_event constants const FUCHSIACITY_YOUNGSTER const FUCHSIACITY_POKEFAN_M const FUCHSIACITY_TEACHER diff --git a/maps/FuchsiaGym.asm b/maps/FuchsiaGym.asm index 508690617..cb60b9437 100644 --- a/maps/FuchsiaGym.asm +++ b/maps/FuchsiaGym.asm @@ -1,4 +1,4 @@ - const_def 2 ; object constants + object_const_def ; object_event constants const FUCHSIAGYM_JANINE const FUCHSIAGYM_FUCHSIA_GYM_1 const FUCHSIAGYM_FUCHSIA_GYM_2 diff --git a/maps/FuchsiaMart.asm b/maps/FuchsiaMart.asm index b57e8259d..413aed07f 100644 --- a/maps/FuchsiaMart.asm +++ b/maps/FuchsiaMart.asm @@ -1,4 +1,4 @@ - const_def 2 ; object constants + object_const_def ; object_event constants const FUCHSIAMART_CLERK const FUCHSIAMART_FISHER const FUCHSIAMART_COOLTRAINER_F diff --git a/maps/FuchsiaPokecenter1F.asm b/maps/FuchsiaPokecenter1F.asm index b05557046..8dad06da2 100644 --- a/maps/FuchsiaPokecenter1F.asm +++ b/maps/FuchsiaPokecenter1F.asm @@ -1,4 +1,4 @@ - const_def 2 ; object constants + object_const_def ; object_event constants const FUCHSIAPOKECENTER1F_NURSE const FUCHSIAPOKECENTER1F_COOLTRAINER_M const FUCHSIAPOKECENTER1F_COOLTRAINER_F diff --git a/maps/GoldenrodBikeShop.asm b/maps/GoldenrodBikeShop.asm index caf328d14..30505e399 100644 --- a/maps/GoldenrodBikeShop.asm +++ b/maps/GoldenrodBikeShop.asm @@ -1,4 +1,4 @@ - const_def 2 ; object constants + object_const_def ; object_event constants const GOLDENRODBIKESHOP_CLERK GoldenrodBikeShop_MapScripts: diff --git a/maps/GoldenrodCity.asm b/maps/GoldenrodCity.asm index 7af886437..ac4f23c17 100644 --- a/maps/GoldenrodCity.asm +++ b/maps/GoldenrodCity.asm @@ -1,4 +1,4 @@ - const_def 2 ; object constants + object_const_def ; object_event constants const GOLDENRODCITY_POKEFAN_M1 const GOLDENRODCITY_YOUNGSTER1 const GOLDENRODCITY_COOLTRAINER_F1 diff --git a/maps/GoldenrodDeptStore1F.asm b/maps/GoldenrodDeptStore1F.asm index 5877484be..608f96fb6 100644 --- a/maps/GoldenrodDeptStore1F.asm +++ b/maps/GoldenrodDeptStore1F.asm @@ -1,4 +1,4 @@ - const_def 2 ; object constants + object_const_def ; object_event constants const GOLDENRODDEPTSTORE1F_RECEPTIONIST const GOLDENRODDEPTSTORE1F_POKEFAN_F const GOLDENRODDEPTSTORE1F_BUG_CATCHER diff --git a/maps/GoldenrodDeptStore2F.asm b/maps/GoldenrodDeptStore2F.asm index 268deb3a0..819af5a83 100644 --- a/maps/GoldenrodDeptStore2F.asm +++ b/maps/GoldenrodDeptStore2F.asm @@ -1,4 +1,4 @@ - const_def 2 ; object constants + object_const_def ; object_event constants const GOLDENRODDEPTSTORE2F_CLERK1 const GOLDENRODDEPTSTORE2F_CLERK2 const GOLDENRODDEPTSTORE2F_YOUNGSTER diff --git a/maps/GoldenrodDeptStore3F.asm b/maps/GoldenrodDeptStore3F.asm index b4441f3e4..d76f87fa8 100644 --- a/maps/GoldenrodDeptStore3F.asm +++ b/maps/GoldenrodDeptStore3F.asm @@ -1,4 +1,4 @@ - const_def 2 ; object constants + object_const_def ; object_event constants const GOLDENRODDEPTSTORE3F_CLERK const GOLDENRODDEPTSTORE3F_SUPER_NERD const GOLDENRODDEPTSTORE3F_ROCKER diff --git a/maps/GoldenrodDeptStore4F.asm b/maps/GoldenrodDeptStore4F.asm index 895c8a4fe..655cfbbbf 100644 --- a/maps/GoldenrodDeptStore4F.asm +++ b/maps/GoldenrodDeptStore4F.asm @@ -1,4 +1,4 @@ - const_def 2 ; object constants + object_const_def ; object_event constants const GOLDENRODDEPTSTORE4F_CLERK const GOLDENRODDEPTSTORE4F_COOLTRAINER_M const GOLDENRODDEPTSTORE4F_BUG_CATCHER diff --git a/maps/GoldenrodDeptStore5F.asm b/maps/GoldenrodDeptStore5F.asm index f7405a3c7..0c7ca9b1d 100644 --- a/maps/GoldenrodDeptStore5F.asm +++ b/maps/GoldenrodDeptStore5F.asm @@ -1,4 +1,4 @@ - const_def 2 ; object constants + object_const_def ; object_event constants const GOLDENRODDEPTSTORE5F_CLERK const GOLDENRODDEPTSTORE5F_LASS const GOLDENRODDEPTSTORE5F_MIKE diff --git a/maps/GoldenrodDeptStore6F.asm b/maps/GoldenrodDeptStore6F.asm index e6a385f71..ecf3440b0 100644 --- a/maps/GoldenrodDeptStore6F.asm +++ b/maps/GoldenrodDeptStore6F.asm @@ -2,7 +2,7 @@ GOLDENRODDEPTSTORE6F_FRESH_WATER_PRICE EQU 200 GOLDENRODDEPTSTORE6F_SODA_POP_PRICE EQU 300 GOLDENRODDEPTSTORE6F_LEMONADE_PRICE EQU 350 - const_def 2 ; object constants + object_const_def ; object_event constants const GOLDENRODDEPTSTORE6F_LASS const GOLDENRODDEPTSTORE6F_SUPER_NERD diff --git a/maps/GoldenrodDeptStoreB1F.asm b/maps/GoldenrodDeptStoreB1F.asm index df78de7b6..29b394414 100644 --- a/maps/GoldenrodDeptStoreB1F.asm +++ b/maps/GoldenrodDeptStoreB1F.asm @@ -1,4 +1,4 @@ - const_def 2 ; object constants + object_const_def ; object_event constants const GOLDENRODDEPTSTOREB1F_POKE_BALL1 const GOLDENRODDEPTSTOREB1F_POKE_BALL2 const GOLDENRODDEPTSTOREB1F_POKE_BALL3 diff --git a/maps/GoldenrodDeptStoreRoof.asm b/maps/GoldenrodDeptStoreRoof.asm index 187d7b69b..26fd331c4 100644 --- a/maps/GoldenrodDeptStoreRoof.asm +++ b/maps/GoldenrodDeptStoreRoof.asm @@ -1,4 +1,4 @@ - const_def 2 ; object constants + object_const_def ; object_event constants const GOLDENRODDEPTSTOREROOF_CLERK const GOLDENRODDEPTSTOREROOF_POKEFAN_F const GOLDENRODDEPTSTOREROOF_FISHER diff --git a/maps/GoldenrodFlowerShop.asm b/maps/GoldenrodFlowerShop.asm index ea060d0d3..107db9e2d 100644 --- a/maps/GoldenrodFlowerShop.asm +++ b/maps/GoldenrodFlowerShop.asm @@ -1,4 +1,4 @@ - const_def 2 ; object constants + object_const_def ; object_event constants const GOLDENRODFLOWERSHOP_TEACHER const GOLDENRODFLOWERSHOP_FLORIA diff --git a/maps/GoldenrodGameCorner.asm b/maps/GoldenrodGameCorner.asm index 6dd9b6326..1381b22db 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 - const_def 2 ; object constants + object_const_def ; object_event constants const GOLDENRODGAMECORNER_CLERK const GOLDENRODGAMECORNER_RECEPTIONIST1 const GOLDENRODGAMECORNER_RECEPTIONIST2 diff --git a/maps/GoldenrodGym.asm b/maps/GoldenrodGym.asm index 5bd01a7e1..8d4f55fc6 100644 --- a/maps/GoldenrodGym.asm +++ b/maps/GoldenrodGym.asm @@ -1,4 +1,4 @@ - const_def 2 ; object constants + object_const_def ; object_event constants const GOLDENRODGYM_WHITNEY const GOLDENRODGYM_LASS1 const GOLDENRODGYM_LASS2 diff --git a/maps/GoldenrodHappinessRater.asm b/maps/GoldenrodHappinessRater.asm index ff5ef8a84..e28eef3e6 100644 --- a/maps/GoldenrodHappinessRater.asm +++ b/maps/GoldenrodHappinessRater.asm @@ -1,4 +1,4 @@ - const_def 2 ; object constants + object_const_def ; object_event constants const GOLDENRODHAPPINESSRATER_TEACHER const GOLDENRODHAPPINESSRATER_POKEFAN_M const GOLDENRODHAPPINESSRATER_TWIN diff --git a/maps/GoldenrodMagnetTrainStation.asm b/maps/GoldenrodMagnetTrainStation.asm index 5744e9bdb..b5b578d2b 100644 --- a/maps/GoldenrodMagnetTrainStation.asm +++ b/maps/GoldenrodMagnetTrainStation.asm @@ -1,4 +1,4 @@ - const_def 2 ; object constants + object_const_def ; object_event constants const GOLDENRODMAGNETTRAINSTATION_OFFICER const GOLDENRODMAGNETTRAINSTATION_GENTLEMAN diff --git a/maps/GoldenrodNameRater.asm b/maps/GoldenrodNameRater.asm index 16ffddb2c..a6f12354e 100644 --- a/maps/GoldenrodNameRater.asm +++ b/maps/GoldenrodNameRater.asm @@ -1,4 +1,4 @@ - const_def 2 ; object constants + object_const_def ; object_event constants const GOLDENRODNAMERATER_NAME_RATER GoldenrodNameRater_MapScripts: diff --git a/maps/GoldenrodPPSpeechHouse.asm b/maps/GoldenrodPPSpeechHouse.asm index 2f43993d1..fc6642707 100644 --- a/maps/GoldenrodPPSpeechHouse.asm +++ b/maps/GoldenrodPPSpeechHouse.asm @@ -1,4 +1,4 @@ - const_def 2 ; object constants + object_const_def ; object_event constants const GOLDENRODPPSPEECHHOUSE_FISHER const GOLDENRODPPSPEECHHOUSE_LASS diff --git a/maps/GoldenrodPokecenter1F.asm b/maps/GoldenrodPokecenter1F.asm index cb5cf9147..dc77dd57a 100644 --- a/maps/GoldenrodPokecenter1F.asm +++ b/maps/GoldenrodPokecenter1F.asm @@ -1,4 +1,4 @@ - const_def 2 ; object constants + object_const_def ; object_event constants const GOLDENRODPOKECENTER1F_NURSE const GOLDENRODPOKECENTER1F_LINK_RECEPTIONIST const GOLDENRODPOKECENTER1F_GAMEBOY_KID diff --git a/maps/GoldenrodUnderground.asm b/maps/GoldenrodUnderground.asm index 6eac61488..8cb5ea4f8 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 - const_def 2 ; object constants + object_const_def ; object_event constants const GOLDENRODUNDERGROUND_SUPER_NERD1 const GOLDENRODUNDERGROUND_SUPER_NERD2 const GOLDENRODUNDERGROUND_SUPER_NERD3 diff --git a/maps/GoldenrodUndergroundSwitchRoomEntrances.asm b/maps/GoldenrodUndergroundSwitchRoomEntrances.asm index 78aed50ce..50b1b03cb 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 - const_def 2 ; object constants + object_const_def ; object_event constants const GOLDENRODUNDERGROUNDSWITCHROOMENTRANCES_PHARMACIST1 const GOLDENRODUNDERGROUNDSWITCHROOMENTRANCES_PHARMACIST2 const GOLDENRODUNDERGROUNDSWITCHROOMENTRANCES_ROCKET1 diff --git a/maps/GoldenrodUndergroundWarehouse.asm b/maps/GoldenrodUndergroundWarehouse.asm index 0a87959fc..2ab8d8f4c 100644 --- a/maps/GoldenrodUndergroundWarehouse.asm +++ b/maps/GoldenrodUndergroundWarehouse.asm @@ -1,4 +1,4 @@ - const_def 2 ; object constants + object_const_def ; object_event constants const GOLDENRODUNDERGROUNDWAREHOUSE_ROCKET1 const GOLDENRODUNDERGROUNDWAREHOUSE_ROCKET2 const GOLDENRODUNDERGROUNDWAREHOUSE_ROCKET3 diff --git a/maps/GuideGentsHouse.asm b/maps/GuideGentsHouse.asm index 376aa0d0c..0fd391ce9 100644 --- a/maps/GuideGentsHouse.asm +++ b/maps/GuideGentsHouse.asm @@ -1,4 +1,4 @@ - const_def 2 ; object constants + object_const_def ; object_event constants const GUIDEGENTSHOUSE_GRAMPS GuideGentsHouse_MapScripts: diff --git a/maps/HallOfFame.asm b/maps/HallOfFame.asm index e2da3ecb0..e25576ad4 100644 --- a/maps/HallOfFame.asm +++ b/maps/HallOfFame.asm @@ -1,4 +1,4 @@ - const_def 2 ; object constants + object_const_def ; object_event constants const HALLOFFAME_LANCE HallOfFame_MapScripts: diff --git a/maps/IcePath1F.asm b/maps/IcePath1F.asm index 9650fd346..a0f02ff0c 100644 --- a/maps/IcePath1F.asm +++ b/maps/IcePath1F.asm @@ -1,4 +1,4 @@ - const_def 2 ; object constants + object_const_def ; object_event constants const ICEPATH1F_POKE_BALL1 const ICEPATH1F_POKE_BALL2 const ICEPATH1F_POKE_BALL3 diff --git a/maps/IcePathB1F.asm b/maps/IcePathB1F.asm index df07edfe6..d4590801b 100644 --- a/maps/IcePathB1F.asm +++ b/maps/IcePathB1F.asm @@ -1,4 +1,4 @@ - const_def 2 ; object constants + object_const_def ; object_event constants const ICEPATHB1F_BOULDER1 const ICEPATHB1F_BOULDER2 const ICEPATHB1F_BOULDER3 diff --git a/maps/IcePathB2FBlackthornSide.asm b/maps/IcePathB2FBlackthornSide.asm index 23ba93773..deb4f3cc5 100644 --- a/maps/IcePathB2FBlackthornSide.asm +++ b/maps/IcePathB2FBlackthornSide.asm @@ -1,4 +1,4 @@ - const_def 2 ; object constants + object_const_def ; object_event constants const ICEPATHB2FBLACKTHORNSIDE_POKE_BALL IcePathB2FBlackthornSide_MapScripts: diff --git a/maps/IcePathB2FMahoganySide.asm b/maps/IcePathB2FMahoganySide.asm index 86a706db8..c9a60a181 100644 --- a/maps/IcePathB2FMahoganySide.asm +++ b/maps/IcePathB2FMahoganySide.asm @@ -1,4 +1,4 @@ - const_def 2 ; object constants + object_const_def ; object_event constants const ICEPATHB2FMAHOGANYSIDE_BOULDER1 const ICEPATHB2FMAHOGANYSIDE_BOULDER2 const ICEPATHB2FMAHOGANYSIDE_BOULDER3 diff --git a/maps/IcePathB3F.asm b/maps/IcePathB3F.asm index 1130705af..c35fd4547 100644 --- a/maps/IcePathB3F.asm +++ b/maps/IcePathB3F.asm @@ -1,4 +1,4 @@ - const_def 2 ; object constants + object_const_def ; object_event constants const ICEPATHB3F_POKE_BALL const ICEPATHB3F_ROCK diff --git a/maps/IlexForest.asm b/maps/IlexForest.asm index 482965bbb..6dd338726 100644 --- a/maps/IlexForest.asm +++ b/maps/IlexForest.asm @@ -1,4 +1,4 @@ - const_def 2 ; object constants + object_const_def ; object_event constants const ILEXFOREST_FARFETCHD const ILEXFOREST_YOUNGSTER1 const ILEXFOREST_BLACK_BELT diff --git a/maps/IlexForestAzaleaGate.asm b/maps/IlexForestAzaleaGate.asm index 0e992960b..33f7bf9c1 100644 --- a/maps/IlexForestAzaleaGate.asm +++ b/maps/IlexForestAzaleaGate.asm @@ -1,4 +1,4 @@ - const_def 2 ; object constants + object_const_def ; object_event constants const ILEXFORESTAZALEAGATE_OFFICER const ILEXFORESTAZALEAGATE_GRANNY diff --git a/maps/IndigoPlateauPokecenter1F.asm b/maps/IndigoPlateauPokecenter1F.asm index c8fd52c46..c5cf3c57a 100644 --- a/maps/IndigoPlateauPokecenter1F.asm +++ b/maps/IndigoPlateauPokecenter1F.asm @@ -1,4 +1,4 @@ - const_def 2 ; object constants + object_const_def ; object_event constants const INDIGOPLATEAUPOKECENTER1F_NURSE const INDIGOPLATEAUPOKECENTER1F_CLERK const INDIGOPLATEAUPOKECENTER1F_COOLTRAINER_M diff --git a/maps/KarensRoom.asm b/maps/KarensRoom.asm index 772dfae8d..2586fc91a 100644 --- a/maps/KarensRoom.asm +++ b/maps/KarensRoom.asm @@ -1,4 +1,4 @@ - const_def 2 ; object constants + object_const_def ; object_event constants const KARENSROOM_KAREN KarensRoom_MapScripts: diff --git a/maps/KogasRoom.asm b/maps/KogasRoom.asm index 00b6d4ee0..866ac9b7b 100644 --- a/maps/KogasRoom.asm +++ b/maps/KogasRoom.asm @@ -1,4 +1,4 @@ - const_def 2 ; object constants + object_const_def ; object_event constants const KOGASROOM_KOGA KogasRoom_MapScripts: diff --git a/maps/KurtsHouse.asm b/maps/KurtsHouse.asm index 3fa4f295d..c430effcc 100644 --- a/maps/KurtsHouse.asm +++ b/maps/KurtsHouse.asm @@ -1,4 +1,4 @@ - const_def 2 ; object constants + object_const_def ; object_event constants const KURTSHOUSE_KURT1 const KURTSHOUSE_TWIN1 const KURTSHOUSE_SLOWPOKE diff --git a/maps/LakeOfRage.asm b/maps/LakeOfRage.asm index e9cf0689d..733d5e024 100644 --- a/maps/LakeOfRage.asm +++ b/maps/LakeOfRage.asm @@ -1,4 +1,4 @@ - const_def 2 ; object constants + object_const_def ; object_event constants const LAKEOFRAGE_LANCE const LAKEOFRAGE_GRAMPS const LAKEOFRAGE_SUPER_NERD1 diff --git a/maps/LakeOfRageHiddenPowerHouse.asm b/maps/LakeOfRageHiddenPowerHouse.asm index 177d7ea27..f8638064b 100644 --- a/maps/LakeOfRageHiddenPowerHouse.asm +++ b/maps/LakeOfRageHiddenPowerHouse.asm @@ -1,4 +1,4 @@ - const_def 2 ; object constants + object_const_def ; object_event constants const LAKEOFRAGEHIDDENPOWERHOUSE_FISHER LakeOfRageHiddenPowerHouse_MapScripts: diff --git a/maps/LakeOfRageMagikarpHouse.asm b/maps/LakeOfRageMagikarpHouse.asm index 60e078500..ab28fe24d 100644 --- a/maps/LakeOfRageMagikarpHouse.asm +++ b/maps/LakeOfRageMagikarpHouse.asm @@ -1,4 +1,4 @@ - const_def 2 ; object constants + object_const_def ; object_event constants const LAKEOFRAGEMAGIKARPHOUSE_FISHING_GURU LakeOfRageMagikarpHouse_MapScripts: diff --git a/maps/LancesRoom.asm b/maps/LancesRoom.asm index e0593d840..7a47c37d1 100644 --- a/maps/LancesRoom.asm +++ b/maps/LancesRoom.asm @@ -1,4 +1,4 @@ - const_def 2 ; object constants + object_const_def ; object_event constants const LANCESROOM_LANCE const LANCESROOM_MARY const LANCESROOM_OAK diff --git a/maps/LavRadioTower1F.asm b/maps/LavRadioTower1F.asm index 117a13c08..4a02115ec 100644 --- a/maps/LavRadioTower1F.asm +++ b/maps/LavRadioTower1F.asm @@ -1,4 +1,4 @@ - const_def 2 ; object constants + object_const_def ; object_event constants const LAVRADIOTOWER1F_RECEPTIONIST const LAVRADIOTOWER1F_OFFICER const LAVRADIOTOWER1F_SUPER_NERD1 diff --git a/maps/LavenderMart.asm b/maps/LavenderMart.asm index b5c3de66c..0ec281ed1 100644 --- a/maps/LavenderMart.asm +++ b/maps/LavenderMart.asm @@ -1,4 +1,4 @@ - const_def 2 ; object constants + object_const_def ; object_event constants const LAVENDERMART_CLERK const LAVENDERMART_POKEFAN_M const LAVENDERMART_ROCKER diff --git a/maps/LavenderNameRater.asm b/maps/LavenderNameRater.asm index 7d2b44c96..333011a58 100644 --- a/maps/LavenderNameRater.asm +++ b/maps/LavenderNameRater.asm @@ -1,4 +1,4 @@ - const_def 2 ; object constants + object_const_def ; object_event constants const LAVENDERNAMERATER_NAME_RATER LavenderNameRater_MapScripts: diff --git a/maps/LavenderPokecenter1F.asm b/maps/LavenderPokecenter1F.asm index 6031e9e80..eb448e86d 100644 --- a/maps/LavenderPokecenter1F.asm +++ b/maps/LavenderPokecenter1F.asm @@ -1,4 +1,4 @@ - const_def 2 ; object constants + object_const_def ; object_event constants const LAVENDERPOKECENTER1F_NURSE const LAVENDERPOKECENTER1F_GENTLEMAN const LAVENDERPOKECENTER1F_TEACHER diff --git a/maps/LavenderSpeechHouse.asm b/maps/LavenderSpeechHouse.asm index dd73aa81f..7d43c2b96 100644 --- a/maps/LavenderSpeechHouse.asm +++ b/maps/LavenderSpeechHouse.asm @@ -1,4 +1,4 @@ - const_def 2 ; object constants + object_const_def ; object_event constants const LAVENDERSPEECHHOUSE_POKEFAN_F LavenderSpeechHouse_MapScripts: diff --git a/maps/LavenderTown.asm b/maps/LavenderTown.asm index 9aeec7ab9..5beb0fec1 100644 --- a/maps/LavenderTown.asm +++ b/maps/LavenderTown.asm @@ -1,4 +1,4 @@ - const_def 2 ; object constants + object_const_def ; object_event constants const LAVENDERTOWN_POKEFAN_M const LAVENDERTOWN_TEACHER const LAVENDERTOWN_GRAMPS diff --git a/maps/MahoganyGym.asm b/maps/MahoganyGym.asm index 6f30b15d8..2af44e820 100644 --- a/maps/MahoganyGym.asm +++ b/maps/MahoganyGym.asm @@ -1,4 +1,4 @@ - const_def 2 ; object constants + object_const_def ; object_event constants const MAHOGANYGYM_PRYCE const MAHOGANYGYM_BUENA1 const MAHOGANYGYM_ROCKER1 diff --git a/maps/MahoganyMart1F.asm b/maps/MahoganyMart1F.asm index ffb513a62..d63430709 100644 --- a/maps/MahoganyMart1F.asm +++ b/maps/MahoganyMart1F.asm @@ -1,4 +1,4 @@ - const_def 2 ; object constants + object_const_def ; object_event constants const MAHOGANYMART1F_PHARMACIST const MAHOGANYMART1F_BLACK_BELT const MAHOGANYMART1F_LANCE diff --git a/maps/MahoganyPokecenter1F.asm b/maps/MahoganyPokecenter1F.asm index caad5e049..8e5666c86 100644 --- a/maps/MahoganyPokecenter1F.asm +++ b/maps/MahoganyPokecenter1F.asm @@ -1,4 +1,4 @@ - const_def 2 ; object constants + object_const_def ; object_event constants const MAHOGANYPOKECENTER1F_NURSE const MAHOGANYPOKECENTER1F_POKEFAN_M const MAHOGANYPOKECENTER1F_YOUNGSTER diff --git a/maps/MahoganyRedGyaradosSpeechHouse.asm b/maps/MahoganyRedGyaradosSpeechHouse.asm index 5984c89fb..71c1aa5a2 100644 --- a/maps/MahoganyRedGyaradosSpeechHouse.asm +++ b/maps/MahoganyRedGyaradosSpeechHouse.asm @@ -1,4 +1,4 @@ - const_def 2 ; object constants + object_const_def ; object_event constants const MAHOGANYREDGYARADOSSPEECHHOUSE_BLACK_BELT const MAHOGANYREDGYARADOSSPEECHHOUSE_TEACHER diff --git a/maps/MahoganyTown.asm b/maps/MahoganyTown.asm index bf28e5ad0..762b7e59c 100644 --- a/maps/MahoganyTown.asm +++ b/maps/MahoganyTown.asm @@ -1,6 +1,6 @@ MAHOGANYTOWN_RAGECANDYBAR_PRICE EQU 300 - const_def 2 ; object constants + object_const_def ; object_event constants const MAHOGANYTOWN_POKEFAN_M const MAHOGANYTOWN_GRAMPS const MAHOGANYTOWN_FISHER diff --git a/maps/ManiasHouse.asm b/maps/ManiasHouse.asm index 1a70e9606..830ecb884 100644 --- a/maps/ManiasHouse.asm +++ b/maps/ManiasHouse.asm @@ -1,4 +1,4 @@ - const_def 2 ; object constants + object_const_def ; object_event constants const MANIASHOUSE_ROCKER ManiasHouse_MapScripts: diff --git a/maps/MountMoon.asm b/maps/MountMoon.asm index 7bbcbabdd..c0c5df796 100644 --- a/maps/MountMoon.asm +++ b/maps/MountMoon.asm @@ -1,4 +1,4 @@ - const_def 2 ; object constants + object_const_def ; object_event constants const MOUNTMOON_SILVER MountMoon_MapScripts: diff --git a/maps/MountMoonGiftShop.asm b/maps/MountMoonGiftShop.asm index 54616ea17..01b881f84 100644 --- a/maps/MountMoonGiftShop.asm +++ b/maps/MountMoonGiftShop.asm @@ -1,4 +1,4 @@ - const_def 2 ; object constants + object_const_def ; object_event constants const MOUNTMOONGIFTSHOP_GRAMPS1 ; morning only const MOUNTMOONGIFTSHOP_GRAMPS2 ; day only const MOUNTMOONGIFTSHOP_LASS1 ; morning only diff --git a/maps/MountMoonSquare.asm b/maps/MountMoonSquare.asm index 71bd14204..8d601fd71 100644 --- a/maps/MountMoonSquare.asm +++ b/maps/MountMoonSquare.asm @@ -1,4 +1,4 @@ - const_def 2 ; object constants + object_const_def ; object_event constants const MOUNTMOONSQUARE_FAIRY1 const MOUNTMOONSQUARE_FAIRY2 const MOUNTMOONSQUARE_ROCK diff --git a/maps/MountMortar1FInside.asm b/maps/MountMortar1FInside.asm index 05b39101e..a92612147 100644 --- a/maps/MountMortar1FInside.asm +++ b/maps/MountMortar1FInside.asm @@ -1,4 +1,4 @@ - const_def 2 ; object constants + object_const_def ; object_event constants const MOUNTMORTAR1FINSIDE_BOULDER const MOUNTMORTAR1FINSIDE_POKE_BALL1 const MOUNTMORTAR1FINSIDE_POKE_BALL2 diff --git a/maps/MountMortar1FOutside.asm b/maps/MountMortar1FOutside.asm index eded2353c..c3f99274a 100644 --- a/maps/MountMortar1FOutside.asm +++ b/maps/MountMortar1FOutside.asm @@ -1,4 +1,4 @@ - const_def 2 ; object constants + object_const_def ; object_event constants const MOUNTMORTAR1FOUTSIDE_POKE_BALL1 const MOUNTMORTAR1FOUTSIDE_POKE_BALL2 diff --git a/maps/MountMortar2FInside.asm b/maps/MountMortar2FInside.asm index a81f77697..a293ea430 100644 --- a/maps/MountMortar2FInside.asm +++ b/maps/MountMortar2FInside.asm @@ -1,4 +1,4 @@ - const_def 2 ; object constants + object_const_def ; object_event constants const MOUNTMORTAR2FINSIDE_POKE_BALL1 const MOUNTMORTAR2FINSIDE_POKE_BALL2 const MOUNTMORTAR2FINSIDE_POKE_BALL3 diff --git a/maps/MountMortarB1F.asm b/maps/MountMortarB1F.asm index c16b9faea..25ffc862f 100644 --- a/maps/MountMortarB1F.asm +++ b/maps/MountMortarB1F.asm @@ -1,4 +1,4 @@ - const_def 2 ; object constants + object_const_def ; object_event constants const MOUNTMORTARB1F_POKE_BALL1 const MOUNTMORTARB1F_POKE_BALL2 const MOUNTMORTARB1F_BOULDER diff --git a/maps/MoveDeletersHouse.asm b/maps/MoveDeletersHouse.asm index e382cf226..3fe4d378c 100644 --- a/maps/MoveDeletersHouse.asm +++ b/maps/MoveDeletersHouse.asm @@ -1,4 +1,4 @@ - const_def 2 ; object constants + object_const_def ; object_event constants const MOVEDELETERSHOUSE_SUPER_NERD MoveDeletersHouse_MapScripts: diff --git a/maps/MrFujisHouse.asm b/maps/MrFujisHouse.asm index 4396e707d..d1edd1581 100644 --- a/maps/MrFujisHouse.asm +++ b/maps/MrFujisHouse.asm @@ -1,4 +1,4 @@ - const_def 2 ; object constants + object_const_def ; object_event constants const MRFUJISHOUSE_SUPER_NERD const MRFUJISHOUSE_LASS const MRFUJISHOUSE_PSYDUCK diff --git a/maps/MrPokemonsHouse.asm b/maps/MrPokemonsHouse.asm index 0aa7e5714..a0f9db039 100644 --- a/maps/MrPokemonsHouse.asm +++ b/maps/MrPokemonsHouse.asm @@ -1,4 +1,4 @@ - const_def 2 ; object constants + object_const_def ; object_event constants const MRPOKEMONSHOUSE_GENTLEMAN const MRPOKEMONSHOUSE_OAK diff --git a/maps/MrPsychicsHouse.asm b/maps/MrPsychicsHouse.asm index c5121e247..754e6cca5 100644 --- a/maps/MrPsychicsHouse.asm +++ b/maps/MrPsychicsHouse.asm @@ -1,4 +1,4 @@ - const_def 2 ; object constants + object_const_def ; object_event constants const MRPSYCHICSHOUSE_FISHING_GURU MrPsychicsHouse_MapScripts: diff --git a/maps/NationalPark.asm b/maps/NationalPark.asm index bd1b9b8b6..b4fc2aff8 100644 --- a/maps/NationalPark.asm +++ b/maps/NationalPark.asm @@ -1,4 +1,4 @@ - const_def 2 ; object constants + object_const_def ; object_event constants const NATIONALPARK_LASS1 const NATIONALPARK_POKEFAN_F1 const NATIONALPARK_TEACHER1 diff --git a/maps/NationalParkBugContest.asm b/maps/NationalParkBugContest.asm index 75623e360..2a234d7cc 100644 --- a/maps/NationalParkBugContest.asm +++ b/maps/NationalParkBugContest.asm @@ -1,4 +1,4 @@ - const_def 2 ; object constants + object_const_def ; object_event constants const NATIONALPARKBUGCONTEST_YOUNGSTER1 const NATIONALPARKBUGCONTEST_YOUNGSTER2 const NATIONALPARKBUGCONTEST_ROCKER diff --git a/maps/NewBarkTown.asm b/maps/NewBarkTown.asm index d5d337455..994c5ee6e 100644 --- a/maps/NewBarkTown.asm +++ b/maps/NewBarkTown.asm @@ -1,4 +1,4 @@ - const_def 2 ; object constants + object_const_def ; object_event constants const NEWBARKTOWN_TEACHER const NEWBARKTOWN_FISHER const NEWBARKTOWN_SILVER diff --git a/maps/OaksLab.asm b/maps/OaksLab.asm index 89b819b41..18f09b030 100644 --- a/maps/OaksLab.asm +++ b/maps/OaksLab.asm @@ -1,4 +1,4 @@ - const_def 2 ; object constants + object_const_def ; object_event constants const OAKSLAB_OAK const OAKSLAB_SCIENTIST1 const OAKSLAB_SCIENTIST2 diff --git a/maps/OlivineCafe.asm b/maps/OlivineCafe.asm index 0a4d66c77..9659c0d58 100644 --- a/maps/OlivineCafe.asm +++ b/maps/OlivineCafe.asm @@ -1,4 +1,4 @@ - const_def 2 ; object constants + object_const_def ; object_event constants const OLIVINECAFE_SAILOR1 const OLIVINECAFE_FISHING_GURU const OLIVINECAFE_SAILOR2 diff --git a/maps/OlivineCity.asm b/maps/OlivineCity.asm index 03d0cf7c2..c8f4bb846 100644 --- a/maps/OlivineCity.asm +++ b/maps/OlivineCity.asm @@ -1,4 +1,4 @@ - const_def 2 ; object constants + object_const_def ; object_event constants const OLIVINECITY_SAILOR1 const OLIVINECITY_STANDING_YOUNGSTER const OLIVINECITY_SAILOR2 diff --git a/maps/OlivineGoodRodHouse.asm b/maps/OlivineGoodRodHouse.asm index 67acb021c..bd7165e7b 100644 --- a/maps/OlivineGoodRodHouse.asm +++ b/maps/OlivineGoodRodHouse.asm @@ -1,4 +1,4 @@ - const_def 2 ; object constants + object_const_def ; object_event constants const OLIVINEGOODRODHOUSE_FISHING_GURU OlivineGoodRodHouse_MapScripts: diff --git a/maps/OlivineGym.asm b/maps/OlivineGym.asm index 27f912594..7e120dba5 100644 --- a/maps/OlivineGym.asm +++ b/maps/OlivineGym.asm @@ -1,4 +1,4 @@ - const_def 2 ; object constants + object_const_def ; object_event constants const OLIVINEGYM_JASMINE const OLIVINEGYM_GYM_GUY diff --git a/maps/OlivineHouseBeta.asm b/maps/OlivineHouseBeta.asm index 2570de372..57709db7b 100644 --- a/maps/OlivineHouseBeta.asm +++ b/maps/OlivineHouseBeta.asm @@ -1,4 +1,4 @@ - const_def 2 ; object constants + object_const_def ; object_event constants const OLIVINEHOUSEBETA_TEACHER const OLIVINEHOUSEBETA_RHYDON diff --git a/maps/OlivineLighthouse1F.asm b/maps/OlivineLighthouse1F.asm index f411731e5..6e1a2c728 100644 --- a/maps/OlivineLighthouse1F.asm +++ b/maps/OlivineLighthouse1F.asm @@ -1,4 +1,4 @@ - const_def 2 ; object constants + object_const_def ; object_event constants const OLIVINELIGHTHOUSE1F_SAILOR const OLIVINELIGHTHOUSE1F_POKEFAN_F diff --git a/maps/OlivineLighthouse2F.asm b/maps/OlivineLighthouse2F.asm index 989eb1585..b1a718fd0 100644 --- a/maps/OlivineLighthouse2F.asm +++ b/maps/OlivineLighthouse2F.asm @@ -1,4 +1,4 @@ - const_def 2 ; object constants + object_const_def ; object_event constants const OLIVINELIGHTHOUSE2F_SAILOR const OLIVINELIGHTHOUSE2F_GENTLEMAN diff --git a/maps/OlivineLighthouse3F.asm b/maps/OlivineLighthouse3F.asm index 53b2c5914..3d71124f2 100644 --- a/maps/OlivineLighthouse3F.asm +++ b/maps/OlivineLighthouse3F.asm @@ -1,4 +1,4 @@ - const_def 2 ; object constants + object_const_def ; object_event constants const OLIVINELIGHTHOUSE3F_SAILOR const OLIVINELIGHTHOUSE3F_GENTLEMAN const OLIVINELIGHTHOUSE3F_YOUNGSTER diff --git a/maps/OlivineLighthouse4F.asm b/maps/OlivineLighthouse4F.asm index 50a4d17fc..6d74f53f6 100644 --- a/maps/OlivineLighthouse4F.asm +++ b/maps/OlivineLighthouse4F.asm @@ -1,4 +1,4 @@ - const_def 2 ; object constants + object_const_def ; object_event constants const OLIVINELIGHTHOUSE4F_SAILOR const OLIVINELIGHTHOUSE4F_LASS diff --git a/maps/OlivineLighthouse5F.asm b/maps/OlivineLighthouse5F.asm index 84e5948b6..7a3cfdf86 100644 --- a/maps/OlivineLighthouse5F.asm +++ b/maps/OlivineLighthouse5F.asm @@ -1,4 +1,4 @@ - const_def 2 ; object constants + object_const_def ; object_event constants const OLIVINELIGHTHOUSE5F_SAILOR const OLIVINELIGHTHOUSE5F_YOUNGSTER const OLIVINELIGHTHOUSE5F_POKE_BALL1 diff --git a/maps/OlivineLighthouse6F.asm b/maps/OlivineLighthouse6F.asm index c7c545af8..2eee5f962 100644 --- a/maps/OlivineLighthouse6F.asm +++ b/maps/OlivineLighthouse6F.asm @@ -1,4 +1,4 @@ - const_def 2 ; object constants + object_const_def ; object_event constants const OLIVINELIGHTHOUSE6F_JASMINE const OLIVINELIGHTHOUSE6F_MONSTER const OLIVINELIGHTHOUSE6F_POKE_BALL diff --git a/maps/OlivineMart.asm b/maps/OlivineMart.asm index f06aeebd4..3f331f77a 100644 --- a/maps/OlivineMart.asm +++ b/maps/OlivineMart.asm @@ -1,4 +1,4 @@ - const_def 2 ; object constants + object_const_def ; object_event constants const OLIVINEMART_CLERK const OLIVINEMART_COOLTRAINER_F const OLIVINEMART_LASS diff --git a/maps/OlivinePokecenter1F.asm b/maps/OlivinePokecenter1F.asm index c1acd0fac..8e9ef8ec6 100644 --- a/maps/OlivinePokecenter1F.asm +++ b/maps/OlivinePokecenter1F.asm @@ -1,4 +1,4 @@ - const_def 2 ; object constants + object_const_def ; object_event constants const OLIVINEPOKECENTER1F_NURSE const OLIVINEPOKECENTER1F_FISHING_GURU const OLIVINEPOKECENTER1F_FISHER diff --git a/maps/OlivinePort.asm b/maps/OlivinePort.asm index 55e32bbe9..1cb28288a 100644 --- a/maps/OlivinePort.asm +++ b/maps/OlivinePort.asm @@ -1,4 +1,4 @@ - const_def 2 ; object constants + object_const_def ; object_event constants const OLIVINEPORT_SAILOR1 const OLIVINEPORT_SAILOR2 const OLIVINEPORT_SAILOR3 diff --git a/maps/OlivinePortPassage.asm b/maps/OlivinePortPassage.asm index 98040307f..a92b5d459 100644 --- a/maps/OlivinePortPassage.asm +++ b/maps/OlivinePortPassage.asm @@ -1,4 +1,4 @@ - const_def 2 ; object constants + object_const_def ; object_event constants const OLIVINEPORTPASSAGE_POKEFAN_M OlivinePortPassage_MapScripts: diff --git a/maps/OlivinePunishmentSpeechHouse.asm b/maps/OlivinePunishmentSpeechHouse.asm index e590f158d..c5309674e 100644 --- a/maps/OlivinePunishmentSpeechHouse.asm +++ b/maps/OlivinePunishmentSpeechHouse.asm @@ -1,4 +1,4 @@ - const_def 2 ; object constants + object_const_def ; object_event constants const OLIVINEPUNISHMENTSPEECHHOUSE_POKEFAN_M const OLIVINEPUNISHMENTSPEECHHOUSE_LASS diff --git a/maps/OlivineTimsHouse.asm b/maps/OlivineTimsHouse.asm index 60263cf3c..aaa0689eb 100644 --- a/maps/OlivineTimsHouse.asm +++ b/maps/OlivineTimsHouse.asm @@ -1,4 +1,4 @@ - const_def 2 ; object constants + object_const_def ; object_event constants const OLIVINETIMSHOUSE_TIM OlivineTimsHouse_MapScripts: diff --git a/maps/PalletTown.asm b/maps/PalletTown.asm index 0bc820103..9907e719b 100644 --- a/maps/PalletTown.asm +++ b/maps/PalletTown.asm @@ -1,4 +1,4 @@ - const_def 2 ; object constants + object_const_def ; object_event constants const PALLETTOWN_TEACHER const PALLETTOWN_FISHER diff --git a/maps/PewterCity.asm b/maps/PewterCity.asm index 0a994ebbf..3afe7a5f3 100644 --- a/maps/PewterCity.asm +++ b/maps/PewterCity.asm @@ -1,4 +1,4 @@ - const_def 2 ; object constants + object_const_def ; object_event constants const PEWTERCITY_COOLTRAINER_F const PEWTERCITY_BUG_CATCHER const PEWTERCITY_GRAMPS diff --git a/maps/PewterGym.asm b/maps/PewterGym.asm index 64773c8f4..cb0f52fef 100644 --- a/maps/PewterGym.asm +++ b/maps/PewterGym.asm @@ -1,4 +1,4 @@ - const_def 2 ; object constants + object_const_def ; object_event constants const PEWTERGYM_BROCK const PEWTERGYM_YOUNGSTER const PEWTERGYM_GYM_GUY diff --git a/maps/PewterMart.asm b/maps/PewterMart.asm index ad6df1593..26fe796e1 100644 --- a/maps/PewterMart.asm +++ b/maps/PewterMart.asm @@ -1,4 +1,4 @@ - const_def 2 ; object constants + object_const_def ; object_event constants const PEWTERMART_CLERK const PEWTERMART_YOUNGSTER const PEWTERMART_SUPER_NERD diff --git a/maps/PewterNidoranSpeechHouse.asm b/maps/PewterNidoranSpeechHouse.asm index cf90488be..b9376def4 100644 --- a/maps/PewterNidoranSpeechHouse.asm +++ b/maps/PewterNidoranSpeechHouse.asm @@ -1,4 +1,4 @@ - const_def 2 ; object constants + object_const_def ; object_event constants const PEWTERNIDORANSPEECHHOUSE_SUPER_NERD const PEWTERNIDORANSPEECHHOUSE_NIDORAN_M diff --git a/maps/PewterPokecenter1F.asm b/maps/PewterPokecenter1F.asm index 3ec7bf91f..ddc053acc 100644 --- a/maps/PewterPokecenter1F.asm +++ b/maps/PewterPokecenter1F.asm @@ -1,4 +1,4 @@ - const_def 2 ; object constants + object_const_def ; object_event constants const PEWTERPOKECENTER1F_NURSE const PEWTERPOKECENTER1F_TEACHER const PEWTERPOKECENTER1F_JIGGLYPUFF diff --git a/maps/PewterSnoozeSpeechHouse.asm b/maps/PewterSnoozeSpeechHouse.asm index 61a96a50f..f8d8fd082 100644 --- a/maps/PewterSnoozeSpeechHouse.asm +++ b/maps/PewterSnoozeSpeechHouse.asm @@ -1,4 +1,4 @@ - const_def 2 ; object constants + object_const_def ; object_event constants const PEWTERSNOOZESPEECHHOUSE_GRAMPS PewterSnoozeSpeechHouse_MapScripts: diff --git a/maps/PlayersHouse1F.asm b/maps/PlayersHouse1F.asm index 8d5703829..b77cc011e 100644 --- a/maps/PlayersHouse1F.asm +++ b/maps/PlayersHouse1F.asm @@ -1,4 +1,4 @@ - const_def 2 ; object constants + object_const_def ; object_event constants const PLAYERSHOUSE1F_MOM1 const PLAYERSHOUSE1F_MOM2 const PLAYERSHOUSE1F_MOM3 diff --git a/maps/PlayersHouse2F.asm b/maps/PlayersHouse2F.asm index a5c03a749..632fa1a33 100644 --- a/maps/PlayersHouse2F.asm +++ b/maps/PlayersHouse2F.asm @@ -1,4 +1,4 @@ - const_def 2 ; object constants + object_const_def ; object_event constants const PLAYERSHOUSE2F_CONSOLE const PLAYERSHOUSE2F_DOLL_1 const PLAYERSHOUSE2F_DOLL_2 diff --git a/maps/PlayersNeighborsHouse.asm b/maps/PlayersNeighborsHouse.asm index 84400b09e..9122c29ef 100644 --- a/maps/PlayersNeighborsHouse.asm +++ b/maps/PlayersNeighborsHouse.asm @@ -1,4 +1,4 @@ - const_def 2 ; object constants + object_const_def ; object_event constants const PLAYERSNEIGHBORSHOUSE_COOLTRAINER_F const PLAYERSNEIGHBORSHOUSE_POKEFAN_F diff --git a/maps/PokeSeersHouse.asm b/maps/PokeSeersHouse.asm index 05d2f9779..7bd18f97e 100644 --- a/maps/PokeSeersHouse.asm +++ b/maps/PokeSeersHouse.asm @@ -1,4 +1,4 @@ - const_def 2 ; object constants + object_const_def ; object_event constants const POKESEERSHOUSE_GRANNY PokeSeersHouse_MapScripts: diff --git a/maps/Pokecenter2F.asm b/maps/Pokecenter2F.asm index b79d251d0..7dc6f32ac 100644 --- a/maps/Pokecenter2F.asm +++ b/maps/Pokecenter2F.asm @@ -1,4 +1,4 @@ - const_def 2 ; object constants + object_const_def ; object_event constants const POKECENTER2F_TRADE_RECEPTIONIST const POKECENTER2F_BATTLE_RECEPTIONIST const POKECENTER2F_TIME_CAPSULE_RECEPTIONIST diff --git a/maps/PokecomCenterAdminOfficeMobile.asm b/maps/PokecomCenterAdminOfficeMobile.asm index 17de08252..c6c815ab2 100644 --- a/maps/PokecomCenterAdminOfficeMobile.asm +++ b/maps/PokecomCenterAdminOfficeMobile.asm @@ -1,4 +1,4 @@ - const_def 2 ; object constants + object_const_def ; object_event constants const POKECOMCENTERADMINOFFICEMOBILE_SCIENTIST1 const POKECOMCENTERADMINOFFICEMOBILE_SCIENTIST2 const POKECOMCENTERADMINOFFICEMOBILE_SCIENTIST3 diff --git a/maps/PokemonFanClub.asm b/maps/PokemonFanClub.asm index 004122b69..343f9bb35 100644 --- a/maps/PokemonFanClub.asm +++ b/maps/PokemonFanClub.asm @@ -1,4 +1,4 @@ - const_def 2 ; object constants + object_const_def ; object_event constants const POKEMONFANCLUB_GENTLEMAN const POKEMONFANCLUB_RECEPTIONIST const POKEMONFANCLUB_FISHER diff --git a/maps/PowerPlant.asm b/maps/PowerPlant.asm index 3678d5dfa..f5cb0d80c 100644 --- a/maps/PowerPlant.asm +++ b/maps/PowerPlant.asm @@ -1,4 +1,4 @@ - const_def 2 ; object constants + object_const_def ; object_event constants const POWERPLANT_OFFICER1 const POWERPLANT_GYM_GUY1 const POWERPLANT_GYM_GUY2 diff --git a/maps/RadioTower1F.asm b/maps/RadioTower1F.asm index ea2f81df4..06977b28c 100644 --- a/maps/RadioTower1F.asm +++ b/maps/RadioTower1F.asm @@ -1,4 +1,4 @@ - const_def 2 ; object constants + object_const_def ; object_event constants const RADIOTOWER1F_RECEPTIONIST const RADIOTOWER1F_LASS const RADIOTOWER1F_YOUNGSTER diff --git a/maps/RadioTower2F.asm b/maps/RadioTower2F.asm index 629dd9a59..95a84e387 100644 --- a/maps/RadioTower2F.asm +++ b/maps/RadioTower2F.asm @@ -1,4 +1,4 @@ - const_def 2 ; object constants + object_const_def ; object_event constants const RADIOTOWER2F_SUPER_NERD const RADIOTOWER2F_TEACHER const RADIOTOWER2F_ROCKET1 diff --git a/maps/RadioTower3F.asm b/maps/RadioTower3F.asm index baa8d1b97..35df92976 100644 --- a/maps/RadioTower3F.asm +++ b/maps/RadioTower3F.asm @@ -1,4 +1,4 @@ - const_def 2 ; object constants + object_const_def ; object_event constants const RADIOTOWER3F_SUPER_NERD const RADIOTOWER3F_GYM_GUY const RADIOTOWER3F_COOLTRAINER_F diff --git a/maps/RadioTower4F.asm b/maps/RadioTower4F.asm index 87efe0b23..2e7c944d8 100644 --- a/maps/RadioTower4F.asm +++ b/maps/RadioTower4F.asm @@ -1,4 +1,4 @@ - const_def 2 ; object constants + object_const_def ; object_event constants const RADIOTOWER4F_FISHER const RADIOTOWER4F_TEACHER const RADIOTOWER4F_GROWLITHE diff --git a/maps/RadioTower5F.asm b/maps/RadioTower5F.asm index fb4c16d75..7e85f7dbe 100644 --- a/maps/RadioTower5F.asm +++ b/maps/RadioTower5F.asm @@ -1,4 +1,4 @@ - const_def 2 ; object constants + object_const_def ; object_event constants const RADIOTOWER5F_DIRECTOR const RADIOTOWER5F_ROCKET const RADIOTOWER5F_ROCKET_GIRL diff --git a/maps/RedsHouse1F.asm b/maps/RedsHouse1F.asm index a07b231a4..6e2324c64 100644 --- a/maps/RedsHouse1F.asm +++ b/maps/RedsHouse1F.asm @@ -1,4 +1,4 @@ - const_def 2 ; object constants + object_const_def ; object_event constants const REDSHOUSE1F_REDS_MOM RedsHouse1F_MapScripts: diff --git a/maps/RockTunnel1F.asm b/maps/RockTunnel1F.asm index 008f7aec8..aa5d81472 100644 --- a/maps/RockTunnel1F.asm +++ b/maps/RockTunnel1F.asm @@ -1,4 +1,4 @@ - const_def 2 ; object constants + object_const_def ; object_event constants const ROCKTUNNEL1F_POKE_BALL1 const ROCKTUNNEL1F_POKE_BALL2 diff --git a/maps/RockTunnelB1F.asm b/maps/RockTunnelB1F.asm index 82cea7924..0a0707452 100644 --- a/maps/RockTunnelB1F.asm +++ b/maps/RockTunnelB1F.asm @@ -1,4 +1,4 @@ - const_def 2 ; object constants + object_const_def ; object_event constants const ROCKTUNNELB1F_POKE_BALL1 const ROCKTUNNELB1F_POKE_BALL2 const ROCKTUNNELB1F_POKE_BALL3 diff --git a/maps/Route1.asm b/maps/Route1.asm index fdae35d58..f77eb7f1e 100644 --- a/maps/Route1.asm +++ b/maps/Route1.asm @@ -1,4 +1,4 @@ - const_def 2 ; object constants + object_const_def ; object_event constants const ROUTE1_YOUNGSTER const ROUTE1_COOLTRAINER_F const ROUTE1_FRUIT_TREE diff --git a/maps/Route10Pokecenter1F.asm b/maps/Route10Pokecenter1F.asm index 82a6c73ad..11a0b3e67 100644 --- a/maps/Route10Pokecenter1F.asm +++ b/maps/Route10Pokecenter1F.asm @@ -1,4 +1,4 @@ - const_def 2 ; object constants + object_const_def ; object_event constants const ROUTE10POKECENTER1F_NURSE const ROUTE10POKECENTER1F_GENTLEMAN const ROUTE10POKECENTER1F_GYM_GUY diff --git a/maps/Route10South.asm b/maps/Route10South.asm index 6161995df..186cf0c5d 100644 --- a/maps/Route10South.asm +++ b/maps/Route10South.asm @@ -1,4 +1,4 @@ - const_def 2 ; object constants + object_const_def ; object_event constants const ROUTE10SOUTH_POKEFAN_M1 const ROUTE10SOUTH_POKEFAN_M2 diff --git a/maps/Route11.asm b/maps/Route11.asm index 9620e8f0b..aba97eccf 100644 --- a/maps/Route11.asm +++ b/maps/Route11.asm @@ -1,4 +1,4 @@ - const_def 2 ; object constants + object_const_def ; object_event constants const ROUTE11_YOUNGSTER1 const ROUTE11_YOUNGSTER2 const ROUTE11_YOUNGSTER3 diff --git a/maps/Route12.asm b/maps/Route12.asm index 607ed498b..449d515bd 100644 --- a/maps/Route12.asm +++ b/maps/Route12.asm @@ -1,4 +1,4 @@ - const_def 2 ; object constants + object_const_def ; object_event constants const ROUTE12_FISHER1 const ROUTE12_FISHER2 const ROUTE12_FISHER3 diff --git a/maps/Route12SuperRodHouse.asm b/maps/Route12SuperRodHouse.asm index f91e78026..2e635edcd 100644 --- a/maps/Route12SuperRodHouse.asm +++ b/maps/Route12SuperRodHouse.asm @@ -1,4 +1,4 @@ - const_def 2 ; object constants + object_const_def ; object_event constants const ROUTE12SUPERRODHOUSE_FISHING_GURU Route12SuperRodHouse_MapScripts: diff --git a/maps/Route13.asm b/maps/Route13.asm index 295f8c5e7..214a845fc 100644 --- a/maps/Route13.asm +++ b/maps/Route13.asm @@ -1,4 +1,4 @@ - const_def 2 ; object constants + object_const_def ; object_event constants const ROUTE13_YOUNGSTER1 const ROUTE13_YOUNGSTER2 const ROUTE13_POKEFAN_M1 diff --git a/maps/Route14.asm b/maps/Route14.asm index 939cbfd20..10c449e2e 100644 --- a/maps/Route14.asm +++ b/maps/Route14.asm @@ -1,4 +1,4 @@ - const_def 2 ; object constants + object_const_def ; object_event constants const ROUTE14_POKEFAN_M1 const ROUTE14_YOUNGSTER const ROUTE14_POKEFAN_M2 diff --git a/maps/Route15.asm b/maps/Route15.asm index 3364a224b..7f960d4b2 100644 --- a/maps/Route15.asm +++ b/maps/Route15.asm @@ -1,4 +1,4 @@ - const_def 2 ; object constants + object_const_def ; object_event constants const ROUTE15_YOUNGSTER1 const ROUTE15_YOUNGSTER2 const ROUTE15_YOUNGSTER3 diff --git a/maps/Route15FuchsiaGate.asm b/maps/Route15FuchsiaGate.asm index 002b31348..e9f03e5f0 100644 --- a/maps/Route15FuchsiaGate.asm +++ b/maps/Route15FuchsiaGate.asm @@ -1,4 +1,4 @@ - const_def 2 ; object constants + object_const_def ; object_event constants const ROUTE15FUCHSIAGATE_OFFICER Route15FuchsiaGate_MapScripts: diff --git a/maps/Route16FuchsiaSpeechHouse.asm b/maps/Route16FuchsiaSpeechHouse.asm index 53af80d35..ccfd4232a 100644 --- a/maps/Route16FuchsiaSpeechHouse.asm +++ b/maps/Route16FuchsiaSpeechHouse.asm @@ -1,4 +1,4 @@ - const_def 2 ; object constants + object_const_def ; object_event constants const ROUTE16FUCHSIASPEECHHOUSE_SUPER_NERD Route16FuchsiaSpeechHouse_MapScripts: diff --git a/maps/Route16Gate.asm b/maps/Route16Gate.asm index fb135e1b7..878ac4689 100644 --- a/maps/Route16Gate.asm +++ b/maps/Route16Gate.asm @@ -1,4 +1,4 @@ - const_def 2 ; object constants + object_const_def ; object_event constants const ROUTE16GATE_OFFICER Route16Gate_MapScripts: diff --git a/maps/Route17.asm b/maps/Route17.asm index a913835e0..31b9d55c6 100644 --- a/maps/Route17.asm +++ b/maps/Route17.asm @@ -1,4 +1,4 @@ - const_def 2 ; object constants + object_const_def ; object_event constants const ROUTE17_BIKER1 const ROUTE17_BIKER2 const ROUTE17_BIKER3 diff --git a/maps/Route17Route18Gate.asm b/maps/Route17Route18Gate.asm index 0e434a711..be69ccdff 100644 --- a/maps/Route17Route18Gate.asm +++ b/maps/Route17Route18Gate.asm @@ -1,4 +1,4 @@ - const_def 2 ; object constants + object_const_def ; object_event constants const ROUTE17ROUTE18GATE_OFFICER Route17Route18Gate_MapScripts: diff --git a/maps/Route18.asm b/maps/Route18.asm index 23d6cb4ed..af529282d 100644 --- a/maps/Route18.asm +++ b/maps/Route18.asm @@ -1,4 +1,4 @@ - const_def 2 ; object constants + object_const_def ; object_event constants const ROUTE18_YOUNGSTER1 const ROUTE18_YOUNGSTER2 diff --git a/maps/Route19.asm b/maps/Route19.asm index 103370a5a..597494808 100644 --- a/maps/Route19.asm +++ b/maps/Route19.asm @@ -1,4 +1,4 @@ - const_def 2 ; object constants + object_const_def ; object_event constants const ROUTE19_SWIMMER_GIRL const ROUTE19_SWIMMER_GUY1 const ROUTE19_SWIMMER_GUY2 diff --git a/maps/Route19FuchsiaGate.asm b/maps/Route19FuchsiaGate.asm index 4c2d6abd0..a65a847c2 100644 --- a/maps/Route19FuchsiaGate.asm +++ b/maps/Route19FuchsiaGate.asm @@ -1,4 +1,4 @@ - const_def 2 ; object constants + object_const_def ; object_event constants const ROUTE19FUCHSIAGATE_OFFICER Route19FuchsiaGate_MapScripts: diff --git a/maps/Route2.asm b/maps/Route2.asm index 2760b16eb..2c697d3e7 100644 --- a/maps/Route2.asm +++ b/maps/Route2.asm @@ -1,4 +1,4 @@ - const_def 2 ; object constants + object_const_def ; object_event constants const ROUTE2_BUG_CATCHER1 const ROUTE2_BUG_CATCHER2 const ROUTE2_BUG_CATCHER3 diff --git a/maps/Route20.asm b/maps/Route20.asm index 8339bb5d0..9169212e4 100644 --- a/maps/Route20.asm +++ b/maps/Route20.asm @@ -1,4 +1,4 @@ - const_def 2 ; object constants + object_const_def ; object_event constants const ROUTE20_SWIMMER_GIRL1 const ROUTE20_SWIMMER_GIRL2 const ROUTE20_SWIMMER_GUY diff --git a/maps/Route21.asm b/maps/Route21.asm index 68c15c526..a4436d9af 100644 --- a/maps/Route21.asm +++ b/maps/Route21.asm @@ -1,4 +1,4 @@ - const_def 2 ; object constants + object_const_def ; object_event constants const ROUTE21_SWIMMER_GIRL const ROUTE21_SWIMMER_GUY const ROUTE21_FISHER diff --git a/maps/Route24.asm b/maps/Route24.asm index 903ff57d0..ac18b7c8a 100644 --- a/maps/Route24.asm +++ b/maps/Route24.asm @@ -1,4 +1,4 @@ - const_def 2 ; object constants + object_const_def ; object_event constants const ROUTE24_ROCKET Route24_MapScripts: diff --git a/maps/Route25.asm b/maps/Route25.asm index 20179b4b4..e68cf2a89 100644 --- a/maps/Route25.asm +++ b/maps/Route25.asm @@ -1,4 +1,4 @@ - const_def 2 ; object constants + object_const_def ; object_event constants const ROUTE25_MISTY const ROUTE25_COOLTRAINER_M1 const ROUTE25_YOUNGSTER1 diff --git a/maps/Route26.asm b/maps/Route26.asm index 8e22eedb0..4dc261fff 100644 --- a/maps/Route26.asm +++ b/maps/Route26.asm @@ -1,4 +1,4 @@ - const_def 2 ; object constants + object_const_def ; object_event constants const ROUTE26_COOLTRAINER_M1 const ROUTE26_COOLTRAINER_M2 const ROUTE26_COOLTRAINER_F1 diff --git a/maps/Route26HealHouse.asm b/maps/Route26HealHouse.asm index 3820defce..cdbcbf4cd 100644 --- a/maps/Route26HealHouse.asm +++ b/maps/Route26HealHouse.asm @@ -1,4 +1,4 @@ - const_def 2 ; object constants + object_const_def ; object_event constants const ROUTE26HEALHOUSE_TEACHER Route26HealHouse_MapScripts: diff --git a/maps/Route27.asm b/maps/Route27.asm index 969a9ad48..6367ac15b 100644 --- a/maps/Route27.asm +++ b/maps/Route27.asm @@ -1,4 +1,4 @@ - const_def 2 ; object constants + object_const_def ; object_event constants const ROUTE27_COOLTRAINER_M1 const ROUTE27_COOLTRAINER_M2 const ROUTE27_COOLTRAINER_F1 diff --git a/maps/Route27SandstormHouse.asm b/maps/Route27SandstormHouse.asm index 7083c95cb..9670a7b2a 100644 --- a/maps/Route27SandstormHouse.asm +++ b/maps/Route27SandstormHouse.asm @@ -1,4 +1,4 @@ - const_def 2 ; object constants + object_const_def ; object_event constants const ROUTE27SANDSTORMHOUSE_GRANNY Route27SandstormHouse_MapScripts: diff --git a/maps/Route28SteelWingHouse.asm b/maps/Route28SteelWingHouse.asm index a62f94d52..1fbdcfde7 100644 --- a/maps/Route28SteelWingHouse.asm +++ b/maps/Route28SteelWingHouse.asm @@ -1,4 +1,4 @@ - const_def 2 ; object constants + object_const_def ; object_event constants const ROUTE28STEELWINGHOUSE_CELEBRITY const ROUTE28STEELWINGHOUSE_FEAROW diff --git a/maps/Route29.asm b/maps/Route29.asm index 392396f55..5b2a1ea9f 100644 --- a/maps/Route29.asm +++ b/maps/Route29.asm @@ -1,4 +1,4 @@ - const_def 2 ; object constants + object_const_def ; object_event constants const ROUTE29_COOLTRAINER_M1 const ROUTE29_YOUNGSTER const ROUTE29_TEACHER1 diff --git a/maps/Route29Route46Gate.asm b/maps/Route29Route46Gate.asm index f575df1ca..46f34df1f 100644 --- a/maps/Route29Route46Gate.asm +++ b/maps/Route29Route46Gate.asm @@ -1,4 +1,4 @@ - const_def 2 ; object constants + object_const_def ; object_event constants const ROUTE29ROUTE46GATE_OFFICER const ROUTE29ROUTE46GATE_YOUNGSTER diff --git a/maps/Route2Gate.asm b/maps/Route2Gate.asm index 1b665799f..0bc8e9fd4 100644 --- a/maps/Route2Gate.asm +++ b/maps/Route2Gate.asm @@ -1,4 +1,4 @@ - const_def 2 ; object constants + object_const_def ; object_event constants const ROUTE2GATE_SCIENTIST Route2Gate_MapScripts: diff --git a/maps/Route2NuggetHouse.asm b/maps/Route2NuggetHouse.asm index 2fa4b8922..a20c313fe 100644 --- a/maps/Route2NuggetHouse.asm +++ b/maps/Route2NuggetHouse.asm @@ -1,4 +1,4 @@ - const_def 2 ; object constants + object_const_def ; object_event constants const ROUTE2NUGGETHOUSE_FISHER Route2NuggetHouse_MapScripts: diff --git a/maps/Route3.asm b/maps/Route3.asm index dbc9b19d1..fcf114bfe 100644 --- a/maps/Route3.asm +++ b/maps/Route3.asm @@ -1,4 +1,4 @@ - const_def 2 ; object constants + object_const_def ; object_event constants const ROUTE3_FISHER1 const ROUTE3_YOUNGSTER1 const ROUTE3_YOUNGSTER2 diff --git a/maps/Route30.asm b/maps/Route30.asm index db6f5051c..0aba37f93 100644 --- a/maps/Route30.asm +++ b/maps/Route30.asm @@ -1,4 +1,4 @@ - const_def 2 ; object constants + object_const_def ; object_event constants const ROUTE30_YOUNGSTER1 const ROUTE30_YOUNGSTER2 const ROUTE30_YOUNGSTER3 diff --git a/maps/Route30BerryHouse.asm b/maps/Route30BerryHouse.asm index f24c58084..30d165ae2 100644 --- a/maps/Route30BerryHouse.asm +++ b/maps/Route30BerryHouse.asm @@ -1,4 +1,4 @@ - const_def 2 ; object constants + object_const_def ; object_event constants const ROUTE30BERRYHOUSE_POKEFAN_M Route30BerryHouse_MapScripts: diff --git a/maps/Route31.asm b/maps/Route31.asm index 189e3fbe8..c37a7137c 100644 --- a/maps/Route31.asm +++ b/maps/Route31.asm @@ -1,4 +1,4 @@ - const_def 2 ; object constants + object_const_def ; object_event constants const ROUTE31_FISHER const ROUTE31_YOUNGSTER const ROUTE31_BUG_CATCHER diff --git a/maps/Route31VioletGate.asm b/maps/Route31VioletGate.asm index 7e08b226c..c8b4fedcf 100644 --- a/maps/Route31VioletGate.asm +++ b/maps/Route31VioletGate.asm @@ -1,4 +1,4 @@ - const_def 2 ; object constants + object_const_def ; object_event constants const ROUTE31VIOLETGATE_OFFICER const ROUTE31VIOLETGATE_COOLTRAINER_F diff --git a/maps/Route32.asm b/maps/Route32.asm index 44d1d0a6c..9995f5603 100644 --- a/maps/Route32.asm +++ b/maps/Route32.asm @@ -1,4 +1,4 @@ - const_def 2 ; object constants + object_const_def ; object_event constants const ROUTE32_FISHER1 const ROUTE32_FISHER2 const ROUTE32_FISHER3 diff --git a/maps/Route32Pokecenter1F.asm b/maps/Route32Pokecenter1F.asm index 0b37334e3..418e411ec 100644 --- a/maps/Route32Pokecenter1F.asm +++ b/maps/Route32Pokecenter1F.asm @@ -1,4 +1,4 @@ - const_def 2 ; object constants + object_const_def ; object_event constants const ROUTE32POKECENTER1F_NURSE const ROUTE32POKECENTER1F_FISHING_GURU const ROUTE32POKECENTER1F_COOLTRAINER_F diff --git a/maps/Route32RuinsOfAlphGate.asm b/maps/Route32RuinsOfAlphGate.asm index 3329d54f5..f35403baf 100644 --- a/maps/Route32RuinsOfAlphGate.asm +++ b/maps/Route32RuinsOfAlphGate.asm @@ -1,4 +1,4 @@ - const_def 2 ; object constants + object_const_def ; object_event constants const ROUTE32RUINSOFALPHGATE_OFFICER const ROUTE32RUINSOFALPHGATE_POKEFAN_M const ROUTE32RUINSOFALPHGATE_YOUNGSTER diff --git a/maps/Route33.asm b/maps/Route33.asm index 8bff3f171..5c8982f9b 100644 --- a/maps/Route33.asm +++ b/maps/Route33.asm @@ -1,4 +1,4 @@ - const_def 2 ; object constants + object_const_def ; object_event constants const ROUTE33_POKEFAN_M const ROUTE33_LASS const ROUTE33_FRUIT_TREE diff --git a/maps/Route34.asm b/maps/Route34.asm index a2ea82aab..caac74912 100644 --- a/maps/Route34.asm +++ b/maps/Route34.asm @@ -1,4 +1,4 @@ - const_def 2 ; object constants + object_const_def ; object_event constants const ROUTE34_YOUNGSTER1 const ROUTE34_YOUNGSTER2 const ROUTE34_YOUNGSTER3 diff --git a/maps/Route34IlexForestGate.asm b/maps/Route34IlexForestGate.asm index 7f2c5124d..2698a37dc 100644 --- a/maps/Route34IlexForestGate.asm +++ b/maps/Route34IlexForestGate.asm @@ -1,4 +1,4 @@ - const_def 2 ; object constants + object_const_def ; object_event constants const ROUTE34ILEXFORESTGATE_TEACHER1 const ROUTE34ILEXFORESTGATE_BUTTERFREE const ROUTE34ILEXFORESTGATE_LASS diff --git a/maps/Route35.asm b/maps/Route35.asm index 0ed21e0e5..44bffedd5 100644 --- a/maps/Route35.asm +++ b/maps/Route35.asm @@ -1,4 +1,4 @@ - const_def 2 ; object constants + object_const_def ; object_event constants const ROUTE35_YOUNGSTER1 const ROUTE35_YOUNGSTER2 const ROUTE35_LASS1 diff --git a/maps/Route35GoldenrodGate.asm b/maps/Route35GoldenrodGate.asm index 5608b57f9..34f76ffb0 100644 --- a/maps/Route35GoldenrodGate.asm +++ b/maps/Route35GoldenrodGate.asm @@ -1,4 +1,4 @@ - const_def 2 ; object constants + object_const_def ; object_event constants const ROUTE35GOLDENRODGATE_OFFICER const ROUTE35GOLDENRODGATE_POKEFAN_F const ROUTE35GOLDENRODGATE_FISHER diff --git a/maps/Route35NationalParkGate.asm b/maps/Route35NationalParkGate.asm index 8676b146f..38e1df404 100644 --- a/maps/Route35NationalParkGate.asm +++ b/maps/Route35NationalParkGate.asm @@ -1,4 +1,4 @@ - const_def 2 ; object constants + object_const_def ; object_event constants const ROUTE35NATIONALPARKGATE_OFFICER1 const ROUTE35NATIONALPARKGATE_YOUNGSTER const ROUTE35NATIONALPARKGATE_OFFICER2 diff --git a/maps/Route36.asm b/maps/Route36.asm index b4399f1dd..4604e8c5a 100644 --- a/maps/Route36.asm +++ b/maps/Route36.asm @@ -1,4 +1,4 @@ - const_def 2 ; object constants + object_const_def ; object_event constants const ROUTE36_YOUNGSTER1 const ROUTE36_YOUNGSTER2 const ROUTE36_WEIRD_TREE diff --git a/maps/Route36NationalParkGate.asm b/maps/Route36NationalParkGate.asm index fa80fc3d1..f07a03d40 100644 --- a/maps/Route36NationalParkGate.asm +++ b/maps/Route36NationalParkGate.asm @@ -1,4 +1,4 @@ - const_def 2 ; object constants + object_const_def ; object_event constants const ROUTE36NATIONALPARKGATE_OFFICER1 const ROUTE36NATIONALPARKGATE_YOUNGSTER1 const ROUTE36NATIONALPARKGATE_YOUNGSTER2 diff --git a/maps/Route36RuinsOfAlphGate.asm b/maps/Route36RuinsOfAlphGate.asm index ed894445d..bced6d8d0 100644 --- a/maps/Route36RuinsOfAlphGate.asm +++ b/maps/Route36RuinsOfAlphGate.asm @@ -1,4 +1,4 @@ - const_def 2 ; object constants + object_const_def ; object_event constants const ROUTE36RUINSOFALPHGATE_OFFICER const ROUTE36RUINSOFALPHGATE_GRAMPS diff --git a/maps/Route37.asm b/maps/Route37.asm index eac94fa89..701afbed3 100644 --- a/maps/Route37.asm +++ b/maps/Route37.asm @@ -1,4 +1,4 @@ - const_def 2 ; object constants + object_const_def ; object_event constants const ROUTE37_WEIRD_TREE1 const ROUTE37_WEIRD_TREE2 const ROUTE37_YOUNGSTER diff --git a/maps/Route38.asm b/maps/Route38.asm index 5ecc35e91..427c12f0a 100644 --- a/maps/Route38.asm +++ b/maps/Route38.asm @@ -1,4 +1,4 @@ - const_def 2 ; object constants + object_const_def ; object_event constants const ROUTE38_STANDING_YOUNGSTER1 const ROUTE38_LASS const ROUTE38_STANDING_YOUNGSTER2 diff --git a/maps/Route38EcruteakGate.asm b/maps/Route38EcruteakGate.asm index 2277c3a1d..7b6aaee40 100644 --- a/maps/Route38EcruteakGate.asm +++ b/maps/Route38EcruteakGate.asm @@ -1,4 +1,4 @@ - const_def 2 ; object constants + object_const_def ; object_event constants const ROUTE38ECRUTEAKGATE_OFFICER Route38EcruteakGate_MapScripts: diff --git a/maps/Route39.asm b/maps/Route39.asm index 60ea78350..69568f3f1 100644 --- a/maps/Route39.asm +++ b/maps/Route39.asm @@ -1,4 +1,4 @@ - const_def 2 ; object constants + object_const_def ; object_event constants const ROUTE39_SAILOR const ROUTE39_POKEFAN_M const ROUTE39_POKEFAN_F1 diff --git a/maps/Route39Barn.asm b/maps/Route39Barn.asm index 2fae06697..2a80b477e 100644 --- a/maps/Route39Barn.asm +++ b/maps/Route39Barn.asm @@ -1,4 +1,4 @@ - const_def 2 ; object constants + object_const_def ; object_event constants const ROUTE39BARN_TWIN1 const ROUTE39BARN_TWIN2 const ROUTE39BARN_MOOMOO diff --git a/maps/Route39Farmhouse.asm b/maps/Route39Farmhouse.asm index a3f582de1..dae261a62 100644 --- a/maps/Route39Farmhouse.asm +++ b/maps/Route39Farmhouse.asm @@ -1,6 +1,6 @@ ROUTE39FARMHOUSE_MILK_PRICE EQU 500 - const_def 2 ; object constants + object_const_def ; object_event constants const ROUTE39FARMHOUSE_POKEFAN_M const ROUTE39FARMHOUSE_POKEFAN_F diff --git a/maps/Route4.asm b/maps/Route4.asm index c7722e3a9..b39beb7f6 100644 --- a/maps/Route4.asm +++ b/maps/Route4.asm @@ -1,4 +1,4 @@ - const_def 2 ; object constants + object_const_def ; object_event constants const ROUTE4_YOUNGSTER const ROUTE4_LASS1 const ROUTE4_LASS2 diff --git a/maps/Route40.asm b/maps/Route40.asm index b7c8d79ca..ce02e91d1 100644 --- a/maps/Route40.asm +++ b/maps/Route40.asm @@ -1,4 +1,4 @@ - const_def 2 ; object constants + object_const_def ; object_event constants const ROUTE40_OLIVINE_RIVAL1 const ROUTE40_OLIVINE_RIVAL2 const ROUTE40_SWIMMER_GIRL1 diff --git a/maps/Route40BattleTowerGate.asm b/maps/Route40BattleTowerGate.asm index 9678e9aa3..e08c9cc97 100644 --- a/maps/Route40BattleTowerGate.asm +++ b/maps/Route40BattleTowerGate.asm @@ -1,4 +1,4 @@ - const_def 2 ; object constants + object_const_def ; object_event constants const ROUTE40BATTLETOWERGATE_ROCKER const ROUTE40BATTLETOWERGATE_TWIN diff --git a/maps/Route41.asm b/maps/Route41.asm index d851a41e5..994a2b2ec 100644 --- a/maps/Route41.asm +++ b/maps/Route41.asm @@ -1,4 +1,4 @@ - const_def 2 ; object constants + object_const_def ; object_event constants const ROUTE41_OLIVINE_RIVAL1 const ROUTE41_OLIVINE_RIVAL2 const ROUTE41_OLIVINE_RIVAL3 diff --git a/maps/Route42.asm b/maps/Route42.asm index 78dc2bf8b..04a194925 100644 --- a/maps/Route42.asm +++ b/maps/Route42.asm @@ -1,4 +1,4 @@ - const_def 2 ; object constants + object_const_def ; object_event constants const ROUTE42_FISHER const ROUTE42_POKEFAN_M const ROUTE42_SUPER_NERD diff --git a/maps/Route42EcruteakGate.asm b/maps/Route42EcruteakGate.asm index c6f702452..e38aa7d79 100644 --- a/maps/Route42EcruteakGate.asm +++ b/maps/Route42EcruteakGate.asm @@ -1,4 +1,4 @@ - const_def 2 ; object constants + object_const_def ; object_event constants const ROUTE42ECRUTEAKGATE_OFFICER Route42EcruteakGate_MapScripts: diff --git a/maps/Route43.asm b/maps/Route43.asm index c1593aaa8..5c5ea9f0a 100644 --- a/maps/Route43.asm +++ b/maps/Route43.asm @@ -1,4 +1,4 @@ - const_def 2 ; object constants + object_const_def ; object_event constants const ROUTE43_SUPER_NERD1 const ROUTE43_SUPER_NERD2 const ROUTE43_SUPER_NERD3 diff --git a/maps/Route43Gate.asm b/maps/Route43Gate.asm index 478d67705..168b62d5a 100644 --- a/maps/Route43Gate.asm +++ b/maps/Route43Gate.asm @@ -1,6 +1,6 @@ ROUTE43GATE_TOLL EQU 1000 - const_def 2 ; object constants + object_const_def ; object_event constants const ROUTE43GATE_OFFICER const ROUTE43GATE_ROCKET1 const ROUTE43GATE_ROCKET2 diff --git a/maps/Route43MahoganyGate.asm b/maps/Route43MahoganyGate.asm index 671b64aed..971cd85b8 100644 --- a/maps/Route43MahoganyGate.asm +++ b/maps/Route43MahoganyGate.asm @@ -1,4 +1,4 @@ - const_def 2 ; object constants + object_const_def ; object_event constants const ROUTE43MAHOGANYGATE_OFFICER Route43MahoganyGate_MapScripts: diff --git a/maps/Route44.asm b/maps/Route44.asm index 1ac89f0d7..7dbb7adfc 100644 --- a/maps/Route44.asm +++ b/maps/Route44.asm @@ -1,4 +1,4 @@ - const_def 2 ; object constants + object_const_def ; object_event constants const ROUTE44_FISHER1 const ROUTE44_FISHER2 const ROUTE44_YOUNGSTER1 diff --git a/maps/Route45.asm b/maps/Route45.asm index 9b4eda79d..947d70284 100644 --- a/maps/Route45.asm +++ b/maps/Route45.asm @@ -1,4 +1,4 @@ - const_def 2 ; object constants + object_const_def ; object_event constants const ROUTE45_POKEFAN_M1 const ROUTE45_POKEFAN_M2 const ROUTE45_POKEFAN_M3 diff --git a/maps/Route46.asm b/maps/Route46.asm index 365748244..532f643ce 100644 --- a/maps/Route46.asm +++ b/maps/Route46.asm @@ -1,4 +1,4 @@ - const_def 2 ; object constants + object_const_def ; object_event constants const ROUTE46_POKEFAN_M const ROUTE46_YOUNGSTER const ROUTE46_LASS diff --git a/maps/Route5.asm b/maps/Route5.asm index 103c17d56..5806ddb91 100644 --- a/maps/Route5.asm +++ b/maps/Route5.asm @@ -1,4 +1,4 @@ - const_def 2 ; object constants + object_const_def ; object_event constants const ROUTE5_POKEFAN_M Route5_MapScripts: diff --git a/maps/Route5CleanseTagHouse.asm b/maps/Route5CleanseTagHouse.asm index 4fc1d0446..a1be6374e 100644 --- a/maps/Route5CleanseTagHouse.asm +++ b/maps/Route5CleanseTagHouse.asm @@ -1,4 +1,4 @@ - const_def 2 ; object constants + object_const_def ; object_event constants const ROUTE5CLEANSETAGHOUSE_GRANNY const ROUTE5CLEANSETAGHOUSE_TEACHER diff --git a/maps/Route5SaffronGate.asm b/maps/Route5SaffronGate.asm index 3a0161af3..2c8898b9f 100644 --- a/maps/Route5SaffronGate.asm +++ b/maps/Route5SaffronGate.asm @@ -1,4 +1,4 @@ - const_def 2 ; object constants + object_const_def ; object_event constants const ROUTE5SAFFRONGATE_OFFICER Route5SaffronGate_MapScripts: diff --git a/maps/Route5UndergroundPathEntrance.asm b/maps/Route5UndergroundPathEntrance.asm index d62a042b9..3f5544d05 100644 --- a/maps/Route5UndergroundPathEntrance.asm +++ b/maps/Route5UndergroundPathEntrance.asm @@ -1,4 +1,4 @@ - const_def 2 ; object constants + object_const_def ; object_event constants const ROUTE5UNDERGROUNDPATHENTRANCE_TEACHER Route5UndergroundPathEntrance_MapScripts: diff --git a/maps/Route6.asm b/maps/Route6.asm index 8576e1b04..e11b7d412 100644 --- a/maps/Route6.asm +++ b/maps/Route6.asm @@ -1,4 +1,4 @@ - const_def 2 ; object constants + object_const_def ; object_event constants const ROUTE6_POKEFAN_M1 const ROUTE6_POKEFAN_M2 const ROUTE6_POKEFAN_M3 diff --git a/maps/Route6SaffronGate.asm b/maps/Route6SaffronGate.asm index c0de7ff54..555fce4c6 100644 --- a/maps/Route6SaffronGate.asm +++ b/maps/Route6SaffronGate.asm @@ -1,4 +1,4 @@ - const_def 2 ; object constants + object_const_def ; object_event constants const ROUTE6SAFFRONGATE_OFFICER Route6SaffronGate_MapScripts: diff --git a/maps/Route7SaffronGate.asm b/maps/Route7SaffronGate.asm index 67a8c6813..4835a87ed 100644 --- a/maps/Route7SaffronGate.asm +++ b/maps/Route7SaffronGate.asm @@ -1,4 +1,4 @@ - const_def 2 ; object constants + object_const_def ; object_event constants const ROUTE7SAFFRONGATE_OFFICER Route7SaffronGate_MapScripts: diff --git a/maps/Route8.asm b/maps/Route8.asm index e3ce0b371..fbfe3ebcf 100644 --- a/maps/Route8.asm +++ b/maps/Route8.asm @@ -1,4 +1,4 @@ - const_def 2 ; object constants + object_const_def ; object_event constants const ROUTE8_BIKER1 const ROUTE8_BIKER2 const ROUTE8_BIKER3 diff --git a/maps/Route8SaffronGate.asm b/maps/Route8SaffronGate.asm index bcaf7f02c..83f4492a5 100644 --- a/maps/Route8SaffronGate.asm +++ b/maps/Route8SaffronGate.asm @@ -1,4 +1,4 @@ - const_def 2 ; object constants + object_const_def ; object_event constants const ROUTE8SAFFRONGATE_OFFICER Route8SaffronGate_MapScripts: diff --git a/maps/Route9.asm b/maps/Route9.asm index fa3d07313..44e214435 100644 --- a/maps/Route9.asm +++ b/maps/Route9.asm @@ -1,4 +1,4 @@ - const_def 2 ; object constants + object_const_def ; object_event constants const ROUTE9_YOUNGSTER1 const ROUTE9_LASS1 const ROUTE9_YOUNGSTER2 diff --git a/maps/RuinsOfAlphAerodactylItemRoom.asm b/maps/RuinsOfAlphAerodactylItemRoom.asm index 396cdc42b..e959faf3b 100644 --- a/maps/RuinsOfAlphAerodactylItemRoom.asm +++ b/maps/RuinsOfAlphAerodactylItemRoom.asm @@ -1,4 +1,4 @@ - const_def 2 ; object constants + object_const_def ; object_event constants const RUINSOFALPHAERODACTYLITEMROOM_POKE_BALL1 const RUINSOFALPHAERODACTYLITEMROOM_POKE_BALL2 const RUINSOFALPHAERODACTYLITEMROOM_POKE_BALL3 diff --git a/maps/RuinsOfAlphHoOhItemRoom.asm b/maps/RuinsOfAlphHoOhItemRoom.asm index 1dde14e7b..8e1f5f192 100644 --- a/maps/RuinsOfAlphHoOhItemRoom.asm +++ b/maps/RuinsOfAlphHoOhItemRoom.asm @@ -1,4 +1,4 @@ - const_def 2 ; object constants + object_const_def ; object_event constants const RUINSOFALPHHOOHITEMROOM_POKE_BALL1 const RUINSOFALPHHOOHITEMROOM_POKE_BALL2 const RUINSOFALPHHOOHITEMROOM_POKE_BALL3 diff --git a/maps/RuinsOfAlphInnerChamber.asm b/maps/RuinsOfAlphInnerChamber.asm index 62b0d6c13..c140874e6 100644 --- a/maps/RuinsOfAlphInnerChamber.asm +++ b/maps/RuinsOfAlphInnerChamber.asm @@ -1,4 +1,4 @@ - const_def 2 ; object constants + object_const_def ; object_event constants const RUINSOFALPHINNERCHAMBER_FISHER const RUINSOFALPHINNERCHAMBER_TEACHER const RUINSOFALPHINNERCHAMBER_GRAMPS diff --git a/maps/RuinsOfAlphKabutoChamber.asm b/maps/RuinsOfAlphKabutoChamber.asm index 37548f5ec..f93036396 100644 --- a/maps/RuinsOfAlphKabutoChamber.asm +++ b/maps/RuinsOfAlphKabutoChamber.asm @@ -1,4 +1,4 @@ - const_def 2 ; object constants + object_const_def ; object_event constants const RUINSOFALPHKABUTOCHAMBER_RECEPTIONIST const RUINSOFALPHKABUTOCHAMBER_SCIENTIST diff --git a/maps/RuinsOfAlphKabutoItemRoom.asm b/maps/RuinsOfAlphKabutoItemRoom.asm index 7b43c2841..f3dcee3a3 100644 --- a/maps/RuinsOfAlphKabutoItemRoom.asm +++ b/maps/RuinsOfAlphKabutoItemRoom.asm @@ -1,4 +1,4 @@ - const_def 2 ; object constants + object_const_def ; object_event constants const RUINSOFALPHKABUTOITEMROOM_POKE_BALL1 const RUINSOFALPHKABUTOITEMROOM_POKE_BALL2 const RUINSOFALPHKABUTOITEMROOM_POKE_BALL3 diff --git a/maps/RuinsOfAlphOmanyteItemRoom.asm b/maps/RuinsOfAlphOmanyteItemRoom.asm index cd0339e58..48e4d6fd4 100644 --- a/maps/RuinsOfAlphOmanyteItemRoom.asm +++ b/maps/RuinsOfAlphOmanyteItemRoom.asm @@ -1,4 +1,4 @@ - const_def 2 ; object constants + object_const_def ; object_event constants const RUINSOFALPHOMANYTEITEMROOM_POKE_BALL1 const RUINSOFALPHOMANYTEITEMROOM_POKE_BALL2 const RUINSOFALPHOMANYTEITEMROOM_POKE_BALL3 diff --git a/maps/RuinsOfAlphOutside.asm b/maps/RuinsOfAlphOutside.asm index 1812bcd30..df93a8c6a 100644 --- a/maps/RuinsOfAlphOutside.asm +++ b/maps/RuinsOfAlphOutside.asm @@ -1,4 +1,4 @@ - const_def 2 ; object constants + object_const_def ; object_event constants const RUINSOFALPHOUTSIDE_YOUNGSTER1 const RUINSOFALPHOUTSIDE_SCIENTIST const RUINSOFALPHOUTSIDE_FISHER diff --git a/maps/RuinsOfAlphResearchCenter.asm b/maps/RuinsOfAlphResearchCenter.asm index 13d4fe0b7..016e51580 100644 --- a/maps/RuinsOfAlphResearchCenter.asm +++ b/maps/RuinsOfAlphResearchCenter.asm @@ -1,4 +1,4 @@ - const_def 2 ; object constants + object_const_def ; object_event constants const RUINSOFALPHRESEARCHCENTER_SCIENTIST1 const RUINSOFALPHRESEARCHCENTER_SCIENTIST2 const RUINSOFALPHRESEARCHCENTER_SCIENTIST3 diff --git a/maps/SafariZoneWardensHome.asm b/maps/SafariZoneWardensHome.asm index 41a2db11d..4dde5009b 100644 --- a/maps/SafariZoneWardensHome.asm +++ b/maps/SafariZoneWardensHome.asm @@ -1,4 +1,4 @@ - const_def 2 ; object constants + object_const_def ; object_event constants const SAFARIZONEWARDENSHOME_LASS SafariZoneWardensHome_MapScripts: diff --git a/maps/SaffronCity.asm b/maps/SaffronCity.asm index 5ea760c88..51da9178e 100644 --- a/maps/SaffronCity.asm +++ b/maps/SaffronCity.asm @@ -1,4 +1,4 @@ - const_def 2 ; object constants + object_const_def ; object_event constants const SAFFRONCITY_LASS1 const SAFFRONCITY_POKEFAN_M const SAFFRONCITY_COOLTRAINER_M diff --git a/maps/SaffronGym.asm b/maps/SaffronGym.asm index b7579f1a4..4be260421 100644 --- a/maps/SaffronGym.asm +++ b/maps/SaffronGym.asm @@ -1,4 +1,4 @@ - const_def 2 ; object constants + object_const_def ; object_event constants const SAFFRONGYM_SABRINA const SAFFRONGYM_GRANNY1 const SAFFRONGYM_YOUNGSTER1 diff --git a/maps/SaffronMagnetTrainStation.asm b/maps/SaffronMagnetTrainStation.asm index 361fc087d..ccefa7d07 100644 --- a/maps/SaffronMagnetTrainStation.asm +++ b/maps/SaffronMagnetTrainStation.asm @@ -1,4 +1,4 @@ - const_def 2 ; object constants + object_const_def ; object_event constants const SAFFRONMAGNETTRAINSTATION_OFFICER const SAFFRONMAGNETTRAINSTATION_GYM_GUY const SAFFRONMAGNETTRAINSTATION_TEACHER diff --git a/maps/SaffronMart.asm b/maps/SaffronMart.asm index 55e078d89..35dbfb22e 100644 --- a/maps/SaffronMart.asm +++ b/maps/SaffronMart.asm @@ -1,4 +1,4 @@ - const_def 2 ; object constants + object_const_def ; object_event constants const SAFFRONMART_CLERK const SAFFRONMART_COOLTRAINER_M const SAFFRONMART_COOLTRAINER_F diff --git a/maps/SaffronPokecenter1F.asm b/maps/SaffronPokecenter1F.asm index 161c4c169..3e23f99b6 100644 --- a/maps/SaffronPokecenter1F.asm +++ b/maps/SaffronPokecenter1F.asm @@ -1,4 +1,4 @@ - const_def 2 ; object constants + object_const_def ; object_event constants const SAFFRONPOKECENTER1F_NURSE const SAFFRONPOKECENTER1F_TEACHER const SAFFRONPOKECENTER1F_FISHER diff --git a/maps/SeafoamGym.asm b/maps/SeafoamGym.asm index 0a4ed0595..4b72e61b7 100644 --- a/maps/SeafoamGym.asm +++ b/maps/SeafoamGym.asm @@ -1,4 +1,4 @@ - const_def 2 ; object constants + object_const_def ; object_event constants const SEAFOAMGYM_BLAINE const SEAFOAMGYM_GYM_GUY diff --git a/maps/SilphCo1F.asm b/maps/SilphCo1F.asm index d14f19b23..9687071ec 100644 --- a/maps/SilphCo1F.asm +++ b/maps/SilphCo1F.asm @@ -1,4 +1,4 @@ - const_def 2 ; object constants + object_const_def ; object_event constants const SILPHCO1F_RECEPTIONIST const SILPHCO1F_OFFICER diff --git a/maps/SilverCaveItemRooms.asm b/maps/SilverCaveItemRooms.asm index e2f48638d..eded4deee 100644 --- a/maps/SilverCaveItemRooms.asm +++ b/maps/SilverCaveItemRooms.asm @@ -1,4 +1,4 @@ - const_def 2 ; object constants + object_const_def ; object_event constants const SILVERCAVEITEMROOMS_POKE_BALL1 const SILVERCAVEITEMROOMS_POKE_BALL2 diff --git a/maps/SilverCavePokecenter1F.asm b/maps/SilverCavePokecenter1F.asm index 7c293a36b..866e269a2 100644 --- a/maps/SilverCavePokecenter1F.asm +++ b/maps/SilverCavePokecenter1F.asm @@ -1,4 +1,4 @@ - const_def 2 ; object constants + object_const_def ; object_event constants const SILVERCAVEPOKECENTER1F_NURSE const SILVERCAVEPOKECENTER1F_GRANNY diff --git a/maps/SilverCaveRoom1.asm b/maps/SilverCaveRoom1.asm index 1fe5df55d..1765b2ac6 100644 --- a/maps/SilverCaveRoom1.asm +++ b/maps/SilverCaveRoom1.asm @@ -1,4 +1,4 @@ - const_def 2 ; object constants + object_const_def ; object_event constants const SILVERCAVEROOM1_POKE_BALL1 const SILVERCAVEROOM1_POKE_BALL2 const SILVERCAVEROOM1_POKE_BALL3 diff --git a/maps/SilverCaveRoom2.asm b/maps/SilverCaveRoom2.asm index 7a7f9250d..a56b9e4b8 100644 --- a/maps/SilverCaveRoom2.asm +++ b/maps/SilverCaveRoom2.asm @@ -1,4 +1,4 @@ - const_def 2 ; object constants + object_const_def ; object_event constants const SILVERCAVEROOM2_POKE_BALL1 const SILVERCAVEROOM2_POKE_BALL2 const SILVERCAVEROOM2_POKE_BALL3 diff --git a/maps/SilverCaveRoom3.asm b/maps/SilverCaveRoom3.asm index 3efd76434..e56a86945 100644 --- a/maps/SilverCaveRoom3.asm +++ b/maps/SilverCaveRoom3.asm @@ -1,4 +1,4 @@ - const_def 2 ; object constants + object_const_def ; object_event constants const SILVERCAVEROOM3_RED SilverCaveRoom3_MapScripts: diff --git a/maps/SlowpokeWellB1F.asm b/maps/SlowpokeWellB1F.asm index e1af3bfcf..f54ab4c4a 100644 --- a/maps/SlowpokeWellB1F.asm +++ b/maps/SlowpokeWellB1F.asm @@ -1,4 +1,4 @@ - const_def 2 ; object constants + object_const_def ; object_event constants const SLOWPOKEWELLB1F_ROCKET1 const SLOWPOKEWELLB1F_ROCKET2 const SLOWPOKEWELLB1F_ROCKET3 diff --git a/maps/SlowpokeWellB2F.asm b/maps/SlowpokeWellB2F.asm index 3098815e2..9ddcdfaed 100644 --- a/maps/SlowpokeWellB2F.asm +++ b/maps/SlowpokeWellB2F.asm @@ -1,4 +1,4 @@ - const_def 2 ; object constants + object_const_def ; object_event constants const SLOWPOKEWELLB2F_GYM_GUY const SLOWPOKEWELLB2F_POKE_BALL diff --git a/maps/SoulHouse.asm b/maps/SoulHouse.asm index 8c6a86128..314900518 100644 --- a/maps/SoulHouse.asm +++ b/maps/SoulHouse.asm @@ -1,4 +1,4 @@ - const_def 2 ; object constants + object_const_def ; object_event constants const SOULHOUSE_MRFUJI const SOULHOUSE_TEACHER const SOULHOUSE_LASS diff --git a/maps/SproutTower1F.asm b/maps/SproutTower1F.asm index 128eac3dc..19766d205 100644 --- a/maps/SproutTower1F.asm +++ b/maps/SproutTower1F.asm @@ -1,4 +1,4 @@ - const_def 2 ; object constants + object_const_def ; object_event constants const SPROUTTOWER1F_SAGE1 const SPROUTTOWER1F_SAGE2 const SPROUTTOWER1F_GRANNY diff --git a/maps/SproutTower2F.asm b/maps/SproutTower2F.asm index 686e8c1f1..6f145aff2 100644 --- a/maps/SproutTower2F.asm +++ b/maps/SproutTower2F.asm @@ -1,4 +1,4 @@ - const_def 2 ; object constants + object_const_def ; object_event constants const SPROUTTOWER2F_SAGE1 const SPROUTTOWER2F_SAGE2 const SPROUTTOWER2F_POKE_BALL diff --git a/maps/SproutTower3F.asm b/maps/SproutTower3F.asm index a33bc0e58..25255c740 100644 --- a/maps/SproutTower3F.asm +++ b/maps/SproutTower3F.asm @@ -1,4 +1,4 @@ - const_def 2 ; object constants + object_const_def ; object_event constants const SPROUTTOWER3F_SAGE1 const SPROUTTOWER3F_SAGE2 const SPROUTTOWER3F_SAGE3 diff --git a/maps/TeamRocketBaseB1F.asm b/maps/TeamRocketBaseB1F.asm index 20e56ebb3..d5cf1d38c 100644 --- a/maps/TeamRocketBaseB1F.asm +++ b/maps/TeamRocketBaseB1F.asm @@ -1,4 +1,4 @@ - const_def 2 ; object constants + object_const_def ; object_event constants const TEAMROCKETBASEB1F_ROCKET1 const TEAMROCKETBASEB1F_ROCKET2 const TEAMROCKETBASEB1F_SCIENTIST diff --git a/maps/TeamRocketBaseB2F.asm b/maps/TeamRocketBaseB2F.asm index 08a069e9a..64ea130af 100644 --- a/maps/TeamRocketBaseB2F.asm +++ b/maps/TeamRocketBaseB2F.asm @@ -1,4 +1,4 @@ - const_def 2 ; object constants + object_const_def ; object_event constants const TEAMROCKETBASEB2F_ROCKET1 const TEAMROCKETBASEB2F_ROCKET_GIRL const TEAMROCKETBASEB2F_LANCE diff --git a/maps/TeamRocketBaseB3F.asm b/maps/TeamRocketBaseB3F.asm index bec7a4176..1833357e1 100644 --- a/maps/TeamRocketBaseB3F.asm +++ b/maps/TeamRocketBaseB3F.asm @@ -1,4 +1,4 @@ - const_def 2 ; object constants + object_const_def ; object_event constants const TEAMROCKETBASEB3F_LANCE const TEAMROCKETBASEB3F_ROCKET1 const TEAMROCKETBASEB3F_MOLTRES diff --git a/maps/TimeCapsule.asm b/maps/TimeCapsule.asm index b0fd42df8..7edc4499e 100644 --- a/maps/TimeCapsule.asm +++ b/maps/TimeCapsule.asm @@ -1,4 +1,4 @@ - const_def 2 ; object constants + object_const_def ; object_event constants const TIMECAPSULE_CHRIS1 const TIMECAPSULE_CHRIS2 diff --git a/maps/TinTower1F.asm b/maps/TinTower1F.asm index 69a5ae47c..9288e7dec 100644 --- a/maps/TinTower1F.asm +++ b/maps/TinTower1F.asm @@ -1,4 +1,4 @@ - const_def 2 ; object constants + object_const_def ; object_event constants const TINTOWER1F_SUICUNE const TINTOWER1F_RAIKOU const TINTOWER1F_ENTEI diff --git a/maps/TinTower3F.asm b/maps/TinTower3F.asm index c089d8124..59ee1d491 100644 --- a/maps/TinTower3F.asm +++ b/maps/TinTower3F.asm @@ -1,4 +1,4 @@ - const_def 2 ; object constants + object_const_def ; object_event constants const TINTOWER3F_POKE_BALL TinTower3F_MapScripts: diff --git a/maps/TinTower4F.asm b/maps/TinTower4F.asm index c36365543..12f22ad45 100644 --- a/maps/TinTower4F.asm +++ b/maps/TinTower4F.asm @@ -1,4 +1,4 @@ - const_def 2 ; object constants + object_const_def ; object_event constants const TINTOWER4F_POKE_BALL1 const TINTOWER4F_POKE_BALL2 const TINTOWER4F_POKE_BALL3 diff --git a/maps/TinTower5F.asm b/maps/TinTower5F.asm index cff375b3d..4cab0c3bf 100644 --- a/maps/TinTower5F.asm +++ b/maps/TinTower5F.asm @@ -1,4 +1,4 @@ - const_def 2 ; object constants + object_const_def ; object_event constants const TINTOWER5F_POKE_BALL TinTower5F_MapScripts: diff --git a/maps/TinTower6F.asm b/maps/TinTower6F.asm index 9fa17a0a2..0d433fa00 100644 --- a/maps/TinTower6F.asm +++ b/maps/TinTower6F.asm @@ -1,4 +1,4 @@ - const_def 2 ; object constants + object_const_def ; object_event constants const TINTOWER6F_POKE_BALL TinTower6F_MapScripts: diff --git a/maps/TinTower7F.asm b/maps/TinTower7F.asm index 5025fbbe9..04ea5c50f 100644 --- a/maps/TinTower7F.asm +++ b/maps/TinTower7F.asm @@ -1,4 +1,4 @@ - const_def 2 ; object constants + object_const_def ; object_event constants const TINTOWER7F_POKE_BALL TinTower7F_MapScripts: diff --git a/maps/TinTower8F.asm b/maps/TinTower8F.asm index c39f118eb..5cb76ca3d 100644 --- a/maps/TinTower8F.asm +++ b/maps/TinTower8F.asm @@ -1,4 +1,4 @@ - const_def 2 ; object constants + object_const_def ; object_event constants const TINTOWER8F_POKE_BALL1 const TINTOWER8F_POKE_BALL2 const TINTOWER8F_POKE_BALL3 diff --git a/maps/TinTower9F.asm b/maps/TinTower9F.asm index 77cd23fce..fec180c83 100644 --- a/maps/TinTower9F.asm +++ b/maps/TinTower9F.asm @@ -1,4 +1,4 @@ - const_def 2 ; object constants + object_const_def ; object_event constants const TINTOWER9F_POKE_BALL TinTower9F_MapScripts: diff --git a/maps/TinTowerRoof.asm b/maps/TinTowerRoof.asm index 14b487a6f..ea86a9189 100644 --- a/maps/TinTowerRoof.asm +++ b/maps/TinTowerRoof.asm @@ -1,4 +1,4 @@ - const_def 2 ; object constants + object_const_def ; object_event constants const TINTOWERROOF_HO_OH TinTowerRoof_MapScripts: diff --git a/maps/TohjoFalls.asm b/maps/TohjoFalls.asm index 4a57e3d2a..7a743151d 100644 --- a/maps/TohjoFalls.asm +++ b/maps/TohjoFalls.asm @@ -1,4 +1,4 @@ - const_def 2 ; object constants + object_const_def ; object_event constants const TOHJOFALLS_POKE_BALL TohjoFalls_MapScripts: diff --git a/maps/TradeCenter.asm b/maps/TradeCenter.asm index 6dc1983f7..b7b708973 100644 --- a/maps/TradeCenter.asm +++ b/maps/TradeCenter.asm @@ -1,4 +1,4 @@ - const_def 2 ; object constants + object_const_def ; object_event constants const TRADECENTER_CHRIS1 const TRADECENTER_CHRIS2 diff --git a/maps/TrainerHouse1F.asm b/maps/TrainerHouse1F.asm index ca6827230..d38b45112 100644 --- a/maps/TrainerHouse1F.asm +++ b/maps/TrainerHouse1F.asm @@ -1,4 +1,4 @@ - const_def 2 ; object constants + object_const_def ; object_event constants const TRAINERHOUSE1F_RECEPTIONIST const TRAINERHOUSE1F_COOLTRAINER_M const TRAINERHOUSE1F_COOLTRAINER_F diff --git a/maps/TrainerHouseB1F.asm b/maps/TrainerHouseB1F.asm index a33c8ac29..fc5942950 100644 --- a/maps/TrainerHouseB1F.asm +++ b/maps/TrainerHouseB1F.asm @@ -1,4 +1,4 @@ - const_def 2 ; object constants + object_const_def ; object_event constants const TRAINERHOUSEB1F_RECEPTIONIST const TRAINERHOUSEB1F_CHRIS diff --git a/maps/UnionCave1F.asm b/maps/UnionCave1F.asm index f978c8c66..46119367a 100644 --- a/maps/UnionCave1F.asm +++ b/maps/UnionCave1F.asm @@ -1,4 +1,4 @@ - const_def 2 ; object constants + object_const_def ; object_event constants const UNIONCAVE1F_POKEFAN_M1 const UNIONCAVE1F_SUPER_NERD const UNIONCAVE1F_POKEFAN_M2 diff --git a/maps/UnionCaveB1F.asm b/maps/UnionCaveB1F.asm index 10ed31e30..f7412c055 100644 --- a/maps/UnionCaveB1F.asm +++ b/maps/UnionCaveB1F.asm @@ -1,4 +1,4 @@ - const_def 2 ; object constants + object_const_def ; object_event constants const UNIONCAVEB1F_POKEFAN_M1 const UNIONCAVEB1F_POKEFAN_M2 const UNIONCAVEB1F_SUPER_NERD1 diff --git a/maps/UnionCaveB2F.asm b/maps/UnionCaveB2F.asm index d24e263c0..4c19854b3 100644 --- a/maps/UnionCaveB2F.asm +++ b/maps/UnionCaveB2F.asm @@ -1,4 +1,4 @@ - const_def 2 ; object constants + object_const_def ; object_event constants const UNIONCAVEB2F_ROCKER const UNIONCAVEB2F_COOLTRAINER_F1 const UNIONCAVEB2F_COOLTRAINER_F2 diff --git a/maps/VermilionCity.asm b/maps/VermilionCity.asm index de1b34d17..d6d5fa6de 100644 --- a/maps/VermilionCity.asm +++ b/maps/VermilionCity.asm @@ -1,4 +1,4 @@ - const_def 2 ; object constants + object_const_def ; object_event constants const VERMILIONCITY_TEACHER const VERMILIONCITY_GRAMPS const VERMILIONCITY_MACHOP diff --git a/maps/VermilionDiglettsCaveSpeechHouse.asm b/maps/VermilionDiglettsCaveSpeechHouse.asm index e6225afa5..1113ef8b7 100644 --- a/maps/VermilionDiglettsCaveSpeechHouse.asm +++ b/maps/VermilionDiglettsCaveSpeechHouse.asm @@ -1,4 +1,4 @@ - const_def 2 ; object constants + object_const_def ; object_event constants const VERMILIONDIGLETTSCAVESPEECHHOUSE_GENTLEMAN VermilionDiglettsCaveSpeechHouse_MapScripts: diff --git a/maps/VermilionFishingSpeechHouse.asm b/maps/VermilionFishingSpeechHouse.asm index dd333af75..ed547b7f2 100644 --- a/maps/VermilionFishingSpeechHouse.asm +++ b/maps/VermilionFishingSpeechHouse.asm @@ -1,4 +1,4 @@ - const_def 2 ; object constants + object_const_def ; object_event constants const VERMILIONFISHINGSPEECHHOUSE_FISHING_GURU VermilionFishingSpeechHouse_MapScripts: diff --git a/maps/VermilionGym.asm b/maps/VermilionGym.asm index 3a9c3f7bf..79595660f 100644 --- a/maps/VermilionGym.asm +++ b/maps/VermilionGym.asm @@ -1,4 +1,4 @@ - const_def 2 ; object constants + object_const_def ; object_event constants const VERMILIONGYM_SURGE const VERMILIONGYM_GENTLEMAN const VERMILIONGYM_ROCKER diff --git a/maps/VermilionMagnetTrainSpeechHouse.asm b/maps/VermilionMagnetTrainSpeechHouse.asm index db7f34db7..0b87e3cd3 100644 --- a/maps/VermilionMagnetTrainSpeechHouse.asm +++ b/maps/VermilionMagnetTrainSpeechHouse.asm @@ -1,4 +1,4 @@ - const_def 2 ; object constants + object_const_def ; object_event constants const VERMILIONMAGNETTRAINSPEECHHOUSE_POKEFAN_F const VERMILIONMAGNETTRAINSPEECHHOUSE_YOUNGSTER diff --git a/maps/VermilionMart.asm b/maps/VermilionMart.asm index a258df7bf..cd5401c15 100644 --- a/maps/VermilionMart.asm +++ b/maps/VermilionMart.asm @@ -1,4 +1,4 @@ - const_def 2 ; object constants + object_const_def ; object_event constants const VERMILIONMART_CLERK const VERMILIONMART_SUPER_NERD const VERMILIONMART_BUENA diff --git a/maps/VermilionPokecenter1F.asm b/maps/VermilionPokecenter1F.asm index c5ab46c3d..ffb09d70a 100644 --- a/maps/VermilionPokecenter1F.asm +++ b/maps/VermilionPokecenter1F.asm @@ -1,4 +1,4 @@ - const_def 2 ; object constants + object_const_def ; object_event constants const VERMILIONPOKECENTER1F_NURSE const VERMILIONPOKECENTER1F_FISHING_GURU const VERMILIONPOKECENTER1F_SAILOR diff --git a/maps/VermilionPort.asm b/maps/VermilionPort.asm index 68bc69e8b..bba156b39 100644 --- a/maps/VermilionPort.asm +++ b/maps/VermilionPort.asm @@ -1,4 +1,4 @@ - const_def 2 ; object constants + object_const_def ; object_event constants const VERMILIONPORT_SAILOR1 const VERMILIONPORT_SAILOR2 const VERMILIONPORT_SUPER_NERD diff --git a/maps/VermilionPortPassage.asm b/maps/VermilionPortPassage.asm index 1ea12457a..09894fdd5 100644 --- a/maps/VermilionPortPassage.asm +++ b/maps/VermilionPortPassage.asm @@ -1,4 +1,4 @@ - const_def 2 ; object constants + object_const_def ; object_event constants const VERMILIONPORTPASSAGE_TEACHER VermilionPortPassage_MapScripts: diff --git a/maps/VictoryRoad.asm b/maps/VictoryRoad.asm index c8e05bf1d..69f782762 100644 --- a/maps/VictoryRoad.asm +++ b/maps/VictoryRoad.asm @@ -1,4 +1,4 @@ - const_def 2 ; object constants + object_const_def ; object_event constants const VICTORYROAD_SILVER const VICTORYROAD_POKE_BALL1 const VICTORYROAD_POKE_BALL2 diff --git a/maps/VictoryRoadGate.asm b/maps/VictoryRoadGate.asm index 6aebf4378..1c2637a24 100644 --- a/maps/VictoryRoadGate.asm +++ b/maps/VictoryRoadGate.asm @@ -1,4 +1,4 @@ - const_def 2 ; object constants + object_const_def ; object_event constants const VICTORYROADGATE_OFFICER const VICTORYROADGATE_BLACK_BELT1 const VICTORYROADGATE_BLACK_BELT2 diff --git a/maps/VioletCity.asm b/maps/VioletCity.asm index cce516cd5..2a880da6a 100644 --- a/maps/VioletCity.asm +++ b/maps/VioletCity.asm @@ -1,4 +1,4 @@ - const_def 2 ; object constants + object_const_def ; object_event constants const VIOLETCITY_EARL const VIOLETCITY_LASS const VIOLETCITY_SUPER_NERD diff --git a/maps/VioletGym.asm b/maps/VioletGym.asm index 4d8c8f7dc..3a2912c37 100644 --- a/maps/VioletGym.asm +++ b/maps/VioletGym.asm @@ -1,4 +1,4 @@ - const_def 2 ; object constants + object_const_def ; object_event constants const VIOLETGYM_FALKNER const VIOLETGYM_YOUNGSTER1 const VIOLETGYM_YOUNGSTER2 diff --git a/maps/VioletKylesHouse.asm b/maps/VioletKylesHouse.asm index eb9062708..95dc95e8f 100644 --- a/maps/VioletKylesHouse.asm +++ b/maps/VioletKylesHouse.asm @@ -1,4 +1,4 @@ - const_def 2 ; object constants + object_const_def ; object_event constants const VIOLETKYLESHOUSE_POKEFAN_M const VIOLETKYLESHOUSE_KYLE diff --git a/maps/VioletMart.asm b/maps/VioletMart.asm index d3e4ce73c..ff3898753 100644 --- a/maps/VioletMart.asm +++ b/maps/VioletMart.asm @@ -1,4 +1,4 @@ - const_def 2 ; object constants + object_const_def ; object_event constants const VIOLETMART_CLERK const VIOLETMART_GRANNY const VIOLETMART_COOLTRAINER_M diff --git a/maps/VioletNicknameSpeechHouse.asm b/maps/VioletNicknameSpeechHouse.asm index ec2747865..b193bf01d 100644 --- a/maps/VioletNicknameSpeechHouse.asm +++ b/maps/VioletNicknameSpeechHouse.asm @@ -1,4 +1,4 @@ - const_def 2 ; object constants + object_const_def ; object_event constants const VIOLETNICKNAMESPEECHHOUSE_TEACHER const VIOLETNICKNAMESPEECHHOUSE_LASS const VIOLETNICKNAMESPEECHHOUSE_BIRD diff --git a/maps/VioletPokecenter1F.asm b/maps/VioletPokecenter1F.asm index 250e3ba67..2124cf27b 100644 --- a/maps/VioletPokecenter1F.asm +++ b/maps/VioletPokecenter1F.asm @@ -1,4 +1,4 @@ - const_def 2 ; object constants + object_const_def ; object_event constants const VIOLETPOKECENTER1F_NURSE const VIOLETPOKECENTER1F_GAMEBOY_KID const VIOLETPOKECENTER1F_GENTLEMAN diff --git a/maps/ViridianCity.asm b/maps/ViridianCity.asm index 2ed7d7441..2a8b0fbd9 100644 --- a/maps/ViridianCity.asm +++ b/maps/ViridianCity.asm @@ -1,4 +1,4 @@ - const_def 2 ; object constants + object_const_def ; object_event constants const VIRIDIANCITY_GRAMPS1 const VIRIDIANCITY_GRAMPS2 const VIRIDIANCITY_FISHER diff --git a/maps/ViridianGym.asm b/maps/ViridianGym.asm index 930ea6603..603b12e59 100644 --- a/maps/ViridianGym.asm +++ b/maps/ViridianGym.asm @@ -1,4 +1,4 @@ - const_def 2 ; object constants + object_const_def ; object_event constants const VIRIDIANGYM_BLUE const VIRIDIANGYM_GYM_GUY diff --git a/maps/ViridianMart.asm b/maps/ViridianMart.asm index 6045fab29..82bbf896b 100644 --- a/maps/ViridianMart.asm +++ b/maps/ViridianMart.asm @@ -1,4 +1,4 @@ - const_def 2 ; object constants + object_const_def ; object_event constants const VIRIDIANMART_CLERK const VIRIDIANMART_LASS const VIRIDIANMART_COOLTRAINER_M diff --git a/maps/ViridianNicknameSpeechHouse.asm b/maps/ViridianNicknameSpeechHouse.asm index 8fd12eb25..58472619b 100644 --- a/maps/ViridianNicknameSpeechHouse.asm +++ b/maps/ViridianNicknameSpeechHouse.asm @@ -1,4 +1,4 @@ - const_def 2 ; object constants + object_const_def ; object_event constants const VIRIDIANNICKNAMESPEECHHOUSE_POKEFAN_M const VIRIDIANNICKNAMESPEECHHOUSE_LASS const VIRIDIANNICKNAMESPEECHHOUSE_SPEARY diff --git a/maps/ViridianPokecenter1F.asm b/maps/ViridianPokecenter1F.asm index 431bda180..0b9349f57 100644 --- a/maps/ViridianPokecenter1F.asm +++ b/maps/ViridianPokecenter1F.asm @@ -1,4 +1,4 @@ - const_def 2 ; object constants + object_const_def ; object_event constants const VIRIDIANPOKECENTER1F_NURSE const VIRIDIANPOKECENTER1F_COOLTRAINER_M const VIRIDIANPOKECENTER1F_COOLTRAINER_F diff --git a/maps/WhirlIslandB1F.asm b/maps/WhirlIslandB1F.asm index a38e53a1d..b456dd86e 100644 --- a/maps/WhirlIslandB1F.asm +++ b/maps/WhirlIslandB1F.asm @@ -1,4 +1,4 @@ - const_def 2 ; object constants + object_const_def ; object_event constants const WHIRLISLANDB1F_POKE_BALL1 const WHIRLISLANDB1F_POKE_BALL2 const WHIRLISLANDB1F_POKE_BALL3 diff --git a/maps/WhirlIslandB2F.asm b/maps/WhirlIslandB2F.asm index acee9670a..87c3ca911 100644 --- a/maps/WhirlIslandB2F.asm +++ b/maps/WhirlIslandB2F.asm @@ -1,4 +1,4 @@ - const_def 2 ; object constants + object_const_def ; object_event constants const WHIRLISLANDB2F_POKE_BALL1 const WHIRLISLANDB2F_POKE_BALL2 const WHIRLISLANDB2F_POKE_BALL3 diff --git a/maps/WhirlIslandLugiaChamber.asm b/maps/WhirlIslandLugiaChamber.asm index de2214c47..1dcdc90c4 100644 --- a/maps/WhirlIslandLugiaChamber.asm +++ b/maps/WhirlIslandLugiaChamber.asm @@ -1,4 +1,4 @@ - const_def 2 ; object constants + object_const_def ; object_event constants const WHIRLISLANDLUGIACHAMBER_LUGIA WhirlIslandLugiaChamber_MapScripts: diff --git a/maps/WhirlIslandNE.asm b/maps/WhirlIslandNE.asm index c13cd7a93..212a35c33 100644 --- a/maps/WhirlIslandNE.asm +++ b/maps/WhirlIslandNE.asm @@ -1,4 +1,4 @@ - const_def 2 ; object constants + object_const_def ; object_event constants const WHIRLISLANDNE_POKE_BALL WhirlIslandNE_MapScripts: diff --git a/maps/WhirlIslandSW.asm b/maps/WhirlIslandSW.asm index 66c3fff23..ba81cae7e 100644 --- a/maps/WhirlIslandSW.asm +++ b/maps/WhirlIslandSW.asm @@ -1,4 +1,4 @@ - const_def 2 ; object constants + object_const_def ; object_event constants const WHIRLISLANDSW_POKE_BALL WhirlIslandSW_MapScripts: diff --git a/maps/WillsRoom.asm b/maps/WillsRoom.asm index dbb2e799f..a2af398b0 100644 --- a/maps/WillsRoom.asm +++ b/maps/WillsRoom.asm @@ -1,4 +1,4 @@ - const_def 2 ; object constants + object_const_def ; object_event constants const WILLSROOM_WILL WillsRoom_MapScripts: diff --git a/maps/WiseTriosRoom.asm b/maps/WiseTriosRoom.asm index ada1a726b..30cdebdf8 100644 --- a/maps/WiseTriosRoom.asm +++ b/maps/WiseTriosRoom.asm @@ -1,4 +1,4 @@ - const_def 2 ; object constants + object_const_def ; object_event constants const WISETRIOSROOM_SAGE1 const WISETRIOSROOM_SAGE2 const WISETRIOSROOM_SAGE3