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_B1F/scripts.inc
+11 -11
View File
@@ -1,42 +1,42 @@
RocketHideout_B1F_MapScripts:: @ 8161195
RocketHideout_B1F_MapScripts::
map_script MAP_SCRIPT_ON_LOAD, RocketHideout_B1F_OnLoad
map_script MAP_SCRIPT_ON_TRANSITION, RocketHideout_B1F_OnTransition
.byte 0
RocketHideout_B1F_OnLoad:: @ 81611A0
RocketHideout_B1F_OnLoad::
call_if_not_defeated TRAINER_TEAM_ROCKET_GRUNT_12 RocketHideout_B1F_EventScript_SetBarrier
end
RocketHideout_B1F_OnTransition:: @ 81611AA
RocketHideout_B1F_OnTransition::
setworldmapflag FLAG_WORLD_MAP_ROCKET_HIDEOUT_B1F
end
RocketHideout_B1F_EventScript_Grunt1:: @ 81611AE
RocketHideout_B1F_EventScript_Grunt1::
trainerbattle_single TRAINER_TEAM_ROCKET_GRUNT_8, RocketHideout_B1F_Text_Grunt1Intro, RocketHideout_B1F_Text_Grunt1Defeat
msgbox RocketHideout_B1F_Text_Grunt1PostBattle, MSGBOX_AUTOCLOSE
end
RocketHideout_B1F_EventScript_Grunt2:: @ 81611C5
RocketHideout_B1F_EventScript_Grunt2::
trainerbattle_single TRAINER_TEAM_ROCKET_GRUNT_9, RocketHideout_B1F_Text_Grunt2Intro, RocketHideout_B1F_Text_Grunt2Defeat
msgbox RocketHideout_B1F_Text_Grunt2PostBattle, MSGBOX_AUTOCLOSE
end
RocketHideout_B1F_EventScript_Grunt3:: @ 81611DC
RocketHideout_B1F_EventScript_Grunt3::
trainerbattle_single TRAINER_TEAM_ROCKET_GRUNT_10, RocketHideout_B1F_Text_Grunt3Intro, RocketHideout_B1F_Text_Grunt3Defeat
msgbox RocketHideout_B1F_Text_Grunt3PostBattle, MSGBOX_AUTOCLOSE
end
RocketHideout_B1F_EventScript_Grunt4:: @ 81611F3
RocketHideout_B1F_EventScript_Grunt4::
trainerbattle_single TRAINER_TEAM_ROCKET_GRUNT_11, RocketHideout_B1F_Text_Grunt4Intro, RocketHideout_B1F_Text_Grunt4Defeat
msgbox RocketHideout_B1F_Text_Grunt4PostBattle, MSGBOX_AUTOCLOSE
end
RocketHideout_B1F_EventScript_Grunt5:: @ 816120A
RocketHideout_B1F_EventScript_Grunt5::
trainerbattle_single TRAINER_TEAM_ROCKET_GRUNT_12, RocketHideout_B1F_Text_Grunt5Intro, RocketHideout_B1F_Text_Grunt5Defeat, RocketHideout_B1F_EventScript_DefeatedGrunt5
msgbox RocketHideout_B1F_Text_Grunt5PostBattle, MSGBOX_AUTOCLOSE
end
RocketHideout_B1F_EventScript_DefeatedGrunt5:: @ 8161225
RocketHideout_B1F_EventScript_DefeatedGrunt5::
call RocketHideout_B1F_EventScript_RemoveBarrier
playse SE_UNLOCK
special DrawWholeMapView
@@ -44,7 +44,7 @@ RocketHideout_B1F_EventScript_DefeatedGrunt5:: @ 8161225
release
end
RocketHideout_B1F_EventScript_SetBarrier:: @ 8161233
RocketHideout_B1F_EventScript_SetBarrier::
setmetatile 20, 19, METATILE_SilphCo_HideoutBarrier_TopLeft_Floor, 1
setmetatile 21, 19, METATILE_SilphCo_HideoutBarrier_TopRight_Floor, 1
setmetatile 20, 20, METATILE_SilphCo_HideoutBarrier_BottomLeft, 1
@@ -53,7 +53,7 @@ RocketHideout_B1F_EventScript_SetBarrier:: @ 8161233
setmetatile 21, 21, METATILE_SilphCo_HideoutFloor_ShadeFull, 0
return
RocketHideout_B1F_EventScript_RemoveBarrier:: @ 816126A
RocketHideout_B1F_EventScript_RemoveBarrier::
setmetatile 20, 19, METATILE_SilphCo_HideoutFloor_ShadeFull, 0
setmetatile 21, 19, METATILE_SilphCo_HideoutFloor, 0
setmetatile 20, 20, METATILE_SilphCo_HideoutFloor_ShadeFull, 0
data/maps/RocketHideout_B1F/text.inc
+15 -15
View File
@@ -1,53 +1,53 @@
RocketHideout_B1F_Text_Grunt1Intro:: @ 8174ECA
RocketHideout_B1F_Text_Grunt1Intro::
.string "Who are you?\n"
.string "How did you get here?$"
RocketHideout_B1F_Text_Grunt1Defeat:: @ 8174EED
RocketHideout_B1F_Text_Grunt1Defeat::
.string "Oww!\n"
.string "Beaten!$"
RocketHideout_B1F_Text_Grunt1PostBattle:: @ 8174EFA
RocketHideout_B1F_Text_Grunt1PostBattle::
.string "Blast it… You're dissing TEAM\n"
.string "ROCKET, aren't you?$"
RocketHideout_B1F_Text_Grunt2Intro:: @ 8174F2C
RocketHideout_B1F_Text_Grunt2Intro::
.string "You broke into TEAM ROCKET's\n"
.string "operation? What nerve!$"
RocketHideout_B1F_Text_Grunt2Defeat:: @ 8174F60
RocketHideout_B1F_Text_Grunt2Defeat::
.string "Boom!$"
RocketHideout_B1F_Text_Grunt2PostBattle:: @ 8174F66
RocketHideout_B1F_Text_Grunt2PostBattle::
.string "You're not going to get away with\n"
.string "this, brat!$"
RocketHideout_B1F_Text_Grunt3Intro:: @ 8174F94
RocketHideout_B1F_Text_Grunt3Intro::
.string "Intruder alert!$"
RocketHideout_B1F_Text_Grunt3Defeat:: @ 8174FA4
RocketHideout_B1F_Text_Grunt3Defeat::
.string "I can't do it!$"
RocketHideout_B1F_Text_Grunt3PostBattle:: @ 8174FB3
RocketHideout_B1F_Text_Grunt3PostBattle::
.string "SILPH SCOPE? Humph!\n"
.string "I don't know where it is.$"
RocketHideout_B1F_Text_Grunt4Intro:: @ 8174FE1
RocketHideout_B1F_Text_Grunt4Intro::
.string "Why did you come here?$"
RocketHideout_B1F_Text_Grunt4Defeat:: @ 8174FF8
RocketHideout_B1F_Text_Grunt4Defeat::
.string "This won't do!$"
RocketHideout_B1F_Text_Grunt4PostBattle:: @ 8175007
RocketHideout_B1F_Text_Grunt4PostBattle::
.string "Okay, I'll talk…\n"
.string "Take the elevator to see my BOSS.$"
RocketHideout_B1F_Text_Grunt5Intro:: @ 817503A
RocketHideout_B1F_Text_Grunt5Intro::
.string "Are you lost, you little mouse?$"
RocketHideout_B1F_Text_Grunt5Defeat:: @ 817505A
RocketHideout_B1F_Text_Grunt5Defeat::
.string "Why…?$"
RocketHideout_B1F_Text_Grunt5PostBattle:: @ 8175060
RocketHideout_B1F_Text_Grunt5PostBattle::
.string "Uh-oh, that ruckus somehow opened\n"
.string "the door!$"