From 6cd573b051b97fa573802ac541d3d4a28cbebc08 Mon Sep 17 00:00:00 2001 From: IIMarckus Date: Mon, 3 Nov 2014 01:21:58 -0700 Subject: Fix some misattributed texts. --- stadiumgs/Makefile | 12 +-- stadiumgs/text/academy/skilltest/trainer/cindy.txt | 81 --------------------- stadiumgs/text/academy/skilltest/trainer/cyndy.txt | 81 +++++++++++++++++++++ stadiumgs/text/gymleadercastle/mahogany/carol1.txt | 81 +++++++++++++++++++++ stadiumgs/text/gymleadercastle/mahogany/carol2.txt | 81 +++++++++++++++++++++ stadiumgs/text/gymleadercastle/mahogany/kathy1.txt | 81 --------------------- stadiumgs/text/gymleadercastle/mahogany/kathy2.txt | 81 --------------------- stadiumgs/text/primecup/flora1.txt | 81 --------------------- stadiumgs/text/primecup/flora2.txt | 80 -------------------- stadiumgs/text/primecup/floria1.txt | 81 +++++++++++++++++++++ stadiumgs/text/primecup/floria2.txt | 80 ++++++++++++++++++++ stadiumgs/text/primecup/teresa1.txt | 85 ---------------------- stadiumgs/text/primecup/terry1.txt | 85 ++++++++++++++++++++++ 13 files changed, 495 insertions(+), 495 deletions(-) delete mode 100644 stadiumgs/text/academy/skilltest/trainer/cindy.txt create mode 100644 stadiumgs/text/academy/skilltest/trainer/cyndy.txt create mode 100644 stadiumgs/text/gymleadercastle/mahogany/carol1.txt create mode 100644 stadiumgs/text/gymleadercastle/mahogany/carol2.txt delete mode 100644 stadiumgs/text/gymleadercastle/mahogany/kathy1.txt delete mode 100644 stadiumgs/text/gymleadercastle/mahogany/kathy2.txt delete mode 100644 stadiumgs/text/primecup/flora1.txt delete mode 100644 stadiumgs/text/primecup/flora2.txt create mode 100644 stadiumgs/text/primecup/floria1.txt create mode 100644 stadiumgs/text/primecup/floria2.txt delete mode 100644 stadiumgs/text/primecup/teresa1.txt create mode 100644 stadiumgs/text/primecup/terry1.txt diff --git a/stadiumgs/Makefile b/stadiumgs/Makefile index 1bba844..882b36a 100644 --- a/stadiumgs/Makefile +++ b/stadiumgs/Makefile @@ -97,7 +97,7 @@ TBLS = \ text/gymleadercastle/rocket/executivef1.bin \ text/gymleadercastle/rocket/executivem1.bin \ text/gymleadercastle/mahogany/alvin1.bin \ - text/gymleadercastle/mahogany/kathy1.bin \ + text/gymleadercastle/mahogany/carol1.bin \ text/gymleadercastle/mahogany/pryce1.bin \ text/gymleadercastle/blackthorn/gloria1.bin \ text/gymleadercastle/blackthorn/vince1.bin \ @@ -189,10 +189,10 @@ TBLS = \ text/littlecup/cora1.bin \ text/littlecup/tina1.bin \ text/littlecup/rex1.bin \ - text/primecup/teresa1.bin \ + text/primecup/terry1.bin \ text/primecup/yang1.bin \ text/primecup/adam1.bin \ - text/primecup/flora1.bin \ + text/primecup/floria1.bin \ text/primecup/chase1.bin \ text/primecup/craig1.bin \ text/primecup/kathy1.bin \ @@ -216,7 +216,7 @@ TBLS = \ text/gymleadercastle/rocket/executivef2.bin \ text/gymleadercastle/rocket/executivem2.bin \ text/gymleadercastle/mahogany/alvin2.bin \ - text/gymleadercastle/mahogany/kathy2.bin \ + text/gymleadercastle/mahogany/carol2.bin \ text/gymleadercastle/mahogany/pryce2.bin \ text/gymleadercastle/blackthorn/gloria2.bin \ text/gymleadercastle/blackthorn/vince2.bin \ @@ -310,7 +310,7 @@ TBLS = \ text/primecup/terry2.bin \ text/primecup/yang2.bin \ text/primecup/adam2.bin \ - text/primecup/flora2.bin \ + text/primecup/floria2.bin \ text/primecup/chase2.bin \ text/primecup/craig2.bin \ text/primecup/kathy2.bin \ @@ -321,7 +321,7 @@ TBLS = \ text/academy/skilltest/trainer/carson.bin \ text/academy/skilltest/trainer/clayton.bin \ text/academy/skilltest/trainer/jonathan.bin \ - text/academy/skilltest/trainer/cindy.bin \ + text/academy/skilltest/trainer/cyndy.bin \ text/academy/skilltest/trainer/nancy.bin \ text/academy/skilltest/gymleader/joseph.bin \ text/academy/skilltest/gymleader/naomi.bin \ diff --git a/stadiumgs/text/academy/skilltest/trainer/cindy.txt b/stadiumgs/text/academy/skilltest/trainer/cindy.txt deleted file mode 100644 index aba0cbd..0000000 --- a/stadiumgs/text/academy/skilltest/trainer/cindy.txt +++ /dev/null @@ -1,81 +0,0 @@ -Aren't my POKéMON nice? But they're very...uh...forgetful. - -Have you ever experienced the power of AMNESIA? - -Do you find my POKéMON nice? They're very forgetful. - -Hip, hip, hooray! - -#26, please do it! - -Get out there, #26! - -We can do it, #26! - -#26! Here's your chance! - -That's not right... Come back, #26! - -Switch out, #26! - -That's good, #26. Come back! - -That's wonderful, #26! Come back! - -Aiyeeee! That's not fair! - -Yippee, yippee, yippee! - -Hit the weak spot! I'm so happy! - -Critical hit? Are you all right, #26?!? - -No! That was nasty! - -Look, look! - -Don't give up, #26! - -Outstanding! Outstanding! - -No fair! - -I often get scolded for forgetting things. - -I'd like to SURF in the sea in summertime. - -I wish I could go on a picnic with muscular -POKéMON. - -We use this to light the fire when we're -cooking outside. - -See? Isn't AMNESIA amazing? - -AMNESIA makes my SPECIAL DEFENSE complete! - -With AMNESIA, SPECIAL DEFENSE is assured! - -Waaaaah! I'm going to tell EARL! - -Aaah! That's so annoying. After all the effort of using AMNESIA! - -I've already forgotten about losing! ...Just kidding! - -Hmm... I guess these things happen. - -It must be about time for me to go on my picnic. - - - - - - - - - - - - - - diff --git a/stadiumgs/text/academy/skilltest/trainer/cyndy.txt b/stadiumgs/text/academy/skilltest/trainer/cyndy.txt new file mode 100644 index 0000000..aba0cbd --- /dev/null +++ b/stadiumgs/text/academy/skilltest/trainer/cyndy.txt @@ -0,0 +1,81 @@ +Aren't my POKéMON nice? But they're very...uh...forgetful. + +Have you ever experienced the power of AMNESIA? + +Do you find my POKéMON nice? They're very forgetful. + +Hip, hip, hooray! + +#26, please do it! + +Get out there, #26! + +We can do it, #26! + +#26! Here's your chance! + +That's not right... Come back, #26! + +Switch out, #26! + +That's good, #26. Come back! + +That's wonderful, #26! Come back! + +Aiyeeee! That's not fair! + +Yippee, yippee, yippee! + +Hit the weak spot! I'm so happy! + +Critical hit? Are you all right, #26?!? + +No! That was nasty! + +Look, look! + +Don't give up, #26! + +Outstanding! Outstanding! + +No fair! + +I often get scolded for forgetting things. + +I'd like to SURF in the sea in summertime. + +I wish I could go on a picnic with muscular +POKéMON. + +We use this to light the fire when we're +cooking outside. + +See? Isn't AMNESIA amazing? + +AMNESIA makes my SPECIAL DEFENSE complete! + +With AMNESIA, SPECIAL DEFENSE is assured! + +Waaaaah! I'm going to tell EARL! + +Aaah! That's so annoying. After all the effort of using AMNESIA! + +I've already forgotten about losing! ...Just kidding! + +Hmm... I guess these things happen. + +It must be about time for me to go on my picnic. + + + + + + + + + + + + + + diff --git a/stadiumgs/text/gymleadercastle/mahogany/carol1.txt b/stadiumgs/text/gymleadercastle/mahogany/carol1.txt new file mode 100644 index 0000000..55c2237 --- /dev/null +++ b/stadiumgs/text/gymleadercastle/mahogany/carol1.txt @@ -0,0 +1,81 @@ +Skiing has to be the ultimate winter sport. + +Lots of trainers take their POKéMON to the ski slopes. + +You don't even notice the cold when you're having fun. Isn't +that strange? + +I'm going with #26! + +My choice is #26! + +#26 ought to do it. + +Play it cool, #26. + +#26 might be the one. + +#26 might not be right. + +#26 gets the hook. + +I'm switching #26 out. + +I'm pulling #26. + +Oh, no! Wait a second! + +Ooh, fabulous! + +Look, look! Isn't it super? Now that's a +critical hit! + +Critical hit? That one doesn't count! No? + +Huh? You can do that? + +Look. Look! Did you see that? + +That's really dull. + +There! I did it! + +Oh! #26! + +This is a gift! + +Cool! It's frozen! + +Don't you like the cold? + +Oh, I'm sorry. + +Yahoo! Hey, this might be more fun than skiing. + +Now that that's done, I can get back to the slopes. + +My POKéMON are spectacular, aren't they? + +Aiyee! That was no fun! I'm hitting the slopes. + +I guess my plan just got swept away. + +No matter how much I fall, I just keep bouncing back for more... + +That's enough battling. I'm off to the slopes. + +What's that? Where are you going? + +DELIOW + +AZUMAROW + +CUBONOW + +QWILOW + +DRATINOW + +SEADROW + + diff --git a/stadiumgs/text/gymleadercastle/mahogany/carol2.txt b/stadiumgs/text/gymleadercastle/mahogany/carol2.txt new file mode 100644 index 0000000..23230ae --- /dev/null +++ b/stadiumgs/text/gymleadercastle/mahogany/carol2.txt @@ -0,0 +1,81 @@ +Skiing has to be the ultimate winter sport. + +Lots of trainers take their POKéMON to the ski slopes. + +You don't even notice the cold when you're having fun. Isn't +that strange? + +I'm going with #26! + +My choice is #26! + +#26 ought to do it. + +Play it cool, #26. + +#26 might be the one. + +#26 might not be right. + +#26 gets the hook. + +I'm switching #26 out. + +I'm pulling #26. + +Oh, no! Wait a second! + +Ooh, fabulous! + +Look, look! Isn't it super? Now that's a +critical hit! + +Critical hit? That one doesn't count! No? + +Huh? You can do that? + +Look. Look! Did you see that? + +That's really dull. + +There! I did it! + +Oh! #26! + +This is a gift! + +Cool! It's frozen! + +Don't you like the cold? + +Oh, I'm sorry. + +Yahoo! Hey, this might be more fun than skiing. + +Now that that's done, I can get back to the slopes. + +My POKéMON are spectacular, aren't they? + +Aiyee! That was no fun! I'm hitting the slopes. + +I guess my plan just got swept away. + +No matter how much I fall, I just keep bouncing back for more... + +That's enough battling. I'm off to the slopes. + +What's that? Where are you going? + +SEAROW + +RATICOW + +OMASTOW + +WAKOW + +WHIRLOW + +SIANSOW + + diff --git a/stadiumgs/text/gymleadercastle/mahogany/kathy1.txt b/stadiumgs/text/gymleadercastle/mahogany/kathy1.txt deleted file mode 100644 index 55c2237..0000000 --- a/stadiumgs/text/gymleadercastle/mahogany/kathy1.txt +++ /dev/null @@ -1,81 +0,0 @@ -Skiing has to be the ultimate winter sport. - -Lots of trainers take their POKéMON to the ski slopes. - -You don't even notice the cold when you're having fun. Isn't -that strange? - -I'm going with #26! - -My choice is #26! - -#26 ought to do it. - -Play it cool, #26. - -#26 might be the one. - -#26 might not be right. - -#26 gets the hook. - -I'm switching #26 out. - -I'm pulling #26. - -Oh, no! Wait a second! - -Ooh, fabulous! - -Look, look! Isn't it super? Now that's a -critical hit! - -Critical hit? That one doesn't count! No? - -Huh? You can do that? - -Look. Look! Did you see that? - -That's really dull. - -There! I did it! - -Oh! #26! - -This is a gift! - -Cool! It's frozen! - -Don't you like the cold? - -Oh, I'm sorry. - -Yahoo! Hey, this might be more fun than skiing. - -Now that that's done, I can get back to the slopes. - -My POKéMON are spectacular, aren't they? - -Aiyee! That was no fun! I'm hitting the slopes. - -I guess my plan just got swept away. - -No matter how much I fall, I just keep bouncing back for more... - -That's enough battling. I'm off to the slopes. - -What's that? Where are you going? - -DELIOW - -AZUMAROW - -CUBONOW - -QWILOW - -DRATINOW - -SEADROW - - diff --git a/stadiumgs/text/gymleadercastle/mahogany/kathy2.txt b/stadiumgs/text/gymleadercastle/mahogany/kathy2.txt deleted file mode 100644 index 23230ae..0000000 --- a/stadiumgs/text/gymleadercastle/mahogany/kathy2.txt +++ /dev/null @@ -1,81 +0,0 @@ -Skiing has to be the ultimate winter sport. - -Lots of trainers take their POKéMON to the ski slopes. - -You don't even notice the cold when you're having fun. Isn't -that strange? - -I'm going with #26! - -My choice is #26! - -#26 ought to do it. - -Play it cool, #26. - -#26 might be the one. - -#26 might not be right. - -#26 gets the hook. - -I'm switching #26 out. - -I'm pulling #26. - -Oh, no! Wait a second! - -Ooh, fabulous! - -Look, look! Isn't it super? Now that's a -critical hit! - -Critical hit? That one doesn't count! No? - -Huh? You can do that? - -Look. Look! Did you see that? - -That's really dull. - -There! I did it! - -Oh! #26! - -This is a gift! - -Cool! It's frozen! - -Don't you like the cold? - -Oh, I'm sorry. - -Yahoo! Hey, this might be more fun than skiing. - -Now that that's done, I can get back to the slopes. - -My POKéMON are spectacular, aren't they? - -Aiyee! That was no fun! I'm hitting the slopes. - -I guess my plan just got swept away. - -No matter how much I fall, I just keep bouncing back for more... - -That's enough battling. I'm off to the slopes. - -What's that? Where are you going? - -SEAROW - -RATICOW - -OMASTOW - -WAKOW - -WHIRLOW - -SIANSOW - - diff --git a/stadiumgs/text/primecup/flora1.txt b/stadiumgs/text/primecup/flora1.txt deleted file mode 100644 index fa886ab..0000000 --- a/stadiumgs/text/primecup/flora1.txt +++ /dev/null @@ -1,81 +0,0 @@ -I study extensively. That makes me strong. - -I'm not going to pull any punches! Ready? - -Let's have a battle for practice's sake. - -Number one! #26! - -#26, let's go! - -It has to be #26! - -#26 will do. - -#26 will tend to you. - -Draw back for now! - -#26, it's over! - -#26, finish! - -It's all over, #26! - -Aack! I misplayed that! - -Bingo! Exactly as planned! - -Yes! That hit the weak spot! Just as I -planned it! - -Critical hit? That one couldn't be helped. - -Oh! That's a little annoying! - -So... We do this now and... - -Awww, that's so tedious. - -And that's the game! Ha, ha, ha... - -Oh... How could this happen...? - -Your eyelids feel heavy... You're getting -sleepy... - -You should train a little at a time, every day. - -Excessive training is a problem. - -Hee, hee... It's taking a snooze. - -That was a foregone conclusion. - -For some reason, I don't feel like I've battled. - -That was quite good. You should keep working at this, too. - -Arrrgh... I won't forgive you for this! - -This must mean that I still have much to learn. - -I'm going to use this disappointment to motivate me! - -How could this happen, I wonder? - -Oh? But why? - -STANTANCE - -HYPNANCE - -GUTORANCE - -FABLANCE - -REEBELANCE - -WRATHANCE - - diff --git a/stadiumgs/text/primecup/flora2.txt b/stadiumgs/text/primecup/flora2.txt deleted file mode 100644 index 9b5559c..0000000 --- a/stadiumgs/text/primecup/flora2.txt +++ /dev/null @@ -1,80 +0,0 @@ -I study extensively. That makes me strong. - -I'm not going to pull any punches! Ready? - -Let's have a battle for practice's sake. - -Number one! #26! - -#26, let's go! - -It has to be #26! - -#26 will do. - -#26 will tend to you. - -Draw back for now! - -#26, it's over! - -#26, finish! - -It's all over, #26! - -Aack! I misplayed that! - -Bingo! Exactly as planned! - -Yes! That hit the weak spot! Just as I -planned it! - -Critical hit? That one couldn't be helped. - -Oh! That's a little annoying! - -So... We do this now and... - -Awww, that's so tedious. - -And that's the game! Ha, ha, ha... - -Oh... How could this happen...? - -I want you to sleep for a while... - -PSYCHIC! It will torture you! - -Excessive training is a problem. - -Good night! - -That was a foregone conclusion. - -For some reason, I don't feel like I've battled. - -That was quite good. You should keep working at this, too. - -Arrrgh... I won't forgive you for this! - -This must mean that I still have much to learn. - -I'm going to use this disappointment to motivate me! - -How could this happen, I wonder? - -Oh? But why? - -HYANCE - -UTORANCE - -DASHANCE - -TOEDANCE - -MR.MANCE - -ESPANCE - - diff --git a/stadiumgs/text/primecup/floria1.txt b/stadiumgs/text/primecup/floria1.txt new file mode 100644 index 0000000..fa886ab --- /dev/null +++ b/stadiumgs/text/primecup/floria1.txt @@ -0,0 +1,81 @@ +I study extensively. That makes me strong. + +I'm not going to pull any punches! Ready? + +Let's have a battle for practice's sake. + +Number one! #26! + +#26, let's go! + +It has to be #26! + +#26 will do. + +#26 will tend to you. + +Draw back for now! + +#26, it's over! + +#26, finish! + +It's all over, #26! + +Aack! I misplayed that! + +Bingo! Exactly as planned! + +Yes! That hit the weak spot! Just as I +planned it! + +Critical hit? That one couldn't be helped. + +Oh! That's a little annoying! + +So... We do this now and... + +Awww, that's so tedious. + +And that's the game! Ha, ha, ha... + +Oh... How could this happen...? + +Your eyelids feel heavy... You're getting +sleepy... + +You should train a little at a time, every day. + +Excessive training is a problem. + +Hee, hee... It's taking a snooze. + +That was a foregone conclusion. + +For some reason, I don't feel like I've battled. + +That was quite good. You should keep working at this, too. + +Arrrgh... I won't forgive you for this! + +This must mean that I still have much to learn. + +I'm going to use this disappointment to motivate me! + +How could this happen, I wonder? + +Oh? But why? + +STANTANCE + +HYPNANCE + +GUTORANCE + +FABLANCE + +REEBELANCE + +WRATHANCE + + diff --git a/stadiumgs/text/primecup/floria2.txt b/stadiumgs/text/primecup/floria2.txt new file mode 100644 index 0000000..9b5559c --- /dev/null +++ b/stadiumgs/text/primecup/floria2.txt @@ -0,0 +1,80 @@ +I study extensively. That makes me strong. + +I'm not going to pull any punches! Ready? + +Let's have a battle for practice's sake. + +Number one! #26! + +#26, let's go! + +It has to be #26! + +#26 will do. + +#26 will tend to you. + +Draw back for now! + +#26, it's over! + +#26, finish! + +It's all over, #26! + +Aack! I misplayed that! + +Bingo! Exactly as planned! + +Yes! That hit the weak spot! Just as I +planned it! + +Critical hit? That one couldn't be helped. + +Oh! That's a little annoying! + +So... We do this now and... + +Awww, that's so tedious. + +And that's the game! Ha, ha, ha... + +Oh... How could this happen...? + +I want you to sleep for a while... + +PSYCHIC! It will torture you! + +Excessive training is a problem. + +Good night! + +That was a foregone conclusion. + +For some reason, I don't feel like I've battled. + +That was quite good. You should keep working at this, too. + +Arrrgh... I won't forgive you for this! + +This must mean that I still have much to learn. + +I'm going to use this disappointment to motivate me! + +How could this happen, I wonder? + +Oh? But why? + +HYANCE + +UTORANCE + +DASHANCE + +TOEDANCE + +MR.MANCE + +ESPANCE + + diff --git a/stadiumgs/text/primecup/teresa1.txt b/stadiumgs/text/primecup/teresa1.txt deleted file mode 100644 index 2e93dde..0000000 --- a/stadiumgs/text/primecup/teresa1.txt +++ /dev/null @@ -1,85 +0,0 @@ -A battle? Certainly! - -I absolutely will not lose to you! - -I know. You want to battle. -But I, TERRY, have confidence in myself. - -Ready, set, go! - -#26, go sweetie! - -Next, my darling #26! - -#26, honey. I'm counting on you! - -#26, honey. Here's your chance! - -It's not working! #26, come back! - -#26, honey. You're done! - -Okay, #26. Come back! - -#26, I'm so proud of you! That's -good enough! - -Eeyaah! My darling, #26! - -You did it, #26! You're so cool! - -Critical hit! Lucky! - -What! How dare you! That hit its weak spot! - -Oh, no! Don't give up! - -That's it! - -Oh! Quit it! - -Yay! - -Eeyaah! #26! - -I think I especially like #26. - -POKéMON... I never get tired of watching -them. - -See, look. Isn't it adorable? - -When I chat with friends, all we talk about is -POKéMON. - -I told you so. It's my win. - -Tough, aren't I? Does it tick you off? - -Thank you. I think you can get much better, too. - -My poor POKéMON... - -Oh, no... That's so cruel... - -Whatever. It doesn't really matter if I win or not... - -Hmm... A draw. How interesting... - -Ha, ha, ha... Chickened out! Bok, bok, bok! - -LOSSOMETTE - -AZUMARETTE - -PHAROSETTE - -FURRETTE - -TUFFETTE - -TOGETTE - - - - diff --git a/stadiumgs/text/primecup/terry1.txt b/stadiumgs/text/primecup/terry1.txt new file mode 100644 index 0000000..2e93dde --- /dev/null +++ b/stadiumgs/text/primecup/terry1.txt @@ -0,0 +1,85 @@ +A battle? Certainly! + +I absolutely will not lose to you! + +I know. You want to battle. +But I, TERRY, have confidence in myself. + +Ready, set, go! + +#26, go sweetie! + +Next, my darling #26! + +#26, honey. I'm counting on you! + +#26, honey. Here's your chance! + +It's not working! #26, come back! + +#26, honey. You're done! + +Okay, #26. Come back! + +#26, I'm so proud of you! That's +good enough! + +Eeyaah! My darling, #26! + +You did it, #26! You're so cool! + +Critical hit! Lucky! + +What! How dare you! That hit its weak spot! + +Oh, no! Don't give up! + +That's it! + +Oh! Quit it! + +Yay! + +Eeyaah! #26! + +I think I especially like #26. + +POKéMON... I never get tired of watching +them. + +See, look. Isn't it adorable? + +When I chat with friends, all we talk about is +POKéMON. + +I told you so. It's my win. + +Tough, aren't I? Does it tick you off? + +Thank you. I think you can get much better, too. + +My poor POKéMON... + +Oh, no... That's so cruel... + +Whatever. It doesn't really matter if I win or not... + +Hmm... A draw. How interesting... + +Ha, ha, ha... Chickened out! Bok, bok, bok! + +LOSSOMETTE + +AZUMARETTE + +PHAROSETTE + +FURRETTE + +TUFFETTE + +TOGETTE + + + + -- cgit v1.2.3