Merge branch 'radical-red' of github.com:andrewbenington/OpenHome int…

…o radical-red
andrewbenington · Nov 17, 2024 · 60ffa82 · 60ffa82
2 parents ca98ffb + 68fa93f
commit 60ffa82
Showing 1 changed file with 7 additions and 3 deletions.
diff --git a/src/types/SAVTypes/radicalred/G3RRSAV.ts b/src/types/SAVTypes/radicalred/G3RRSAV.ts
@@ -321,8 +321,12 @@ export class G3RRSAV implements PluginSAV<PK3RR> {
     }
 
     return (
-      bytesToUint32LittleEndian(bytes, 0xac) === 0 &&
-      bytesToUint32LittleEndian(bytes, findFirstSaveIndexZero(bytes) + 0xac) > 0
+      (
+        bytesToUint32LittleEndian(bytes, 0xac) === 0 &&
+        bytesToUint32LittleEndian(bytes, findFirstSaveIndexZero(bytes) + 0xac) > 0
+      ) || (
+        isRR(bytes)
+      )
     )
   }
 
@@ -355,4 +359,4 @@ const findFirstSaveIndexZero = (bytes: Uint8Array): number => {
 // or that there are no pokemon in the first box. The result
 // of both checks failing can&should be a prompt to specify
 // which game the Save belongs too.
-export function isRR(data: Uint8Array): boolean { return isG3(data, 4080, 58) }
+export function isRR(bytes: Uint8Array): boolean { return isG3(bytes, 4080, 58) }