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/VermilionCity_PokemonCenter_1F/scripts.inc
+6 -6
View File
@@ -1,27 +1,27 @@
VermilionCity_PokemonCenter_1F_MapScripts:: @ 816B424
VermilionCity_PokemonCenter_1F_MapScripts::
map_script MAP_SCRIPT_ON_TRANSITION, VermilionCity_PokemonCenter_1F_OnTransition
map_script MAP_SCRIPT_ON_RESUME, CableClub_OnResume
.byte 0
VermilionCity_PokemonCenter_1F_OnTransition:: @ 816B42F
VermilionCity_PokemonCenter_1F_OnTransition::
setrespawn SPAWN_VERMILION_CITY
end
VermilionCity_PokemonCenter_1F_EventScript_Nurse:: @ 816B433
VermilionCity_PokemonCenter_1F_EventScript_Nurse::
lock
faceplayer
call EventScript_PkmnCenterNurse
release
end
VermilionCity_PokemonCenter_1F_EventScript_Man:: @ 816B43C
VermilionCity_PokemonCenter_1F_EventScript_Man::
msgbox VermilionCity_PokemonCenter_1F_Text_PoisonedMonFaintedWhileWalking, MSGBOX_NPC
end
VermilionCity_PokemonCenter_1F_EventScript_Hiker:: @ 816B445
VermilionCity_PokemonCenter_1F_EventScript_Hiker::
msgbox VermilionCity_PokemonCenter_1F_Text_TrainerMonsStrongerThanWild, MSGBOX_NPC
end
VermilionCity_PokemonCenter_1F_EventScript_Youngster:: @ 816B44E
VermilionCity_PokemonCenter_1F_EventScript_Youngster::
msgbox VermilionCity_PokemonCenter_1F_Text_AllMonWeakToSpecificTypes, MSGBOX_NPC
end
data/maps/VermilionCity_PokemonCenter_1F/text.inc
+6 -6
View File
@@ -1,15 +1,15 @@
VermilionCity_PokemonCenter_1F_Text_TrainerMonsStrongerThanWild:: @ 81940AF
VermilionCity_PokemonCenter_1F_Text_TrainerMonsStrongerThanWild::
.string "Even if they are the same level,\n"
.string "POKéMON can have very different\l"
.string "stats and abilities.\p"
.string "A POKéMON raised by a TRAINER is\n"
.string "stronger than one in the wild.$"
VermilionCity_PokemonCenter_1F_Text_PoisonedMonFaintedWhileWalking:: @ 8194145
VermilionCity_PokemonCenter_1F_Text_PoisonedMonFaintedWhileWalking::
.string "My POKéMON was poisoned!\n"
.string "It fainted while we were walking!$"
VermilionCity_PokemonCenter_1F_Text_AllMonWeakToSpecificTypes:: @ 8194180
VermilionCity_PokemonCenter_1F_Text_AllMonWeakToSpecificTypes::
.string "It is true that a higher-level\n"
.string "POKéMON will be more powerful…\p"
.string "But, all POKéMON will have weak\n"
@@ -17,7 +17,7 @@ VermilionCity_PokemonCenter_1F_Text_AllMonWeakToSpecificTypes:: @ 8194180
.string "So, there appears to be no\n"
.string "universally strong POKéMON.$"
VermilionCity_PokemonCenter_1F_Text_UrgeToBattleSomeoneAgain:: @ 8194234
VermilionCity_PokemonCenter_1F_Text_UrgeToBattleSomeoneAgain::
.string "The urge to battle with someone\n"
.string "you've tangled with before…\p"
.string "Have you ever had that urge?\n"
@@ -27,13 +27,13 @@ VermilionCity_PokemonCenter_1F_Text_UrgeToBattleSomeoneAgain:: @ 8194234
.string "So, I've been giving these away.\n"
.string "Please, take one!$"
VermilionCity_PokemonCenter_1F_Text_UseDeviceForRematches:: @ 819430F
VermilionCity_PokemonCenter_1F_Text_UseDeviceForRematches::
.string "Use that device and you'll find\n"
.string "TRAINERS looking for a rematch.\p"
.string "You have to charge its battery to\n"
.string "use it, though.$"
VermilionCity_PokemonCenter_1F_Text_ExplainVSSeeker:: @ 8194381
VermilionCity_PokemonCenter_1F_Text_ExplainVSSeeker::
.string "How do you use the VS SEEKER?\n"
.string "There's nothing to it.\p"
.string "Use it like beep-beep-beep, and\n"