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/CinnabarIsland_PokemonLab_ResearchRoom/scripts.inc
+5 -5
View File
@@ -1,18 +1,18 @@
CinnabarIsland_PokemonLab_ResearchRoom_MapScripts:: @ 816E3DE
CinnabarIsland_PokemonLab_ResearchRoom_MapScripts::
.byte 0
CinnabarIsland_PokemonLab_ResearchRoom_EventScript_MetronomeTutor:: @ 816E3DF
CinnabarIsland_PokemonLab_ResearchRoom_EventScript_MetronomeTutor::
goto EventScript_MetronomeTutor
end
CinnabarIsland_PokemonLab_ResearchRoom_EventScript_Scientist:: @ 816E3E5
CinnabarIsland_PokemonLab_ResearchRoom_EventScript_Scientist::
msgbox CinnabarIsland_PokemonLab_ResearchRoom_Text_EeveeCanEvolveIntroThreeMons, MSGBOX_NPC
end
CinnabarIsland_PokemonLab_ResearchRoom_EventScript_Computer:: @ 816E3EE
CinnabarIsland_PokemonLab_ResearchRoom_EventScript_Computer::
msgbox CinnabarIsland_PokemonLab_ResearchRoom_Text_LegendaryBirdEmail, MSGBOX_SIGN
end
CinnabarIsland_PokemonLab_ResearchRoom_EventScript_AmberPipe:: @ 816E3F7
CinnabarIsland_PokemonLab_ResearchRoom_EventScript_AmberPipe::
msgbox CinnabarIsland_PokemonLab_ResearchRoom_Text_AnAmberPipe, MSGBOX_SIGN
end
data/maps/CinnabarIsland_PokemonLab_ResearchRoom/text.inc
+3 -3
View File
@@ -1,8 +1,8 @@
CinnabarIsland_PokemonLab_ResearchRoom_Text_EeveeCanEvolveIntroThreeMons:: @ 819A015
CinnabarIsland_PokemonLab_ResearchRoom_Text_EeveeCanEvolveIntroThreeMons::
.string "EEVEE can evolve into one of three\n"
.string "kinds of POKéMON.$"
CinnabarIsland_PokemonLab_ResearchRoom_Text_LegendaryBirdEmail:: @ 819A04A
CinnabarIsland_PokemonLab_ResearchRoom_Text_LegendaryBirdEmail::
.string "There's an e-mail message.\p"
.string "… … …\p"
.string "There are three legendary bird\n"
@@ -14,6 +14,6 @@ CinnabarIsland_PokemonLab_ResearchRoom_Text_LegendaryBirdEmail:: @ 819A04A
.string "close to CERULEAN.\p"
.string "From: POKéMON RESEARCH TEAM…$"
CinnabarIsland_PokemonLab_ResearchRoom_Text_AnAmberPipe:: @ 819A128
CinnabarIsland_PokemonLab_ResearchRoom_Text_AnAmberPipe::
.string "An amber pipe!$"