pokehacks/pokecrystal-board
0
0
Fork 0
mirror of https://gitlab.com/xCrystal/pokecrystal-board.git synced 2025-09-08 08:13:02 -07:00
Code Issues Packages Projects Releases Wiki Activity

PokeCenter → Pokecenter (consistent with the POKECENTER map constants)

Browse Source
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
Download Patch File Download Diff File Expand all files Collapse all files

24
engine/pokecenter_pc.asm
View File

@@ -2,9 +2,9 @@ PokemonCenterPC: ; 1559a
call PC_CheckPartyForPokemon call PC_CheckPartyForPokemon
ret c ret c
call PC_PlayBootSound call PC_PlayBootSound
ld hl, PokeCenterPCText_BootedUpPC ld hl, PokecenterPCText_BootedUpPC
call PC_DisplayText call PC_DisplayText
ld hl, PokeCenterPCText_AccessWhosePC ld hl, PokecenterPCText_AccessWhosePC
call PC_DisplayTextWaitMenu call PC_DisplayTextWaitMenu
ld hl, .TopMenu ld hl, .TopMenu
call LoadMenuDataHeader call LoadMenuDataHeader
@@ -103,7 +103,7 @@ PC_CheckPartyForPokemon: ; 15650
BillsPC: ; 15668 BillsPC: ; 15668
call PC_PlayChoosePCSound call PC_PlayChoosePCSound
ld hl, PokeCenterPCText_AccessedBillsPC ld hl, PokecenterPCText_AccessedBillsPC
call PC_DisplayText call PC_DisplayText
callba _BillsPC callba _BillsPC
and a and a
@@ -112,7 +112,7 @@ BillsPC: ; 15668
PlayersPC: ; 15679 PlayersPC: ; 15679
call PC_PlayChoosePCSound call PC_PlayChoosePCSound
ld hl, PokeCenterPCText_AccessedOwnPC ld hl, PokecenterPCText_AccessedOwnPC
call PC_DisplayText call PC_DisplayText
ld b, $0 ld b, $0
call _PlayersPC call _PlayersPC
@@ -122,7 +122,7 @@ PlayersPC: ; 15679
OaksPC: ; 15689 OaksPC: ; 15689
call PC_PlayChoosePCSound call PC_PlayChoosePCSound
ld hl, PokeCenterPCText_AccessedOaksPC ld hl, PokecenterPCText_AccessedOaksPC
call PC_DisplayText call PC_DisplayText
callba ProfOaksPC callba ProfOaksPC
and a and a
@@ -139,7 +139,7 @@ HallOfFamePC: ; 1569a
; 156ab ; 156ab
TurnOffPC: ; 156ab TurnOffPC: ; 156ab
ld hl, PokeCenterPCText_LinkClosed ld hl, PokecenterPCText_LinkClosed
call PrintText call PrintText
scf scf
ret ret
@@ -641,37 +641,37 @@ PC_DisplayText: ; 15a20
ret ret
; 15a27 ; 15a27
PokeCenterPCText_BootedUpPC: ; 0x15a27 PokecenterPCText_BootedUpPC: ; 0x15a27
; turned on the PC. ; turned on the PC.
text_jump UnknownText_0x1c144d text_jump UnknownText_0x1c144d
db "@" db "@"
; 0x15a2c ; 0x15a2c
PokeCenterPCText_AccessWhosePC: ; 0x15a2c PokecenterPCText_AccessWhosePC: ; 0x15a2c
; Access whose PC? ; Access whose PC?
text_jump UnknownText_0x1c1462 text_jump UnknownText_0x1c1462
db "@" db "@"
; 0x15a31 ; 0x15a31
PokeCenterPCText_AccessedBillsPC: ; 0x15a31 PokecenterPCText_AccessedBillsPC: ; 0x15a31
; BILL's PC accessed. #MON Storage System opened. ; BILL's PC accessed. #MON Storage System opened.
text_jump UnknownText_0x1c1474 text_jump UnknownText_0x1c1474
db "@" db "@"
; 0x15a36 ; 0x15a36
PokeCenterPCText_AccessedOwnPC: ; 0x15a36 PokecenterPCText_AccessedOwnPC: ; 0x15a36
; Accessed own PC. Item Storage System opened. ; Accessed own PC. Item Storage System opened.
text_jump UnknownText_0x1c14a4 text_jump UnknownText_0x1c14a4
db "@" db "@"
; 0x15a3b ; 0x15a3b
PokeCenterPCText_AccessedOaksPC: ; 0x15a3b PokecenterPCText_AccessedOaksPC: ; 0x15a3b
; PROF.OAK's PC accessed. #DEX Rating System opened. ; PROF.OAK's PC accessed. #DEX Rating System opened.
text_jump UnknownText_0x1c14d2 text_jump UnknownText_0x1c14d2
db "@" db "@"
; 0x15a40 ; 0x15a40
PokeCenterPCText_LinkClosed: ; 0x15a40 PokecenterPCText_LinkClosed: ; 0x15a40
; … Link closed… ; … Link closed…
text_jump UnknownText_0x1c1505 text_jump UnknownText_0x1c1505
db "@" db "@"

10
engine/std_scripts.asm
View File

