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/SilphCo_2F/scripts.inc
+8 -8
View File
@@ -1,36 +1,36 @@
SilphCo_2F_MapScripts:: @ 8161641
SilphCo_2F_MapScripts::
map_script MAP_SCRIPT_ON_LOAD, SilphCo_2F_OnLoad
.byte 0
SilphCo_2F_OnLoad:: @ 8161647
SilphCo_2F_OnLoad::
call_if_unset FLAG_SILPH_2F_DOOR_1, EventScript_Close2FDoor1
call_if_unset FLAG_SILPH_2F_DOOR_2, EventScript_Close2FDoor2
end
SilphCo_2F_EventScript_ThunderWaveTutor:: @ 816165A
SilphCo_2F_EventScript_ThunderWaveTutor::
goto EventScript_ThunderWaveTutor
end
SilphCo_2F_EventScript_FloorSign:: @ 8161660
SilphCo_2F_EventScript_FloorSign::
msgbox SilphCo_2F_Text_FloorSign, MSGBOX_SIGN
end
SilphCo_2F_EventScript_Connor:: @ 8161669
SilphCo_2F_EventScript_Connor::
trainerbattle_single TRAINER_SCIENTIST_CONNOR, SilphCo_2F_Text_ConnorIntro, SilphCo_2F_Text_ConnorDefeat
msgbox SilphCo_2F_Text_ConnorPostBattle, MSGBOX_AUTOCLOSE
end
SilphCo_2F_EventScript_Jerry:: @ 8161680
SilphCo_2F_EventScript_Jerry::
trainerbattle_single TRAINER_SCIENTIST_JERRY, SilphCo_2F_Text_JerryIntro, SilphCo_2F_Text_JerryDefeat
msgbox SilphCo_2F_Text_JerryPostBattle, MSGBOX_AUTOCLOSE
end
SilphCo_2F_EventScript_Grunt1:: @ 8161697
SilphCo_2F_EventScript_Grunt1::
trainerbattle_single TRAINER_TEAM_ROCKET_GRUNT_23, SilphCo_2F_Text_Grunt1Intro, SilphCo_2F_Text_Grunt1Defeat
msgbox SilphCo_2F_Text_Grunt1PostBattle, MSGBOX_AUTOCLOSE
end
SilphCo_2F_EventScript_Grunt2:: @ 81616AE
SilphCo_2F_EventScript_Grunt2::
trainerbattle_single TRAINER_TEAM_ROCKET_GRUNT_24, SilphCo_2F_Text_Grunt2Intro, SilphCo_2F_Text_Grunt2Defeat
msgbox SilphCo_2F_Text_Grunt2PostBattle, MSGBOX_AUTOCLOSE
end
data/maps/SilphCo_2F/text.inc
+17 -17
View File
@@ -1,50 +1,50 @@
SilphCo_2F_Text_ConnorIntro:: @ 8175562
SilphCo_2F_Text_ConnorIntro::
.string "Help!\n"
.string "I'm a SILPH employee.$"
SilphCo_2F_Text_ConnorDefeat:: @ 817557E
SilphCo_2F_Text_ConnorDefeat::
.string "How did you know\n"
.string "I was a ROCKET?$"
SilphCo_2F_Text_ConnorPostBattle:: @ 817559F
SilphCo_2F_Text_ConnorPostBattle::
.string "I work for both SILPH and TEAM\n"
.string "ROCKET.$"
SilphCo_2F_Text_JerryIntro:: @ 81755C6
SilphCo_2F_Text_JerryIntro::
.string "It's off-limits here!\n"
.string "Go home!$"
SilphCo_2F_Text_JerryDefeat:: @ 81755E5
SilphCo_2F_Text_JerryDefeat::
.string "You're good.$"
SilphCo_2F_Text_JerryPostBattle:: @ 81755F2
SilphCo_2F_Text_JerryPostBattle::
.string "Can you solve the maze in here?\n"
.string "It's not easy, I tell you!$"
SilphCo_2F_Text_Grunt1Intro:: @ 817562D
SilphCo_2F_Text_Grunt1Intro::
.string "No kids are allowed in here!$"
SilphCo_2F_Text_Grunt1Defeat:: @ 817564A
SilphCo_2F_Text_Grunt1Defeat::
.string "Tough!$"
SilphCo_2F_Text_Grunt1PostBattle:: @ 8175651
SilphCo_2F_Text_Grunt1PostBattle::
.string "Diamond-shaped tiles are teleport\n"
.string "blocks.\p"
.string "They're transporters for this\n"
.string "high-tech building.$"
SilphCo_2F_Text_Grunt2Intro:: @ 81756AD
SilphCo_2F_Text_Grunt2Intro::
.string "Hey, kid!\n"
.string "What are you wandering here for?$"
SilphCo_2F_Text_Grunt2Defeat:: @ 81756D8
SilphCo_2F_Text_Grunt2Defeat::
.string "I goofed!$"
SilphCo_2F_Text_Grunt2PostBattle:: @ 81756E2
SilphCo_2F_Text_Grunt2PostBattle::
.string "SILPH CO. will be associated with\n"
.string "TEAM ROCKET!$"
Text_ThunderWaveTeach:: @ 8175711
Text_ThunderWaveTeach::
.string "Eeek!\n"
.string "No! Stop! Help!\p"
.string "Oh, you're not with TEAM ROCKET.\n"
@@ -52,15 +52,15 @@ Text_ThunderWaveTeach:: @ 8175711
.string "Will you forgive me if I teach\n"
.string "you the THUNDER WAVE technique?$"
Text_ThunderWaveDeclined:: @ 817579D
Text_ThunderWaveDeclined::
.string "Oh…\n"
.string "But THUNDER WAVE is convenient…$"
Text_ThunderWaveWhichMon:: @ 81757C1
Text_ThunderWaveWhichMon::
.string "Which POKéMON should I teach\n"
.string "THUNDER WAVE?$"
Text_ThunderWaveTaught:: @ 81757EC
Text_ThunderWaveTaught::
.string "THUNDER WAVE causes paralysis in\n"
.string "the target POKéMON.\p"
.string "A paralyzed POKéMON may be unable\n"
@@ -68,7 +68,7 @@ Text_ThunderWaveTaught:: @ 81757EC
.string "It's an ELECTRIC-type move, so it\n"
.string "won't work on some POKéMON.$"
SilphCo_2F_Text_FloorSign:: @ 8175894
SilphCo_2F_Text_FloorSign::
.string "SILPH CO. HEAD OFFICE\n"
.string "2F$"