PokeCenter → Pokecenter (consistent with the POKECENTER map constants)

This commit is contained in:
Remy Oukaour
2017-12-10 22:34:42 -05:00
parent a827c02757
commit a551e345df
72 changed files with 429 additions and 429 deletions

View File

@@ -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

View File

@@ -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

View File

@@ -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

View File

@@ -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

View File

@@ -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:

View File

@@ -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

View File

@@ -1,11 +1,11 @@
CeladonPokeCenter2FBeta_MapScriptHeader:
CeladonPokecenter2FBeta_MapScriptHeader:
.MapTriggers:
db 0
.MapCallbacks:
db 0
CeladonPokeCenter2FBeta_MapEventHeader:
CeladonPokecenter2FBeta_MapEventHeader:
; filler
db 0, 0

View File

@@ -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

View File

@@ -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

View File

@@ -1,11 +1,11 @@
CeruleanPokeCenter2FBeta_MapScriptHeader:
CeruleanPokecenter2FBeta_MapScriptHeader:
.MapTriggers:
db 0
.MapCallbacks:
db 0
CeruleanPokeCenter2FBeta_MapEventHeader:
CeruleanPokecenter2FBeta_MapEventHeader:
; filler
db 0, 0

View File

@@ -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

View File

@@ -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

View File

@@ -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

View File

@@ -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

View File

@@ -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

View File

@@ -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

View File

@@ -1,11 +1,11 @@
CinnabarPokeCenter2FBeta_MapScriptHeader:
CinnabarPokecenter2FBeta_MapScriptHeader:
.MapTriggers:
db 0
.MapCallbacks:
db 0
CinnabarPokeCenter2FBeta_MapEventHeader:
CinnabarPokecenter2FBeta_MapEventHeader:
; filler
db 0, 0

View File

@@ -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

Some files were not shown because too many files have changed in this diff Show More