@@ -1,5 +1,5 @@
StdScripts:: StdScripts::
dba PokeCenterNurseScript dba PokecenterNurseScript
dba DifficultBookshelfScript dba DifficultBookshelfScript
dba PictureBookshelfScript dba PictureBookshelfScript
dba MagazineBookshelfScript dba MagazineBookshelfScript
@@ -15,7 +15,7 @@ StdScripts::
dba TrashCanScript dba TrashCanScript
dba StrengthBoulderScript dba StrengthBoulderScript
dba SmashRockScript dba SmashRockScript
dba PokeCenterSignScript dba PokecenterSignScript
dba MartSignScript dba MartSignScript
dba GoldenrodRocketsScript dba GoldenrodRocketsScript
dba RadioTowerRocketsScript dba RadioTowerRocketsScript
@@ -52,7 +52,7 @@ StdScripts::
dba GameCornerCoinVendorScript dba GameCornerCoinVendorScript
dba HappinessCheckScript dba HappinessCheckScript
PokeCenterNurseScript: PokecenterNurseScript:
; EVENT_WELCOMED_TO_POKECOM_CENTER is never set ; EVENT_WELCOMED_TO_POKECOM_CENTER is never set
opentext opentext
@@ -236,8 +236,8 @@ StrengthBoulderScript:
SmashRockScript: SmashRockScript:
farjump AskRockSmashScript farjump AskRockSmashScript
PokeCenterSignScript: PokecenterSignScript:
farjumptext PokeCenterSignText farjumptext PokecenterSignText
MartSignScript MartSignScript
farjumptext MartSignText farjumptext MartSignText

6
main.asm
View File

@@ -3118,17 +3118,17 @@ SetBoxmonOrEggmonCaughtData: ; 4db53
ld a, [MapNumber] ld a, [MapNumber]
ld c, a ld c, a
cp MAP_POKECENTER_2F cp MAP_POKECENTER_2F
jr nz, .NotPokeCenter2F jr nz, .NotPokecenter2F
ld a, b ld a, b
cp GROUP_POKECENTER_2F cp GROUP_POKECENTER_2F
jr nz, .NotPokeCenter2F jr nz, .NotPokecenter2F
ld a, [BackupMapGroup] ld a, [BackupMapGroup]
ld b, a ld b, a
ld a, [BackupMapNumber] ld a, [BackupMapNumber]
ld c, a ld c, a
.NotPokeCenter2F: .NotPokecenter2F:
call GetWorldMapLocation call GetWorldMapLocation
ld b, a ld b, a
ld a, [PlayerGender] ld a, [PlayerGender]

66
maps.asm
View File

