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,35 +1,35 @@
.equ REQUIRED_OWNED_MONS, 20
Route10_PokemonCenter_1F_MapScripts:: @ 816FC2F
Route10_PokemonCenter_1F_MapScripts::
map_script MAP_SCRIPT_ON_TRANSITION, Route10_PokemonCenter_1F_OnTransition
map_script MAP_SCRIPT_ON_RESUME, CableClub_OnResume
.byte 0
Route10_PokemonCenter_1F_OnTransition:: @ 816FC3A
Route10_PokemonCenter_1F_OnTransition::
setworldmapflag FLAG_WORLD_MAP_ROUTE10_POKEMON_CENTER_1F
setrespawn SPAWN_ROUTE10
end
Route10_PokemonCenter_1F_EventScript_Nurse:: @ 816FC41
Route10_PokemonCenter_1F_EventScript_Nurse::
lock
faceplayer
call EventScript_PkmnCenterNurse
release
end
Route10_PokemonCenter_1F_EventScript_FatMan:: @ 816FC4A
Route10_PokemonCenter_1F_EventScript_FatMan::
msgbox Route10_PokemonCenter_1F_Text_NuggetUselessSoldFor5000, MSGBOX_NPC
end
Route10_PokemonCenter_1F_EventScript_Gentleman:: @ 816FC53
Route10_PokemonCenter_1F_EventScript_Gentleman::
msgbox Route10_PokemonCenter_1F_Text_EveryTypeStrongerThanOthers, MSGBOX_NPC
end
Route10_PokemonCenter_1F_EventScript_Youngster:: @ 816FC5C
Route10_PokemonCenter_1F_EventScript_Youngster::
msgbox Route10_PokemonCenter_1F_Text_HeardGhostsHauntLavender, MSGBOX_NPC
end
Route10_PokemonCenter_1F_EventScript_Aide:: @ 816FC65
Route10_PokemonCenter_1F_EventScript_Aide::
lock
faceplayer
call Route10_PokemonCenter_1F_EventScript_GetAideRequestInfo
@@ -53,12 +53,12 @@ Route10_PokemonCenter_1F_EventScript_Aide:: @ 816FC65
release
end
Route10_PokemonCenter_1F_EventScript_AlreadyGotEverstone:: @ 816FCE7
Route10_PokemonCenter_1F_EventScript_AlreadyGotEverstone::
msgbox Route10_PokemonCenter_1F_Text_ExplainEverstone
release
end
Route10_PokemonCenter_1F_EventScript_GetAideRequestInfo:: @ 816FCF1
Route10_PokemonCenter_1F_EventScript_GetAideRequestInfo::
getnumberstring 0, REQUIRED_OWNED_MONS
getitemname 1, ITEM_EVERSTONE
return
+7 -7
View File
@@ -1,18 +1,18 @@
Route10_PokemonCenter_1F_Text_EveryTypeStrongerThanOthers:: @ 819E523
Route10_PokemonCenter_1F_Text_EveryTypeStrongerThanOthers::
.string "The types of POKéMON match up\n"
.string "differently with each other.\p"
.string "Every type is stronger than some\n"
.string "types and weaker than others.$"
Route10_PokemonCenter_1F_Text_NuggetUselessSoldFor5000:: @ 819E59D
Route10_PokemonCenter_1F_Text_NuggetUselessSoldFor5000::
.string "A NUGGET is totally useless.\n"
.string "So I sold it for ¥5000.$"
Route10_PokemonCenter_1F_Text_HeardGhostsHauntLavender:: @ 819E5D2
Route10_PokemonCenter_1F_Text_HeardGhostsHauntLavender::
.string "I heard that ghosts haunt\n"
.string "LAVENDER TOWN.$"
Route10_PokemonCenter_1F_Text_GiveEverstoneIfCaught20Mons:: @ 819E5FB
Route10_PokemonCenter_1F_Text_GiveEverstoneIfCaught20Mons::
.string "Oh… {PLAYER}!\n"
.string "I've been looking for you!\p"
.string "It's me, one of the ever-present\n"
@@ -26,17 +26,17 @@ Route10_PokemonCenter_1F_Text_GiveEverstoneIfCaught20Mons:: @ 819E5FB
.string "Have you gathered data on at least\n"
.string "twenty kinds of POKéMON?$"
Route10_PokemonCenter_1F_Text_GreatHereYouGo:: @ 819E733
Route10_PokemonCenter_1F_Text_GreatHereYouGo::
.string "Great! You have caught or owned\n"
.string "{STR_VAR_3} kinds of POKéMON!\p"
.string "Congratulations!\n"
.string "Here you go!$"
Route10_PokemonCenter_1F_Text_ReceivedEverstoneFromAide:: @ 819E786
Route10_PokemonCenter_1F_Text_ReceivedEverstoneFromAide::
.string "{PLAYER} received the EVERSTONE\n"
.string "from the AIDE.$"
Route10_PokemonCenter_1F_Text_ExplainEverstone:: @ 819E7AF
Route10_PokemonCenter_1F_Text_ExplainEverstone::
.string "Making POKéMON evolve certainly\n"
.string "can add to the POKéDEX.\p"
.string "However, at times, you may not\n"