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
+2 -2
View File
@@ -1,6 +1,6 @@
Route11_MapScripts:: @ 8167FF6
Route11_MapScripts::
.byte 0
Route11_EventScript_DiglettsCaveSign:: @ 8167FF7
Route11_EventScript_DiglettsCaveSign::
msgbox Route11_Text_DiglettsCave, MSGBOX_SIGN
end
+31 -31
View File
@@ -1,113 +1,113 @@
Route11_Text_HugoIntro:: @ 8184F01
Route11_Text_HugoIntro::
.string "Win, lose, or draw!$"
Route11_Text_HugoDefeat:: @ 8184F15
Route11_Text_HugoDefeat::
.string "Atcha!\n"
.string "Didn't go my way!$"
Route11_Text_HugoPostBattle:: @ 8184F2E
Route11_Text_HugoPostBattle::
.string "POKéMON is life!\n"
.string "And to live is to play games!$"
Route11_Text_JasperIntro:: @ 8184F5D
Route11_Text_JasperIntro::
.string "Competition!\n"
.string "I can't get enough!$"
Route11_Text_JasperDefeat:: @ 8184F7E
Route11_Text_JasperDefeat::
.string "I had a chance!$"
Route11_Text_JasperPostBattle:: @ 8184F8E
Route11_Text_JasperPostBattle::
.string "You can't be a coward in the world\n"
.string "of POKéMON!$"
Route11_Text_EddieIntro:: @ 8184FBD
Route11_Text_EddieIntro::
.string "Let's go, but don't cheat!$"
Route11_Text_EddieDefeat:: @ 8184FD8
Route11_Text_EddieDefeat::
.string "Huh?\n"
.string "That's not right!$"
Route11_Text_EddiePostBattle:: @ 8184FEF
Route11_Text_EddiePostBattle::
.string "I did my best.\n"
.string "I have no regrets.$"
Route11_Text_BraxtonIntro:: @ 8185011
Route11_Text_BraxtonIntro::
.string "Careful!\n"
.string "I'm laying down some cables!$"
Route11_Text_BraxtonDefeat:: @ 8185037
Route11_Text_BraxtonDefeat::
.string "That was electric!$"
Route11_Text_BraxtonPostBattle:: @ 818504A
Route11_Text_BraxtonPostBattle::
.string "Spread the word to save energy!$"
Route11_Text_DillonIntro:: @ 818506A
Route11_Text_DillonIntro::
.string "I just became a TRAINER.\n"
.string "But, I think I can win.$"
Route11_Text_DillonDefeat:: @ 818509B
Route11_Text_DillonDefeat::
.string "My POKéMON couldn't win…\n"
.string "Haven't they grown enough?$"
Route11_Text_DillonPostBattle:: @ 81850CF
Route11_Text_DillonPostBattle::
.string "What now?\n"
.string "Leave me alone!$"
Route11_Text_DirkIntro:: @ 81850E9
Route11_Text_DirkIntro::
.string "Fwahaha!\n"
.string "I have never lost!$"
Route11_Text_DirkDefeat:: @ 8185105
Route11_Text_DirkDefeat::
.string "My first loss!$"
Route11_Text_DirkPostBattle:: @ 8185114
Route11_Text_DirkPostBattle::
.string "You were just lucky, that's all.$"
Route11_Text_DarianIntro:: @ 8185135
Route11_Text_DarianIntro::
.string "I have never won before…$"
Route11_Text_DarianDefeat:: @ 818514E
Route11_Text_DarianDefeat::
.string "I saw this coming…$"
Route11_Text_DarianPostBattle:: @ 8185161
Route11_Text_DarianPostBattle::
.string "I was unlucky, as always.$"
Route11_Text_YasuIntro:: @ 818517B
Route11_Text_YasuIntro::
.string "I'm the best in my class.\n"
.string "I train every morning.$"
Route11_Text_YasuDefeat:: @ 81851AC
Route11_Text_YasuDefeat::
.string "Darn!\n"
.string "My POKéMON need to be stronger!$"
Route11_Text_YasuPostBattle:: @ 81851D2
Route11_Text_YasuPostBattle::
.string "There's a fat POKéMON that comes\n"
.string "down from the mountains.\p"
.string "I bet it'd be strong if you can\n"
.string "catch it.$"
Route11_Text_BernieIntro:: @ 8185236
Route11_Text_BernieIntro::
.string "Watch out for live wires!$"
Route11_Text_BernieDefeat:: @ 8185250
Route11_Text_BernieDefeat::
.string "Whoa!\n"
.string "You spark plug!$"
Route11_Text_BerniePostBattle:: @ 8185266
Route11_Text_BerniePostBattle::
.string "Well, better get back to work.$"
Route11_Text_DaveIntro:: @ 8185285
Route11_Text_DaveIntro::
.string "I raised my POKéMON carefully.\n"
.string "They should be ready by now!$"
Route11_Text_DaveDefeat:: @ 81852C1
Route11_Text_DaveDefeat::
.string "Bye-bye!\n"
.string "Thank you, and good-bye!$"
Route11_Text_DavePostBattle:: @ 81852E3
Route11_Text_DavePostBattle::
.string "Tch…\n"
.string "I better go find stronger ones!$"
Route11_Text_DiglettsCave:: @ 8185308
Route11_Text_DiglettsCave::
.string "DIGLETT'S CAVE$"