@@ -74,7 +74,7 @@ SECTION "Map Scripts 4", ROMX
INCLUDE "maps/RadioTower5F.asm" INCLUDE "maps/RadioTower5F.asm"
INCLUDE "maps/OlivineLighthouse5F.asm" INCLUDE "maps/OlivineLighthouse5F.asm"
INCLUDE "maps/OlivineLighthouse6F.asm" INCLUDE "maps/OlivineLighthouse6F.asm"
INCLUDE "maps/GoldenrodPokeCenter1F.asm" INCLUDE "maps/GoldenrodPokecenter1F.asm"
INCLUDE "maps/GoldenrodPokeComCenter2FMobile.asm" INCLUDE "maps/GoldenrodPokeComCenter2FMobile.asm"
INCLUDE "maps/IlexForestAzaleaGate.asm" INCLUDE "maps/IlexForestAzaleaGate.asm"
INCLUDE "maps/Route34IlexForestGate.asm" INCLUDE "maps/Route34IlexForestGate.asm"
@@ -88,10 +88,10 @@ INCLUDE "maps/VioletMart.asm"
INCLUDE "maps/VioletGym.asm" INCLUDE "maps/VioletGym.asm"
INCLUDE "maps/EarlsPokemonAcademy.asm" INCLUDE "maps/EarlsPokemonAcademy.asm"
INCLUDE "maps/VioletNicknameSpeechHouse.asm" INCLUDE "maps/VioletNicknameSpeechHouse.asm"
INCLUDE "maps/VioletPokeCenter1F.asm" INCLUDE "maps/VioletPokecenter1F.asm"
INCLUDE "maps/VioletOnixTradeHouse.asm" INCLUDE "maps/VioletOnixTradeHouse.asm"
INCLUDE "maps/Route32RuinsOfAlphGate.asm" INCLUDE "maps/Route32RuinsOfAlphGate.asm"
INCLUDE "maps/Route32PokeCenter1F.asm" INCLUDE "maps/Route32Pokecenter1F.asm"
INCLUDE "maps/Route35GoldenrodGate.asm" INCLUDE "maps/Route35GoldenrodGate.asm"
INCLUDE "maps/Route35NationalParkGate.asm" INCLUDE "maps/Route35NationalParkGate.asm"
INCLUDE "maps/Route36RuinsOfAlphGate.asm" INCLUDE "maps/Route36RuinsOfAlphGate.asm"
@@ -123,8 +123,8 @@ INCLUDE "maps/CeladonMansion2F.asm"
INCLUDE "maps/CeladonMansion3F.asm" INCLUDE "maps/CeladonMansion3F.asm"
INCLUDE "maps/CeladonMansionRoof.asm" INCLUDE "maps/CeladonMansionRoof.asm"
INCLUDE "maps/CeladonMansionRoofHouse.asm" INCLUDE "maps/CeladonMansionRoofHouse.asm"
INCLUDE "maps/CeladonPokeCenter1F.asm" INCLUDE "maps/CeladonPokecenter1F.asm"
INCLUDE "maps/CeladonPokeCenter2FBeta.asm" INCLUDE "maps/CeladonPokecenter2FBeta.asm"
INCLUDE "maps/CeladonGameCorner.asm" INCLUDE "maps/CeladonGameCorner.asm"
INCLUDE "maps/CeladonGameCornerPrizeRoom.asm" INCLUDE "maps/CeladonGameCornerPrizeRoom.asm"
INCLUDE "maps/CeladonGym.asm" INCLUDE "maps/CeladonGym.asm"
@@ -189,8 +189,8 @@ INCLUDE "maps/IcePathB1F.asm"
INCLUDE "maps/IcePathB2FMahoganySide.asm" INCLUDE "maps/IcePathB2FMahoganySide.asm"
INCLUDE "maps/IcePathB2FBlackthornSide.asm" INCLUDE "maps/IcePathB2FBlackthornSide.asm"
INCLUDE "maps/IcePathB3F.asm" INCLUDE "maps/IcePathB3F.asm"
INCLUDE "maps/LavenderPokeCenter1F.asm" INCLUDE "maps/LavenderPokecenter1F.asm"
INCLUDE "maps/LavenderPokeCenter2FBeta.asm" INCLUDE "maps/LavenderPokecenter2FBeta.asm"
INCLUDE "maps/MrFujisHouse.asm" INCLUDE "maps/MrFujisHouse.asm"
INCLUDE "maps/LavenderTownSpeechHouse.asm" INCLUDE "maps/LavenderTownSpeechHouse.asm"
INCLUDE "maps/LavenderNameRater.asm" INCLUDE "maps/LavenderNameRater.asm"
@@ -205,7 +205,7 @@ SECTION "Map Scripts 11", ROMX
INCLUDE "maps/EcruteakHouse.asm" INCLUDE "maps/EcruteakHouse.asm"
INCLUDE "maps/WiseTriosRoom.asm" INCLUDE "maps/WiseTriosRoom.asm"
INCLUDE "maps/EcruteakPokeCenter1F.asm" INCLUDE "maps/EcruteakPokecenter1F.asm"
INCLUDE "maps/EcruteakLugiaSpeechHouse.asm" INCLUDE "maps/EcruteakLugiaSpeechHouse.asm"
INCLUDE "maps/DanceTheatre.asm" INCLUDE "maps/DanceTheatre.asm"
INCLUDE "maps/EcruteakMart.asm" INCLUDE "maps/EcruteakMart.asm"
@@ -216,8 +216,8 @@ INCLUDE "maps/ViridianNicknameSpeechHouse.asm"
INCLUDE "maps/TrainerHouse1F.asm" INCLUDE "maps/TrainerHouse1F.asm"
INCLUDE "maps/TrainerHouseB1F.asm" INCLUDE "maps/TrainerHouseB1F.asm"
INCLUDE "maps/ViridianMart.asm" INCLUDE "maps/ViridianMart.asm"
INCLUDE "maps/ViridianPokeCenter1F.asm" INCLUDE "maps/ViridianPokecenter1F.asm"
INCLUDE "maps/ViridianPokeCenter2FBeta.asm" INCLUDE "maps/ViridianPokecenter2FBeta.asm"
INCLUDE "maps/Route2NuggetSpeechHouse.asm" INCLUDE "maps/Route2NuggetSpeechHouse.asm"
INCLUDE "maps/Route2Gate.asm" INCLUDE "maps/Route2Gate.asm"
INCLUDE "maps/VictoryRoadGate.asm" INCLUDE "maps/VictoryRoadGate.asm"
@@ -225,7 +225,7 @@ INCLUDE "maps/VictoryRoadGate.asm"
SECTION "Map Scripts 12", ROMX SECTION "Map Scripts 12", ROMX
INCLUDE "maps/OlivinePokeCenter1F.asm" INCLUDE "maps/OlivinePokecenter1F.asm"
INCLUDE "maps/OlivineGym.asm" INCLUDE "maps/OlivineGym.asm"
INCLUDE "maps/OlivineTimsHouse.asm" INCLUDE "maps/OlivineTimsHouse.asm"
INCLUDE "maps/OlivineHouseBeta.asm" INCLUDE "maps/OlivineHouseBeta.asm"
@@ -238,7 +238,7 @@ INCLUDE "maps/Route39Barn.asm"
INCLUDE "maps/Route39Farmhouse.asm" INCLUDE "maps/Route39Farmhouse.asm"
INCLUDE "maps/ManiasHouse.asm" INCLUDE "maps/ManiasHouse.asm"
INCLUDE "maps/CianwoodGym.asm" INCLUDE "maps/CianwoodGym.asm"
INCLUDE "maps/CianwoodPokeCenter1F.asm" INCLUDE "maps/CianwoodPokecenter1F.asm"
INCLUDE "maps/CianwoodPharmacy.asm" INCLUDE "maps/CianwoodPharmacy.asm"
INCLUDE "maps/CianwoodCityPhotoStudio.asm" INCLUDE "maps/CianwoodCityPhotoStudio.asm"
INCLUDE "maps/CianwoodLugiaSpeechHouse.asm" INCLUDE "maps/CianwoodLugiaSpeechHouse.asm"
@@ -253,7 +253,7 @@ INCLUDE "maps/BattleTowerOutside.asm"
SECTION "Map Scripts 13", ROMX SECTION "Map Scripts 13", ROMX
INCLUDE "maps/IndigoPlateauPokeCenter1F.asm" INCLUDE "maps/IndigoPlateauPokecenter1F.asm"
INCLUDE "maps/WillsRoom.asm" INCLUDE "maps/WillsRoom.asm"
INCLUDE "maps/KogasRoom.asm" INCLUDE "maps/KogasRoom.asm"
INCLUDE "maps/BrunosRoom.asm" INCLUDE "maps/BrunosRoom.asm"
@@ -286,19 +286,19 @@ SECTION "Map Scripts 15", ROMX
INCLUDE "maps/CeruleanGymBadgeSpeechHouse.asm" INCLUDE "maps/CeruleanGymBadgeSpeechHouse.asm"
INCLUDE "maps/CeruleanPoliceStation.asm" INCLUDE "maps/CeruleanPoliceStation.asm"
INCLUDE "maps/CeruleanTradeSpeechHouse.asm" INCLUDE "maps/CeruleanTradeSpeechHouse.asm"
INCLUDE "maps/CeruleanPokeCenter1F.asm" INCLUDE "maps/CeruleanPokecenter1F.asm"
INCLUDE "maps/CeruleanPokeCenter2FBeta.asm" INCLUDE "maps/CeruleanPokecenter2FBeta.asm"
INCLUDE "maps/CeruleanGym.asm" INCLUDE "maps/CeruleanGym.asm"
INCLUDE "maps/CeruleanMart.asm" INCLUDE "maps/CeruleanMart.asm"
INCLUDE "maps/Route10PokeCenter1F.asm" INCLUDE "maps/Route10Pokecenter1F.asm"
INCLUDE "maps/Route10PokeCenter2FBeta.asm" INCLUDE "maps/Route10Pokecenter2FBeta.asm"
INCLUDE "maps/PowerPlant.asm" INCLUDE "maps/PowerPlant.asm"
INCLUDE "maps/BillsHouse.asm" INCLUDE "maps/BillsHouse.asm"
INCLUDE "maps/FightingDojo.asm" INCLUDE "maps/FightingDojo.asm"
INCLUDE "maps/SaffronGym.asm" INCLUDE "maps/SaffronGym.asm"
INCLUDE "maps/SaffronMart.asm" INCLUDE "maps/SaffronMart.asm"
INCLUDE "maps/SaffronPokeCenter1F.asm" INCLUDE "maps/SaffronPokecenter1F.asm"
INCLUDE "maps/SaffronPokeCenter2FBeta.asm" INCLUDE "maps/SaffronPokecenter2FBeta.asm"
INCLUDE "maps/MrPsychicsHouse.asm" INCLUDE "maps/MrPsychicsHouse.asm"
INCLUDE "maps/SaffronTrainStation.asm" INCLUDE "maps/SaffronTrainStation.asm"
INCLUDE "maps/SilphCo1F.asm" INCLUDE "maps/SilphCo1F.asm"
@@ -330,7 +330,7 @@ INCLUDE "maps/DragonsDen1F.asm"
INCLUDE "maps/DragonsDenB1F.asm" INCLUDE "maps/DragonsDenB1F.asm"
INCLUDE "maps/DragonShrine.asm" INCLUDE "maps/DragonShrine.asm"
INCLUDE "maps/TohjoFalls.asm" INCLUDE "maps/TohjoFalls.asm"
INCLUDE "maps/AzaleaPokeCenter1F.asm" INCLUDE "maps/AzaleaPokecenter1F.asm"
INCLUDE "maps/CharcoalKiln.asm" INCLUDE "maps/CharcoalKiln.asm"
INCLUDE "maps/AzaleaMart.asm" INCLUDE "maps/AzaleaMart.asm"
INCLUDE "maps/KurtsHouse.asm" INCLUDE "maps/KurtsHouse.asm"
@@ -342,8 +342,8 @@ SECTION "Map Scripts 17", ROMX
INCLUDE "maps/MahoganyTown.asm" INCLUDE "maps/MahoganyTown.asm"
INCLUDE "maps/Route32.asm" INCLUDE "maps/Route32.asm"
INCLUDE "maps/VermilionHouseFishingSpeechHouse.asm" INCLUDE "maps/VermilionHouseFishingSpeechHouse.asm"
INCLUDE "maps/VermilionPokeCenter1F.asm" INCLUDE "maps/VermilionPokecenter1F.asm"
INCLUDE "maps/VermilionPokeCenter2FBeta.asm" INCLUDE "maps/VermilionPokecenter2FBeta.asm"
INCLUDE "maps/PokemonFanClub.asm" INCLUDE "maps/PokemonFanClub.asm"
INCLUDE "maps/VermilionMagnetTrainSpeechHouse.asm" INCLUDE "maps/VermilionMagnetTrainSpeechHouse.asm"
INCLUDE "maps/VermilionMart.asm" INCLUDE "maps/VermilionMart.asm"
@@ -351,7 +351,7 @@ INCLUDE "maps/VermilionHouseDiglettsCaveSpeechHouse.asm"
INCLUDE "maps/VermilionGym.asm" INCLUDE "maps/VermilionGym.asm"
INCLUDE "maps/Route6SaffronGate.asm" INCLUDE "maps/Route6SaffronGate.asm"
INCLUDE "maps/Route6UndergroundEntrance.asm" INCLUDE "maps/Route6UndergroundEntrance.asm"
INCLUDE "maps/PokeCenter2F.asm" INCLUDE "maps/Pokecenter2F.asm"
INCLUDE "maps/TradeCenter.asm" INCLUDE "maps/TradeCenter.asm"
INCLUDE "maps/Colosseum.asm" INCLUDE "maps/Colosseum.asm"
INCLUDE "maps/TimeCapsule.asm" INCLUDE "maps/TimeCapsule.asm"
@@ -368,18 +368,18 @@ INCLUDE "maps/BlackthornGym2F.asm"
INCLUDE "maps/BlackthornDragonSpeechHouse.asm" INCLUDE "maps/BlackthornDragonSpeechHouse.asm"
INCLUDE "maps/BlackthornEmysHouse.asm" INCLUDE "maps/BlackthornEmysHouse.asm"
INCLUDE "maps/BlackthornMart.asm" INCLUDE "maps/BlackthornMart.asm"
INCLUDE "maps/BlackthornPokeCenter1F.asm" INCLUDE "maps/BlackthornPokecenter1F.asm"
INCLUDE "maps/MoveDeletersHouse.asm" INCLUDE "maps/MoveDeletersHouse.asm"
INCLUDE "maps/FuchsiaMart.asm" INCLUDE "maps/FuchsiaMart.asm"
INCLUDE "maps/SafariZoneMainOffice.asm" INCLUDE "maps/SafariZoneMainOffice.asm"
INCLUDE "maps/FuchsiaGym.asm" INCLUDE "maps/FuchsiaGym.asm"
INCLUDE "maps/FuchsiaBillSpeechHouse.asm" INCLUDE "maps/FuchsiaBillSpeechHouse.asm"
INCLUDE "maps/FuchsiaPokeCenter1F.asm" INCLUDE "maps/FuchsiaPokecenter1F.asm"
INCLUDE "maps/FuchsiaPokeCenter2FBeta.asm" INCLUDE "maps/FuchsiaPokecenter2FBeta.asm"
INCLUDE "maps/SafariZoneWardensHome.asm" INCLUDE "maps/SafariZoneWardensHome.asm"
INCLUDE "maps/Route15FuchsiaGate.asm" INCLUDE "maps/Route15FuchsiaGate.asm"
INCLUDE "maps/CherrygroveMart.asm" INCLUDE "maps/CherrygroveMart.asm"
INCLUDE "maps/CherrygrovePokeCenter1F.asm" INCLUDE "maps/CherrygrovePokecenter1F.asm"
INCLUDE "maps/CherrygroveGymSpeechHouse.asm" INCLUDE "maps/CherrygroveGymSpeechHouse.asm"
INCLUDE "maps/GuideGentsHouse.asm" INCLUDE "maps/GuideGentsHouse.asm"
INCLUDE "maps/CherrygroveEvolutionSpeechHouse.asm" INCLUDE "maps/CherrygroveEvolutionSpeechHouse.asm"
@@ -395,7 +395,7 @@ INCLUDE "maps/GoldenrodCity.asm"
INCLUDE "maps/SaffronCity.asm" INCLUDE "maps/SaffronCity.asm"
INCLUDE "maps/MahoganyRedGyaradosSpeechHouse.asm" INCLUDE "maps/MahoganyRedGyaradosSpeechHouse.asm"
INCLUDE "maps/MahoganyGym.asm" INCLUDE "maps/MahoganyGym.asm"
INCLUDE "maps/MahoganyPokeCenter1F.asm" INCLUDE "maps/MahoganyPokecenter1F.asm"
INCLUDE "maps/Route42EcruteakGate.asm" INCLUDE "maps/Route42EcruteakGate.asm"
INCLUDE "maps/LakeOfRageHiddenPowerHouse.asm" INCLUDE "maps/LakeOfRageHiddenPowerHouse.asm"
INCLUDE "maps/LakeOfRageMagikarpHouse.asm" INCLUDE "maps/LakeOfRageMagikarpHouse.asm"
@@ -429,8 +429,8 @@ INCLUDE "maps/Route13.asm"
INCLUDE "maps/PewterNidoranSpeechHouse.asm" INCLUDE "maps/PewterNidoranSpeechHouse.asm"
INCLUDE "maps/PewterGym.asm" INCLUDE "maps/PewterGym.asm"
INCLUDE "maps/PewterMart.asm" INCLUDE "maps/PewterMart.asm"
INCLUDE "maps/PewterPokeCenter1F.asm" INCLUDE "maps/PewterPokecenter1F.asm"
INCLUDE "maps/PewterPokeCenter2FBeta.asm" INCLUDE "maps/PewterPokecenter2FBeta.asm"
INCLUDE "maps/PewterSnoozeSpeechHouse.asm" INCLUDE "maps/PewterSnoozeSpeechHouse.asm"
@@ -460,8 +460,8 @@ INCLUDE "maps/CeladonCity.asm"
INCLUDE "maps/Route15.asm" INCLUDE "maps/Route15.asm"
INCLUDE "maps/VermilionCity.asm" INCLUDE "maps/VermilionCity.asm"
INCLUDE "maps/Route9.asm" INCLUDE "maps/Route9.asm"
INCLUDE "maps/CinnabarPokeCenter1F.asm" INCLUDE "maps/CinnabarPokecenter1F.asm"
INCLUDE "maps/CinnabarPokeCenter2FBeta.asm" INCLUDE "maps/CinnabarPokecenter2FBeta.asm"
INCLUDE "maps/Route19FuchsiaGate.asm" INCLUDE "maps/Route19FuchsiaGate.asm"
INCLUDE "maps/SeafoamGym.asm" INCLUDE "maps/SeafoamGym.asm"
@@ -488,7 +488,7 @@ INCLUDE "maps/Route3.asm"
INCLUDE "maps/Route4.asm" INCLUDE "maps/Route4.asm"
INCLUDE "maps/Route10South.asm" INCLUDE "maps/Route10South.asm"
INCLUDE "maps/Route23.asm" INCLUDE "maps/Route23.asm"
INCLUDE "maps/SilverCavePokeCenter1F.asm" INCLUDE "maps/SilverCavePokecenter1F.asm"
INCLUDE "maps/Route28FamousSpeechHouse.asm" INCLUDE "maps/Route28FamousSpeechHouse.asm"

