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/Route20/scripts.inc
+5 -5
View File
@@ -1,13 +1,13 @@
Route20_MapScripts:: @ 816823B
Route20_MapScripts::
map_script MAP_SCRIPT_ON_TRANSITION, Route20_OnTransition
.byte 0
Route20_OnTransition:: @ 8168241
Route20_OnTransition::
call_if_unset FLAG_STOPPED_SEAFOAM_B3F_CURRENT, Route20_EventScript_ResetSeafoamBouldersForB3F
call_if_unset FLAG_STOPPED_SEAFOAM_B4F_CURRENT, Route20_EventScript_ResetSeafoamBouldersForB4F
end
Route20_EventScript_ResetSeafoamBouldersForB3F:: @ 8168254
Route20_EventScript_ResetSeafoamBouldersForB3F::
clearflag FLAG_HIDE_SEAFOAM_1F_BOULDER_1
clearflag FLAG_HIDE_SEAFOAM_1F_BOULDER_2
setflag FLAG_HIDE_SEAFOAM_B1F_BOULDER_1
@@ -18,7 +18,7 @@ Route20_EventScript_ResetSeafoamBouldersForB3F:: @ 8168254
setflag FLAG_HIDE_SEAFOAM_B3F_BOULDER_2
return
Route20_EventScript_ResetSeafoamBouldersForB4F:: @ 816826D
Route20_EventScript_ResetSeafoamBouldersForB4F::
clearflag FLAG_HIDE_SEAFOAM_B3F_BOULDER_3
clearflag FLAG_HIDE_SEAFOAM_B3F_BOULDER_4
clearflag FLAG_HIDE_SEAFOAM_B3F_BOULDER_5
@@ -27,6 +27,6 @@ Route20_EventScript_ResetSeafoamBouldersForB4F:: @ 816826D
setflag FLAG_HIDE_SEAFOAM_B4F_BOULDER_2
return
Route20_EventScript_SeafoamIslandsSign:: @ 8168280
Route20_EventScript_SeafoamIslandsSign::
msgbox Route20_Text_SeafoamIslands, MSGBOX_SIGN
end
data/maps/Route20/text.inc
+32 -32
View File
@@ -1,119 +1,119 @@
Route20_Text_BarryIntro:: @ 8187E40
Route20_Text_BarryIntro::
.string "The water is shallow here.\n"
.string "There are many people swimming.$"
Route20_Text_BarryDefeat:: @ 8187E7B
Route20_Text_BarryDefeat::
.string "Splash!$"
Route20_Text_BarryPostBattle:: @ 8187E83
Route20_Text_BarryPostBattle::
.string "I wish I could ride my POKéMON.\n"
.string "I bet you're not tired.$"
Route20_Text_ShirleyIntro:: @ 8187EBB
Route20_Text_ShirleyIntro::
.string "SEAFOAM is a quiet getaway.\n"
.string "I'm vacationing here.$"
Route20_Text_ShirleyDefeat:: @ 8187EED
Route20_Text_ShirleyDefeat::
.string "Quit it!$"
Route20_Text_ShirleyPostBattle:: @ 8187EF6
Route20_Text_ShirleyPostBattle::
.string "There's a huge cavern underneath\n"
.string "this island.$"
Route20_Text_TiffanyIntro:: @ 8187F24
Route20_Text_TiffanyIntro::
.string "I love floating with the fishes\n"
.string "here among the waves.$"
Route20_Text_TiffanyDefeat:: @ 8187F5A
Route20_Text_TiffanyDefeat::
.string "Yowch!$"
Route20_Text_TiffanyPostBattle:: @ 8187F61
Route20_Text_TiffanyPostBattle::
.string "Want to float with me?$"
Route20_Text_IreneIntro:: @ 8187F78
Route20_Text_IreneIntro::
.string "Are you on vacation, too?$"
Route20_Text_IreneDefeat:: @ 8187F92
Route20_Text_IreneDefeat::
.string "No mercy at all!$"
Route20_Text_IrenePostBattle:: @ 8187FA3
Route20_Text_IrenePostBattle::
.string "SEAFOAM used to be a single island\n"
.string "in the distant past.$"
Route20_Text_DeanIntro:: @ 8187FDB
Route20_Text_DeanIntro::
.string "Check out my buff physique!$"
Route20_Text_DeanDefeat:: @ 8187FF7
Route20_Text_DeanDefeat::
.string "Wimpy!$"
Route20_Text_DeanPostBattle:: @ 8187FFE
Route20_Text_DeanPostBattle::
.string "I should've been buffing up my\n"
.string "POKéMON, not me!$"
Route20_Text_DarrinIntro:: @ 818802E
Route20_Text_DarrinIntro::
.string "Why are you riding a POKéMON?\n"
.string "Can't you swim?$"
Route20_Text_DarrinDefeat:: @ 818805C
Route20_Text_DarrinDefeat::
.string "Ouch!\n"
.string "Torpedoed!$"
Route20_Text_DarrinPostBattle:: @ 818806D
Route20_Text_DarrinPostBattle::
.string "Riding a POKéMON sure looks fun!$"
Route20_Text_RogerIntro:: @ 818808E
Route20_Text_RogerIntro::
.string "I rode my bird POKéMON here.$"
Route20_Text_RogerDefeat:: @ 81880AB
Route20_Text_RogerDefeat::
.string "Oh, no!\n"
.string "Now what am I to do?$"
Route20_Text_RogerPostBattle:: @ 81880C8
Route20_Text_RogerPostBattle::
.string "My birds are exhausted.\n"
.string "They can't FLY me back!$"
Route20_Text_NoraIntro:: @ 81880F8
Route20_Text_NoraIntro::
.string "My boyfriend gave me big pearls.$"
Route20_Text_NoraDefeat:: @ 8188119
Route20_Text_NoraDefeat::
.string "Oh, no!\n"
.string "My pearls were in them!$"
Route20_Text_NoraPostBattle:: @ 8188139
Route20_Text_NoraPostBattle::
.string "Will my pearls grow bigger inside\n"
.string "CLOYSTER?$"
Route20_Text_MissyIntro:: @ 8188165
Route20_Text_MissyIntro::
.string "I swam here from CINNABAR ISLAND.\n"
.string "It wasn't easy, I tell you.$"
Route20_Text_MissyDefeat:: @ 81881A3
Route20_Text_MissyDefeat::
.string "I'm so disappointed!$"
Route20_Text_MissyPostBattle:: @ 81881B8
Route20_Text_MissyPostBattle::
.string "POKéMON have taken over an\n"
.string "abandoned mansion on CINNABAR.\p"
.string "They call it the POKéMON MANSION\n"
.string "now.$"
Route20_Text_MelissaIntro:: @ 8188218
Route20_Text_MelissaIntro::
.string "CINNABAR, in the west, has a LAB\n"
.string "for POKéMON.\p"
.string "My daddy works there.$"
Route20_Text_MelissaDefeat:: @ 818825C
Route20_Text_MelissaDefeat::
.string "Wait!\n"
.string "You're supposed to wait!$"
Route20_Text_MelissaPostBattle:: @ 818827B
Route20_Text_MelissaPostBattle::
.string "CINNABAR is a volcanic island.\p"
.string "I heard it rose out of the sea\n"
.string "when a volcano erupted.$"
Route20_Text_SeafoamIslands:: @ 81882D1
Route20_Text_SeafoamIslands::
.string "SEAFOAM ISLANDS$"
Route20_Text_MistyTrainsHere:: @ 81882E1
Route20_Text_MistyTrainsHere::
.string "Strong TRAINERS and WATER POKéMON\n"
.string "are common sights in these parts.\p"
.string "They say that MISTY of the\n"