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

This commit is contained in:
GriffinR
2022-08-10 13:48:30 -04:00
1146 changed files with 40526 additions and 38156 deletions
@@ -1,23 +1,23 @@
FiveIsland_PokemonCenter_1F_MapScripts:: @ 8171CF1
FiveIsland_PokemonCenter_1F_MapScripts::
map_script MAP_SCRIPT_ON_TRANSITION, FiveIsland_PokemonCenter_1F_OnTransition
map_script MAP_SCRIPT_ON_RESUME, CableClub_OnResume
.byte 0
FiveIsland_PokemonCenter_1F_OnTransition:: @ 8171CFC
FiveIsland_PokemonCenter_1F_OnTransition::
setrespawn SPAWN_FIVE_ISLAND
end
FiveIsland_PokemonCenter_1F_EventScript_Nurse:: @ 8171D00
FiveIsland_PokemonCenter_1F_EventScript_Nurse::
lock
faceplayer
call EventScript_PkmnCenterNurse
release
end
FiveIsland_PokemonCenter_1F_EventScript_Chef:: @ 8171D09
FiveIsland_PokemonCenter_1F_EventScript_Chef::
msgbox FiveIsland_PokemonCenter_1F_Text_OnMyWayToPrepareMeal, MSGBOX_NPC
end
FiveIsland_PokemonCenter_1F_EventScript_CooltrainerF:: @ 8171D12
FiveIsland_PokemonCenter_1F_EventScript_CooltrainerF::
msgbox FiveIsland_PokemonCenter_1F_Text_YoureOnQuestToCatchEveryMon, MSGBOX_NPC
end
@@ -1,8 +1,8 @@
FiveIsland_PokemonCenter_1F_Text_OnMyWayToPrepareMeal:: @ 81A3BBA
FiveIsland_PokemonCenter_1F_Text_OnMyWayToPrepareMeal::
.string "I'm on my way to prepare a meal\n"
.string "for a certain high-society person.$"
FiveIsland_PokemonCenter_1F_Text_YoureOnQuestToCatchEveryMon:: @ 81A3BFD
FiveIsland_PokemonCenter_1F_Text_YoureOnQuestToCatchEveryMon::
.string "You're on a quest to catch every\n"
.string "single kind of POKéMON?\p"
.string "…How incredible. Please tell me if\n"