34
maps/AzaleaPokeCenter1F.asm → maps/AzaleaPokecenter1F.asm
View File

@@ -4,7 +4,7 @@ const_value set 2
const AZALEAPOKECENTER1F_FISHING_GURU const AZALEAPOKECENTER1F_FISHING_GURU
const AZALEAPOKECENTER1F_POKEFAN_F const AZALEAPOKECENTER1F_POKEFAN_F
AzaleaPokeCenter1F_MapScriptHeader: AzaleaPokecenter1F_MapScriptHeader:
.MapTriggers: .MapTriggers:
db 1 db 1
maptrigger .DummyTrigger maptrigger .DummyTrigger
@@ -15,19 +15,19 @@ AzaleaPokeCenter1F_MapScriptHeader:
.DummyTrigger: .DummyTrigger:
end end
AzaleaPokeCenter1FNurseScript: AzaleaPokecenter1FNurseScript:
jumpstd pokecenternurse jumpstd pokecenternurse
AzaleaPokeCenter1FGentlemanScript: AzaleaPokecenter1FGentlemanScript:
jumptextfaceplayer AzaleaPokeCenter1FGentlemanText jumptextfaceplayer AzaleaPokecenter1FGentlemanText
AzaleaPokeCenter1FFishingGuruScript: AzaleaPokecenter1FFishingGuruScript:
jumptextfaceplayer AzaleaPokeCenter1FFishingGuruText jumptextfaceplayer AzaleaPokecenter1FFishingGuruText
AzaleaPokeCenter1FPokefanFScript: AzaleaPokecenter1FPokefanFScript:
jumptextfaceplayer AzaleaPokeCenter1FPokefanFText jumptextfaceplayer AzaleaPokecenter1FPokefanFText
AzaleaPokeCenter1FGentlemanText: AzaleaPokecenter1FGentlemanText:
text "Do your #MON" text "Do your #MON"
line "know HM moves?" line "know HM moves?"
@@ -38,7 +38,7 @@ AzaleaPokeCenter1FGentlemanText:
line "fainted." line "fainted."
done done
AzaleaPokeCenter1FUnusedText: AzaleaPokecenter1FUnusedText:
text "This BILL guy" text "This BILL guy"
line "created the system" line "created the system"
@@ -50,13 +50,13 @@ AzaleaPokeCenter1FUnusedText:
cont "#MON per BOX." cont "#MON per BOX."
done done
AzaleaPokeCenter1FFishingGuruText: AzaleaPokecenter1FFishingGuruText:
text "BILL's PC can" text "BILL's PC can"
line "store up to 20" line "store up to 20"
cont "#MON per BOX." cont "#MON per BOX."
done done
AzaleaPokeCenter1FPokefanFText: AzaleaPokecenter1FPokefanFText:
text "Do you know about" text "Do you know about"
line "APRICORNS?" line "APRICORNS?"
@@ -76,7 +76,7 @@ AzaleaPokeCenter1FPokefanFText:
line "APRICORNS." line "APRICORNS."
done done
AzaleaPokeCenter1F_MapEventHeader: AzaleaPokecenter1F_MapEventHeader:
; filler ; filler
db 0, 0 db 0, 0
@@ -94,7 +94,7 @@ AzaleaPokeCenter1F_MapEventHeader:
.PersonEvents: .PersonEvents:
db 4 db 4
person_event SPRITE_NURSE, 1, 3, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, 0, PERSONTYPE_SCRIPT, 0, AzaleaPokeCenter1FNurseScript, -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_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_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_POKEFAN_F, 4, 1, SPRITEMOVEDATA_WANDER, 2, 1, -1, -1, 0, PERSONTYPE_SCRIPT, 0, AzaleaPokecenter1FPokefanFScript, -1

