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
+4 -4
View File
@@ -1,14 +1,14 @@
Route13_MapScripts:: @ 81680B5
Route13_MapScripts::
.byte 0
Route13_EventScript_TrainerTips1:: @ 81680B6
Route13_EventScript_TrainerTips1::
msgbox Route13_Text_LookToLeftOfThatPost, MSGBOX_SIGN
end
Route13_EventScript_TrainerTips2:: @ 81680BF
Route13_EventScript_TrainerTips2::
msgbox Route13_Text_SelectToSwitchItems, MSGBOX_SIGN
end
Route13_EventScript_RouteSign:: @ 81680C8
Route13_EventScript_RouteSign::
msgbox Route13_Text_RouteSign, MSGBOX_SIGN
end
+33 -33
View File
@@ -1,128 +1,128 @@
Route13_Text_SebastianIntro:: @ 8185955
Route13_Text_SebastianIntro::
.string "My bird POKéMON want to battle\n"
.string "with you!$"
Route13_Text_SebastianDefeat:: @ 818597E
Route13_Text_SebastianDefeat::
.string "My PIDGEY and PIDGEOTTO combo\n"
.string "lost?$"
Route13_Text_SebastianPostBattle:: @ 81859A2
Route13_Text_SebastianPostBattle::
.string "My POKéMON look happy even though\n"
.string "they lost.$"
Route13_Text_SusieIntro:: @ 81859CF
Route13_Text_SusieIntro::
.string "I'm told I'm good for a kid.$"
Route13_Text_SusieDefeat:: @ 81859EC
Route13_Text_SusieDefeat::
.string "Ohh!\n"
.string "I lost!$"
Route13_Text_SusiePostBattle:: @ 81859F9
Route13_Text_SusiePostBattle::
.string "I want to become a good TRAINER.\n"
.string "I'll train hard, just watch.$"
Route13_Text_ValerieIntro:: @ 8185A37
Route13_Text_ValerieIntro::
.string "Wow!\n"
.string "Your BADGES are too cool!$"
Route13_Text_ValerieDefeat:: @ 8185A56
Route13_Text_ValerieDefeat::
.string "Not enough!$"
Route13_Text_ValeriePostBattle:: @ 8185A62
Route13_Text_ValeriePostBattle::
.string "You got those BADGES from GYM\n"
.string "LEADERS. I know!$"
Route13_Text_GwenIntro:: @ 8185A91
Route13_Text_GwenIntro::
.string "My cute POKéMON wish to make your\n"
.string "acquaintance.$"
Route13_Text_GwenDefeat:: @ 8185AC1
Route13_Text_GwenDefeat::
.string "Good going!\n"
.string "You totally won!$"
Route13_Text_GwenPostBattle:: @ 8185ADE
Route13_Text_GwenPostBattle::
.string "You have to make POKéMON battle\n"
.string "to toughen them up.$"
Route13_Text_AlmaIntro:: @ 8185B12
Route13_Text_AlmaIntro::
.string "I found CARBOS in a cave once\n"
.string "while I was spelunking.$"
Route13_Text_AlmaDefeat:: @ 8185B48
Route13_Text_AlmaDefeat::
.string "Oh, too bad!\n"
.string "I just messed up!$"
Route13_Text_AlmaPostBattle:: @ 8185B67
Route13_Text_AlmaPostBattle::
.string "CARBOS boosted the SPEED of my\n"
.string "POKéMON.$"
Route13_Text_PerryIntro:: @ 8185B8F
Route13_Text_PerryIntro::
.string "I'm not going to lose.\n"
.string "Not when the wind's blowing my way!$"
Route13_Text_PerryDefeat:: @ 8185BCA
Route13_Text_PerryDefeat::
.string "The wind turned!$"
Route13_Text_PerryPostBattle:: @ 8185BDB
Route13_Text_PerryPostBattle::
.string "I'm beat.\n"
.string "I guess I'll FLY home.$"
Route13_Text_LolaIntro:: @ 8185BFC
Route13_Text_LolaIntro::
.string "Sure, I'll play with you, sweetie.$"
Route13_Text_LolaDefeat:: @ 8185C1F
Route13_Text_LolaDefeat::
.string "Oh!\n"
.string "You little beast!$"
Route13_Text_LolaPostBattle:: @ 8185C35
Route13_Text_LolaPostBattle::
.string "I wonder which is stronger, male or\n"
.string "female POKéMON?$"
Route13_Text_SheilaIntro:: @ 8185C69
Route13_Text_SheilaIntro::
.string "Do you want to battle some\n"
.string "POKéMON with me?$"
Route13_Text_SheilaDefeat:: @ 8185C95
Route13_Text_SheilaDefeat::
.string "It's over already?$"
Route13_Text_SheilaPostBattle:: @ 8185CA8
Route13_Text_SheilaPostBattle::
.string "I don't know anything about\n"
.string "POKéMON actually.\p"
.string "The ones I use… I picked them\n"
.string "for their looks!$"
Route13_Text_JaredIntro:: @ 8185D05
Route13_Text_JaredIntro::
.string "What're you lookin' at?$"
Route13_Text_JaredDefeat:: @ 8185D1D
Route13_Text_JaredDefeat::
.string "Dang!\n"
.string "Stripped gears!$"
Route13_Text_JaredPostBattle:: @ 8185D33
Route13_Text_JaredPostBattle::
.string "Get lost!$"
Route13_Text_RobertIntro:: @ 8185D3D
Route13_Text_RobertIntro::
.string "I always go with bird POKéMON.\n"
.string "I've dedicated myself to them.$"
Route13_Text_RobertDefeat:: @ 8185D7B
Route13_Text_RobertDefeat::
.string "Out of power!$"
Route13_Text_RobertPostBattle:: @ 8185D89
Route13_Text_RobertPostBattle::
.string "I wish I could fly like PIDGEY and\n"
.string "PIDGEOTTO…$"
Route13_Text_LookToLeftOfThatPost:: @ 8185DB7
Route13_Text_LookToLeftOfThatPost::
.string "TRAINER TIPS\p"
.string "Look, look!\n"
.string "Look to the left of that post!$"
Route13_Text_SelectToSwitchItems:: @ 8185DEF
Route13_Text_SelectToSwitchItems::
.string "TRAINER TIPS\p"
.string "Use SELECT to switch items in the\n"
.string "ITEMS window.$"
Route13_Text_RouteSign:: @ 8185E2C
Route13_Text_RouteSign::
.string "ROUTE 13\n"
.string "North to SILENCE BRIDGE$"