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/MtMoon_B2F/scripts.inc
+17 -17
View File
@@ -2,20 +2,20 @@
.equ LOCALID_HELIX_FOSSIL, 2
.equ LOCALID_MIGUEL, 3
MtMoon_B2F_MapScripts:: @ 8160699
MtMoon_B2F_MapScripts::
map_script MAP_SCRIPT_ON_TRANSITION, MtMoon_B2F_OnTransition
.byte 0
MtMoon_B2F_OnTransition:: @ 816069F
MtMoon_B2F_OnTransition::
call_if_unset FLAG_GOT_FOSSIL_FROM_MT_MOON, MtMoon_B2F_EventScript_ShowFossils
end
MtMoon_B2F_EventScript_ShowFossils:: @ 81606A9
MtMoon_B2F_EventScript_ShowFossils::
clearflag FLAG_HIDE_DOME_FOSSIL
clearflag FLAG_HIDE_HELIX_FOSSIL
return
MtMoon_B2F_EventScript_MiguelTrigger:: @ 81606B0
MtMoon_B2F_EventScript_MiguelTrigger::
lockall
applymovement LOCALID_MIGUEL, Movement_WalkInPlaceFastestRight
waitmovement 0
@@ -23,7 +23,7 @@ MtMoon_B2F_EventScript_MiguelTrigger:: @ 81606B0
releaseall
end
MtMoon_B2F_EventScript_Miguel:: @ 81606C2
MtMoon_B2F_EventScript_Miguel::
lock
faceplayer
goto_if_set FLAG_GOT_FOSSIL_FROM_MT_MOON, MtMoon_B2F_EventScript_MiguelFossilPicked
@@ -32,7 +32,7 @@ MtMoon_B2F_EventScript_Miguel:: @ 81606C2
release
end
MtMoon_B2F_EventScript_BattleMiguel:: @ 81606DD
MtMoon_B2F_EventScript_BattleMiguel::
textcolor 0
message MtMoon_B2F_Text_MiguelIntro
waitmessage
@@ -44,17 +44,17 @@ MtMoon_B2F_EventScript_BattleMiguel:: @ 81606DD
msgbox MtMoon_B2F_Text_WellEachTakeAFossil
return
MtMoon_B2F_EventScript_MiguelFossilPicked:: @ 8160707
MtMoon_B2F_EventScript_MiguelFossilPicked::
msgbox MtMoon_B2F_Text_LabOnCinnabarRegeneratesFossils
release
end
MtMoon_B2F_EventScript_MiguelGoPickFossil:: @ 8160711
MtMoon_B2F_EventScript_MiguelGoPickFossil::
msgbox MtMoon_B2F_Text_WellEachTakeAFossil
release
end
MtMoon_B2F_EventScript_DomeFossil:: @ 816071B
MtMoon_B2F_EventScript_DomeFossil::
lock
faceplayer
msgbox MtMoon_B2F_Text_YouWantDomeFossil, MSGBOX_YESNO
@@ -79,14 +79,14 @@ MtMoon_B2F_EventScript_DomeFossil:: @ 816071B
release
end
MtMoon_B2F_Movement_MiguelToHelixFossil:: @ 816077A
MtMoon_B2F_Movement_MiguelToHelixFossil::
walk_right
walk_up
walk_up
walk_up
step_end
MtMoon_B2F_EventScript_HelixFossil:: @ 816077F
MtMoon_B2F_EventScript_HelixFossil::
lock
faceplayer
msgbox MtMoon_B2F_Text_YouWantHelixFossil, MSGBOX_YESNO
@@ -111,32 +111,32 @@ MtMoon_B2F_EventScript_HelixFossil:: @ 816077F
release
end
MtMoon_B2F_EventScript_DontTakeFossil:: @ 81607DE
MtMoon_B2F_EventScript_DontTakeFossil::
release
end
MtMoon_B2F_Movement_MiguelToDomeFossil:: @ 81607E0
MtMoon_B2F_Movement_MiguelToDomeFossil::
walk_up
walk_up
walk_up
step_end
MtMoon_B2F_EventScript_Grunt1:: @ 81607E4
MtMoon_B2F_EventScript_Grunt1::
trainerbattle_single TRAINER_TEAM_ROCKET_GRUNT, MtMoon_B2F_Text_Grunt1Intro, MtMoon_B2F_Text_Grunt1Defeat
msgbox MtMoon_B2F_Text_Grunt1PostBattle, MSGBOX_AUTOCLOSE
end
MtMoon_B2F_EventScript_Grunt2:: @ 81607FB
MtMoon_B2F_EventScript_Grunt2::
trainerbattle_single TRAINER_TEAM_ROCKET_GRUNT_2, MtMoon_B2F_Text_Grunt2Intro, MtMoon_B2F_Text_Grunt2Defeat
msgbox MtMoon_B2F_Text_Grunt2PostBattle, MSGBOX_AUTOCLOSE
end
MtMoon_B2F_EventScript_Grunt3:: @ 8160812
MtMoon_B2F_EventScript_Grunt3::
trainerbattle_single TRAINER_TEAM_ROCKET_GRUNT_3, MtMoon_B2F_Text_Grunt3Intro, MtMoon_B2F_Text_Grunt3Defeat
msgbox MtMoon_B2F_Text_Grunt3PostBattle, MSGBOX_AUTOCLOSE
end
MtMoon_B2F_EventScript_Grunt4:: @ 8160829
MtMoon_B2F_EventScript_Grunt4::
trainerbattle_single TRAINER_TEAM_ROCKET_GRUNT_4, MtMoon_B2F_Text_Grunt4Intro, MtMoon_B2F_Text_Grunt4Defeat
msgbox MtMoon_B2F_Text_Grunt4PostBattle, MSGBOX_AUTOCLOSE
end
data/maps/MtMoon_B2F/text.inc
+21 -21
View File
@@ -1,84 +1,84 @@
MtMoon_B2F_Text_MiguelIntro:: @ 8172B64
MtMoon_B2F_Text_MiguelIntro::
.string "Hey, stop!\p"
.string "I found these fossils!\n"
.string "They're both mine!$"
MtMoon_B2F_Text_MiguelDefeat:: @ 8172B99
MtMoon_B2F_Text_MiguelDefeat::
.string "Okay!\n"
.string "I'll share!$"
MtMoon_B2F_Text_WellEachTakeAFossil:: @ 8172BAB
MtMoon_B2F_Text_WellEachTakeAFossil::
.string "We'll each take a fossil!\n"
.string "No being greedy!$"
MtMoon_B2F_Text_ThenThisFossilIsMine:: @ 8172BD6
MtMoon_B2F_Text_ThenThisFossilIsMine::
.string "All right.\n"
.string "Then this fossil is mine!$"
MtMoon_B2F_Text_LabOnCinnabarRegeneratesFossils:: @ 8172BFB
MtMoon_B2F_Text_LabOnCinnabarRegeneratesFossils::
.string "Far away, on CINNABAR ISLAND,\n"
.string "there's a POKéMON LAB.\p"
.string "They do research on regenerating\n"
.string "fossils.$"
MtMoon_B2F_Text_Grunt1Intro:: @ 8172C5A
MtMoon_B2F_Text_Grunt1Intro::
.string "We, TEAM ROCKET, shall find the\n"
.string "fossils!\p"
.string "Reviving POKéMON from them will\n"
.string "earn us huge riches!$"
MtMoon_B2F_Text_Grunt1Defeat:: @ 8172CB8
MtMoon_B2F_Text_Grunt1Defeat::
.string "Urgh!\n"
.string "Now I'm mad!$"
MtMoon_B2F_Text_Grunt1PostBattle:: @ 8172CCB
MtMoon_B2F_Text_Grunt1PostBattle::
.string "You made me mad!\n"
.string "TEAM ROCKET will blacklist you!$"
MtMoon_B2F_Text_Grunt2Intro:: @ 8172CFC
MtMoon_B2F_Text_Grunt2Intro::
.string "We, TEAM ROCKET, are POKéMON\n"
.string "gangsters!\l"
.string "We strike fear with our strength!$"
MtMoon_B2F_Text_Grunt2Defeat:: @ 8172D46
MtMoon_B2F_Text_Grunt2Defeat::
.string "I blew it!$"
MtMoon_B2F_Text_Grunt2PostBattle:: @ 8172D51
MtMoon_B2F_Text_Grunt2PostBattle::
.string "Darn it all!\n"
.string "My associates won't stand for this!$"
MtMoon_B2F_Text_Grunt3Intro:: @ 8172D82
MtMoon_B2F_Text_Grunt3Intro::
.string "We're pulling a big job here!\n"
.string "Get lost, kid!$"
MtMoon_B2F_Text_Grunt3Defeat:: @ 8172DAF
MtMoon_B2F_Text_Grunt3Defeat::
.string "So, you are good…$"
MtMoon_B2F_Text_Grunt3PostBattle:: @ 8172DC1
MtMoon_B2F_Text_Grunt3PostBattle::
.string "If you find a fossil, give it to me\n"
.string "and scram!$"
MtMoon_B2F_Text_Grunt4Intro:: @ 8172DF0
MtMoon_B2F_Text_Grunt4Intro::
.string "Little kids shouldn't be messing\n"
.string "around with grown-ups!\p"
.string "It could be bad news!$"
MtMoon_B2F_Text_Grunt4Defeat:: @ 8172E3E
MtMoon_B2F_Text_Grunt4Defeat::
.string "I'm steamed!$"
MtMoon_B2F_Text_Grunt4PostBattle:: @ 8172E4B
MtMoon_B2F_Text_Grunt4PostBattle::
.string "POKéMON lived here long before\n"
.string "people came.$"
MtMoon_B2F_Text_YouWantDomeFossil:: @ 8172E77
MtMoon_B2F_Text_YouWantDomeFossil::
.string "Do you want the DOME FOSSIL?$"
MtMoon_B2F_Text_YouWantHelixFossil:: @ 8172E94
MtMoon_B2F_Text_YouWantHelixFossil::
.string "Do you want the HELIX FOSSIL?$"
MtMoon_B2F_Text_ObtainedHelixFossil:: @ 8172EB2
MtMoon_B2F_Text_ObtainedHelixFossil::
.string "Obtained the HELIX FOSSIL!$"
MtMoon_B2F_Text_ObtainedDomeFossil:: @ 8172ECD
MtMoon_B2F_Text_ObtainedDomeFossil::
.string "Obtained the DOME FOSSIL!$"