4
maps/AzaleaTown.asm
View File

@@ -201,7 +201,7 @@ CharcoalKilnSign:
AzaleaTownIlextForestSign: AzaleaTownIlextForestSign:
jumptext AzaleaTownIlexForestSignText jumptext AzaleaTownIlexForestSignText
AzaleaTownPokeCenterSign: AzaleaTownPokecenterSign:
jumpstd pokecentersign jumpstd pokecentersign
AzaleaTownMartSign: AzaleaTownMartSign:
@@ -483,7 +483,7 @@ AzaleaTown_MapEventHeader:
signpost 15, 14, SIGNPOST_READ, AzaleaGymSign signpost 15, 14, SIGNPOST_READ, AzaleaGymSign
signpost 7, 29, SIGNPOST_READ, SlowpokeWellSign signpost 7, 29, SIGNPOST_READ, SlowpokeWellSign
signpost 13, 19, SIGNPOST_READ, CharcoalKilnSign 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 5, 22, SIGNPOST_READ, AzaleaTownMartSign
signpost 9, 3, SIGNPOST_READ, AzaleaTownIlextForestSign signpost 9, 3, SIGNPOST_READ, AzaleaTownIlextForestSign
signpost 6, 31, SIGNPOST_ITEM, AzaleaTownHiddenFullHeal signpost 6, 31, SIGNPOST_ITEM, AzaleaTownHiddenFullHeal

