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_8F/scripts.inc
+8 -8
View File
@@ -1,12 +1,12 @@
SilphCo_8F_MapScripts:: @ 8161C5F
SilphCo_8F_MapScripts::
map_script MAP_SCRIPT_ON_LOAD, SilphCo_8F_OnLoad
.byte 0
SilphCo_8F_OnLoad:: @ 8161C65
SilphCo_8F_OnLoad::
call_if_unset FLAG_SILPH_8F_DOOR, EventScript_Close8FDoor
end
SilphCo_8F_EventScript_WorkerM:: @ 8161C6F
SilphCo_8F_EventScript_WorkerM::
lock
faceplayer
compare VAR_MAP_SCENE_SILPH_CO_11F, 1
@@ -15,26 +15,26 @@ SilphCo_8F_EventScript_WorkerM:: @ 8161C6F
release
end
SilphCo_8F_EventScript_WorkerMRocketsGone:: @ 8161C86
SilphCo_8F_EventScript_WorkerMRocketsGone::
msgbox SilphCo_8F_Text_ThanksForSavingUs
release
end
SilphCo_8F_EventScript_FloorSign:: @ 8161C90
SilphCo_8F_EventScript_FloorSign::
msgbox SilphCo_8F_Text_FloorSign, MSGBOX_SIGN
end
SilphCo_8F_EventScript_Parker:: @ 8161C99
SilphCo_8F_EventScript_Parker::
trainerbattle_single TRAINER_SCIENTIST_PARKER, SilphCo_8F_Text_ParkerIntro, SilphCo_8F_Text_ParkerDefeat
msgbox SilphCo_8F_Text_ParkerPostBattle, MSGBOX_AUTOCLOSE
end
SilphCo_8F_EventScript_Grunt1:: @ 8161CB0
SilphCo_8F_EventScript_Grunt1::
trainerbattle_single TRAINER_TEAM_ROCKET_GRUNT_32, SilphCo_8F_Text_Grunt1Intro, SilphCo_8F_Text_Grunt1Defeat
msgbox SilphCo_8F_Text_Grunt1PostBattle, MSGBOX_AUTOCLOSE
end
SilphCo_8F_EventScript_Grunt2:: @ 8161CC7
SilphCo_8F_EventScript_Grunt2::
trainerbattle_single TRAINER_TEAM_ROCKET_GRUNT_36, SilphCo_8F_Text_Grunt2Intro, SilphCo_8F_Text_Grunt2Defeat
msgbox SilphCo_8F_Text_Grunt2PostBattle, MSGBOX_AUTOCLOSE
end
data/maps/SilphCo_8F/text.inc
+13 -13
View File
@@ -1,46 +1,46 @@
SilphCo_8F_Text_WonderIfSilphIsFinished:: @ 817696D
SilphCo_8F_Text_WonderIfSilphIsFinished::
.string "I wonder if SILPH is finished…$"
SilphCo_8F_Text_ThanksForSavingUs:: @ 817698C
SilphCo_8F_Text_ThanksForSavingUs::
.string "Thanks for saving us!$"
SilphCo_8F_Text_Grunt1Intro:: @ 81769A2
SilphCo_8F_Text_Grunt1Intro::
.string "That's as far as you'll go!$"
SilphCo_8F_Text_Grunt1Defeat:: @ 81769BE
SilphCo_8F_Text_Grunt1Defeat::
.string "Not enough grit!$"
SilphCo_8F_Text_Grunt1PostBattle:: @ 81769CF
SilphCo_8F_Text_Grunt1PostBattle::
.string "If you don't turn back…\n"
.string "I'll call for backup!$"
SilphCo_8F_Text_ParkerIntro:: @ 81769FD
SilphCo_8F_Text_ParkerIntro::
.string "You're causing us problems!$"
SilphCo_8F_Text_ParkerDefeat:: @ 8176A19
SilphCo_8F_Text_ParkerDefeat::
.string "Huh?\n"
.string "I lost?$"
SilphCo_8F_Text_ParkerPostBattle:: @ 8176A26
SilphCo_8F_Text_ParkerPostBattle::
.string "So, what do you think of SILPH\n"
.string "BUILDING's maze?$"
SilphCo_8F_Text_Grunt2Intro:: @ 8176A56
SilphCo_8F_Text_Grunt2Intro::
.string "I am one of the four ROCKET\n"
.string "BROTHERS!$"
SilphCo_8F_Text_Grunt2Defeat:: @ 8176A7C
SilphCo_8F_Text_Grunt2Defeat::
.string "Whoo!\n"
.string "Oh, Brothers!$"
SilphCo_8F_Text_Grunt2PostBattle:: @ 8176A90
SilphCo_8F_Text_Grunt2PostBattle::
.string "I'll leave you up to my brothers.$"
SilphCo_8F_Text_FloorSign:: @ 8176AB2
SilphCo_8F_Text_FloorSign::
.string "SILPH CO. HEAD OFFICE\n"
.string "8F$"
SilphCo_8F_Text_ToRocketBossMonsAreTools:: @ 8176ACB
SilphCo_8F_Text_ToRocketBossMonsAreTools::
.string "TEAM ROCKET's BOSS is terribly\n"
.string "cruel!\p"
.string "To him, POKéMON are just tools to\n"