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/SaffronCity_PokemonCenter_1F/scripts.inc
+7 -7
View File
@@ -1,28 +1,28 @@
SaffronCity_PokemonCenter_1F_MapScripts:: @ 816EFEC
SaffronCity_PokemonCenter_1F_MapScripts::
map_script MAP_SCRIPT_ON_TRANSITION, SaffronCity_PokemonCenter_1F_OnTransition
map_script MAP_SCRIPT_ON_RESUME, CableClub_OnResume
.byte 0
SaffronCity_PokemonCenter_1F_OnTransition:: @ 816EFF7
SaffronCity_PokemonCenter_1F_OnTransition::
setrespawn SPAWN_SAFFRON_CITY
end
SaffronCity_PokemonCenter_1F_EventScript_Nurse:: @ 816EFFB
SaffronCity_PokemonCenter_1F_EventScript_Nurse::
lock
faceplayer
call EventScript_PkmnCenterNurse
release
end
SaffronCity_PokemonCenter_1F_EventScript_Gentleman:: @ 816F004
SaffronCity_PokemonCenter_1F_EventScript_Gentleman::
msgbox SaffronCity_PokemonCenter_1F_Text_SilphCoVictimOfFame, MSGBOX_NPC
end
SaffronCity_PokemonCenter_1F_EventScript_Woman:: @ 816F00D
SaffronCity_PokemonCenter_1F_EventScript_Woman::
msgbox SaffronCity_PokemonCenter_1F_Text_GrowthRatesDifferBySpecies, MSGBOX_NPC
end
SaffronCity_PokemonCenter_1F_EventScript_Youngster:: @ 816F016
SaffronCity_PokemonCenter_1F_EventScript_Youngster::
lock
faceplayer
compare VAR_MAP_SCENE_SILPH_CO_11F, 1
@@ -31,7 +31,7 @@ SaffronCity_PokemonCenter_1F_EventScript_Youngster:: @ 816F016
release
end
SaffronCity_PokemonCenter_1F_EventScript_YoungsterRocketsGone:: @ 816F02D
SaffronCity_PokemonCenter_1F_EventScript_YoungsterRocketsGone::
msgbox SaffronCity_PokemonCenter_1F_Text_TeamRocketTookOff
release
end
data/maps/SaffronCity_PokemonCenter_1F/text.inc
+4 -4
View File
@@ -1,19 +1,19 @@
SaffronCity_PokemonCenter_1F_Text_GrowthRatesDifferBySpecies:: @ 819C023
SaffronCity_PokemonCenter_1F_Text_GrowthRatesDifferBySpecies::
.string "POKéMON growth rates differ from\n"
.string "species to species.$"
SaffronCity_PokemonCenter_1F_Text_SilphCoVictimOfFame:: @ 819C058
SaffronCity_PokemonCenter_1F_Text_SilphCoVictimOfFame::
.string "SILPH CO. is widely known to all.\p"
.string "It's a victim of its own fame - it\n"
.string "attracted TEAM ROCKET.$"
SaffronCity_PokemonCenter_1F_Text_GreatIfEliteFourCameBeatRockets:: @ 819C0B4
SaffronCity_PokemonCenter_1F_Text_GreatIfEliteFourCameBeatRockets::
.string "Sigh…\n"
.string "Wouldn't this be great?\p"
.string "If the ELITE FOUR came and\n"
.string "stomped TEAM ROCKET?$"
SaffronCity_PokemonCenter_1F_Text_TeamRocketTookOff:: @ 819C102
SaffronCity_PokemonCenter_1F_Text_TeamRocketTookOff::
.string "TEAM ROCKET took off!\n"
.string "We can go out safely again!\l"
.string "That's great!$"