0
maps/BetaPokeCenterMainHouse.blk → maps/BetaPokecenterMainHouse.blk
View File

0
maps/BetaPokeCenterTradeStation.blk → maps/BetaPokecenterTradeStation.blk
View File

4
maps/BlackthornCity.asm
View File

@@ -138,7 +138,7 @@ DragonDensSign:
BlackthornCityTrainerTips: BlackthornCityTrainerTips:
jumptext BlackthornCityTrainerTipsText jumptext BlackthornCityTrainerTipsText
BlackthornCityPokeCenterSign: BlackthornCityPokecenterSign:
jumpstd pokecentersign jumpstd pokecentersign
BlackthornCityMartSign: BlackthornCityMartSign:
@@ -338,7 +338,7 @@ BlackthornCity_MapEventHeader:
signpost 3, 21, SIGNPOST_READ, DragonDensSign signpost 3, 21, SIGNPOST_READ, DragonDensSign
signpost 25, 5, SIGNPOST_READ, BlackthornCityTrainerTips signpost 25, 5, SIGNPOST_READ, BlackthornCityTrainerTips
signpost 29, 16, SIGNPOST_READ, BlackthornCityMartSign signpost 29, 16, SIGNPOST_READ, BlackthornCityMartSign
signpost 29, 22, SIGNPOST_READ, BlackthornCityPokeCenterSign signpost 29, 22, SIGNPOST_READ, BlackthornCityPokecenterSign
.PersonEvents: .PersonEvents:
db 9 db 9

