fx cheat

weihuoya · Feb 16, 2022 · fc8d099 · fc8d099
1 parent d672e54
commit fc8d099
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 5 deletions.
diff --git a/src/android/app/src/main/assets/cheats/00040000001B5000.txt b/src/android/app/src/main/assets/cheats/00040000001B5000.txt
@@ -11,7 +11,7 @@ D3000000 30000000
 D2000000 00000000
 
 [No Outlines v1.0]
-0042E2B8 E320F000
+0042E2B4 E320F000
 
 [No Outlines v1.2]
 0042FBA4 E320F000
diff --git a/src/android/app/src/main/java/org/citra/emu/ui/EditorActivity.java b/src/android/app/src/main/java/org/citra/emu/ui/EditorActivity.java
@@ -485,12 +485,18 @@ private String validateCheat(String line) {
             } else if (c >= 'A' && c <= 'Z') {
                 sb.append(c);
                 insertSpace = true;
-            } else if (insertSpace) {
-                sb.append(' ');
-                insertSpace = false;
+            } else if (Character.isWhitespace(c)) {
+                if (insertSpace) {
+                    sb.append(' ');
+                    insertSpace = false;
+                }
+            } else {
+                // invalid cheat code
+                sb.append(line.substring(i));
+                break;
             }
         }
-        if (sb.charAt(sb.length() - 1) == ' ') {
+        if (sb.length() > 0 && sb.charAt(sb.length() - 1) == ' ') {
             sb.deleteCharAt(sb.length() - 1);
         }
         return sb.toString();