summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rwxr-xr-xengine/pokecenter_pc.asm24
-rw-r--r--engine/std_scripts.asm10
-rw-r--r--main.asm6
-rw-r--r--maps.asm66
-rw-r--r--maps/AzaleaPokecenter1F.asm (renamed from maps/AzaleaPokeCenter1F.asm)34
-rw-r--r--maps/AzaleaTown.asm4
-rw-r--r--maps/BetaPokecenterMainHouse.blk (renamed from maps/BetaPokeCenterMainHouse.blk)0
-rw-r--r--maps/BetaPokecenterTradeStation.blk (renamed from maps/BetaPokeCenterTradeStation.blk)0
-rw-r--r--maps/BlackthornCity.asm4
-rw-r--r--maps/BlackthornPokecenter1F.asm (renamed from maps/BlackthornPokeCenter1F.asm)4
-rw-r--r--maps/CeladonCity.asm4
-rw-r--r--maps/CeladonPokecenter1F.asm (renamed from maps/CeladonPokeCenter1F.asm)4
-rw-r--r--maps/CeladonPokecenter2FBeta.asm (renamed from maps/CeladonPokeCenter2FBeta.asm)4
-rw-r--r--maps/CeruleanCity.asm4
-rw-r--r--maps/CeruleanPokecenter1F.asm (renamed from maps/CeruleanPokeCenter1F.asm)4
-rw-r--r--maps/CeruleanPokecenter2FBeta.asm (renamed from maps/CeruleanPokeCenter2FBeta.asm)4
-rw-r--r--maps/CherrygroveCity.asm8
-rw-r--r--maps/CherrygrovePokecenter1F.asm (renamed from maps/CherrygrovePokeCenter1F.asm)4
-rw-r--r--maps/CianwoodCity.asm4
-rw-r--r--maps/CianwoodPokecenter1F.asm (renamed from maps/CianwoodPokeCenter1F.asm)4
-rw-r--r--maps/CinnabarIsland.asm4
-rw-r--r--maps/CinnabarPokecenter1F.asm (renamed from maps/CinnabarPokeCenter1F.asm)4
-rw-r--r--maps/CinnabarPokecenter2FBeta.asm (renamed from maps/CinnabarPokeCenter2FBeta.asm)4
-rw-r--r--maps/Colosseum.asm8
-rw-r--r--maps/EcruteakCity.asm4
-rw-r--r--maps/EcruteakPokecenter1F.asm (renamed from maps/EcruteakPokeCenter1F.asm)56
-rw-r--r--maps/FuchsiaCity.asm4
-rw-r--r--maps/FuchsiaPokecenter1F.asm (renamed from maps/FuchsiaPokeCenter1F.asm)4
-rw-r--r--maps/FuchsiaPokecenter2FBeta.asm (renamed from maps/FuchsiaPokeCenter2FBeta.asm)4
-rw-r--r--maps/GoldenrodCity.asm4
-rw-r--r--maps/GoldenrodPokecenter1F.asm (renamed from maps/GoldenrodPokeCenter1F.asm)12
-rw-r--r--maps/IndigoPlateauPokecenter1F.asm (renamed from maps/IndigoPlateauPokeCenter1F.asm)4
-rw-r--r--maps/IndigoPlateauPokecenter1F.blk (renamed from maps/IndigoPlateauPokeCenter1F.blk)0
-rw-r--r--maps/LavenderPokecenter1F.asm (renamed from maps/LavenderPokeCenter1F.asm)4
-rw-r--r--maps/LavenderPokecenter2FBeta.asm (renamed from maps/LavenderPokeCenter2FBeta.asm)4
-rw-r--r--maps/LavenderTown.asm4
-rw-r--r--maps/MahoganyPokecenter1F.asm (renamed from maps/MahoganyPokeCenter1F.asm)4
-rw-r--r--maps/MahoganyTown.asm4
-rw-r--r--maps/MobileBattleRoom.asm4
-rw-r--r--maps/MobileTradeRoomMobile.asm4
-rw-r--r--maps/OlivineCity.asm4
-rw-r--r--maps/OlivinePokecenter1F.asm (renamed from maps/OlivinePokeCenter1F.asm)4
-rw-r--r--maps/PewterCity.asm4
-rw-r--r--maps/PewterPokecenter1F.asm (renamed from maps/PewterPokeCenter1F.asm)4
-rw-r--r--maps/PewterPokecenter2FBeta.asm (renamed from maps/PewterPokeCenter2FBeta.asm)4
-rw-r--r--maps/Pokecenter1F.blk (renamed from maps/PokeCenter1F.blk)0
-rw-r--r--maps/Pokecenter2F.asm (renamed from maps/PokeCenter2F.asm)200
-rw-r--r--maps/Pokecenter2F.blk (renamed from maps/PokeCenter2F.blk)0
-rw-r--r--maps/Route10North.asm4
-rw-r--r--maps/Route10Pokecenter1F.asm (renamed from maps/Route10PokeCenter1F.asm)4
-rw-r--r--maps/Route10Pokecenter2FBeta.asm (renamed from maps/Route10PokeCenter2FBeta.asm)4
-rw-r--r--maps/Route32.asm4
-rw-r--r--maps/Route32Pokecenter1F.asm (renamed from maps/Route32PokeCenter1F.asm)4
-rw-r--r--maps/SaffronCity.asm4
-rw-r--r--maps/SaffronPokecenter1F.asm (renamed from maps/SaffronPokeCenter1F.asm)4
-rw-r--r--maps/SaffronPokecenter2FBeta.asm (renamed from maps/SaffronPokeCenter2FBeta.asm)4
-rw-r--r--maps/SilverCaveOutside.asm4
-rw-r--r--maps/SilverCavePokecenter1F.asm (renamed from maps/SilverCavePokeCenter1F.asm)4
-rw-r--r--maps/TimeCapsule.asm4
-rw-r--r--maps/TradeCenter.asm4
-rw-r--r--maps/VermilionCity.asm4
-rw-r--r--maps/VermilionPokecenter1F.asm (renamed from maps/VermilionPokeCenter1F.asm)4
-rw-r--r--maps/VermilionPokecenter2FBeta.asm (renamed from maps/VermilionPokeCenter2FBeta.asm)4
-rw-r--r--maps/VioletCity.asm4
-rw-r--r--maps/VioletPokecenter1F.asm (renamed from maps/VioletPokeCenter1F.asm)12
-rw-r--r--maps/ViridianCity.asm4
-rw-r--r--maps/ViridianPokecenter1F.asm (renamed from maps/ViridianPokeCenter1F.asm)4
-rw-r--r--maps/ViridianPokecenter2FBeta.asm (renamed from maps/ViridianPokeCenter2FBeta.asm)4
-rw-r--r--maps/blockdata.asm80
-rw-r--r--maps/map_headers.asm66
-rw-r--r--maps/second_map_headers.asm66
-rw-r--r--text/stdtext.asm2
72 files changed, 429 insertions, 429 deletions
diff --git a/engine/pokecenter_pc.asm b/engine/pokecenter_pc.asm
index f6b970ede..8203ffa19 100755
--- a/engine/pokecenter_pc.asm
+++ b/engine/pokecenter_pc.asm
@@ -2,9 +2,9 @@ PokemonCenterPC: ; 1559a
call PC_CheckPartyForPokemon
ret c
call PC_PlayBootSound
- ld hl, PokeCenterPCText_BootedUpPC
+ ld hl, PokecenterPCText_BootedUpPC
call PC_DisplayText
- ld hl, PokeCenterPCText_AccessWhosePC
+ ld hl, PokecenterPCText_AccessWhosePC
call PC_DisplayTextWaitMenu
ld hl, .TopMenu
call LoadMenuDataHeader
@@ -103,7 +103,7 @@ PC_CheckPartyForPokemon: ; 15650
BillsPC: ; 15668
call PC_PlayChoosePCSound
- ld hl, PokeCenterPCText_AccessedBillsPC
+ ld hl, PokecenterPCText_AccessedBillsPC
call PC_DisplayText
callba _BillsPC
and a
@@ -112,7 +112,7 @@ BillsPC: ; 15668
PlayersPC: ; 15679
call PC_PlayChoosePCSound
- ld hl, PokeCenterPCText_AccessedOwnPC
+ ld hl, PokecenterPCText_AccessedOwnPC
call PC_DisplayText
ld b, $0
call _PlayersPC
@@ -122,7 +122,7 @@ PlayersPC: ; 15679
OaksPC: ; 15689
call PC_PlayChoosePCSound
- ld hl, PokeCenterPCText_AccessedOaksPC
+ ld hl, PokecenterPCText_AccessedOaksPC
call PC_DisplayText
callba ProfOaksPC
and a
@@ -139,7 +139,7 @@ HallOfFamePC: ; 1569a
; 156ab
TurnOffPC: ; 156ab
- ld hl, PokeCenterPCText_LinkClosed
+ ld hl, PokecenterPCText_LinkClosed
call PrintText
scf
ret
@@ -641,37 +641,37 @@ PC_DisplayText: ; 15a20
ret
; 15a27
-PokeCenterPCText_BootedUpPC: ; 0x15a27
+PokecenterPCText_BootedUpPC: ; 0x15a27
; turned on the PC.
text_jump UnknownText_0x1c144d
db "@"
; 0x15a2c
-PokeCenterPCText_AccessWhosePC: ; 0x15a2c
+PokecenterPCText_AccessWhosePC: ; 0x15a2c
; Access whose PC?
text_jump UnknownText_0x1c1462
db "@"
; 0x15a31
-PokeCenterPCText_AccessedBillsPC: ; 0x15a31
+PokecenterPCText_AccessedBillsPC: ; 0x15a31
; BILL's PC accessed. #MON Storage System opened.
text_jump UnknownText_0x1c1474
db "@"
; 0x15a36
-PokeCenterPCText_AccessedOwnPC: ; 0x15a36
+PokecenterPCText_AccessedOwnPC: ; 0x15a36
; Accessed own PC. Item Storage System opened.
text_jump UnknownText_0x1c14a4
db "@"
; 0x15a3b
-PokeCenterPCText_AccessedOaksPC: ; 0x15a3b
+PokecenterPCText_AccessedOaksPC: ; 0x15a3b
; PROF.OAK's PC accessed. #DEX Rating System opened.
text_jump UnknownText_0x1c14d2
db "@"
; 0x15a40
-PokeCenterPCText_LinkClosed: ; 0x15a40
+PokecenterPCText_LinkClosed: ; 0x15a40
; … Link closed…
text_jump UnknownText_0x1c1505
db "@"
diff --git a/engine/std_scripts.asm b/engine/std_scripts.asm
index 629f16fc0..020875ff7 100644
--- a/engine/std_scripts.asm
+++ b/engine/std_scripts.asm
@@ -1,5 +1,5 @@
StdScripts::
- dba PokeCenterNurseScript
+ dba PokecenterNurseScript
dba DifficultBookshelfScript
dba PictureBookshelfScript
dba MagazineBookshelfScript
@@ -15,7 +15,7 @@ StdScripts::
dba TrashCanScript
dba StrengthBoulderScript
dba SmashRockScript
- dba PokeCenterSignScript
+ dba PokecenterSignScript
dba MartSignScript
dba GoldenrodRocketsScript
dba RadioTowerRocketsScript
@@ -52,7 +52,7 @@ StdScripts::
dba GameCornerCoinVendorScript
dba HappinessCheckScript
-PokeCenterNurseScript:
+PokecenterNurseScript:
; EVENT_WELCOMED_TO_POKECOM_CENTER is never set
opentext
@@ -236,8 +236,8 @@ StrengthBoulderScript:
SmashRockScript:
farjump AskRockSmashScript
-PokeCenterSignScript:
- farjumptext PokeCenterSignText
+PokecenterSignScript:
+ farjumptext PokecenterSignText
MartSignScript
farjumptext MartSignText
diff --git a/main.asm b/main.asm
index 5ff629015..525fa26b9 100644
--- a/main.asm
+++ b/main.asm
@@ -3118,17 +3118,17 @@ SetBoxmonOrEggmonCaughtData: ; 4db53
ld a, [MapNumber]
ld c, a
cp MAP_POKECENTER_2F
- jr nz, .NotPokeCenter2F
+ jr nz, .NotPokecenter2F
ld a, b
cp GROUP_POKECENTER_2F
- jr nz, .NotPokeCenter2F
+ jr nz, .NotPokecenter2F
ld a, [BackupMapGroup]
ld b, a
ld a, [BackupMapNumber]
ld c, a
-.NotPokeCenter2F:
+.NotPokecenter2F:
call GetWorldMapLocation
ld b, a
ld a, [PlayerGender]
diff --git a/maps.asm b/maps.asm
index ed36ef4cc..80ded93fc 100644
--- a/maps.asm
+++ b/maps.asm
@@ -74,7 +74,7 @@ SECTION "Map Scripts 4", ROMX
INCLUDE "maps/RadioTower5F.asm"
INCLUDE "maps/OlivineLighthouse5F.asm"
INCLUDE "maps/OlivineLighthouse6F.asm"
-INCLUDE "maps/GoldenrodPokeCenter1F.asm"
+INCLUDE "maps/GoldenrodPokecenter1F.asm"
INCLUDE "maps/GoldenrodPokeComCenter2FMobile.asm"
INCLUDE "maps/IlexForestAzaleaGate.asm"
INCLUDE "maps/Route34IlexForestGate.asm"
@@ -88,10 +88,10 @@ INCLUDE "maps/VioletMart.asm"
INCLUDE "maps/VioletGym.asm"
INCLUDE "maps/EarlsPokemonAcademy.asm"
INCLUDE "maps/VioletNicknameSpeechHouse.asm"
-INCLUDE "maps/VioletPokeCenter1F.asm"
+INCLUDE "maps/VioletPokecenter1F.asm"
INCLUDE "maps/VioletOnixTradeHouse.asm"
INCLUDE "maps/Route32RuinsOfAlphGate.asm"
-INCLUDE "maps/Route32PokeCenter1F.asm"
+INCLUDE "maps/Route32Pokecenter1F.asm"
INCLUDE "maps/Route35GoldenrodGate.asm"
INCLUDE "maps/Route35NationalParkGate.asm"
INCLUDE "maps/Route36RuinsOfAlphGate.asm"
@@ -123,8 +123,8 @@ INCLUDE "maps/CeladonMansion2F.asm"
INCLUDE "maps/CeladonMansion3F.asm"
INCLUDE "maps/CeladonMansionRoof.asm"
INCLUDE "maps/CeladonMansionRoofHouse.asm"
-INCLUDE "maps/CeladonPokeCenter1F.asm"
-INCLUDE "maps/CeladonPokeCenter2FBeta.asm"
+INCLUDE "maps/CeladonPokecenter1F.asm"
+INCLUDE "maps/CeladonPokecenter2FBeta.asm"
INCLUDE "maps/CeladonGameCorner.asm"
INCLUDE "maps/CeladonGameCornerPrizeRoom.asm"
INCLUDE "maps/CeladonGym.asm"
@@ -189,8 +189,8 @@ INCLUDE "maps/IcePathB1F.asm"
INCLUDE "maps/IcePathB2FMahoganySide.asm"
INCLUDE "maps/IcePathB2FBlackthornSide.asm"
INCLUDE "maps/IcePathB3F.asm"
-INCLUDE "maps/LavenderPokeCenter1F.asm"
-INCLUDE "maps/LavenderPokeCenter2FBeta.asm"
+INCLUDE "maps/LavenderPokecenter1F.asm"
+INCLUDE "maps/LavenderPokecenter2FBeta.asm"
INCLUDE "maps/MrFujisHouse.asm"
INCLUDE "maps/LavenderTownSpeechHouse.asm"
INCLUDE "maps/LavenderNameRater.asm"
@@ -205,7 +205,7 @@ SECTION "Map Scripts 11", ROMX
INCLUDE "maps/EcruteakHouse.asm"
INCLUDE "maps/WiseTriosRoom.asm"
-INCLUDE "maps/EcruteakPokeCenter1F.asm"
+INCLUDE "maps/EcruteakPokecenter1F.asm"
INCLUDE "maps/EcruteakLugiaSpeechHouse.asm"
INCLUDE "maps/DanceTheatre.asm"
INCLUDE "maps/EcruteakMart.asm"
@@ -216,8 +216,8 @@ INCLUDE "maps/ViridianNicknameSpeechHouse.asm"
INCLUDE "maps/TrainerHouse1F.asm"
INCLUDE "maps/TrainerHouseB1F.asm"
INCLUDE "maps/ViridianMart.asm"
-INCLUDE "maps/ViridianPokeCenter1F.asm"
-INCLUDE "maps/ViridianPokeCenter2FBeta.asm"
+INCLUDE "maps/ViridianPokecenter1F.asm"
+INCLUDE "maps/ViridianPokecenter2FBeta.asm"
INCLUDE "maps/Route2NuggetSpeechHouse.asm"
INCLUDE "maps/Route2Gate.asm"
INCLUDE "maps/VictoryRoadGate.asm"
@@ -225,7 +225,7 @@ INCLUDE "maps/VictoryRoadGate.asm"
SECTION "Map Scripts 12", ROMX
-INCLUDE "maps/OlivinePokeCenter1F.asm"
+INCLUDE "maps/OlivinePokecenter1F.asm"
INCLUDE "maps/OlivineGym.asm"
INCLUDE "maps/OlivineTimsHouse.asm"
INCLUDE "maps/OlivineHouseBeta.asm"
@@ -238,7 +238,7 @@ INCLUDE "maps/Route39Barn.asm"
INCLUDE "maps/Route39Farmhouse.asm"
INCLUDE "maps/ManiasHouse.asm"
INCLUDE "maps/CianwoodGym.asm"
-INCLUDE "maps/CianwoodPokeCenter1F.asm"
+INCLUDE "maps/CianwoodPokecenter1F.asm"
INCLUDE "maps/CianwoodPharmacy.asm"
INCLUDE "maps/CianwoodCityPhotoStudio.asm"
INCLUDE "maps/CianwoodLugiaSpeechHouse.asm"
@@ -253,7 +253,7 @@ INCLUDE "maps/BattleTowerOutside.asm"
SECTION "Map Scripts 13", ROMX
-INCLUDE "maps/IndigoPlateauPokeCenter1F.asm"
+INCLUDE "maps/IndigoPlateauPokecenter1F.asm"
INCLUDE "maps/WillsRoom.asm"
INCLUDE "maps/KogasRoom.asm"
INCLUDE "maps/BrunosRoom.asm"
@@ -286,19 +286,19 @@ SECTION "Map Scripts 15", ROMX
INCLUDE "maps/CeruleanGymBadgeSpeechHouse.asm"
INCLUDE "maps/CeruleanPoliceStation.asm"
INCLUDE "maps/CeruleanTradeSpeechHouse.asm"
-INCLUDE "maps/CeruleanPokeCenter1F.asm"
-INCLUDE "maps/CeruleanPokeCenter2FBeta.asm"
+INCLUDE "maps/CeruleanPokecenter1F.asm"
+INCLUDE "maps/CeruleanPokecenter2FBeta.asm"
INCLUDE "maps/CeruleanGym.asm"
INCLUDE "maps/CeruleanMart.asm"
-INCLUDE "maps/Route10PokeCenter1F.asm"
-INCLUDE "maps/Route10PokeCenter2FBeta.asm"
+INCLUDE "maps/Route10Pokecenter1F.asm"
+INCLUDE "maps/Route10Pokecenter2FBeta.asm"
INCLUDE "maps/PowerPlant.asm"
INCLUDE "maps/BillsHouse.asm"
INCLUDE "maps/FightingDojo.asm"
INCLUDE "maps/SaffronGym.asm"
INCLUDE "maps/SaffronMart.asm"
-INCLUDE "maps/SaffronPokeCenter1F.asm"
-INCLUDE "maps/SaffronPokeCenter2FBeta.asm"
+INCLUDE "maps/SaffronPokecenter1F.asm"
+INCLUDE "maps/SaffronPokecenter2FBeta.asm"
INCLUDE "maps/MrPsychicsHouse.asm"
INCLUDE "maps/SaffronTrainStation.asm"
INCLUDE "maps/SilphCo1F.asm"
@@ -330,7 +330,7 @@ INCLUDE "maps/DragonsDen1F.asm"
INCLUDE "maps/DragonsDenB1F.asm"
INCLUDE "maps/DragonShrine.asm"
INCLUDE "maps/TohjoFalls.asm"
-INCLUDE "maps/AzaleaPokeCenter1F.asm"
+INCLUDE "maps/AzaleaPokecenter1F.asm"
INCLUDE "maps/CharcoalKiln.asm"
INCLUDE "maps/AzaleaMart.asm"
INCLUDE "maps/KurtsHouse.asm"
@@ -342,8 +342,8 @@ SECTION "Map Scripts 17", ROMX
INCLUDE "maps/MahoganyTown.asm"
INCLUDE "maps/Route32.asm"
INCLUDE "maps/VermilionHouseFishingSpeechHouse.asm"
-INCLUDE "maps/VermilionPokeCenter1F.asm"
-INCLUDE "maps/VermilionPokeCenter2FBeta.asm"
+INCLUDE "maps/VermilionPokecenter1F.asm"
+INCLUDE "maps/VermilionPokecenter2FBeta.asm"
INCLUDE "maps/PokemonFanClub.asm"
INCLUDE "maps/VermilionMagnetTrainSpeechHouse.asm"
INCLUDE "maps/VermilionMart.asm"
@@ -351,7 +351,7 @@ INCLUDE "maps/VermilionHouseDiglettsCaveSpeechHouse.asm"
INCLUDE "maps/VermilionGym.asm"
INCLUDE "maps/Route6SaffronGate.asm"
INCLUDE "maps/Route6UndergroundEntrance.asm"
-INCLUDE "maps/PokeCenter2F.asm"
+INCLUDE "maps/Pokecenter2F.asm"
INCLUDE "maps/TradeCenter.asm"
INCLUDE "maps/Colosseum.asm"
INCLUDE "maps/TimeCapsule.asm"
@@ -368,18 +368,18 @@ INCLUDE "maps/BlackthornGym2F.asm"
INCLUDE "maps/BlackthornDragonSpeechHouse.asm"
INCLUDE "maps/BlackthornEmysHouse.asm"
INCLUDE "maps/BlackthornMart.asm"
-INCLUDE "maps/BlackthornPokeCenter1F.asm"
+INCLUDE "maps/BlackthornPokecenter1F.asm"
INCLUDE "maps/MoveDeletersHouse.asm"
INCLUDE "maps/FuchsiaMart.asm"
INCLUDE "maps/SafariZoneMainOffice.asm"
INCLUDE "maps/FuchsiaGym.asm"
INCLUDE "maps/FuchsiaBillSpeechHouse.asm"
-INCLUDE "maps/FuchsiaPokeCenter1F.asm"
-INCLUDE "maps/FuchsiaPokeCenter2FBeta.asm"
+INCLUDE "maps/FuchsiaPokecenter1F.asm"
+INCLUDE "maps/FuchsiaPokecenter2FBeta.asm"
INCLUDE "maps/SafariZoneWardensHome.asm"
INCLUDE "maps/Route15FuchsiaGate.asm"
INCLUDE "maps/CherrygroveMart.asm"
-INCLUDE "maps/CherrygrovePokeCenter1F.asm"
+INCLUDE "maps/CherrygrovePokecenter1F.asm"
INCLUDE "maps/CherrygroveGymSpeechHouse.asm"
INCLUDE "maps/GuideGentsHouse.asm"
INCLUDE "maps/CherrygroveEvolutionSpeechHouse.asm"
@@ -395,7 +395,7 @@ INCLUDE "maps/GoldenrodCity.asm"
INCLUDE "maps/SaffronCity.asm"
INCLUDE "maps/MahoganyRedGyaradosSpeechHouse.asm"
INCLUDE "maps/MahoganyGym.asm"
-INCLUDE "maps/MahoganyPokeCenter1F.asm"
+INCLUDE "maps/MahoganyPokecenter1F.asm"
INCLUDE "maps/Route42EcruteakGate.asm"
INCLUDE "maps/LakeOfRageHiddenPowerHouse.asm"
INCLUDE "maps/LakeOfRageMagikarpHouse.asm"
@@ -429,8 +429,8 @@ INCLUDE "maps/Route13.asm"
INCLUDE "maps/PewterNidoranSpeechHouse.asm"
INCLUDE "maps/PewterGym.asm"
INCLUDE "maps/PewterMart.asm"
-INCLUDE "maps/PewterPokeCenter1F.asm"
-INCLUDE "maps/PewterPokeCenter2FBeta.asm"
+INCLUDE "maps/PewterPokecenter1F.asm"
+INCLUDE "maps/PewterPokecenter2FBeta.asm"
INCLUDE "maps/PewterSnoozeSpeechHouse.asm"
@@ -460,8 +460,8 @@ INCLUDE "maps/CeladonCity.asm"
INCLUDE "maps/Route15.asm"
INCLUDE "maps/VermilionCity.asm"
INCLUDE "maps/Route9.asm"
-INCLUDE "maps/CinnabarPokeCenter1F.asm"
-INCLUDE "maps/CinnabarPokeCenter2FBeta.asm"
+INCLUDE "maps/CinnabarPokecenter1F.asm"
+INCLUDE "maps/CinnabarPokecenter2FBeta.asm"
INCLUDE "maps/Route19FuchsiaGate.asm"
INCLUDE "maps/SeafoamGym.asm"
@@ -488,7 +488,7 @@ INCLUDE "maps/Route3.asm"
INCLUDE "maps/Route4.asm"
INCLUDE "maps/Route10South.asm"
INCLUDE "maps/Route23.asm"
-INCLUDE "maps/SilverCavePokeCenter1F.asm"
+INCLUDE "maps/SilverCavePokecenter1F.asm"
INCLUDE "maps/Route28FamousSpeechHouse.asm"
diff --git a/maps/AzaleaPokeCenter1F.asm b/maps/AzaleaPokecenter1F.asm
index 3a8a0310c..bc09c2e09 100644
--- a/maps/AzaleaPokeCenter1F.asm
+++ b/maps/AzaleaPokecenter1F.asm
@@ -4,7 +4,7 @@ const_value set 2
const AZALEAPOKECENTER1F_FISHING_GURU
const AZALEAPOKECENTER1F_POKEFAN_F
-AzaleaPokeCenter1F_MapScriptHeader:
+AzaleaPokecenter1F_MapScriptHeader:
.MapTriggers:
db 1
maptrigger .DummyTrigger
@@ -15,19 +15,19 @@ AzaleaPokeCenter1F_MapScriptHeader:
.DummyTrigger:
end
-AzaleaPokeCenter1FNurseScript:
+AzaleaPokecenter1FNurseScript:
jumpstd pokecenternurse
-AzaleaPokeCenter1FGentlemanScript:
- jumptextfaceplayer AzaleaPokeCenter1FGentlemanText
+AzaleaPokecenter1FGentlemanScript:
+ jumptextfaceplayer AzaleaPokecenter1FGentlemanText
-AzaleaPokeCenter1FFishingGuruScript:
- jumptextfaceplayer AzaleaPokeCenter1FFishingGuruText
+AzaleaPokecenter1FFishingGuruScript:
+ jumptextfaceplayer AzaleaPokecenter1FFishingGuruText
-AzaleaPokeCenter1FPokefanFScript:
- jumptextfaceplayer AzaleaPokeCenter1FPokefanFText
+AzaleaPokecenter1FPokefanFScript:
+ jumptextfaceplayer AzaleaPokecenter1FPokefanFText
-AzaleaPokeCenter1FGentlemanText:
+AzaleaPokecenter1FGentlemanText:
text "Do your #MON"
line "know HM moves?"
@@ -38,7 +38,7 @@ AzaleaPokeCenter1FGentlemanText:
line "fainted."
done
-AzaleaPokeCenter1FUnusedText:
+AzaleaPokecenter1FUnusedText:
text "This BILL guy"
line "created the system"
@@ -50,13 +50,13 @@ AzaleaPokeCenter1FUnusedText:
cont "#MON per BOX."
done
-AzaleaPokeCenter1FFishingGuruText:
+AzaleaPokecenter1FFishingGuruText:
text "BILL's PC can"
line "store up to 20"
cont "#MON per BOX."
done
-AzaleaPokeCenter1FPokefanFText:
+AzaleaPokecenter1FPokefanFText:
text "Do you know about"
line "APRICORNS?"
@@ -76,7 +76,7 @@ AzaleaPokeCenter1FPokefanFText:
line "APRICORNS."
done
-AzaleaPokeCenter1F_MapEventHeader:
+AzaleaPokecenter1F_MapEventHeader:
; filler
db 0, 0
@@ -94,7 +94,7 @@ AzaleaPokeCenter1F_MapEventHeader:
.PersonEvents:
db 4
- person_event SPRITE_NURSE, 1, 3, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, 0, PERSONTYPE_SCRIPT, 0, AzaleaPokeCenter1FNurseScript, -1
- person_event SPRITE_GENTLEMAN, 6, 9, SPRITEMOVEDATA_WALK_UP_DOWN, 1, 0, -1, -1, 0, PERSONTYPE_SCRIPT, 0, AzaleaPokeCenter1FGentlemanScript, -1
- person_event SPRITE_FISHING_GURU, 1, 6, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, 0, PERSONTYPE_SCRIPT, 0, AzaleaPokeCenter1FFishingGuruScript, -1
- person_event SPRITE_POKEFAN_F, 4, 1, SPRITEMOVEDATA_WANDER, 2, 1, -1, -1, 0, PERSONTYPE_SCRIPT, 0, AzaleaPokeCenter1FPokefanFScript, -1
+ person_event SPRITE_NURSE, 1, 3, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, 0, PERSONTYPE_SCRIPT, 0, AzaleaPokecenter1FNurseScript, -1
+ person_event SPRITE_GENTLEMAN, 6, 9, SPRITEMOVEDATA_WALK_UP_DOWN, 1, 0, -1, -1, 0, PERSONTYPE_SCRIPT, 0, AzaleaPokecenter1FGentlemanScript, -1
+ person_event SPRITE_FISHING_GURU, 1, 6, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, 0, PERSONTYPE_SCRIPT, 0, AzaleaPokecenter1FFishingGuruScript, -1
+ person_event SPRITE_POKEFAN_F, 4, 1, SPRITEMOVEDATA_WANDER, 2, 1, -1, -1, 0, PERSONTYPE_SCRIPT, 0, AzaleaPokecenter1FPokefanFScript, -1
diff --git a/maps/AzaleaTown.asm b/maps/AzaleaTown.asm
index e592d0715..db1f5e0d1 100644
--- a/maps/AzaleaTown.asm
+++ b/maps/AzaleaTown.asm
@@ -201,7 +201,7 @@ CharcoalKilnSign:
AzaleaTownIlextForestSign:
jumptext AzaleaTownIlexForestSignText
-AzaleaTownPokeCenterSign:
+AzaleaTownPokecenterSign:
jumpstd pokecentersign
AzaleaTownMartSign:
@@ -483,7 +483,7 @@ AzaleaTown_MapEventHeader:
signpost 15, 14, SIGNPOST_READ, AzaleaGymSign
signpost 7, 29, SIGNPOST_READ, SlowpokeWellSign
signpost 13, 19, SIGNPOST_READ, CharcoalKilnSign
- signpost 9, 16, SIGNPOST_READ, AzaleaTownPokeCenterSign
+ signpost 9, 16, SIGNPOST_READ, AzaleaTownPokecenterSign
signpost 5, 22, SIGNPOST_READ, AzaleaTownMartSign
signpost 9, 3, SIGNPOST_READ, AzaleaTownIlextForestSign
signpost 6, 31, SIGNPOST_ITEM, AzaleaTownHiddenFullHeal
diff --git a/maps/BetaPokeCenterMainHouse.blk b/maps/BetaPokecenterMainHouse.blk
index 261350738..261350738 100644
--- a/maps/BetaPokeCenterMainHouse.blk
+++ b/maps/BetaPokecenterMainHouse.blk
diff --git a/maps/BetaPokeCenterTradeStation.blk b/maps/BetaPokecenterTradeStation.blk
index 555abfa07..555abfa07 100644
--- a/maps/BetaPokeCenterTradeStation.blk
+++ b/maps/BetaPokecenterTradeStation.blk
diff --git a/maps/BlackthornCity.asm b/maps/BlackthornCity.asm
index 465f1597e..c2b23c591 100644
--- a/maps/BlackthornCity.asm
+++ b/maps/BlackthornCity.asm
@@ -138,7 +138,7 @@ DragonDensSign:
BlackthornCityTrainerTips:
jumptext BlackthornCityTrainerTipsText
-BlackthornCityPokeCenterSign:
+BlackthornCityPokecenterSign:
jumpstd pokecentersign
BlackthornCityMartSign:
@@ -338,7 +338,7 @@ BlackthornCity_MapEventHeader:
signpost 3, 21, SIGNPOST_READ, DragonDensSign
signpost 25, 5, SIGNPOST_READ, BlackthornCityTrainerTips
signpost 29, 16, SIGNPOST_READ, BlackthornCityMartSign
- signpost 29, 22, SIGNPOST_READ, BlackthornCityPokeCenterSign
+ signpost 29, 22, SIGNPOST_READ, BlackthornCityPokecenterSign
.PersonEvents:
db 9
diff --git a/maps/BlackthornPokeCenter1F.asm b/maps/BlackthornPokecenter1F.asm
index 3f5cbf3cb..6da357319 100644
--- a/maps/BlackthornPokeCenter1F.asm
+++ b/maps/BlackthornPokecenter1F.asm
@@ -4,7 +4,7 @@ const_value set 2
const BLACKTHORNPOKECENTER1F_TWIN
const BLACKTHORNPOKECENTER1F_COOLTRAINER_M
-BlackthornPokeCenter1F_MapScriptHeader:
+BlackthornPokecenter1F_MapScriptHeader:
.MapTriggers:
db 0
@@ -49,7 +49,7 @@ UnknownText_0x195bfd:
cont "forget an HM move."
done
-BlackthornPokeCenter1F_MapEventHeader:
+BlackthornPokecenter1F_MapEventHeader:
; filler
db 0, 0
diff --git a/maps/CeladonCity.asm b/maps/CeladonCity.asm
index 7b560e05a..a46e01da5 100644
--- a/maps/CeladonCity.asm
+++ b/maps/CeladonCity.asm
@@ -71,7 +71,7 @@ CeladonCityGameCornerSign:
CeladonCityTrainerTips:
jumptext CeladonCityTrainerTipsText
-CeladonCityPokeCenterSign:
+CeladonCityPokecenterSign:
jumpstd pokecentersign
CeladonCityHiddenPpUp:
@@ -261,7 +261,7 @@ CeladonCity_MapEventHeader:
signpost 9, 13, SIGNPOST_READ, CeladonCityMansionSign
signpost 21, 19, SIGNPOST_READ, CeladonCityGameCornerSign
signpost 21, 29, SIGNPOST_READ, CeladonCityTrainerTips
- signpost 9, 30, SIGNPOST_READ, CeladonCityPokeCenterSign
+ signpost 9, 30, SIGNPOST_READ, CeladonCityPokecenterSign
signpost 21, 37, SIGNPOST_ITEM, CeladonCityHiddenPpUp
.PersonEvents:
diff --git a/maps/CeladonPokeCenter1F.asm b/maps/CeladonPokecenter1F.asm
index 653094a51..03912f623 100644
--- a/maps/CeladonPokeCenter1F.asm
+++ b/maps/CeladonPokecenter1F.asm
@@ -5,7 +5,7 @@ const_value set 2
const CELADONPOKECENTER1F_COOLTRAINER_F
const CELADONPOKECENTER1F_EUSINE
-CeladonPokeCenter1F_MapScriptHeader:
+CeladonPokecenter1F_MapScriptHeader:
.MapTriggers:
db 0
@@ -145,7 +145,7 @@ NoBeastsText:
line "you, <PLAYER>!"
done
-CeladonPokeCenter1F_MapEventHeader:
+CeladonPokecenter1F_MapEventHeader:
; filler
db 0, 0
diff --git a/maps/CeladonPokeCenter2FBeta.asm b/maps/CeladonPokecenter2FBeta.asm
index 9c8d25332..70b3cfbd6 100644
--- a/maps/CeladonPokeCenter2FBeta.asm
+++ b/maps/CeladonPokecenter2FBeta.asm
@@ -1,11 +1,11 @@
-CeladonPokeCenter2FBeta_MapScriptHeader:
+CeladonPokecenter2FBeta_MapScriptHeader:
.MapTriggers:
db 0
.MapCallbacks:
db 0
-CeladonPokeCenter2FBeta_MapEventHeader:
+CeladonPokecenter2FBeta_MapEventHeader:
; filler
db 0, 0
diff --git a/maps/CeruleanCity.asm b/maps/CeruleanCity.asm
index 7ef51c16e..9c781cb43 100644
--- a/maps/CeruleanCity.asm
+++ b/maps/CeruleanCity.asm
@@ -140,7 +140,7 @@ CeruleanCapeSign:
CeruleanLockedDoor:
jumptext CeruleanLockedDoorText
-CeruleanCityPokeCenterSign:
+CeruleanCityPokecenterSign:
jumpstd pokecentersign
CeruleanCityMartSign:
@@ -299,7 +299,7 @@ CeruleanCity_MapEventHeader:
signpost 17, 25, SIGNPOST_READ, CeruleanPoliceSign
signpost 7, 23, SIGNPOST_READ, CeruleanCapeSign
signpost 29, 14, SIGNPOST_READ, CeruleanLockedDoor
- signpost 21, 20, SIGNPOST_READ, CeruleanCityPokeCenterSign
+ signpost 21, 20, SIGNPOST_READ, CeruleanCityPokecenterSign
signpost 29, 26, SIGNPOST_READ, CeruleanCityMartSign
signpost 12, 2, SIGNPOST_ITEM, CeruleanCityHiddenBerserkGene
diff --git a/maps/CeruleanPokeCenter1F.asm b/maps/CeruleanPokecenter1F.asm
index 50cc90001..7933c6386 100644
--- a/maps/CeruleanPokeCenter1F.asm
+++ b/maps/CeruleanPokecenter1F.asm
@@ -3,7 +3,7 @@ const_value set 2
const CERULEANPOKECENTER1F_SUPER_NERD
const CERULEANPOKECENTER1F_GYM_GUY
-CeruleanPokeCenter1F_MapScriptHeader:
+CeruleanPokecenter1F_MapScriptHeader:
.MapTriggers:
db 0
@@ -62,7 +62,7 @@ UnknownText_0x1882ff:
line "JOHTO accessible."
done
-CeruleanPokeCenter1F_MapEventHeader:
+CeruleanPokecenter1F_MapEventHeader:
; filler
db 0, 0
diff --git a/maps/CeruleanPokeCenter2FBeta.asm b/maps/CeruleanPokecenter2FBeta.asm
index 4479a484f..96c924b71 100644
--- a/maps/CeruleanPokeCenter2FBeta.asm
+++ b/maps/CeruleanPokecenter2FBeta.asm
@@ -1,11 +1,11 @@
-CeruleanPokeCenter2FBeta_MapScriptHeader:
+CeruleanPokecenter2FBeta_MapScriptHeader:
.MapTriggers:
db 0
.MapCallbacks:
db 0
-CeruleanPokeCenter2FBeta_MapEventHeader:
+CeruleanPokecenter2FBeta_MapEventHeader:
; filler
db 0, 0
diff --git a/maps/CherrygroveCity.asm b/maps/CherrygroveCity.asm
index 61418fc82..ef13130bc 100644
--- a/maps/CherrygroveCity.asm
+++ b/maps/CherrygroveCity.asm
@@ -40,7 +40,7 @@ CherrygroveCityGuideGent:
follow CHERRYGROVECITY_GRAMPS, PLAYER
applymovement CHERRYGROVECITY_GRAMPS, GuideGentMovement1
opentext
- writetext GuideGentPokeCenterText
+ writetext GuideGentPokecenterText
waitbutton
closetext
applymovement CHERRYGROVECITY_GRAMPS, GuideGentMovement2
@@ -231,7 +231,7 @@ CherrygroveCitySign:
GuideGentsHouseSign:
jumptext GuideGentsHouseSignText
-CherrygroveCityPokeCenterSign:
+CherrygroveCityPokecenterSign:
jumpstd pokecentersign
CherrygroveCityMartSign:
@@ -354,7 +354,7 @@ GuideGentTourText1:
line "Follow me!"
done
-GuideGentPokeCenterText:
+GuideGentPokecenterText:
text "This is a #MON"
line "CENTER. They heal"
@@ -568,7 +568,7 @@ CherrygroveCity_MapEventHeader:
signpost 8, 30, SIGNPOST_READ, CherrygroveCitySign
signpost 9, 23, SIGNPOST_READ, GuideGentsHouseSign
signpost 3, 24, SIGNPOST_READ, CherrygroveCityMartSign
- signpost 3, 30, SIGNPOST_READ, CherrygroveCityPokeCenterSign
+ signpost 3, 30, SIGNPOST_READ, CherrygroveCityPokecenterSign
.PersonEvents:
db 5
diff --git a/maps/CherrygrovePokeCenter1F.asm b/maps/CherrygrovePokecenter1F.asm
index 0e8ffe952..e3c9893fa 100644
--- a/maps/CherrygrovePokeCenter1F.asm
+++ b/maps/CherrygrovePokecenter1F.asm
@@ -4,7 +4,7 @@ const_value set 2
const CHERRYGROVEPOKECENTER1F_GENTLEMAN
const CHERRYGROVEPOKECENTER1F_TEACHER
-CherrygrovePokeCenter1F_MapScriptHeader:
+CherrygrovePokecenter1F_MapScriptHeader:
.MapTriggers:
db 0
@@ -68,7 +68,7 @@ UnknownText_0x196a46:
line "there already!"
done
-CherrygrovePokeCenter1F_MapEventHeader:
+CherrygrovePokecenter1F_MapEventHeader:
; filler
db 0, 0
diff --git a/maps/CianwoodCity.asm b/maps/CianwoodCity.asm
index 63c83d83d..f86e9dcca 100644
--- a/maps/CianwoodCity.asm
+++ b/maps/CianwoodCity.asm
@@ -138,7 +138,7 @@ CianwoodPhotoStudioSign:
CianwoodPokeSeerSign:
jumptext CianwoodPokeSeerSignText
-CianwoodPokeCenterSign:
+CianwoodPokecenterSign:
jumpstd pokecentersign
CianwoodCityRock:
@@ -402,7 +402,7 @@ CianwoodCity_MapEventHeader:
db 8
signpost 34, 20, SIGNPOST_READ, CianwoodCitySign
signpost 45, 7, SIGNPOST_READ, CianwoodGymSign
- signpost 43, 24, SIGNPOST_READ, CianwoodPokeCenterSign
+ signpost 43, 24, SIGNPOST_READ, CianwoodPokecenterSign
signpost 47, 19, SIGNPOST_READ, CianwoodPharmacySign
signpost 32, 8, SIGNPOST_READ, CianwoodPhotoStudioSign
signpost 24, 8, SIGNPOST_READ, CianwoodPokeSeerSign
diff --git a/maps/CianwoodPokeCenter1F.asm b/maps/CianwoodPokecenter1F.asm
index e1d89bca6..4671836b7 100644
--- a/maps/CianwoodPokeCenter1F.asm
+++ b/maps/CianwoodPokecenter1F.asm
@@ -4,7 +4,7 @@ const_value set 2
const CIANWOODPOKECENTER1F_GYM_GUY
const CIANWOODPOKECENTER1F_SUPER_NERD
-CianwoodPokeCenter1F_MapScriptHeader:
+CianwoodPokecenter1F_MapScriptHeader:
.MapTriggers:
db 0
@@ -131,7 +131,7 @@ UnknownText_0x9ded7:
line "off my #MON!"
done
-CianwoodPokeCenter1F_MapEventHeader:
+CianwoodPokecenter1F_MapEventHeader:
; filler
db 0, 0
diff --git a/maps/CinnabarIsland.asm b/maps/CinnabarIsland.asm
index 6dfa77e3a..c4a742826 100644
--- a/maps/CinnabarIsland.asm
+++ b/maps/CinnabarIsland.asm
@@ -31,7 +31,7 @@ CinnabarIslandGymSign:
CinnabarIslandSign:
jumptext CinnabarIslandSignText
-CinnabarIslandPokeCenterSign:
+CinnabarIslandPokecenterSign:
jumpstd pokecentersign
CinnabarIslandHiddenRareCandy:
@@ -140,7 +140,7 @@ CinnabarIsland_MapEventHeader:
.Signposts:
db 4
- signpost 11, 12, SIGNPOST_READ, CinnabarIslandPokeCenterSign
+ signpost 11, 12, SIGNPOST_READ, CinnabarIslandPokecenterSign
signpost 11, 9, SIGNPOST_READ, CinnabarIslandGymSign
signpost 7, 7, SIGNPOST_READ, CinnabarIslandSign
signpost 1, 9, SIGNPOST_ITEM, CinnabarIslandHiddenRareCandy
diff --git a/maps/CinnabarPokeCenter1F.asm b/maps/CinnabarPokecenter1F.asm
index 434969870..97f240011 100644
--- a/maps/CinnabarPokeCenter1F.asm
+++ b/maps/CinnabarPokecenter1F.asm
@@ -3,7 +3,7 @@ const_value set 2
const CINNABARPOKECENTER1F_COOLTRAINER_F
const CINNABARPOKECENTER1F_FISHER
-CinnabarPokeCenter1F_MapScriptHeader:
+CinnabarPokecenter1F_MapScriptHeader:
.MapTriggers:
db 0
@@ -34,7 +34,7 @@ UnknownText_0x1ab37f:
cont "erupted."
done
-CinnabarPokeCenter1F_MapEventHeader:
+CinnabarPokecenter1F_MapEventHeader:
; filler
db 0, 0
diff --git a/maps/CinnabarPokeCenter2FBeta.asm b/maps/CinnabarPokecenter2FBeta.asm
index fb9d96b7a..1a0c4c695 100644
--- a/maps/CinnabarPokeCenter2FBeta.asm
+++ b/maps/CinnabarPokecenter2FBeta.asm
@@ -1,11 +1,11 @@
-CinnabarPokeCenter2FBeta_MapScriptHeader:
+CinnabarPokecenter2FBeta_MapScriptHeader:
.MapTriggers:
db 0
.MapCallbacks:
db 0
-CinnabarPokeCenter2FBeta_MapEventHeader:
+CinnabarPokecenter2FBeta_MapEventHeader:
; filler
db 0, 0
diff --git a/maps/Colosseum.asm b/maps/Colosseum.asm
index 14766393c..abc3a63e7 100644
--- a/maps/Colosseum.asm
+++ b/maps/Colosseum.asm
@@ -12,10 +12,10 @@ Colosseum_MapScriptHeader:
.MapCallbacks:
db 2
dbw MAPCALLBACK_OBJECTS, .SetWhichChris
- dbw MAPCALLBACK_NEWMAP, .PreparePokeCenter2F
+ dbw MAPCALLBACK_NEWMAP, .PreparePokecenter2F
.InitializeColosseum:
- priorityjump .InitializeAndPreparePokeCenter2F
+ priorityjump .InitializeAndPreparePokecenter2F
end
.DummyTrigger1:
@@ -36,11 +36,11 @@ Colosseum_MapScriptHeader:
appear COLOSSEUM_CHRIS2
return
-.PreparePokeCenter2F:
+.PreparePokecenter2F:
domaptrigger POKECENTER_2F, $2
return
-.InitializeAndPreparePokeCenter2F:
+.InitializeAndPreparePokecenter2F:
dotrigger $1
domaptrigger POKECENTER_2F, $2
end
diff --git a/maps/EcruteakCity.asm b/maps/EcruteakCity.asm
index bbe5ae1ce..9e2c8fa08 100644
--- a/maps/EcruteakCity.asm
+++ b/maps/EcruteakCity.asm
@@ -81,7 +81,7 @@ EcruteakDanceTheaterSign:
BurnedTowerSign:
jumptext BurnedTowerSignText
-EcruteakCityPokeCenterSign:
+EcruteakCityPokecenterSign:
jumpstd pokecentersign
EcruteakCityMartSign:
@@ -291,7 +291,7 @@ EcruteakCity_MapEventHeader:
signpost 28, 8, SIGNPOST_READ, EcruteakGymSign
signpost 21, 21, SIGNPOST_READ, EcruteakDanceTheaterSign
signpost 10, 2, SIGNPOST_READ, BurnedTowerSign
- signpost 27, 24, SIGNPOST_READ, EcruteakCityPokeCenterSign
+ signpost 27, 24, SIGNPOST_READ, EcruteakCityPokecenterSign
signpost 21, 30, SIGNPOST_READ, EcruteakCityMartSign
signpost 14, 23, SIGNPOST_ITEM, EcruteakCityHiddenHyperPotion
diff --git a/maps/EcruteakPokeCenter1F.asm b/maps/EcruteakPokecenter1F.asm
index b47eda902..704b378bd 100644
--- a/maps/EcruteakPokeCenter1F.asm
+++ b/maps/EcruteakPokecenter1F.asm
@@ -5,7 +5,7 @@ const_value set 2
const ECRUTEAKPOKECENTER1F_GYM_GUY
const ECRUTEAKPOKECENTER1F_BILL
-EcruteakPokeCenter1F_MapScriptHeader:
+EcruteakPokecenter1F_MapScriptHeader:
.MapTriggers:
db 2
maptrigger .MeetBill
@@ -26,8 +26,8 @@ EcruteakPokeCenter1F_MapScriptHeader:
playsound SFX_EXIT_BUILDING
appear ECRUTEAKPOKECENTER1F_BILL
waitsfx
- applymovement ECRUTEAKPOKECENTER1F_BILL, EcruteakPokeCenter1FBillMovement1
- applymovement PLAYER, EcruteakPokeCenter1FPlayerMovement1
+ applymovement ECRUTEAKPOKECENTER1F_BILL, EcruteakPokecenter1FBillMovement1
+ applymovement PLAYER, EcruteakPokecenter1FPlayerMovement1
spriteface ECRUTEAKPOKECENTER1F_NURSE, UP
pause 10
spriteface ECRUTEAKPOKECENTER1F_NURSE, DOWN
@@ -39,16 +39,16 @@ EcruteakPokeCenter1F_MapScriptHeader:
spriteface ECRUTEAKPOKECENTER1F_BILL, DOWN
pause 10
opentext
- writetext EcruteakPokeCenter1F_BillText1
+ writetext EcruteakPokecenter1F_BillText1
buttonsound
jump .PointlessJump
.PointlessJump:
- writetext EcruteakPokeCenter1F_BillText2
+ writetext EcruteakPokecenter1F_BillText2
waitbutton
closetext
spriteface PLAYER, DOWN
- applymovement ECRUTEAKPOKECENTER1F_BILL, EcruteakPokeCenter1FBillMovement2
+ applymovement ECRUTEAKPOKECENTER1F_BILL, EcruteakPokecenter1FBillMovement2
playsound SFX_EXIT_BUILDING
disappear ECRUTEAKPOKECENTER1F_BILL
clearevent EVENT_MET_BILL
@@ -57,24 +57,24 @@ EcruteakPokeCenter1F_MapScriptHeader:
waitsfx
end
-EcruteakPokeCenter1FNurseScript:
+EcruteakPokecenter1FNurseScript:
jumpstd pokecenternurse
-EcruteakPokeCenter1FPokefanMScript:
+EcruteakPokecenter1FPokefanMScript:
special Mobile_DummyReturnFalse
iftrue .mobile
- jumptextfaceplayer EcruteakPokeCenter1FPokefanMText
+ jumptextfaceplayer EcruteakPokecenter1FPokefanMText
.mobile
- jumptextfaceplayer EcruteakPokeCenter1FPokefanMTextMobile
+ jumptextfaceplayer EcruteakPokecenter1FPokefanMTextMobile
-EcruteakPokeCenter1FCooltrainerFScript:
- jumptextfaceplayer EcruteakPokeCenter1FCooltrainerFText
+EcruteakPokecenter1FCooltrainerFScript:
+ jumptextfaceplayer EcruteakPokecenter1FCooltrainerFText
-EcruteakPokeCenter1FGymGuyScript:
- jumptextfaceplayer EcruteakPokeCenter1FGymGuyText
+EcruteakPokecenter1FGymGuyScript:
+ jumptextfaceplayer EcruteakPokecenter1FGymGuyText
-EcruteakPokeCenter1FBillMovement1:
+EcruteakPokecenter1FBillMovement1:
step UP
step UP
step UP
@@ -85,7 +85,7 @@ EcruteakPokeCenter1FBillMovement1:
turn_head UP
step_end
-EcruteakPokeCenter1FBillMovement2:
+EcruteakPokecenter1FBillMovement2:
step RIGHT
step DOWN
step DOWN
@@ -93,13 +93,13 @@ EcruteakPokeCenter1FBillMovement2:
step DOWN
step_end
-EcruteakPokeCenter1FPlayerMovement1:
+EcruteakPokecenter1FPlayerMovement1:
step UP
step UP
step UP
step_end
-EcruteakPokeCenter1F_BillText1:
+EcruteakPokecenter1F_BillText1:
text "Hi, I'm BILL. And"
line "who are you?"
@@ -108,7 +108,7 @@ EcruteakPokeCenter1F_BillText1:
cont "right time."
done
-EcruteakPokeCenter1F_BillText2:
+EcruteakPokecenter1F_BillText2:
text "I just finished"
line "adjustments on my"
cont "TIME CAPSULE."
@@ -162,7 +162,7 @@ EcruteakPokeCenter1F_BillText2:
para "Buh-bye!"
done
-EcruteakPokeCenter1FPokefanMText:
+EcruteakPokecenter1FPokefanMText:
text "The way the KIMONO"
line "GIRLS dance is"
@@ -171,7 +171,7 @@ EcruteakPokeCenter1FPokefanMText:
cont "use their #MON."
done
-EcruteakPokeCenter1FPokefanMTextMobile:
+EcruteakPokecenter1FPokefanMTextMobile:
text "You must be hoping"
line "to battle more"
@@ -187,7 +187,7 @@ EcruteakPokeCenter1FPokefanMTextMobile:
line "OLIVINE CITY."
done
-EcruteakPokeCenter1FCooltrainerFText:
+EcruteakPokecenter1FCooltrainerFText:
text "MORTY, the GYM"
line "LEADER, is soooo"
cont "cool."
@@ -196,7 +196,7 @@ EcruteakPokeCenter1FCooltrainerFText:
line "really tough too."
done
-EcruteakPokeCenter1FGymGuyText:
+EcruteakPokecenter1FGymGuyText:
text "LAKE OF RAGE…"
para "The appearance of"
@@ -206,7 +206,7 @@ EcruteakPokeCenter1FGymGuyText:
line "acy. I know it!"
done
-EcruteakPokeCenter1F_MapEventHeader:
+EcruteakPokecenter1F_MapEventHeader:
; filler
db 0, 0
@@ -224,8 +224,8 @@ EcruteakPokeCenter1F_MapEventHeader:
.PersonEvents:
db 5
- person_event SPRITE_NURSE, 1, 3, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, 0, PERSONTYPE_SCRIPT, 0, EcruteakPokeCenter1FNurseScript, -1
- person_event SPRITE_POKEFAN_M, 6, 7, SPRITEMOVEDATA_SPINRANDOM_FAST, 0, 0, -1, -1, 0, PERSONTYPE_SCRIPT, 0, EcruteakPokeCenter1FPokefanMScript, -1
- person_event SPRITE_COOLTRAINER_F, 4, 1, SPRITEMOVEDATA_SPINRANDOM_SLOW, 0, 0, -1, -1, 0, PERSONTYPE_SCRIPT, 0, EcruteakPokeCenter1FCooltrainerFScript, -1
- person_event SPRITE_GYM_GUY, 1, 7, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_GREEN, PERSONTYPE_SCRIPT, 0, EcruteakPokeCenter1FGymGuyScript, -1
+ person_event SPRITE_NURSE, 1, 3, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, 0, PERSONTYPE_SCRIPT, 0, EcruteakPokecenter1FNurseScript, -1
+ person_event SPRITE_POKEFAN_M, 6, 7, SPRITEMOVEDATA_SPINRANDOM_FAST, 0, 0, -1, -1, 0, PERSONTYPE_SCRIPT, 0, EcruteakPokecenter1FPokefanMScript, -1
+ person_event SPRITE_COOLTRAINER_F, 4, 1, SPRITEMOVEDATA_SPINRANDOM_SLOW, 0, 0, -1, -1, 0, PERSONTYPE_SCRIPT, 0, EcruteakPokecenter1FCooltrainerFScript, -1
+ person_event SPRITE_GYM_GUY, 1, 7, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_GREEN, PERSONTYPE_SCRIPT, 0, EcruteakPokecenter1FGymGuyScript, -1
person_event SPRITE_BILL, 7, 0, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, 0, PERSONTYPE_SCRIPT, 0, ObjectEvent, EVENT_ECRUTEAK_POKE_CENTER_BILL
diff --git a/maps/FuchsiaCity.asm b/maps/FuchsiaCity.asm
index 2ebbf37aa..f13245e68 100644
--- a/maps/FuchsiaCity.asm
+++ b/maps/FuchsiaCity.asm
@@ -43,7 +43,7 @@ SafariZoneClosedSign:
NoLitteringSign:
jumptext NoLitteringSignText
-FuchsiaCityPokeCenterSign:
+FuchsiaCityPokecenterSign:
jumpstd pokecentersign
FuchsiaCityMartSign:
@@ -153,7 +153,7 @@ FuchsiaCity_MapEventHeader:
signpost 29, 27, SIGNPOST_READ, WardensHomeSign
signpost 5, 17, SIGNPOST_READ, SafariZoneClosedSign
signpost 15, 13, SIGNPOST_READ, NoLitteringSign
- signpost 27, 20, SIGNPOST_READ, FuchsiaCityPokeCenterSign
+ signpost 27, 20, SIGNPOST_READ, FuchsiaCityPokecenterSign
signpost 13, 6, SIGNPOST_READ, FuchsiaCityMartSign
.PersonEvents:
diff --git a/maps/FuchsiaPokeCenter1F.asm b/maps/FuchsiaPokecenter1F.asm
index dc31d472a..422661e0b 100644
--- a/maps/FuchsiaPokeCenter1F.asm
+++ b/maps/FuchsiaPokecenter1F.asm
@@ -4,7 +4,7 @@ const_value set 2
const FUCHSIAPOKECENTER1F_COOLTRAINER_F
const FUCHSIAPOKECENTER1F_JANINE_IMPERSONATOR
-FuchsiaPokeCenter1F_MapScriptHeader:
+FuchsiaPokecenter1F_MapScriptHeader:
.MapTriggers:
db 1
maptrigger .DummyTrigger
@@ -88,7 +88,7 @@ UnknownText_0x19654e:
line "like her now!"
done
-FuchsiaPokeCenter1F_MapEventHeader:
+FuchsiaPokecenter1F_MapEventHeader:
; filler
db 0, 0
diff --git a/maps/FuchsiaPokeCenter2FBeta.asm b/maps/FuchsiaPokecenter2FBeta.asm
index 7ba5508a9..a8deeae42 100644
--- a/maps/FuchsiaPokeCenter2FBeta.asm
+++ b/maps/FuchsiaPokecenter2FBeta.asm
@@ -1,11 +1,11 @@
-FuchsiaPokeCenter2FBeta_MapScriptHeader:
+FuchsiaPokecenter2FBeta_MapScriptHeader:
.MapTriggers:
db 0
.MapCallbacks:
db 0
-FuchsiaPokeCenter2FBeta_MapEventHeader:
+FuchsiaPokecenter2FBeta_MapEventHeader:
; filler
db 0, 0
diff --git a/maps/GoldenrodCity.asm b/maps/GoldenrodCity.asm
index 362d2c37d..48959cac8 100644
--- a/maps/GoldenrodCity.asm
+++ b/maps/GoldenrodCity.asm
@@ -266,7 +266,7 @@ GoldenrodCityUndergroundSignNorth:
GoldenrodCityUndergroundSignSouth:
jumptext GoldenrodCityUndergroundSignSouthText
-GoldenrodCityPokeCenterSign:
+GoldenrodCityPokecenterSign:
jumpstd pokecentersign
GoldenrodCityFlowerShopSign:
@@ -591,7 +591,7 @@ GoldenrodCity_MapEventHeader:
signpost 7, 12, SIGNPOST_READ, GoldenrodCityNameRaterSign
signpost 6, 8, SIGNPOST_READ, GoldenrodCityUndergroundSignNorth
signpost 30, 12, SIGNPOST_READ, GoldenrodCityUndergroundSignSouth
- signpost 27, 16, SIGNPOST_UP, GoldenrodCityPokeCenterSign
+ signpost 27, 16, SIGNPOST_UP, GoldenrodCityPokecenterSign
signpost 6, 30, SIGNPOST_READ, GoldenrodCityFlowerShopSign
.PersonEvents:
diff --git a/maps/GoldenrodPokeCenter1F.asm b/maps/GoldenrodPokecenter1F.asm
index 5bfe40fea..2189b4d7e 100644
--- a/maps/GoldenrodPokeCenter1F.asm
+++ b/maps/GoldenrodPokecenter1F.asm
@@ -5,7 +5,7 @@ const_value set 2
const GOLDENRODPOKECENTER1F_LASS
const GOLDENRODPOKECENTER1F_POKEFAN_F
-GoldenrodPokeCenter1F_MapScriptHeader:
+GoldenrodPokecenter1F_MapScriptHeader:
.MapTriggers:
db 0
@@ -15,7 +15,7 @@ GoldenrodPokeCenter1F_MapScriptHeader:
NurseScript_0x60f91:
jumpstd pokecenternurse
-GoldenrodPokeCenter1F_GSBallTriggerLeft:
+GoldenrodPokecenter1F_GSBallTriggerLeft:
writebyte BATTLETOWERACTION_CHECKMOBILEEVENT
special BattleTowerAction
if_equal MOBILE_EVENT_OBJECT_GS_BALL, .gsball
@@ -47,7 +47,7 @@ GoldenrodPokeCenter1F_GSBallTriggerLeft:
.cancel
end
-GoldenrodPokeCenter1F_GSBallTriggerRight:
+GoldenrodPokecenter1F_GSBallTriggerRight:
writebyte BATTLETOWERACTION_CHECKMOBILEEVENT
special BattleTowerAction
if_equal MOBILE_EVENT_OBJECT_GS_BALL, .gsball
@@ -804,7 +804,7 @@ UnknownText_0x62549:
line "the EON MAIL."
done
-GoldenrodPokeCenter1F_MapEventHeader:
+GoldenrodPokecenter1F_MapEventHeader:
; filler
db 0, 0
@@ -817,8 +817,8 @@ GoldenrodPokeCenter1F_MapEventHeader:
.XYTriggers:
db 2
- xy_trigger 0, $7, $3, $0, GoldenrodPokeCenter1F_GSBallTriggerLeft, $0, $0
- xy_trigger 0, $7, $4, $0, GoldenrodPokeCenter1F_GSBallTriggerRight, $0, $0
+ xy_trigger 0, $7, $3, $0, GoldenrodPokecenter1F_GSBallTriggerLeft, $0, $0
+ xy_trigger 0, $7, $4, $0, GoldenrodPokecenter1F_GSBallTriggerRight, $0, $0
.Signposts:
db 0
diff --git a/maps/IndigoPlateauPokeCenter1F.asm b/maps/IndigoPlateauPokecenter1F.asm
index ddb073880..5721e6bfc 100644
--- a/maps/IndigoPlateauPokeCenter1F.asm
+++ b/maps/IndigoPlateauPokecenter1F.asm
@@ -6,7 +6,7 @@ const_value set 2
const INDIGOPLATEAUPOKECENTER1F_GRAMPS
const INDIGOPLATEAUPOKECENTER1F_ABRA
-IndigoPlateauPokeCenter1F_MapScriptHeader:
+IndigoPlateauPokecenter1F_MapScriptHeader:
.MapTriggers:
db 1
maptrigger .DummyTrigger
@@ -302,7 +302,7 @@ AbraText:
text "ABRA: Aabra…"
done
-IndigoPlateauPokeCenter1F_MapEventHeader:
+IndigoPlateauPokecenter1F_MapEventHeader:
; filler
db 0, 0
diff --git a/maps/IndigoPlateauPokeCenter1F.blk b/maps/IndigoPlateauPokecenter1F.blk
index 96c6a225b..96c6a225b 100644
--- a/maps/IndigoPlateauPokeCenter1F.blk
+++ b/maps/IndigoPlateauPokecenter1F.blk
diff --git a/maps/LavenderPokeCenter1F.asm b/maps/LavenderPokecenter1F.asm
index d93e3f9ed..c961364d5 100644
--- a/maps/LavenderPokeCenter1F.asm
+++ b/maps/LavenderPokecenter1F.asm
@@ -4,7 +4,7 @@ const_value set 2
const LAVENDERPOKECENTER1F_TEACHER
const LAVENDERPOKECENTER1F_YOUNGSTER
-LavenderPokeCenter1F_MapScriptHeader:
+LavenderPokecenter1F_MapScriptHeader:
.MapTriggers:
db 0
@@ -80,7 +80,7 @@ UnknownText_0x7e7ed:
cont "smoothly again."
done
-LavenderPokeCenter1F_MapEventHeader:
+LavenderPokecenter1F_MapEventHeader:
; filler
db 0, 0
diff --git a/maps/LavenderPokeCenter2FBeta.asm b/maps/LavenderPokecenter2FBeta.asm
index 9d31d8d4e..3958e0657 100644
--- a/maps/LavenderPokeCenter2FBeta.asm
+++ b/maps/LavenderPokecenter2FBeta.asm
@@ -1,11 +1,11 @@
-LavenderPokeCenter2FBeta_MapScriptHeader:
+LavenderPokecenter2FBeta_MapScriptHeader:
.MapTriggers:
db 0
.MapCallbacks:
db 0
-LavenderPokeCenter2FBeta_MapEventHeader:
+LavenderPokecenter2FBeta_MapEventHeader:
; filler
db 0, 0
diff --git a/maps/LavenderTown.asm b/maps/LavenderTown.asm
index e98be87b5..65bb780f2 100644
--- a/maps/LavenderTown.asm
+++ b/maps/LavenderTown.asm
@@ -40,7 +40,7 @@ VolunteerPokemonHouseSign:
SoulHouseSign:
jumptext SoulHouseSignText
-LavenderPokeCenterSignText:
+LavenderPokecenterSignText:
jumpstd pokecentersign
LavenderMartSignText:
@@ -128,7 +128,7 @@ LavenderTown_MapEventHeader:
signpost 7, 15, SIGNPOST_READ, KantoRadioStationSign
signpost 9, 3, SIGNPOST_READ, VolunteerPokemonHouseSign
signpost 13, 15, SIGNPOST_READ, SoulHouseSign
- signpost 5, 6, SIGNPOST_READ, LavenderPokeCenterSignText
+ signpost 5, 6, SIGNPOST_READ, LavenderPokecenterSignText
signpost 5, 2, SIGNPOST_READ, LavenderMartSignText
.PersonEvents:
diff --git a/maps/MahoganyPokeCenter1F.asm b/maps/MahoganyPokecenter1F.asm
index be0d896b4..73c978836 100644
--- a/maps/MahoganyPokeCenter1F.asm
+++ b/maps/MahoganyPokecenter1F.asm
@@ -4,7 +4,7 @@ const_value set 2
const MAHOGANYPOKECENTER1F_YOUNGSTER
const MAHOGANYPOKECENTER1F_COOLTRAINER_F
-MahoganyPokeCenter1F_MapScriptHeader:
+MahoganyPokecenter1F_MapScriptHeader:
.MapTriggers:
db 0
@@ -53,7 +53,7 @@ UnknownText_0x19a418:
cont "more slowly."
done
-MahoganyPokeCenter1F_MapEventHeader:
+MahoganyPokecenter1F_MapEventHeader:
; filler
db 0, 0
diff --git a/maps/MahoganyTown.asm b/maps/MahoganyTown.asm
index 79232b02e..1ac3c1a4b 100644
--- a/maps/MahoganyTown.asm
+++ b/maps/MahoganyTown.asm
@@ -118,7 +118,7 @@ MahoganyTownRagecandybarSign:
MahoganyGymSign:
jumptext MahoganyGymSignText
-MahoganyTownPokeCenterSign:
+MahoganyTownPokecenterSign:
jumpstd pokecentersign
MovementData_0x1900a4:
@@ -266,7 +266,7 @@ MahoganyTown_MapEventHeader:
signpost 5, 1, SIGNPOST_READ, MahoganyTownSign
signpost 7, 9, SIGNPOST_READ, MahoganyTownRagecandybarSign
signpost 13, 3, SIGNPOST_READ, MahoganyGymSign
- signpost 13, 16, SIGNPOST_READ, MahoganyTownPokeCenterSign
+ signpost 13, 16, SIGNPOST_READ, MahoganyTownPokecenterSign
.PersonEvents:
db 4
diff --git a/maps/MobileBattleRoom.asm b/maps/MobileBattleRoom.asm
index 7a10a7299..aeb0cebad 100644
--- a/maps/MobileBattleRoom.asm
+++ b/maps/MobileBattleRoom.asm
@@ -8,13 +8,13 @@ MobileBattleRoom_MapScriptHeader:
db 0
.InitializeMobileBattleRoom:
- priorityjump .InitializeAndPreparePokeCenter2F
+ priorityjump .InitializeAndPreparePokecenter2F
end
.DummyTrigger:
end
-.InitializeAndPreparePokeCenter2F:
+.InitializeAndPreparePokecenter2F:
dotrigger $1
domaptrigger POKECENTER_2F, $5
end
diff --git a/maps/MobileTradeRoomMobile.asm b/maps/MobileTradeRoomMobile.asm
index 3e1753832..69f762254 100644
--- a/maps/MobileTradeRoomMobile.asm
+++ b/maps/MobileTradeRoomMobile.asm
@@ -8,13 +8,13 @@ MobileTradeRoomMobile_MapScriptHeader:
db 0
.InitializeMobileTradeRoomMobile:
- priorityjump .InitializeAndPreparePokeCenter2F
+ priorityjump .InitializeAndPreparePokecenter2F
end
.DummyTrigger:
end
-.InitializeAndPreparePokeCenter2F:
+.InitializeAndPreparePokecenter2F:
dotrigger $1
domaptrigger POKECENTER_2F, $4
end
diff --git a/maps/OlivineCity.asm b/maps/OlivineCity.asm
index eff8b7ea3..605bd0da2 100644
--- a/maps/OlivineCity.asm
+++ b/maps/OlivineCity.asm
@@ -109,7 +109,7 @@ OlivineLighthouseSign:
OlivineCityBattleTowerSign:
jumptext OlivineCityBattleTowerSignText
-OlivineCityPokeCenterSign:
+OlivineCityPokecenterSign:
jumpstd pokecentersign
OlivineCityMartSign:
@@ -317,7 +317,7 @@ OlivineCity_MapEventHeader:
signpost 11, 7, SIGNPOST_READ, OlivineGymSign
signpost 28, 30, SIGNPOST_READ, OlivineLighthouseSign
signpost 23, 3, SIGNPOST_READ, OlivineCityBattleTowerSign
- signpost 21, 14, SIGNPOST_READ, OlivineCityPokeCenterSign
+ signpost 21, 14, SIGNPOST_READ, OlivineCityPokecenterSign
signpost 17, 20, SIGNPOST_READ, OlivineCityMartSign
.PersonEvents:
diff --git a/maps/OlivinePokeCenter1F.asm b/maps/OlivinePokecenter1F.asm
index db4ab7be4..f331c95db 100644
--- a/maps/OlivinePokeCenter1F.asm
+++ b/maps/OlivinePokecenter1F.asm
@@ -4,7 +4,7 @@ const_value set 2
const OLIVINEPOKECENTER1F_FISHER
const OLIVINEPOKECENTER1F_TEACHER
-OlivinePokeCenter1F_MapScriptHeader:
+OlivinePokecenter1F_MapScriptHeader:
.MapTriggers:
db 0
@@ -47,7 +47,7 @@ UnknownText_0x9c086:
cont "rare #MON."
done
-OlivinePokeCenter1F_MapEventHeader:
+OlivinePokecenter1F_MapEventHeader:
; filler
db 0, 0
diff --git a/maps/PewterCity.asm b/maps/PewterCity.asm
index a05154912..9194cc4ec 100644
--- a/maps/PewterCity.asm
+++ b/maps/PewterCity.asm
@@ -56,7 +56,7 @@ PewterCityMtMoonGiftShopSign:
PewterCityWelcomeSign:
jumptext PewterCityWelcomeSignText
-PewterCityPokeCenterSign:
+PewterCityPokecenterSign:
jumpstd pokecentersign
PewterCityMartSign:
@@ -174,7 +174,7 @@ PewterCity_MapEventHeader:
signpost 9, 15, SIGNPOST_READ, PewterMuseumSign
signpost 19, 33, SIGNPOST_READ, PewterCityMtMoonGiftShopSign
signpost 29, 19, SIGNPOST_READ, PewterCityWelcomeSign
- signpost 25, 14, SIGNPOST_READ, PewterCityPokeCenterSign
+ signpost 25, 14, SIGNPOST_READ, PewterCityPokecenterSign
signpost 17, 24, SIGNPOST_READ, PewterCityMartSign
.PersonEvents:
diff --git a/maps/PewterPokeCenter1F.asm b/maps/PewterPokecenter1F.asm
index a1aa61ae7..b0ef93e16 100644
--- a/maps/PewterPokeCenter1F.asm
+++ b/maps/PewterPokecenter1F.asm
@@ -5,7 +5,7 @@ const_value set 2
const PEWTERPOKECENTER1F_BUG_CATCHER
const PEWTERPOKECENTER1F_CHRIS
-PewterPokeCenter1F_MapScriptHeader:
+PewterPokecenter1F_MapScriptHeader:
.MapTriggers:
db 0
@@ -67,7 +67,7 @@ UnknownText_0x1a2f75:
line "#MON is asleep."
done
-PewterPokeCenter1F_MapEventHeader:
+PewterPokecenter1F_MapEventHeader:
; filler
db 0, 0
diff --git a/maps/PewterPokeCenter2FBeta.asm b/maps/PewterPokecenter2FBeta.asm
index b2530ed8b..af81dfc4b 100644
--- a/maps/PewterPokeCenter2FBeta.asm
+++ b/maps/PewterPokecenter2FBeta.asm
@@ -1,11 +1,11 @@
-PewterPokeCenter2FBeta_MapScriptHeader:
+PewterPokecenter2FBeta_MapScriptHeader:
.MapTriggers:
db 0
.MapCallbacks:
db 0
-PewterPokeCenter2FBeta_MapEventHeader:
+PewterPokecenter2FBeta_MapEventHeader:
; filler
db 0, 0
diff --git a/maps/PokeCenter1F.blk b/maps/Pokecenter1F.blk
index 6d4f1eca9..6d4f1eca9 100644
--- a/maps/PokeCenter1F.blk
+++ b/maps/Pokecenter1F.blk
diff --git a/maps/PokeCenter2F.asm b/maps/Pokecenter2F.asm
index 4ba8555fd..28f519a5f 100644
--- a/maps/PokeCenter2F.asm
+++ b/maps/Pokecenter2F.asm
@@ -4,7 +4,7 @@ const_value set 2
const POKECENTER2F_TIME_CAPSULE_RECEPTIONIST
const POKECENTER2F_OFFICER
-PokeCenter2F_MapScriptHeader:
+Pokecenter2F_MapScriptHeader:
.MapTriggers:
db 6
maptrigger .Trigger0
@@ -23,7 +23,7 @@ PokeCenter2F_MapScriptHeader:
clearevent EVENT_MYSTERY_GIFT_DELIVERY_GUY
checkevent EVENT_RECEIVED_BALLS_FROM_KURT
iftrue .Trigger0Done
- priorityjump PokeCenter2F_AppearMysteryGiftDeliveryGuy
+ priorityjump Pokecenter2F_AppearMysteryGiftDeliveryGuy
.Trigger0Done:
end
@@ -48,7 +48,7 @@ PokeCenter2F_MapScriptHeader:
priorityjump Script_LeftMobileBattleRoom
end
-PokeCenter2F_AppearMysteryGiftDeliveryGuy:
+Pokecenter2F_AppearMysteryGiftDeliveryGuy:
appear POKECENTER2F_OFFICER
setevent EVENT_RECEIVED_BALLS_FROM_KURT
end
@@ -102,7 +102,7 @@ LinkReceptionistScript_Trade:
writetext Text_PleaseComeIn2
waitbutton
closetext
- scall PokeCenter2F_CheckGender
+ scall Pokecenter2F_CheckGender
warpcheck
end
@@ -167,8 +167,8 @@ LinkReceptionistScript_Trade:
end
BattleTradeMobile_WalkIn:
- applymovement2 PokeCenter2FMobileMobileMovementData_ReceptionistWalksUpAndLeft_LookDown
- applymovement PLAYER, PokeCenter2FMobileMovementData_PlayerWalksIntoMobileBattleRoom
+ applymovement2 Pokecenter2FMobileMobileMovementData_ReceptionistWalksUpAndLeft_LookDown
+ applymovement PLAYER, Pokecenter2FMobileMovementData_PlayerWalksIntoMobileBattleRoom
end
LinkReceptionistScript_Battle:
@@ -204,7 +204,7 @@ LinkReceptionistScript_Battle:
writetext Text_PleaseComeIn2
waitbutton
closetext
- scall PokeCenter2F_CheckGender
+ scall Pokecenter2F_CheckGender
warpcheck
end
@@ -388,9 +388,9 @@ Script_LeftMobileTradeRoom:
end
Script_WalkOutOfMobileTradeRoom:
- applymovement POKECENTER2F_TRADE_RECEPTIONIST, PokeCenter2FMobileMovementData_ReceptionistWalksUpAndLeft
- applymovement PLAYER, PokeCenter2FMovementData_PlayerWalksOutOfMobileRoom
- applymovement POKECENTER2F_TRADE_RECEPTIONIST, PokeCenter2FMobileMovementData_ReceptionistWalksRightAndDown
+ applymovement POKECENTER2F_TRADE_RECEPTIONIST, Pokecenter2FMobileMovementData_ReceptionistWalksUpAndLeft
+ applymovement PLAYER, Pokecenter2FMovementData_PlayerWalksOutOfMobileRoom
+ applymovement POKECENTER2F_TRADE_RECEPTIONIST, Pokecenter2FMobileMovementData_ReceptionistWalksRightAndDown
end
Script_LeftCableColosseum:
@@ -408,36 +408,36 @@ Script_LeftMobileBattleRoom:
end
Script_WalkOutOfMobileBattleRoom:
- applymovement POKECENTER2F_BATTLE_RECEPTIONIST, PokeCenter2FMobileMovementData_ReceptionistWalksUpAndLeft
- applymovement PLAYER, PokeCenter2FMovementData_PlayerWalksOutOfMobileRoom
- applymovement POKECENTER2F_BATTLE_RECEPTIONIST, PokeCenter2FMobileMovementData_ReceptionistWalksRightAndDown
+ applymovement POKECENTER2F_BATTLE_RECEPTIONIST, Pokecenter2FMobileMovementData_ReceptionistWalksUpAndLeft
+ applymovement PLAYER, Pokecenter2FMovementData_PlayerWalksOutOfMobileRoom
+ applymovement POKECENTER2F_BATTLE_RECEPTIONIST, Pokecenter2FMobileMovementData_ReceptionistWalksRightAndDown
end
-PokeCenter2F_CheckGender:
+Pokecenter2F_CheckGender:
checkflag ENGINE_PLAYER_IS_FEMALE
iftrue .Female
- applymovement2 PokeCenter2FMovementData_ReceptionistWalksUpAndLeft_LookRight
- applymovement PLAYER, PokeCenter2FMovementData_PlayerTakesThreeStepsUp
+ applymovement2 Pokecenter2FMovementData_ReceptionistWalksUpAndLeft_LookRight
+ applymovement PLAYER, Pokecenter2FMovementData_PlayerTakesThreeStepsUp
end
.Female:
- applymovement2 PokeCenter2FMovementData_ReceptionistWalksUpAndLeft_LookRight_2
- applymovement PLAYER, PokeCenter2FMovementData_PlayerTakesTwoStepsUp
+ applymovement2 Pokecenter2FMovementData_ReceptionistWalksUpAndLeft_LookRight_2
+ applymovement PLAYER, Pokecenter2FMovementData_PlayerTakesTwoStepsUp
opentext
writetext Text_OhPleaseWait
waitbutton
closetext
- applymovement2 PokeCenter2FMovementData_ReceptionistLooksRight
+ applymovement2 Pokecenter2FMovementData_ReceptionistLooksRight
spriteface PLAYER, LEFT
opentext
writetext Text_ChangeTheLook
waitbutton
closetext
playsound SFX_TINGLE
- applymovement PLAYER, PokeCenter2FMovementData_PlayerSpinsClockwiseEndsFacingRight
+ applymovement PLAYER, Pokecenter2FMovementData_PlayerSpinsClockwiseEndsFacingRight
writebyte (PAL_NPC_RED << 4)
special Special_SetPlayerPalette
- applymovement PLAYER, PokeCenter2FMovementData_PlayerSpinsClockwiseEndsFacingLeft
+ applymovement PLAYER, Pokecenter2FMovementData_PlayerSpinsClockwiseEndsFacingLeft
setflag ENGINE_KRIS_IN_CABLE_CLUB
special ReplaceKrisSprite
opentext
@@ -445,51 +445,51 @@ PokeCenter2F_CheckGender:
waitbutton
closetext
showemote EMOTE_SHOCK, PLAYER, 15
- applymovement PLAYER, PokeCenter2FMovementData_PlayerTakesOneStepUp
+ applymovement PLAYER, Pokecenter2FMovementData_PlayerTakesOneStepUp
end
Script_WalkOutOfLinkTradeRoom:
checkflag ENGINE_KRIS_IN_CABLE_CLUB
iftrue .Female
- applymovement POKECENTER2F_TRADE_RECEPTIONIST, PokeCenter2FMovementData_ReceptionistStepsRightLooksDown_3
- applymovement PLAYER, PokeCenter2FMovementData_PlayerTakesThreeStepsDown
- applymovement POKECENTER2F_TRADE_RECEPTIONIST, PokeCenter2FMovementData_ReceptionistStepsRightAndDown
+ applymovement POKECENTER2F_TRADE_RECEPTIONIST, Pokecenter2FMovementData_ReceptionistStepsRightLooksDown_3
+ applymovement PLAYER, Pokecenter2FMovementData_PlayerTakesThreeStepsDown
+ applymovement POKECENTER2F_TRADE_RECEPTIONIST, Pokecenter2FMovementData_ReceptionistStepsRightAndDown
end
.Female:
- applymovement POKECENTER2F_TRADE_RECEPTIONIST, PokeCenter2FMovementData_ReceptionistStepsRightLooksDown_3
- applymovement PLAYER, PokeCenter2FMovementData_PlayerTakesOneStepDown_2
+ applymovement POKECENTER2F_TRADE_RECEPTIONIST, Pokecenter2FMovementData_ReceptionistStepsRightLooksDown_3
+ applymovement PLAYER, Pokecenter2FMovementData_PlayerTakesOneStepDown_2
clearflag ENGINE_KRIS_IN_CABLE_CLUB
playsound SFX_TINGLE
- applymovement PLAYER, PokeCenter2FMovementData_PlayerSpinsClockwiseEndsFacingRight
+ applymovement PLAYER, Pokecenter2FMovementData_PlayerSpinsClockwiseEndsFacingRight
writebyte (PAL_NPC_BLUE << 4)
special Special_SetPlayerPalette
- applymovement PLAYER, PokeCenter2FMovementData_PlayerSpinsClockwiseEndsFacingLeft
+ applymovement PLAYER, Pokecenter2FMovementData_PlayerSpinsClockwiseEndsFacingLeft
special ReplaceKrisSprite
- applymovement PLAYER, PokeCenter2FMovementData_PlayerTakesTwoStepsDown_2
- applymovement POKECENTER2F_TRADE_RECEPTIONIST, PokeCenter2FMovementData_ReceptionistStepsRightAndDown
+ applymovement PLAYER, Pokecenter2FMovementData_PlayerTakesTwoStepsDown_2
+ applymovement POKECENTER2F_TRADE_RECEPTIONIST, Pokecenter2FMovementData_ReceptionistStepsRightAndDown
end
Script_WalkOutOfLinkBattleRoom:
checkflag ENGINE_KRIS_IN_CABLE_CLUB
iftrue .Female
- applymovement POKECENTER2F_BATTLE_RECEPTIONIST, PokeCenter2FMovementData_ReceptionistStepsRightLooksDown_3
- applymovement PLAYER, PokeCenter2FMovementData_PlayerTakesThreeStepsDown
- applymovement POKECENTER2F_BATTLE_RECEPTIONIST, PokeCenter2FMovementData_ReceptionistStepsRightAndDown
+ applymovement POKECENTER2F_BATTLE_RECEPTIONIST, Pokecenter2FMovementData_ReceptionistStepsRightLooksDown_3
+ applymovement PLAYER, Pokecenter2FMovementData_PlayerTakesThreeStepsDown
+ applymovement POKECENTER2F_BATTLE_RECEPTIONIST, Pokecenter2FMovementData_ReceptionistStepsRightAndDown
end
.Female:
- applymovement POKECENTER2F_BATTLE_RECEPTIONIST, PokeCenter2FMovementData_ReceptionistStepsRightLooksDown_3
- applymovement PLAYER, PokeCenter2FMovementData_PlayerTakesOneStepDown_2
+ applymovement POKECENTER2F_BATTLE_RECEPTIONIST, Pokecenter2FMovementData_ReceptionistStepsRightLooksDown_3
+ applymovement PLAYER, Pokecenter2FMovementData_PlayerTakesOneStepDown_2
clearflag ENGINE_KRIS_IN_CABLE_CLUB
playsound SFX_TINGLE
- applymovement PLAYER, PokeCenter2FMovementData_PlayerSpinsClockwiseEndsFacingRight
+ applymovement PLAYER, Pokecenter2FMovementData_PlayerSpinsClockwiseEndsFacingRight
writebyte (PAL_NPC_BLUE << 4)
special Special_SetPlayerPalette
- applymovement PLAYER, PokeCenter2FMovementData_PlayerSpinsClockwiseEndsFacingLeft
+ applymovement PLAYER, Pokecenter2FMovementData_PlayerSpinsClockwiseEndsFacingLeft
special ReplaceKrisSprite
- applymovement PLAYER, PokeCenter2FMovementData_PlayerTakesTwoStepsDown_2
- applymovement POKECENTER2F_BATTLE_RECEPTIONIST, PokeCenter2FMovementData_ReceptionistStepsRightAndDown
+ applymovement PLAYER, Pokecenter2FMovementData_PlayerTakesTwoStepsDown_2
+ applymovement POKECENTER2F_BATTLE_RECEPTIONIST, Pokecenter2FMovementData_ReceptionistStepsRightAndDown
end
TimeCapsuleScript_CheckPlayerGender:
@@ -498,36 +498,36 @@ TimeCapsuleScript_CheckPlayerGender:
checkcode VAR_FACING
if_equal LEFT, .MaleFacingLeft
if_equal RIGHT, .MaleFacingRight
- applymovement2 PokeCenter2FMovementData_ReceptionistStepsLeftLooksDown
- applymovement PLAYER, PokeCenter2FMovementData_PlayerTakesTwoStepsUp_2
+ applymovement2 Pokecenter2FMovementData_ReceptionistStepsLeftLooksDown
+ applymovement PLAYER, Pokecenter2FMovementData_PlayerTakesTwoStepsUp_2
end
.MaleFacingLeft:
- applymovement2 PokeCenter2FMovementData_ReceptionistStepsLeftLooksDown
- applymovement PLAYER, PokeCenter2FMovementData_PlayerWalksLeftAndUp
+ applymovement2 Pokecenter2FMovementData_ReceptionistStepsLeftLooksDown
+ applymovement PLAYER, Pokecenter2FMovementData_PlayerWalksLeftAndUp
end
.MaleFacingRight:
- applymovement2 PokeCenter2FMovementData_ReceptionistStepsRightLooksDown
- applymovement PLAYER, PokeCenter2FMovementData_PlayerWalksRightAndUp
+ applymovement2 Pokecenter2FMovementData_ReceptionistStepsRightLooksDown
+ applymovement PLAYER, Pokecenter2FMovementData_PlayerWalksRightAndUp
end
.Female:
checkcode VAR_FACING
if_equal RIGHT, .FemaleFacingRight
if_equal LEFT, .FemaleFacingLeft
- applymovement2 PokeCenter2FMovementData_ReceptionistStepsLeftLooksRight_2
- applymovement PLAYER, PokeCenter2FMovementData_PlayerTakesOneStepUp_2
+ applymovement2 Pokecenter2FMovementData_ReceptionistStepsLeftLooksRight_2
+ applymovement PLAYER, Pokecenter2FMovementData_PlayerTakesOneStepUp_2
jump .FemaleContinue
.FemaleFacingRight:
- applymovement2 PokeCenter2FMovementData_ReceptionistStepsRightLooksLeft_2
- applymovement PLAYER, PokeCenter2FMovementData_PlayerTakesOneStepRight
+ applymovement2 Pokecenter2FMovementData_ReceptionistStepsRightLooksLeft_2
+ applymovement PLAYER, Pokecenter2FMovementData_PlayerTakesOneStepRight
jump .FemaleContinue
.FemaleFacingLeft:
- applymovement2 PokeCenter2FMovementData_ReceptionistStepsLeftLooksRight_2
- applymovement PLAYER, PokeCenter2FMovementData_PlayerTakesOneStepLeft
+ applymovement2 Pokecenter2FMovementData_ReceptionistStepsLeftLooksRight_2
+ applymovement PLAYER, Pokecenter2FMovementData_PlayerTakesOneStepLeft
.FemaleContinue:
opentext
writetext Text_OhPleaseWait
@@ -542,10 +542,10 @@ TimeCapsuleScript_CheckPlayerGender:
waitbutton
closetext
playsound SFX_TINGLE
- applymovement PLAYER, PokeCenter2FMovementData_PlayerSpinsClockwiseEndsFacingRight
+ applymovement PLAYER, Pokecenter2FMovementData_PlayerSpinsClockwiseEndsFacingRight
writebyte (PAL_NPC_RED << 4)
special Special_SetPlayerPalette
- applymovement PLAYER, PokeCenter2FMovementData_PlayerSpinsClockwiseEndsFacingDown
+ applymovement PLAYER, Pokecenter2FMovementData_PlayerSpinsClockwiseEndsFacingDown
faceperson PLAYER, POKECENTER2F_TIME_CAPSULE_RECEPTIONIST
setflag ENGINE_KRIS_IN_CABLE_CLUB
special ReplaceKrisSprite
@@ -554,36 +554,36 @@ TimeCapsuleScript_CheckPlayerGender:
waitbutton
closetext
showemote EMOTE_SHOCK, PLAYER, 15
- applymovement PLAYER, PokeCenter2FMovementData_PlayerTakesOneStepUp_2
+ applymovement PLAYER, Pokecenter2FMovementData_PlayerTakesOneStepUp_2
end
Script_LeftTimeCapsule:
special WaitForOtherPlayerToExit
checkflag ENGINE_KRIS_IN_CABLE_CLUB
iftrue .Female
- applymovement POKECENTER2F_TIME_CAPSULE_RECEPTIONIST, PokeCenter2FMovementData_ReceptionistStepsLeftLooksRight
- applymovement PLAYER, PokeCenter2FMovementData_PlayerTakesTwoStepsDown
- applymovement POKECENTER2F_TIME_CAPSULE_RECEPTIONIST, PokeCenter2FMovementData_ReceptionistStepsRightLooksDown_2
+ applymovement POKECENTER2F_TIME_CAPSULE_RECEPTIONIST, Pokecenter2FMovementData_ReceptionistStepsLeftLooksRight
+ applymovement PLAYER, Pokecenter2FMovementData_PlayerTakesTwoStepsDown
+ applymovement POKECENTER2F_TIME_CAPSULE_RECEPTIONIST, Pokecenter2FMovementData_ReceptionistStepsRightLooksDown_2
jump .Done
.Female:
- applymovement POKECENTER2F_TIME_CAPSULE_RECEPTIONIST, PokeCenter2FMovementData_ReceptionistStepsLeftLooksRight
- applymovement PLAYER, PokeCenter2FMovementData_PlayerTakesOneStepDown
+ applymovement POKECENTER2F_TIME_CAPSULE_RECEPTIONIST, Pokecenter2FMovementData_ReceptionistStepsLeftLooksRight
+ applymovement PLAYER, Pokecenter2FMovementData_PlayerTakesOneStepDown
clearflag ENGINE_KRIS_IN_CABLE_CLUB
playsound SFX_TINGLE
- applymovement PLAYER, PokeCenter2FMovementData_PlayerSpinsClockwiseEndsFacingRight
+ applymovement PLAYER, Pokecenter2FMovementData_PlayerSpinsClockwiseEndsFacingRight
writebyte (PAL_NPC_BLUE << 4)
special Special_SetPlayerPalette
- applymovement PLAYER, PokeCenter2FMovementData_PlayerSpinsClockwiseEndsFacingLeft
+ applymovement PLAYER, Pokecenter2FMovementData_PlayerSpinsClockwiseEndsFacingLeft
special ReplaceKrisSprite
- applymovement PLAYER, PokeCenter2FMovementData_PlayerTakesOneStepDown
- applymovement POKECENTER2F_TIME_CAPSULE_RECEPTIONIST, PokeCenter2FMovementData_ReceptionistStepsRightLooksDown_2
+ applymovement PLAYER, Pokecenter2FMovementData_PlayerTakesOneStepDown
+ applymovement POKECENTER2F_TIME_CAPSULE_RECEPTIONIST, Pokecenter2FMovementData_ReceptionistStepsRightLooksDown_2
.Done:
dotrigger $0
domaptrigger TIME_CAPSULE, $0
end
-MapPokeCenter2FSignpost0Script:
+MapPokecenter2FSignpost0Script:
refreshscreen $0
special Special_DisplayLinkRecord
closetext
@@ -622,137 +622,137 @@ OfficerScript_0x192c9a:
closetext
end
-PokeCenter2FMovementData_ReceptionistWalksUpAndLeft_LookRight:
+Pokecenter2FMovementData_ReceptionistWalksUpAndLeft_LookRight:
slow_step UP
slow_step LEFT
turn_head RIGHT
step_end
-PokeCenter2FMobileMobileMovementData_ReceptionistWalksUpAndLeft_LookDown:
+Pokecenter2FMobileMobileMovementData_ReceptionistWalksUpAndLeft_LookDown:
slow_step UP
slow_step LEFT
turn_head DOWN
step_end
-PokeCenter2FMovementData_ReceptionistStepsLeftLooksDown:
+Pokecenter2FMovementData_ReceptionistStepsLeftLooksDown:
slow_step LEFT
turn_head DOWN
step_end
-PokeCenter2FMovementData_ReceptionistStepsRightLooksDown:
+Pokecenter2FMovementData_ReceptionistStepsRightLooksDown:
slow_step RIGHT
turn_head DOWN
step_end
-PokeCenter2FMovementData_ReceptionistWalksUpAndLeft_LookRight_2:
+Pokecenter2FMovementData_ReceptionistWalksUpAndLeft_LookRight_2:
slow_step UP
slow_step LEFT
turn_head RIGHT
step_end
-PokeCenter2FMovementData_ReceptionistLooksRight:
+Pokecenter2FMovementData_ReceptionistLooksRight:
turn_head RIGHT
step_end
-PokeCenter2FMovementData_PlayerTakesThreeStepsUp:
+Pokecenter2FMovementData_PlayerTakesThreeStepsUp:
step UP
step UP
step UP
step_end
-PokeCenter2FMovementData_PlayerTakesTwoStepsUp:
+Pokecenter2FMovementData_PlayerTakesTwoStepsUp:
step UP
step UP
step_end
-PokeCenter2FMovementData_PlayerTakesOneStepUp:
+Pokecenter2FMovementData_PlayerTakesOneStepUp:
step UP
step_end
-PokeCenter2FMobileMovementData_PlayerWalksIntoMobileBattleRoom:
+Pokecenter2FMobileMovementData_PlayerWalksIntoMobileBattleRoom:
step UP
step UP
step RIGHT
step UP
step_end
-PokeCenter2FMovementData_PlayerTakesTwoStepsUp_2:
+Pokecenter2FMovementData_PlayerTakesTwoStepsUp_2:
step UP
step UP
step_end
-PokeCenter2FMovementData_PlayerWalksLeftAndUp:
+Pokecenter2FMovementData_PlayerWalksLeftAndUp:
step LEFT
step UP
step_end
-PokeCenter2FMovementData_PlayerWalksRightAndUp:
+Pokecenter2FMovementData_PlayerWalksRightAndUp:
step RIGHT
step UP
step_end
-PokeCenter2FMovementData_PlayerTakesThreeStepsDown:
+Pokecenter2FMovementData_PlayerTakesThreeStepsDown:
step DOWN
step DOWN
step DOWN
step_end
-PokeCenter2FMovementData_PlayerTakesTwoStepsDown:
+Pokecenter2FMovementData_PlayerTakesTwoStepsDown:
step DOWN
step DOWN
step_end
-PokeCenter2FMovementData_PlayerTakesOneStepDown:
+Pokecenter2FMovementData_PlayerTakesOneStepDown:
step DOWN
step_end
-PokeCenter2FMovementData_ReceptionistStepsRightAndDown:
+Pokecenter2FMovementData_ReceptionistStepsRightAndDown:
slow_step RIGHT
slow_step DOWN
step_end
-PokeCenter2FMovementData_ReceptionistStepsRightLooksDown_2:
+Pokecenter2FMovementData_ReceptionistStepsRightLooksDown_2:
slow_step RIGHT
turn_head DOWN
step_end
-PokeCenter2FMovementData_ReceptionistStepsRightLooksDown_3:
+Pokecenter2FMovementData_ReceptionistStepsRightLooksDown_3:
slow_step UP
slow_step LEFT
turn_head RIGHT
step_end
-PokeCenter2FMovementData_ReceptionistStepsLeftLooksRight:
+Pokecenter2FMovementData_ReceptionistStepsLeftLooksRight:
slow_step LEFT
turn_head RIGHT
step_end
-PokeCenter2FMobileMovementData_ReceptionistWalksUpAndLeft:
+Pokecenter2FMobileMovementData_ReceptionistWalksUpAndLeft:
slow_step UP
slow_step LEFT
turn_head RIGHT
step_end
-PokeCenter2FMovementData_PlayerWalksOutOfMobileRoom:
+Pokecenter2FMovementData_PlayerWalksOutOfMobileRoom:
step DOWN
step LEFT
step DOWN
step DOWN
step_end
-PokeCenter2FMobileMovementData_ReceptionistWalksRightAndDown:
+Pokecenter2FMobileMovementData_ReceptionistWalksRightAndDown:
slow_step RIGHT
slow_step DOWN
step_end
-PokeCenter2FMovementData_PlayerSpinsClockwiseEndsFacingRight:
+Pokecenter2FMovementData_PlayerSpinsClockwiseEndsFacingRight:
turn_head DOWN
turn_head LEFT
turn_head UP
turn_head RIGHT
step_end
-PokeCenter2FMovementData_PlayerSpinsClockwiseEndsFacingLeft:
+Pokecenter2FMovementData_PlayerSpinsClockwiseEndsFacingLeft:
turn_head DOWN
turn_head LEFT
turn_head UP
@@ -760,7 +760,7 @@ PokeCenter2FMovementData_PlayerSpinsClockwiseEndsFacingLeft:
turn_head LEFT
step_end
-PokeCenter2FMovementData_PlayerSpinsClockwiseEndsFacingDown:
+Pokecenter2FMovementData_PlayerSpinsClockwiseEndsFacingDown:
turn_head DOWN
turn_head LEFT
turn_head UP
@@ -768,33 +768,33 @@ PokeCenter2FMovementData_PlayerSpinsClockwiseEndsFacingDown:
turn_head DOWN
step_end
-PokeCenter2FMovementData_PlayerTakesOneStepDown_2:
+Pokecenter2FMovementData_PlayerTakesOneStepDown_2:
step DOWN
step_end
-PokeCenter2FMovementData_PlayerTakesTwoStepsDown_2:
+Pokecenter2FMovementData_PlayerTakesTwoStepsDown_2:
step DOWN
step DOWN
step_end
-PokeCenter2FMovementData_PlayerTakesOneStepUp_2:
+Pokecenter2FMovementData_PlayerTakesOneStepUp_2:
step UP
step_end
-PokeCenter2FMovementData_PlayerTakesOneStepRight:
+Pokecenter2FMovementData_PlayerTakesOneStepRight:
step RIGHT
step_end
-PokeCenter2FMovementData_PlayerTakesOneStepLeft:
+Pokecenter2FMovementData_PlayerTakesOneStepLeft:
step LEFT
step_end
-PokeCenter2FMovementData_ReceptionistStepsLeftLooksRight_2:
+Pokecenter2FMovementData_ReceptionistStepsLeftLooksRight_2:
slow_step LEFT
turn_head RIGHT
step_end
-PokeCenter2FMovementData_ReceptionistStepsRightLooksLeft_2:
+Pokecenter2FMovementData_ReceptionistStepsRightLooksLeft_2:
slow_step RIGHT
turn_head LEFT
step_end
@@ -1022,7 +1022,7 @@ Text_BrokeStadiumRules:
line "when you're ready."
done
-PokeCenter2F_MapEventHeader:
+Pokecenter2F_MapEventHeader:
; filler
db 0, 0
@@ -1040,7 +1040,7 @@ PokeCenter2F_MapEventHeader:
.Signposts:
db 1
- signpost 3, 7, SIGNPOST_READ, MapPokeCenter2FSignpost0Script
+ signpost 3, 7, SIGNPOST_READ, MapPokecenter2FSignpost0Script
.PersonEvents:
db 4
diff --git a/maps/PokeCenter2F.blk b/maps/Pokecenter2F.blk
index 968f746e6..968f746e6 100644
--- a/maps/PokeCenter2F.blk
+++ b/maps/Pokecenter2F.blk
diff --git a/maps/Route10North.asm b/maps/Route10North.asm
index 29b345fed..97094ff05 100644
--- a/maps/Route10North.asm
+++ b/maps/Route10North.asm
@@ -8,7 +8,7 @@ Route10North_MapScriptHeader:
PowerPlantSign:
jumptext PowerPlantSignText
-Route10PokeCenterSign:
+Route10PokecenterSign:
jumpstd pokecentersign
PowerPlantSignText:
@@ -30,7 +30,7 @@ Route10North_MapEventHeader:
.Signposts:
db 2
signpost 11, 5, SIGNPOST_READ, PowerPlantSign
- signpost 1, 12, SIGNPOST_READ, Route10PokeCenterSign
+ signpost 1, 12, SIGNPOST_READ, Route10PokecenterSign
.PersonEvents:
db 0
diff --git a/maps/Route10PokeCenter1F.asm b/maps/Route10Pokecenter1F.asm
index 95780ed5e..18f1bd8ab 100644
--- a/maps/Route10PokeCenter1F.asm
+++ b/maps/Route10Pokecenter1F.asm
@@ -4,7 +4,7 @@ const_value set 2
const ROUTE10POKECENTER1F_GYM_GUY
const ROUTE10POKECENTER1F_COOLTRAINER_F
-Route10PokeCenter1F_MapScriptHeader:
+Route10Pokecenter1F_MapScriptHeader:
.MapTriggers:
db 0
@@ -80,7 +80,7 @@ UnknownText_0x188d0c:
line "PLANT."
done
-Route10PokeCenter1F_MapEventHeader:
+Route10Pokecenter1F_MapEventHeader:
; filler
db 0, 0
diff --git a/maps/Route10PokeCenter2FBeta.asm b/maps/Route10Pokecenter2FBeta.asm
index a4a4aed6f..f3c247241 100644
--- a/maps/Route10PokeCenter2FBeta.asm
+++ b/maps/Route10Pokecenter2FBeta.asm
@@ -1,11 +1,11 @@
-Route10PokeCenter2FBeta_MapScriptHeader:
+Route10Pokecenter2FBeta_MapScriptHeader:
.MapTriggers:
db 0
.MapCallbacks:
db 0
-Route10PokeCenter2FBeta_MapEventHeader:
+Route10Pokecenter2FBeta_MapEventHeader:
; filler
db 0, 0
diff --git a/maps/Route32.asm b/maps/Route32.asm
index 1c0579d70..ded343998 100644
--- a/maps/Route32.asm
+++ b/maps/Route32.asm
@@ -502,7 +502,7 @@ Route32RuinsSign:
Route32UnionCaveSign:
jumptext Route32UnionCaveSignText
-Route32PokeCenterSign:
+Route32PokecenterSign:
jumpstd pokecentersign
Route32HiddenGreatBall:
@@ -951,7 +951,7 @@ Route32_MapEventHeader:
signpost 5, 13, SIGNPOST_READ, Route32Sign
signpost 1, 9, SIGNPOST_READ, Route32RuinsSign
signpost 84, 10, SIGNPOST_READ, Route32UnionCaveSign
- signpost 73, 12, SIGNPOST_READ, Route32PokeCenterSign
+ signpost 73, 12, SIGNPOST_READ, Route32PokecenterSign
signpost 67, 12, SIGNPOST_ITEM, Route32HiddenGreatBall
signpost 40, 11, SIGNPOST_ITEM, Route32HiddenSuperPotion
diff --git a/maps/Route32PokeCenter1F.asm b/maps/Route32Pokecenter1F.asm
index ca303b029..18c9622ee 100644
--- a/maps/Route32PokeCenter1F.asm
+++ b/maps/Route32Pokecenter1F.asm
@@ -3,7 +3,7 @@ const_value set 2
const ROUTE32POKECENTER1F_FISHING_GURU
const ROUTE32POKECENTER1F_COOLTRAINER_F
-Route32PokeCenter1F_MapScriptHeader:
+Route32Pokecenter1F_MapScriptHeader:
.MapTriggers:
db 0
@@ -94,7 +94,7 @@ UnknownText_0x69cac:
cont "power…"
done
-Route32PokeCenter1F_MapEventHeader:
+Route32Pokecenter1F_MapEventHeader:
; filler
db 0, 0
diff --git a/maps/SaffronCity.asm b/maps/SaffronCity.asm
index 8fd105754..4b50f427c 100644
--- a/maps/SaffronCity.asm
+++ b/maps/SaffronCity.asm
@@ -101,7 +101,7 @@ MrPsychicsHouseSign:
SaffronCityMagnetTrainStationSign:
jumptext SaffronCityMagnetTrainStationSignText
-SaffronCityPokeCenterSign:
+SaffronCityPokecenterSign:
jumpstd pokecentersign
SaffronCityMartSign:
@@ -298,7 +298,7 @@ SaffronCity_MapEventHeader:
signpost 21, 15, SIGNPOST_READ, SilphCoSign
signpost 29, 25, SIGNPOST_READ, MrPsychicsHouseSign
signpost 5, 11, SIGNPOST_READ, SaffronCityMagnetTrainStationSign
- signpost 29, 10, SIGNPOST_READ, SaffronCityPokeCenterSign
+ signpost 29, 10, SIGNPOST_READ, SaffronCityPokecenterSign
signpost 11, 26, SIGNPOST_READ, SaffronCityMartSign
.PersonEvents:
diff --git a/maps/SaffronPokeCenter1F.asm b/maps/SaffronPokecenter1F.asm
index 6c46cada6..975ea587c 100644
--- a/maps/SaffronPokeCenter1F.asm
+++ b/maps/SaffronPokecenter1F.asm
@@ -4,7 +4,7 @@ const_value set 2
const SAFFRONPOKECENTER1F_FISHER
const SAFFRONPOKECENTER1F_YOUNGSTER
-SaffronPokeCenter1F_MapScriptHeader:
+SaffronPokecenter1F_MapScriptHeader:
.MapTriggers:
db 0
@@ -111,7 +111,7 @@ UnknownText_0x18a6c5:
line "SAFFRON."
done
-SaffronPokeCenter1F_MapEventHeader:
+SaffronPokecenter1F_MapEventHeader:
; filler
db 0, 0
diff --git a/maps/SaffronPokeCenter2FBeta.asm b/maps/SaffronPokecenter2FBeta.asm
index 987236d0b..3c1381ba6 100644
--- a/maps/SaffronPokeCenter2FBeta.asm
+++ b/maps/SaffronPokecenter2FBeta.asm
@@ -1,11 +1,11 @@
-SaffronPokeCenter2FBeta_MapScriptHeader:
+SaffronPokecenter2FBeta_MapScriptHeader:
.MapTriggers:
db 0
.MapCallbacks:
db 0
-SaffronPokeCenter2FBeta_MapEventHeader:
+SaffronPokecenter2FBeta_MapEventHeader:
; filler
db 0, 0
diff --git a/maps/SilverCaveOutside.asm b/maps/SilverCaveOutside.asm
index 4b4657f1e..86354d742 100644
--- a/maps/SilverCaveOutside.asm
+++ b/maps/SilverCaveOutside.asm
@@ -10,7 +10,7 @@ SilverCaveOutside_MapScriptHeader:
setflag ENGINE_FLYPOINT_SILVER_CAVE
return
-MtSilverPokeCenterSign:
+MtSilverPokecenterSign:
jumpstd pokecentersign
MtSilverSign:
@@ -37,7 +37,7 @@ SilverCaveOutside_MapEventHeader:
.Signposts:
db 3
- signpost 19, 24, SIGNPOST_READ, MtSilverPokeCenterSign
+ signpost 19, 24, SIGNPOST_READ, MtSilverPokecenterSign
signpost 13, 17, SIGNPOST_READ, MtSilverSign
signpost 25, 9, SIGNPOST_ITEM, SilverCaveOutsideHiddenFullRestore
diff --git a/maps/SilverCavePokeCenter1F.asm b/maps/SilverCavePokecenter1F.asm
index 7aba170fe..ab6eab65a 100644
--- a/maps/SilverCavePokeCenter1F.asm
+++ b/maps/SilverCavePokecenter1F.asm
@@ -2,7 +2,7 @@ const_value set 2
const SILVERCAVEPOKECENTER1F_NURSE
const SILVERCAVEPOKECENTER1F_GRANNY
-SilverCavePokeCenter1F_MapScriptHeader:
+SilverCavePokecenter1F_MapScriptHeader:
.MapTriggers:
db 0
@@ -29,7 +29,7 @@ UnknownText_0x1ae5a0:
line "anywhere…"
done
-SilverCavePokeCenter1F_MapEventHeader:
+SilverCavePokecenter1F_MapEventHeader:
; filler
db 0, 0
diff --git a/maps/TimeCapsule.asm b/maps/TimeCapsule.asm
index ed34b3f5c..e9f10d578 100644
--- a/maps/TimeCapsule.asm
+++ b/maps/TimeCapsule.asm
@@ -13,7 +13,7 @@ TimeCapsule_MapScriptHeader:
dbw MAPCALLBACK_OBJECTS, .SetWhichChris
.InitializeTimeCapsule:
- priorityjump .InitializeAndPreparePokeCenter2F
+ priorityjump .InitializeAndPreparePokecenter2F
end
.DummyTrigger:
@@ -31,7 +31,7 @@ TimeCapsule_MapScriptHeader:
appear TIMECAPSULE_CHRIS2
return
-.InitializeAndPreparePokeCenter2F:
+.InitializeAndPreparePokecenter2F:
dotrigger $1
domaptrigger POKECENTER_2F, $3
end
diff --git a/maps/TradeCenter.asm b/maps/TradeCenter.asm
index 07cb18136..e0c984b36 100644
--- a/maps/TradeCenter.asm
+++ b/maps/TradeCenter.asm
@@ -13,7 +13,7 @@ TradeCenter_MapScriptHeader:
dbw MAPCALLBACK_OBJECTS, .SetWhichChris
.InitializeTradeCenter:
- priorityjump .InitializeAndPreparePokeCenter2F
+ priorityjump .InitializeAndPreparePokecenter2F
end
.DummyTrigger:
@@ -31,7 +31,7 @@ TradeCenter_MapScriptHeader:
appear TRADECENTER_CHRIS2
return
-.InitializeAndPreparePokeCenter2F:
+.InitializeAndPreparePokecenter2F:
dotrigger $1
domaptrigger POKECENTER_2F, $1
end
diff --git a/maps/VermilionCity.asm b/maps/VermilionCity.asm
index 64c740516..ea794dd6a 100644
--- a/maps/VermilionCity.asm
+++ b/maps/VermilionCity.asm
@@ -116,7 +116,7 @@ VermilionCityDiglettsCaveSign:
VermilionCityPortSign:
jumptext VermilionCityPortSignText
-VermilionCityPokeCenterSign:
+VermilionCityPokecenterSign:
jumpstd pokecentersign
VermilionCityMartSign:
@@ -294,7 +294,7 @@ VermilionCity_MapEventHeader:
signpost 13, 5, SIGNPOST_READ, PokemonFanClubSign
signpost 9, 33, SIGNPOST_READ, VermilionCityDiglettsCaveSign
signpost 15, 27, SIGNPOST_READ, VermilionCityPortSign
- signpost 5, 10, SIGNPOST_READ, VermilionCityPokeCenterSign
+ signpost 5, 10, SIGNPOST_READ, VermilionCityPokecenterSign
signpost 13, 22, SIGNPOST_READ, VermilionCityMartSign
signpost 19, 12, SIGNPOST_ITEM, VermilionCityHiddenFullHeal
diff --git a/maps/VermilionPokeCenter1F.asm b/maps/VermilionPokecenter1F.asm
index 674b7d984..f4bbd0140 100644
--- a/maps/VermilionPokeCenter1F.asm
+++ b/maps/VermilionPokecenter1F.asm
@@ -4,7 +4,7 @@ const_value set 2
const VERMILIONPOKECENTER1F_SAILOR
const VERMILIONPOKECENTER1F_BUG_CATCHER
-VermilionPokeCenter1F_MapScriptHeader:
+VermilionPokecenter1F_MapScriptHeader:
.MapTriggers:
db 0
@@ -76,7 +76,7 @@ UnknownText_0x19173b:
line "got them in JOHTO."
done
-VermilionPokeCenter1F_MapEventHeader:
+VermilionPokecenter1F_MapEventHeader:
; filler
db 0, 0
diff --git a/maps/VermilionPokeCenter2FBeta.asm b/maps/VermilionPokecenter2FBeta.asm
index 3d8ad1efc..9a9aeec2c 100644
--- a/maps/VermilionPokeCenter2FBeta.asm
+++ b/maps/VermilionPokecenter2FBeta.asm
@@ -1,11 +1,11 @@
-VermilionPokeCenter2FBeta_MapScriptHeader:
+VermilionPokecenter2FBeta_MapScriptHeader:
.MapTriggers:
db 0
.MapCallbacks:
db 0
-VermilionPokeCenter2FBeta_MapEventHeader:
+VermilionPokecenter2FBeta_MapEventHeader:
; filler
db 0, 0
diff --git a/maps/VioletCity.asm b/maps/VioletCity.asm
index 8a2a658d2..2d503853b 100644
--- a/maps/VioletCity.asm
+++ b/maps/VioletCity.asm
@@ -82,7 +82,7 @@ SproutTowerSign:
EarlsPokemonAcademySign:
jumptext EarlsPokemonAcademySignText
-VioletCityPokeCenterSign:
+VioletCityPokecenterSign:
jumpstd pokecentersign
VioletCityMartSign:
@@ -303,7 +303,7 @@ VioletCity_MapEventHeader:
signpost 17, 15, SIGNPOST_READ, VioletGymSign
signpost 8, 24, SIGNPOST_READ, SproutTowerSign
signpost 17, 27, SIGNPOST_READ, EarlsPokemonAcademySign
- signpost 25, 32, SIGNPOST_READ, VioletCityPokeCenterSign
+ signpost 25, 32, SIGNPOST_READ, VioletCityPokecenterSign
signpost 17, 10, SIGNPOST_READ, VioletCityMartSign
signpost 14, 37, SIGNPOST_ITEM, VioletCityHiddenHyperPotion
diff --git a/maps/VioletPokeCenter1F.asm b/maps/VioletPokecenter1F.asm
index d2f6423b4..46afff49a 100644
--- a/maps/VioletPokeCenter1F.asm
+++ b/maps/VioletPokecenter1F.asm
@@ -5,17 +5,17 @@ const_value set 2
const VIOLETPOKECENTER1F_YOUNGSTER
const VIOLETPOKECENTER1F_SCIENTIST
-VioletPokeCenter1F_MapScriptHeader:
+VioletPokecenter1F_MapScriptHeader:
.MapTriggers:
db 0
.MapCallbacks:
db 0
-VioletPokeCenterNurse:
+VioletPokecenterNurse:
jumpstd pokecenternurse
-VioletPokeCenter1F_ElmsAideScript:
+VioletPokecenter1F_ElmsAideScript:
faceplayer
opentext
checkevent EVENT_REFUSED_TO_TAKE_EGG_FROM_ELMS_AIDE
@@ -215,7 +215,7 @@ UnknownText_0x698b8:
line "they please."
done
-VioletPokeCenter1F_MapEventHeader:
+VioletPokecenter1F_MapEventHeader:
; filler
db 0, 0
@@ -233,8 +233,8 @@ VioletPokeCenter1F_MapEventHeader:
.PersonEvents:
db 5
- person_event SPRITE_NURSE, 1, 3, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, 0, PERSONTYPE_SCRIPT, 0, VioletPokeCenterNurse, -1
+ person_event SPRITE_NURSE, 1, 3, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, 0, PERSONTYPE_SCRIPT, 0, VioletPokecenterNurse, -1
person_event SPRITE_GAMEBOY_KID, 6, 7, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_GREEN, PERSONTYPE_SCRIPT, 0, GameboyKidScript_0x69540, -1
person_event SPRITE_GENTLEMAN, 4, 1, SPRITEMOVEDATA_SPINRANDOM_SLOW, 0, 0, -1, -1, 0, PERSONTYPE_SCRIPT, 0, GentlemanScript_0x69543, -1
person_event SPRITE_YOUNGSTER, 1, 8, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_RED, PERSONTYPE_SCRIPT, 0, YoungsterScript_0x69546, -1
- person_event SPRITE_SCIENTIST, 3, 4, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_BLUE, PERSONTYPE_SCRIPT, 0, VioletPokeCenter1F_ElmsAideScript, EVENT_ELMS_AIDE_IN_VIOLET_POKEMON_CENTER
+ person_event SPRITE_SCIENTIST, 3, 4, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_BLUE, PERSONTYPE_SCRIPT, 0, VioletPokecenter1F_ElmsAideScript, EVENT_ELMS_AIDE_IN_VIOLET_POKEMON_CENTER
diff --git a/maps/ViridianCity.asm b/maps/ViridianCity.asm
index a117be25b..a6b30627a 100644
--- a/maps/ViridianCity.asm
+++ b/maps/ViridianCity.asm
@@ -81,7 +81,7 @@ ViridianCityWelcomeSign:
TrainerHouseSign:
jumptext TrainerHouseSignText
-ViridianCityPokeCenterSign:
+ViridianCityPokecenterSign:
jumpstd pokecentersign
ViridianCityMartSign:
@@ -236,7 +236,7 @@ ViridianCity_MapEventHeader:
signpost 7, 27, SIGNPOST_READ, ViridianGymSign
signpost 1, 19, SIGNPOST_READ, ViridianCityWelcomeSign
signpost 15, 21, SIGNPOST_READ, TrainerHouseSign
- signpost 25, 24, SIGNPOST_READ, ViridianCityPokeCenterSign
+ signpost 25, 24, SIGNPOST_READ, ViridianCityPokecenterSign
signpost 19, 30, SIGNPOST_READ, ViridianCityMartSign
.PersonEvents:
diff --git a/maps/ViridianPokeCenter1F.asm b/maps/ViridianPokecenter1F.asm
index 7c63655bd..35c634f03 100644
--- a/maps/ViridianPokeCenter1F.asm
+++ b/maps/ViridianPokecenter1F.asm
@@ -4,7 +4,7 @@ const_value set 2
const VIRIDIANPOKECENTER1F_COOLTRAINER_F
const VIRIDIANPOKECENTER1F_BUG_CATCHER
-ViridianPokeCenter1F_MapScriptHeader:
+ViridianPokecenter1F_MapScriptHeader:
.MapTriggers:
db 0
@@ -71,7 +71,7 @@ UnknownText_0x9b7c8:
line "come a GYM LEADER."
done
-ViridianPokeCenter1F_MapEventHeader:
+ViridianPokecenter1F_MapEventHeader:
; filler
db 0, 0
diff --git a/maps/ViridianPokeCenter2FBeta.asm b/maps/ViridianPokecenter2FBeta.asm
index c545a50bc..84551d7f2 100644
--- a/maps/ViridianPokeCenter2FBeta.asm
+++ b/maps/ViridianPokecenter2FBeta.asm
@@ -1,11 +1,11 @@
-ViridianPokeCenter2FBeta_MapScriptHeader:
+ViridianPokecenter2FBeta_MapScriptHeader:
.MapTriggers:
db 0
.MapCallbacks:
db 0
-ViridianPokeCenter2FBeta_MapEventHeader:
+ViridianPokecenter2FBeta_MapEventHeader:
; filler
db 0, 0
diff --git a/maps/blockdata.asm b/maps/blockdata.asm
index d1e7b39b7..e6c3e7ae9 100644
--- a/maps/blockdata.asm
+++ b/maps/blockdata.asm
@@ -54,18 +54,18 @@ BetaBlackthornCity_BlockData:
Route10South_BlockData:
INCBIN "maps/Route10South.blk"
-PokeCenter2F_BlockData:
-CinnabarPokeCenter2FBeta_BlockData:
-CeruleanPokeCenter2FBeta_BlockData:
-Route10PokeCenter2FBeta_BlockData:
-VermilionPokeCenter2FBeta_BlockData:
-PewterPokeCenter2FBeta_BlockData:
-FuchsiaPokeCenter2FBeta_BlockData:
-LavenderPokeCenter2FBeta_BlockData:
-CeladonPokeCenter2FBeta_BlockData:
-ViridianPokeCenter2FBeta_BlockData:
-SaffronPokeCenter2FBeta_BlockData:
- INCBIN "maps/PokeCenter2F.blk"
+Pokecenter2F_BlockData:
+CinnabarPokecenter2FBeta_BlockData:
+CeruleanPokecenter2FBeta_BlockData:
+Route10Pokecenter2FBeta_BlockData:
+VermilionPokecenter2FBeta_BlockData:
+PewterPokecenter2FBeta_BlockData:
+FuchsiaPokecenter2FBeta_BlockData:
+LavenderPokecenter2FBeta_BlockData:
+CeladonPokecenter2FBeta_BlockData:
+ViridianPokecenter2FBeta_BlockData:
+SaffronPokecenter2FBeta_BlockData:
+ INCBIN "maps/Pokecenter2F.blk"
Route41_BlockData:
INCBIN "maps/Route41.blk"
@@ -121,8 +121,8 @@ Route20_BlockData:
BetaSproutTower6_BlockData:
INCBIN "maps/BetaSproutTower6.blk"
-BetaPokeCenterMainHouse_BlockData:
- INCBIN "maps/BetaPokeCenterMainHouse.blk"
+BetaPokecenterMainHouse_BlockData:
+ INCBIN "maps/BetaPokecenterMainHouse.blk"
Route30_BlockData:
INCBIN "maps/Route30.blk"
@@ -340,28 +340,28 @@ Route10North_BlockData:
BetaLakeOfRage_BlockData:
INCBIN "maps/BetaLakeOfRage.blk"
-OlivinePokeCenter1F_BlockData:
-MahoganyPokeCenter1F_BlockData:
-EcruteakPokeCenter1F_BlockData:
-BlackthornPokeCenter1F_BlockData:
-CinnabarPokeCenter1F_BlockData:
-CeruleanPokeCenter1F_BlockData:
-Route10PokeCenter1F_BlockData:
-AzaleaPokeCenter1F_BlockData:
-VioletPokeCenter1F_BlockData:
-Route32PokeCenter1F_BlockData:
-GoldenrodPokeCenter1F_BlockData:
-VermilionPokeCenter1F_BlockData:
-PewterPokeCenter1F_BlockData:
-FuchsiaPokeCenter1F_BlockData:
-LavenderPokeCenter1F_BlockData:
-SilverCavePokeCenter1F_BlockData:
-CeladonPokeCenter1F_BlockData:
-CianwoodPokeCenter1F_BlockData:
-ViridianPokeCenter1F_BlockData:
-SaffronPokeCenter1F_BlockData:
-CherrygrovePokeCenter1F_BlockData:
- INCBIN "maps/PokeCenter1F.blk"
+OlivinePokecenter1F_BlockData:
+MahoganyPokecenter1F_BlockData:
+EcruteakPokecenter1F_BlockData:
+BlackthornPokecenter1F_BlockData:
+CinnabarPokecenter1F_BlockData:
+CeruleanPokecenter1F_BlockData:
+Route10Pokecenter1F_BlockData:
+AzaleaPokecenter1F_BlockData:
+VioletPokecenter1F_BlockData:
+Route32Pokecenter1F_BlockData:
+GoldenrodPokecenter1F_BlockData:
+VermilionPokecenter1F_BlockData:
+PewterPokecenter1F_BlockData:
+FuchsiaPokecenter1F_BlockData:
+LavenderPokecenter1F_BlockData:
+SilverCavePokecenter1F_BlockData:
+CeladonPokecenter1F_BlockData:
+CianwoodPokecenter1F_BlockData:
+ViridianPokecenter1F_BlockData:
+SaffronPokecenter1F_BlockData:
+CherrygrovePokecenter1F_BlockData:
+ INCBIN "maps/Pokecenter1F.blk"
BetaPewterMuseumOfScience1F_BlockData:
INCBIN "maps/BetaPewterMuseumOfScience1F.blk"
@@ -466,8 +466,8 @@ Route6UndergroundEntrance_BlockData:
Route5UndergroundEntrance_BlockData:
INCBIN "maps/UndergroundPathEntrance.blk"
-BetaPokeCenterTradeStation_BlockData:
- INCBIN "maps/BetaPokeCenterTradeStation.blk"
+BetaPokecenterTradeStation_BlockData:
+ INCBIN "maps/BetaPokecenterTradeStation.blk"
KurtsHouse_BlockData:
INCBIN "maps/KurtsHouse.blk"
@@ -713,8 +713,8 @@ TeamRocketBaseB3F_BlockData:
BetaRoute23EarlyVersion_BlockData:
INCBIN "maps/BetaRoute23EarlyVersion.blk"
-IndigoPlateauPokeCenter1F_BlockData:
- INCBIN "maps/IndigoPlateauPokeCenter1F.blk"
+IndigoPlateauPokecenter1F_BlockData:
+ INCBIN "maps/IndigoPlateauPokecenter1F.blk"
WillsRoom_BlockData:
INCBIN "maps/WillsRoom.blk"
diff --git a/maps/map_headers.asm b/maps/map_headers.asm
index e50ab8e6a..9d58c7cbe 100644
--- a/maps/map_headers.asm
+++ b/maps/map_headers.asm
@@ -29,7 +29,7 @@ MapGroupPointers::
MapGroup1:
- map_header OlivinePokeCenter1F, TILESET_POKECENTER, INDOOR, OLIVINE_CITY, MUSIC_POKEMON_CENTER, 0, PALETTE_DAY, FISHGROUP_SHORE
+ map_header OlivinePokecenter1F, TILESET_POKECENTER, INDOOR, OLIVINE_CITY, MUSIC_POKEMON_CENTER, 0, PALETTE_DAY, FISHGROUP_SHORE
map_header OlivineGym, TILESET_OLIVINE_GYM, INDOOR, OLIVINE_CITY, MUSIC_GYM, 1, PALETTE_DAY, FISHGROUP_SHORE
map_header OlivineTimsHouse, TILESET_HOUSE_1, INDOOR, OLIVINE_CITY, MUSIC_VIOLET_CITY, 0, PALETTE_DAY, FISHGROUP_SHORE
map_header OlivineHouseBeta, TILESET_HOUSE_1, INDOOR, OLIVINE_CITY, MUSIC_VIOLET_CITY, 0, PALETTE_DAY, FISHGROUP_SHORE
@@ -48,7 +48,7 @@ MapGroup1:
MapGroup2:
map_header MahoganyRedGyaradosSpeechHouse, TILESET_HOUSE_1, INDOOR, MAHOGANY_TOWN, MUSIC_CHERRYGROVE_CITY, 0, PALETTE_DAY, FISHGROUP_SHORE
map_header MahoganyGym, TILESET_GYM_1, INDOOR, MAHOGANY_TOWN, MUSIC_GYM, 1, PALETTE_DAY, FISHGROUP_SHORE
- map_header MahoganyPokeCenter1F, TILESET_POKECENTER, INDOOR, MAHOGANY_TOWN, MUSIC_POKEMON_CENTER, 0, PALETTE_DAY, FISHGROUP_SHORE
+ map_header MahoganyPokecenter1F, TILESET_POKECENTER, INDOOR, MAHOGANY_TOWN, MUSIC_POKEMON_CENTER, 0, PALETTE_DAY, FISHGROUP_SHORE
map_header Route42EcruteakGate, TILESET_GATE, GATE, ROUTE_42, MUSIC_LAKE_OF_RAGE, 0, PALETTE_DAY, FISHGROUP_SHORE
map_header Route42, TILESET_JOHTO_1, ROUTE, ROUTE_42, MUSIC_LAKE_OF_RAGE, 0, PALETTE_AUTO, FISHGROUP_LAKE
map_header Route44, TILESET_JOHTO_1, ROUTE, ROUTE_44, MUSIC_LAKE_OF_RAGE, 0, PALETTE_AUTO, FISHGROUP_POND
@@ -152,7 +152,7 @@ MapGroup3:
MapGroup4:
map_header EcruteakHouse, TILESET_SPROUT_TOWER, INDOOR, ECRUTEAK_CITY, MUSIC_ECRUTEAK_CITY, 0, PALETTE_DAY, FISHGROUP_SHORE
map_header WiseTriosRoom, TILESET_KURT_HOUSE, INDOOR, ECRUTEAK_CITY, MUSIC_ECRUTEAK_CITY, 1, PALETTE_DAY, FISHGROUP_SHORE
- map_header EcruteakPokeCenter1F, TILESET_POKECENTER, INDOOR, ECRUTEAK_CITY, MUSIC_POKEMON_CENTER, 0, PALETTE_DAY, FISHGROUP_SHORE
+ map_header EcruteakPokecenter1F, TILESET_POKECENTER, INDOOR, ECRUTEAK_CITY, MUSIC_POKEMON_CENTER, 0, PALETTE_DAY, FISHGROUP_SHORE
map_header EcruteakLugiaSpeechHouse, TILESET_KURT_HOUSE, INDOOR, ECRUTEAK_CITY, MUSIC_ECRUTEAK_CITY, 0, PALETTE_DAY, FISHGROUP_SHORE
map_header DanceTheatre, TILESET_KURT_HOUSE, INDOOR, ECRUTEAK_CITY, MUSIC_DANCING_HALL, 0, PALETTE_DAY, FISHGROUP_SHORE
map_header EcruteakMart, TILESET_MART, INDOOR, ECRUTEAK_CITY, MUSIC_ECRUTEAK_CITY, 0, PALETTE_DAY, FISHGROUP_SHORE
@@ -167,7 +167,7 @@ MapGroup5:
map_header BlackthornDragonSpeechHouse, TILESET_HOUSE_1, INDOOR, BLACKTHORN_CITY, MUSIC_AZALEA_TOWN, 0, PALETTE_DAY, FISHGROUP_SHORE
map_header BlackthornEmysHouse, TILESET_HOUSE_1, INDOOR, BLACKTHORN_CITY, MUSIC_AZALEA_TOWN, 0, PALETTE_DAY, FISHGROUP_SHORE
map_header BlackthornMart, TILESET_MART, INDOOR, BLACKTHORN_CITY, MUSIC_AZALEA_TOWN, 0, PALETTE_DAY, FISHGROUP_SHORE
- map_header BlackthornPokeCenter1F, TILESET_POKECENTER, INDOOR, BLACKTHORN_CITY, MUSIC_POKEMON_CENTER, 0, PALETTE_DAY, FISHGROUP_SHORE
+ map_header BlackthornPokecenter1F, TILESET_POKECENTER, INDOOR, BLACKTHORN_CITY, MUSIC_POKEMON_CENTER, 0, PALETTE_DAY, FISHGROUP_SHORE
map_header MoveDeletersHouse, TILESET_HOUSE_1, INDOOR, BLACKTHORN_CITY, MUSIC_AZALEA_TOWN, 0, PALETTE_DAY, FISHGROUP_SHORE
map_header Route45, TILESET_JOHTO_1, ROUTE, ROUTE_45, MUSIC_ROUTE_36, 0, PALETTE_AUTO, FISHGROUP_DRATINI_2
map_header Route46, TILESET_JOHTO_1, ROUTE, ROUTE_46, MUSIC_ROUTE_36, 0, PALETTE_AUTO, FISHGROUP_SHORE
@@ -175,8 +175,8 @@ MapGroup5:
MapGroup6:
- map_header CinnabarPokeCenter1F, TILESET_POKECENTER, INDOOR, CINNABAR_ISLAND, MUSIC_POKEMON_CENTER, 0, PALETTE_DAY, FISHGROUP_SHORE
- map_header CinnabarPokeCenter2FBeta, TILESET_POKECENTER, INDOOR, CINNABAR_ISLAND, MUSIC_POKEMON_CENTER, 0, PALETTE_DAY, FISHGROUP_SHORE
+ map_header CinnabarPokecenter1F, TILESET_POKECENTER, INDOOR, CINNABAR_ISLAND, MUSIC_POKEMON_CENTER, 0, PALETTE_DAY, FISHGROUP_SHORE
+ map_header CinnabarPokecenter2FBeta, TILESET_POKECENTER, INDOOR, CINNABAR_ISLAND, MUSIC_POKEMON_CENTER, 0, PALETTE_DAY, FISHGROUP_SHORE
map_header Route19FuchsiaGate, TILESET_GATE, GATE, ROUTE_19, MUSIC_ROUTE_3, 0, PALETTE_DAY, FISHGROUP_SHORE
map_header SeafoamGym, TILESET_CAVE, INDOOR, SEAFOAM_ISLANDS, MUSIC_GYM, 1, PALETTE_DAY, FISHGROUP_SHORE
map_header Route19, TILESET_KANTO, ROUTE, ROUTE_19, MUSIC_ROUTE_3, 0, PALETTE_AUTO, FISHGROUP_SHORE
@@ -189,12 +189,12 @@ MapGroup7:
map_header CeruleanGymBadgeSpeechHouse, TILESET_HOUSE_1, INDOOR, CERULEAN_CITY, MUSIC_VIRIDIAN_CITY, 0, PALETTE_DAY, FISHGROUP_SHORE
map_header CeruleanPoliceStation, TILESET_HOUSE_1, INDOOR, CERULEAN_CITY, MUSIC_VIRIDIAN_CITY, 0, PALETTE_DAY, FISHGROUP_SHORE
map_header CeruleanTradeSpeechHouse, TILESET_HOUSE_1, INDOOR, CERULEAN_CITY, MUSIC_VIRIDIAN_CITY, 0, PALETTE_DAY, FISHGROUP_SHORE
- map_header CeruleanPokeCenter1F, TILESET_POKECENTER, INDOOR, CERULEAN_CITY, MUSIC_POKEMON_CENTER, 0, PALETTE_DAY, FISHGROUP_SHORE
- map_header CeruleanPokeCenter2FBeta, TILESET_POKECENTER, INDOOR, CERULEAN_CITY, MUSIC_POKEMON_CENTER, 0, PALETTE_DAY, FISHGROUP_SHORE
+ map_header CeruleanPokecenter1F, TILESET_POKECENTER, INDOOR, CERULEAN_CITY, MUSIC_POKEMON_CENTER, 0, PALETTE_DAY, FISHGROUP_SHORE
+ map_header CeruleanPokecenter2FBeta, TILESET_POKECENTER, INDOOR, CERULEAN_CITY, MUSIC_POKEMON_CENTER, 0, PALETTE_DAY, FISHGROUP_SHORE
map_header CeruleanGym, TILESET_PORT, INDOOR, CERULEAN_CITY, MUSIC_GYM, 1, PALETTE_DAY, FISHGROUP_NONE
map_header CeruleanMart, TILESET_MART, INDOOR, CERULEAN_CITY, MUSIC_VIRIDIAN_CITY, 0, PALETTE_DAY, FISHGROUP_SHORE
- map_header Route10PokeCenter1F, TILESET_POKECENTER, INDOOR, ROUTE_10, MUSIC_POKEMON_CENTER, 0, PALETTE_DAY, FISHGROUP_SHORE
- map_header Route10PokeCenter2FBeta, TILESET_POKECENTER, INDOOR, ROUTE_10, MUSIC_POKEMON_CENTER, 0, PALETTE_DAY, FISHGROUP_SHORE
+ map_header Route10Pokecenter1F, TILESET_POKECENTER, INDOOR, ROUTE_10, MUSIC_POKEMON_CENTER, 0, PALETTE_DAY, FISHGROUP_SHORE
+ map_header Route10Pokecenter2FBeta, TILESET_POKECENTER, INDOOR, ROUTE_10, MUSIC_POKEMON_CENTER, 0, PALETTE_DAY, FISHGROUP_SHORE
map_header PowerPlant, TILESET_POWER_PLANT, INDOOR, POWER_PLANT, MUSIC_VIRIDIAN_CITY, 0, PALETTE_DAY, FISHGROUP_SHORE
map_header BillsHouse, TILESET_HOUSE_1, INDOOR, ROUTE_25, MUSIC_VIRIDIAN_CITY, 0, PALETTE_DAY, FISHGROUP_SHORE
map_header Route4, TILESET_KANTO, ROUTE, ROUTE_4, MUSIC_ROUTE_3, 0, PALETTE_AUTO, FISHGROUP_NONE
@@ -206,7 +206,7 @@ MapGroup7:
MapGroup8:
- map_header AzaleaPokeCenter1F, TILESET_POKECENTER, INDOOR, AZALEA_TOWN, MUSIC_POKEMON_CENTER, 0, PALETTE_DAY, FISHGROUP_SHORE
+ map_header AzaleaPokecenter1F, TILESET_POKECENTER, INDOOR, AZALEA_TOWN, MUSIC_POKEMON_CENTER, 0, PALETTE_DAY, FISHGROUP_SHORE
map_header CharcoalKiln, TILESET_HOUSE_1, INDOOR, AZALEA_TOWN, MUSIC_AZALEA_TOWN, 0, PALETTE_DAY, FISHGROUP_SHORE
map_header AzaleaMart, TILESET_MART, INDOOR, AZALEA_TOWN, MUSIC_AZALEA_TOWN, 0, PALETTE_DAY, FISHGROUP_SHORE
map_header KurtsHouse, TILESET_KURT_HOUSE, INDOOR, AZALEA_TOWN, MUSIC_AZALEA_TOWN, 0, PALETTE_DAY, FISHGROUP_SHORE
@@ -234,10 +234,10 @@ MapGroup10:
map_header VioletGym, TILESET_GYM_1, INDOOR, VIOLET_CITY, MUSIC_GYM, 1, PALETTE_DAY, FISHGROUP_SHORE
map_header EarlsPokemonAcademy, TILESET_LAB, INDOOR, VIOLET_CITY, MUSIC_VIOLET_CITY, 0, PALETTE_DAY, FISHGROUP_SHORE
map_header VioletNicknameSpeechHouse, TILESET_KURT_HOUSE, INDOOR, VIOLET_CITY, MUSIC_VIOLET_CITY, 0, PALETTE_DAY, FISHGROUP_SHORE
- map_header VioletPokeCenter1F, TILESET_POKECENTER, INDOOR, VIOLET_CITY, MUSIC_POKEMON_CENTER, 0, PALETTE_DAY, FISHGROUP_SHORE
+ map_header VioletPokecenter1F, TILESET_POKECENTER, INDOOR, VIOLET_CITY, MUSIC_POKEMON_CENTER, 0, PALETTE_DAY, FISHGROUP_SHORE
map_header VioletOnixTradeHouse, TILESET_KURT_HOUSE, INDOOR, VIOLET_CITY, MUSIC_VIOLET_CITY, 0, PALETTE_DAY, FISHGROUP_SHORE
map_header Route32RuinsOfAlphGate, TILESET_GATE, GATE, ROUTE_32, MUSIC_ROUTE_30, 0, PALETTE_DAY, FISHGROUP_SHORE
- map_header Route32PokeCenter1F, TILESET_POKECENTER, INDOOR, ROUTE_32, MUSIC_POKEMON_CENTER, 0, PALETTE_DAY, FISHGROUP_SHORE
+ map_header Route32Pokecenter1F, TILESET_POKECENTER, INDOOR, ROUTE_32, MUSIC_POKEMON_CENTER, 0, PALETTE_DAY, FISHGROUP_SHORE
map_header Route35GoldenrodGate, TILESET_GATE, GATE, ROUTE_35, MUSIC_ROUTE_36, 0, PALETTE_DAY, FISHGROUP_SHORE
map_header Route35NationalParkGate, TILESET_GATE, INDOOR, ROUTE_35, MUSIC_GOLDENROD_CITY, 0, PALETTE_DAY, FISHGROUP_SHORE
map_header Route36RuinsOfAlphGate, TILESET_GATE, GATE, ROUTE_36, MUSIC_ROUTE_36, 0, PALETTE_DAY, FISHGROUP_SHORE
@@ -264,7 +264,7 @@ MapGroup11:
map_header GoldenrodDeptStoreElevator, TILESET_MART, INDOOR, GOLDENROD_CITY, MUSIC_GOLDENROD_CITY, 0, PALETTE_DAY, FISHGROUP_SHORE
map_header GoldenrodDeptStoreRoof, TILESET_MART, INDOOR, GOLDENROD_CITY, MUSIC_GOLDENROD_CITY, 0, PALETTE_DAY, FISHGROUP_SHORE
map_header GoldenrodGameCorner, TILESET_GAME_CORNER, INDOOR, GOLDENROD_CITY, MUSIC_GAME_CORNER, 0, PALETTE_DAY, FISHGROUP_SHORE
- map_header GoldenrodPokeCenter1F, TILESET_POKECENTER, INDOOR, GOLDENROD_CITY, MUSIC_POKEMON_CENTER, 0, PALETTE_DAY, FISHGROUP_SHORE
+ map_header GoldenrodPokecenter1F, TILESET_POKECENTER, INDOOR, GOLDENROD_CITY, MUSIC_POKEMON_CENTER, 0, PALETTE_DAY, FISHGROUP_SHORE
map_header GoldenrodPokeComCenter2FMobile, TILESET_POKECOM_CENTER, INDOOR, GOLDENROD_CITY, MUSIC_POKEMON_CENTER, 0, PALETTE_DAY, FISHGROUP_SHORE
map_header IlexForestAzaleaGate, TILESET_GATE, GATE, ROUTE_34, MUSIC_ROUTE_36, 0, PALETTE_DAY, FISHGROUP_SHORE
map_header Route34IlexForestGate, TILESET_GATE, GATE, ROUTE_34, MUSIC_ROUTE_36, 0, PALETTE_DAY, FISHGROUP_SHORE
@@ -276,8 +276,8 @@ MapGroup12:
map_header Route11, TILESET_KANTO, ROUTE, ROUTE_11, MUSIC_ROUTE_12, 0, PALETTE_AUTO, FISHGROUP_SHORE
map_header VermilionCity, TILESET_KANTO, TOWN, VERMILION_CITY, MUSIC_VERMILION_CITY, 0, PALETTE_AUTO, FISHGROUP_OCEAN
map_header VermilionHouseFishingSpeechHouse, TILESET_HOUSE_1, INDOOR, VERMILION_CITY, MUSIC_VERMILION_CITY, 0, PALETTE_DAY, FISHGROUP_SHORE
- map_header VermilionPokeCenter1F, TILESET_POKECENTER, INDOOR, VERMILION_CITY, MUSIC_POKEMON_CENTER, 0, PALETTE_DAY, FISHGROUP_SHORE
- map_header VermilionPokeCenter2FBeta, TILESET_POKECENTER, INDOOR, VERMILION_CITY, MUSIC_VERMILION_CITY, 0, PALETTE_DAY, FISHGROUP_SHORE
+ map_header VermilionPokecenter1F, TILESET_POKECENTER, INDOOR, VERMILION_CITY, MUSIC_POKEMON_CENTER, 0, PALETTE_DAY, FISHGROUP_SHORE
+ map_header VermilionPokecenter2FBeta, TILESET_POKECENTER, INDOOR, VERMILION_CITY, MUSIC_VERMILION_CITY, 0, PALETTE_DAY, FISHGROUP_SHORE
map_header PokemonFanClub, TILESET_HOUSE_1, INDOOR, VERMILION_CITY, MUSIC_VERMILION_CITY, 0, PALETTE_DAY, FISHGROUP_SHORE
map_header VermilionMagnetTrainSpeechHouse, TILESET_HOUSE_1, INDOOR, VERMILION_CITY, MUSIC_VERMILION_CITY, 0, PALETTE_DAY, FISHGROUP_SHORE
map_header VermilionMart, TILESET_MART, INDOOR, VERMILION_CITY, MUSIC_VERMILION_CITY, 0, PALETTE_DAY, FISHGROUP_SHORE
@@ -302,8 +302,8 @@ MapGroup14:
map_header PewterNidoranSpeechHouse, TILESET_HOUSE_1, INDOOR, PEWTER_CITY, MUSIC_VIRIDIAN_CITY, 0, PALETTE_DAY, FISHGROUP_SHORE
map_header PewterGym, TILESET_SPROUT_TOWER, INDOOR, PEWTER_CITY, MUSIC_GYM, 1, PALETTE_DAY, FISHGROUP_SHORE
map_header PewterMart, TILESET_MART, INDOOR, PEWTER_CITY, MUSIC_VIRIDIAN_CITY, 0, PALETTE_DAY, FISHGROUP_SHORE
- map_header PewterPokeCenter1F, TILESET_POKECENTER, INDOOR, PEWTER_CITY, MUSIC_POKEMON_CENTER, 0, PALETTE_DAY, FISHGROUP_SHORE
- map_header PewterPokeCenter2FBeta, TILESET_POKECENTER, INDOOR, PEWTER_CITY, MUSIC_VIRIDIAN_CITY, 0, PALETTE_DAY, FISHGROUP_SHORE
+ map_header PewterPokecenter1F, TILESET_POKECENTER, INDOOR, PEWTER_CITY, MUSIC_POKEMON_CENTER, 0, PALETTE_DAY, FISHGROUP_SHORE
+ map_header PewterPokecenter2FBeta, TILESET_POKECENTER, INDOOR, PEWTER_CITY, MUSIC_VIRIDIAN_CITY, 0, PALETTE_DAY, FISHGROUP_SHORE
map_header PewterSnoozeSpeechHouse, TILESET_HOUSE_1, INDOOR, PEWTER_CITY, MUSIC_VIRIDIAN_CITY, 0, PALETTE_DAY, FISHGROUP_SHORE
@@ -324,7 +324,7 @@ MapGroup15:
MapGroup16:
map_header Route23, TILESET_KANTO, TOWN, ROUTE_23, MUSIC_INDIGO_PLATEAU, 0, PALETTE_AUTO, FISHGROUP_SHORE
- map_header IndigoPlateauPokeCenter1F, TILESET_POKECENTER, INDOOR, INDIGO_PLATEAU, MUSIC_INDIGO_PLATEAU, 0, PALETTE_DAY, FISHGROUP_SHORE
+ map_header IndigoPlateauPokecenter1F, TILESET_POKECENTER, INDOOR, INDIGO_PLATEAU, MUSIC_INDIGO_PLATEAU, 0, PALETTE_DAY, FISHGROUP_SHORE
map_header WillsRoom, TILESET_GYM_1, INDOOR, INDIGO_PLATEAU, MUSIC_INDIGO_PLATEAU, 1, PALETTE_DAY, FISHGROUP_SHORE
map_header KogasRoom, TILESET_GYM_1, INDOOR, INDIGO_PLATEAU, MUSIC_INDIGO_PLATEAU, 1, PALETTE_DAY, FISHGROUP_SHORE
map_header BrunosRoom, TILESET_GYM_1, INDOOR, INDIGO_PLATEAU, MUSIC_INDIGO_PLATEAU, 1, PALETTE_DAY, FISHGROUP_SHORE
@@ -343,8 +343,8 @@ MapGroup17:
map_header SafariZoneMainOffice, TILESET_GAME_CORNER, INDOOR, FUCHSIA_CITY, MUSIC_CELADON_CITY, 0, PALETTE_DAY, FISHGROUP_SHORE
map_header FuchsiaGym, TILESET_LAB, INDOOR, FUCHSIA_CITY, MUSIC_GYM, 1, PALETTE_DAY, FISHGROUP_SHORE
map_header FuchsiaBillSpeechHouse, TILESET_HOUSE_1, INDOOR, FUCHSIA_CITY, MUSIC_CELADON_CITY, 0, PALETTE_DAY, FISHGROUP_SHORE
- map_header FuchsiaPokeCenter1F, TILESET_POKECENTER, INDOOR, FUCHSIA_CITY, MUSIC_POKEMON_CENTER, 0, PALETTE_DAY, FISHGROUP_SHORE
- map_header FuchsiaPokeCenter2FBeta, TILESET_POKECENTER, INDOOR, FUCHSIA_CITY, MUSIC_CELADON_CITY, 0, PALETTE_DAY, FISHGROUP_SHORE
+ map_header FuchsiaPokecenter1F, TILESET_POKECENTER, INDOOR, FUCHSIA_CITY, MUSIC_POKEMON_CENTER, 0, PALETTE_DAY, FISHGROUP_SHORE
+ map_header FuchsiaPokecenter2FBeta, TILESET_POKECENTER, INDOOR, FUCHSIA_CITY, MUSIC_CELADON_CITY, 0, PALETTE_DAY, FISHGROUP_SHORE
map_header SafariZoneWardensHome, TILESET_HOUSE_1, INDOOR, FUCHSIA_CITY, MUSIC_CELADON_CITY, 0, PALETTE_DAY, FISHGROUP_SHORE
map_header Route15FuchsiaGate, TILESET_GATE, GATE, ROUTE_15, MUSIC_ROUTE_12, 0, PALETTE_DAY, FISHGROUP_SHORE
@@ -354,8 +354,8 @@ MapGroup18:
map_header Route12, TILESET_KANTO, ROUTE, ROUTE_12, MUSIC_ROUTE_12, 0, PALETTE_AUTO, FISHGROUP_QWILFISH_NO_SWARM
map_header Route10South, TILESET_KANTO, ROUTE, ROUTE_10, MUSIC_ROUTE_3, 0, PALETTE_AUTO, FISHGROUP_LAKE
map_header LavenderTown, TILESET_KANTO, TOWN, LAVENDER_TOWN, MUSIC_LAVENDER_TOWN, 0, PALETTE_AUTO, FISHGROUP_SHORE
- map_header LavenderPokeCenter1F, TILESET_POKECENTER, INDOOR, LAVENDER_TOWN, MUSIC_POKEMON_CENTER, 0, PALETTE_DAY, FISHGROUP_SHORE
- map_header LavenderPokeCenter2FBeta, TILESET_POKECENTER, INDOOR, LAVENDER_TOWN, MUSIC_POKEMON_CENTER, 0, PALETTE_DAY, FISHGROUP_SHORE
+ map_header LavenderPokecenter1F, TILESET_POKECENTER, INDOOR, LAVENDER_TOWN, MUSIC_POKEMON_CENTER, 0, PALETTE_DAY, FISHGROUP_SHORE
+ map_header LavenderPokecenter2FBeta, TILESET_POKECENTER, INDOOR, LAVENDER_TOWN, MUSIC_POKEMON_CENTER, 0, PALETTE_DAY, FISHGROUP_SHORE
map_header MrFujisHouse, TILESET_HOUSE_1, INDOOR, LAVENDER_TOWN, MUSIC_LAVENDER_TOWN, 0, PALETTE_DAY, FISHGROUP_SHORE
map_header LavenderTownSpeechHouse, TILESET_HOUSE_1, INDOOR, LAVENDER_TOWN, MUSIC_LAVENDER_TOWN, 0, PALETTE_DAY, FISHGROUP_SHORE
map_header LavenderNameRater, TILESET_HOUSE_1, INDOOR, LAVENDER_TOWN, MUSIC_LAVENDER_TOWN, 0, PALETTE_DAY, FISHGROUP_SHORE
@@ -369,12 +369,12 @@ MapGroup18:
MapGroup19:
map_header Route28, TILESET_KANTO, ROUTE, ROUTE_28, MUSIC_INDIGO_PLATEAU, 0, PALETTE_AUTO, FISHGROUP_POND
map_header SilverCaveOutside, TILESET_KANTO, TOWN, SILVER_CAVE, MUSIC_INDIGO_PLATEAU, 0, PALETTE_AUTO, FISHGROUP_POND
- map_header SilverCavePokeCenter1F, TILESET_POKECENTER, INDOOR, SILVER_CAVE, MUSIC_POKEMON_CENTER, 0, PALETTE_DAY, FISHGROUP_SHORE
+ map_header SilverCavePokecenter1F, TILESET_POKECENTER, INDOOR, SILVER_CAVE, MUSIC_POKEMON_CENTER, 0, PALETTE_DAY, FISHGROUP_SHORE
map_header Route28FamousSpeechHouse, TILESET_HOUSE_1, INDOOR, ROUTE_28, MUSIC_AZALEA_TOWN, 0, PALETTE_DAY, FISHGROUP_SHORE
MapGroup20:
- map_header PokeCenter2F, TILESET_POKECENTER, INDOOR, SPECIAL_MAP, MUSIC_POKEMON_CENTER, 1, PALETTE_DAY, FISHGROUP_SHORE
+ map_header Pokecenter2F, TILESET_POKECENTER, INDOOR, SPECIAL_MAP, MUSIC_POKEMON_CENTER, 1, PALETTE_DAY, FISHGROUP_SHORE
map_header TradeCenter, TILESET_GATE, INDOOR, SPECIAL_MAP, MUSIC_CHERRYGROVE_CITY, 1, PALETTE_DAY, FISHGROUP_SHORE
map_header Colosseum, TILESET_GATE, INDOOR, SPECIAL_MAP, MUSIC_CHERRYGROVE_CITY, 1, PALETTE_DAY, FISHGROUP_SHORE
map_header TimeCapsule, TILESET_GATE, INDOOR, SPECIAL_MAP, MUSIC_CHERRYGROVE_CITY, 1, PALETTE_DAY, FISHGROUP_SHORE
@@ -399,8 +399,8 @@ MapGroup21:
map_header CeladonMansion3F, TILESET_CELADON_MANSION, INDOOR, CELADON_CITY, MUSIC_CELADON_CITY, 0, PALETTE_DAY, FISHGROUP_SHORE
map_header CeladonMansionRoof, TILESET_CELADON_MANSION, INDOOR, CELADON_CITY, MUSIC_CELADON_CITY, 0, PALETTE_DAY, FISHGROUP_SHORE
map_header CeladonMansionRoofHouse, TILESET_HOUSE_1, INDOOR, CELADON_CITY, MUSIC_CELADON_CITY, 0, PALETTE_DAY, FISHGROUP_SHORE
- map_header CeladonPokeCenter1F, TILESET_POKECENTER, INDOOR, CELADON_CITY, MUSIC_POKEMON_CENTER, 0, PALETTE_DAY, FISHGROUP_SHORE
- map_header CeladonPokeCenter2FBeta, TILESET_POKECENTER, INDOOR, CELADON_CITY, MUSIC_CELADON_CITY, 0, PALETTE_DAY, FISHGROUP_SHORE
+ map_header CeladonPokecenter1F, TILESET_POKECENTER, INDOOR, CELADON_CITY, MUSIC_POKEMON_CENTER, 0, PALETTE_DAY, FISHGROUP_SHORE
+ map_header CeladonPokecenter2FBeta, TILESET_POKECENTER, INDOOR, CELADON_CITY, MUSIC_CELADON_CITY, 0, PALETTE_DAY, FISHGROUP_SHORE
map_header CeladonGameCorner, TILESET_GAME_CORNER, INDOOR, CELADON_CITY, MUSIC_GAME_CORNER, 0, PALETTE_DAY, FISHGROUP_SHORE
map_header CeladonGameCornerPrizeRoom, TILESET_GAME_CORNER, INDOOR, CELADON_CITY, MUSIC_CELADON_CITY, 0, PALETTE_DAY, FISHGROUP_SHORE
map_header CeladonGym, TILESET_TRAIN_STATION, INDOOR, CELADON_CITY, MUSIC_GYM, 1, PALETTE_DAY, FISHGROUP_SHORE
@@ -417,7 +417,7 @@ MapGroup22:
map_header CianwoodCity, TILESET_JOHTO_1, TOWN, CIANWOOD_CITY, MUSIC_ECRUTEAK_CITY, 0, PALETTE_AUTO, FISHGROUP_SHORE
map_header ManiasHouse, TILESET_HOUSE_1, INDOOR, CIANWOOD_CITY, MUSIC_ECRUTEAK_CITY, 0, PALETTE_DAY, FISHGROUP_SHORE
map_header CianwoodGym, TILESET_SPROUT_TOWER, INDOOR, CIANWOOD_CITY, MUSIC_GYM, 1, PALETTE_DAY, FISHGROUP_SHORE
- map_header CianwoodPokeCenter1F, TILESET_POKECENTER, INDOOR, CIANWOOD_CITY, MUSIC_POKEMON_CENTER, 0, PALETTE_DAY, FISHGROUP_SHORE
+ map_header CianwoodPokecenter1F, TILESET_POKECENTER, INDOOR, CIANWOOD_CITY, MUSIC_POKEMON_CENTER, 0, PALETTE_DAY, FISHGROUP_SHORE
map_header CianwoodPharmacy, TILESET_HOUSE_1, INDOOR, CIANWOOD_CITY, MUSIC_ECRUTEAK_CITY, 0, PALETTE_DAY, FISHGROUP_SHORE
map_header CianwoodCityPhotoStudio, TILESET_HOUSE_1, INDOOR, CIANWOOD_CITY, MUSIC_ECRUTEAK_CITY, 0, PALETTE_DAY, FISHGROUP_SHORE
map_header CianwoodLugiaSpeechHouse, TILESET_HOUSE_1, INDOOR, CIANWOOD_CITY, MUSIC_ECRUTEAK_CITY, 0, PALETTE_DAY, FISHGROUP_SHORE
@@ -439,8 +439,8 @@ MapGroup23:
map_header TrainerHouse1F, TILESET_HOUSE_1, INDOOR, VIRIDIAN_CITY, MUSIC_VIRIDIAN_CITY, 0, PALETTE_DAY, FISHGROUP_SHORE
map_header TrainerHouseB1F, TILESET_POWER_PLANT, INDOOR, VIRIDIAN_CITY, MUSIC_VIRIDIAN_CITY, 0, PALETTE_DAY, FISHGROUP_SHORE
map_header ViridianMart, TILESET_MART, INDOOR, VIRIDIAN_CITY, MUSIC_VIRIDIAN_CITY, 0, PALETTE_DAY, FISHGROUP_SHORE
- map_header ViridianPokeCenter1F, TILESET_POKECENTER, INDOOR, VIRIDIAN_CITY, MUSIC_POKEMON_CENTER, 0, PALETTE_DAY, FISHGROUP_SHORE
- map_header ViridianPokeCenter2FBeta, TILESET_POKECENTER, INDOOR, VIRIDIAN_CITY, MUSIC_VIRIDIAN_CITY, 0, PALETTE_DAY, FISHGROUP_SHORE
+ map_header ViridianPokecenter1F, TILESET_POKECENTER, INDOOR, VIRIDIAN_CITY, MUSIC_POKEMON_CENTER, 0, PALETTE_DAY, FISHGROUP_SHORE
+ map_header ViridianPokecenter2FBeta, TILESET_POKECENTER, INDOOR, VIRIDIAN_CITY, MUSIC_VIRIDIAN_CITY, 0, PALETTE_DAY, FISHGROUP_SHORE
map_header Route2NuggetSpeechHouse, TILESET_HOUSE_1, INDOOR, ROUTE_2, MUSIC_VIRIDIAN_CITY, 0, PALETTE_DAY, FISHGROUP_SHORE
map_header Route2Gate, TILESET_GATE, GATE, ROUTE_2, MUSIC_ROUTE_2, 0, PALETTE_DAY, FISHGROUP_SHORE
map_header VictoryRoadGate, TILESET_GATE, GATE, ROUTE_26, MUSIC_INDIGO_PLATEAU, 0, PALETTE_DAY, FISHGROUP_SHORE
@@ -468,8 +468,8 @@ MapGroup25:
map_header FightingDojo, TILESET_TRAIN_STATION, INDOOR, SAFFRON_CITY, MUSIC_VIRIDIAN_CITY, 0, PALETTE_DAY, FISHGROUP_SHORE
map_header SaffronGym, TILESET_UNDERGROUND, INDOOR, SAFFRON_CITY, MUSIC_GYM, 1, PALETTE_DAY, FISHGROUP_SHORE
map_header SaffronMart, TILESET_MART, INDOOR, SAFFRON_CITY, MUSIC_VIRIDIAN_CITY, 0, PALETTE_DAY, FISHGROUP_SHORE
- map_header SaffronPokeCenter1F, TILESET_POKECENTER, INDOOR, SAFFRON_CITY, MUSIC_POKEMON_CENTER, 0, PALETTE_DAY, FISHGROUP_SHORE
- map_header SaffronPokeCenter2FBeta, TILESET_POKECENTER, INDOOR, SAFFRON_CITY, MUSIC_VIRIDIAN_CITY, 0, PALETTE_DAY, FISHGROUP_SHORE
+ map_header SaffronPokecenter1F, TILESET_POKECENTER, INDOOR, SAFFRON_CITY, MUSIC_POKEMON_CENTER, 0, PALETTE_DAY, FISHGROUP_SHORE
+ map_header SaffronPokecenter2FBeta, TILESET_POKECENTER, INDOOR, SAFFRON_CITY, MUSIC_VIRIDIAN_CITY, 0, PALETTE_DAY, FISHGROUP_SHORE
map_header MrPsychicsHouse, TILESET_HOUSE_1, INDOOR, SAFFRON_CITY, MUSIC_VIRIDIAN_CITY, 0, PALETTE_DAY, FISHGROUP_SHORE
map_header SaffronTrainStation, TILESET_TRAIN_STATION, INDOOR, SAFFRON_CITY, MUSIC_VIRIDIAN_CITY, 0, PALETTE_DAY, FISHGROUP_SHORE
map_header SilphCo1F, TILESET_POWER_PLANT, INDOOR, SAFFRON_CITY, MUSIC_VIRIDIAN_CITY, 0, PALETTE_DAY, FISHGROUP_SHORE
@@ -485,7 +485,7 @@ MapGroup26:
map_header Route31, TILESET_JOHTO_1, ROUTE, ROUTE_31, MUSIC_ROUTE_30, 0, PALETTE_AUTO, FISHGROUP_POND
map_header CherrygroveCity, TILESET_JOHTO_1, TOWN, CHERRYGROVE_CITY, MUSIC_CHERRYGROVE_CITY, 0, PALETTE_AUTO, FISHGROUP_SHORE
map_header CherrygroveMart, TILESET_MART, INDOOR, CHERRYGROVE_CITY, MUSIC_CHERRYGROVE_CITY, 0, PALETTE_DAY, FISHGROUP_SHORE
- map_header CherrygrovePokeCenter1F, TILESET_POKECENTER, INDOOR, CHERRYGROVE_CITY, MUSIC_POKEMON_CENTER, 0, PALETTE_DAY, FISHGROUP_SHORE
+ map_header CherrygrovePokecenter1F, TILESET_POKECENTER, INDOOR, CHERRYGROVE_CITY, MUSIC_POKEMON_CENTER, 0, PALETTE_DAY, FISHGROUP_SHORE
map_header CherrygroveGymSpeechHouse, TILESET_HOUSE_1, INDOOR, CHERRYGROVE_CITY, MUSIC_CHERRYGROVE_CITY, 0, PALETTE_DAY, FISHGROUP_SHORE
map_header GuideGentsHouse, TILESET_HOUSE_1, INDOOR, CHERRYGROVE_CITY, MUSIC_CHERRYGROVE_CITY, 0, PALETTE_DAY, FISHGROUP_SHORE
map_header CherrygroveEvolutionSpeechHouse, TILESET_HOUSE_1, INDOOR, CHERRYGROVE_CITY, MUSIC_CHERRYGROVE_CITY, 0, PALETTE_DAY, FISHGROUP_SHORE
diff --git a/maps/second_map_headers.asm b/maps/second_map_headers.asm
index 3f4bcbac0..b58895f4b 100644
--- a/maps/second_map_headers.asm
+++ b/maps/second_map_headers.asm
@@ -360,7 +360,7 @@
map_header_2 DragonsDenB1F, DRAGONS_DEN_B1F, $71, 0
map_header_2 DragonShrine, DRAGON_SHRINE, $0, 0
map_header_2 TohjoFalls, TOHJO_FALLS, $9, 0
- map_header_2 OlivinePokeCenter1F, OLIVINE_POKECENTER_1F, $0, 0
+ map_header_2 OlivinePokecenter1F, OLIVINE_POKECENTER_1F, $0, 0
map_header_2 OlivineGym, OLIVINE_GYM, $0, 0
map_header_2 OlivineTimsHouse, OLIVINE_TIMS_HOUSE, $0, 0
map_header_2 OlivineHouseBeta, OLIVINE_HOUSE_BETA, $0, 0
@@ -373,7 +373,7 @@
map_header_2 Route39Farmhouse, ROUTE_39_FARMHOUSE, $0, 0
map_header_2 MahoganyRedGyaradosSpeechHouse, MAHOGANY_RED_GYARADOS_SPEECH_HOUSE, $0, 0
map_header_2 MahoganyGym, MAHOGANY_GYM, $0, 0
- map_header_2 MahoganyPokeCenter1F, MAHOGANY_POKECENTER_1F, $0, 0
+ map_header_2 MahoganyPokecenter1F, MAHOGANY_POKECENTER_1F, $0, 0
map_header_2 Route42EcruteakGate, ROUTE_42_ECRUTEAK_GATE, $0, 0
map_header_2 DiglettsCave, DIGLETTS_CAVE, $9, 0
map_header_2 MountMoon, MOUNT_MOON, $9, 0
@@ -385,7 +385,7 @@
map_header_2 VictoryRoad, VICTORY_ROAD, $1d, 0
map_header_2 EcruteakHouse, ECRUTEAK_HOUSE, $0, 0
map_header_2 WiseTriosRoom, WISE_TRIOS_ROOM, $0, 0
- map_header_2 EcruteakPokeCenter1F, ECRUTEAK_POKECENTER_1F, $0, 0
+ map_header_2 EcruteakPokecenter1F, ECRUTEAK_POKECENTER_1F, $0, 0
map_header_2 EcruteakLugiaSpeechHouse, ECRUTEAK_LUGIA_SPEECH_HOUSE, $0, 0
map_header_2 DanceTheatre, DANCE_THEATRE, $0, 0
map_header_2 EcruteakMart, ECRUTEAK_MART, $0, 0
@@ -396,24 +396,24 @@
map_header_2 BlackthornDragonSpeechHouse, BLACKTHORN_DRAGON_SPEECH_HOUSE, $0, 0
map_header_2 BlackthornEmysHouse, BLACKTHORN_EMYS_HOUSE, $0, 0
map_header_2 BlackthornMart, BLACKTHORN_MART, $0, 0
- map_header_2 BlackthornPokeCenter1F, BLACKTHORN_POKECENTER_1F, $0, 0
+ map_header_2 BlackthornPokecenter1F, BLACKTHORN_POKECENTER_1F, $0, 0
map_header_2 MoveDeletersHouse, MOVE_DELETERS_HOUSE, $0, 0
- map_header_2 CinnabarPokeCenter1F, CINNABAR_POKECENTER_1F, $0, 0
- map_header_2 CinnabarPokeCenter2FBeta, CINNABAR_POKECENTER_2F_BETA, $0, 0
+ map_header_2 CinnabarPokecenter1F, CINNABAR_POKECENTER_1F, $0, 0
+ map_header_2 CinnabarPokecenter2FBeta, CINNABAR_POKECENTER_2F_BETA, $0, 0
map_header_2 Route19FuchsiaGate, ROUTE_19___FUCHSIA_GATE, $0, 0
map_header_2 SeafoamGym, SEAFOAM_GYM, $9, 0
map_header_2 CeruleanGymBadgeSpeechHouse, CERULEAN_GYM_BADGE_SPEECH_HOUSE, $0, 0
map_header_2 CeruleanPoliceStation, CERULEAN_POLICE_STATION, $0, 0
map_header_2 CeruleanTradeSpeechHouse, CERULEAN_TRADE_SPEECH_HOUSE, $0, 0
- map_header_2 CeruleanPokeCenter1F, CERULEAN_POKECENTER_1F, $0, 0
- map_header_2 CeruleanPokeCenter2FBeta, CERULEAN_POKECENTER_2F_BETA, $0, 0
+ map_header_2 CeruleanPokecenter1F, CERULEAN_POKECENTER_1F, $0, 0
+ map_header_2 CeruleanPokecenter2FBeta, CERULEAN_POKECENTER_2F_BETA, $0, 0
map_header_2 CeruleanGym, CERULEAN_GYM, $0, 0
map_header_2 CeruleanMart, CERULEAN_MART, $0, 0
- map_header_2 Route10PokeCenter1F, ROUTE_10_POKECENTER_1F, $0, 0
- map_header_2 Route10PokeCenter2FBeta, ROUTE_10_POKECENTER_2F_BETA, $0, 0
+ map_header_2 Route10Pokecenter1F, ROUTE_10_POKECENTER_1F, $0, 0
+ map_header_2 Route10Pokecenter2FBeta, ROUTE_10_POKECENTER_2F_BETA, $0, 0
map_header_2 PowerPlant, POWER_PLANT, $0, 0
map_header_2 BillsHouse, BILLS_HOUSE, $0, 0
- map_header_2 AzaleaPokeCenter1F, AZALEA_POKECENTER_1F, $0, 0
+ map_header_2 AzaleaPokecenter1F, AZALEA_POKECENTER_1F, $0, 0
map_header_2 CharcoalKiln, CHARCOAL_KILN, $0, 0
map_header_2 AzaleaMart, AZALEA_MART, $0, 0
map_header_2 KurtsHouse, KURTS_HOUSE, $0, 0
@@ -426,10 +426,10 @@
map_header_2 VioletGym, VIOLET_GYM, $0, 0
map_header_2 EarlsPokemonAcademy, EARLS_POKEMON_ACADEMY, $0, 0
map_header_2 VioletNicknameSpeechHouse, VIOLET_NICKNAME_SPEECH_HOUSE, $0, 0
- map_header_2 VioletPokeCenter1F, VIOLET_POKECENTER_1F, $0, 0
+ map_header_2 VioletPokecenter1F, VIOLET_POKECENTER_1F, $0, 0
map_header_2 VioletOnixTradeHouse, VIOLET_ONIX_TRADE_HOUSE, $0, 0
map_header_2 Route32RuinsOfAlphGate, ROUTE_32_RUINS_OF_ALPH_GATE, $0, 0
- map_header_2 Route32PokeCenter1F, ROUTE_32_POKECENTER_1F, $0, 0
+ map_header_2 Route32Pokecenter1F, ROUTE_32_POKECENTER_1F, $0, 0
map_header_2 Route35GoldenrodGate, ROUTE_35_GOLDENROD_GATE, $0, 0
map_header_2 Route35NationalParkGate, ROUTE_35_NATIONAL_PARK_GATE, $0, 0
map_header_2 Route36RuinsOfAlphGate, ROUTE_36_RUINS_OF_ALPH_GATE, $0, 0
@@ -451,14 +451,14 @@
map_header_2 GoldenrodDeptStoreElevator, GOLDENROD_DEPT_STORE_ELEVATOR, $0, 0
map_header_2 GoldenrodDeptStoreRoof, GOLDENROD_DEPT_STORE_ROOF, $24, 0
map_header_2 GoldenrodGameCorner, GOLDENROD_GAME_CORNER, $0, 0
- map_header_2 GoldenrodPokeCenter1F, GOLDENROD_POKECENTER_1F, $0, 0
+ map_header_2 GoldenrodPokecenter1F, GOLDENROD_POKECENTER_1F, $0, 0
map_header_2 GoldenrodPokeComCenter2FMobile, GOLDENROD_POKECOM_CENTER_2F_MOBILE, $0, 0
map_header_2 IlexForestAzaleaGate, ILEX_FOREST_AZALEA_GATE, $0, 0
map_header_2 Route34IlexForestGate, ROUTE_34_ILEX_FOREST_GATE, $0, 0
map_header_2 DayCare, DAY_CARE, $0, 0
map_header_2 VermilionHouseFishingSpeechHouse, VERMILION_HOUSE_FISHING_SPEECH_HOUSE, $0, 0
- map_header_2 VermilionPokeCenter1F, VERMILION_POKECENTER_1F, $0, 0
- map_header_2 VermilionPokeCenter2FBeta, VERMILION_POKECENTER_2F_BETA, $0, 0
+ map_header_2 VermilionPokecenter1F, VERMILION_POKECENTER_1F, $0, 0
+ map_header_2 VermilionPokecenter2FBeta, VERMILION_POKECENTER_2F_BETA, $0, 0
map_header_2 PokemonFanClub, POKEMON_FAN_CLUB, $0, 0
map_header_2 VermilionMagnetTrainSpeechHouse, VERMILION_MAGNET_TRAIN_SPEECH_HOUSE, $0, 0
map_header_2 VermilionMart, VERMILION_MART, $0, 0
@@ -473,8 +473,8 @@
map_header_2 PewterNidoranSpeechHouse, PEWTER_NIDORAN_SPEECH_HOUSE, $0, 0
map_header_2 PewterGym, PEWTER_GYM, $0, 0
map_header_2 PewterMart, PEWTER_MART, $0, 0
- map_header_2 PewterPokeCenter1F, PEWTER_POKECENTER_1F, $0, 0
- map_header_2 PewterPokeCenter2FBeta, PEWTER_POKECENTER_2F_BETA, $0, 0
+ map_header_2 PewterPokecenter1F, PEWTER_POKECENTER_1F, $0, 0
+ map_header_2 PewterPokecenter2FBeta, PEWTER_POKECENTER_2F_BETA, $0, 0
map_header_2 PewterSnoozeSpeechHouse, PEWTER_SNOOZE_SPEECH_HOUSE, $0, 0
map_header_2 OlivinePort, OLIVINE_PORT, $a, 0
map_header_2 VermilionPort, VERMILION_PORT, $a, 0
@@ -488,7 +488,7 @@
map_header_2 MountMoonSquare, MOUNT_MOON_SQUARE, $2d, 0
map_header_2 MountMoonGiftShop, MOUNT_MOON_GIFT_SHOP, $0, 0
map_header_2 TinTowerRoof, TIN_TOWER_ROOF, $0, 0
- map_header_2 IndigoPlateauPokeCenter1F, INDIGO_PLATEAU_POKECENTER_1F, $0, 0
+ map_header_2 IndigoPlateauPokecenter1F, INDIGO_PLATEAU_POKECENTER_1F, $0, 0
map_header_2 WillsRoom, WILLS_ROOM, $0, 0
map_header_2 KogasRoom, KOGAS_ROOM, $0, 0
map_header_2 BrunosRoom, BRUNOS_ROOM, $0, 0
@@ -499,12 +499,12 @@
map_header_2 SafariZoneMainOffice, SAFARI_ZONE_MAIN_OFFICE, $0, 0
map_header_2 FuchsiaGym, FUCHSIA_GYM, $0, 0
map_header_2 FuchsiaBillSpeechHouse, FUCHSIA_BILL_SPEECH_HOUSE, $0, 0
- map_header_2 FuchsiaPokeCenter1F, FUCHSIA_POKECENTER_1F, $0, 0
- map_header_2 FuchsiaPokeCenter2FBeta, FUCHSIA_POKECENTER_2F_BETA, $0, 0
+ map_header_2 FuchsiaPokecenter1F, FUCHSIA_POKECENTER_1F, $0, 0
+ map_header_2 FuchsiaPokecenter2FBeta, FUCHSIA_POKECENTER_2F_BETA, $0, 0
map_header_2 SafariZoneWardensHome, SAFARI_ZONE_WARDENS_HOME, $0, 0
map_header_2 Route15FuchsiaGate, ROUTE_15_FUCHSIA_GATE, $0, 0
- map_header_2 LavenderPokeCenter1F, LAVENDER_POKECENTER_1F, $0, 0
- map_header_2 LavenderPokeCenter2FBeta, LAVENDER_POKECENTER_2F_BETA, $0, 0
+ map_header_2 LavenderPokecenter1F, LAVENDER_POKECENTER_1F, $0, 0
+ map_header_2 LavenderPokecenter2FBeta, LAVENDER_POKECENTER_2F_BETA, $0, 0
map_header_2 MrFujisHouse, MR_FUJIS_HOUSE, $0, 0
map_header_2 LavenderTownSpeechHouse, LAVENDER_TOWN_SPEECH_HOUSE, $0, 0
map_header_2 LavenderNameRater, LAVENDER_NAME_RATER, $0, 0
@@ -513,9 +513,9 @@
map_header_2 LavRadioTower1F, LAV_RADIO_TOWER_1F, $0, 0
map_header_2 Route8SaffronGate, ROUTE_8_SAFFRON_GATE, $0, 0
map_header_2 Route12SuperRodHouse, ROUTE_12_SUPER_ROD_HOUSE, $0, 0
- map_header_2 SilverCavePokeCenter1F, SILVER_CAVE_POKECENTER_1F, $0, 0
+ map_header_2 SilverCavePokecenter1F, SILVER_CAVE_POKECENTER_1F, $0, 0
map_header_2 Route28FamousSpeechHouse, ROUTE_28_FAMOUS_SPEECH_HOUSE, $0, 0
- map_header_2 PokeCenter2F, POKECENTER_2F, $0, 0
+ map_header_2 Pokecenter2F, POKECENTER_2F, $0, 0
map_header_2 TradeCenter, TRADE_CENTER, $0, 0
map_header_2 Colosseum, COLOSSEUM, $0, 0
map_header_2 TimeCapsule, TIME_CAPSULE, $0, 0
@@ -533,8 +533,8 @@
map_header_2 CeladonMansion3F, CELADON_MANSION_3F, $0, 0
map_header_2 CeladonMansionRoof, CELADON_MANSION_ROOF, $1, 0
map_header_2 CeladonMansionRoofHouse, CELADON_MANSION_ROOF_HOUSE, $0, 0
- map_header_2 CeladonPokeCenter1F, CELADON_POKECENTER_1F, $0, 0
- map_header_2 CeladonPokeCenter2FBeta, CELADON_POKECENTER_2F_BETA, $0, 0
+ map_header_2 CeladonPokecenter1F, CELADON_POKECENTER_1F, $0, 0
+ map_header_2 CeladonPokecenter2FBeta, CELADON_POKECENTER_2F_BETA, $0, 0
map_header_2 CeladonGameCorner, CELADON_GAME_CORNER, $0, 0
map_header_2 CeladonGameCornerPrizeRoom, CELADON_GAME_CORNER_PRIZE_ROOM, $0, 0
map_header_2 CeladonGym, CELADON_GYM, $0, 0
@@ -545,7 +545,7 @@
map_header_2 Route1718Gate, ROUTE_17_18_GATE, $0, 0
map_header_2 ManiasHouse, MANIAS_HOUSE, $0, 0
map_header_2 CianwoodGym, CIANWOOD_GYM, $0, 0
- map_header_2 CianwoodPokeCenter1F, CIANWOOD_POKECENTER_1F, $0, 0
+ map_header_2 CianwoodPokecenter1F, CIANWOOD_POKECENTER_1F, $0, 0
map_header_2 CianwoodPharmacy, CIANWOOD_PHARMACY, $0, 0
map_header_2 CianwoodCityPhotoStudio, CIANWOOD_CITY_PHOTO_STUDIO, $0, 0
map_header_2 CianwoodLugiaSpeechHouse, CIANWOOD_LUGIA_SPEECH_HOUSE, $0, 0
@@ -561,8 +561,8 @@
map_header_2 TrainerHouse1F, TRAINER_HOUSE_1F, $0, 0
map_header_2 TrainerHouseB1F, TRAINER_HOUSE_B1F, $0, 0
map_header_2 ViridianMart, VIRIDIAN_MART, $0, 0
- map_header_2 ViridianPokeCenter1F, VIRIDIAN_POKECENTER_1F, $0, 0
- map_header_2 ViridianPokeCenter2FBeta, VIRIDIAN_POKECENTER_2F_BETA, $0, 0
+ map_header_2 ViridianPokecenter1F, VIRIDIAN_POKECENTER_1F, $0, 0
+ map_header_2 ViridianPokecenter2FBeta, VIRIDIAN_POKECENTER_2F_BETA, $0, 0
map_header_2 Route2NuggetSpeechHouse, ROUTE_2_NUGGET_SPEECH_HOUSE, $0, 0
map_header_2 Route2Gate, ROUTE_2_GATE, $0, 0
map_header_2 VictoryRoadGate, VICTORY_ROAD_GATE, $0, 0
@@ -578,8 +578,8 @@
map_header_2 FightingDojo, FIGHTING_DOJO, $0, 0
map_header_2 SaffronGym, SAFFRON_GYM, $0, 0
map_header_2 SaffronMart, SAFFRON_MART, $0, 0
- map_header_2 SaffronPokeCenter1F, SAFFRON_POKECENTER_1F, $0, 0
- map_header_2 SaffronPokeCenter2FBeta, SAFFRON_POKECENTER_2F_BETA, $0, 0
+ map_header_2 SaffronPokecenter1F, SAFFRON_POKECENTER_1F, $0, 0
+ map_header_2 SaffronPokecenter2FBeta, SAFFRON_POKECENTER_2F_BETA, $0, 0
map_header_2 MrPsychicsHouse, MR_PSYCHICS_HOUSE, $0, 0
map_header_2 SaffronTrainStation, SAFFRON_TRAIN_STATION, $0, 0
map_header_2 SilphCo1F, SILPH_CO_1F, $0, 0
@@ -589,7 +589,7 @@
map_header_2 Route5SaffronCityGate, ROUTE_5_SAFFRON_CITY_GATE, $0, 0
map_header_2 Route5CleanseTagSpeechHouse, ROUTE_5_CLEANSE_TAG_SPEECH_HOUSE, $0, 0
map_header_2 CherrygroveMart, CHERRYGROVE_MART, $0, 0
- map_header_2 CherrygrovePokeCenter1F, CHERRYGROVE_POKECENTER_1F, $0, 0
+ map_header_2 CherrygrovePokecenter1F, CHERRYGROVE_POKECENTER_1F, $0, 0
map_header_2 CherrygroveGymSpeechHouse, CHERRYGROVE_GYM_SPEECH_HOUSE, $0, 0
map_header_2 GuideGentsHouse, GUIDE_GENTS_HOUSE, $0, 0
map_header_2 CherrygroveEvolutionSpeechHouse, CHERRYGROVE_EVOLUTION_SPEECH_HOUSE, $0, 0
diff --git a/text/stdtext.asm b/text/stdtext.asm
index 33827694f..7b558cc49 100644
--- a/text/stdtext.asm
+++ b/text/stdtext.asm
@@ -202,7 +202,7 @@ TrashCanText:
line "can break this."
done
-PokeCenterSignText:
+PokecenterSignText:
text "Heal Your #MON!"
line "#MON CENTER"
done
generated by cgit v1.2.3 (git 2.25.1) at 2025-06-05 04:08:04 +0000