4
maps/BlackthornPokeCenter1F.asm → maps/BlackthornPokecenter1F.asm
View File

@@ -4,7 +4,7 @@ const_value set 2
const BLACKTHORNPOKECENTER1F_TWIN const BLACKTHORNPOKECENTER1F_TWIN
const BLACKTHORNPOKECENTER1F_COOLTRAINER_M const BLACKTHORNPOKECENTER1F_COOLTRAINER_M
BlackthornPokeCenter1F_MapScriptHeader: BlackthornPokecenter1F_MapScriptHeader:
.MapTriggers: .MapTriggers:
db 0 db 0
@@ -49,7 +49,7 @@ UnknownText_0x195bfd:
cont "forget an HM move." cont "forget an HM move."
done done
BlackthornPokeCenter1F_MapEventHeader: BlackthornPokecenter1F_MapEventHeader:
; filler ; filler
db 0, 0 db 0, 0

4
maps/CeladonCity.asm
View File

@@ -71,7 +71,7 @@ CeladonCityGameCornerSign:
CeladonCityTrainerTips: CeladonCityTrainerTips:
jumptext CeladonCityTrainerTipsText jumptext CeladonCityTrainerTipsText
CeladonCityPokeCenterSign: CeladonCityPokecenterSign:
jumpstd pokecentersign jumpstd pokecentersign
CeladonCityHiddenPpUp: CeladonCityHiddenPpUp:
@@ -261,7 +261,7 @@ CeladonCity_MapEventHeader:
signpost 9, 13, SIGNPOST_READ, CeladonCityMansionSign signpost 9, 13, SIGNPOST_READ, CeladonCityMansionSign
signpost 21, 19, SIGNPOST_READ, CeladonCityGameCornerSign signpost 21, 19, SIGNPOST_READ, CeladonCityGameCornerSign
signpost 21, 29, SIGNPOST_READ, CeladonCityTrainerTips signpost 21, 29, SIGNPOST_READ, CeladonCityTrainerTips
signpost 9, 30, SIGNPOST_READ, CeladonCityPokeCenterSign signpost 9, 30, SIGNPOST_READ, CeladonCityPokecenterSign
signpost 21, 37, SIGNPOST_ITEM, CeladonCityHiddenPpUp signpost 21, 37, SIGNPOST_ITEM, CeladonCityHiddenPpUp
.PersonEvents: .PersonEvents:

4
maps/CeladonPokeCenter1F.asm → maps/CeladonPokecenter1F.asm
View File

@@ -5,7 +5,7 @@ const_value set 2
const CELADONPOKECENTER1F_COOLTRAINER_F const CELADONPOKECENTER1F_COOLTRAINER_F
const CELADONPOKECENTER1F_EUSINE const CELADONPOKECENTER1F_EUSINE
CeladonPokeCenter1F_MapScriptHeader: CeladonPokecenter1F_MapScriptHeader:
.MapTriggers: .MapTriggers:
db 0 db 0
@@ -145,7 +145,7 @@ NoBeastsText:
line "you, <PLAYER>!" line "you, <PLAYER>!"
done done
CeladonPokeCenter1F_MapEventHeader: CeladonPokecenter1F_MapEventHeader:
; filler ; filler
db 0, 0 db 0, 0

4
maps/CeladonPokeCenter2FBeta.asm → maps/CeladonPokecenter2FBeta.asm
View File

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

4
maps/CeruleanCity.asm
View File

@@ -140,7 +140,7 @@ CeruleanCapeSign:
CeruleanLockedDoor: CeruleanLockedDoor:
jumptext CeruleanLockedDoorText jumptext CeruleanLockedDoorText
CeruleanCityPokeCenterSign: CeruleanCityPokecenterSign:
jumpstd pokecentersign jumpstd pokecentersign
CeruleanCityMartSign: CeruleanCityMartSign:
@@ -299,7 +299,7 @@ CeruleanCity_MapEventHeader:
signpost 17, 25, SIGNPOST_READ, CeruleanPoliceSign signpost 17, 25, SIGNPOST_READ, CeruleanPoliceSign
signpost 7, 23, SIGNPOST_READ, CeruleanCapeSign signpost 7, 23, SIGNPOST_READ, CeruleanCapeSign
signpost 29, 14, SIGNPOST_READ, CeruleanLockedDoor 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 29, 26, SIGNPOST_READ, CeruleanCityMartSign
signpost 12, 2, SIGNPOST_ITEM, CeruleanCityHiddenBerserkGene signpost 12, 2, SIGNPOST_ITEM, CeruleanCityHiddenBerserkGene

4
maps/CeruleanPokeCenter1F.asm → maps/CeruleanPokecenter1F.asm
View File

@@ -3,7 +3,7 @@ const_value set 2
const CERULEANPOKECENTER1F_SUPER_NERD const CERULEANPOKECENTER1F_SUPER_NERD
const CERULEANPOKECENTER1F_GYM_GUY const CERULEANPOKECENTER1F_GYM_GUY
CeruleanPokeCenter1F_MapScriptHeader: CeruleanPokecenter1F_MapScriptHeader:
.MapTriggers: .MapTriggers:
db 0 db 0
@@ -62,7 +62,7 @@ UnknownText_0x1882ff:
line "JOHTO accessible." line "JOHTO accessible."
done done
CeruleanPokeCenter1F_MapEventHeader: CeruleanPokecenter1F_MapEventHeader:
; filler ; filler
db 0, 0 db 0, 0

