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_B4F/scripts.inc
+15 -15
View File
@@ -4,11 +4,11 @@
.equ NUM_DOOR_GRUNTS_DEFEATED, VAR_TEMP_1
RocketHideout_B4F_MapScripts:: @ 81612E8
RocketHideout_B4F_MapScripts::
map_script MAP_SCRIPT_ON_LOAD, RocketHideout_B4F_OnLoad
.byte 0
RocketHideout_B4F_OnLoad:: @ 81612EE
RocketHideout_B4F_OnLoad::
setvar NUM_DOOR_GRUNTS_DEFEATED, 0
call_if_defeated TRAINER_TEAM_ROCKET_GRUNT_16, RocketHideout_B4F_EventScript_CountGruntDefeated
call_if_defeated TRAINER_TEAM_ROCKET_GRUNT_17, RocketHideout_B4F_EventScript_CountGruntDefeated
@@ -16,11 +16,11 @@ RocketHideout_B4F_OnLoad:: @ 81612EE
call_if_ne RocketHideout_B4F_EventScript_SetBarrier
end
RocketHideout_B4F_EventScript_CountGruntDefeated:: @ 8161311
RocketHideout_B4F_EventScript_CountGruntDefeated::
addvar NUM_DOOR_GRUNTS_DEFEATED, 1
return
RocketHideout_B4F_EventScript_Giovanni:: @ 8161317
RocketHideout_B4F_EventScript_Giovanni::
lock
faceplayer
famechecker FAMECHECKER_GIOVANNI, 0
@@ -41,7 +41,7 @@ RocketHideout_B4F_EventScript_Giovanni:: @ 8161317
release
end
RocketHideout_B4F_EventScript_SilphScope:: @ 8161363
RocketHideout_B4F_EventScript_SilphScope::
lock
faceplayer
removeobject LOCALID_SILPH_SCOPE
@@ -51,20 +51,20 @@ RocketHideout_B4F_EventScript_SilphScope:: @ 8161363
release
end
RocketHideout_B4F_EventScript_Grunt1:: @ 8161381
RocketHideout_B4F_EventScript_Grunt1::
trainerbattle_single TRAINER_TEAM_ROCKET_GRUNT_18, RocketHideout_B4F_Text_Grunt1Intro, RocketHideout_B4F_Text_Grunt1Defeat, RocketHideout_B4F_EventScript_DefeatedGrunt1
msgbox RocketHideout_B4F_Text_Grunt1PostBattle
release
end
RocketHideout_B4F_EventScript_DefeatedGrunt1:: @ 816139D
RocketHideout_B4F_EventScript_DefeatedGrunt1::
msgbox RocketHideout_B4F_Text_Grunt1PostBattle
addobject LOCALID_LIFT_KEY
clearflag FLAG_HIDE_LIFT_KEY
release
end
RocketHideout_B4F_EventScript_LiftKey:: @ 81613AD
RocketHideout_B4F_EventScript_LiftKey::
lock
faceplayer
setflag FLAG_CAN_USE_ROCKET_HIDEOUT_LIFT
@@ -75,12 +75,12 @@ RocketHideout_B4F_EventScript_LiftKey:: @ 81613AD
release
end
RocketHideout_B4F_EventScript_Grunt2:: @ 81613CE
RocketHideout_B4F_EventScript_Grunt2::
trainerbattle_single TRAINER_TEAM_ROCKET_GRUNT_16, RocketHideout_B4F_Text_Grunt2Intro, RocketHideout_B4F_Text_Grunt2Defeat, RocketHideout_B4F_EventScript_DefeatedGrunt2
msgbox RocketHideout_B4F_Text_Grunt2PostBattle, MSGBOX_AUTOCLOSE
end
RocketHideout_B4F_EventScript_DefeatedGrunt2:: @ 81613E9
RocketHideout_B4F_EventScript_DefeatedGrunt2::
setvar NUM_DOOR_GRUNTS_DEFEATED, 0
call_if_defeated TRAINER_TEAM_ROCKET_GRUNT_16, RocketHideout_B4F_EventScript_CountGruntDefeated
call_if_defeated TRAINER_TEAM_ROCKET_GRUNT_17, RocketHideout_B4F_EventScript_CountGruntDefeated
@@ -91,12 +91,12 @@ RocketHideout_B4F_EventScript_DefeatedGrunt2:: @ 81613E9
release
end
RocketHideout_B4F_EventScript_Grunt3:: @ 8161418
RocketHideout_B4F_EventScript_Grunt3::
trainerbattle_single TRAINER_TEAM_ROCKET_GRUNT_17, RocketHideout_B4F_Text_Grunt3Intro, RocketHideout_B4F_Text_Grunt3Defeat, RocketHideout_B4F_EventScript_DefeatedGrunt3
msgbox RocketHideout_B4F_Text_Grunt3PostBattle, MSGBOX_AUTOCLOSE
end
RocketHideout_B4F_EventScript_DefeatedGrunt3:: @ 8161433
RocketHideout_B4F_EventScript_DefeatedGrunt3::
setvar NUM_DOOR_GRUNTS_DEFEATED, 0
call_if_defeated TRAINER_TEAM_ROCKET_GRUNT_16, RocketHideout_B4F_EventScript_CountGruntDefeated
call_if_defeated TRAINER_TEAM_ROCKET_GRUNT_17, RocketHideout_B4F_EventScript_CountGruntDefeated
@@ -107,13 +107,13 @@ RocketHideout_B4F_EventScript_DefeatedGrunt3:: @ 8161433
release
end
RocketHideout_B4F_EventScript_DrawMapForBarrierRemoval:: @ 8161462
RocketHideout_B4F_EventScript_DrawMapForBarrierRemoval::
playse SE_UNLOCK
special DrawWholeMapView
waitse
return
RocketHideout_B4F_EventScript_SetBarrier:: @ 816146A
RocketHideout_B4F_EventScript_SetBarrier::
setmetatile 17, 12, METATILE_SilphCo_HideoutBarrier_TopLeft_Floor, 1
setmetatile 18, 12, METATILE_SilphCo_HideoutBarrier_TopRight_Floor, 1
setmetatile 17, 13, METATILE_SilphCo_HideoutBarrier_BottomLeft, 1
@@ -122,7 +122,7 @@ RocketHideout_B4F_EventScript_SetBarrier:: @ 816146A
setmetatile 18, 14, METATILE_SilphCo_HideoutFloor_ShadeFull, 0
return
RocketHideout_B4F_EventScript_RemoveBarrier:: @ 81614A1
RocketHideout_B4F_EventScript_RemoveBarrier::
setmetatile 17, 12, METATILE_SilphCo_HideoutFloor_ShadeFull, 0
setmetatile 18, 12, METATILE_SilphCo_HideoutFloor, 0
setmetatile 17, 13, METATILE_SilphCo_HideoutFloor_ShadeFull, 0
data/maps/RocketHideout_B4F/text.inc
+12 -12
View File
@@ -1,4 +1,4 @@
RocketHideout_B4F_Text_GiovanniIntro:: @ 8175226
RocketHideout_B4F_Text_GiovanniIntro::
.string "So! I must say, I am impressed you\n"
.string "got here.\p"
.string "TEAM ROCKET captures POKéMON from\n"
@@ -9,11 +9,11 @@ RocketHideout_B4F_Text_GiovanniIntro:: @ 8175226
.string "For your insolence, you will feel a\n"
.string "world of pain!$"
RocketHideout_B4F_Text_GiovanniDefeat:: @ 8175318
RocketHideout_B4F_Text_GiovanniDefeat::
.string "WHAT!\n"
.string "This can't be!$"
RocketHideout_B4F_Text_GiovanniPostBattle:: @ 817532D
RocketHideout_B4F_Text_GiovanniPostBattle::
.string "I see that you raise POKéMON with\n"
.string "utmost care.\p"
.string "A child like you would never\n"
@@ -21,36 +21,36 @@ RocketHideout_B4F_Text_GiovanniPostBattle:: @ 817532D
.string "I shall step aside this time!\p"
.string "I hope we meet again…$"
RocketHideout_B4F_Text_Grunt2Intro:: @ 81753D0
RocketHideout_B4F_Text_Grunt2Intro::
.string "I know you!\n"
.string "You ruined our plans at MT. MOON!$"
RocketHideout_B4F_Text_Grunt2Defeat:: @ 81753FE
RocketHideout_B4F_Text_Grunt2Defeat::
.string "Burned again!$"
RocketHideout_B4F_Text_Grunt2PostBattle:: @ 817540C
RocketHideout_B4F_Text_Grunt2PostBattle::
.string "Do you have something against TEAM\n"
.string "ROCKET?$"
RocketHideout_B4F_Text_Grunt3Intro:: @ 8175437
RocketHideout_B4F_Text_Grunt3Intro::
.string "How can you not see the beauty of\n"
.string "our evil?$"
RocketHideout_B4F_Text_Grunt3Defeat:: @ 8175463
RocketHideout_B4F_Text_Grunt3Defeat::
.string "Ayaya!$"
RocketHideout_B4F_Text_Grunt3PostBattle:: @ 817546A
RocketHideout_B4F_Text_Grunt3PostBattle::
.string "BOSS!\n"
.string "I'm sorry I failed you!$"
RocketHideout_B4F_Text_Grunt1Intro:: @ 8175488
RocketHideout_B4F_Text_Grunt1Intro::
.string "The elevator doesn't work?\n"
.string "Who has the LIFT KEY?$"
RocketHideout_B4F_Text_Grunt1Defeat:: @ 81754B9
RocketHideout_B4F_Text_Grunt1Defeat::
.string "No!$"
RocketHideout_B4F_Text_Grunt1PostBattle:: @ 81754BD
RocketHideout_B4F_Text_Grunt1PostBattle::
.string "Oh, no!\n"
.string "I dropped the LIFT KEY!$"