From d547da3e38c6252997434861dfe7dee5252375a9 Mon Sep 17 00:00:00 2001 From: FrenchOrange <64930003+FrenchOrange@users.noreply.github.com> Date: Tue, 23 Sep 2025 22:01:03 +0200 Subject: [PATCH 1/4] Update bugs_and_glitches.md --- bugs_and_glitches.md | 13 +++++++++++++ 1 file changed, 13 insertions(+) diff --git a/bugs_and_glitches.md b/bugs_and_glitches.md index e9431396..2c2affd6 100644 --- a/bugs_and_glitches.md +++ b/bugs_and_glitches.md @@ -36,6 +36,7 @@ Fixes are written in the `diff` format. - [Dive Bomb animation has incorrect frame data](#dive-bomb-animation-has-incorrect-frame-data) - [Text](#text) - [Both Ninetales cards misspell its name](#both-ninetales-cards-misspell-its-name) + - [Brittany's defeat dialogue has a typo](#brittanys-defeat-dialogue-has-a-typo) - [Challenge host uses wrong name for the first rival](#challenge-host-uses-wrong-name-for-the-first-rival) ## Game engine @@ -800,6 +801,18 @@ When playing the challenge cup, player name is used instead of rival name before + text "Presently, is still" ``` +### Brittany's defeat dialogue has a typo + +After defeating Brittany in the Grass Club, her dialogue is gramatically incorrect. + +**Fix:** Edit `Text06e7` in [src/text/text8.asm](https://github.com/pret/poketcg/blob/master/src/text/text8.asm): +```diff + text "Humph! Whenever I lose, I " +- line "get irritated me!" ++ line "get irritated!" + done +``` + ### Both Ninetales cards misspell its name The name string used for both NinetalesLv32 and NinetalesLv35 misspells the Pokémon's name as "Ninetails". From fc0a7f48c811fdb9e1e2fff3c7d636b15fa104ac Mon Sep 17 00:00:00 2001 From: FrenchOrange <64930003+FrenchOrange@users.noreply.github.com> Date: Wed, 24 Sep 2025 03:04:44 +0200 Subject: [PATCH 2/4] Additional typos --- bugs_and_glitches.md | 28 ++++++++++++++++++++++++++++ 1 file changed, 28 insertions(+) diff --git a/bugs_and_glitches.md b/bugs_and_glitches.md index 2c2affd6..03ff01a4 100644 --- a/bugs_and_glitches.md +++ b/bugs_and_glitches.md @@ -35,6 +35,8 @@ Fixes are written in the `diff` format. - [Big Lightning animation has incorrect frame data](#big-lightning-animation-has-incorrect-frame-data) - [Dive Bomb animation has incorrect frame data](#dive-bomb-animation-has-incorrect-frame-data) - [Text](#text) + - [Missing acute accents] (#missing-acute-accents) + - [Doctor Mason misspells Exeggcute's name] (#doctor-mason-misspells-exeggcutes-name) - [Both Ninetales cards misspell its name](#both-ninetales-cards-misspell-its-name) - [Brittany's defeat dialogue has a typo](#brittanys-defeat-dialogue-has-a-typo) - [Challenge host uses wrong name for the first rival](#challenge-host-uses-wrong-name-for-the-first-rival) @@ -789,6 +791,32 @@ The flames of one of the blasts being cut-off is addressed below, though that sp ## Text +### Missing acute accents + +The following instances of "Poké" are missing the acute accent (thus being incorrectly rendered as "Poke"). + +**Fix:** Edit `VoltorbDescription` in [src/text/text11.asm](https://github.com/pret/poketcg/blob/master/src/text/text11.asm): +```diff +- line "Easily mistaken for a Poke Ball, it" ++ line "Easily mistaken for a Poké Ball, it" +``` + +**Fix:** Edit `ClefairysMetronomeDescription` in [src/text/text12.asm](https://github.com/pret/poketcg/blob/master/src/text/text12.asm): +```diff +- line "Pokemon is, Clefairy's type is" ++ line "Pokémon is, Clefairy's type is" +``` + +### Doctor Mason misspells Exeggcute's name + +One of Doctor Mason's emails misspells Exeggcute's name as "Exeggute". + +**Fix:** Edit `Mail6Part1Text` in [src/text/text4.asm](https://github.com/pret/poketcg/blob/master/src/text/text4.asm): +```diff +- line "Exeggute and Exeggutor at an" ++ line "Exeggcute and Exeggutor at an" +``` + ### Challenge host uses wrong name for the first rival ([Video](https://www.youtube.com/watch?v=1igDbNxRfUw&t=17310s)) From 6fb2be1d382b02fdfa4326cc987250132137d307 Mon Sep 17 00:00:00 2001 From: FrenchOrange <64930003+FrenchOrange@users.noreply.github.com> Date: Thu, 25 Sep 2025 05:09:50 +0200 Subject: [PATCH 3/4] Even more typos documented --- bugs_and_glitches.md | 172 +++++++++++++++++++++++++++++++------------ 1 file changed, 124 insertions(+), 48 deletions(-) diff --git a/bugs_and_glitches.md b/bugs_and_glitches.md index 03ff01a4..1cdaef03 100644 --- a/bugs_and_glitches.md +++ b/bugs_and_glitches.md @@ -35,11 +35,16 @@ Fixes are written in the `diff` format. - [Big Lightning animation has incorrect frame data](#big-lightning-animation-has-incorrect-frame-data) - [Dive Bomb animation has incorrect frame data](#dive-bomb-animation-has-incorrect-frame-data) - [Text](#text) - - [Missing acute accents] (#missing-acute-accents) + - [Misspelled "chosen" system text string] (#misspelled-chosen-system-text-string) - [Doctor Mason misspells Exeggcute's name] (#doctor-mason-misspells-exeggcutes-name) - - [Both Ninetales cards misspell its name](#both-ninetales-cards-misspell-its-name) - - [Brittany's defeat dialogue has a typo](#brittanys-defeat-dialogue-has-a-typo) + - [Clerk's Challenge Cup dialogue has an extra 'the'] (#clerks-challenge-cup-dialogue-has-an-extra-the) + - [Ronald's Challenge Cup dialogue has a typo] (#ronalds-challenge-cup-dialogue-has-a-typo) - [Challenge host uses wrong name for the first rival](#challenge-host-uses-wrong-name-for-the-first-rival) + - [Lightning Club dialogue has a typo] (#lightning-club-dialogue-has-a-typo) + - [Brittany's defeat dialogue has a typo](#brittanys-defeat-dialogue-has-a-typo) + - [Ronald's Legendary Card dialogue has a typo] (#ronalds-legendary-card-dialogue-has-a-typo) + - [Both Ninetales cards misspell its name](#both-ninetales-cards-misspell-its-name) + - [Missing acute accents] (#missing-acute-accents) ## Game engine @@ -791,6 +796,122 @@ The flames of one of the blasts being cut-off is addressed below, though that sp ## Text +### Misspelled "chosen" system text string + +The word "chosen" is misspelled as "choosen" in one piece of system text. Fixing it is a tad more involved than the rest. + +**Fix:** Edit `NoAttackMayBeChoosenText` in [src/text/text1.asm](https://github.com/pret/poketcg/blob/master/src/text/text1.asm): +```diff +-NoAttackMayBeChoosenText: +- text "No Attacks may be choosen." ++NoAttackMayBeChosenText: ++ text "No Attacks may be chosen." + done +``` + +Next, correct the corresponding label name in [src/text/text_offsets.asm](https://github.com/pret/poketcg/blob/master/src/text/text_offsets.asm): +```diff + textpointer ThereAreNoTrainerCardsInDiscardPileText ; 0x00c4 +- textpointer NoAttackMayBeChoosenText ; 0x00c5 ++ textpointer NoAttackMayBeChosenText ; 0x00c5 + textpointer YouDidNotReceiveAnAttackToMirrorMoveText ; 0x00c6 +``` + +Lastly, you will want to update every instance of "NoAttackMayBeChoosenText" in [src/engine/duel/effect_functions.asm](https://github.com/pret/poketcg/blob/master/src/engine/duel/effect_functions.asm) (there are four of them): +```diff +- ldtx hl, NoAttackMayBeChoosenText ++ ldtx hl, NoAttackMayBeChosenText +``` + +### Doctor Mason misspells Exeggcute's name + +One of Doctor Mason's emails misspells Exeggcute's name as "Exeggute". + +**Fix:** Edit `Mail6Part1Text` in [src/text/text4.asm](https://github.com/pret/poketcg/blob/master/src/text/text4.asm): +```diff +- line "Exeggute and Exeggutor at an" ++ line "Exeggcute and Exeggutor at an" +``` + +### Clerk's Challenge Cup dialogue has an extra 'the' + +The Clerk mistakenly repeats "the" twice when describing the Challenge Hall. + +**Fix:** Edit `Clerk9ChallengeCupOverText` in [src/text/text5.asm](https://github.com/pret/poketcg/blob/master/src/text/text5.asm): +```diff +- line "Challenge Hall! This is where the" ++ line "Challenge Hall! This is where" + line "the Challenge Cup is held. The" + done +``` + +### Ronald's Challenge Cup dialogue has a typo + +Ronald was so angry that he atomized the "l" out of "pulverize". + +**Fix:** Edit `RonaldChallengeCup1LostActive2Text` in [src/text/text5.asm](https://github.com/pret/poketcg/blob/master/src/text/text5.asm): +```diff +- line "Cup! Of course I'll puverize you!" ++ line "Cup! Of course I'll pulverize you!" + done +``` + +### Challenge host uses wrong name for the first rival + +([Video](https://www.youtube.com/watch?v=1igDbNxRfUw&t=17310s)) + +When playing the challenge cup, player name is used instead of rival name before the first fight. + +**Fix:** Edit `Clerk12ChallengeCupContenderText` in [src/text/text6.asm](https://github.com/pret/poketcg/blob/master/src/text/text6.asm): +```diff +- text "Presently, is still" ++ text "Presently, is still" +``` + +### Lightning Club dialogue has a typo + +This trainer dialogue in the Lightning club is gramatically incorrect. + +**Fix:** Edit `Text0629` in [src/text/text7.asm](https://github.com/pret/poketcg/blob/master/src/text/text7.asm): +```diff +- line "to keep it 'em lit!" ++ line "to keep 'em lit!" + done +``` + +### Brittany's defeat dialogue has a typo + +After defeating Brittany in the Grass Club, her dialogue is gramatically incorrect. + +**Fix:** Edit `Text06e7` in [src/text/text8.asm](https://github.com/pret/poketcg/blob/master/src/text/text8.asm): +```diff + text "Humph! Whenever I lose, I " +- line "get irritated me!" ++ line "get irritated!" + done +``` + +### Ronald's Legendary Card dialogue has a typo +Ronald's spiel on the Legendary Pokémon Cards is missing a contraction. + +**Fix:** Edit `Text073f` in [src/text/text9.asm](https://github.com/pret/poketcg/blob/master/src/text/text9.asm): +```diff +- line "And this time, I not gonna lose!" ++ line "And this time, I'm not gonna lose!" +``` + + +### Both Ninetales cards misspell its name +The name string used for both NinetalesLv32 and NinetalesLv35 misspells the Pokémon's name as "Ninetails". + +**Fix:** Edit `NinetalesName` in [src/text/text10.asm](https://github.com/pret/poketcg/blob/master/src/text/text10.asm): +```diff +NinetalesName: +- text "Ninetails" ++ text "Ninetales" + done +``` + ### Missing acute accents The following instances of "Poké" are missing the acute accent (thus being incorrectly rendered as "Poke"). @@ -806,48 +927,3 @@ The following instances of "Poké" are missing the acute accent (thus being inco - line "Pokemon is, Clefairy's type is" + line "Pokémon is, Clefairy's type is" ``` - -### Doctor Mason misspells Exeggcute's name - -One of Doctor Mason's emails misspells Exeggcute's name as "Exeggute". - -**Fix:** Edit `Mail6Part1Text` in [src/text/text4.asm](https://github.com/pret/poketcg/blob/master/src/text/text4.asm): -```diff -- line "Exeggute and Exeggutor at an" -+ line "Exeggcute and Exeggutor at an" -``` - -### Challenge host uses wrong name for the first rival - -([Video](https://www.youtube.com/watch?v=1igDbNxRfUw&t=17310s)) - -When playing the challenge cup, player name is used instead of rival name before the first fight. - -**Fix:** Edit `Clerk12ChallengeCupContenderText` in [src/text/text6.asm](https://github.com/pret/poketcg/blob/master/src/text/text6.asm): -```diff -- text "Presently, is still" -+ text "Presently, is still" -``` - -### Brittany's defeat dialogue has a typo - -After defeating Brittany in the Grass Club, her dialogue is gramatically incorrect. - -**Fix:** Edit `Text06e7` in [src/text/text8.asm](https://github.com/pret/poketcg/blob/master/src/text/text8.asm): -```diff - text "Humph! Whenever I lose, I " -- line "get irritated me!" -+ line "get irritated!" - done -``` - -### Both Ninetales cards misspell its name -The name string used for both NinetalesLv32 and NinetalesLv35 misspells the Pokémon's name as "Ninetails". - -**Fix:** Edit `NinetalesName` in [src/text/text10.asm](https://github.com/pret/poketcg/blob/master/src/text/text10.asm): -```diff -NinetalesName: -- text "Ninetails" -+ text "Ninetales" - done -``` From d16459ffd5c43394336f8be595288900d946d5fa Mon Sep 17 00:00:00 2001 From: FrenchOrange <64930003+FrenchOrange@users.noreply.github.com> Date: Sun, 28 Sep 2025 08:23:56 +0200 Subject: [PATCH 4/4] More documented typos and formatting fixes --- bugs_and_glitches.md | 95 +++++++++++++++++++++++++++++++++++++++----- 1 file changed, 86 insertions(+), 9 deletions(-) diff --git a/bugs_and_glitches.md b/bugs_and_glitches.md index 1cdaef03..75dbe260 100644 --- a/bugs_and_glitches.md +++ b/bugs_and_glitches.md @@ -35,16 +35,22 @@ Fixes are written in the `diff` format. - [Big Lightning animation has incorrect frame data](#big-lightning-animation-has-incorrect-frame-data) - [Dive Bomb animation has incorrect frame data](#dive-bomb-animation-has-incorrect-frame-data) - [Text](#text) - - [Misspelled "chosen" system text string] (#misspelled-chosen-system-text-string) - - [Doctor Mason misspells Exeggcute's name] (#doctor-mason-misspells-exeggcutes-name) - - [Clerk's Challenge Cup dialogue has an extra 'the'] (#clerks-challenge-cup-dialogue-has-an-extra-the) - - [Ronald's Challenge Cup dialogue has a typo] (#ronalds-challenge-cup-dialogue-has-a-typo) + - [Typos in unused strings](#typos-in-unused-strings) + - [Misspelled "chosen" system text string](#misspelled-chosen-system-text-string) + - [Missing space](#missing-space) + - [Misspelled status effect message](#misspelled-status-effect-message) + - [Promotional Flying Pikachu typo](#promotional-flying-pikachu-typo) + - [Legendary Zapdos card has a typo](#legendary-zapdos-card-has-a-typo) + - [Doctor Mason misspells Exeggcute's name](#doctor-mason-misspells-exeggcutes-name) + - [Clerk's Challenge Cup dialogue has an extra 'the'](#clerks-challenge-cup-dialogue-has-an-extra-the) + - [Ronald's Challenge Cup dialogue has a typo](#ronalds-challenge-cup-dialogue-has-a-typo) - [Challenge host uses wrong name for the first rival](#challenge-host-uses-wrong-name-for-the-first-rival) - - [Lightning Club dialogue has a typo] (#lightning-club-dialogue-has-a-typo) + - [Courtney's defeat dialogue has a typo](#courtneys-defeat-dialogue-has-a-typo) + - [Lightning Club dialogue has a typo](#lightning-club-dialogue-has-a-typo) - [Brittany's defeat dialogue has a typo](#brittanys-defeat-dialogue-has-a-typo) - - [Ronald's Legendary Card dialogue has a typo] (#ronalds-legendary-card-dialogue-has-a-typo) + - [Ronald's Legendary Card dialogue has a typo](#ronalds-legendary-card-dialogue-has-a-typo) - [Both Ninetales cards misspell its name](#both-ninetales-cards-misspell-its-name) - - [Missing acute accents] (#missing-acute-accents) + - [Missing acute accents](#missing-acute-accents) ## Game engine @@ -796,6 +802,23 @@ The flames of one of the blasts being cut-off is addressed below, though that sp ## Text +### Typos in unused strings + +Two pieces of unused text contain typos. + +**Fix:** Edit `UnusedText0096` in [src/text/text1.asm](https://github.com/pret/poketcg/blob/master/src/text/text1.asm): +```diff +- line "Payalysis" ++ line "Paralysis" +``` + +Edit `UnusedText00d5`, still in `text1.asm`: +```diff +- text "A Transmission Error occured." ++ text "A Transmission Error occurred." + done +``` + ### Misspelled "chosen" system text string The word "chosen" is misspelled as "choosen" in one piece of system text. Fixing it is a tad more involved than the rest. @@ -823,6 +846,49 @@ Lastly, you will want to update every instance of "NoAttackMayBeChoosenText" in + ldtx hl, NoAttackMayBeChosenText ``` +### Missing space + +The description for Mewtwo's Energy Absorption move is missing a space between "Pile" and "to". + +**Fix:** Edit `Choose2EnergyCardsFromDiscardPileToAttachText` in [src/text/text2.asm](https://github.com/pret/poketcg/blob/master/src/text/text2.asm): +```diff + text "Choose 2 Energy cards from the" +- line "Discard Pileto attach to a Pokémon." ++ line "Discard Pile to attach to a Pokémon." +``` + +### Misspelled status effect message + +The message reporting that Poison and Confusion had no effect misspells "effect". + +**Fix:** Edit `ThereWasNoEffectFromPoisonConfusionText` in [src/text/text2.asm](https://github.com/pret/poketcg/blob/master/src/text/text2.asm): +```diff +- text "There was no effet" ++ text "There was no effect" + line "from Poison, Confusion." +``` + +### Promotional Flying Pikachu typo + +The message for receiving the promotional Flying Pikachu card ironically misspells "Promotional". + +**Fix:** Edit `ReceivedPromotionalFlyingPikachuText` in [src/text/text2.asm](https://github.com/pret/poketcg/blob/master/src/text/text2.asm): +```diff +- text " received a Promotinal" ++ text " received a Promotional" + line "card Flyin' Pikachu!" +``` + +### Legendary Zapdos card has a typo + +The Legendary Zapdos card misspells "Legendary" in its description. + +**Fix:** Edit `LegendaryZapdosDescriptionText` in [src/text/text3.asm](https://github.com/pret/poketcg/blob/master/src/text/text3.asm): +```diff +- line "Legandary Zapdos!" ++ line "Legendary Zapdos!" +``` + ### Doctor Mason misspells Exeggcute's name One of Doctor Mason's emails misspells Exeggcute's name as "Exeggute". @@ -868,9 +934,20 @@ When playing the challenge cup, player name is used instead of rival name before + text "Presently, is still" ``` +### Courtney's defeat dialogue has a typo + +After defeating Courtney at the Pokémon Dome Club, her dialogue is grammatically incorrect. + +**Fix:** Edit `Text0579` in [src/text/text6.asm](https://github.com/pret/poketcg/blob/master/src/text/text6.asm): +```diff +- line "But that's no suprise, seeing " ++ line "But that's no surprise, seeing " + done +``` + ### Lightning Club dialogue has a typo -This trainer dialogue in the Lightning club is gramatically incorrect. +Brandon's dialogue in the Lightning club is grammatically incorrect. **Fix:** Edit `Text0629` in [src/text/text7.asm](https://github.com/pret/poketcg/blob/master/src/text/text7.asm): ```diff @@ -881,7 +958,7 @@ This trainer dialogue in the Lightning club is gramatically incorrect. ### Brittany's defeat dialogue has a typo -After defeating Brittany in the Grass Club, her dialogue is gramatically incorrect. +After defeating Brittany in the Grass Club, her dialogue is grammatically incorrect. **Fix:** Edit `Text06e7` in [src/text/text8.asm](https://github.com/pret/poketcg/blob/master/src/text/text8.asm): ```diff