4
maps/CeruleanPokeCenter2FBeta.asm → maps/CeruleanPokecenter2FBeta.asm
View File

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

8
maps/CherrygroveCity.asm
View File

@@ -40,7 +40,7 @@ CherrygroveCityGuideGent:
follow CHERRYGROVECITY_GRAMPS, PLAYER follow CHERRYGROVECITY_GRAMPS, PLAYER
applymovement CHERRYGROVECITY_GRAMPS, GuideGentMovement1 applymovement CHERRYGROVECITY_GRAMPS, GuideGentMovement1
opentext opentext
writetext GuideGentPokeCenterText writetext GuideGentPokecenterText
waitbutton waitbutton
closetext closetext
applymovement CHERRYGROVECITY_GRAMPS, GuideGentMovement2 applymovement CHERRYGROVECITY_GRAMPS, GuideGentMovement2
@@ -231,7 +231,7 @@ CherrygroveCitySign:
GuideGentsHouseSign: GuideGentsHouseSign:
jumptext GuideGentsHouseSignText jumptext GuideGentsHouseSignText
CherrygroveCityPokeCenterSign: CherrygroveCityPokecenterSign:
jumpstd pokecentersign jumpstd pokecentersign
CherrygroveCityMartSign: CherrygroveCityMartSign:
@@ -354,7 +354,7 @@ GuideGentTourText1:
line "Follow me!" line "Follow me!"
done done
GuideGentPokeCenterText: GuideGentPokecenterText:
text "This is a #MON" text "This is a #MON"
line "CENTER. They heal" line "CENTER. They heal"
@@ -568,7 +568,7 @@ CherrygroveCity_MapEventHeader:
signpost 8, 30, SIGNPOST_READ, CherrygroveCitySign signpost 8, 30, SIGNPOST_READ, CherrygroveCitySign
signpost 9, 23, SIGNPOST_READ, GuideGentsHouseSign signpost 9, 23, SIGNPOST_READ, GuideGentsHouseSign
signpost 3, 24, SIGNPOST_READ, CherrygroveCityMartSign signpost 3, 24, SIGNPOST_READ, CherrygroveCityMartSign
signpost 3, 30, SIGNPOST_READ, CherrygroveCityPokeCenterSign signpost 3, 30, SIGNPOST_READ, CherrygroveCityPokecenterSign
.PersonEvents: .PersonEvents:
db 5 db 5

4
maps/CherrygrovePokeCenter1F.asm → maps/CherrygrovePokecenter1F.asm
View File

@@ -4,7 +4,7 @@ const_value set 2
const CHERRYGROVEPOKECENTER1F_GENTLEMAN const CHERRYGROVEPOKECENTER1F_GENTLEMAN
const CHERRYGROVEPOKECENTER1F_TEACHER const CHERRYGROVEPOKECENTER1F_TEACHER
CherrygrovePokeCenter1F_MapScriptHeader: CherrygrovePokecenter1F_MapScriptHeader:
.MapTriggers: .MapTriggers:
db 0 db 0
@@ -68,7 +68,7 @@ UnknownText_0x196a46:
line "there already!" line "there already!"
done done
CherrygrovePokeCenter1F_MapEventHeader: CherrygrovePokecenter1F_MapEventHeader:
; filler ; filler
db 0, 0 db 0, 0

4
maps/CianwoodCity.asm
View File

@@ -138,7 +138,7 @@ CianwoodPhotoStudioSign:
CianwoodPokeSeerSign: CianwoodPokeSeerSign:
jumptext CianwoodPokeSeerSignText jumptext CianwoodPokeSeerSignText
CianwoodPokeCenterSign: CianwoodPokecenterSign:
jumpstd pokecentersign jumpstd pokecentersign
CianwoodCityRock: CianwoodCityRock:
@@ -402,7 +402,7 @@ CianwoodCity_MapEventHeader:
db 8 db 8
signpost 34, 20, SIGNPOST_READ, CianwoodCitySign signpost 34, 20, SIGNPOST_READ, CianwoodCitySign
signpost 45, 7, SIGNPOST_READ, CianwoodGymSign 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 47, 19, SIGNPOST_READ, CianwoodPharmacySign
signpost 32, 8, SIGNPOST_READ, CianwoodPhotoStudioSign signpost 32, 8, SIGNPOST_READ, CianwoodPhotoStudioSign
signpost 24, 8, SIGNPOST_READ, CianwoodPokeSeerSign signpost 24, 8, SIGNPOST_READ, CianwoodPokeSeerSign

4
maps/CianwoodPokeCenter1F.asm → maps/CianwoodPokecenter1F.asm
View File

@@ -4,7 +4,7 @@ const_value set 2
const CIANWOODPOKECENTER1F_GYM_GUY const CIANWOODPOKECENTER1F_GYM_GUY
const CIANWOODPOKECENTER1F_SUPER_NERD const CIANWOODPOKECENTER1F_SUPER_NERD
CianwoodPokeCenter1F_MapScriptHeader: CianwoodPokecenter1F_MapScriptHeader:
.MapTriggers: .MapTriggers:
db 0 db 0
@@ -131,7 +131,7 @@ UnknownText_0x9ded7:
line "off my #MON!" line "off my #MON!"
done done
CianwoodPokeCenter1F_MapEventHeader: CianwoodPokecenter1F_MapEventHeader:
; filler ; filler
db 0, 0 db 0, 0

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