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/RocketHideout_B3F/scripts.inc
+3 -3
View File
@@ -1,12 +1,12 @@
RocketHideout_B3F_MapScripts:: @ 81612B9
RocketHideout_B3F_MapScripts::
.byte 0
RocketHideout_B3F_EventScript_Grunt1:: @ 81612BA
RocketHideout_B3F_EventScript_Grunt1::
trainerbattle_single TRAINER_TEAM_ROCKET_GRUNT_14, RocketHideout_B3F_Text_Grunt1Intro, RocketHideout_B3F_Text_Grunt1Defeat
msgbox RocketHideout_B3F_Text_Grunt1PostBattle, MSGBOX_AUTOCLOSE
end
RocketHideout_B3F_EventScript_Grunt2:: @ 81612D1
RocketHideout_B3F_EventScript_Grunt2::
trainerbattle_single TRAINER_TEAM_ROCKET_GRUNT_15, RocketHideout_B3F_Text_Grunt2Intro, RocketHideout_B3F_Text_Grunt2Defeat
msgbox RocketHideout_B3F_Text_Grunt2PostBattle, MSGBOX_AUTOCLOSE
end
data/maps/RocketHideout_B3F/text.inc
+6 -6
View File
@@ -1,25 +1,25 @@
RocketHideout_B3F_Text_Grunt1Intro:: @ 817511A
RocketHideout_B3F_Text_Grunt1Intro::
.string "Stop meddling in TEAM ROCKET's\n"
.string "affairs or else!$"
RocketHideout_B3F_Text_Grunt1Defeat:: @ 817514A
RocketHideout_B3F_Text_Grunt1Defeat::
.string "Oof!\n"
.string "Taken down!$"
RocketHideout_B3F_Text_Grunt1PostBattle:: @ 817515B
RocketHideout_B3F_Text_Grunt1PostBattle::
.string "SILPH SCOPE?\n"
.string "Oh, that machine the BOSS stole.\p"
.string "It's here somewhere.$"
RocketHideout_B3F_Text_Grunt2Intro:: @ 817519E
RocketHideout_B3F_Text_Grunt2Intro::
.string "We got word from upstairs that you\n"
.string "were coming!$"
RocketHideout_B3F_Text_Grunt2Defeat:: @ 81751CE
RocketHideout_B3F_Text_Grunt2Defeat::
.string "What?\n"
.string "I lost? No!$"
RocketHideout_B3F_Text_Grunt2PostBattle:: @ 81751E0
RocketHideout_B3F_Text_Grunt2PostBattle::
.string "Go ahead and go!\p"
.string "But you can't run the elevator\n"
.string "without the LIFT KEY.$"