Bug fixes

Fixed `Patch Colored Text Crashes` for XY and fixed cheats that involved selecting Moves or Pokémon

Author: semaj14

Includes/Helpers/Lookup.hpp

@@ -2932,7 +2932,7 @@ namespace CTRPluginFramework {
         {10, "Timer Ball", 3}
     };
 
-    static const char *allMoves[675] = {
+    static const char *allMoves[728] = {
         "Pound",
         "Karate Chop",
         "Double Slap",
@@ -3554,6 +3554,43 @@ namespace CTRPluginFramework {
         "Precipice Blades",
         "Dragon Ascent",
         "Hyperspace Fury",
+        "Breakneck Blitz P",
+        "Breakneck Blitz S",
+        "All Out Pummeling P",
+        "All Out Pummeling S",
+        "Supersonic Skystrike P",
+        "Supersonic Skystrike S",
+        "Acid Downpour P",
+        "Acid Downpour S",
+        "Tectonic Rage P",
+        "Tectonic Rage S",
+        "Continental Crush P",
+        "Continental Crush S",
+        "Savage Spin Out P",
+        "Savage Spin Out S",
+        "Never Ending Nightmare P",
+        "Never Ending Nightmare S",
+        "Corkscrew Crash P",
+        "Corkscrew Crash S",
+        "Inferno Overdrive P",
+        "Inferno Overdrive S",
+        "Hydro Vortex P",
+        "Hydro Vortex S",
+        "Bloom Doom P",
+        "Bloom Doom S",
+        "Gigavolt Havoc P",
+        "Gigavolt Havoc S",
+        "Shattered Psyche P",
+        "Shattered Psyche S",
+        "Subzero Slammer P",
+        "Subzero Slammer S",
+        "Devastating Drake P",
+        "Devastating Drake S",
+        "Black Hole Eclipse P",
+        "Black Hole Eclipse S",
+        "Twinkle Tackle P",
+        "Twinkle Tackle S",
+        "Catastropika",
         "Shore Up",
         "First Impression",
         "Baneful Bunker",
@@ -3590,6 +3627,15 @@ namespace CTRPluginFramework {
         "Dragon Hammer",
         "Brutal Swing",
         "Aurora Veil",
+        "Sinister Arrow Raid",
+        "Malicious Moonsault",
+        "Oceanic Operetta",
+        "Guardian of Alola",
+        "Soul Stealing 7 Star Strike",
+        "Stoked Sparksurfer",
+        "Pulverizing Pancake",
+        "Extreme Evoboost",
+        "Genesis Supernova",
         "Shell Trap",
         "Fleur Cannon",
         "Psychic Fangs",
@@ -3603,11 +3649,18 @@ namespace CTRPluginFramework {
         "Moongeist Beam",
         "Tearful Look",
         "Zing Zap",
-        "Nature's Madness",
-        "Multi-Attack",
+        "Natures Madness",
+        "Multi Attack",
+        "Ten M Volt Thunderbolt",
         "Mind Blown",
         "Plasma Fists",
-        "Photon Geyser"
+        "Photon Geyser",
+        "Light That Burns the Sky",
+        "Searing Sunraze Smash",
+        "Menacing Moonraze Maelstrom",
+        "Lets Snuggle Forever",
+        "Splintered Stormshards",
+        "Clangorous Soulblaze"
     };
 
     extern int moveID;

Sources/Folders/Miscellaneous.cpp

@@ -278,7 +278,7 @@ namespace Misc {
         ProcessPlus process;
         unsigned int x = stoul(process.Address(s, -5), nullptr, 16);
 
-        if (!ProcessPlus::Write32(x, 0xE3B01000, original, entry, saved))
+        if (!ProcessPlus::Write32(x + Helpers::GetVersion(Helpers::PickGame(0x2000, 0), 0), 0xE3B01000, original, entry, saved))
             return;
     }
 }

Sources/Helpers/Lookup.cpp

@@ -6,7 +6,7 @@ namespace CTRPluginFramework {
     u16 spwnSpecies;
     u8 spawnLv;
     u8 spwnForm;
-    int pkmnID;
+    int pkmnID = 0;
 
     int MatchPkmn(Pokemon &output, string &input) {
         int index = 0;
@@ -67,26 +67,22 @@ namespace CTRPluginFramework {
         // If we have only one matches, complete the input
         if (count == 1) {
             pkmnID = matches.choiceNo[0] + 1;
-            input = matches.name[0];
-            return;
-        }
-
-        if (count == 2 && (input == "Mew" || input == "Pidgeot")) {
-            pkmnID = matches.choiceNo[1] + 1;
-            input = matches.name[1];
+            OSD::Notify(Color::LimeGreen << "Success" << Color::White << "! Selected: " << matches.name[0]);
+            keyboard.Close();
             return;
         }
 
         // If we have less than or equal to ten matches, populate a list keyboard
-        if (count > 1 && count <= 10 && (input != "Mew" && input != "Pidgeot")) {
+        if (count > 1 && count <= 10) {
             Keyboard kb(matches.name);
             kb.CanAbort(false);
             kb.DisplayTopScreen = false;
             choice = kb.Open();
 
             if (choice >= 0) {
                 pkmnID = matches.choiceNo[choice] + 1;
-                input = matches.name[choice];
+                OSD::Notify(Color::LimeGreen << "Success" << Color::White << "! Selected: " << matches.name[choice]);
+                keyboard.Close();
                 return;
             }
         }
@@ -100,8 +96,6 @@ namespace CTRPluginFramework {
 
         if (KB<string>("Pokémon:", true, 11, output, "", PkmnInputChange))
             return;
-
-        pkmnID = 0;
     }
 
     int abilityID;
@@ -297,7 +291,6 @@ namespace CTRPluginFramework {
         int index = 0;
         output.name.clear();
         string lowerCase(input);
-        static const vector<int> ignored = {622, 623, 624, 625, 626, 627, 628, 629, 630, 631, 632, 633, 634, 635, 636, 637, 638, 639, 640, 641, 642, 643, 644, 645, 646, 647, 648, 649, 650, 651, 652, 653, 654, 655, 656, 657, 658, 695, 696, 697, 698, 699, 700, 701, 702, 703, 719, 723, 724, 725, 726, 727, 728};
 
         for (char &character : lowerCase)
             character = tolower(character);
@@ -314,11 +307,9 @@ namespace CTRPluginFramework {
             }
 
             if (index < Helpers::AutoRegion(Helpers::GetVersion(617, 621), Helpers::GetVersion(719, 728))) {
-                if (*find(ignored.begin(), ignored.end(), index) != index) {
-                    if (iterator == lowerCase.end()) {
-                        output.name.push_back(moves);
-                        output.choiceNo.push_back(index);
-                    }
+                if (iterator == lowerCase.end()) {
+                    output.name.push_back(moves);
+                    output.choiceNo.push_back(index);
                 }
             }
 
@@ -355,26 +346,22 @@ namespace CTRPluginFramework {
         // If we have only one matches, complete the input
         if (count == 1) {
             moveID = matches.choiceNo[0] + 1;
-            input = matches.name[0];
-            return;
-        }
-
-        if (count == 6 && (input == "Thunder")) {
-            moveID = matches.choiceNo[4] + 1;
-            input = matches.name[4];
+            OSD::Notify(Color::LimeGreen << "Success" << Color::White << "! Applied: " << matches.name[0]);
+            keyboard.Close();
             return;
         }
 
         // If we have less than or equal to ten matches, populate a list keyboard
-        if (count > 1 && count <= 10 && (input != "Thunder")) {
+        if (count > 1 && count <= 10) {
             Keyboard kb(matches.name);
             kb.CanAbort(false);
             kb.DisplayTopScreen = false;
             int choice = kb.Open();
 
             if (choice >= 0) {
                 moveID = matches.choiceNo[choice] + 1;
-                input = matches.name[choice];
+                OSD::Notify(Color::LimeGreen << "Success" << Color::White << "! Applied: " << matches.name[choice]);
+                keyboard.Close();
                 return;
             }
         }
@@ -388,7 +375,5 @@ namespace CTRPluginFramework {
 
         if (KB<string>("Move:", true, 27, output, "", MoveInputChange))
             return;
-
-        moveID = 0;
     }
 }