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,27 +1,27 @@
LavenderTown_PokemonCenter_1F_MapScripts:: @ 816B0EF
LavenderTown_PokemonCenter_1F_MapScripts::
map_script MAP_SCRIPT_ON_TRANSITION, LavenderTown_PokemonCenter_1F_OnTransition
map_script MAP_SCRIPT_ON_RESUME, CableClub_OnResume
.byte 0
LavenderTown_PokemonCenter_1F_OnTransition:: @ 816B0FA
LavenderTown_PokemonCenter_1F_OnTransition::
setrespawn SPAWN_LAVENDER_TOWN
end
LavenderTown_PokemonCenter_1F_EventScript_Nurse:: @ 816B0FE
LavenderTown_PokemonCenter_1F_EventScript_Nurse::
lock
faceplayer
call EventScript_PkmnCenterNurse
release
end
LavenderTown_PokemonCenter_1F_EventScript_Gentleman:: @ 816B107
LavenderTown_PokemonCenter_1F_EventScript_Gentleman::
msgbox LavenderTown_PokemonCenter_1F_Text_RocketsDoAnythingForMoney, MSGBOX_NPC
end
LavenderTown_PokemonCenter_1F_EventScript_Lass:: @ 816B110
LavenderTown_PokemonCenter_1F_EventScript_Lass::
msgbox LavenderTown_PokemonCenter_1F_Text_CubonesMotherKilledByRockets, MSGBOX_NPC
end
LavenderTown_PokemonCenter_1F_EventScript_Youngster:: @ 816B119
LavenderTown_PokemonCenter_1F_EventScript_Youngster::
msgbox LavenderTown_PokemonCenter_1F_Text_PeoplePayForCuboneSkulls, MSGBOX_NPC
end
@@ -1,15 +1,15 @@
LavenderTown_PokemonCenter_1F_Text_RocketsDoAnythingForMoney:: @ 8193465
LavenderTown_PokemonCenter_1F_Text_RocketsDoAnythingForMoney::
.string "TEAM ROCKET will do anything for\n"
.string "the sake of money!\p"
.string "There is no job too dirty, no deed\n"
.string "too heinous, no crime too wicked!$"
LavenderTown_PokemonCenter_1F_Text_CubonesMotherKilledByRockets:: @ 81934DE
LavenderTown_PokemonCenter_1F_Text_CubonesMotherKilledByRockets::
.string "I saw CUBONE's mother trying to\n"
.string "escape from TEAM ROCKET.\p"
.string "She was killed trying to get away…$"
LavenderTown_PokemonCenter_1F_Text_PeoplePayForCuboneSkulls:: @ 819353A
LavenderTown_PokemonCenter_1F_Text_PeoplePayForCuboneSkulls::
.string "You know how the CUBONE species\n"
.string "wears skulls, right?\p"
.string "People will pay a lot for one.$"