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/SevenIsland_PokemonCenter_1F/scripts.inc
+6 -6
View File
@@ -1,27 +1,27 @@
SevenIsland_PokemonCenter_1F_MapScripts:: @ 8170B89
SevenIsland_PokemonCenter_1F_MapScripts::
map_script MAP_SCRIPT_ON_TRANSITION, SevenIsland_PokemonCenter_1F_OnTransition
map_script MAP_SCRIPT_ON_RESUME, CableClub_OnResume
.byte 0
SevenIsland_PokemonCenter_1F_OnTransition:: @ 8170B94
SevenIsland_PokemonCenter_1F_OnTransition::
setrespawn SPAWN_SEVEN_ISLAND
end
SevenIsland_PokemonCenter_1F_EventScript_Nurse:: @ 8170B98
SevenIsland_PokemonCenter_1F_EventScript_Nurse::
lock
faceplayer
call EventScript_PkmnCenterNurse
release
end
SevenIsland_PokemonCenter_1F_EventScript_OldMan:: @ 8170BA1
SevenIsland_PokemonCenter_1F_EventScript_OldMan::
msgbox SevenIsland_PokemonCenter_1F_Text_EventsDependingOnConnections, MSGBOX_NPC
end
SevenIsland_PokemonCenter_1F_EventScript_Sailor:: @ 8170BAA
SevenIsland_PokemonCenter_1F_EventScript_Sailor::
msgbox SevenIsland_PokemonCenter_1F_Text_DidYouRideSeagallopHere, MSGBOX_NPC
end
SevenIsland_PokemonCenter_1F_EventScript_Beauty:: @ 8170BB3
SevenIsland_PokemonCenter_1F_EventScript_Beauty::
msgbox SevenIsland_PokemonCenter_1F_Text_CheckOutTrainerTower, MSGBOX_NPC
end
data/maps/SevenIsland_PokemonCenter_1F/text.inc
+3 -3
View File
@@ -1,11 +1,11 @@
SevenIsland_PokemonCenter_1F_Text_EventsDependingOnConnections:: @ 81A0B98
SevenIsland_PokemonCenter_1F_Text_EventsDependingOnConnections::
.string "On this island, different events\n"
.string "occur depending on connections.\p"
.string "What are those connections?\p"
.string "They are for you to discover on\n"
.string "your own.$"
SevenIsland_PokemonCenter_1F_Text_DidYouRideSeagallopHere:: @ 81A0C1F
SevenIsland_PokemonCenter_1F_Text_DidYouRideSeagallopHere::
.string "Did you ride a SEAGALLOP ferry\n"
.string "to get here?\p"
.string "There are at least ten of those\n"
@@ -13,7 +13,7 @@ SevenIsland_PokemonCenter_1F_Text_DidYouRideSeagallopHere:: @ 81A0C1F
.string "I don't know where they all go,\n"
.string "though.$"
SevenIsland_PokemonCenter_1F_Text_CheckOutTrainerTower:: @ 81A0CA5
SevenIsland_PokemonCenter_1F_Text_CheckOutTrainerTower::
.string "If you're confident, you should\n"
.string "check out TRAINER TOWER.$"