diff options
350 files changed, 350 insertions, 350 deletions
diff --git a/constants/script_constants.asm b/constants/script_constants.asm index 0cf3b058e..eb7f9b8d6 100644 --- a/constants/script_constants.asm +++ b/constants/script_constants.asm @@ -1,4 +1,4 @@ -; script vars +; person constants PLAYER EQU 0 LAST_TALKED EQU -2 diff --git a/docs/map_event_scripts.md b/docs/map_event_scripts.md index 33f51eb37..129a47fab 100644 --- a/docs/map_event_scripts.md +++ b/docs/map_event_scripts.md @@ -4,7 +4,7 @@ ## Person constants <pre> -const_value set 2 +const_value set 2 ; person constants const <i>MAPNAME</i>_<i>OBJECTNAME</i> </pre> diff --git a/maps/AzaleaGym.asm b/maps/AzaleaGym.asm index b23523a47..3dad852e5 100644 --- a/maps/AzaleaGym.asm +++ b/maps/AzaleaGym.asm @@ -1,4 +1,4 @@ -const_value set 2 +const_value set 2 ; person constants const AZALEAGYM_BUGSY const AZALEAGYM_BUG_CATCHER1 const AZALEAGYM_BUG_CATCHER2 diff --git a/maps/AzaleaMart.asm b/maps/AzaleaMart.asm index 4d8b4997a..0f5d4cde7 100644 --- a/maps/AzaleaMart.asm +++ b/maps/AzaleaMart.asm @@ -1,4 +1,4 @@ -const_value set 2 +const_value set 2 ; person constants const AZALEAMART_CLERK const AZALEAMART_COOLTRAINER_M const AZALEAMART_BUG_CATCHER diff --git a/maps/AzaleaPokecenter1F.asm b/maps/AzaleaPokecenter1F.asm index e644e99f1..fcf04c2a6 100644 --- a/maps/AzaleaPokecenter1F.asm +++ b/maps/AzaleaPokecenter1F.asm @@ -1,4 +1,4 @@ -const_value set 2 +const_value set 2 ; person constants const AZALEAPOKECENTER1F_NURSE const AZALEAPOKECENTER1F_GENTLEMAN const AZALEAPOKECENTER1F_FISHING_GURU diff --git a/maps/AzaleaTown.asm b/maps/AzaleaTown.asm index e9026e05e..3ff773c07 100644 --- a/maps/AzaleaTown.asm +++ b/maps/AzaleaTown.asm @@ -1,4 +1,4 @@ -const_value set 2 +const_value set 2 ; person constants const AZALEATOWN_AZALEA_ROCKET1 const AZALEATOWN_GRAMPS const AZALEATOWN_TEACHER diff --git a/maps/BattleTower1F.asm b/maps/BattleTower1F.asm index 42242bd8c..07dbe0ae2 100644 --- a/maps/BattleTower1F.asm +++ b/maps/BattleTower1F.asm @@ -1,4 +1,4 @@ -const_value set 2 +const_value set 2 ; person constants const BATTLETOWER1F_RECEPTIONIST const BATTLETOWER1F_YOUNGSTER const BATTLETOWER1F_COOLTRAINER_F diff --git a/maps/BattleTowerBattleRoom.asm b/maps/BattleTowerBattleRoom.asm index 24011c144..96f11974e 100644 --- a/maps/BattleTowerBattleRoom.asm +++ b/maps/BattleTowerBattleRoom.asm @@ -1,4 +1,4 @@ -const_value set 2 +const_value set 2 ; person constants const BATTLETOWERBATTLEROOM_YOUNGSTER const BATTLETOWERBATTLEROOM_RECEPTIONIST diff --git a/maps/BattleTowerElevator.asm b/maps/BattleTowerElevator.asm index 1704c3601..ec4b68f21 100644 --- a/maps/BattleTowerElevator.asm +++ b/maps/BattleTowerElevator.asm @@ -1,4 +1,4 @@ -const_value set 2 +const_value set 2 ; person constants const BATTLETOWERELEVATOR_RECEPTIONIST BattleTowerElevator_MapScripts: diff --git a/maps/BattleTowerHallway.asm b/maps/BattleTowerHallway.asm index 3cfc923e0..f4255a378 100644 --- a/maps/BattleTowerHallway.asm +++ b/maps/BattleTowerHallway.asm @@ -1,4 +1,4 @@ -const_value set 2 +const_value set 2 ; person constants const BATTLETOWERHALLWAY_RECEPTIONIST BattleTowerHallway_MapScripts: diff --git a/maps/BattleTowerOutside.asm b/maps/BattleTowerOutside.asm index f9b58af82..b42d43c9c 100644 --- a/maps/BattleTowerOutside.asm +++ b/maps/BattleTowerOutside.asm @@ -1,4 +1,4 @@ -const_value set 2 +const_value set 2 ; person constants const BATTLETOWEROUTSIDE_STANDING_YOUNGSTER const BATTLETOWEROUTSIDE_BUENA const BATTLETOWEROUTSIDE_SAILOR diff --git a/maps/BillsBrothersHouse.asm b/maps/BillsBrothersHouse.asm index ff951b05c..6fbf2f7c2 100644 --- a/maps/BillsBrothersHouse.asm +++ b/maps/BillsBrothersHouse.asm @@ -1,4 +1,4 @@ -const_value set 2 +const_value set 2 ; person constants const BILLSBROTHERSHOUSE_POKEFAN_F const BILLSBROTHERSHOUSE_YOUNGSTER diff --git a/maps/BillsFamilysHouse.asm b/maps/BillsFamilysHouse.asm index 05c757e71..acab1aa10 100644 --- a/maps/BillsFamilysHouse.asm +++ b/maps/BillsFamilysHouse.asm @@ -1,4 +1,4 @@ -const_value set 2 +const_value set 2 ; person constants const BILLSFAMILYSHOUSE_BILL const BILLSFAMILYSHOUSE_POKEFAN_F const BILLSFAMILYSHOUSE_TWIN diff --git a/maps/BillsHouse.asm b/maps/BillsHouse.asm index f27b4a5a3..33c7372d2 100644 --- a/maps/BillsHouse.asm +++ b/maps/BillsHouse.asm @@ -1,4 +1,4 @@ -const_value set 2 +const_value set 2 ; person constants const BILLSHOUSE_GRAMPS BillsHouse_MapScripts: diff --git a/maps/BlackthornCity.asm b/maps/BlackthornCity.asm index edc4e2f66..648f37f32 100644 --- a/maps/BlackthornCity.asm +++ b/maps/BlackthornCity.asm @@ -1,4 +1,4 @@ -const_value set 2 +const_value set 2 ; person constants const BLACKTHORNCITY_SUPER_NERD1 const BLACKTHORNCITY_SUPER_NERD2 const BLACKTHORNCITY_GRAMPS1 diff --git a/maps/BlackthornDragonSpeechHouse.asm b/maps/BlackthornDragonSpeechHouse.asm index 3ee16fefc..bf3bb9772 100644 --- a/maps/BlackthornDragonSpeechHouse.asm +++ b/maps/BlackthornDragonSpeechHouse.asm @@ -1,4 +1,4 @@ -const_value set 2 +const_value set 2 ; person constants const BLACKTHORNDRAGONSPEECHHOUSE_GRANNY const BLACKTHORNDRAGONSPEECHHOUSE_EKANS diff --git a/maps/BlackthornEmysHouse.asm b/maps/BlackthornEmysHouse.asm index 21599704c..189d928f7 100644 --- a/maps/BlackthornEmysHouse.asm +++ b/maps/BlackthornEmysHouse.asm @@ -1,4 +1,4 @@ -const_value set 2 +const_value set 2 ; person constants const BLACKTHORNEMYSHOUSE_EMY BlackthornEmysHouse_MapScripts: diff --git a/maps/BlackthornGym1F.asm b/maps/BlackthornGym1F.asm index 2f3f22971..9e6c06ee9 100644 --- a/maps/BlackthornGym1F.asm +++ b/maps/BlackthornGym1F.asm @@ -1,4 +1,4 @@ -const_value set 2 +const_value set 2 ; person constants const BLACKTHORNGYM1F_CLAIR const BLACKTHORNGYM1F_COOLTRAINER_M1 const BLACKTHORNGYM1F_COOLTRAINER_M2 diff --git a/maps/BlackthornGym2F.asm b/maps/BlackthornGym2F.asm index 2417a14b1..2a809027f 100644 --- a/maps/BlackthornGym2F.asm +++ b/maps/BlackthornGym2F.asm @@ -1,4 +1,4 @@ -const_value set 2 +const_value set 2 ; person constants const BLACKTHORNGYM2F_COOLTRAINER_M const BLACKTHORNGYM2F_COOLTRAINER_F const BLACKTHORNGYM2F_BOULDER1 diff --git a/maps/BlackthornMart.asm b/maps/BlackthornMart.asm index 0272436fd..48a75323b 100644 --- a/maps/BlackthornMart.asm +++ b/maps/BlackthornMart.asm @@ -1,4 +1,4 @@ -const_value set 2 +const_value set 2 ; person constants const BLACKTHORNMART_CLERK const BLACKTHORNMART_COOLTRAINER_M const BLACKTHORNMART_BLACK_BELT diff --git a/maps/BlackthornPokecenter1F.asm b/maps/BlackthornPokecenter1F.asm index e7baf90d9..b27bd816c 100644 --- a/maps/BlackthornPokecenter1F.asm +++ b/maps/BlackthornPokecenter1F.asm @@ -1,4 +1,4 @@ -const_value set 2 +const_value set 2 ; person constants const BLACKTHORNPOKECENTER1F_NURSE const BLACKTHORNPOKECENTER1F_GENTLEMAN const BLACKTHORNPOKECENTER1F_TWIN diff --git a/maps/BluesHouse.asm b/maps/BluesHouse.asm index e6283bd40..e2ab5e1de 100644 --- a/maps/BluesHouse.asm +++ b/maps/BluesHouse.asm @@ -1,4 +1,4 @@ -const_value set 2 +const_value set 2 ; person constants const BLUESHOUSE_DAISY BluesHouse_MapScripts: diff --git a/maps/BrunosRoom.asm b/maps/BrunosRoom.asm index ef1557c03..371003777 100644 --- a/maps/BrunosRoom.asm +++ b/maps/BrunosRoom.asm @@ -1,4 +1,4 @@ -const_value set 2 +const_value set 2 ; person constants const BRUNOSROOM_BRUNO BrunosRoom_MapScripts: diff --git a/maps/BurnedTower1F.asm b/maps/BurnedTower1F.asm index fb7b950f5..f60c64237 100644 --- a/maps/BurnedTower1F.asm +++ b/maps/BurnedTower1F.asm @@ -1,4 +1,4 @@ -const_value set 2 +const_value set 2 ; person constants const BURNEDTOWER1F_ROCK const BURNEDTOWER1F_EUSINE const BURNEDTOWER1F_SILVER diff --git a/maps/BurnedTowerB1F.asm b/maps/BurnedTowerB1F.asm index 0f1059349..9d383f8a2 100644 --- a/maps/BurnedTowerB1F.asm +++ b/maps/BurnedTowerB1F.asm @@ -1,4 +1,4 @@ -const_value set 2 +const_value set 2 ; person constants const BURNEDTOWERB1F_BOULDER const BURNEDTOWERB1F_RAIKOU1 const BURNEDTOWERB1F_ENTEI1 diff --git a/maps/CeladonCafe.asm b/maps/CeladonCafe.asm index 8d2d04824..81934496e 100644 --- a/maps/CeladonCafe.asm +++ b/maps/CeladonCafe.asm @@ -1,4 +1,4 @@ -const_value set 2 +const_value set 2 ; person constants const CELADONCAFE_SUPER_NERD const CELADONCAFE_FISHER1 const CELADONCAFE_FISHER2 diff --git a/maps/CeladonCity.asm b/maps/CeladonCity.asm index e7e62ac4e..cc1c22649 100644 --- a/maps/CeladonCity.asm +++ b/maps/CeladonCity.asm @@ -1,4 +1,4 @@ -const_value set 2 +const_value set 2 ; person constants const CELADONCITY_FISHER const CELADONCITY_POLIWAG const CELADONCITY_TEACHER1 diff --git a/maps/CeladonDeptStore1F.asm b/maps/CeladonDeptStore1F.asm index 5eede6743..9f43067a9 100644 --- a/maps/CeladonDeptStore1F.asm +++ b/maps/CeladonDeptStore1F.asm @@ -1,4 +1,4 @@ -const_value set 2 +const_value set 2 ; person constants const CELADONDEPTSTORE1F_RECEPTIONIST const CELADONDEPTSTORE1F_GENTLEMAN const CELADONDEPTSTORE1F_TEACHER diff --git a/maps/CeladonDeptStore2F.asm b/maps/CeladonDeptStore2F.asm index 4ec78cb6f..44aa1591c 100644 --- a/maps/CeladonDeptStore2F.asm +++ b/maps/CeladonDeptStore2F.asm @@ -1,4 +1,4 @@ -const_value set 2 +const_value set 2 ; person constants const CELADONDEPTSTORE2F_CLERK1 const CELADONDEPTSTORE2F_CLERK2 const CELADONDEPTSTORE2F_POKEFAN_M diff --git a/maps/CeladonDeptStore3F.asm b/maps/CeladonDeptStore3F.asm index 4950dee28..718ec6491 100644 --- a/maps/CeladonDeptStore3F.asm +++ b/maps/CeladonDeptStore3F.asm @@ -1,4 +1,4 @@ -const_value set 2 +const_value set 2 ; person constants const CELADONDEPTSTORE3F_CLERK const CELADONDEPTSTORE3F_YOUNGSTER const CELADONDEPTSTORE3F_GAMEBOY_KID1 diff --git a/maps/CeladonDeptStore4F.asm b/maps/CeladonDeptStore4F.asm index 1d8e8e7fc..a0034dcb0 100644 --- a/maps/CeladonDeptStore4F.asm +++ b/maps/CeladonDeptStore4F.asm @@ -1,4 +1,4 @@ -const_value set 2 +const_value set 2 ; person constants const CELADONDEPTSTORE4F_CLERK const CELADONDEPTSTORE4F_SUPER_NERD const CELADONDEPTSTORE4F_YOUNGSTER diff --git a/maps/CeladonDeptStore5F.asm b/maps/CeladonDeptStore5F.asm index 63c65acab..c2d6ecfa5 100644 --- a/maps/CeladonDeptStore5F.asm +++ b/maps/CeladonDeptStore5F.asm @@ -1,4 +1,4 @@ -const_value set 2 +const_value set 2 ; person constants const CELADONDEPTSTORE5F_CLERK1 const CELADONDEPTSTORE5F_CLERK2 const CELADONDEPTSTORE5F_GENTLEMAN diff --git a/maps/CeladonDeptStore6F.asm b/maps/CeladonDeptStore6F.asm index f70a7d725..f5a64328d 100644 --- a/maps/CeladonDeptStore6F.asm +++ b/maps/CeladonDeptStore6F.asm @@ -1,4 +1,4 @@ -const_value set 2 +const_value set 2 ; person constants const CELADONDEPTSTORE6F_SUPER_NERD const CELADONDEPTSTORE6F_YOUNGSTER diff --git a/maps/CeladonGameCorner.asm b/maps/CeladonGameCorner.asm index 1c213bacf..394d4a932 100644 --- a/maps/CeladonGameCorner.asm +++ b/maps/CeladonGameCorner.asm @@ -1,4 +1,4 @@ -const_value set 2 +const_value set 2 ; person constants const CELADONGAMECORNER_CLERK const CELADONGAMECORNER_RECEPTIONIST const CELADONGAMECORNER_POKEFAN_M diff --git a/maps/CeladonGameCornerPrizeRoom.asm b/maps/CeladonGameCornerPrizeRoom.asm index cc64e736e..12b3aa4dc 100644 --- a/maps/CeladonGameCornerPrizeRoom.asm +++ b/maps/CeladonGameCornerPrizeRoom.asm @@ -1,4 +1,4 @@ -const_value set 2 +const_value set 2 ; person constants const CELADONGAMECORNERPRIZEROOM_GENTLEMAN const CELADONGAMECORNERPRIZEROOM_PHARMACIST diff --git a/maps/CeladonGym.asm b/maps/CeladonGym.asm index 1c6e1169c..0f5218d6c 100644 --- a/maps/CeladonGym.asm +++ b/maps/CeladonGym.asm @@ -1,4 +1,4 @@ -const_value set 2 +const_value set 2 ; person constants const CELADONGYM_ERIKA const CELADONGYM_LASS1 const CELADONGYM_LASS2 diff --git a/maps/CeladonMansion1F.asm b/maps/CeladonMansion1F.asm index 5d14663a9..fad635f28 100644 --- a/maps/CeladonMansion1F.asm +++ b/maps/CeladonMansion1F.asm @@ -1,4 +1,4 @@ -const_value set 2 +const_value set 2 ; person constants const CELADONMANSION1F_GRANNY const CELADONMANSION1F_GROWLITHE1 const CELADONMANSION1F_CLEFAIRY diff --git a/maps/CeladonMansion3F.asm b/maps/CeladonMansion3F.asm index 39ac12d7a..c002bf2b3 100644 --- a/maps/CeladonMansion3F.asm +++ b/maps/CeladonMansion3F.asm @@ -1,4 +1,4 @@ -const_value set 2 +const_value set 2 ; person constants const CELADONMANSION3F_COOLTRAINER_M const CELADONMANSION3F_GYM_GUY const CELADONMANSION3F_SUPER_NERD diff --git a/maps/CeladonMansionRoof.asm b/maps/CeladonMansionRoof.asm index 254000bd1..862f4d6cc 100644 --- a/maps/CeladonMansionRoof.asm +++ b/maps/CeladonMansionRoof.asm @@ -1,4 +1,4 @@ -const_value set 2 +const_value set 2 ; person constants const CELADONMANSIONROOF_FISHER CeladonMansionRoof_MapScripts: diff --git a/maps/CeladonMansionRoofHouse.asm b/maps/CeladonMansionRoofHouse.asm index b82709b6c..008c967dc 100644 --- a/maps/CeladonMansionRoofHouse.asm +++ b/maps/CeladonMansionRoofHouse.asm @@ -1,4 +1,4 @@ -const_value set 2 +const_value set 2 ; person constants const CELADONMANSIONROOFHOUSE_PHARMACIST CeladonMansionRoofHouse_MapScripts: diff --git a/maps/CeladonPokecenter1F.asm b/maps/CeladonPokecenter1F.asm index 0590da32d..35b488600 100644 --- a/maps/CeladonPokecenter1F.asm +++ b/maps/CeladonPokecenter1F.asm @@ -1,4 +1,4 @@ -const_value set 2 +const_value set 2 ; person constants const CELADONPOKECENTER1F_NURSE const CELADONPOKECENTER1F_GENTLEMAN const CELADONPOKECENTER1F_PHARMACIST diff --git a/maps/CeruleanCity.asm b/maps/CeruleanCity.asm index 6fa79be19..d65c1a9b8 100644 --- a/maps/CeruleanCity.asm +++ b/maps/CeruleanCity.asm @@ -1,4 +1,4 @@ -const_value set 2 +const_value set 2 ; person constants const CERULEANCITY_COOLTRAINER_M const CERULEANCITY_SUPER_NERD const CERULEANCITY_SLOWPOKE diff --git a/maps/CeruleanGym.asm b/maps/CeruleanGym.asm index f43cf4d12..148a535af 100644 --- a/maps/CeruleanGym.asm +++ b/maps/CeruleanGym.asm @@ -1,4 +1,4 @@ -const_value set 2 +const_value set 2 ; person constants const CERULEANGYM_ROCKET const CERULEANGYM_MISTY const CERULEANGYM_SWIMMER_GIRL1 diff --git a/maps/CeruleanGymBadgeSpeechHouse.asm b/maps/CeruleanGymBadgeSpeechHouse.asm index 19b60dfdb..3294aa1a0 100644 --- a/maps/CeruleanGymBadgeSpeechHouse.asm +++ b/maps/CeruleanGymBadgeSpeechHouse.asm @@ -1,4 +1,4 @@ -const_value set 2 +const_value set 2 ; person constants const CERULEANGYMBADGESPEECHHOUSE_POKEFAN_M CeruleanGymBadgeSpeechHouse_MapScripts: diff --git a/maps/CeruleanMart.asm b/maps/CeruleanMart.asm index d66986a89..ba11d432c 100644 --- a/maps/CeruleanMart.asm +++ b/maps/CeruleanMart.asm @@ -1,4 +1,4 @@ -const_value set 2 +const_value set 2 ; person constants const CERULEANMART_CLERK const CERULEANMART_COOLTRAINER_M const CERULEANMART_COOLTRAINER_F diff --git a/maps/CeruleanPokecenter1F.asm b/maps/CeruleanPokecenter1F.asm index 7988f7154..81851f02b 100644 --- a/maps/CeruleanPokecenter1F.asm +++ b/maps/CeruleanPokecenter1F.asm @@ -1,4 +1,4 @@ -const_value set 2 +const_value set 2 ; person constants const CERULEANPOKECENTER1F_NURSE const CERULEANPOKECENTER1F_SUPER_NERD const CERULEANPOKECENTER1F_GYM_GUY diff --git a/maps/CeruleanPoliceStation.asm b/maps/CeruleanPoliceStation.asm index 7adaba556..5f1a44fe3 100644 --- a/maps/CeruleanPoliceStation.asm +++ b/maps/CeruleanPoliceStation.asm @@ -1,4 +1,4 @@ -const_value set 2 +const_value set 2 ; person constants const CERULEANPOLICESTATION_FISHING_GURU const CERULEANPOLICESTATION_POKEFAN_F const CERULEANPOLICESTATION_DIGLETT diff --git a/maps/CeruleanTradeSpeechHouse.asm b/maps/CeruleanTradeSpeechHouse.asm index 785b43cc9..7e33a1b5c 100644 --- a/maps/CeruleanTradeSpeechHouse.asm +++ b/maps/CeruleanTradeSpeechHouse.asm @@ -1,4 +1,4 @@ -const_value set 2 +const_value set 2 ; person constants const CERULEANTRADESPEECHHOUSE_GRANNY const CERULEANTRADESPEECHHOUSE_GRAMPS const CERULEANTRADESPEECHHOUSE_RHYDON diff --git a/maps/CharcoalKiln.asm b/maps/CharcoalKiln.asm index 91ee79e25..1f9465743 100644 --- a/maps/CharcoalKiln.asm +++ b/maps/CharcoalKiln.asm @@ -1,4 +1,4 @@ -const_value set 2 +const_value set 2 ; person constants const CHARCOALKILN_BLACK_BELT const CHARCOALKILN_YOUNGSTER const CHARCOALKILN_MOLTRES diff --git a/maps/CherrygroveCity.asm b/maps/CherrygroveCity.asm index 4df1fd299..d92bcff1b 100644 --- a/maps/CherrygroveCity.asm +++ b/maps/CherrygroveCity.asm @@ -1,4 +1,4 @@ -const_value set 2 +const_value set 2 ; person constants const CHERRYGROVECITY_GRAMPS const CHERRYGROVECITY_SILVER const CHERRYGROVECITY_TEACHER diff --git a/maps/CherrygroveEvolutionSpeechHouse.asm b/maps/CherrygroveEvolutionSpeechHouse.asm index 8ecad6337..a111f7409 100644 --- a/maps/CherrygroveEvolutionSpeechHouse.asm +++ b/maps/CherrygroveEvolutionSpeechHouse.asm @@ -1,4 +1,4 @@ -const_value set 2 +const_value set 2 ; person constants const CHERRYGROVEEVOLUTIONSPEECHHOUSE_LASS const CHERRYGROVEEVOLUTIONSPEECHHOUSE_YOUNGSTER diff --git a/maps/CherrygroveGymSpeechHouse.asm b/maps/CherrygroveGymSpeechHouse.asm index df5c588c6..e0c2ffb8e 100644 --- a/maps/CherrygroveGymSpeechHouse.asm +++ b/maps/CherrygroveGymSpeechHouse.asm @@ -1,4 +1,4 @@ -const_value set 2 +const_value set 2 ; person constants const CHERRYGROVEGYMSPEECHHOUSE_POKEFAN_M const CHERRYGROVEGYMSPEECHHOUSE_BUG_CATCHER diff --git a/maps/CherrygroveMart.asm b/maps/CherrygroveMart.asm index 7ccc16f59..cdf5268f4 100644 --- a/maps/CherrygroveMart.asm +++ b/maps/CherrygroveMart.asm @@ -1,4 +1,4 @@ -const_value set 2 +const_value set 2 ; person constants const CHERRYGROVEMART_CLERK const CHERRYGROVEMART_COOLTRAINER_M const CHERRYGROVEMART_YOUNGSTER diff --git a/maps/CherrygrovePokecenter1F.asm b/maps/CherrygrovePokecenter1F.asm index abc16919f..9b6afa0c8 100644 --- a/maps/CherrygrovePokecenter1F.asm +++ b/maps/CherrygrovePokecenter1F.asm @@ -1,4 +1,4 @@ -const_value set 2 +const_value set 2 ; person constants const CHERRYGROVEPOKECENTER1F_NURSE const CHERRYGROVEPOKECENTER1F_FISHER const CHERRYGROVEPOKECENTER1F_GENTLEMAN diff --git a/maps/CianwoodCity.asm b/maps/CianwoodCity.asm index c7fa3e8b0..f269c2a87 100644 --- a/maps/CianwoodCity.asm +++ b/maps/CianwoodCity.asm @@ -1,4 +1,4 @@ -const_value set 2 +const_value set 2 ; person constants const CIANWOODCITY_STANDING_YOUNGSTER const CIANWOODCITY_POKEFAN_M const CIANWOODCITY_LASS diff --git a/maps/CianwoodGym.asm b/maps/CianwoodGym.asm index fd4109957..82053ae14 100644 --- a/maps/CianwoodGym.asm +++ b/maps/CianwoodGym.asm @@ -1,4 +1,4 @@ -const_value set 2 +const_value set 2 ; person constants const CIANWOODGYM_CHUCK const CIANWOODGYM_BLACK_BELT1 const CIANWOODGYM_BLACK_BELT2 diff --git a/maps/CianwoodLugiaSpeechHouse.asm b/maps/CianwoodLugiaSpeechHouse.asm index 1049d5280..aa02289a6 100644 --- a/maps/CianwoodLugiaSpeechHouse.asm +++ b/maps/CianwoodLugiaSpeechHouse.asm @@ -1,4 +1,4 @@ -const_value set 2 +const_value set 2 ; person constants const CIANWOODLUGIASPEECHHOUSE_TEACHER const CIANWOODLUGIASPEECHHOUSE_LASS const CIANWOODLUGIASPEECHHOUSE_TWIN diff --git a/maps/CianwoodPharmacy.asm b/maps/CianwoodPharmacy.asm index 8bb278e3d..ecbcb72da 100644 --- a/maps/CianwoodPharmacy.asm +++ b/maps/CianwoodPharmacy.asm @@ -1,4 +1,4 @@ -const_value set 2 +const_value set 2 ; person constants const CIANWOODPHARMACY_PHARMACIST CianwoodPharmacy_MapScripts: diff --git a/maps/CianwoodPhotoStudio.asm b/maps/CianwoodPhotoStudio.asm index 956d64948..bc857b575 100644 --- a/maps/CianwoodPhotoStudio.asm +++ b/maps/CianwoodPhotoStudio.asm @@ -1,4 +1,4 @@ -const_value set 2 +const_value set 2 ; person constants const CIANWOODPHOTOSTUDIO_FISHING_GURU CianwoodPhotoStudio_MapScripts: diff --git a/maps/CianwoodPokecenter1F.asm b/maps/CianwoodPokecenter1F.asm index 3b7e41f17..e10e93f0d 100644 --- a/maps/CianwoodPokecenter1F.asm +++ b/maps/CianwoodPokecenter1F.asm @@ -1,4 +1,4 @@ -const_value set 2 +const_value set 2 ; person constants const CIANWOODPOKECENTER1F_NURSE const CIANWOODPOKECENTER1F_LASS const CIANWOODPOKECENTER1F_GYM_GUY diff --git a/maps/CinnabarIsland.asm b/maps/CinnabarIsland.asm index 021da6387..7d0f4655f 100644 --- a/maps/CinnabarIsland.asm +++ b/maps/CinnabarIsland.asm @@ -1,4 +1,4 @@ -const_value set 2 +const_value set 2 ; person constants const CINNABARISLAND_BLUE CinnabarIsland_MapScripts: diff --git a/maps/CinnabarPokecenter1F.asm b/maps/CinnabarPokecenter1F.asm index c5f5956e9..09f36ce2b 100644 --- a/maps/CinnabarPokecenter1F.asm +++ b/maps/CinnabarPokecenter1F.asm @@ -1,4 +1,4 @@ -const_value set 2 +const_value set 2 ; person constants const CINNABARPOKECENTER1F_NURSE const CINNABARPOKECENTER1F_COOLTRAINER_F const CINNABARPOKECENTER1F_FISHER diff --git a/maps/Colosseum.asm b/maps/Colosseum.asm index 7dd4083a9..856a80058 100644 --- a/maps/Colosseum.asm +++ b/maps/Colosseum.asm @@ -1,4 +1,4 @@ -const_value set 2 +const_value set 2 ; person constants const COLOSSEUM_CHRIS1 const COLOSSEUM_CHRIS2 diff --git a/maps/CopycatsHouse1F.asm b/maps/CopycatsHouse1F.asm index 96249fe8d..df321aabf 100644 --- a/maps/CopycatsHouse1F.asm +++ b/maps/CopycatsHouse1F.asm @@ -1,4 +1,4 @@ -const_value set 2 +const_value set 2 ; person constants const COPYCATSHOUSE1F_POKEFAN_M const COPYCATSHOUSE1F_POKEFAN_F const COPYCATSHOUSE1F_CLEFAIRY diff --git a/maps/CopycatsHouse2F.asm b/maps/CopycatsHouse2F.asm index 722b39dcc..819d18eda 100644 --- a/maps/CopycatsHouse2F.asm +++ b/maps/CopycatsHouse2F.asm @@ -1,4 +1,4 @@ -const_value set 2 +const_value set 2 ; person 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 fa3c4abca..37c2f9264 100644 --- a/maps/DanceTheatre.asm +++ b/maps/DanceTheatre.asm @@ -1,4 +1,4 @@ -const_value set 2 +const_value set 2 ; person constants const DANCETHEATRE_KIMONO_GIRL1 const DANCETHEATRE_KIMONO_GIRL2 const DANCETHEATRE_KIMONO_GIRL3 diff --git a/maps/DarkCaveBlackthornEntrance.asm b/maps/DarkCaveBlackthornEntrance.asm index cbc858e70..8b1c2a772 100644 --- a/maps/DarkCaveBlackthornEntrance.asm +++ b/maps/DarkCaveBlackthornEntrance.asm @@ -1,4 +1,4 @@ -const_value set 2 +const_value set 2 ; person constants const DARKCAVEBLACKTHORNENTRANCE_PHARMACIST const DARKCAVEBLACKTHORNENTRANCE_POKE_BALL1 const DARKCAVEBLACKTHORNENTRANCE_POKE_BALL2 diff --git a/maps/DarkCaveVioletEntrance.asm b/maps/DarkCaveVioletEntrance.asm index 733f260f0..60b0b92bc 100644 --- a/maps/DarkCaveVioletEntrance.asm +++ b/maps/DarkCaveVioletEntrance.asm @@ -1,4 +1,4 @@ -const_value set 2 +const_value set 2 ; person constants const DARKCAVEVIOLETENTRANCE_POKE_BALL1 const DARKCAVEVIOLETENTRANCE_ROCK1 const DARKCAVEVIOLETENTRANCE_ROCK2 diff --git a/maps/DayCare.asm b/maps/DayCare.asm index e6b3ea986..f6d4b6693 100644 --- a/maps/DayCare.asm +++ b/maps/DayCare.asm @@ -1,4 +1,4 @@ -const_value set 2 +const_value set 2 ; person constants const DAYCARE_GRAMPS const DAYCARE_GRANNY diff --git a/maps/DayOfWeekSiblingsHouse.asm b/maps/DayOfWeekSiblingsHouse.asm index b88641ef0..c5d900300 100644 --- a/maps/DayOfWeekSiblingsHouse.asm +++ b/maps/DayOfWeekSiblingsHouse.asm @@ -1,4 +1,4 @@ -const_value set 2 +const_value set 2 ; person constants const DAYOFWEEKSIBLINGSHOUSE_POKEDEX DayOfWeekSiblingsHouse_MapScripts: diff --git a/maps/DiglettsCave.asm b/maps/DiglettsCave.asm index 74ed60bc9..e1eaba04a 100644 --- a/maps/DiglettsCave.asm +++ b/maps/DiglettsCave.asm @@ -1,4 +1,4 @@ -const_value set 2 +const_value set 2 ; person constants const DIGLETTSCAVE_POKEFAN_M DiglettsCave_MapScripts: diff --git a/maps/DragonShrine.asm b/maps/DragonShrine.asm index eb8485e5e..50baf8455 100644 --- a/maps/DragonShrine.asm +++ b/maps/DragonShrine.asm @@ -1,4 +1,4 @@ -const_value set 2 +const_value set 2 ; person constants const DRAGONSHRINE_ELDER1 const DRAGONSHRINE_ELDER2 const DRAGONSHRINE_ELDER3 diff --git a/maps/DragonsDenB1F.asm b/maps/DragonsDenB1F.asm index 4f2545a5a..cb25c8603 100644 --- a/maps/DragonsDenB1F.asm +++ b/maps/DragonsDenB1F.asm @@ -1,4 +1,4 @@ -const_value set 2 +const_value set 2 ; person constants const DRAGONSDENB1F_POKE_BALL1 const DRAGONSDENB1F_CLAIR const DRAGONSDENB1F_SILVER diff --git a/maps/EarlsPokemonAcademy.asm b/maps/EarlsPokemonAcademy.asm index e650fa409..47e70add1 100644 --- a/maps/EarlsPokemonAcademy.asm +++ b/maps/EarlsPokemonAcademy.asm @@ -1,4 +1,4 @@ -const_value set 2 +const_value set 2 ; person constants const EARLSPOKEMONACADEMY_EARL const EARLSPOKEMONACADEMY_YOUNGSTER1 const EARLSPOKEMONACADEMY_GAMEBOY_KID1 diff --git a/maps/EcruteakCity.asm b/maps/EcruteakCity.asm index c23c36c0e..1fb53baf5 100644 --- a/maps/EcruteakCity.asm +++ b/maps/EcruteakCity.asm @@ -1,4 +1,4 @@ -const_value set 2 +const_value set 2 ; person constants const ECRUTEAKCITY_GRAMPS1 const ECRUTEAKCITY_GRAMPS2 const ECRUTEAKCITY_LASS1 diff --git a/maps/EcruteakGym.asm b/maps/EcruteakGym.asm index 176d6a370..820fce044 100644 --- a/maps/EcruteakGym.asm +++ b/maps/EcruteakGym.asm @@ -1,4 +1,4 @@ -const_value set 2 +const_value set 2 ; person constants const ECRUTEAKGYM_MORTY const ECRUTEAKGYM_SAGE1 const ECRUTEAKGYM_SAGE2 diff --git a/maps/EcruteakItemfinderHouse.asm b/maps/EcruteakItemfinderHouse.asm index a5e7ad29b..4f7400bfe 100644 --- a/maps/EcruteakItemfinderHouse.asm +++ b/maps/EcruteakItemfinderHouse.asm @@ -1,4 +1,4 @@ -const_value set 2 +const_value set 2 ; person constants const ECRUTEAKITEMFINDERHOUSE_COOLTRAINER_M const ECRUTEAKITEMFINDERHOUSE_POKEDEX diff --git a/maps/EcruteakLugiaSpeechHouse.asm b/maps/EcruteakLugiaSpeechHouse.asm index 9149d06bc..5a94ff6ec 100644 --- a/maps/EcruteakLugiaSpeechHouse.asm +++ b/maps/EcruteakLugiaSpeechHouse.asm @@ -1,4 +1,4 @@ -const_value set 2 +const_value set 2 ; person constants const ECRUTEAKLUGIASPEECHHOUSE_GRAMPS const ECRUTEAKLUGIASPEECHHOUSE_YOUNGSTER diff --git a/maps/EcruteakMart.asm b/maps/EcruteakMart.asm index f8d4f10bd..164a5f253 100644 --- a/maps/EcruteakMart.asm +++ b/maps/EcruteakMart.asm @@ -1,4 +1,4 @@ -const_value set 2 +const_value set 2 ; person constants const ECRUTEAKMART_CLERK const ECRUTEAKMART_SUPER_NERD const ECRUTEAKMART_GRANNY diff --git a/maps/EcruteakPokecenter1F.asm b/maps/EcruteakPokecenter1F.asm index fc56b0b0d..9e1d409f5 100644 --- a/maps/EcruteakPokecenter1F.asm +++ b/maps/EcruteakPokecenter1F.asm @@ -1,4 +1,4 @@ -const_value set 2 +const_value set 2 ; person constants const ECRUTEAKPOKECENTER1F_NURSE const ECRUTEAKPOKECENTER1F_POKEFAN_M const ECRUTEAKPOKECENTER1F_COOLTRAINER_F diff --git a/maps/EcruteakTinTowerEntrance.asm b/maps/EcruteakTinTowerEntrance.asm index 17ffc7b08..933dbe52f 100644 --- a/maps/EcruteakTinTowerEntrance.asm +++ b/maps/EcruteakTinTowerEntrance.asm @@ -1,4 +1,4 @@ -const_value set 2 +const_value set 2 ; person constants const ECRUTEAKTINTOWERENTRANCE_SAGE1 const ECRUTEAKTINTOWERENTRANCE_SAGE2 const ECRUTEAKTINTOWERENTRANCE_SAGE3 diff --git a/maps/ElmsHouse.asm b/maps/ElmsHouse.asm index 28cba0a3f..16f1425fd 100644 --- a/maps/ElmsHouse.asm +++ b/maps/ElmsHouse.asm @@ -1,4 +1,4 @@ -const_value set 2 +const_value set 2 ; person constants const ELMSHOUSE_ELMS_WIFE const ELMSHOUSE_ELMS_SON diff --git a/maps/ElmsLab.asm b/maps/ElmsLab.asm index 2dff90e41..965d84e66 100644 --- a/maps/ElmsLab.asm +++ b/maps/ElmsLab.asm @@ -1,4 +1,4 @@ -const_value set 2 +const_value set 2 ; person constants const ELMSLAB_ELM const ELMSLAB_ELMS_AIDE const ELMSLAB_POKE_BALL1 diff --git a/maps/FastShip1F.asm b/maps/FastShip1F.asm index 19bb91a37..f61d95d61 100644 --- a/maps/FastShip1F.asm +++ b/maps/FastShip1F.asm @@ -1,4 +1,4 @@ -const_value set 2 +const_value set 2 ; person constants const FASTSHIP1F_SAILOR1 const FASTSHIP1F_SAILOR2 const FASTSHIP1F_SAILOR3 diff --git a/maps/FastShipB1F.asm b/maps/FastShipB1F.asm index 252511f93..91036b42c 100644 --- a/maps/FastShipB1F.asm +++ b/maps/FastShipB1F.asm @@ -1,4 +1,4 @@ -const_value set 2 +const_value set 2 ; person 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 1314070d4..836caf2f3 100644 --- a/maps/FastShipCabins_NNW_NNE_NE.asm +++ b/maps/FastShipCabins_NNW_NNE_NE.asm @@ -1,4 +1,4 @@ -const_value set 2 +const_value set 2 ; person 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 fdb1e9a37..14b67f576 100644 --- a/maps/FastShipCabins_SE_SSE_CaptainsCabin.asm +++ b/maps/FastShipCabins_SE_SSE_CaptainsCabin.asm @@ -1,4 +1,4 @@ -const_value set 2 +const_value set 2 ; person 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 ecdf5e412..6cf80814f 100644 --- a/maps/FastShipCabins_SW_SSW_NW.asm +++ b/maps/FastShipCabins_SW_SSW_NW.asm @@ -1,4 +1,4 @@ -const_value set 2 +const_value set 2 ; person 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 20e81db02..5481b2581 100644 --- a/maps/FightingDojo.asm +++ b/maps/FightingDojo.asm @@ -1,4 +1,4 @@ -const_value set 2 +const_value set 2 ; person constants const FIGHTINGDOJO_BLACK_BELT const FIGHTINGDOJO_POKE_BALL diff --git a/maps/FuchsiaCity.asm b/maps/FuchsiaCity.asm index 076587ca0..ac931c6c8 100644 --- a/maps/FuchsiaCity.asm +++ b/maps/FuchsiaCity.asm @@ -1,4 +1,4 @@ -const_value set 2 +const_value set 2 ; person constants const FUCHSIACITY_YOUNGSTER const FUCHSIACITY_POKEFAN_M const FUCHSIACITY_TEACHER diff --git a/maps/FuchsiaGym.asm b/maps/FuchsiaGym.asm index 4a1d1ffe8..c8d0c9929 100644 --- a/maps/FuchsiaGym.asm +++ b/maps/FuchsiaGym.asm @@ -1,4 +1,4 @@ -const_value set 2 +const_value set 2 ; person 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 cfc7eb659..b4b08bc14 100644 --- a/maps/FuchsiaMart.asm +++ b/maps/FuchsiaMart.asm @@ -1,4 +1,4 @@ -const_value set 2 +const_value set 2 ; person constants const FUCHSIAMART_CLERK const FUCHSIAMART_FISHER const FUCHSIAMART_COOLTRAINER_F diff --git a/maps/FuchsiaPokecenter1F.asm b/maps/FuchsiaPokecenter1F.asm index 829fab00d..1527a63aa 100644 --- a/maps/FuchsiaPokecenter1F.asm +++ b/maps/FuchsiaPokecenter1F.asm @@ -1,4 +1,4 @@ -const_value set 2 +const_value set 2 ; person constants const FUCHSIAPOKECENTER1F_NURSE const FUCHSIAPOKECENTER1F_COOLTRAINER_M const FUCHSIAPOKECENTER1F_COOLTRAINER_F diff --git a/maps/GoldenrodBikeShop.asm b/maps/GoldenrodBikeShop.asm index 0c681f60b..2b653e752 100644 --- a/maps/GoldenrodBikeShop.asm +++ b/maps/GoldenrodBikeShop.asm @@ -1,4 +1,4 @@ -const_value set 2 +const_value set 2 ; person constants const GOLDENRODBIKESHOP_CLERK GoldenrodBikeShop_MapScripts: diff --git a/maps/GoldenrodCity.asm b/maps/GoldenrodCity.asm index 045dd05bc..85788cd38 100644 --- a/maps/GoldenrodCity.asm +++ b/maps/GoldenrodCity.asm @@ -1,4 +1,4 @@ -const_value set 2 +const_value set 2 ; person constants const GOLDENRODCITY_POKEFAN_M1 const GOLDENRODCITY_YOUNGSTER1 const GOLDENRODCITY_COOLTRAINER_F1 diff --git a/maps/GoldenrodDeptStore1F.asm b/maps/GoldenrodDeptStore1F.asm index 88aebfdd1..c6c8e3f11 100644 --- a/maps/GoldenrodDeptStore1F.asm +++ b/maps/GoldenrodDeptStore1F.asm @@ -1,4 +1,4 @@ -const_value set 2 +const_value set 2 ; person constants const GOLDENRODDEPTSTORE1F_RECEPTIONIST const GOLDENRODDEPTSTORE1F_POKEFAN_F const GOLDENRODDEPTSTORE1F_BUG_CATCHER diff --git a/maps/GoldenrodDeptStore2F.asm b/maps/GoldenrodDeptStore2F.asm index bb2090eb9..4171cd8d2 100644 --- a/maps/GoldenrodDeptStore2F.asm +++ b/maps/GoldenrodDeptStore2F.asm @@ -1,4 +1,4 @@ -const_value set 2 +const_value set 2 ; person constants const GOLDENRODDEPTSTORE2F_CLERK1 const GOLDENRODDEPTSTORE2F_CLERK2 const GOLDENRODDEPTSTORE2F_YOUNGSTER diff --git a/maps/GoldenrodDeptStore3F.asm b/maps/GoldenrodDeptStore3F.asm index 5ddfe04c7..62d084a37 100644 --- a/maps/GoldenrodDeptStore3F.asm +++ b/maps/GoldenrodDeptStore3F.asm @@ -1,4 +1,4 @@ -const_value set 2 +const_value set 2 ; person constants const GOLDENRODDEPTSTORE3F_CLERK const GOLDENRODDEPTSTORE3F_SUPER_NERD const GOLDENRODDEPTSTORE3F_ROCKER diff --git a/maps/GoldenrodDeptStore4F.asm b/maps/GoldenrodDeptStore4F.asm index 426996978..746ed8c4e 100644 --- a/maps/GoldenrodDeptStore4F.asm +++ b/maps/GoldenrodDeptStore4F.asm @@ -1,4 +1,4 @@ -const_value set 2 +const_value set 2 ; person constants const GOLDENRODDEPTSTORE4F_CLERK const GOLDENRODDEPTSTORE4F_COOLTRAINER_M const GOLDENRODDEPTSTORE4F_BUG_CATCHER diff --git a/maps/GoldenrodDeptStore5F.asm b/maps/GoldenrodDeptStore5F.asm index 6f2577f15..9c7475e13 100644 --- a/maps/GoldenrodDeptStore5F.asm +++ b/maps/GoldenrodDeptStore5F.asm @@ -1,4 +1,4 @@ -const_value set 2 +const_value set 2 ; person constants const GOLDENRODDEPTSTORE5F_CLERK const GOLDENRODDEPTSTORE5F_LASS const GOLDENRODDEPTSTORE5F_MIKE diff --git a/maps/GoldenrodDeptStore6F.asm b/maps/GoldenrodDeptStore6F.asm index 295f5b6ea..afa67eece 100644 --- a/maps/GoldenrodDeptStore6F.asm +++ b/maps/GoldenrodDeptStore6F.asm @@ -1,4 +1,4 @@ -const_value set 2 +const_value set 2 ; person constants const GOLDENRODDEPTSTORE6F_LASS const GOLDENRODDEPTSTORE6F_SUPER_NERD diff --git a/maps/GoldenrodDeptStoreB1F.asm b/maps/GoldenrodDeptStoreB1F.asm index 83849fe60..1db75499d 100644 --- a/maps/GoldenrodDeptStoreB1F.asm +++ b/maps/GoldenrodDeptStoreB1F.asm @@ -1,4 +1,4 @@ -const_value set 2 +const_value set 2 ; person constants const GOLDENRODDEPTSTOREB1F_POKE_BALL1 const GOLDENRODDEPTSTOREB1F_POKE_BALL2 const GOLDENRODDEPTSTOREB1F_POKE_BALL3 diff --git a/maps/GoldenrodDeptStoreRoof.asm b/maps/GoldenrodDeptStoreRoof.asm index d83f760cb..96c93abc6 100644 --- a/maps/GoldenrodDeptStoreRoof.asm +++ b/maps/GoldenrodDeptStoreRoof.asm @@ -1,4 +1,4 @@ -const_value set 2 +const_value set 2 ; person constants const GOLDENRODDEPTSTOREROOF_CLERK const GOLDENRODDEPTSTOREROOF_POKEFAN_F const GOLDENRODDEPTSTOREROOF_FISHER diff --git a/maps/GoldenrodFlowerShop.asm b/maps/GoldenrodFlowerShop.asm index c80183bb0..da4c6c3ee 100644 --- a/maps/GoldenrodFlowerShop.asm +++ b/maps/GoldenrodFlowerShop.asm @@ -1,4 +1,4 @@ -const_value set 2 +const_value set 2 ; person constants const GOLDENRODFLOWERSHOP_TEACHER const GOLDENRODFLOWERSHOP_FLORIA diff --git a/maps/GoldenrodGameCorner.asm b/maps/GoldenrodGameCorner.asm index a83ce3e96..68bcbdc8b 100644 --- a/maps/GoldenrodGameCorner.asm +++ b/maps/GoldenrodGameCorner.asm @@ -1,4 +1,4 @@ -const_value set 2 +const_value set 2 ; person constants const GOLDENRODGAMECORNER_CLERK const GOLDENRODGAMECORNER_RECEPTIONIST1 const GOLDENRODGAMECORNER_RECEPTIONIST2 diff --git a/maps/GoldenrodGym.asm b/maps/GoldenrodGym.asm index ccfac2120..3b844fd62 100644 --- a/maps/GoldenrodGym.asm +++ b/maps/GoldenrodGym.asm @@ -1,4 +1,4 @@ -const_value set 2 +const_value set 2 ; person constants const GOLDENRODGYM_WHITNEY const GOLDENRODGYM_LASS1 const GOLDENRODGYM_LASS2 diff --git a/maps/GoldenrodHappinessRater.asm b/maps/GoldenrodHappinessRater.asm index aa8bbd9f4..872a81414 100644 --- a/maps/GoldenrodHappinessRater.asm +++ b/maps/GoldenrodHappinessRater.asm @@ -1,4 +1,4 @@ -const_value set 2 +const_value set 2 ; person constants const GOLDENRODHAPPINESSRATER_TEACHER const GOLDENRODHAPPINESSRATER_POKEFAN_M const GOLDENRODHAPPINESSRATER_TWIN diff --git a/maps/GoldenrodMagnetTrainStation.asm b/maps/GoldenrodMagnetTrainStation.asm index a3117a355..e9f100d55 100644 --- a/maps/GoldenrodMagnetTrainStation.asm +++ b/maps/GoldenrodMagnetTrainStation.asm @@ -1,4 +1,4 @@ -const_value set 2 +const_value set 2 ; person constants const GOLDENRODMAGNETTRAINSTATION_OFFICER const GOLDENRODMAGNETTRAINSTATION_GENTLEMAN diff --git a/maps/GoldenrodNameRater.asm b/maps/GoldenrodNameRater.asm index d807b7e3e..b7f0a52d8 100644 --- a/maps/GoldenrodNameRater.asm +++ b/maps/GoldenrodNameRater.asm @@ -1,4 +1,4 @@ -const_value set 2 +const_value set 2 ; person constants const GOLDENRODNAMERATER_NAME_RATER GoldenrodNameRater_MapScripts: diff --git a/maps/GoldenrodPPSpeechHouse.asm b/maps/GoldenrodPPSpeechHouse.asm index da2965def..263d3a46e 100644 --- a/maps/GoldenrodPPSpeechHouse.asm +++ b/maps/GoldenrodPPSpeechHouse.asm @@ -1,4 +1,4 @@ -const_value set 2 +const_value set 2 ; person constants const GOLDENRODPPSPEECHHOUSE_FISHER const GOLDENRODPPSPEECHHOUSE_LASS diff --git a/maps/GoldenrodPokecenter1F.asm b/maps/GoldenrodPokecenter1F.asm index 3765181b2..ca288ceca 100644 --- a/maps/GoldenrodPokecenter1F.asm +++ b/maps/GoldenrodPokecenter1F.asm @@ -1,4 +1,4 @@ -const_value set 2 +const_value set 2 ; person constants const GOLDENRODPOKECENTER1F_NURSE const GOLDENRODPOKECENTER1F_LINK_RECEPTIONIST const GOLDENRODPOKECENTER1F_GAMEBOY_KID diff --git a/maps/GoldenrodUnderground.asm b/maps/GoldenrodUnderground.asm index 765b48427..2a026b551 100644 --- a/maps/GoldenrodUnderground.asm +++ b/maps/GoldenrodUnderground.asm @@ -1,4 +1,4 @@ -const_value set 2 +const_value set 2 ; person constants const GOLDENRODUNDERGROUND_SUPER_NERD1 const GOLDENRODUNDERGROUND_SUPER_NERD2 const GOLDENRODUNDERGROUND_SUPER_NERD3 diff --git a/maps/GoldenrodUndergroundSwitchRoomEntrances.asm b/maps/GoldenrodUndergroundSwitchRoomEntrances.asm index 27c77e1ba..62eeb9356 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_value set 2 +const_value set 2 ; person constants const GOLDENRODUNDERGROUNDSWITCHROOMENTRANCES_PHARMACIST1 const GOLDENRODUNDERGROUNDSWITCHROOMENTRANCES_PHARMACIST2 const GOLDENRODUNDERGROUNDSWITCHROOMENTRANCES_ROCKET1 diff --git a/maps/GoldenrodUndergroundWarehouse.asm b/maps/GoldenrodUndergroundWarehouse.asm index a4d283739..0bfb3bf99 100644 --- a/maps/GoldenrodUndergroundWarehouse.asm +++ b/maps/GoldenrodUndergroundWarehouse.asm @@ -1,4 +1,4 @@ -const_value set 2 +const_value set 2 ; person constants const GOLDENRODUNDERGROUNDWAREHOUSE_ROCKET1 const GOLDENRODUNDERGROUNDWAREHOUSE_ROCKET2 const GOLDENRODUNDERGROUNDWAREHOUSE_ROCKET3 diff --git a/maps/GuideGentsHouse.asm b/maps/GuideGentsHouse.asm index 42382ec94..201b72021 100644 --- a/maps/GuideGentsHouse.asm +++ b/maps/GuideGentsHouse.asm @@ -1,4 +1,4 @@ -const_value set 2 +const_value set 2 ; person constants const GUIDEGENTSHOUSE_GRAMPS GuideGentsHouse_MapScripts: diff --git a/maps/HallOfFame.asm b/maps/HallOfFame.asm index 571a5a964..1c68545db 100644 --- a/maps/HallOfFame.asm +++ b/maps/HallOfFame.asm @@ -1,4 +1,4 @@ -const_value set 2 +const_value set 2 ; person constants const HALLOFFAME_LANCE HallOfFame_MapScripts: diff --git a/maps/IcePath1F.asm b/maps/IcePath1F.asm index fbb3a9198..82676465a 100644 --- a/maps/IcePath1F.asm +++ b/maps/IcePath1F.asm @@ -1,4 +1,4 @@ -const_value set 2 +const_value set 2 ; person constants const ICEPATH1F_POKE_BALL1 const ICEPATH1F_POKE_BALL2 const ICEPATH1F_POKE_BALL3 diff --git a/maps/IcePathB1F.asm b/maps/IcePathB1F.asm index b40bea795..3c33bc44c 100644 --- a/maps/IcePathB1F.asm +++ b/maps/IcePathB1F.asm @@ -1,4 +1,4 @@ -const_value set 2 +const_value set 2 ; person constants const ICEPATHB1F_BOULDER1 const ICEPATHB1F_BOULDER2 const ICEPATHB1F_BOULDER3 diff --git a/maps/IcePathB2FBlackthornSide.asm b/maps/IcePathB2FBlackthornSide.asm index 2170bacd6..22be3224a 100644 --- a/maps/IcePathB2FBlackthornSide.asm +++ b/maps/IcePathB2FBlackthornSide.asm @@ -1,4 +1,4 @@ -const_value set 2 +const_value set 2 ; person constants const ICEPATHB2FBLACKTHORNSIDE_POKE_BALL IcePathB2FBlackthornSide_MapScripts: diff --git a/maps/IcePathB2FMahoganySide.asm b/maps/IcePathB2FMahoganySide.asm index 05f9ee3ec..c0299be4b 100644 --- a/maps/IcePathB2FMahoganySide.asm +++ b/maps/IcePathB2FMahoganySide.asm @@ -1,4 +1,4 @@ -const_value set 2 +const_value set 2 ; person constants const ICEPATHB2FMAHOGANYSIDE_BOULDER1 const ICEPATHB2FMAHOGANYSIDE_BOULDER2 const ICEPATHB2FMAHOGANYSIDE_BOULDER3 diff --git a/maps/IcePathB3F.asm b/maps/IcePathB3F.asm index 8e93a991c..b6234ffdb 100644 --- a/maps/IcePathB3F.asm +++ b/maps/IcePathB3F.asm @@ -1,4 +1,4 @@ -const_value set 2 +const_value set 2 ; person constants const ICEPATHB3F_POKE_BALL const ICEPATHB3F_ROCK diff --git a/maps/IlexForest.asm b/maps/IlexForest.asm index 17190a96c..840c7094e 100644 --- a/maps/IlexForest.asm +++ b/maps/IlexForest.asm @@ -1,4 +1,4 @@ -const_value set 2 +const_value set 2 ; person constants const ILEXFOREST_FARFETCHD const ILEXFOREST_YOUNGSTER1 const ILEXFOREST_BLACK_BELT diff --git a/maps/IlexForestAzaleaGate.asm b/maps/IlexForestAzaleaGate.asm index 8f64f2794..3c403c33f 100644 --- a/maps/IlexForestAzaleaGate.asm +++ b/maps/IlexForestAzaleaGate.asm @@ -1,4 +1,4 @@ -const_value set 2 +const_value set 2 ; person constants const ILEXFORESTAZALEAGATE_OFFICER const ILEXFORESTAZALEAGATE_GRANNY diff --git a/maps/IndigoPlateauPokecenter1F.asm b/maps/IndigoPlateauPokecenter1F.asm index 702f9692b..49c661f95 100644 --- a/maps/IndigoPlateauPokecenter1F.asm +++ b/maps/IndigoPlateauPokecenter1F.asm @@ -1,4 +1,4 @@ -const_value set 2 +const_value set 2 ; person constants const INDIGOPLATEAUPOKECENTER1F_NURSE const INDIGOPLATEAUPOKECENTER1F_CLERK const INDIGOPLATEAUPOKECENTER1F_COOLTRAINER_M diff --git a/maps/KarensRoom.asm b/maps/KarensRoom.asm index 3b9ff0d3a..cb06c84d7 100644 --- a/maps/KarensRoom.asm +++ b/maps/KarensRoom.asm @@ -1,4 +1,4 @@ -const_value set 2 +const_value set 2 ; person constants const KARENSROOM_KAREN KarensRoom_MapScripts: diff --git a/maps/KogasRoom.asm b/maps/KogasRoom.asm index 9c88d1a2c..193ffe768 100644 --- a/maps/KogasRoom.asm +++ b/maps/KogasRoom.asm @@ -1,4 +1,4 @@ -const_value set 2 +const_value set 2 ; person constants const KOGASROOM_KOGA KogasRoom_MapScripts: diff --git a/maps/KurtsHouse.asm b/maps/KurtsHouse.asm index fe04823d8..e150d2395 100644 --- a/maps/KurtsHouse.asm +++ b/maps/KurtsHouse.asm @@ -1,4 +1,4 @@ -const_value set 2 +const_value set 2 ; person constants const KURTSHOUSE_KURT1 const KURTSHOUSE_TWIN1 const KURTSHOUSE_SLOWPOKE diff --git a/maps/LakeOfRage.asm b/maps/LakeOfRage.asm index 2630738b9..10e6d2c3e 100644 --- a/maps/LakeOfRage.asm +++ b/maps/LakeOfRage.asm @@ -1,4 +1,4 @@ -const_value set 2 +const_value set 2 ; person constants const LAKEOFRAGE_LANCE const LAKEOFRAGE_GRAMPS const LAKEOFRAGE_SUPER_NERD1 diff --git a/maps/LakeOfRageHiddenPowerHouse.asm b/maps/LakeOfRageHiddenPowerHouse.asm index 4fa55dd54..de5294793 100644 --- a/maps/LakeOfRageHiddenPowerHouse.asm +++ b/maps/LakeOfRageHiddenPowerHouse.asm @@ -1,4 +1,4 @@ -const_value set 2 +const_value set 2 ; person constants const LAKEOFRAGEHIDDENPOWERHOUSE_FISHER LakeOfRageHiddenPowerHouse_MapScripts: diff --git a/maps/LakeOfRageMagikarpHouse.asm b/maps/LakeOfRageMagikarpHouse.asm index c5e05a423..683caae26 100644 --- a/maps/LakeOfRageMagikarpHouse.asm +++ b/maps/LakeOfRageMagikarpHouse.asm @@ -1,4 +1,4 @@ -const_value set 2 +const_value set 2 ; person constants const LAKEOFRAGEMAGIKARPHOUSE_FISHING_GURU LakeOfRageMagikarpHouse_MapScripts: diff --git a/maps/LancesRoom.asm b/maps/LancesRoom.asm index 657a45942..13c95305b 100644 --- a/maps/LancesRoom.asm +++ b/maps/LancesRoom.asm @@ -1,4 +1,4 @@ -const_value set 2 +const_value set 2 ; person constants const LANCESROOM_LANCE const LANCESROOM_MARY const LANCESROOM_OAK diff --git a/maps/LavRadioTower1F.asm b/maps/LavRadioTower1F.asm index 1b2a302e7..6787d7889 100644 --- a/maps/LavRadioTower1F.asm +++ b/maps/LavRadioTower1F.asm @@ -1,4 +1,4 @@ -const_value set 2 +const_value set 2 ; person constants const LAVRADIOTOWER1F_RECEPTIONIST const LAVRADIOTOWER1F_OFFICER const LAVRADIOTOWER1F_SUPER_NERD1 diff --git a/maps/LavenderMart.asm b/maps/LavenderMart.asm index cdbb7e8cb..41a9b9291 100644 --- a/maps/LavenderMart.asm +++ b/maps/LavenderMart.asm @@ -1,4 +1,4 @@ -const_value set 2 +const_value set 2 ; person constants const LAVENDERMART_CLERK const LAVENDERMART_POKEFAN_M const LAVENDERMART_ROCKER diff --git a/maps/LavenderNameRater.asm b/maps/LavenderNameRater.asm index d0fe4aff5..10da518dd 100644 --- a/maps/LavenderNameRater.asm +++ b/maps/LavenderNameRater.asm @@ -1,4 +1,4 @@ -const_value set 2 +const_value set 2 ; person constants const LAVENDERNAMERATER_NAME_RATER LavenderNameRater_MapScripts: diff --git a/maps/LavenderPokecenter1F.asm b/maps/LavenderPokecenter1F.asm index 250d6e98f..33c910a16 100644 --- a/maps/LavenderPokecenter1F.asm +++ b/maps/LavenderPokecenter1F.asm @@ -1,4 +1,4 @@ -const_value set 2 +const_value set 2 ; person constants const LAVENDERPOKECENTER1F_NURSE const LAVENDERPOKECENTER1F_GENTLEMAN const LAVENDERPOKECENTER1F_TEACHER diff --git a/maps/LavenderSpeechHouse.asm b/maps/LavenderSpeechHouse.asm index d020861ac..8c036236d 100644 --- a/maps/LavenderSpeechHouse.asm +++ b/maps/LavenderSpeechHouse.asm @@ -1,4 +1,4 @@ -const_value set 2 +const_value set 2 ; person constants const LAVENDERSPEECHHOUSE_POKEFAN_F LavenderSpeechHouse_MapScripts: diff --git a/maps/LavenderTown.asm b/maps/LavenderTown.asm index 94075b2c2..6a43962d9 100644 --- a/maps/LavenderTown.asm +++ b/maps/LavenderTown.asm @@ -1,4 +1,4 @@ -const_value set 2 +const_value set 2 ; person constants const LAVENDERTOWN_POKEFAN_M const LAVENDERTOWN_TEACHER const LAVENDERTOWN_GRAMPS diff --git a/maps/MahoganyGym.asm b/maps/MahoganyGym.asm index 860e54c1c..34512ea99 100644 --- a/maps/MahoganyGym.asm +++ b/maps/MahoganyGym.asm @@ -1,4 +1,4 @@ -const_value set 2 +const_value set 2 ; person constants const MAHOGANYGYM_PRYCE const MAHOGANYGYM_BUENA1 const MAHOGANYGYM_ROCKER1 diff --git a/maps/MahoganyMart1F.asm b/maps/MahoganyMart1F.asm index 09748c48e..9a1da5330 100644 --- a/maps/MahoganyMart1F.asm +++ b/maps/MahoganyMart1F.asm @@ -1,4 +1,4 @@ -const_value set 2 +const_value set 2 ; person constants const MAHOGANYMART1F_PHARMACIST const MAHOGANYMART1F_BLACK_BELT const MAHOGANYMART1F_LANCE diff --git a/maps/MahoganyPokecenter1F.asm b/maps/MahoganyPokecenter1F.asm index 4a2a32f26..f7be3cde7 100644 --- a/maps/MahoganyPokecenter1F.asm +++ b/maps/MahoganyPokecenter1F.asm @@ -1,4 +1,4 @@ -const_value set 2 +const_value set 2 ; person constants const MAHOGANYPOKECENTER1F_NURSE const MAHOGANYPOKECENTER1F_POKEFAN_M const MAHOGANYPOKECENTER1F_YOUNGSTER diff --git a/maps/MahoganyRedGyaradosSpeechHouse.asm b/maps/MahoganyRedGyaradosSpeechHouse.asm index fd4734de7..c80c902f7 100644 --- a/maps/MahoganyRedGyaradosSpeechHouse.asm +++ b/maps/MahoganyRedGyaradosSpeechHouse.asm @@ -1,4 +1,4 @@ -const_value set 2 +const_value set 2 ; person constants const MAHOGANYREDGYARADOSSPEECHHOUSE_BLACK_BELT const MAHOGANYREDGYARADOSSPEECHHOUSE_TEACHER diff --git a/maps/MahoganyTown.asm b/maps/MahoganyTown.asm index c33ec64ba..ac5639ebc 100644 --- a/maps/MahoganyTown.asm +++ b/maps/MahoganyTown.asm @@ -1,4 +1,4 @@ -const_value set 2 +const_value set 2 ; person constants const MAHOGANYTOWN_POKEFAN_M const MAHOGANYTOWN_GRAMPS const MAHOGANYTOWN_FISHER diff --git a/maps/ManiasHouse.asm b/maps/ManiasHouse.asm index 502aad783..5bef1bf6f 100644 --- a/maps/ManiasHouse.asm +++ b/maps/ManiasHouse.asm @@ -1,4 +1,4 @@ -const_value set 2 +const_value set 2 ; person constants const MANIASHOUSE_ROCKER ManiasHouse_MapScripts: diff --git a/maps/MountMoon.asm b/maps/MountMoon.asm index 5b978bc0e..1c00e6dbf 100644 --- a/maps/MountMoon.asm +++ b/maps/MountMoon.asm @@ -1,4 +1,4 @@ -const_value set 2 +const_value set 2 ; person constants const MOUNTMOON_SILVER MountMoon_MapScripts: diff --git a/maps/MountMoonGiftShop.asm b/maps/MountMoonGiftShop.asm index 7188a7c00..be6a195ac 100644 --- a/maps/MountMoonGiftShop.asm +++ b/maps/MountMoonGiftShop.asm @@ -1,4 +1,4 @@ -const_value set 2 +const_value set 2 ; person 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 b12e7b391..e264bb1eb 100644 --- a/maps/MountMoonSquare.asm +++ b/maps/MountMoonSquare.asm @@ -1,4 +1,4 @@ -const_value set 2 +const_value set 2 ; person constants const MOUNTMOONSQUARE_FAIRY1 const MOUNTMOONSQUARE_FAIRY2 const MOUNTMOONSQUARE_ROCK diff --git a/maps/MountMortar1FInside.asm b/maps/MountMortar1FInside.asm index 30b59906a..24074d061 100644 --- a/maps/MountMortar1FInside.asm +++ b/maps/MountMortar1FInside.asm @@ -1,4 +1,4 @@ -const_value set 2 +const_value set 2 ; person constants const MOUNTMORTAR1FINSIDE_BOULDER const MOUNTMORTAR1FINSIDE_POKE_BALL1 const MOUNTMORTAR1FINSIDE_POKE_BALL2 diff --git a/maps/MountMortar1FOutside.asm b/maps/MountMortar1FOutside.asm index cb9518c3a..8c3c63164 100644 --- a/maps/MountMortar1FOutside.asm +++ b/maps/MountMortar1FOutside.asm @@ -1,4 +1,4 @@ -const_value set 2 +const_value set 2 ; person constants const MOUNTMORTAR1FOUTSIDE_POKE_BALL1 const MOUNTMORTAR1FOUTSIDE_POKE_BALL2 diff --git a/maps/MountMortar2FInside.asm b/maps/MountMortar2FInside.asm index c0bf05700..7f70c89aa 100644 --- a/maps/MountMortar2FInside.asm +++ b/maps/MountMortar2FInside.asm @@ -1,4 +1,4 @@ -const_value set 2 +const_value set 2 ; person constants const MOUNTMORTAR2FINSIDE_POKE_BALL1 const MOUNTMORTAR2FINSIDE_POKE_BALL2 const MOUNTMORTAR2FINSIDE_POKE_BALL3 diff --git a/maps/MountMortarB1F.asm b/maps/MountMortarB1F.asm index 1aa27592e..de30974ad 100644 --- a/maps/MountMortarB1F.asm +++ b/maps/MountMortarB1F.asm @@ -1,4 +1,4 @@ -const_value set 2 +const_value set 2 ; person constants const MOUNTMORTARB1F_POKE_BALL1 const MOUNTMORTARB1F_POKE_BALL2 const MOUNTMORTARB1F_BOULDER diff --git a/maps/MoveDeletersHouse.asm b/maps/MoveDeletersHouse.asm index 743acf816..e61ba452e 100644 --- a/maps/MoveDeletersHouse.asm +++ b/maps/MoveDeletersHouse.asm @@ -1,4 +1,4 @@ -const_value set 2 +const_value set 2 ; person constants const MOVEDELETERSHOUSE_SUPER_NERD MoveDeletersHouse_MapScripts: diff --git a/maps/MrFujisHouse.asm b/maps/MrFujisHouse.asm index 881487ff6..9ed6bd18e 100644 --- a/maps/MrFujisHouse.asm +++ b/maps/MrFujisHouse.asm @@ -1,4 +1,4 @@ -const_value set 2 +const_value set 2 ; person constants const MRFUJISHOUSE_SUPER_NERD const MRFUJISHOUSE_LASS const MRFUJISHOUSE_PSYDUCK diff --git a/maps/MrPokemonsHouse.asm b/maps/MrPokemonsHouse.asm index 4a4249cc5..c23deb54f 100644 --- a/maps/MrPokemonsHouse.asm +++ b/maps/MrPokemonsHouse.asm @@ -1,4 +1,4 @@ -const_value set 2 +const_value set 2 ; person constants const MRPOKEMONSHOUSE_GENTLEMAN const MRPOKEMONSHOUSE_OAK diff --git a/maps/MrPsychicsHouse.asm b/maps/MrPsychicsHouse.asm index b79c08b6e..75c7f6a59 100644 --- a/maps/MrPsychicsHouse.asm +++ b/maps/MrPsychicsHouse.asm @@ -1,4 +1,4 @@ -const_value set 2 +const_value set 2 ; person constants const MRPSYCHICSHOUSE_FISHING_GURU MrPsychicsHouse_MapScripts: diff --git a/maps/NationalPark.asm b/maps/NationalPark.asm index 095324ea5..6118f507c 100644 --- a/maps/NationalPark.asm +++ b/maps/NationalPark.asm @@ -1,4 +1,4 @@ -const_value set 2 +const_value set 2 ; person constants const NATIONALPARK_LASS1 const NATIONALPARK_POKEFAN_F1 const NATIONALPARK_TEACHER1 diff --git a/maps/NationalParkBugContest.asm b/maps/NationalParkBugContest.asm index e52e0c71a..616446d9a 100644 --- a/maps/NationalParkBugContest.asm +++ b/maps/NationalParkBugContest.asm @@ -1,4 +1,4 @@ -const_value set 2 +const_value set 2 ; person constants const NATIONALPARKBUGCONTEST_YOUNGSTER1 const NATIONALPARKBUGCONTEST_YOUNGSTER2 const NATIONALPARKBUGCONTEST_ROCKER diff --git a/maps/NewBarkTown.asm b/maps/NewBarkTown.asm index 985f7e4cf..40b241392 100644 --- a/maps/NewBarkTown.asm +++ b/maps/NewBarkTown.asm @@ -1,4 +1,4 @@ -const_value set 2 +const_value set 2 ; person constants const NEWBARKTOWN_TEACHER const NEWBARKTOWN_FISHER const NEWBARKTOWN_SILVER diff --git a/maps/OaksLab.asm b/maps/OaksLab.asm index bf505711e..913128d75 100644 --- a/maps/OaksLab.asm +++ b/maps/OaksLab.asm @@ -1,4 +1,4 @@ -const_value set 2 +const_value set 2 ; person constants const OAKSLAB_OAK const OAKSLAB_SCIENTIST1 const OAKSLAB_SCIENTIST2 diff --git a/maps/OlivineCafe.asm b/maps/OlivineCafe.asm index f651f0e97..0128a216b 100644 --- a/maps/OlivineCafe.asm +++ b/maps/OlivineCafe.asm @@ -1,4 +1,4 @@ -const_value set 2 +const_value set 2 ; person constants const OLIVINECAFE_SAILOR1 const OLIVINECAFE_FISHING_GURU const OLIVINECAFE_SAILOR2 diff --git a/maps/OlivineCity.asm b/maps/OlivineCity.asm index 8c418d99d..e44801fa8 100644 --- a/maps/OlivineCity.asm +++ b/maps/OlivineCity.asm @@ -1,4 +1,4 @@ -const_value set 2 +const_value set 2 ; person constants const OLIVINECITY_SAILOR1 const OLIVINECITY_STANDING_YOUNGSTER const OLIVINECITY_SAILOR2 diff --git a/maps/OlivineGoodRodHouse.asm b/maps/OlivineGoodRodHouse.asm index 8bee6f363..3134ac531 100644 --- a/maps/OlivineGoodRodHouse.asm +++ b/maps/OlivineGoodRodHouse.asm @@ -1,4 +1,4 @@ -const_value set 2 +const_value set 2 ; person constants const OLIVINEGOODRODHOUSE_FISHING_GURU OlivineGoodRodHouse_MapScripts: diff --git a/maps/OlivineGym.asm b/maps/OlivineGym.asm index e8ab40213..01ac72662 100644 --- a/maps/OlivineGym.asm +++ b/maps/OlivineGym.asm @@ -1,4 +1,4 @@ -const_value set 2 +const_value set 2 ; person constants const OLIVINEGYM_JASMINE const OLIVINEGYM_GYM_GUY diff --git a/maps/OlivineHouseBeta.asm b/maps/OlivineHouseBeta.asm index 3297736e6..5cdebfef2 100644 --- a/maps/OlivineHouseBeta.asm +++ b/maps/OlivineHouseBeta.asm @@ -1,4 +1,4 @@ -const_value set 2 +const_value set 2 ; person constants const OLIVINEHOUSEBETA_TEACHER const OLIVINEHOUSEBETA_RHYDON diff --git a/maps/OlivineLighthouse1F.asm b/maps/OlivineLighthouse1F.asm index bc09e9ef4..f8da48801 100644 --- a/maps/OlivineLighthouse1F.asm +++ b/maps/OlivineLighthouse1F.asm @@ -1,4 +1,4 @@ -const_value set 2 +const_value set 2 ; person constants const OLIVINELIGHTHOUSE1F_SAILOR const OLIVINELIGHTHOUSE1F_POKEFAN_F diff --git a/maps/OlivineLighthouse2F.asm b/maps/OlivineLighthouse2F.asm index 2bc489c57..f1e087d50 100644 --- a/maps/OlivineLighthouse2F.asm +++ b/maps/OlivineLighthouse2F.asm @@ -1,4 +1,4 @@ -const_value set 2 +const_value set 2 ; person constants const OLIVINELIGHTHOUSE2F_SAILOR const OLIVINELIGHTHOUSE2F_GENTLEMAN diff --git a/maps/OlivineLighthouse3F.asm b/maps/OlivineLighthouse3F.asm index 1a02febe8..55211a8c7 100644 --- a/maps/OlivineLighthouse3F.asm +++ b/maps/OlivineLighthouse3F.asm @@ -1,4 +1,4 @@ -const_value set 2 +const_value set 2 ; person constants const OLIVINELIGHTHOUSE3F_SAILOR const OLIVINELIGHTHOUSE3F_GENTLEMAN const OLIVINELIGHTHOUSE3F_YOUNGSTER diff --git a/maps/OlivineLighthouse4F.asm b/maps/OlivineLighthouse4F.asm index 21f59b17a..db4eb73ac 100644 --- a/maps/OlivineLighthouse4F.asm +++ b/maps/OlivineLighthouse4F.asm @@ -1,4 +1,4 @@ -const_value set 2 +const_value set 2 ; person constants const OLIVINELIGHTHOUSE4F_SAILOR const OLIVINELIGHTHOUSE4F_LASS diff --git a/maps/OlivineLighthouse5F.asm b/maps/OlivineLighthouse5F.asm index 792f77132..77c155eb1 100644 --- a/maps/OlivineLighthouse5F.asm +++ b/maps/OlivineLighthouse5F.asm @@ -1,4 +1,4 @@ -const_value set 2 +const_value set 2 ; person constants const OLIVINELIGHTHOUSE5F_SAILOR const OLIVINELIGHTHOUSE5F_YOUNGSTER const OLIVINELIGHTHOUSE5F_POKE_BALL1 diff --git a/maps/OlivineLighthouse6F.asm b/maps/OlivineLighthouse6F.asm index 9c2620eb5..b644924b2 100644 --- a/maps/OlivineLighthouse6F.asm +++ b/maps/OlivineLighthouse6F.asm @@ -1,4 +1,4 @@ -const_value set 2 +const_value set 2 ; person constants const OLIVINELIGHTHOUSE6F_JASMINE const OLIVINELIGHTHOUSE6F_MONSTER const OLIVINELIGHTHOUSE6F_POKE_BALL diff --git a/maps/OlivineMart.asm b/maps/OlivineMart.asm index ff4ed669a..36c0bd826 100644 --- a/maps/OlivineMart.asm +++ b/maps/OlivineMart.asm @@ -1,4 +1,4 @@ -const_value set 2 +const_value set 2 ; person constants const OLIVINEMART_CLERK const OLIVINEMART_COOLTRAINER_F const OLIVINEMART_LASS diff --git a/maps/OlivinePokecenter1F.asm b/maps/OlivinePokecenter1F.asm index 16a774912..ff9bbcc98 100644 --- a/maps/OlivinePokecenter1F.asm +++ b/maps/OlivinePokecenter1F.asm @@ -1,4 +1,4 @@ -const_value set 2 +const_value set 2 ; person constants const OLIVINEPOKECENTER1F_NURSE const OLIVINEPOKECENTER1F_FISHING_GURU const OLIVINEPOKECENTER1F_FISHER diff --git a/maps/OlivinePort.asm b/maps/OlivinePort.asm index ce949a4ba..e6b74b315 100644 --- a/maps/OlivinePort.asm +++ b/maps/OlivinePort.asm @@ -1,4 +1,4 @@ -const_value set 2 +const_value set 2 ; person constants const OLIVINEPORT_SAILOR1 const OLIVINEPORT_SAILOR2 const OLIVINEPORT_SAILOR3 diff --git a/maps/OlivinePortPassage.asm b/maps/OlivinePortPassage.asm index 2d8cf9e55..913dad068 100644 --- a/maps/OlivinePortPassage.asm +++ b/maps/OlivinePortPassage.asm @@ -1,4 +1,4 @@ -const_value set 2 +const_value set 2 ; person constants const OLIVINEPORTPASSAGE_POKEFAN_M OlivinePortPassage_MapScripts: diff --git a/maps/OlivinePunishmentSpeechHouse.asm b/maps/OlivinePunishmentSpeechHouse.asm index 6133c8f53..1989e222b 100644 --- a/maps/OlivinePunishmentSpeechHouse.asm +++ b/maps/OlivinePunishmentSpeechHouse.asm @@ -1,4 +1,4 @@ -const_value set 2 +const_value set 2 ; person constants const OLIVINEPUNISHMENTSPEECHHOUSE_POKEFAN_M const OLIVINEPUNISHMENTSPEECHHOUSE_LASS diff --git a/maps/OlivineTimsHouse.asm b/maps/OlivineTimsHouse.asm index 0038bf6b9..497e60f07 100644 --- a/maps/OlivineTimsHouse.asm +++ b/maps/OlivineTimsHouse.asm @@ -1,4 +1,4 @@ -const_value set 2 +const_value set 2 ; person constants const OLIVINETIMSHOUSE_TIM OlivineTimsHouse_MapScripts: diff --git a/maps/PalletTown.asm b/maps/PalletTown.asm index 80601f222..90ca2bbb4 100644 --- a/maps/PalletTown.asm +++ b/maps/PalletTown.asm @@ -1,4 +1,4 @@ -const_value set 2 +const_value set 2 ; person constants const PALLETTOWN_TEACHER const PALLETTOWN_FISHER diff --git a/maps/PewterCity.asm b/maps/PewterCity.asm index 1008bf2fa..71e7e642e 100644 --- a/maps/PewterCity.asm +++ b/maps/PewterCity.asm @@ -1,4 +1,4 @@ -const_value set 2 +const_value set 2 ; person constants const PEWTERCITY_COOLTRAINER_F const PEWTERCITY_BUG_CATCHER const PEWTERCITY_GRAMPS diff --git a/maps/PewterGym.asm b/maps/PewterGym.asm index 0fa0bcc13..17e634a34 100644 --- a/maps/PewterGym.asm +++ b/maps/PewterGym.asm @@ -1,4 +1,4 @@ -const_value set 2 +const_value set 2 ; person constants const PEWTERGYM_BROCK const PEWTERGYM_YOUNGSTER const PEWTERGYM_GYM_GUY diff --git a/maps/PewterMart.asm b/maps/PewterMart.asm index f4aa7614e..8445f0340 100644 --- a/maps/PewterMart.asm +++ b/maps/PewterMart.asm @@ -1,4 +1,4 @@ -const_value set 2 +const_value set 2 ; person constants const PEWTERMART_CLERK const PEWTERMART_YOUNGSTER const PEWTERMART_SUPER_NERD diff --git a/maps/PewterNidoranSpeechHouse.asm b/maps/PewterNidoranSpeechHouse.asm index 4f4424e9e..ffa5fa414 100644 --- a/maps/PewterNidoranSpeechHouse.asm +++ b/maps/PewterNidoranSpeechHouse.asm @@ -1,4 +1,4 @@ -const_value set 2 +const_value set 2 ; person constants const PEWTERNIDORANSPEECHHOUSE_SUPER_NERD const PEWTERNIDORANSPEECHHOUSE_NIDORAN_M diff --git a/maps/PewterPokecenter1F.asm b/maps/PewterPokecenter1F.asm index 1948928b6..dcfa043d4 100644 --- a/maps/PewterPokecenter1F.asm +++ b/maps/PewterPokecenter1F.asm @@ -1,4 +1,4 @@ -const_value set 2 +const_value set 2 ; person constants const PEWTERPOKECENTER1F_NURSE const PEWTERPOKECENTER1F_TEACHER const PEWTERPOKECENTER1F_JIGGLYPUFF diff --git a/maps/PewterSnoozeSpeechHouse.asm b/maps/PewterSnoozeSpeechHouse.asm index 4e76da519..2229b884d 100644 --- a/maps/PewterSnoozeSpeechHouse.asm +++ b/maps/PewterSnoozeSpeechHouse.asm @@ -1,4 +1,4 @@ -const_value set 2 +const_value set 2 ; person constants const PEWTERSNOOZESPEECHHOUSE_GRAMPS PewterSnoozeSpeechHouse_MapScripts: diff --git a/maps/PlayersHouse1F.asm b/maps/PlayersHouse1F.asm index 5ac942d53..39400f2cc 100644 --- a/maps/PlayersHouse1F.asm +++ b/maps/PlayersHouse1F.asm @@ -1,4 +1,4 @@ -const_value set 2 +const_value set 2 ; person constants const PLAYERSHOUSE1F_MOM1 const PLAYERSHOUSE1F_MOM2 const PLAYERSHOUSE1F_MOM3 diff --git a/maps/PlayersHouse2F.asm b/maps/PlayersHouse2F.asm index 011fbbd0c..2e3683600 100644 --- a/maps/PlayersHouse2F.asm +++ b/maps/PlayersHouse2F.asm @@ -1,4 +1,4 @@ -const_value set 2 +const_value set 2 ; person constants const PLAYERSHOUSE2F_CONSOLE const PLAYERSHOUSE2F_DOLL_1 const PLAYERSHOUSE2F_DOLL_2 diff --git a/maps/PlayersNeighborsHouse.asm b/maps/PlayersNeighborsHouse.asm index 514802636..196fc9fe6 100644 --- a/maps/PlayersNeighborsHouse.asm +++ b/maps/PlayersNeighborsHouse.asm @@ -1,4 +1,4 @@ -const_value set 2 +const_value set 2 ; person constants const PLAYERSNEIGHBORSHOUSE_COOLTRAINER_F const PLAYERSNEIGHBORSHOUSE_POKEFAN_F diff --git a/maps/PokeSeersHouse.asm b/maps/PokeSeersHouse.asm index bef008511..ecbff92aa 100644 --- a/maps/PokeSeersHouse.asm +++ b/maps/PokeSeersHouse.asm @@ -1,4 +1,4 @@ -const_value set 2 +const_value set 2 ; person constants const POKESEERSHOUSE_GRANNY PokeSeersHouse_MapScripts: diff --git a/maps/Pokecenter2F.asm b/maps/Pokecenter2F.asm index 05b3ca63a..21bedbac5 100644 --- a/maps/Pokecenter2F.asm +++ b/maps/Pokecenter2F.asm @@ -1,4 +1,4 @@ -const_value set 2 +const_value set 2 ; person constants const POKECENTER2F_TRADE_RECEPTIONIST const POKECENTER2F_BATTLE_RECEPTIONIST const POKECENTER2F_TIME_CAPSULE_RECEPTIONIST diff --git a/maps/PokecomCenterAdminRoomMobile.asm b/maps/PokecomCenterAdminRoomMobile.asm index 5af6eed77..873057f13 100644 --- a/maps/PokecomCenterAdminRoomMobile.asm +++ b/maps/PokecomCenterAdminRoomMobile.asm @@ -1,4 +1,4 @@ -const_value set 2 +const_value set 2 ; person constants const POKECOMCENTERADMINROOMMOBILE_SCIENTIST1 const POKECOMCENTERADMINROOMMOBILE_SCIENTIST2 const POKECOMCENTERADMINROOMMOBILE_SCIENTIST3 diff --git a/maps/PokemonFanClub.asm b/maps/PokemonFanClub.asm index 78bd8607a..8d14c094f 100644 --- a/maps/PokemonFanClub.asm +++ b/maps/PokemonFanClub.asm @@ -1,4 +1,4 @@ -const_value set 2 +const_value set 2 ; person constants const POKEMONFANCLUB_GENTLEMAN const POKEMONFANCLUB_RECEPTIONIST const POKEMONFANCLUB_FISHER diff --git a/maps/PowerPlant.asm b/maps/PowerPlant.asm index fdc17e2a4..30fab8d5b 100644 --- a/maps/PowerPlant.asm +++ b/maps/PowerPlant.asm @@ -1,4 +1,4 @@ -const_value set 2 +const_value set 2 ; person constants const POWERPLANT_OFFICER1 const POWERPLANT_GYM_GUY1 const POWERPLANT_GYM_GUY2 diff --git a/maps/RadioTower1F.asm b/maps/RadioTower1F.asm index 73fee4d01..5f89c1118 100644 --- a/maps/RadioTower1F.asm +++ b/maps/RadioTower1F.asm @@ -1,4 +1,4 @@ -const_value set 2 +const_value set 2 ; person constants const RADIOTOWER1F_RECEPTIONIST const RADIOTOWER1F_LASS const RADIOTOWER1F_YOUNGSTER diff --git a/maps/RadioTower2F.asm b/maps/RadioTower2F.asm index aefb31799..5a590f02b 100644 --- a/maps/RadioTower2F.asm +++ b/maps/RadioTower2F.asm @@ -1,4 +1,4 @@ -const_value set 2 +const_value set 2 ; person constants const RADIOTOWER2F_SUPER_NERD const RADIOTOWER2F_TEACHER const RADIOTOWER2F_ROCKET1 diff --git a/maps/RadioTower3F.asm b/maps/RadioTower3F.asm index 64d5a7ec5..126538721 100644 --- a/maps/RadioTower3F.asm +++ b/maps/RadioTower3F.asm @@ -1,4 +1,4 @@ -const_value set 2 +const_value set 2 ; person constants const RADIOTOWER3F_SUPER_NERD const RADIOTOWER3F_GYM_GUY const RADIOTOWER3F_COOLTRAINER_F diff --git a/maps/RadioTower4F.asm b/maps/RadioTower4F.asm index 3167b3c7b..21299684a 100644 --- a/maps/RadioTower4F.asm +++ b/maps/RadioTower4F.asm @@ -1,4 +1,4 @@ -const_value set 2 +const_value set 2 ; person constants const RADIOTOWER4F_FISHER const RADIOTOWER4F_TEACHER const RADIOTOWER4F_GROWLITHE diff --git a/maps/RadioTower5F.asm b/maps/RadioTower5F.asm index efc0e3cef..2cfc77eea 100644 --- a/maps/RadioTower5F.asm +++ b/maps/RadioTower5F.asm @@ -1,4 +1,4 @@ -const_value set 2 +const_value set 2 ; person constants const RADIOTOWER5F_DIRECTOR const RADIOTOWER5F_ROCKET const RADIOTOWER5F_ROCKET_GIRL diff --git a/maps/RedsHouse1F.asm b/maps/RedsHouse1F.asm index 4c7f1addf..e18f0dc87 100644 --- a/maps/RedsHouse1F.asm +++ b/maps/RedsHouse1F.asm @@ -1,4 +1,4 @@ -const_value set 2 +const_value set 2 ; person constants const REDSHOUSE1F_REDS_MOM RedsHouse1F_MapScripts: diff --git a/maps/RockTunnel1F.asm b/maps/RockTunnel1F.asm index 6b8a8fe35..ea80ca780 100644 --- a/maps/RockTunnel1F.asm +++ b/maps/RockTunnel1F.asm @@ -1,4 +1,4 @@ -const_value set 2 +const_value set 2 ; person constants const ROCKTUNNEL1F_POKE_BALL1 const ROCKTUNNEL1F_POKE_BALL2 diff --git a/maps/RockTunnelB1F.asm b/maps/RockTunnelB1F.asm index 799e31fc8..47090d74c 100644 --- a/maps/RockTunnelB1F.asm +++ b/maps/RockTunnelB1F.asm @@ -1,4 +1,4 @@ -const_value set 2 +const_value set 2 ; person constants const ROCKTUNNELB1F_POKE_BALL1 const ROCKTUNNELB1F_POKE_BALL2 const ROCKTUNNELB1F_POKE_BALL3 diff --git a/maps/Route1.asm b/maps/Route1.asm index 834605d8a..68b96f274 100644 --- a/maps/Route1.asm +++ b/maps/Route1.asm @@ -1,4 +1,4 @@ -const_value set 2 +const_value set 2 ; person constants const ROUTE1_YOUNGSTER const ROUTE1_COOLTRAINER_F const ROUTE1_FRUIT_TREE diff --git a/maps/Route10Pokecenter1F.asm b/maps/Route10Pokecenter1F.asm index 6e33641a9..54d489b59 100644 --- a/maps/Route10Pokecenter1F.asm +++ b/maps/Route10Pokecenter1F.asm @@ -1,4 +1,4 @@ -const_value set 2 +const_value set 2 ; person constants const ROUTE10POKECENTER1F_NURSE const ROUTE10POKECENTER1F_GENTLEMAN const ROUTE10POKECENTER1F_GYM_GUY diff --git a/maps/Route10South.asm b/maps/Route10South.asm index f5946ea74..de5b899d0 100644 --- a/maps/Route10South.asm +++ b/maps/Route10South.asm @@ -1,4 +1,4 @@ -const_value set 2 +const_value set 2 ; person constants const ROUTE10SOUTH_POKEFAN_M1 const ROUTE10SOUTH_POKEFAN_M2 diff --git a/maps/Route11.asm b/maps/Route11.asm index 1e7f9d7c7..c2c5c3912 100644 --- a/maps/Route11.asm +++ b/maps/Route11.asm @@ -1,4 +1,4 @@ -const_value set 2 +const_value set 2 ; person constants const ROUTE11_YOUNGSTER1 const ROUTE11_YOUNGSTER2 const ROUTE11_YOUNGSTER3 diff --git a/maps/Route12.asm b/maps/Route12.asm index 78671620c..955f2803a 100644 --- a/maps/Route12.asm +++ b/maps/Route12.asm @@ -1,4 +1,4 @@ -const_value set 2 +const_value set 2 ; person constants const ROUTE12_FISHER1 const ROUTE12_FISHER2 const ROUTE12_FISHER3 diff --git a/maps/Route12SuperRodHouse.asm b/maps/Route12SuperRodHouse.asm index 0c41049e5..5599ebe18 100644 --- a/maps/Route12SuperRodHouse.asm +++ b/maps/Route12SuperRodHouse.asm @@ -1,4 +1,4 @@ -const_value set 2 +const_value set 2 ; person constants const ROUTE12SUPERRODHOUSE_FISHING_GURU Route12SuperRodHouse_MapScripts: diff --git a/maps/Route13.asm b/maps/Route13.asm index c97a54830..60a9e7998 100644 --- a/maps/Route13.asm +++ b/maps/Route13.asm @@ -1,4 +1,4 @@ -const_value set 2 +const_value set 2 ; person constants const ROUTE13_YOUNGSTER1 const ROUTE13_YOUNGSTER2 const ROUTE13_POKEFAN_M1 diff --git a/maps/Route14.asm b/maps/Route14.asm index aa388dfb9..17d576c17 100644 --- a/maps/Route14.asm +++ b/maps/Route14.asm @@ -1,4 +1,4 @@ -const_value set 2 +const_value set 2 ; person constants const ROUTE14_POKEFAN_M1 const ROUTE14_YOUNGSTER const ROUTE14_POKEFAN_M2 diff --git a/maps/Route15.asm b/maps/Route15.asm index 39737342e..1d855de73 100644 --- a/maps/Route15.asm +++ b/maps/Route15.asm @@ -1,4 +1,4 @@ -const_value set 2 +const_value set 2 ; person constants const ROUTE15_YOUNGSTER1 const ROUTE15_YOUNGSTER2 const ROUTE15_YOUNGSTER3 diff --git a/maps/Route15FuchsiaGate.asm b/maps/Route15FuchsiaGate.asm index 3d31256f7..59fbf8c78 100644 --- a/maps/Route15FuchsiaGate.asm +++ b/maps/Route15FuchsiaGate.asm @@ -1,4 +1,4 @@ -const_value set 2 +const_value set 2 ; person constants const ROUTE15FUCHSIAGATE_OFFICER Route15FuchsiaGate_MapScripts: diff --git a/maps/Route16FuchsiaSpeechHouse.asm b/maps/Route16FuchsiaSpeechHouse.asm index ffac53705..0d3a47d0b 100644 --- a/maps/Route16FuchsiaSpeechHouse.asm +++ b/maps/Route16FuchsiaSpeechHouse.asm @@ -1,4 +1,4 @@ -const_value set 2 +const_value set 2 ; person constants const ROUTE16FUCHSIASPEECHHOUSE_SUPER_NERD Route16FuchsiaSpeechHouse_MapScripts: diff --git a/maps/Route16Gate.asm b/maps/Route16Gate.asm index 9bfbce366..b42875e79 100644 --- a/maps/Route16Gate.asm +++ b/maps/Route16Gate.asm @@ -1,4 +1,4 @@ -const_value set 2 +const_value set 2 ; person constants const ROUTE16GATE_OFFICER Route16Gate_MapScripts: diff --git a/maps/Route17.asm b/maps/Route17.asm index 5fe83bd41..34c150bac 100644 --- a/maps/Route17.asm +++ b/maps/Route17.asm @@ -1,4 +1,4 @@ -const_value set 2 +const_value set 2 ; person constants const ROUTE17_BIKER1 const ROUTE17_BIKER2 const ROUTE17_BIKER3 diff --git a/maps/Route17Route18Gate.asm b/maps/Route17Route18Gate.asm index 5b863d524..c778c4c11 100644 --- a/maps/Route17Route18Gate.asm +++ b/maps/Route17Route18Gate.asm @@ -1,4 +1,4 @@ -const_value set 2 +const_value set 2 ; person constants const ROUTE17ROUTE18GATE_OFFICER Route17Route18Gate_MapScripts: diff --git a/maps/Route18.asm b/maps/Route18.asm index 51dee07e9..d6b858bc6 100644 --- a/maps/Route18.asm +++ b/maps/Route18.asm @@ -1,4 +1,4 @@ -const_value set 2 +const_value set 2 ; person constants const ROUTE18_YOUNGSTER1 const ROUTE18_YOUNGSTER2 diff --git a/maps/Route19.asm b/maps/Route19.asm index 123da8374..3d1d7fbb8 100644 --- a/maps/Route19.asm +++ b/maps/Route19.asm @@ -1,4 +1,4 @@ -const_value set 2 +const_value set 2 ; person constants const ROUTE19_SWIMMER_GIRL const ROUTE19_SWIMMER_GUY1 const ROUTE19_SWIMMER_GUY2 diff --git a/maps/Route19FuchsiaGate.asm b/maps/Route19FuchsiaGate.asm index ea0a5fa04..9357f6efe 100644 --- a/maps/Route19FuchsiaGate.asm +++ b/maps/Route19FuchsiaGate.asm @@ -1,4 +1,4 @@ -const_value set 2 +const_value set 2 ; person constants const ROUTE19FUCHSIAGATE_OFFICER Route19FuchsiaGate_MapScripts: diff --git a/maps/Route2.asm b/maps/Route2.asm index 04e11f88b..694a5feec 100644 --- a/maps/Route2.asm +++ b/maps/Route2.asm @@ -1,4 +1,4 @@ -const_value set 2 +const_value set 2 ; person constants const ROUTE2_BUG_CATCHER1 const ROUTE2_BUG_CATCHER2 const ROUTE2_BUG_CATCHER3 diff --git a/maps/Route20.asm b/maps/Route20.asm index da7900400..3ffc6a6a8 100644 --- a/maps/Route20.asm +++ b/maps/Route20.asm @@ -1,4 +1,4 @@ -const_value set 2 +const_value set 2 ; person constants const ROUTE20_SWIMMER_GIRL1 const ROUTE20_SWIMMER_GIRL2 const ROUTE20_SWIMMER_GUY diff --git a/maps/Route21.asm b/maps/Route21.asm index e7bee259d..b6bc080f8 100644 --- a/maps/Route21.asm +++ b/maps/Route21.asm @@ -1,4 +1,4 @@ -const_value set 2 +const_value set 2 ; person constants const ROUTE21_SWIMMER_GIRL const ROUTE21_SWIMMER_GUY const ROUTE21_FISHER diff --git a/maps/Route24.asm b/maps/Route24.asm index ada8cdab1..6ad4d81ec 100644 --- a/maps/Route24.asm +++ b/maps/Route24.asm @@ -1,4 +1,4 @@ -const_value set 2 +const_value set 2 ; person constants const ROUTE24_ROCKET Route24_MapScripts: diff --git a/maps/Route25.asm b/maps/Route25.asm index b27472063..a0cc96cbd 100644 --- a/maps/Route25.asm +++ b/maps/Route25.asm @@ -1,4 +1,4 @@ -const_value set 2 +const_value set 2 ; person constants const ROUTE25_MISTY const ROUTE25_COOLTRAINER_M1 const ROUTE25_YOUNGSTER1 diff --git a/maps/Route26.asm b/maps/Route26.asm index 332e361b3..ae2010817 100644 --- a/maps/Route26.asm +++ b/maps/Route26.asm @@ -1,4 +1,4 @@ -const_value set 2 +const_value set 2 ; person constants const ROUTE26_COOLTRAINER_M1 const ROUTE26_COOLTRAINER_M2 const ROUTE26_COOLTRAINER_F1 diff --git a/maps/Route26HealHouse.asm b/maps/Route26HealHouse.asm index 453ec4693..b85d9820d 100644 --- a/maps/Route26HealHouse.asm +++ b/maps/Route26HealHouse.asm @@ -1,4 +1,4 @@ -const_value set 2 +const_value set 2 ; person constants const ROUTE26HEALHOUSE_TEACHER Route26HealHouse_MapScripts: diff --git a/maps/Route27.asm b/maps/Route27.asm index d7c02cb3b..5ecaf3db2 100644 --- a/maps/Route27.asm +++ b/maps/Route27.asm @@ -1,4 +1,4 @@ -const_value set 2 +const_value set 2 ; person constants const ROUTE27_COOLTRAINER_M1 const ROUTE27_COOLTRAINER_M2 const ROUTE27_COOLTRAINER_F1 diff --git a/maps/Route27SandstormHouse.asm b/maps/Route27SandstormHouse.asm index cd78cb62c..1007e9074 100644 --- a/maps/Route27SandstormHouse.asm +++ b/maps/Route27SandstormHouse.asm @@ -1,4 +1,4 @@ -const_value set 2 +const_value set 2 ; person constants const ROUTE27SANDSTORMHOUSE_GRANNY Route27SandstormHouse_MapScripts: diff --git a/maps/Route28SteelWingHouse.asm b/maps/Route28SteelWingHouse.asm index b3c7856bb..0d1cae45b 100644 --- a/maps/Route28SteelWingHouse.asm +++ b/maps/Route28SteelWingHouse.asm @@ -1,4 +1,4 @@ -const_value set 2 +const_value set 2 ; person constants const ROUTE28STEELWINGHOUSE_CELEBRITY const ROUTE28STEELWINGHOUSE_FEAROW diff --git a/maps/Route29.asm b/maps/Route29.asm index 66b761e2a..63bd7b7be 100644 --- a/maps/Route29.asm +++ b/maps/Route29.asm @@ -1,4 +1,4 @@ -const_value set 2 +const_value set 2 ; person constants const ROUTE29_COOLTRAINER_M1 const ROUTE29_YOUNGSTER const ROUTE29_TEACHER1 diff --git a/maps/Route29Route46Gate.asm b/maps/Route29Route46Gate.asm index ec28965b8..15e5bbb8e 100644 --- a/maps/Route29Route46Gate.asm +++ b/maps/Route29Route46Gate.asm @@ -1,4 +1,4 @@ -const_value set 2 +const_value set 2 ; person constants const ROUTE29ROUTE46GATE_OFFICER const ROUTE29ROUTE46GATE_YOUNGSTER diff --git a/maps/Route2Gate.asm b/maps/Route2Gate.asm index d3626f169..7a80d9424 100644 --- a/maps/Route2Gate.asm +++ b/maps/Route2Gate.asm @@ -1,4 +1,4 @@ -const_value set 2 +const_value set 2 ; person constants const ROUTE2GATE_SCIENTIST Route2Gate_MapScripts: diff --git a/maps/Route2NuggetHouse.asm b/maps/Route2NuggetHouse.asm index 451d9d177..58e862beb 100644 --- a/maps/Route2NuggetHouse.asm +++ b/maps/Route2NuggetHouse.asm @@ -1,4 +1,4 @@ -const_value set 2 +const_value set 2 ; person constants const ROUTE2NUGGETHOUSE_FISHER Route2NuggetHouse_MapScripts: diff --git a/maps/Route3.asm b/maps/Route3.asm index 65c8a35d2..b77d3d5df 100644 --- a/maps/Route3.asm +++ b/maps/Route3.asm @@ -1,4 +1,4 @@ -const_value set 2 +const_value set 2 ; person constants const ROUTE3_FISHER1 const ROUTE3_YOUNGSTER1 const ROUTE3_YOUNGSTER2 diff --git a/maps/Route30.asm b/maps/Route30.asm index 78d41fac8..fa8448aa6 100644 --- a/maps/Route30.asm +++ b/maps/Route30.asm @@ -1,4 +1,4 @@ -const_value set 2 +const_value set 2 ; person constants const ROUTE30_YOUNGSTER1 const ROUTE30_YOUNGSTER2 const ROUTE30_YOUNGSTER3 diff --git a/maps/Route30BerryHouse.asm b/maps/Route30BerryHouse.asm index a6586ce6a..3baad0209 100644 --- a/maps/Route30BerryHouse.asm +++ b/maps/Route30BerryHouse.asm @@ -1,4 +1,4 @@ -const_value set 2 +const_value set 2 ; person constants const ROUTE30BERRYHOUSE_POKEFAN_M Route30BerryHouse_MapScripts: diff --git a/maps/Route31.asm b/maps/Route31.asm index 0d774ebdb..e30e56600 100644 --- a/maps/Route31.asm +++ b/maps/Route31.asm @@ -1,4 +1,4 @@ -const_value set 2 +const_value set 2 ; person constants const ROUTE31_FISHER const ROUTE31_YOUNGSTER const ROUTE31_BUG_CATCHER diff --git a/maps/Route31VioletGate.asm b/maps/Route31VioletGate.asm index a85a0bc44..4a3912567 100644 --- a/maps/Route31VioletGate.asm +++ b/maps/Route31VioletGate.asm @@ -1,4 +1,4 @@ -const_value set 2 +const_value set 2 ; person constants const ROUTE31VIOLETGATE_OFFICER const ROUTE31VIOLETGATE_COOLTRAINER_F diff --git a/maps/Route32.asm b/maps/Route32.asm index 00d1bc473..54fa28ddd 100644 --- a/maps/Route32.asm +++ b/maps/Route32.asm @@ -1,4 +1,4 @@ -const_value set 2 +const_value set 2 ; person constants const ROUTE32_FISHER1 const ROUTE32_FISHER2 const ROUTE32_FISHER3 diff --git a/maps/Route32Pokecenter1F.asm b/maps/Route32Pokecenter1F.asm index 3c852bff5..186fe7934 100644 --- a/maps/Route32Pokecenter1F.asm +++ b/maps/Route32Pokecenter1F.asm @@ -1,4 +1,4 @@ -const_value set 2 +const_value set 2 ; person constants const ROUTE32POKECENTER1F_NURSE const ROUTE32POKECENTER1F_FISHING_GURU const ROUTE32POKECENTER1F_COOLTRAINER_F diff --git a/maps/Route32RuinsOfAlphGate.asm b/maps/Route32RuinsOfAlphGate.asm index b2b6af2d0..c35c5a752 100644 --- a/maps/Route32RuinsOfAlphGate.asm +++ b/maps/Route32RuinsOfAlphGate.asm @@ -1,4 +1,4 @@ -const_value set 2 +const_value set 2 ; person constants const ROUTE32RUINSOFALPHGATE_OFFICER const ROUTE32RUINSOFALPHGATE_POKEFAN_M const ROUTE32RUINSOFALPHGATE_YOUNGSTER diff --git a/maps/Route33.asm b/maps/Route33.asm index 5993e361a..d54b01f81 100644 --- a/maps/Route33.asm +++ b/maps/Route33.asm @@ -1,4 +1,4 @@ -const_value set 2 +const_value set 2 ; person constants const ROUTE33_POKEFAN_M const ROUTE33_LASS const ROUTE33_FRUIT_TREE diff --git a/maps/Route34.asm b/maps/Route34.asm index 178694c68..ba757f877 100644 --- a/maps/Route34.asm +++ b/maps/Route34.asm @@ -1,4 +1,4 @@ -const_value set 2 +const_value set 2 ; person constants const ROUTE34_YOUNGSTER1 const ROUTE34_YOUNGSTER2 const ROUTE34_YOUNGSTER3 diff --git a/maps/Route34IlexForestGate.asm b/maps/Route34IlexForestGate.asm index f73e488bc..7d885a569 100644 --- a/maps/Route34IlexForestGate.asm +++ b/maps/Route34IlexForestGate.asm @@ -1,4 +1,4 @@ -const_value set 2 +const_value set 2 ; person constants const ROUTE34ILEXFORESTGATE_TEACHER1 const ROUTE34ILEXFORESTGATE_BUTTERFREE const ROUTE34ILEXFORESTGATE_LASS diff --git a/maps/Route35.asm b/maps/Route35.asm index 6bfeff6da..a73738072 100644 --- a/maps/Route35.asm +++ b/maps/Route35.asm @@ -1,4 +1,4 @@ -const_value set 2 +const_value set 2 ; person constants const ROUTE35_YOUNGSTER1 const ROUTE35_YOUNGSTER2 const ROUTE35_LASS1 diff --git a/maps/Route35GoldenrodGate.asm b/maps/Route35GoldenrodGate.asm index 386ac66fe..f09ad646f 100644 --- a/maps/Route35GoldenrodGate.asm +++ b/maps/Route35GoldenrodGate.asm @@ -1,4 +1,4 @@ -const_value set 2 +const_value set 2 ; person constants const ROUTE35GOLDENRODGATE_OFFICER const ROUTE35GOLDENRODGATE_POKEFAN_F const ROUTE35GOLDENRODGATE_FISHER diff --git a/maps/Route35NationalParkGate.asm b/maps/Route35NationalParkGate.asm index 8be5b768a..94eca4488 100644 --- a/maps/Route35NationalParkGate.asm +++ b/maps/Route35NationalParkGate.asm @@ -1,4 +1,4 @@ -const_value set 2 +const_value set 2 ; person constants const ROUTE35NATIONALPARKGATE_OFFICER1 const ROUTE35NATIONALPARKGATE_YOUNGSTER const ROUTE35NATIONALPARKGATE_OFFICER2 diff --git a/maps/Route36.asm b/maps/Route36.asm index d62e7ebd1..3cfbd4df5 100644 --- a/maps/Route36.asm +++ b/maps/Route36.asm @@ -1,4 +1,4 @@ -const_value set 2 +const_value set 2 ; person constants const ROUTE36_YOUNGSTER1 const ROUTE36_YOUNGSTER2 const ROUTE36_WEIRD_TREE diff --git a/maps/Route36NationalParkGate.asm b/maps/Route36NationalParkGate.asm index a635fd8a7..cf1e0b798 100644 --- a/maps/Route36NationalParkGate.asm +++ b/maps/Route36NationalParkGate.asm @@ -1,4 +1,4 @@ -const_value set 2 +const_value set 2 ; person constants const ROUTE36NATIONALPARKGATE_OFFICER1 const ROUTE36NATIONALPARKGATE_YOUNGSTER1 const ROUTE36NATIONALPARKGATE_YOUNGSTER2 diff --git a/maps/Route36RuinsOfAlphGate.asm b/maps/Route36RuinsOfAlphGate.asm index acea3628c..0f5519d9e 100644 --- a/maps/Route36RuinsOfAlphGate.asm +++ b/maps/Route36RuinsOfAlphGate.asm @@ -1,4 +1,4 @@ -const_value set 2 +const_value set 2 ; person constants const ROUTE36RUINSOFALPHGATE_OFFICER const ROUTE36RUINSOFALPHGATE_GRAMPS diff --git a/maps/Route37.asm b/maps/Route37.asm index 0a875ecec..7712903a6 100644 --- a/maps/Route37.asm +++ b/maps/Route37.asm @@ -1,4 +1,4 @@ -const_value set 2 +const_value set 2 ; person constants const ROUTE37_WEIRD_TREE1 const ROUTE37_WEIRD_TREE2 const ROUTE37_YOUNGSTER diff --git a/maps/Route38.asm b/maps/Route38.asm index e1102333a..cda7a868b 100644 --- a/maps/Route38.asm +++ b/maps/Route38.asm @@ -1,4 +1,4 @@ -const_value set 2 +const_value set 2 ; person constants const ROUTE38_STANDING_YOUNGSTER1 const ROUTE38_LASS const ROUTE38_STANDING_YOUNGSTER2 diff --git a/maps/Route38EcruteakGate.asm b/maps/Route38EcruteakGate.asm index adf5419d3..f9912b625 100644 --- a/maps/Route38EcruteakGate.asm +++ b/maps/Route38EcruteakGate.asm @@ -1,4 +1,4 @@ -const_value set 2 +const_value set 2 ; person constants const ROUTE38ECRUTEAKGATE_OFFICER Route38EcruteakGate_MapScripts: diff --git a/maps/Route39.asm b/maps/Route39.asm index 4e3b35067..4af19cb69 100644 --- a/maps/Route39.asm +++ b/maps/Route39.asm @@ -1,4 +1,4 @@ -const_value set 2 +const_value set 2 ; person constants const ROUTE39_SAILOR const ROUTE39_POKEFAN_M const ROUTE39_POKEFAN_F1 diff --git a/maps/Route39Barn.asm b/maps/Route39Barn.asm index 103d924e6..7a41f9086 100644 --- a/maps/Route39Barn.asm +++ b/maps/Route39Barn.asm @@ -1,4 +1,4 @@ -const_value set 2 +const_value set 2 ; person constants const ROUTE39BARN_TWIN1 const ROUTE39BARN_TWIN2 const ROUTE39BARN_MOOMOO diff --git a/maps/Route39Farmhouse.asm b/maps/Route39Farmhouse.asm index 96a19b608..d2622a4bf 100644 --- a/maps/Route39Farmhouse.asm +++ b/maps/Route39Farmhouse.asm @@ -1,4 +1,4 @@ -const_value set 2 +const_value set 2 ; person constants const ROUTE39FARMHOUSE_POKEFAN_M const ROUTE39FARMHOUSE_POKEFAN_F diff --git a/maps/Route4.asm b/maps/Route4.asm index 5662ec516..61f245289 100644 --- a/maps/Route4.asm +++ b/maps/Route4.asm @@ -1,4 +1,4 @@ -const_value set 2 +const_value set 2 ; person constants const ROUTE4_YOUNGSTER const ROUTE4_LASS1 const ROUTE4_LASS2 diff --git a/maps/Route40.asm b/maps/Route40.asm index 53ce2f959..780a7ca86 100644 --- a/maps/Route40.asm +++ b/maps/Route40.asm @@ -1,4 +1,4 @@ -const_value set 2 +const_value set 2 ; person constants const ROUTE40_OLIVINE_RIVAL1 const ROUTE40_OLIVINE_RIVAL2 const ROUTE40_SWIMMER_GIRL1 diff --git a/maps/Route40BattleTowerGate.asm b/maps/Route40BattleTowerGate.asm index d30401714..98ce051bf 100644 --- a/maps/Route40BattleTowerGate.asm +++ b/maps/Route40BattleTowerGate.asm @@ -1,4 +1,4 @@ -const_value set 2 +const_value set 2 ; person constants const ROUTE40BATTLETOWERGATE_ROCKER const ROUTE40BATTLETOWERGATE_TWIN diff --git a/maps/Route41.asm b/maps/Route41.asm index 4307ff3b4..5da9216fb 100644 --- a/maps/Route41.asm +++ b/maps/Route41.asm @@ -1,4 +1,4 @@ -const_value set 2 +const_value set 2 ; person constants const ROUTE41_OLIVINE_RIVAL1 const ROUTE41_OLIVINE_RIVAL2 const ROUTE41_OLIVINE_RIVAL3 diff --git a/maps/Route42.asm b/maps/Route42.asm index 92f28fc22..f86a091ce 100644 --- a/maps/Route42.asm +++ b/maps/Route42.asm @@ -1,4 +1,4 @@ -const_value set 2 +const_value set 2 ; person constants const ROUTE42_FISHER const ROUTE42_POKEFAN_M const ROUTE42_SUPER_NERD diff --git a/maps/Route42EcruteakGate.asm b/maps/Route42EcruteakGate.asm index 2417cd0d8..4a15d5042 100644 --- a/maps/Route42EcruteakGate.asm +++ b/maps/Route42EcruteakGate.asm @@ -1,4 +1,4 @@ -const_value set 2 +const_value set 2 ; person constants const ROUTE42ECRUTEAKGATE_OFFICER Route42EcruteakGate_MapScripts: diff --git a/maps/Route43.asm b/maps/Route43.asm index 0958475db..229cf419e 100644 --- a/maps/Route43.asm +++ b/maps/Route43.asm @@ -1,4 +1,4 @@ -const_value set 2 +const_value set 2 ; person constants const ROUTE43_SUPER_NERD1 const ROUTE43_SUPER_NERD2 const ROUTE43_SUPER_NERD3 diff --git a/maps/Route43Gate.asm b/maps/Route43Gate.asm index 886768431..b244ea2aa 100644 --- a/maps/Route43Gate.asm +++ b/maps/Route43Gate.asm @@ -1,6 +1,6 @@ ROUTE43GATE_TOLL EQU 1000 -const_value set 2 +const_value set 2 ; person constants const ROUTE43GATE_OFFICER const ROUTE43GATE_ROCKET1 const ROUTE43GATE_ROCKET2 diff --git a/maps/Route43MahoganyGate.asm b/maps/Route43MahoganyGate.asm index 0f5243349..0aa77bd26 100644 --- a/maps/Route43MahoganyGate.asm +++ b/maps/Route43MahoganyGate.asm @@ -1,4 +1,4 @@ -const_value set 2 +const_value set 2 ; person constants const ROUTE43MAHOGANYGATE_OFFICER Route43MahoganyGate_MapScripts: diff --git a/maps/Route44.asm b/maps/Route44.asm index 4b3a188cc..c088cd087 100644 --- a/maps/Route44.asm +++ b/maps/Route44.asm @@ -1,4 +1,4 @@ -const_value set 2 +const_value set 2 ; person constants const ROUTE44_FISHER1 const ROUTE44_FISHER2 const ROUTE44_YOUNGSTER1 diff --git a/maps/Route45.asm b/maps/Route45.asm index f5d1c9e9b..6c83d67a1 100644 --- a/maps/Route45.asm +++ b/maps/Route45.asm @@ -1,4 +1,4 @@ -const_value set 2 +const_value set 2 ; person constants const ROUTE45_POKEFAN_M1 const ROUTE45_POKEFAN_M2 const ROUTE45_POKEFAN_M3 diff --git a/maps/Route46.asm b/maps/Route46.asm index 9e4b04f08..f464b3257 100644 --- a/maps/Route46.asm +++ b/maps/Route46.asm @@ -1,4 +1,4 @@ -const_value set 2 +const_value set 2 ; person constants const ROUTE46_POKEFAN_M const ROUTE46_YOUNGSTER const ROUTE46_LASS diff --git a/maps/Route5.asm b/maps/Route5.asm index a53bb0f3c..e7d99d930 100644 --- a/maps/Route5.asm +++ b/maps/Route5.asm @@ -1,4 +1,4 @@ -const_value set 2 +const_value set 2 ; person constants const ROUTE5_POKEFAN_M Route5_MapScripts: diff --git a/maps/Route5CleanseTagHouse.asm b/maps/Route5CleanseTagHouse.asm index dc6edf16c..e91c46ab3 100644 --- a/maps/Route5CleanseTagHouse.asm +++ b/maps/Route5CleanseTagHouse.asm @@ -1,4 +1,4 @@ -const_value set 2 +const_value set 2 ; person constants const ROUTE5CLEANSETAGHOUSE_GRANNY const ROUTE5CLEANSETAGHOUSE_TEACHER diff --git a/maps/Route5SaffronGate.asm b/maps/Route5SaffronGate.asm index c10a35d75..d6ac38aa8 100644 --- a/maps/Route5SaffronGate.asm +++ b/maps/Route5SaffronGate.asm @@ -1,4 +1,4 @@ -const_value set 2 +const_value set 2 ; person constants const ROUTE5SAFFRONGATE_OFFICER Route5SaffronGate_MapScripts: diff --git a/maps/Route5UndergroundPathEntrance.asm b/maps/Route5UndergroundPathEntrance.asm index 39013b51d..fd16ea861 100644 --- a/maps/Route5UndergroundPathEntrance.asm +++ b/maps/Route5UndergroundPathEntrance.asm @@ -1,4 +1,4 @@ -const_value set 2 +const_value set 2 ; person constants const ROUTE5UNDERGROUNDPATHENTRANCE_TEACHER Route5UndergroundPathEntrance_MapScripts: diff --git a/maps/Route6.asm b/maps/Route6.asm index fb00e641e..aa6101c20 100644 --- a/maps/Route6.asm +++ b/maps/Route6.asm @@ -1,4 +1,4 @@ -const_value set 2 +const_value set 2 ; person constants const ROUTE6_POKEFAN_M1 const ROUTE6_POKEFAN_M2 const ROUTE6_POKEFAN_M3 diff --git a/maps/Route6SaffronGate.asm b/maps/Route6SaffronGate.asm index dfc8590e8..8fa0197ca 100644 --- a/maps/Route6SaffronGate.asm +++ b/maps/Route6SaffronGate.asm @@ -1,4 +1,4 @@ -const_value set 2 +const_value set 2 ; person constants const ROUTE6SAFFRONGATE_OFFICER Route6SaffronGate_MapScripts: diff --git a/maps/Route7SaffronGate.asm b/maps/Route7SaffronGate.asm index 57b8ff6cc..9d9144994 100644 --- a/maps/Route7SaffronGate.asm +++ b/maps/Route7SaffronGate.asm @@ -1,4 +1,4 @@ -const_value set 2 +const_value set 2 ; person constants const ROUTE7SAFFRONGATE_OFFICER Route7SaffronGate_MapScripts: diff --git a/maps/Route8.asm b/maps/Route8.asm index e66a06a83..5f0a4c44f 100644 --- a/maps/Route8.asm +++ b/maps/Route8.asm @@ -1,4 +1,4 @@ -const_value set 2 +const_value set 2 ; person constants const ROUTE8_BIKER1 const ROUTE8_BIKER2 const ROUTE8_BIKER3 diff --git a/maps/Route8SaffronGate.asm b/maps/Route8SaffronGate.asm index beb0da6a5..a9bce58d3 100644 --- a/maps/Route8SaffronGate.asm +++ b/maps/Route8SaffronGate.asm @@ -1,4 +1,4 @@ -const_value set 2 +const_value set 2 ; person constants const ROUTE8SAFFRONGATE_OFFICER Route8SaffronGate_MapScripts: diff --git a/maps/Route9.asm b/maps/Route9.asm index d25430d27..251c8cc1d 100644 --- a/maps/Route9.asm +++ b/maps/Route9.asm @@ -1,4 +1,4 @@ -const_value set 2 +const_value set 2 ; person constants const ROUTE9_YOUNGSTER1 const ROUTE9_LASS1 const ROUTE9_YOUNGSTER2 diff --git a/maps/RuinsOfAlphAerodactylItemRoom.asm b/maps/RuinsOfAlphAerodactylItemRoom.asm index b5a43250d..c44e87ce8 100644 --- a/maps/RuinsOfAlphAerodactylItemRoom.asm +++ b/maps/RuinsOfAlphAerodactylItemRoom.asm @@ -1,4 +1,4 @@ -const_value set 2 +const_value set 2 ; person constants const RUINSOFALPHAERODACTYLITEMROOM_POKE_BALL1 const RUINSOFALPHAERODACTYLITEMROOM_POKE_BALL2 const RUINSOFALPHAERODACTYLITEMROOM_POKE_BALL3 diff --git a/maps/RuinsOfAlphHoOhItemRoom.asm b/maps/RuinsOfAlphHoOhItemRoom.asm index 94ae48fd7..50ef6843f 100644 --- a/maps/RuinsOfAlphHoOhItemRoom.asm +++ b/maps/RuinsOfAlphHoOhItemRoom.asm @@ -1,4 +1,4 @@ -const_value set 2 +const_value set 2 ; person constants const RUINSOFALPHHOOHITEMROOM_POKE_BALL1 const RUINSOFALPHHOOHITEMROOM_POKE_BALL2 const RUINSOFALPHHOOHITEMROOM_POKE_BALL3 diff --git a/maps/RuinsOfAlphInnerChamber.asm b/maps/RuinsOfAlphInnerChamber.asm index ff9130613..10ca74514 100644 --- a/maps/RuinsOfAlphInnerChamber.asm +++ b/maps/RuinsOfAlphInnerChamber.asm @@ -1,4 +1,4 @@ -const_value set 2 +const_value set 2 ; person constants const RUINSOFALPHINNERCHAMBER_FISHER const RUINSOFALPHINNERCHAMBER_TEACHER const RUINSOFALPHINNERCHAMBER_GRAMPS diff --git a/maps/RuinsOfAlphKabutoChamber.asm b/maps/RuinsOfAlphKabutoChamber.asm index 449fdaaaf..b47a1a885 100644 --- a/maps/RuinsOfAlphKabutoChamber.asm +++ b/maps/RuinsOfAlphKabutoChamber.asm @@ -1,4 +1,4 @@ -const_value set 2 +const_value set 2 ; person constants const RUINSOFALPHKABUTOCHAMBER_RECEPTIONIST const RUINSOFALPHKABUTOCHAMBER_SCIENTIST diff --git a/maps/RuinsOfAlphKabutoItemRoom.asm b/maps/RuinsOfAlphKabutoItemRoom.asm index efd2766db..f63330f59 100644 --- a/maps/RuinsOfAlphKabutoItemRoom.asm +++ b/maps/RuinsOfAlphKabutoItemRoom.asm @@ -1,4 +1,4 @@ -const_value set 2 +const_value set 2 ; person constants const RUINSOFALPHKABUTOITEMROOM_POKE_BALL1 const RUINSOFALPHKABUTOITEMROOM_POKE_BALL2 const RUINSOFALPHKABUTOITEMROOM_POKE_BALL3 diff --git a/maps/RuinsOfAlphOmanyteItemRoom.asm b/maps/RuinsOfAlphOmanyteItemRoom.asm index 376531c07..6a6f8aebf 100644 --- a/maps/RuinsOfAlphOmanyteItemRoom.asm +++ b/maps/RuinsOfAlphOmanyteItemRoom.asm @@ -1,4 +1,4 @@ -const_value set 2 +const_value set 2 ; person constants const RUINSOFALPHOMANYTEITEMROOM_POKE_BALL1 const RUINSOFALPHOMANYTEITEMROOM_POKE_BALL2 const RUINSOFALPHOMANYTEITEMROOM_POKE_BALL3 diff --git a/maps/RuinsOfAlphOutside.asm b/maps/RuinsOfAlphOutside.asm index 068a60a51..149ed48ea 100644 --- a/maps/RuinsOfAlphOutside.asm +++ b/maps/RuinsOfAlphOutside.asm @@ -1,4 +1,4 @@ -const_value set 2 +const_value set 2 ; person constants const RUINSOFALPHOUTSIDE_YOUNGSTER1 const RUINSOFALPHOUTSIDE_SCIENTIST const RUINSOFALPHOUTSIDE_FISHER diff --git a/maps/RuinsOfAlphResearchCenter.asm b/maps/RuinsOfAlphResearchCenter.asm index 325f9dd9e..1020865cb 100644 --- a/maps/RuinsOfAlphResearchCenter.asm +++ b/maps/RuinsOfAlphResearchCenter.asm @@ -1,4 +1,4 @@ -const_value set 2 +const_value set 2 ; person constants const RUINSOFALPHRESEARCHCENTER_SCIENTIST1 const RUINSOFALPHRESEARCHCENTER_SCIENTIST2 const RUINSOFALPHRESEARCHCENTER_SCIENTIST3 diff --git a/maps/SafariZoneWardensHome.asm b/maps/SafariZoneWardensHome.asm index 2717a0c8d..17e147a7a 100644 --- a/maps/SafariZoneWardensHome.asm +++ b/maps/SafariZoneWardensHome.asm @@ -1,4 +1,4 @@ -const_value set 2 +const_value set 2 ; person constants const SAFARIZONEWARDENSHOME_LASS SafariZoneWardensHome_MapScripts: diff --git a/maps/SaffronCity.asm b/maps/SaffronCity.asm index bca1d0dde..8c4853eda 100644 --- a/maps/SaffronCity.asm +++ b/maps/SaffronCity.asm @@ -1,4 +1,4 @@ -const_value set 2 +const_value set 2 ; person constants const SAFFRONCITY_LASS1 const SAFFRONCITY_POKEFAN_M const SAFFRONCITY_COOLTRAINER_M diff --git a/maps/SaffronGym.asm b/maps/SaffronGym.asm index 9cceafe44..a0de9bdee 100644 --- a/maps/SaffronGym.asm +++ b/maps/SaffronGym.asm @@ -1,4 +1,4 @@ -const_value set 2 +const_value set 2 ; person constants const SAFFRONGYM_SABRINA const SAFFRONGYM_GRANNY1 const SAFFRONGYM_YOUNGSTER1 diff --git a/maps/SaffronMagnetTrainStation.asm b/maps/SaffronMagnetTrainStation.asm index 69a7a3559..399a30006 100644 --- a/maps/SaffronMagnetTrainStation.asm +++ b/maps/SaffronMagnetTrainStation.asm @@ -1,4 +1,4 @@ -const_value set 2 +const_value set 2 ; person constants const SAFFRONMAGNETTRAINSTATION_OFFICER const SAFFRONMAGNETTRAINSTATION_GYM_GUY const SAFFRONMAGNETTRAINSTATION_TEACHER diff --git a/maps/SaffronMart.asm b/maps/SaffronMart.asm index 65fbf100e..f2ffdc078 100644 --- a/maps/SaffronMart.asm +++ b/maps/SaffronMart.asm @@ -1,4 +1,4 @@ -const_value set 2 +const_value set 2 ; person constants const SAFFRONMART_CLERK const SAFFRONMART_COOLTRAINER_M const SAFFRONMART_COOLTRAINER_F diff --git a/maps/SaffronPokecenter1F.asm b/maps/SaffronPokecenter1F.asm index b72315b15..d28f746e0 100644 --- a/maps/SaffronPokecenter1F.asm +++ b/maps/SaffronPokecenter1F.asm @@ -1,4 +1,4 @@ -const_value set 2 +const_value set 2 ; person constants const SAFFRONPOKECENTER1F_NURSE const SAFFRONPOKECENTER1F_TEACHER const SAFFRONPOKECENTER1F_FISHER diff --git a/maps/SeafoamGym.asm b/maps/SeafoamGym.asm index 8931fdf8a..bb845bcea 100644 --- a/maps/SeafoamGym.asm +++ b/maps/SeafoamGym.asm @@ -1,4 +1,4 @@ -const_value set 2 +const_value set 2 ; person constants const SEAFOAMGYM_BLAINE const SEAFOAMGYM_GYM_GUY diff --git a/maps/SilphCo1F.asm b/maps/SilphCo1F.asm index eefb4d50e..546d168b0 100644 --- a/maps/SilphCo1F.asm +++ b/maps/SilphCo1F.asm @@ -1,4 +1,4 @@ -const_value set 2 +const_value set 2 ; person constants const SILPHCO1F_RECEPTIONIST const SILPHCO1F_OFFICER diff --git a/maps/SilverCaveItemRooms.asm b/maps/SilverCaveItemRooms.asm index 04574f3c5..66a053415 100644 --- a/maps/SilverCaveItemRooms.asm +++ b/maps/SilverCaveItemRooms.asm @@ -1,4 +1,4 @@ -const_value set 2 +const_value set 2 ; person constants const SILVERCAVEITEMROOMS_POKE_BALL1 const SILVERCAVEITEMROOMS_POKE_BALL2 diff --git a/maps/SilverCavePokecenter1F.asm b/maps/SilverCavePokecenter1F.asm index 5ee974367..5bbc5a938 100644 --- a/maps/SilverCavePokecenter1F.asm +++ b/maps/SilverCavePokecenter1F.asm @@ -1,4 +1,4 @@ -const_value set 2 +const_value set 2 ; person constants const SILVERCAVEPOKECENTER1F_NURSE const SILVERCAVEPOKECENTER1F_GRANNY diff --git a/maps/SilverCaveRoom1.asm b/maps/SilverCaveRoom1.asm index ada015512..6d1e4a78a 100644 --- a/maps/SilverCaveRoom1.asm +++ b/maps/SilverCaveRoom1.asm @@ -1,4 +1,4 @@ -const_value set 2 +const_value set 2 ; person constants const SILVERCAVEROOM1_POKE_BALL1 const SILVERCAVEROOM1_POKE_BALL2 const SILVERCAVEROOM1_POKE_BALL3 diff --git a/maps/SilverCaveRoom2.asm b/maps/SilverCaveRoom2.asm index 0b06f893f..00dc158a5 100644 --- a/maps/SilverCaveRoom2.asm +++ b/maps/SilverCaveRoom2.asm @@ -1,4 +1,4 @@ -const_value set 2 +const_value set 2 ; person constants const SILVERCAVEROOM2_POKE_BALL1 const SILVERCAVEROOM2_POKE_BALL2 const SILVERCAVEROOM2_POKE_BALL3 diff --git a/maps/SilverCaveRoom3.asm b/maps/SilverCaveRoom3.asm index 12f5eeb87..747759765 100644 --- a/maps/SilverCaveRoom3.asm +++ b/maps/SilverCaveRoom3.asm @@ -1,4 +1,4 @@ -const_value set 2 +const_value set 2 ; person constants const SILVERCAVEROOM3_RED SilverCaveRoom3_MapScripts: diff --git a/maps/SlowpokeWellB1F.asm b/maps/SlowpokeWellB1F.asm index 53531527d..2b5c1e116 100644 --- a/maps/SlowpokeWellB1F.asm +++ b/maps/SlowpokeWellB1F.asm @@ -1,4 +1,4 @@ -const_value set 2 +const_value set 2 ; person constants const SLOWPOKEWELLB1F_ROCKET1 const SLOWPOKEWELLB1F_ROCKET2 const SLOWPOKEWELLB1F_ROCKET3 diff --git a/maps/SlowpokeWellB2F.asm b/maps/SlowpokeWellB2F.asm index 6f3ca2f54..2fc8f5e6d 100644 --- a/maps/SlowpokeWellB2F.asm +++ b/maps/SlowpokeWellB2F.asm @@ -1,4 +1,4 @@ -const_value set 2 +const_value set 2 ; person constants const SLOWPOKEWELLB2F_GYM_GUY const SLOWPOKEWELLB2F_POKE_BALL diff --git a/maps/SoulHouse.asm b/maps/SoulHouse.asm index ee4d394e2..48ad6f728 100644 --- a/maps/SoulHouse.asm +++ b/maps/SoulHouse.asm @@ -1,4 +1,4 @@ -const_value set 2 +const_value set 2 ; person constants const SOULHOUSE_MRFUJI const SOULHOUSE_TEACHER const SOULHOUSE_LASS diff --git a/maps/SproutTower1F.asm b/maps/SproutTower1F.asm index 7dd9288a9..1be0f6fb7 100644 --- a/maps/SproutTower1F.asm +++ b/maps/SproutTower1F.asm @@ -1,4 +1,4 @@ -const_value set 2 +const_value set 2 ; person constants const SPROUTTOWER1F_SAGE1 const SPROUTTOWER1F_SAGE2 const SPROUTTOWER1F_GRANNY diff --git a/maps/SproutTower2F.asm b/maps/SproutTower2F.asm index f945086a4..59c59eee1 100644 --- a/maps/SproutTower2F.asm +++ b/maps/SproutTower2F.asm @@ -1,4 +1,4 @@ -const_value set 2 +const_value set 2 ; person constants const SPROUTTOWER2F_SAGE1 const SPROUTTOWER2F_SAGE2 const SPROUTTOWER2F_POKE_BALL diff --git a/maps/SproutTower3F.asm b/maps/SproutTower3F.asm index 4917ad5ad..0c89427b7 100644 --- a/maps/SproutTower3F.asm +++ b/maps/SproutTower3F.asm @@ -1,4 +1,4 @@ -const_value set 2 +const_value set 2 ; person constants const SPROUTTOWER3F_SAGE1 const SPROUTTOWER3F_SAGE2 const SPROUTTOWER3F_SAGE3 diff --git a/maps/TeamRocketBaseB1F.asm b/maps/TeamRocketBaseB1F.asm index 0e02a0008..9e87b6d69 100644 --- a/maps/TeamRocketBaseB1F.asm +++ b/maps/TeamRocketBaseB1F.asm @@ -1,4 +1,4 @@ -const_value set 2 +const_value set 2 ; person constants const TEAMROCKETBASEB1F_ROCKET1 const TEAMROCKETBASEB1F_ROCKET2 const TEAMROCKETBASEB1F_SCIENTIST diff --git a/maps/TeamRocketBaseB2F.asm b/maps/TeamRocketBaseB2F.asm index 3e8d0688e..27dc7d523 100644 --- a/maps/TeamRocketBaseB2F.asm +++ b/maps/TeamRocketBaseB2F.asm @@ -1,4 +1,4 @@ -const_value set 2 +const_value set 2 ; person constants const TEAMROCKETBASEB2F_ROCKET1 const TEAMROCKETBASEB2F_ROCKET_GIRL const TEAMROCKETBASEB2F_LANCE diff --git a/maps/TeamRocketBaseB3F.asm b/maps/TeamRocketBaseB3F.asm index cabae5bd1..21fa5aa9c 100644 --- a/maps/TeamRocketBaseB3F.asm +++ b/maps/TeamRocketBaseB3F.asm @@ -1,4 +1,4 @@ -const_value set 2 +const_value set 2 ; person constants const TEAMROCKETBASEB3F_LANCE const TEAMROCKETBASEB3F_ROCKET1 const TEAMROCKETBASEB3F_MOLTRES diff --git a/maps/TimeCapsule.asm b/maps/TimeCapsule.asm index 1f34782f9..97421a769 100644 --- a/maps/TimeCapsule.asm +++ b/maps/TimeCapsule.asm @@ -1,4 +1,4 @@ -const_value set 2 +const_value set 2 ; person constants const TIMECAPSULE_CHRIS1 const TIMECAPSULE_CHRIS2 diff --git a/maps/TinTower1F.asm b/maps/TinTower1F.asm index 9956fb9e7..971dfd3f8 100644 --- a/maps/TinTower1F.asm +++ b/maps/TinTower1F.asm @@ -1,4 +1,4 @@ -const_value set 2 +const_value set 2 ; person constants const TINTOWER1F_SUICUNE const TINTOWER1F_RAIKOU const TINTOWER1F_ENTEI diff --git a/maps/TinTower3F.asm b/maps/TinTower3F.asm index f3f8f230b..ecb2a1402 100644 --- a/maps/TinTower3F.asm +++ b/maps/TinTower3F.asm @@ -1,4 +1,4 @@ -const_value set 2 +const_value set 2 ; person constants const TINTOWER3F_POKE_BALL TinTower3F_MapScripts: diff --git a/maps/TinTower4F.asm b/maps/TinTower4F.asm index 453e985a0..cbc92ec1c 100644 --- a/maps/TinTower4F.asm +++ b/maps/TinTower4F.asm @@ -1,4 +1,4 @@ -const_value set 2 +const_value set 2 ; person constants const TINTOWER4F_POKE_BALL1 const TINTOWER4F_POKE_BALL2 const TINTOWER4F_POKE_BALL3 diff --git a/maps/TinTower5F.asm b/maps/TinTower5F.asm index 1fb058b10..adfaf1880 100644 --- a/maps/TinTower5F.asm +++ b/maps/TinTower5F.asm @@ -1,4 +1,4 @@ -const_value set 2 +const_value set 2 ; person constants const TINTOWER5F_POKE_BALL TinTower5F_MapScripts: diff --git a/maps/TinTower6F.asm b/maps/TinTower6F.asm index 5a4ee770b..aebd4c1f9 100644 --- a/maps/TinTower6F.asm +++ b/maps/TinTower6F.asm @@ -1,4 +1,4 @@ -const_value set 2 +const_value set 2 ; person constants const TINTOWER6F_POKE_BALL TinTower6F_MapScripts: diff --git a/maps/TinTower7F.asm b/maps/TinTower7F.asm index 429657d1b..58bd8b29e 100644 --- a/maps/TinTower7F.asm +++ b/maps/TinTower7F.asm @@ -1,4 +1,4 @@ -const_value set 2 +const_value set 2 ; person constants const TINTOWER7F_POKE_BALL TinTower7F_MapScripts: diff --git a/maps/TinTower8F.asm b/maps/TinTower8F.asm index 403f8e4b1..d5b4d467c 100644 --- a/maps/TinTower8F.asm +++ b/maps/TinTower8F.asm @@ -1,4 +1,4 @@ -const_value set 2 +const_value set 2 ; person constants const TINTOWER8F_POKE_BALL1 const TINTOWER8F_POKE_BALL2 const TINTOWER8F_POKE_BALL3 diff --git a/maps/TinTower9F.asm b/maps/TinTower9F.asm index 9096927c8..01a40f12e 100644 --- a/maps/TinTower9F.asm +++ b/maps/TinTower9F.asm @@ -1,4 +1,4 @@ -const_value set 2 +const_value set 2 ; person constants const TINTOWER9F_POKE_BALL TinTower9F_MapScripts: diff --git a/maps/TinTowerRoof.asm b/maps/TinTowerRoof.asm index 92dde683d..21e30dbe2 100644 --- a/maps/TinTowerRoof.asm +++ b/maps/TinTowerRoof.asm @@ -1,4 +1,4 @@ -const_value set 2 +const_value set 2 ; person constants const TINTOWERROOF_HO_OH TinTowerRoof_MapScripts: diff --git a/maps/TohjoFalls.asm b/maps/TohjoFalls.asm index f0e2cb36b..242adc14f 100644 --- a/maps/TohjoFalls.asm +++ b/maps/TohjoFalls.asm @@ -1,4 +1,4 @@ -const_value set 2 +const_value set 2 ; person constants const TOHJOFALLS_POKE_BALL TohjoFalls_MapScripts: diff --git a/maps/TradeCenter.asm b/maps/TradeCenter.asm index 8bf282bbf..77353d20c 100644 --- a/maps/TradeCenter.asm +++ b/maps/TradeCenter.asm @@ -1,4 +1,4 @@ -const_value set 2 +const_value set 2 ; person constants const TRADECENTER_CHRIS1 const TRADECENTER_CHRIS2 diff --git a/maps/TrainerHouse1F.asm b/maps/TrainerHouse1F.asm index 8714c17f7..b00bc2378 100644 --- a/maps/TrainerHouse1F.asm +++ b/maps/TrainerHouse1F.asm @@ -1,4 +1,4 @@ -const_value set 2 +const_value set 2 ; person constants const TRAINERHOUSE1F_RECEPTIONIST const TRAINERHOUSE1F_COOLTRAINER_M const TRAINERHOUSE1F_COOLTRAINER_F diff --git a/maps/TrainerHouseB1F.asm b/maps/TrainerHouseB1F.asm index 3fc986b3a..7d9586543 100644 --- a/maps/TrainerHouseB1F.asm +++ b/maps/TrainerHouseB1F.asm @@ -1,4 +1,4 @@ -const_value set 2 +const_value set 2 ; person constants const TRAINERHOUSEB1F_RECEPTIONIST const TRAINERHOUSEB1F_CHRIS diff --git a/maps/UnionCave1F.asm b/maps/UnionCave1F.asm index 077869795..a68947bd0 100644 --- a/maps/UnionCave1F.asm +++ b/maps/UnionCave1F.asm @@ -1,4 +1,4 @@ -const_value set 2 +const_value set 2 ; person constants const UNIONCAVE1F_POKEFAN_M1 const UNIONCAVE1F_SUPER_NERD const UNIONCAVE1F_POKEFAN_M2 diff --git a/maps/UnionCaveB1F.asm b/maps/UnionCaveB1F.asm index 5d5719a41..3f5da7612 100644 --- a/maps/UnionCaveB1F.asm +++ b/maps/UnionCaveB1F.asm @@ -1,4 +1,4 @@ -const_value set 2 +const_value set 2 ; person constants const UNIONCAVEB1F_POKEFAN_M1 const UNIONCAVEB1F_POKEFAN_M2 const UNIONCAVEB1F_SUPER_NERD1 diff --git a/maps/UnionCaveB2F.asm b/maps/UnionCaveB2F.asm index c53636179..5ec846c63 100644 --- a/maps/UnionCaveB2F.asm +++ b/maps/UnionCaveB2F.asm @@ -1,4 +1,4 @@ -const_value set 2 +const_value set 2 ; person constants const UNIONCAVEB2F_ROCKER const UNIONCAVEB2F_COOLTRAINER_F1 const UNIONCAVEB2F_COOLTRAINER_F2 diff --git a/maps/VermilionCity.asm b/maps/VermilionCity.asm index fb07c28e8..e1d66413d 100644 --- a/maps/VermilionCity.asm +++ b/maps/VermilionCity.asm @@ -1,4 +1,4 @@ -const_value set 2 +const_value set 2 ; person constants const VERMILIONCITY_TEACHER const VERMILIONCITY_GRAMPS const VERMILIONCITY_MACHOP diff --git a/maps/VermilionDiglettsCaveSpeechHouse.asm b/maps/VermilionDiglettsCaveSpeechHouse.asm index efcc6fde3..eaf5b0e07 100644 --- a/maps/VermilionDiglettsCaveSpeechHouse.asm +++ b/maps/VermilionDiglettsCaveSpeechHouse.asm @@ -1,4 +1,4 @@ -const_value set 2 +const_value set 2 ; person constants const VERMILIONDIGLETTSCAVESPEECHHOUSE_GENTLEMAN VermilionDiglettsCaveSpeechHouse_MapScripts: diff --git a/maps/VermilionFishingSpeechHouse.asm b/maps/VermilionFishingSpeechHouse.asm index b55b2ca11..5be17c675 100644 --- a/maps/VermilionFishingSpeechHouse.asm +++ b/maps/VermilionFishingSpeechHouse.asm @@ -1,4 +1,4 @@ -const_value set 2 +const_value set 2 ; person constants const VERMILIONFISHINGSPEECHHOUSE_FISHING_GURU VermilionFishingSpeechHouse_MapScripts: diff --git a/maps/VermilionGym.asm b/maps/VermilionGym.asm index 0432ca163..86c82863d 100644 --- a/maps/VermilionGym.asm +++ b/maps/VermilionGym.asm @@ -1,4 +1,4 @@ -const_value set 2 +const_value set 2 ; person constants const VERMILIONGYM_SURGE const VERMILIONGYM_GENTLEMAN const VERMILIONGYM_ROCKER diff --git a/maps/VermilionMagnetTrainSpeechHouse.asm b/maps/VermilionMagnetTrainSpeechHouse.asm index 596b8407f..ee04792a2 100644 --- a/maps/VermilionMagnetTrainSpeechHouse.asm +++ b/maps/VermilionMagnetTrainSpeechHouse.asm @@ -1,4 +1,4 @@ -const_value set 2 +const_value set 2 ; person constants const VERMILIONMAGNETTRAINSPEECHHOUSE_POKEFAN_F const VERMILIONMAGNETTRAINSPEECHHOUSE_YOUNGSTER diff --git a/maps/VermilionMart.asm b/maps/VermilionMart.asm index 0de709e44..bcaaad868 100644 --- a/maps/VermilionMart.asm +++ b/maps/VermilionMart.asm @@ -1,4 +1,4 @@ -const_value set 2 +const_value set 2 ; person constants const VERMILIONMART_CLERK const VERMILIONMART_SUPER_NERD const VERMILIONMART_BUENA diff --git a/maps/VermilionPokecenter1F.asm b/maps/VermilionPokecenter1F.asm index 0c3712b3a..095ff49ab 100644 --- a/maps/VermilionPokecenter1F.asm +++ b/maps/VermilionPokecenter1F.asm @@ -1,4 +1,4 @@ -const_value set 2 +const_value set 2 ; person constants const VERMILIONPOKECENTER1F_NURSE const VERMILIONPOKECENTER1F_FISHING_GURU const VERMILIONPOKECENTER1F_SAILOR diff --git a/maps/VermilionPort.asm b/maps/VermilionPort.asm index 7a8faa118..a89474dc1 100644 --- a/maps/VermilionPort.asm +++ b/maps/VermilionPort.asm @@ -1,4 +1,4 @@ -const_value set 2 +const_value set 2 ; person constants const VERMILIONPORT_SAILOR1 const VERMILIONPORT_SAILOR2 const VERMILIONPORT_SUPER_NERD diff --git a/maps/VermilionPortPassage.asm b/maps/VermilionPortPassage.asm index 1364202a4..5184fa00f 100644 --- a/maps/VermilionPortPassage.asm +++ b/maps/VermilionPortPassage.asm @@ -1,4 +1,4 @@ -const_value set 2 +const_value set 2 ; person constants const VERMILIONPORTPASSAGE_TEACHER VermilionPortPassage_MapScripts: diff --git a/maps/VictoryRoad.asm b/maps/VictoryRoad.asm index 062371647..06ba3a805 100644 --- a/maps/VictoryRoad.asm +++ b/maps/VictoryRoad.asm @@ -1,4 +1,4 @@ -const_value set 2 +const_value set 2 ; person constants const VICTORYROAD_SILVER const VICTORYROAD_POKE_BALL1 const VICTORYROAD_POKE_BALL2 diff --git a/maps/VictoryRoadGate.asm b/maps/VictoryRoadGate.asm index 3f5054dd5..59fc5bbea 100644 --- a/maps/VictoryRoadGate.asm +++ b/maps/VictoryRoadGate.asm @@ -1,4 +1,4 @@ -const_value set 2 +const_value set 2 ; person constants const VICTORYROADGATE_OFFICER const VICTORYROADGATE_BLACK_BELT1 const VICTORYROADGATE_BLACK_BELT2 diff --git a/maps/VioletCity.asm b/maps/VioletCity.asm index 93ca00b36..09bd2cc71 100644 --- a/maps/VioletCity.asm +++ b/maps/VioletCity.asm @@ -1,4 +1,4 @@ -const_value set 2 +const_value set 2 ; person constants const VIOLETCITY_EARL const VIOLETCITY_LASS const VIOLETCITY_SUPER_NERD diff --git a/maps/VioletGym.asm b/maps/VioletGym.asm index 1b8b3414a..0bbef6640 100644 --- a/maps/VioletGym.asm +++ b/maps/VioletGym.asm @@ -1,4 +1,4 @@ -const_value set 2 +const_value set 2 ; person constants const VIOLETGYM_FALKNER const VIOLETGYM_YOUNGSTER1 const VIOLETGYM_YOUNGSTER2 diff --git a/maps/VioletKylesHouse.asm b/maps/VioletKylesHouse.asm index be3ae329b..e274331d2 100644 --- a/maps/VioletKylesHouse.asm +++ b/maps/VioletKylesHouse.asm @@ -1,4 +1,4 @@ -const_value set 2 +const_value set 2 ; person constants const VIOLETKYLESHOUSE_POKEFAN_M const VIOLETKYLESHOUSE_KYLE diff --git a/maps/VioletMart.asm b/maps/VioletMart.asm index 006a28208..accbb493c 100644 --- a/maps/VioletMart.asm +++ b/maps/VioletMart.asm @@ -1,4 +1,4 @@ -const_value set 2 +const_value set 2 ; person constants const VIOLETMART_CLERK const VIOLETMART_GRANNY const VIOLETMART_COOLTRAINER_M diff --git a/maps/VioletNicknameSpeechHouse.asm b/maps/VioletNicknameSpeechHouse.asm index 90d137801..c79b8afcd 100644 --- a/maps/VioletNicknameSpeechHouse.asm +++ b/maps/VioletNicknameSpeechHouse.asm @@ -1,4 +1,4 @@ -const_value set 2 +const_value set 2 ; person constants const VIOLETNICKNAMESPEECHHOUSE_TEACHER const VIOLETNICKNAMESPEECHHOUSE_LASS const VIOLETNICKNAMESPEECHHOUSE_BIRD diff --git a/maps/VioletPokecenter1F.asm b/maps/VioletPokecenter1F.asm index 39171fa21..e96d696f0 100644 --- a/maps/VioletPokecenter1F.asm +++ b/maps/VioletPokecenter1F.asm @@ -1,4 +1,4 @@ -const_value set 2 +const_value set 2 ; person constants const VIOLETPOKECENTER1F_NURSE const VIOLETPOKECENTER1F_GAMEBOY_KID const VIOLETPOKECENTER1F_GENTLEMAN diff --git a/maps/ViridianCity.asm b/maps/ViridianCity.asm index 435c21546..0b254e035 100644 --- a/maps/ViridianCity.asm +++ b/maps/ViridianCity.asm @@ -1,4 +1,4 @@ -const_value set 2 +const_value set 2 ; person constants const VIRIDIANCITY_GRAMPS1 const VIRIDIANCITY_GRAMPS2 const VIRIDIANCITY_FISHER diff --git a/maps/ViridianGym.asm b/maps/ViridianGym.asm index f194f434c..2daa02820 100644 --- a/maps/ViridianGym.asm +++ b/maps/ViridianGym.asm @@ -1,4 +1,4 @@ -const_value set 2 +const_value set 2 ; person constants const VIRIDIANGYM_BLUE const VIRIDIANGYM_GYM_GUY diff --git a/maps/ViridianMart.asm b/maps/ViridianMart.asm index be8e454b9..3247ffbf1 100644 --- a/maps/ViridianMart.asm +++ b/maps/ViridianMart.asm @@ -1,4 +1,4 @@ -const_value set 2 +const_value set 2 ; person constants const VIRIDIANMART_CLERK const VIRIDIANMART_LASS const VIRIDIANMART_COOLTRAINER_M diff --git a/maps/ViridianNicknameSpeechHouse.asm b/maps/ViridianNicknameSpeechHouse.asm index c7115761d..65cffe9d9 100644 --- a/maps/ViridianNicknameSpeechHouse.asm +++ b/maps/ViridianNicknameSpeechHouse.asm @@ -1,4 +1,4 @@ -const_value set 2 +const_value set 2 ; person constants const VIRIDIANNICKNAMESPEECHHOUSE_POKEFAN_M const VIRIDIANNICKNAMESPEECHHOUSE_LASS const VIRIDIANNICKNAMESPEECHHOUSE_SPEARY diff --git a/maps/ViridianPokecenter1F.asm b/maps/ViridianPokecenter1F.asm index 296fee253..2b7a31b5d 100644 --- a/maps/ViridianPokecenter1F.asm +++ b/maps/ViridianPokecenter1F.asm @@ -1,4 +1,4 @@ -const_value set 2 +const_value set 2 ; person constants const VIRIDIANPOKECENTER1F_NURSE const VIRIDIANPOKECENTER1F_COOLTRAINER_M const VIRIDIANPOKECENTER1F_COOLTRAINER_F diff --git a/maps/WhirlIslandB1F.asm b/maps/WhirlIslandB1F.asm index b6e3c7fad..302317e91 100644 --- a/maps/WhirlIslandB1F.asm +++ b/maps/WhirlIslandB1F.asm @@ -1,4 +1,4 @@ -const_value set 2 +const_value set 2 ; person constants const WHIRLISLANDB1F_POKE_BALL1 const WHIRLISLANDB1F_POKE_BALL2 const WHIRLISLANDB1F_POKE_BALL3 diff --git a/maps/WhirlIslandB2F.asm b/maps/WhirlIslandB2F.asm index 97df1a598..1f93a1709 100644 --- a/maps/WhirlIslandB2F.asm +++ b/maps/WhirlIslandB2F.asm @@ -1,4 +1,4 @@ -const_value set 2 +const_value set 2 ; person constants const WHIRLISLANDB2F_POKE_BALL1 const WHIRLISLANDB2F_POKE_BALL2 const WHIRLISLANDB2F_POKE_BALL3 diff --git a/maps/WhirlIslandLugiaChamber.asm b/maps/WhirlIslandLugiaChamber.asm index 162cdc88f..cb5e1af8a 100644 --- a/maps/WhirlIslandLugiaChamber.asm +++ b/maps/WhirlIslandLugiaChamber.asm @@ -1,4 +1,4 @@ -const_value set 2 +const_value set 2 ; person constants const WHIRLISLANDLUGIACHAMBER_LUGIA WhirlIslandLugiaChamber_MapScripts: diff --git a/maps/WhirlIslandNE.asm b/maps/WhirlIslandNE.asm index c38d94baa..37885de6e 100644 --- a/maps/WhirlIslandNE.asm +++ b/maps/WhirlIslandNE.asm @@ -1,4 +1,4 @@ -const_value set 2 +const_value set 2 ; person constants const WHIRLISLANDNE_POKE_BALL WhirlIslandNE_MapScripts: diff --git a/maps/WhirlIslandSW.asm b/maps/WhirlIslandSW.asm index 75e8cc3ff..7d0c436be 100644 --- a/maps/WhirlIslandSW.asm +++ b/maps/WhirlIslandSW.asm @@ -1,4 +1,4 @@ -const_value set 2 +const_value set 2 ; person constants const WHIRLISLANDSW_POKE_BALL WhirlIslandSW_MapScripts: diff --git a/maps/WillsRoom.asm b/maps/WillsRoom.asm index e56a5777f..8e8dd4147 100644 --- a/maps/WillsRoom.asm +++ b/maps/WillsRoom.asm @@ -1,4 +1,4 @@ -const_value set 2 +const_value set 2 ; person constants const WILLSROOM_WILL WillsRoom_MapScripts: diff --git a/maps/WiseTriosRoom.asm b/maps/WiseTriosRoom.asm index d92e48c4a..b381561de 100644 --- a/maps/WiseTriosRoom.asm +++ b/maps/WiseTriosRoom.asm @@ -1,4 +1,4 @@ -const_value set 2 +const_value set 2 ; person constants const WISETRIOSROOM_SAGE1 const WISETRIOSROOM_SAGE2 const WISETRIOSROOM_SAGE3 |