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
+7 -7
View File
@@ -1,26 +1,26 @@
Route17_MapScripts:: @ 81681BF
Route17_MapScripts::
.byte 0
Route17_EventScript_ItemsNotice:: @ 81681C0
Route17_EventScript_ItemsNotice::
msgbox Route17_Text_WatchOutForDiscardedItems, MSGBOX_SIGN
end
Route17_EventScript_TrainerTips1:: @ 81681C9
Route17_EventScript_TrainerTips1::
msgbox Route17_Text_SameSpeciesGrowDifferentRates, MSGBOX_SIGN
end
Route17_EventScript_TrainerTips2:: @ 81681D2
Route17_EventScript_TrainerTips2::
msgbox Route17_Text_PressBToStayInPlace, MSGBOX_SIGN
end
Route17_EventScript_RouteSign:: @ 81681DB
Route17_EventScript_RouteSign::
msgbox Route17_Text_RouteSign, MSGBOX_SIGN
end
Route17_EventScript_BallsNotice:: @ 81681E4
Route17_EventScript_BallsNotice::
msgbox Route17_Text_DontThrowGameThrowBalls, MSGBOX_SIGN
end
Route17_EventScript_CyclingRoadSign:: @ 81681ED
Route17_EventScript_CyclingRoadSign::
msgbox Route17_Text_CyclingRoadSign, MSGBOX_SIGN
end
+36 -36
View File
@@ -1,131 +1,131 @@
Route17_Text_RaulIntro:: @ 818717E
Route17_Text_RaulIntro::
.string "There's no getting rich quick in\n"
.string "battling kids.$"
Route17_Text_RaulDefeat:: @ 81871AE
Route17_Text_RaulDefeat::
.string "Burned out!$"
Route17_Text_RaulPostBattle:: @ 81871BA
Route17_Text_RaulPostBattle::
.string "You can find good stuff lying\n"
.string "around on CYCLING ROAD.\p"
.string "There's good money in picking them\n"
.string "up and selling them.$"
Route17_Text_IsaiahIntro:: @ 8187228
Route17_Text_IsaiahIntro::
.string "I'm mighty proud of my bod, kiddo.\n"
.string "Come on!$"
Route17_Text_IsaiahDefeat:: @ 8187254
Route17_Text_IsaiahDefeat::
.string "Whoo!$"
Route17_Text_IsaiahPostBattle:: @ 818725A
Route17_Text_IsaiahPostBattle::
.string "I could belly-bump you outta\n"
.string "here!$"
Route17_Text_VirgilIntro:: @ 818727D
Route17_Text_VirgilIntro::
.string "You heading to FUCHSIA?$"
Route17_Text_VirgilDefeat:: @ 8187295
Route17_Text_VirgilDefeat::
.string "Crash and burn!$"
Route17_Text_VirgilPostBattle:: @ 81872A5
Route17_Text_VirgilPostBattle::
.string "I love racing downhill!$"
Route17_Text_BillyIntro:: @ 81872BD
Route17_Text_BillyIntro::
.string "We're BIKERS!\n"
.string "We rule the roads, man!$"
Route17_Text_BillyDefeat:: @ 81872E3
Route17_Text_BillyDefeat::
.string "Smoked!$"
Route17_Text_BillyPostBattle:: @ 81872EB
Route17_Text_BillyPostBattle::
.string "Are you looking for adventure?$"
Route17_Text_NikolasIntro:: @ 818730A
Route17_Text_NikolasIntro::
.string "Let VOLTORB electrify you!$"
Route17_Text_NikolasDefeat:: @ 8187325
Route17_Text_NikolasDefeat::
.string "Grounded out!$"
Route17_Text_NikolasPostBattle:: @ 8187333
Route17_Text_NikolasPostBattle::
.string "I got my VOLTORB at the abandoned\n"
.string "POWER PLANT.$"
Route17_Text_ZeekIntro:: @ 8187362
Route17_Text_ZeekIntro::
.string "I leveled up my POKéMON, but it\n"
.string "won't evolve. Why?$"
Route17_Text_ZeekDefeat:: @ 8187395
Route17_Text_ZeekDefeat::
.string "Why, you!$"
Route17_Text_ZeekPostBattle:: @ 818739F
Route17_Text_ZeekPostBattle::
.string "Maybe some POKéMON need element\n"
.string "STONES to evolve.$"
Route17_Text_JamalIntro:: @ 81873D1
Route17_Text_JamalIntro::
.string "I need a little exercise!$"
Route17_Text_JamalDefeat:: @ 81873EB
Route17_Text_JamalDefeat::
.string "Whew!\n"
.string "Good workout!$"
Route17_Text_JamalPostBattle:: @ 81873FF
Route17_Text_JamalPostBattle::
.string "I'm sure I lost weight there!$"
Route17_Text_CoreyIntro:: @ 818741D
Route17_Text_CoreyIntro::
.string "Be a rebel!$"
Route17_Text_CoreyDefeat:: @ 8187429
Route17_Text_CoreyDefeat::
.string "Aaaargh!$"
Route17_Text_CoreyPostBattle:: @ 8187432
Route17_Text_CoreyPostBattle::
.string "Be ready to fight for your beliefs!$"
Route17_Text_JaxonIntro:: @ 8187456
Route17_Text_JaxonIntro::
.string "Nice BIKE!\n"
.string "How's it handle?$"
Route17_Text_JaxonDefeat:: @ 8187472
Route17_Text_JaxonDefeat::
.string "Shoot!$"
Route17_Text_JaxonPostBattle:: @ 8187479
Route17_Text_JaxonPostBattle::
.string "The slope makes it hard to steer.$"
Route17_Text_WilliamIntro:: @ 818749B
Route17_Text_WilliamIntro::
.string "Get lost, kid!\n"
.string "I'm bushed!$"
Route17_Text_WilliamDefeat:: @ 81874B6
Route17_Text_WilliamDefeat::
.string "Are you satisfied?$"
Route17_Text_WilliamPostBattle:: @ 81874C9
Route17_Text_WilliamPostBattle::
.string "I need to catch a few z's!$"
Route17_Text_WatchOutForDiscardedItems:: @ 81874E4
Route17_Text_WatchOutForDiscardedItems::
.string "It's a notice.\p"
.string "Watch out for discarded items.$"
Route17_Text_SameSpeciesGrowDifferentRates:: @ 8187512
Route17_Text_SameSpeciesGrowDifferentRates::
.string "TRAINER TIPS\p"
.string "All POKéMON are unique.\p"
.string "Even POKéMON of the same species\n"
.string "and level grow at different rates.$"
Route17_Text_PressBToStayInPlace:: @ 818757B
Route17_Text_PressBToStayInPlace::
.string "TRAINER TIPS\p"
.string "Press the B Button to stay in place\n"
.string "while on a slope.$"
Route17_Text_RouteSign:: @ 81875BE
Route17_Text_RouteSign::
.string "ROUTE 17\n"
.string "CELADON CITY - FUCHSIA CITY$"
Route17_Text_DontThrowGameThrowBalls:: @ 81875E3
Route17_Text_DontThrowGameThrowBalls::
.string "It's a notice!\p"
.string "Don't throw the game, throw POKé\n"
.string "BALLS instead!$"
Route17_Text_CyclingRoadSign:: @ 8187622
Route17_Text_CyclingRoadSign::
.string "CYCLING ROAD\n"
.string "Slope ends here!$"