dionmoustos/Pokemon-Firered
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'master' into doc-sixisland

Browse Source
This commit is contained in:
GriffinR
2020-03-02 10:48:56 -05:00
committed by GitHub
parent 47f6e9f973 5198a05272
commit 6280a3786b
141 changed files with 2894 additions and 4342 deletions
Download Patch File Download Diff File Expand all files Collapse all files
data/text/fame_checker.inc
+2 -2
View File
@@ -1429,7 +1429,7 @@ gUnknown_81B17E9:: @ 81B17E9
.string "shades only when he is thinking up\l"
.string "new quiz questions.$"
gUnknown_81B187F:: @ 81B187F
PokemonJournal_Text_SpecialFeatureLorelei:: @ 81B187F
.string "POKéMON JOURNAL\p"
.string "Special Feature:\n"
.string "ELITE FOUR's LORELEI!\p"
@@ -1468,7 +1468,7 @@ PokemonJournal_Text_SpecialFeatureProfOak:: @ 81B1AB9
.string "PROF. OAK reportedly lives with his\n"
.string "grandchildren DAISY and {RIVAL}.$"
gUnknown_81B1B3D:: @ 81B1B3D
PokemonJournal_Text_SpecialFeatureDaisyOak:: @ 81B1B3D
.string "This is a POKéMON JOURNAL from\n"
.string "years ago…\p"
.string "POKéMON JOURNAL\n"
data/text/trainer_card.inc
+30 -30
View File
@@ -1,31 +1,31 @@
gUnknown_81B1D7D:: @ 81B1D7D
CeladonCity_GameCorner_Text_TryPokemonPrinter:: @ 81B1D7D
.string "It's a POKéMON PRINTER!\p"
.string "It can put a print of your POKéMON\n"
.string "on the back of your TRAINER CARD.\p"
.string "It costs only ¥50.\n"
.string "Would you like to try it?$"
gUnknown_81B1E07:: @ 81B1E07
CeladonCity_GameCorner_Text_DontHaveEnoughMoney:: @ 81B1E07
.string "You don't have enough money.$"
gUnknown_81B1E24:: @ 81B1E24
CeladonCity_GameCorner_Text_ChoosePrintType:: @ 81B1E24
.string "Please choose the print type.$"
gUnknown_81B1E42:: @ 81B1E42
CeladonCity_GameCorner_Text_BigSmileForPhoto:: @ 81B1E42
.string "A big smile for the photo, please!\n"
.string "Three… Two… One…\p"
.string "Flash!$"
gUnknown_81B1E7D:: @ 81B1E7D
CeladonCity_GameCorner_Text_PrintIsReadyCheckTrainerCard:: @ 81B1E7D
.string "Your POKéMON print is ready!\n"
.string "Check your TRAINER CARD.$"
gUnknown_81B1EB3:: @ 81B1EB3
FourIsland_House2_Text_WishICouldShowOffStickers:: @ 81B1EB3
.string "Giggle…\n"
.string "I collected a ton of STICKERS.\l"
.string "I wish I could show them off…$"
gUnknown_81B1EF8:: @ 81B1EF8
FourIsland_House2_Text_GiveYouStickerIfYouBrag:: @ 81B1EF8
.string "Oh, excellent!\n"
.string "You've come to the right place!\p"
.string "Look, look! See? See?\n"
@@ -38,113 +38,113 @@ gUnknown_81B1EF8:: @ 81B1EF8
.string "yourself.\p"
.string "What will you brag about?$"
gUnknown_81B1FEF:: @ 81B1FEF
FourIsland_House2_Text_BragAboutSomethingForMe:: @ 81B1FEF
.string "Brag about something for me.\n"
.string "I'll give you a STICKER.$"
gUnknown_81B2025:: @ 81B2025
FourIsland_House2_Text_BragAboutWhatToday:: @ 81B2025
.string "Oh, hi!\n"
.string "Here comes the braggart.\p"
.string "What are you going to brag about\n"
.string "today?$"
gUnknown_81B206E:: @ 81B206E
FourIsland_House2_Text_WowHoFLowest:: @ 81B206E
.string "Oh, wow, you made it into the\n"
.string "HALL OF FAME.\p"
.string "That's pretty good, yup!\n"
.string "I'll give you one of these.$"
gUnknown_81B20CF:: @ 81B20CF
FourIsland_House2_Text_WowHoFLow:: @ 81B20CF
.string "Oh, wow, you've entered the\n"
.string "HALL OF FAME often!\p"
.string "That's impressive, yup!\n"
.string "I'll give you one of these.$"
gUnknown_81B2133:: @ 81B2133
FourIsland_House2_Text_WowHoFHigh:: @ 81B2133
.string "Whoa! You've made it into the\n"
.string "HALL OF FAME that often?\l"
.string "That's seriously incredible, yup!\p"
.string "You own the POKéMON LEAGUE!\n"
.string "I'll give you one of these.$"
gUnknown_81B21C4:: @ 81B21C4
FourIsland_House2_Text_WowHoFHighest:: @ 81B21C4
.string "No way! You've gone into the\n"
.string "HALL OF FAME that many times?\p"
.string "You're beyond incredible, yup!\n"
.string "That's it, I have to give you this.$"
gUnknown_81B2242:: @ 81B2242
FourIsland_House2_Text_HoFStickerApplied:: @ 81B2242
.string "The HALL OF FAME STICKER was\n"
.string "applied to the TRAINER CARD.$"
gUnknown_81B227C:: @ 81B227C
FourIsland_House2_Text_ComeBackWithBetterStoryHoF:: @ 81B227C
.string "Hmm…\p"
.string "Come back with a better story next\n"
.string "time, okay?$"
gUnknown_81B22B0:: @ 81B22B0
FourIsland_House2_Text_LivingLegendHoF:: @ 81B22B0
.string "Oh, no, no can do.\p"
.string "You're practically a living legend.\n"
.string "I have no SITCKERS left to give.$"
gUnknown_81B2308:: @ 81B2308
FourIsland_House2_Text_WowEggsLowest:: @ 81B2308
.string "Oh, wow, there are POKéMON EGGS?\n"
.string "I didn't know that!\p"
.string "That's pretty good, yup!\n"
.string "I'll give you one of these.$"
gUnknown_81B2372:: @ 81B2372
FourIsland_House2_Text_WowEggsLow:: @ 81B2372
.string "You've hatched that many EGGS?\n"
.string "You really must like them!\p"
.string "That's impressive, yup!\n"
.string "I'll give you one of these.$"
gUnknown_81B23E0:: @ 81B23E0
FourIsland_House2_Text_WowEggsHigh:: @ 81B23E0
.string "Whoa! You've hatched a whole\n"
.string "bunch of EGGS!\p"
.string "You're an EGG-hatching machine!\n"
.string "I'll give you one of these.$"
gUnknown_81B2448:: @ 81B2448
FourIsland_House2_Text_WowEggsHighest:: @ 81B2448
.string "Wh… You hatched that many EGGS?\p"
.string "What's behind your love of EGGS?\n"
.string "It's beyond incredible, yup!\p"
.string "You're too awesome, I tell you.\n"
.string "That's it, I have to give you this.$"
gUnknown_81B24EA:: @ 81B24EA
FourIsland_House2_Text_EggStickerApplied:: @ 81B24EA
.string "The EGG STICKER was applied\n"
.string "to the TRAINER CARD.$"
gUnknown_81B251B:: @ 81B251B
FourIsland_House2_Text_ComeBackWithBetterStoryEggs:: @ 81B251B
.string "Hmm…\p"
.string "Come back with a better story next\n"
.string "time, okay?$"
gUnknown_81B254F:: @ 81B254F
FourIsland_House2_Text_LivingLegendEggs:: @ 81B254F
.string "Oh, no, no can do.\p"
.string "You're practically a living legend.\n"
.string "I have no SITCKERS left to give.$"
gUnknown_81B25A7:: @ 81B25A7
FourIsland_House2_Text_WowLinkWinsLowest:: @ 81B25A7
.string "Oh, wow, you've had success\n"
.string "link battling?\p"
.string "You're pretty strong, yup!\n"
.string "I'll give you one of these.$"
gUnknown_81B2609:: @ 81B2609
FourIsland_House2_Text_WowLinkWinsLow:: @ 81B2609
.string "You've beaten your friends a lot\n"
.string "link battling, huh?\p"
.string "You're impressively strong, yup!\n"
.string "I'll give you one of these.$"
gUnknown_81B267B:: @ 81B267B
FourIsland_House2_Text_WowLinkWinsHigh:: @ 81B267B
.string "Whoa! You've beaten your friends\n"
.string "a frightful number of times.\p"
.string "Have you lost friends over this?\n"
.string "I'll give you one of these.$"
gUnknown_81B26F6:: @ 81B26F6
FourIsland_House2_Text_WowLinkWinsHighest:: @ 81B26F6
.string "Wh… Wickedly whoa!\n"
.string "You've won mind-blowingly often!\p"
.string "It just knocks me out thinking\n"
@@ -152,16 +152,16 @@ gUnknown_81B26F6:: @ 81B26F6
.string "You're the stuff of nightmares!\n"
.string "That's it, I have to give you this.$"
gUnknown_81B27A6:: @ 81B27A6
FourIsland_House2_Text_VictoryStickerApplied:: @ 81B27A6
.string "The VICTORY STICKER was applied\n"
.string "to the TRAINER CARD.$"
gUnknown_81B27DB:: @ 81B27DB
FourIsland_House2_Text_ComeBackWithBetterStoryLinkWins:: @ 81B27DB
.string "Hmm…\p"
.string "Come back with a better story next\n"
.string "time, okay?$"
gUnknown_81B280F:: @ 81B280F
FourIsland_House2_Text_LivingLegendLinkWins:: @ 81B280F
.string "Oh, no, no can do.\p"
.string "You're practically a living legend.\n"
.string "I have no SITCKERS left to give.$"
data/text/trainers.inc
+18 -18
View File
@@ -765,80 +765,80 @@ OneIsland_KindleRoad_Text_MikRematchIntro:: @ 81C3A55
.string "afraid of nothing!\p"
.string "We'll prove it to you this time!$"
Text_1C3AA7:: @ 81C3AA7
ThreeIsland_BondBridge_Text_NikkiRematchIntro:: @ 81C3AA7
.string "Are we to battle again?$"
Text_1C3ABF:: @ 81C3ABF
ThreeIsland_BondBridge_Text_VioletRematchIntro:: @ 81C3ABF
.string "From where have you come, and\n"
.string "where are you bound?$"
Text_1C3AF2:: @ 81C3AF2
ThreeIsland_BondBridge_Text_AmiraRematchIntro:: @ 81C3AF2
.string "I want to swim without my float\n"
.string "ring soon.$"
Text_1C3B1D:: @ 81C3B1D
ThreeIsland_BondBridge_Text_AlexisRematchIntro:: @ 81C3B1D
.string "Yay, yay!\n"
.string "POKéMON!$"
Text_1C3B30:: @ 81C3B30
ThreeIsland_BondBridge_Text_TishaRematchIntro:: @ 81C3B30
.string "Oh, no, didn't I tell you already?\n"
.string "Please, stay away from me!$"
Text_1C3B6E:: @ 81C3B6E
ThreeIsland_BondBridge_Text_JoyRematchIntro:: @ 81C3B6E
.string "JOY: We've gotten stronger!\n"
.string "Lots and lots!$"
Text_1C3B99:: @ 81C3B99
ThreeIsland_BondBridge_Text_MegRematchIntro:: @ 81C3B99
.string "MEG: You can't beat us today!$"
Text_1C3BB7:: @ 81C3BB7
FiveIsland_WaterLabyrinth_Text_AlizeRematchIntro:: @ 81C3BB7
.string "Oh, hello!\p"
.string "Are you raising your POKéMON in a\n"
.string "good environment?$"
Text_1C3BF6:: @ 81C3BF6
FiveIsland_ResortGorgeous_Text_DaisyRematchIntro:: @ 81C3BF6
.string "With these hands, I will create\n"
.string "my victory today.$"
Text_1C3C28:: @ 81C3C28
FiveIsland_ResortGorgeous_Text_CelinaRematchIntro:: @ 81C3C28
.string "Must I repeat myself?\n"
.string "I'm trying to paint.\l"
.string "Please keep out of my sight!$"
Text_1C3C70:: @ 81C3C70
FiveIsland_ResortGorgeous_Text_RaynaRematchIntro:: @ 81C3C70
.string "I haven't made any progress…\n"
.string "I still can't get the right angle…$"
Text_1C3CB0:: @ 81C3CB0
FiveIsland_ResortGorgeous_Text_JackiRematchIntro:: @ 81C3CB0
.string "Oh, you will give me another\n"
.string "opportunity to match wits with you?$"
Text_1C3CF1:: @ 81C3CF1
FiveIsland_ResortGorgeous_Text_GillianRematchIntro:: @ 81C3CF1
.string "They're almost finished making the\n"
.string "pool for my POKéMON.\p"
.string "You must drop in for a visit.$"
Text_1C3D47:: @ 81C3D47
FiveIsland_ResortGorgeous_Text_DestinRematchIntro:: @ 81C3D47
.string "I'm a good runner.\n"
.string "I've gotten even faster!$"
Text_1C3D73:: @ 81C3D73
FiveIsland_ResortGorgeous_Text_TobyRematchIntro:: @ 81C3D73
.string "I say, friend!\n"
.string "Let us enjoy our time together!$"
Text_1C3DA2:: @ 81C3DA2
FiveIsland_MemorialPillar_Text_MiloRematchIntro:: @ 81C3DA2
.string "I'm the eldest of the BIRD\n"
.string "BROTHERS. Remember me?\p"
.string "That's right, I'm the one who loves\n"
.string "birds for their beaks!$"
Text_1C3E0F:: @ 81C3E0F
FiveIsland_MemorialPillar_Text_ChazRematchIntro:: @ 81C3E0F
.string "I'm the middle kid of the BIRD\n"
.string "BROTHERS.\p"
.string "I'm the one that loves wings.\n"
.string "Let's battle again!$"
Text_1C3E6A:: @ 81C3E6A
FiveIsland_MemorialPillar_Text_HaroldRematchIntro:: @ 81C3E6A
.string "I'm the youngest of the BIRD\n"
.string "BROTHERS.\p"
.string "I love birds for their down.\n"