Merge branch 'master' of https://github.com/GriffinRichards/pokefirered into clone-union

This commit is contained in:
GriffinR
2022-08-10 13:48:30 -04:00
1146 changed files with 40526 additions and 38156 deletions
+2 -2
View File
@@ -1,7 +1,7 @@
RocketHideout_B2F_MapScripts:: @ 81612A1
RocketHideout_B2F_MapScripts::
.byte 0
RocketHideout_B2F_EventScript_Grunt:: @ 81612A2
RocketHideout_B2F_EventScript_Grunt::
trainerbattle_single TRAINER_TEAM_ROCKET_GRUNT_13, RocketHideout_B2F_Text_GruntIntro, RocketHideout_B2F_Text_GruntDefeat
msgbox RocketHideout_B2F_Text_GruntPostBattle, MSGBOX_AUTOCLOSE
end
+3 -3
View File
@@ -1,11 +1,11 @@
RocketHideout_B2F_Text_GruntIntro:: @ 817508C
RocketHideout_B2F_Text_GruntIntro::
.string "BOSS said you can see ghosts with\n"
.string "the SILPH SCOPE.$"
RocketHideout_B2F_Text_GruntDefeat:: @ 81750BF
RocketHideout_B2F_Text_GruntDefeat::
.string "I surrender!$"
RocketHideout_B2F_Text_GruntPostBattle:: @ 81750CC
RocketHideout_B2F_Text_GruntPostBattle::
.string "The TEAM ROCKET HQ has four\n"
.string "underground floors.\p"
.string "Think you can reach the BOSS?$"