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/ThreeIsland_PokemonCenter_1F/scripts.inc
+6 -6
View File
@@ -1,27 +1,27 @@
ThreeIsland_PokemonCenter_1F_MapScripts:: @ 8171832
ThreeIsland_PokemonCenter_1F_MapScripts::
map_script MAP_SCRIPT_ON_TRANSITION, ThreeIsland_PokemonCenter_1F_OnTransition
map_script MAP_SCRIPT_ON_RESUME, CableClub_OnResume
.byte 0
ThreeIsland_PokemonCenter_1F_OnTransition:: @ 817183D
ThreeIsland_PokemonCenter_1F_OnTransition::
setrespawn SPAWN_THREE_ISLAND
end
ThreeIsland_PokemonCenter_1F_EventScript_Nurse:: @ 8171841
ThreeIsland_PokemonCenter_1F_EventScript_Nurse::
lock
faceplayer
call EventScript_PkmnCenterNurse
release
end
ThreeIsland_PokemonCenter_1F_EventScript_Sailor:: @ 817184A
ThreeIsland_PokemonCenter_1F_EventScript_Sailor::
msgbox ThreeIsland_PokemonCenter_1F_Text_ImpossibleToSurfBetweenIslands, MSGBOX_NPC
end
ThreeIsland_PokemonCenter_1F_EventScript_Lass:: @ 8171853
ThreeIsland_PokemonCenter_1F_EventScript_Lass::
msgbox ThreeIsland_PokemonCenter_1F_Text_AlwaysBerriesInBerryForest, MSGBOX_NPC
end
ThreeIsland_PokemonCenter_1F_EventScript_Rocker:: @ 817185C
ThreeIsland_PokemonCenter_1F_EventScript_Rocker::
msgbox ThreeIsland_PokemonCenter_1F_Text_PCNetworkCanLinkWithKanto, MSGBOX_NPC
end
data/maps/ThreeIsland_PokemonCenter_1F/text.inc
+3 -3
View File
@@ -1,17 +1,17 @@
ThreeIsland_PokemonCenter_1F_Text_PCNetworkCanLinkWithKanto:: @ 81A2FB5
ThreeIsland_PokemonCenter_1F_Text_PCNetworkCanLinkWithKanto::
.string "Hey, did you hear the news?\p"
.string "The PC network here can now link\n"
.string "with PCs in KANTO.\p"
.string "I don't know how that came about,\n"
.string "but it's fantastic!$"
ThreeIsland_PokemonCenter_1F_Text_ImpossibleToSurfBetweenIslands:: @ 81A303B
ThreeIsland_PokemonCenter_1F_Text_ImpossibleToSurfBetweenIslands::
.string "It's impossible to SURF between the\n"
.string "islands around these parts.\p"
.string "The tides are too fast and\n"
.string "treacherous.$"
ThreeIsland_PokemonCenter_1F_Text_AlwaysBerriesInBerryForest:: @ 81A30A3
ThreeIsland_PokemonCenter_1F_Text_AlwaysBerriesInBerryForest::
.string "Let's crush BERRIES!\n"
.string "…That'd be wasting BERRIES?\p"
.string "You can always find some BERRIES\n"