Address typing issue in safeguard test

Fix unnecessary attr type cast in move phase
Fix blockCrit method broken in merge
2025-07-03 23:12:20 +02:00 · 2025-06-18 14:24:24 -06:00 · 2025-06-18 14:24:24 -06:00 · 2025-06-18 14:24:17 -06:00 · 2025-06-18 12:55:24 -06:00 · 2025-06-18 12:55:23 -06:00
357 changed files with 12957 additions and 72516 deletions
--- a/package-lock.json
+++ b/package-lock.json
@ -1,12 +1,12 @@
 {
  "name": "pokemon-rogue-battle",
-  "version": "1.9.6",
+  "version": "1.9.5",
  "lockfileVersion": 3,
  "requires": true,
  "packages": {
    "": {
      "name": "pokemon-rogue-battle",
-      "version": "1.9.6",
+      "version": "1.9.5",
      "hasInstallScript": true,
      "dependencies": {
        "@material/material-color-utilities": "^0.2.7",
--- a/package.json
+++ b/package.json
@ -1,7 +1,7 @@
 {
  "name": "pokemon-rogue-battle",
  "private": true,
-  "version": "1.9.6",
+  "version": "1.9.5",
  "type": "module",
  "scripts": {
    "start": "vite",
--- a/public/exp-sprites.json
+++ b/public/exp-sprites.json
@ -595,20 +595,6 @@
    "774-yellow",
    "774",
    "774",
-    "774-blue-meteor",
-    "774-blue-meteor",
-    "774-green-meteor",
-    "774-green-meteor",
-    "774-indigo-meteor",
-    "774-indigo-meteor",
-    "774-orange-meteor",
-    "774-orange-meteor",
-    "774-red-meteor",
-    "774-red-meteor",
-    "774-violet-meteor",
-    "774-violet-meteor",
-    "774-yellow-meteor",
-    "774-yellow-meteor",
    "775",
    "775",
    "776",
@ -1719,20 +1705,6 @@
    "774b-violet",
    "774b-yellow",
    "774b-yellow",
-    "774b-blue-meteor",
-    "774b-blue-meteor",
-    "774b-green-meteor",
-    "774b-green-meteor",
-    "774b-indigo-meteor",
-    "774b-indigo-meteor",
-    "774b-orange-meteor",
-    "774b-orange-meteor",
-    "774b-red-meteor",
-    "774b-red-meteor",
-    "774b-violet-meteor",
-    "774b-violet-meteor",
-    "774b-yellow-meteor",
-    "774b-yellow-meteor",
    "774b",
    "774b",
    "775b",
@ -2845,20 +2817,6 @@
    "774sb-violet",
    "774sb-yellow",
    "774sb-yellow",
-    "774sb-blue-meteor",
-    "774sb-blue-meteor",
-    "774sb-green-meteor",
-    "774sb-green-meteor",
-    "774sb-indigo-meteor",
-    "774sb-indigo-meteor",
-    "774sb-orange-meteor",
-    "774sb-orange-meteor",
-    "774sb-red-meteor",
-    "774sb-red-meteor",
-    "774sb-violet-meteor",
-    "774sb-violet-meteor",
-    "774sb-yellow-meteor",
-    "774sb-yellow-meteor",
    "774sb",
    "774sb",
    "775sb",
@ -3976,20 +3934,6 @@
    "774s-violet",
    "774s-yellow",
    "774s-yellow",
-    "774s-blue-meteor",
-    "774s-blue-meteor",
-    "774s-green-meteor",
-    "774s-green-meteor",
-    "774s-indigo-meteor",
-    "774s-indigo-meteor",
-    "774s-orange-meteor",
-    "774s-orange-meteor",
-    "774s-red-meteor",
-    "774s-red-meteor",
-    "774s-violet-meteor",
-    "774s-violet-meteor",
-    "774s-yellow-meteor",
-    "774s-yellow-meteor",
    "774s",
    "774s",
    "775s",
--- a/public/images/events/pride2025-de.png
+++ b/public/images/events/pride2025-de.png
--- a/public/images/events/pride2025-en.png
+++ b/public/images/events/pride2025-en.png
--- a/public/images/events/pride2025-es-ES.png
+++ b/public/images/events/pride2025-es-ES.png
--- a/public/images/events/pride2025-es-MX.png
+++ b/public/images/events/pride2025-es-MX.png
--- a/public/images/events/pride2025-fr.png
+++ b/public/images/events/pride2025-fr.png
--- a/public/images/events/pride2025-it.png
+++ b/public/images/events/pride2025-it.png
--- a/public/images/events/pride2025-ja.png
+++ b/public/images/events/pride2025-ja.png
--- a/public/images/events/pride2025-ko.png
+++ b/public/images/events/pride2025-ko.png
--- a/public/images/events/pride2025-pt-BR.png
+++ b/public/images/events/pride2025-pt-BR.png
--- a/public/images/events/pride2025-zh-CN.png
+++ b/public/images/events/pride2025-zh-CN.png
--- a/public/images/events/pride2025-zh-TW.png
+++ b/public/images/events/pride2025-zh-TW.png
--- a/public/images/pokemon/774-blue-meteor.json
+++ b/public/images/pokemon/774-blue-meteor.json
@ -1,41 +0,0 @@
-{
-	"textures": [
-		{
-			"image": "774.png",
-			"format": "RGBA8888",
-			"size": {
-				"w": 37,
-				"h": 37
-			},
-			"scale": 1,
-			"frames": [
-				{
-					"filename": "0001.png",
-					"rotated": false,
-					"trimmed": false,
-					"sourceSize": {
-						"w": 37,
-						"h": 37
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 0,
-						"w": 37,
-						"h": 37
-					},
-					"frame": {
-						"x": 0,
-						"y": 0,
-						"w": 37,
-						"h": 37
-					}
-				}
-			]
-		}
-	],
-	"meta": {
-		"app": "https://www.codeandweb.com/texturepacker",
-		"version": "3.0",
-		"smartupdate": "$TexturePacker:SmartUpdate:566b51540ed595250ead15a4733d98d6:172aa05dcc207383119cd2f2f7977e0e:37281ac0aa1e619ef385b889b64064b7$"
-	}
-}
--- a/public/images/pokemon/774-blue-meteor.png
+++ b/public/images/pokemon/774-blue-meteor.png
--- a/public/images/pokemon/774-blue.png
+++ b/public/images/pokemon/774-blue.png
--- a/public/images/pokemon/774-green-meteor.json
+++ b/public/images/pokemon/774-green-meteor.json
@ -1,41 +0,0 @@
-{
-	"textures": [
-		{
-			"image": "774.png",
-			"format": "RGBA8888",
-			"size": {
-				"w": 37,
-				"h": 37
-			},
-			"scale": 1,
-			"frames": [
-				{
-					"filename": "0001.png",
-					"rotated": false,
-					"trimmed": false,
-					"sourceSize": {
-						"w": 37,
-						"h": 37
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 0,
-						"w": 37,
-						"h": 37
-					},
-					"frame": {
-						"x": 0,
-						"y": 0,
-						"w": 37,
-						"h": 37
-					}
-				}
-			]
-		}
-	],
-	"meta": {
-		"app": "https://www.codeandweb.com/texturepacker",
-		"version": "3.0",
-		"smartupdate": "$TexturePacker:SmartUpdate:566b51540ed595250ead15a4733d98d6:172aa05dcc207383119cd2f2f7977e0e:37281ac0aa1e619ef385b889b64064b7$"
-	}
-}
--- a/public/images/pokemon/774-green-meteor.png
+++ b/public/images/pokemon/774-green-meteor.png
--- a/public/images/pokemon/774-green.png
+++ b/public/images/pokemon/774-green.png
--- a/public/images/pokemon/774-indigo-meteor.json
+++ b/public/images/pokemon/774-indigo-meteor.json
@ -1,41 +0,0 @@
-{
-	"textures": [
-		{
-			"image": "774.png",
-			"format": "RGBA8888",
-			"size": {
-				"w": 37,
-				"h": 37
-			},
-			"scale": 1,
-			"frames": [
-				{
-					"filename": "0001.png",
-					"rotated": false,
-					"trimmed": false,
-					"sourceSize": {
-						"w": 37,
-						"h": 37
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 0,
-						"w": 37,
-						"h": 37
-					},
-					"frame": {
-						"x": 0,
-						"y": 0,
-						"w": 37,
-						"h": 37
-					}
-				}
-			]
-		}
-	],
-	"meta": {
-		"app": "https://www.codeandweb.com/texturepacker",
-		"version": "3.0",
-		"smartupdate": "$TexturePacker:SmartUpdate:566b51540ed595250ead15a4733d98d6:172aa05dcc207383119cd2f2f7977e0e:37281ac0aa1e619ef385b889b64064b7$"
-	}
-}
--- a/public/images/pokemon/774-indigo-meteor.png
+++ b/public/images/pokemon/774-indigo-meteor.png
--- a/public/images/pokemon/774-indigo.png
+++ b/public/images/pokemon/774-indigo.png
--- a/public/images/pokemon/774-orange-meteor.json
+++ b/public/images/pokemon/774-orange-meteor.json
@ -1,41 +0,0 @@
-{
-	"textures": [
-		{
-			"image": "774.png",
-			"format": "RGBA8888",
-			"size": {
-				"w": 37,
-				"h": 37
-			},
-			"scale": 1,
-			"frames": [
-				{
-					"filename": "0001.png",
-					"rotated": false,
-					"trimmed": false,
-					"sourceSize": {
-						"w": 37,
-						"h": 37
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 0,
-						"w": 37,
-						"h": 37
-					},
-					"frame": {
-						"x": 0,
-						"y": 0,
-						"w": 37,
-						"h": 37
-					}
-				}
-			]
-		}
-	],
-	"meta": {
-		"app": "https://www.codeandweb.com/texturepacker",
-		"version": "3.0",
-		"smartupdate": "$TexturePacker:SmartUpdate:566b51540ed595250ead15a4733d98d6:172aa05dcc207383119cd2f2f7977e0e:37281ac0aa1e619ef385b889b64064b7$"
-	}
-}
--- a/public/images/pokemon/774-orange-meteor.png
+++ b/public/images/pokemon/774-orange-meteor.png
--- a/public/images/pokemon/774-orange.png
+++ b/public/images/pokemon/774-orange.png
--- a/public/images/pokemon/774-red-meteor.json
+++ b/public/images/pokemon/774-red-meteor.json
@ -1,41 +0,0 @@
-{
-	"textures": [
-		{
-			"image": "774.png",
-			"format": "RGBA8888",
-			"size": {
-				"w": 37,
-				"h": 37
-			},
-			"scale": 1,
-			"frames": [
-				{
-					"filename": "0001.png",
-					"rotated": false,
-					"trimmed": false,
-					"sourceSize": {
-						"w": 37,
-						"h": 37
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 0,
-						"w": 37,
-						"h": 37
-					},
-					"frame": {
-						"x": 0,
-						"y": 0,
-						"w": 37,
-						"h": 37
-					}
-				}
-			]
-		}
-	],
-	"meta": {
-		"app": "https://www.codeandweb.com/texturepacker",
-		"version": "3.0",
-		"smartupdate": "$TexturePacker:SmartUpdate:566b51540ed595250ead15a4733d98d6:172aa05dcc207383119cd2f2f7977e0e:37281ac0aa1e619ef385b889b64064b7$"
-	}
-}
--- a/public/images/pokemon/774-red-meteor.png
+++ b/public/images/pokemon/774-red-meteor.png
--- a/public/images/pokemon/774-red.png
+++ b/public/images/pokemon/774-red.png
--- a/public/images/pokemon/774-violet-meteor.json
+++ b/public/images/pokemon/774-violet-meteor.json
@ -1,41 +0,0 @@
-{
-	"textures": [
-		{
-			"image": "774.png",
-			"format": "RGBA8888",
-			"size": {
-				"w": 37,
-				"h": 37
-			},
-			"scale": 1,
-			"frames": [
-				{
-					"filename": "0001.png",
-					"rotated": false,
-					"trimmed": false,
-					"sourceSize": {
-						"w": 37,
-						"h": 37
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 0,
-						"w": 37,
-						"h": 37
-					},
-					"frame": {
-						"x": 0,
-						"y": 0,
-						"w": 37,
-						"h": 37
-					}
-				}
-			]
-		}
-	],
-	"meta": {
-		"app": "https://www.codeandweb.com/texturepacker",
-		"version": "3.0",
-		"smartupdate": "$TexturePacker:SmartUpdate:566b51540ed595250ead15a4733d98d6:172aa05dcc207383119cd2f2f7977e0e:37281ac0aa1e619ef385b889b64064b7$"
-	}
-}
--- a/public/images/pokemon/774-violet-meteor.png
+++ b/public/images/pokemon/774-violet-meteor.png
--- a/public/images/pokemon/774-violet.png
+++ b/public/images/pokemon/774-violet.png
--- a/public/images/pokemon/774-yellow-meteor.json
+++ b/public/images/pokemon/774-yellow-meteor.json
@ -1,41 +0,0 @@
-{
-	"textures": [
-		{
-			"image": "774.png",
-			"format": "RGBA8888",
-			"size": {
-				"w": 37,
-				"h": 37
-			},
-			"scale": 1,
-			"frames": [
-				{
-					"filename": "0001.png",
-					"rotated": false,
-					"trimmed": false,
-					"sourceSize": {
-						"w": 37,
-						"h": 37
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 0,
-						"w": 37,
-						"h": 37
-					},
-					"frame": {
-						"x": 0,
-						"y": 0,
-						"w": 37,
-						"h": 37
-					}
-				}
-			]
-		}
-	],
-	"meta": {
-		"app": "https://www.codeandweb.com/texturepacker",
-		"version": "3.0",
-		"smartupdate": "$TexturePacker:SmartUpdate:566b51540ed595250ead15a4733d98d6:172aa05dcc207383119cd2f2f7977e0e:37281ac0aa1e619ef385b889b64064b7$"
-	}
-}
--- a/public/images/pokemon/774-yellow-meteor.png
+++ b/public/images/pokemon/774-yellow-meteor.png
--- a/public/images/pokemon/774-yellow.png
+++ b/public/images/pokemon/774-yellow.png
--- a/public/images/pokemon/774.png
+++ b/public/images/pokemon/774.png
--- a/public/images/pokemon/842.png
+++ b/public/images/pokemon/842.png
--- a/public/images/pokemon/back/774-blue-meteor.json
+++ b/public/images/pokemon/back/774-blue-meteor.json
@ -1,41 +0,0 @@
-{
-	"textures": [
-		{
-			"image": "774.png",
-			"format": "RGBA8888",
-			"size": {
-				"w": 37,
-				"h": 37
-			},
-			"scale": 1,
-			"frames": [
-				{
-					"filename": "0001.png",
-					"rotated": false,
-					"trimmed": false,
-					"sourceSize": {
-						"w": 37,
-						"h": 37
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 0,
-						"w": 37,
-						"h": 37
-					},
-					"frame": {
-						"x": 0,
-						"y": 0,
-						"w": 37,
-						"h": 37
-					}
-				}
-			]
-		}
-	],
-	"meta": {
-		"app": "https://www.codeandweb.com/texturepacker",
-		"version": "3.0",
-		"smartupdate": "$TexturePacker:SmartUpdate:241dff4083e172e8503b54a7f0210f8d:982b194223ffeef2ba672b3c5979a426:37281ac0aa1e619ef385b889b64064b7$"
-	}
-}
--- a/public/images/pokemon/back/774-blue-meteor.png
+++ b/public/images/pokemon/back/774-blue-meteor.png
--- a/public/images/pokemon/back/774-blue.png
+++ b/public/images/pokemon/back/774-blue.png
--- a/public/images/pokemon/back/774-green-meteor.json
+++ b/public/images/pokemon/back/774-green-meteor.json
@ -1,41 +0,0 @@
-{
-	"textures": [
-		{
-			"image": "774.png",
-			"format": "RGBA8888",
-			"size": {
-				"w": 37,
-				"h": 37
-			},
-			"scale": 1,
-			"frames": [
-				{
-					"filename": "0001.png",
-					"rotated": false,
-					"trimmed": false,
-					"sourceSize": {
-						"w": 37,
-						"h": 37
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 0,
-						"w": 37,
-						"h": 37
-					},
-					"frame": {
-						"x": 0,
-						"y": 0,
-						"w": 37,
-						"h": 37
-					}
-				}
-			]
-		}
-	],
-	"meta": {
-		"app": "https://www.codeandweb.com/texturepacker",
-		"version": "3.0",
-		"smartupdate": "$TexturePacker:SmartUpdate:241dff4083e172e8503b54a7f0210f8d:982b194223ffeef2ba672b3c5979a426:37281ac0aa1e619ef385b889b64064b7$"
-	}
-}
--- a/public/images/pokemon/back/774-green-meteor.png
+++ b/public/images/pokemon/back/774-green-meteor.png
--- a/public/images/pokemon/back/774-green.png
+++ b/public/images/pokemon/back/774-green.png
--- a/public/images/pokemon/back/774-indigo-meteor.json
+++ b/public/images/pokemon/back/774-indigo-meteor.json
@ -1,41 +0,0 @@
-{
-	"textures": [
-		{
-			"image": "774.png",
-			"format": "RGBA8888",
-			"size": {
-				"w": 37,
-				"h": 37
-			},
-			"scale": 1,
-			"frames": [
-				{
-					"filename": "0001.png",
-					"rotated": false,
-					"trimmed": false,
-					"sourceSize": {
-						"w": 37,
-						"h": 37
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 0,
-						"w": 37,
-						"h": 37
-					},
-					"frame": {
-						"x": 0,
-						"y": 0,
-						"w": 37,
-						"h": 37
-					}
-				}
-			]
-		}
-	],
-	"meta": {
-		"app": "https://www.codeandweb.com/texturepacker",
-		"version": "3.0",
-		"smartupdate": "$TexturePacker:SmartUpdate:241dff4083e172e8503b54a7f0210f8d:982b194223ffeef2ba672b3c5979a426:37281ac0aa1e619ef385b889b64064b7$"
-	}
-}
--- a/public/images/pokemon/back/774-indigo-meteor.png
+++ b/public/images/pokemon/back/774-indigo-meteor.png
--- a/public/images/pokemon/back/774-indigo.png
+++ b/public/images/pokemon/back/774-indigo.png
--- a/public/images/pokemon/back/774-orange-meteor.json
+++ b/public/images/pokemon/back/774-orange-meteor.json
@ -1,41 +0,0 @@
-{
-	"textures": [
-		{
-			"image": "774.png",
-			"format": "RGBA8888",
-			"size": {
-				"w": 37,
-				"h": 37
-			},
-			"scale": 1,
-			"frames": [
-				{
-					"filename": "0001.png",
-					"rotated": false,
-					"trimmed": false,
-					"sourceSize": {
-						"w": 37,
-						"h": 37
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 0,
-						"w": 37,
-						"h": 37
-					},
-					"frame": {
-						"x": 0,
-						"y": 0,
-						"w": 37,
-						"h": 37
-					}
-				}
-			]
-		}
-	],
-	"meta": {
-		"app": "https://www.codeandweb.com/texturepacker",
-		"version": "3.0",
-		"smartupdate": "$TexturePacker:SmartUpdate:241dff4083e172e8503b54a7f0210f8d:982b194223ffeef2ba672b3c5979a426:37281ac0aa1e619ef385b889b64064b7$"
-	}
-}
--- a/public/images/pokemon/back/774-orange-meteor.png
+++ b/public/images/pokemon/back/774-orange-meteor.png
--- a/public/images/pokemon/back/774-orange.png
+++ b/public/images/pokemon/back/774-orange.png
--- a/public/images/pokemon/back/774-red-meteor.json
+++ b/public/images/pokemon/back/774-red-meteor.json
@ -1,41 +0,0 @@
-{
-	"textures": [
-		{
-			"image": "774.png",
-			"format": "RGBA8888",
-			"size": {
-				"w": 37,
-				"h": 37
-			},
-			"scale": 1,
-			"frames": [
-				{
-					"filename": "0001.png",
-					"rotated": false,
-					"trimmed": false,
-					"sourceSize": {
-						"w": 37,
-						"h": 37
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 0,
-						"w": 37,
-						"h": 37
-					},
-					"frame": {
-						"x": 0,
-						"y": 0,
-						"w": 37,
-						"h": 37
-					}
-				}
-			]
-		}
-	],
-	"meta": {
-		"app": "https://www.codeandweb.com/texturepacker",
-		"version": "3.0",
-		"smartupdate": "$TexturePacker:SmartUpdate:241dff4083e172e8503b54a7f0210f8d:982b194223ffeef2ba672b3c5979a426:37281ac0aa1e619ef385b889b64064b7$"
-	}
-}
--- a/public/images/pokemon/back/774-red-meteor.png
+++ b/public/images/pokemon/back/774-red-meteor.png
--- a/public/images/pokemon/back/774-red.png
+++ b/public/images/pokemon/back/774-red.png
--- a/public/images/pokemon/back/774-violet-meteor.json
+++ b/public/images/pokemon/back/774-violet-meteor.json
@ -1,41 +0,0 @@
-{
-	"textures": [
-		{
-			"image": "774.png",
-			"format": "RGBA8888",
-			"size": {
-				"w": 37,
-				"h": 37
-			},
-			"scale": 1,
-			"frames": [
-				{
-					"filename": "0001.png",
-					"rotated": false,
-					"trimmed": false,
-					"sourceSize": {
-						"w": 37,
-						"h": 37
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 0,
-						"w": 37,
-						"h": 37
-					},
-					"frame": {
-						"x": 0,
-						"y": 0,
-						"w": 37,
-						"h": 37
-					}
-				}
-			]
-		}
-	],
-	"meta": {
-		"app": "https://www.codeandweb.com/texturepacker",
-		"version": "3.0",
-		"smartupdate": "$TexturePacker:SmartUpdate:241dff4083e172e8503b54a7f0210f8d:982b194223ffeef2ba672b3c5979a426:37281ac0aa1e619ef385b889b64064b7$"
-	}
-}
--- a/public/images/pokemon/back/774-violet-meteor.png
+++ b/public/images/pokemon/back/774-violet-meteor.png
--- a/public/images/pokemon/back/774-violet.png
+++ b/public/images/pokemon/back/774-violet.png
--- a/public/images/pokemon/back/774-yellow-meteor.json
+++ b/public/images/pokemon/back/774-yellow-meteor.json
@ -1,41 +0,0 @@
-{
-	"textures": [
-		{
-			"image": "774.png",
-			"format": "RGBA8888",
-			"size": {
-				"w": 37,
-				"h": 37
-			},
-			"scale": 1,
-			"frames": [
-				{
-					"filename": "0001.png",
-					"rotated": false,
-					"trimmed": false,
-					"sourceSize": {
-						"w": 37,
-						"h": 37
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 0,
-						"w": 37,
-						"h": 37
-					},
-					"frame": {
-						"x": 0,
-						"y": 0,
-						"w": 37,
-						"h": 37
-					}
-				}
-			]
-		}
-	],
-	"meta": {
-		"app": "https://www.codeandweb.com/texturepacker",
-		"version": "3.0",
-		"smartupdate": "$TexturePacker:SmartUpdate:241dff4083e172e8503b54a7f0210f8d:982b194223ffeef2ba672b3c5979a426:37281ac0aa1e619ef385b889b64064b7$"
-	}
-}
--- a/public/images/pokemon/back/774-yellow-meteor.png
+++ b/public/images/pokemon/back/774-yellow-meteor.png
--- a/public/images/pokemon/back/774-yellow.png
+++ b/public/images/pokemon/back/774-yellow.png
--- a/public/images/pokemon/back/774.png
+++ b/public/images/pokemon/back/774.png
--- a/public/images/pokemon/back/shiny/774-blue-meteor.json
+++ b/public/images/pokemon/back/shiny/774-blue-meteor.json
@ -1,41 +0,0 @@
-{
-	"textures": [
-		{
-			"image": "774.png",
-			"format": "RGBA8888",
-			"size": {
-				"w": 37,
-				"h": 37
-			},
-			"scale": 1,
-			"frames": [
-				{
-					"filename": "0001.png",
-					"rotated": false,
-					"trimmed": false,
-					"sourceSize": {
-						"w": 37,
-						"h": 37
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 0,
-						"w": 37,
-						"h": 37
-					},
-					"frame": {
-						"x": 0,
-						"y": 0,
-						"w": 37,
-						"h": 37
-					}
-				}
-			]
-		}
-	],
-	"meta": {
-		"app": "https://www.codeandweb.com/texturepacker",
-		"version": "3.0",
-		"smartupdate": "$TexturePacker:SmartUpdate:241dff4083e172e8503b54a7f0210f8d:982b194223ffeef2ba672b3c5979a426:37281ac0aa1e619ef385b889b64064b7$"
-	}
-}
--- a/public/images/pokemon/back/shiny/774-blue-meteor.png
+++ b/public/images/pokemon/back/shiny/774-blue-meteor.png
--- a/public/images/pokemon/back/shiny/774-blue.json
+++ b/public/images/pokemon/back/shiny/774-blue.json
@ -1,7 +1,7 @@
 {
 	"textures": [
 		{
-			"image": "774-green.png",
+			"image": "774-blue.png",
 			"format": "RGBA8888",
 			"size": {
 				"w": 37,
@ -36,6 +36,6 @@
 	"meta": {
 		"app": "https://www.codeandweb.com/texturepacker",
 		"version": "3.0",
-		"smartupdate": "$TexturePacker:SmartUpdate:15dc5fd6941072ff45be95ed6c7c8648:bc55f37f7cfc1778719aa7113bbfe914:e4b1fffb78b8c0cdc557670bcee043ca$"
+		"smartupdate": "$TexturePacker:SmartUpdate:d2a43e44c5cc1c82f432212a17308d68:5faf838c8d06da9dcfb9b100f32b682b:0787168dbe37404ac3aa22b487979d47$"
 	}
 }
--- a/public/images/pokemon/back/shiny/774-blue.png
+++ b/public/images/pokemon/back/shiny/774-blue.png
--- a/public/images/pokemon/back/shiny/774-green-meteor.json
+++ b/public/images/pokemon/back/shiny/774-green-meteor.json
@ -1,41 +0,0 @@
-{
-	"textures": [
-		{
-			"image": "774.png",
-			"format": "RGBA8888",
-			"size": {
-				"w": 37,
-				"h": 37
-			},
-			"scale": 1,
-			"frames": [
-				{
-					"filename": "0001.png",
-					"rotated": false,
-					"trimmed": false,
-					"sourceSize": {
-						"w": 37,
-						"h": 37
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 0,
-						"w": 37,
-						"h": 37
-					},
-					"frame": {
-						"x": 0,
-						"y": 0,
-						"w": 37,
-						"h": 37
-					}
-				}
-			]
-		}
-	],
-	"meta": {
-		"app": "https://www.codeandweb.com/texturepacker",
-		"version": "3.0",
-		"smartupdate": "$TexturePacker:SmartUpdate:241dff4083e172e8503b54a7f0210f8d:982b194223ffeef2ba672b3c5979a426:37281ac0aa1e619ef385b889b64064b7$"
-	}
-}
--- a/public/images/pokemon/back/shiny/774-green-meteor.png
+++ b/public/images/pokemon/back/shiny/774-green-meteor.png
--- a/public/images/pokemon/back/shiny/774-green.png
+++ b/public/images/pokemon/back/shiny/774-green.png
--- a/public/images/pokemon/back/shiny/774-indigo-meteor.json
+++ b/public/images/pokemon/back/shiny/774-indigo-meteor.json
@ -1,41 +0,0 @@
-{
-	"textures": [
-		{
-			"image": "774.png",
-			"format": "RGBA8888",
-			"size": {
-				"w": 37,
-				"h": 37
-			},
-			"scale": 1,
-			"frames": [
-				{
-					"filename": "0001.png",
-					"rotated": false,
-					"trimmed": false,
-					"sourceSize": {
-						"w": 37,
-						"h": 37
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 0,
-						"w": 37,
-						"h": 37
-					},
-					"frame": {
-						"x": 0,
-						"y": 0,
-						"w": 37,
-						"h": 37
-					}
-				}
-			]
-		}
-	],
-	"meta": {
-		"app": "https://www.codeandweb.com/texturepacker",
-		"version": "3.0",
-		"smartupdate": "$TexturePacker:SmartUpdate:241dff4083e172e8503b54a7f0210f8d:982b194223ffeef2ba672b3c5979a426:37281ac0aa1e619ef385b889b64064b7$"
-	}
-}
--- a/public/images/pokemon/back/shiny/774-indigo-meteor.png
+++ b/public/images/pokemon/back/shiny/774-indigo-meteor.png
--- a/public/images/pokemon/back/shiny/774-indigo.json
+++ b/public/images/pokemon/back/shiny/774-indigo.json
@ -1,7 +1,7 @@
 {
 	"textures": [
 		{
-			"image": "774-green.png",
+			"image": "774-indigo.png",
 			"format": "RGBA8888",
 			"size": {
 				"w": 37,
@ -36,6 +36,6 @@
 	"meta": {
 		"app": "https://www.codeandweb.com/texturepacker",
 		"version": "3.0",
-		"smartupdate": "$TexturePacker:SmartUpdate:15dc5fd6941072ff45be95ed6c7c8648:bc55f37f7cfc1778719aa7113bbfe914:e4b1fffb78b8c0cdc557670bcee043ca$"
+		"smartupdate": "$TexturePacker:SmartUpdate:98fb9e8a8436e2a8c9e7950a6cd9a86a:d89e965b091729dac43a3b5625521c2a:f6d3104f6cc09a16e2cbfcba30e4d78a$"
 	}
 }
--- a/public/images/pokemon/back/shiny/774-indigo.png
+++ b/public/images/pokemon/back/shiny/774-indigo.png
--- a/public/images/pokemon/back/shiny/774-orange-meteor.json
+++ b/public/images/pokemon/back/shiny/774-orange-meteor.json
@ -1,41 +0,0 @@
-{
-	"textures": [
-		{
-			"image": "774.png",
-			"format": "RGBA8888",
-			"size": {
-				"w": 37,
-				"h": 37
-			},
-			"scale": 1,
-			"frames": [
-				{
-					"filename": "0001.png",
-					"rotated": false,
-					"trimmed": false,
-					"sourceSize": {
-						"w": 37,
-						"h": 37
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 0,
-						"w": 37,
-						"h": 37
-					},
-					"frame": {
-						"x": 0,
-						"y": 0,
-						"w": 37,
-						"h": 37
-					}
-				}
-			]
-		}
-	],
-	"meta": {
-		"app": "https://www.codeandweb.com/texturepacker",
-		"version": "3.0",
-		"smartupdate": "$TexturePacker:SmartUpdate:241dff4083e172e8503b54a7f0210f8d:982b194223ffeef2ba672b3c5979a426:37281ac0aa1e619ef385b889b64064b7$"
-	}
-}
--- a/public/images/pokemon/back/shiny/774-orange-meteor.png
+++ b/public/images/pokemon/back/shiny/774-orange-meteor.png
--- a/public/images/pokemon/back/shiny/774-orange.json
+++ b/public/images/pokemon/back/shiny/774-orange.json
@ -1,7 +1,7 @@
 {
 	"textures": [
 		{
-			"image": "774-green.png",
+			"image": "774-orange.png",
 			"format": "RGBA8888",
 			"size": {
 				"w": 37,
@ -36,6 +36,6 @@
 	"meta": {
 		"app": "https://www.codeandweb.com/texturepacker",
 		"version": "3.0",
-		"smartupdate": "$TexturePacker:SmartUpdate:15dc5fd6941072ff45be95ed6c7c8648:bc55f37f7cfc1778719aa7113bbfe914:e4b1fffb78b8c0cdc557670bcee043ca$"
+		"smartupdate": "$TexturePacker:SmartUpdate:35a5ec7178c34950d39e76fac4d9c4e1:f0224f022e70f1f1ced7c450321b1ee7:44d5ed9bf64302a0edf6c65ea8033c12$"
 	}
 }
--- a/public/images/pokemon/back/shiny/774-orange.png
+++ b/public/images/pokemon/back/shiny/774-orange.png
--- a/public/images/pokemon/back/shiny/774-red-meteor.json
+++ b/public/images/pokemon/back/shiny/774-red-meteor.json
@ -1,41 +0,0 @@
-{
-	"textures": [
-		{
-			"image": "774.png",
-			"format": "RGBA8888",
-			"size": {
-				"w": 37,
-				"h": 37
-			},
-			"scale": 1,
-			"frames": [
-				{
-					"filename": "0001.png",
-					"rotated": false,
-					"trimmed": false,
-					"sourceSize": {
-						"w": 37,
-						"h": 37
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 0,
-						"w": 37,
-						"h": 37
-					},
-					"frame": {
-						"x": 0,
-						"y": 0,
-						"w": 37,
-						"h": 37
-					}
-				}
-			]
-		}
-	],
-	"meta": {
-		"app": "https://www.codeandweb.com/texturepacker",
-		"version": "3.0",
-		"smartupdate": "$TexturePacker:SmartUpdate:241dff4083e172e8503b54a7f0210f8d:982b194223ffeef2ba672b3c5979a426:37281ac0aa1e619ef385b889b64064b7$"
-	}
-}
--- a/public/images/pokemon/back/shiny/774-red-meteor.png
+++ b/public/images/pokemon/back/shiny/774-red-meteor.png
--- a/public/images/pokemon/back/shiny/774-red.json
+++ b/public/images/pokemon/back/shiny/774-red.json
@ -1,7 +1,7 @@
 {
 	"textures": [
 		{
-			"image": "774-green.png",
+			"image": "774-red.png",
 			"format": "RGBA8888",
 			"size": {
 				"w": 37,
@ -36,6 +36,6 @@
 	"meta": {
 		"app": "https://www.codeandweb.com/texturepacker",
 		"version": "3.0",
-		"smartupdate": "$TexturePacker:SmartUpdate:15dc5fd6941072ff45be95ed6c7c8648:bc55f37f7cfc1778719aa7113bbfe914:e4b1fffb78b8c0cdc557670bcee043ca$"
+		"smartupdate": "$TexturePacker:SmartUpdate:83c95663a6a4dd2327dd160efa96fc46:76b2340565400cf3b9209f1de35a8a7d:cda0147f4d676691e1699693bc0ee567$"
 	}
 }
--- a/public/images/pokemon/back/shiny/774-red.png
+++ b/public/images/pokemon/back/shiny/774-red.png
--- a/public/images/pokemon/back/shiny/774-violet-meteor.json
+++ b/public/images/pokemon/back/shiny/774-violet-meteor.json
@ -1,41 +0,0 @@
-{
-	"textures": [
-		{
-			"image": "774.png",
-			"format": "RGBA8888",
-			"size": {
-				"w": 37,
-				"h": 37
-			},
-			"scale": 1,
-			"frames": [
-				{
-					"filename": "0001.png",
-					"rotated": false,
-					"trimmed": false,
-					"sourceSize": {
-						"w": 37,
-						"h": 37
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 0,
-						"w": 37,
-						"h": 37
-					},
-					"frame": {
-						"x": 0,
-						"y": 0,
-						"w": 37,
-						"h": 37
-					}
-				}
-			]
-		}
-	],
-	"meta": {
-		"app": "https://www.codeandweb.com/texturepacker",
-		"version": "3.0",
-		"smartupdate": "$TexturePacker:SmartUpdate:241dff4083e172e8503b54a7f0210f8d:982b194223ffeef2ba672b3c5979a426:37281ac0aa1e619ef385b889b64064b7$"
-	}
-}
--- a/public/images/pokemon/back/shiny/774-violet-meteor.png
+++ b/public/images/pokemon/back/shiny/774-violet-meteor.png
--- a/public/images/pokemon/back/shiny/774-violet.json
+++ b/public/images/pokemon/back/shiny/774-violet.json
@ -1,7 +1,7 @@
 {
 	"textures": [
 		{
-			"image": "774-green.png",
+			"image": "774-violet.png",
 			"format": "RGBA8888",
 			"size": {
 				"w": 37,
@ -36,6 +36,6 @@
 	"meta": {
 		"app": "https://www.codeandweb.com/texturepacker",
 		"version": "3.0",
-		"smartupdate": "$TexturePacker:SmartUpdate:15dc5fd6941072ff45be95ed6c7c8648:bc55f37f7cfc1778719aa7113bbfe914:e4b1fffb78b8c0cdc557670bcee043ca$"
+		"smartupdate": "$TexturePacker:SmartUpdate:dd289c19ea84de5009d77b1701e0e91c:9e5c9078e416d3f1cee7d51e089a3ba3:cafe7bbce21f2b95187ef35011084eca$"
 	}
 }
--- a/public/images/pokemon/back/shiny/774-violet.png
+++ b/public/images/pokemon/back/shiny/774-violet.png
--- a/public/images/pokemon/back/shiny/774-yellow-meteor.json
+++ b/public/images/pokemon/back/shiny/774-yellow-meteor.json
@ -1,41 +0,0 @@
-{
-	"textures": [
-		{
-			"image": "774.png",
-			"format": "RGBA8888",
-			"size": {
-				"w": 37,
-				"h": 37
-			},
-			"scale": 1,
-			"frames": [
-				{
-					"filename": "0001.png",
-					"rotated": false,
-					"trimmed": false,
-					"sourceSize": {
-						"w": 37,
-						"h": 37
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 0,
-						"w": 37,
-						"h": 37
-					},
-					"frame": {
-						"x": 0,
-						"y": 0,
-						"w": 37,
-						"h": 37
-					}
-				}
-			]
-		}
-	],
-	"meta": {
-		"app": "https://www.codeandweb.com/texturepacker",
-		"version": "3.0",
-		"smartupdate": "$TexturePacker:SmartUpdate:241dff4083e172e8503b54a7f0210f8d:982b194223ffeef2ba672b3c5979a426:37281ac0aa1e619ef385b889b64064b7$"
-	}
-}
--- a/public/images/pokemon/back/shiny/774-yellow-meteor.png
+++ b/public/images/pokemon/back/shiny/774-yellow-meteor.png
--- a/public/images/pokemon/back/shiny/774-yellow.json
+++ b/public/images/pokemon/back/shiny/774-yellow.json
@ -1,7 +1,7 @@
 {
 	"textures": [
 		{
-			"image": "774-green.png",
+			"image": "774-yellow.png",
 			"format": "RGBA8888",
 			"size": {
 				"w": 37,
@ -36,6 +36,6 @@
 	"meta": {
 		"app": "https://www.codeandweb.com/texturepacker",
 		"version": "3.0",
-		"smartupdate": "$TexturePacker:SmartUpdate:15dc5fd6941072ff45be95ed6c7c8648:bc55f37f7cfc1778719aa7113bbfe914:e4b1fffb78b8c0cdc557670bcee043ca$"
+		"smartupdate": "$TexturePacker:SmartUpdate:c7063e9e17bf96e9b263cf3610e97aac:72e798f451f6278999af6e79cca818bd:a0f9f47b818f7e67dd381af2f205c265$"
 	}
 }
--- a/public/images/pokemon/back/shiny/774-yellow.png
+++ b/public/images/pokemon/back/shiny/774-yellow.png
--- a/public/images/pokemon/exp/774-blue-meteor.json
+++ b/public/images/pokemon/exp/774-blue-meteor.json
--- a/public/images/pokemon/exp/774-blue-meteor.png
+++ b/public/images/pokemon/exp/774-blue-meteor.png
--- a/public/images/pokemon/exp/774-blue.png
+++ b/public/images/pokemon/exp/774-blue.png
--- a/public/images/pokemon/exp/774-green-meteor.json
+++ b/public/images/pokemon/exp/774-green-meteor.json
--- a/public/images/pokemon/exp/774-green-meteor.png
+++ b/public/images/pokemon/exp/774-green-meteor.png
--- a/public/images/pokemon/exp/774-green.png
+++ b/public/images/pokemon/exp/774-green.png
--- a/public/images/pokemon/exp/774-indigo-meteor.json
+++ b/public/images/pokemon/exp/774-indigo-meteor.json
--- a/public/images/pokemon/exp/774-indigo-meteor.png
+++ b/public/images/pokemon/exp/774-indigo-meteor.png
--- a/public/images/pokemon/exp/774-indigo.png
+++ b/public/images/pokemon/exp/774-indigo.png
--- a/public/images/pokemon/exp/774-meteor.json
+++ b/public/images/pokemon/exp/774-meteor.json
--- a/public/images/pokemon/exp/774-meteor.png
+++ b/public/images/pokemon/exp/774-meteor.png
--- a/public/images/pokemon/exp/774-orange-meteor.json
+++ b/public/images/pokemon/exp/774-orange-meteor.json
--- a/public/images/pokemon/exp/774-orange-meteor.png
+++ b/public/images/pokemon/exp/774-orange-meteor.png
--- a/public/images/pokemon/exp/774-orange.png
+++ b/public/images/pokemon/exp/774-orange.png
--- a/Show More
+++ b/Show More
Author	SHA1	Message	Date
Sirz Benjie	b3473d3932	Address typing issue in safeguard test	2025-06-18 14:24:24 -06:00
Sirz Benjie	73f113658c	Fix unnecessary attr type cast in move phase	2025-06-18 14:24:24 -06:00
Sirz Benjie	1f2b9c0a07	Fix blockCrit method broken in merge	2025-06-18 14:24:17 -06:00
Sirz Benjie	02e08184d0	Remove empty, unused file	2025-06-18 12:55:24 -06:00
Sirz Benjie	f9bb930495	Update trySetStatus test in pokemon to respect new return value for undefined	2025-06-18 12:55:23 -06:00
Sirz Benjie	3252cfb7a5	Fix regression in flower veil	2025-06-18 12:55:23 -06:00
Sirz Benjie	250fae9f2f	Make cud chew consumption not subclass postTurnAbAttr	2025-06-18 12:55:22 -06:00
Sirz Benjie	f51a4bfd4b	[wip] fix cud chew tests	2025-06-18 12:55:22 -06:00
Sirz Benjie	186a2a5985	Pass source to postApplyDamage in pokemon.ts	2025-06-18 12:55:22 -06:00
Sirz Benjie	5bb423810c	Fix improper simulated check in moody's apply method	2025-06-18 12:55:21 -06:00
Sirz Benjie	fdc7e86ee1	Remove improper condition in mimicry's ability application	2025-06-18 12:55:20 -06:00
Sirz Benjie	d0964c9d56	Fix some tests to mock proper methods	2025-06-18 12:55:19 -06:00
Sirz Benjie	4ffa42bfdf	update abattr callsite in winstrate challenge encounter	2025-06-18 12:55:19 -06:00
Sirz Benjie	1ddcf9b0d6	update ability attribute callsite in shield dust test	2025-06-18 12:55:18 -06:00
Sirz Benjie	a6c5ff76c2	Remove latent test functionality	2025-06-18 12:55:18 -06:00
Sirz Benjie	9e45323402	Update abAttr callsites in misc phases	2025-06-18 12:55:17 -06:00
Sirz Benjie	55e441b56b	Update callsites in turn-start-phase	2025-06-18 12:55:17 -06:00
Sirz Benjie	48f1088250	Update abattr callsites in MEP	2025-06-18 12:55:16 -06:00
Sirz Benjie	49a092fdc4	format with biome and remove cancelled from weather lapse	2025-06-18 12:55:16 -06:00
Sirz Benjie	89c209f53e	Update abattr callsites in battler-tags Also removed stat drop ability application from cancelling ME stat boost effects	2025-06-18 12:55:15 -06:00
Sirz Benjie	a4aba5d0a8	Update abattr callsites in move-phase	2025-06-18 12:55:15 -06:00
Sirz Benjie	40e97f1633	Update callsites in moves.ts	2025-06-18 12:55:14 -06:00
Sirz Benjie	4c5c5ca737	Update callsites in pokemon.ts	2025-06-18 12:55:13 -06:00
Sirz Benjie	ba0115962c	[WIP] update ability signatures	2025-06-18 12:55:13 -06:00
Sirz Benjie	4beab5d07a	[WIP] Refactor ability attribute apply args	2025-06-18 12:55:08 -06:00