Avoid a completion message despite nothing being done

Author: semaj14

Sources/Folders/Battle.cpp

@@ -254,6 +254,10 @@ namespace Battle {
                     start:
                     if (keyboard.SetKeyboard(entry->Name() + ":", true, options, attackSlot) != -1) {
                         FindMoveKB(entry);
+
+                        if (Controller::IsKeyPressed(Key::B))
+                            goto start;
+
                         attack = moveID;
 
                         if (attack > 0) {
@@ -542,6 +546,10 @@ namespace Battle {
 
         void Spawner(MenuEntry *entry) {
             FindPkmnKB(entry);
+
+            if (Controller::IsKeyPressed(Key::B))
+                return;
+
             pokemon = pkmnID;
             KeyboardPlus keyboard;
 
@@ -797,6 +805,10 @@ namespace Battle {
 
         void Spawner(MenuEntry *entry) {
             FindPkmnKB(entry);
+
+            if (Controller::IsKeyPressed(Key::B))
+                return;
+
             pokemon = pkmnID;
             KeyboardPlus keyboard;
 

Sources/Folders/Computer.cpp

@@ -138,6 +138,10 @@ namespace Computer {
 
             if (IsValid(pointer, pkmn)) {
                 FindPkmnKB(entry);
+
+                if (Controller::IsKeyPressed(Key::B))
+                    return;
+
                 species = pkmnID;
 
                 if (species > 0) {
@@ -745,6 +749,10 @@ namespace Computer {
                 start:
                 if (keyboard.SetKeyboard(entry->Name() + ":", true, options, moveSlot) != -1) {
                     FindMoveKB(entry);
+
+                    if (Controller::IsKeyPressed(Key::B))
+                        goto start;
+
                     moves = moveID;
 
                     if (moves > 0)
@@ -792,6 +800,10 @@ namespace Computer {
                 start:
                 if (keyboard.SetKeyboard(entry->Name() + ":", true, options, relearnMoveSlot) != -1) {
                     FindMoveKB(entry);
+
+                    if (Controller::IsKeyPressed(Key::B))
+                        goto start;
+
                     relearnMoves = moveID;
 
                     if (relearnMoves > 0)

Sources/Folders/FestivalPlaza.cpp

@@ -17,6 +17,10 @@ namespace Plaza {
             if (keyboard.SetKeyboard(entry->Name() + ":", true, options, depositConfig) != -1) {
                 if (depositConfig == 0) {
                     FindPkmnKB(entry);
+
+                    if (Controller::IsKeyPressed(Key::B))
+                        goto start;
+
                     settings[0] = pkmnID;
 
                     if (settings[0] != 0)

Sources/Folders/PlayerSearchSystem.cpp

@@ -33,6 +33,10 @@ namespace PSS {
             if (keyboard.SetKeyboard(entry->Name() + ":", true, options, depositConfig) != -1) {
                 if (depositConfig == 0) {
                     FindPkmnKB(entry);
+
+                    if (Controller::IsKeyPressed(Key::B))
+                        goto start;
+
                     settings[0] = pkmnID;
 
                     if (settings[0] != 0)