diff --git a/public/battle-anims/psychic.json b/public/battle-anims/psychic.json
index 5ad4898de5a..72161ff9aff 100644
--- a/public/battle-anims/psychic.json
+++ b/public/battle-anims/psychic.json
@@ -1,6 +1,6 @@
 {
   "id": 94,
-  "graphic": "PRAS- PsychicBG",
+  "graphic": "PRAS- Psychic BG",
   "frames": [
     [
       {
diff --git a/src/system/game-data.ts b/src/system/game-data.ts
index e200fa6b3c7..51e488210be 100644
--- a/src/system/game-data.ts
+++ b/src/system/game-data.ts
@@ -118,15 +118,17 @@ export function getDataTypeKey(dataType: GameDataType, slotId = 0): string {
 }
 
 export function encrypt(data: string, bypassLogin: boolean): string {
-  return (bypassLogin ? (data: string) => btoa(data) : (data: string) => AES.encrypt(data, saveKey))(
-    data,
-  ) as unknown as string; // TODO: is this correct?
+  return (bypassLogin
+    ? (data: string) => btoa(encodeURIComponent(data))
+    : (data: string) => AES.encrypt(data, saveKey))(data) as unknown as string; // TODO: is this correct?
 }
 
 export function decrypt(data: string, bypassLogin: boolean): string {
-  return (bypassLogin ? (data: string) => atob(data) : (data: string) => AES.decrypt(data, saveKey).toString(enc.Utf8))(
-    data,
-  );
+  return (
+    bypassLogin
+      ? (data: string) => decodeURIComponent(atob(data))
+      : (data: string) => AES.decrypt(data, saveKey).toString(enc.Utf8)
+  )(data);
 }
 
 export interface SystemSaveData {