dionmoustos/Pokemon-Firered
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'master' of https://github.com/GriffinRichards/pokefirered into clone-union

Browse Source
This commit is contained in:
GriffinR
2022-08-10 13:48:30 -04:00
parent 23d7c00c62 d6d5290099
commit 2b93687ade
1146 changed files with 40526 additions and 38156 deletions
Download Patch File Download Diff File Expand all files Collapse all files
data/maps/CeladonCity_PokemonCenter_1F/scripts.inc
+6 -6
View File
@@ -1,27 +1,27 @@
CeladonCity_PokemonCenter_1F_MapScripts:: @ 816C5EC
CeladonCity_PokemonCenter_1F_MapScripts::
map_script MAP_SCRIPT_ON_TRANSITION, CeladonCity_PokemonCenter_1F_OnTransition
map_script MAP_SCRIPT_ON_RESUME, CableClub_OnResume
.byte 0
CeladonCity_PokemonCenter_1F_OnTransition:: @ 816C5F7
CeladonCity_PokemonCenter_1F_OnTransition::
setrespawn SPAWN_CELADON_CITY
end
CeladonCity_PokemonCenter_1F_EventScript_Nurse:: @ 816C5FB
CeladonCity_PokemonCenter_1F_EventScript_Nurse::
lock
faceplayer
call EventScript_PkmnCenterNurse
release
end
CeladonCity_PokemonCenter_1F_EventScript_Gentleman:: @ 816C604
CeladonCity_PokemonCenter_1F_EventScript_Gentleman::
msgbox CeladonCity_PokemonCenter_1F_Text_PokeFluteAwakensSleepingMons, MSGBOX_NPC
end
CeladonCity_PokemonCenter_1F_EventScript_CooltrainerF:: @ 816C60D
CeladonCity_PokemonCenter_1F_EventScript_CooltrainerF::
msgbox CeladonCity_PokemonCenter_1F_Text_RodeHereFromFuchsia, MSGBOX_NPC
end
CeladonCity_PokemonCenter_1F_EventScript_Youngster:: @ 816C616
CeladonCity_PokemonCenter_1F_EventScript_Youngster::
msgbox CeladonCity_PokemonCenter_1F_Text_GoToCyclingRoadIfIHadBike, MSGBOX_NPC
end
data/maps/CeladonCity_PokemonCenter_1F/text.inc
+3 -3
View File
@@ -1,15 +1,15 @@
CeladonCity_PokemonCenter_1F_Text_PokeFluteAwakensSleepingMons:: @ 819685B
CeladonCity_PokemonCenter_1F_Text_PokeFluteAwakensSleepingMons::
.string "A POKé FLUTE awakens sleeping\n"
.string "POKéMON. You know that.\p"
.string "It does so with a sound that only\n"
.string "they can hear.$"
CeladonCity_PokemonCenter_1F_Text_RodeHereFromFuchsia:: @ 81968C2
CeladonCity_PokemonCenter_1F_Text_RodeHereFromFuchsia::
.string "I rode here from FUCHSIA.\p"
.string "It's an uphill ride on CYCLING\n"
.string "ROAD, so I'm exhausted.$"
CeladonCity_PokemonCenter_1F_Text_GoToCyclingRoadIfIHadBike:: @ 8196913
CeladonCity_PokemonCenter_1F_Text_GoToCyclingRoadIfIHadBike::
.string "If I had a BIKE, I would go to\n"
.string "CYCLING ROAD!$"