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
+3 -3
View File
@@ -1,10 +1,10 @@
OneIsland_KindleRoad_MapScripts:: @ 8168758
OneIsland_KindleRoad_MapScripts::
.byte 0
OneIsland_KindleRoad_EventScript_RouteSign:: @ 8168759
OneIsland_KindleRoad_EventScript_RouteSign::
msgbox OneIsland_KindleRoad_Text_RouteSign, MSGBOX_SIGN
end
OneIsland_KindleRoad_EventScript_EmberSpaSign:: @ 8168762
OneIsland_KindleRoad_EventScript_EmberSpaSign::
msgbox OneIsland_KindleRoad_Text_EmberSpaSign, MSGBOX_SIGN
end
+43 -43
View File
@@ -1,164 +1,164 @@
OneIsland_KindleRoad_Text_MariaIntro:: @ 818961F
OneIsland_KindleRoad_Text_MariaIntro::
.string "The weather's gorgeous!\n"
.string "Perfect for a battle!$"
OneIsland_KindleRoad_Text_MariaDefeat:: @ 818964D
OneIsland_KindleRoad_Text_MariaDefeat::
.string "Aiyeeeeh!$"
OneIsland_KindleRoad_Text_MariaPostBattle:: @ 8189657
OneIsland_KindleRoad_Text_MariaPostBattle::
.string "Please don't splash my face!\n"
.string "You'll ruin the makeup.$"
OneIsland_KindleRoad_Text_AbigailIntro:: @ 818968C
OneIsland_KindleRoad_Text_AbigailIntro::
.string "I'm beginning to get a sunburn…$"
OneIsland_KindleRoad_Text_AbigailDefeat:: @ 81896AC
OneIsland_KindleRoad_Text_AbigailDefeat::
.string "Oh, you're so awful.$"
OneIsland_KindleRoad_Text_AbigailPostBattle:: @ 81896C1
OneIsland_KindleRoad_Text_AbigailPostBattle::
.string "I like that cap you have.\n"
.string "Maybe I should wear one, too…$"
OneIsland_KindleRoad_Text_FinnIntro:: @ 81896F9
OneIsland_KindleRoad_Text_FinnIntro::
.string "Seen from here, MT. EMBER towers\n"
.string "into the sky.$"
OneIsland_KindleRoad_Text_FinnDefeat:: @ 8189728
OneIsland_KindleRoad_Text_FinnDefeat::
.string "Well, aren't you tough?$"
OneIsland_KindleRoad_Text_FinnPostBattle:: @ 8189740
OneIsland_KindleRoad_Text_FinnPostBattle::
.string "The sky is immense around these\n"
.string "parts.$"
OneIsland_KindleRoad_Text_GarrettIntro:: @ 8189767
OneIsland_KindleRoad_Text_GarrettIntro::
.string "I took a break from swimming,\n"
.string "only to have you challenge me?$"
OneIsland_KindleRoad_Text_GarrettDefeat:: @ 81897A4
OneIsland_KindleRoad_Text_GarrettDefeat::
.string "Hey, what the…\n"
.string "You're good, you!$"
OneIsland_KindleRoad_Text_GarrettPostBattle:: @ 81897C5
OneIsland_KindleRoad_Text_GarrettPostBattle::
.string "Instead of using SURF all the time,\n"
.string "you should swim some.$"
OneIsland_KindleRoad_Text_TommyIntro:: @ 81897FF
OneIsland_KindleRoad_Text_TommyIntro::
.string "Wait! Wait a second!\n"
.string "I think I've hooked a big one!$"
OneIsland_KindleRoad_Text_TommyDefeat:: @ 8189833
OneIsland_KindleRoad_Text_TommyDefeat::
.string "I've lost it all again…$"
OneIsland_KindleRoad_Text_TommyPostBattle:: @ 818984B
OneIsland_KindleRoad_Text_TommyPostBattle::
.string "Not only did I lose, the big one\n"
.string "got away from me, too!$"
OneIsland_KindleRoad_Text_SharonIntro:: @ 8189883
OneIsland_KindleRoad_Text_SharonIntro::
.string "Could you help me out with my\n"
.string "training?$"
OneIsland_KindleRoad_Text_SharonDefeat:: @ 81898AB
OneIsland_KindleRoad_Text_SharonDefeat::
.string "You were a cut above me.$"
OneIsland_KindleRoad_Text_SharonPostBattle:: @ 81898C4
OneIsland_KindleRoad_Text_SharonPostBattle::
.string "It's clear that you're skilled.\n"
.string "I like you!$"
OneIsland_KindleRoad_Text_TanyaIntro:: @ 81898F0
OneIsland_KindleRoad_Text_TanyaIntro::
.string "There isn't a day in which we don't\n"
.string "train!$"
OneIsland_KindleRoad_Text_TanyaDefeat:: @ 818991B
OneIsland_KindleRoad_Text_TanyaDefeat::
.string "I'm such a fool!$"
OneIsland_KindleRoad_Text_TanyaPostBattle:: @ 818992C
OneIsland_KindleRoad_Text_TanyaPostBattle::
.string "I'll train even harder from now on!$"
OneIsland_KindleRoad_Text_SheaIntro:: @ 8189950
OneIsland_KindleRoad_Text_SheaIntro::
.string "Every morning, before breakfast,\n"
.string "I swim around this island.$"
OneIsland_KindleRoad_Text_SheaDefeat:: @ 818998C
OneIsland_KindleRoad_Text_SheaDefeat::
.string "Gasp…\n"
.string "Gasp…$"
OneIsland_KindleRoad_Text_SheaPostBattle:: @ 8189998
OneIsland_KindleRoad_Text_SheaPostBattle::
.string "I lost because I'm pooped from all\n"
.string "the running I did…$"
OneIsland_KindleRoad_Text_HughIntro:: @ 81899CE
OneIsland_KindleRoad_Text_HughIntro::
.string "Dress appropriately for battle!\n"
.string "Lose that frivolous outfit!$"
OneIsland_KindleRoad_Text_HughDefeat:: @ 8189A0A
OneIsland_KindleRoad_Text_HughDefeat::
.string "Why me?!$"
OneIsland_KindleRoad_Text_HughPostBattle:: @ 8189A13
OneIsland_KindleRoad_Text_HughPostBattle::
.string "Even martial artists are becoming\n"
.string "fashion conscious these days…$"
OneIsland_KindleRoad_Text_BryceIntro:: @ 8189A53
OneIsland_KindleRoad_Text_BryceIntro::
.string "You know, everything tastes great\n"
.string "when you're out in the wild.$"
OneIsland_KindleRoad_Text_BryceDefeat:: @ 8189A92
OneIsland_KindleRoad_Text_BryceDefeat::
.string "Awww, blown!$"
OneIsland_KindleRoad_Text_BrycePostBattle:: @ 8189A9F
OneIsland_KindleRoad_Text_BrycePostBattle::
.string "The water in volcanic regions is\n"
.string "delicious.$"
OneIsland_KindleRoad_Text_ClaireIntro:: @ 8189ACB
OneIsland_KindleRoad_Text_ClaireIntro::
.string "My lunch filled us up, so will you\n"
.string "battle us for some exercise?$"
OneIsland_KindleRoad_Text_ClaireDefeat:: @ 8189B0B
OneIsland_KindleRoad_Text_ClaireDefeat::
.string "That made me all sweaty.$"
OneIsland_KindleRoad_Text_ClairePostBattle:: @ 8189B24
OneIsland_KindleRoad_Text_ClairePostBattle::
.string "What should I do?\n"
.string "I feel famished again.$"
OneIsland_KindleRoad_Text_KiaIntro:: @ 8189B4D
OneIsland_KindleRoad_Text_KiaIntro::
.string "KIA: My big brother and I make\n"
.string "an awesome combination!$"
OneIsland_KindleRoad_Text_KiaDefeat:: @ 8189B84
OneIsland_KindleRoad_Text_KiaDefeat::
.string "KIA: Huh?!\n"
.string "I can't believe it!$"
OneIsland_KindleRoad_Text_KiaPostBattle:: @ 8189BA3
OneIsland_KindleRoad_Text_KiaPostBattle::
.string "KIA: How could there be anyone\n"
.string "better than my big brother?$"
OneIsland_KindleRoad_Text_KiaNotEnoughMons:: @ 8189BDE
OneIsland_KindleRoad_Text_KiaNotEnoughMons::
.string "KIA: If you want to battle with\n"
.string "us, you have to bring at least two\l"
.string "POKéMON with you.$"
OneIsland_KindleRoad_Text_MikIntro:: @ 8189C33
OneIsland_KindleRoad_Text_MikIntro::
.string "MIK: Together with KIA, I'm afraid\n"
.string "of nothing!$"
OneIsland_KindleRoad_Text_MikDefeat:: @ 8189C62
OneIsland_KindleRoad_Text_MikDefeat::
.string "MIK: Whoa!\n"
.string "That's too much!$"
OneIsland_KindleRoad_Text_MikPostBattle:: @ 8189C7E
OneIsland_KindleRoad_Text_MikPostBattle::
.string "MIK: How could my combination\n"
.string "with KIA fail?$"
OneIsland_KindleRoad_Text_MikNotEnoughMons:: @ 8189CAB
OneIsland_KindleRoad_Text_MikNotEnoughMons::
.string "MIK: Hey, do you want to battle\n"
.string "with us two?\p"
.string "Bring two or more POKéMON with\n"
.string "you, then.$"
OneIsland_KindleRoad_Text_RouteSign:: @ 8189D02
OneIsland_KindleRoad_Text_RouteSign::
.string "This is KINDLE ROAD.\p"
.string "Go straight for MT. EMBER.$"
OneIsland_KindleRoad_Text_EmberSpaSign:: @ 8189D32
OneIsland_KindleRoad_Text_EmberSpaSign::
.string "Light the Fire in Your Heart!\n"
.string "EMBER SPA$"