diff --git a/public/images/pokemon/icons/890.png b/public/images/pokemon/icons/890.png index b8ac500c5..b449ac73b 100644 Binary files a/public/images/pokemon/icons/890.png and b/public/images/pokemon/icons/890.png differ diff --git a/public/images/pokemon/icons/890eternamax.png b/public/images/pokemon/icons/890eternamax.png index 39a9f1269..fb4f60dfe 100644 Binary files a/public/images/pokemon/icons/890eternamax.png and b/public/images/pokemon/icons/890eternamax.png differ diff --git a/public/images/ui/pokemon_icons_6.json b/public/images/ui/pokemon_icons_6.json index 20250634b..1799c6744 100644 --- a/public/images/ui/pokemon_icons_6.json +++ b/public/images/ui/pokemon_icons_6.json @@ -4,53 +4,11 @@ "image": "pokemon_icons_6.png", "format": "RGBA8888", "size": { - "w": 192, - "h": 58 + "w": 109, + "h": 62 }, "scale": 1, "frames": [ - { - "filename": "890eternamax", - "rotated": false, - "trimmed": false, - "sourceSize": { - "w": 67, - "h": 56 - }, - "spriteSourceSize": { - "x": 0, - "y": 0, - "w": 67, - "h": 56 - }, - "frame": { - "x": 0, - "y": 0, - "w": 67, - "h": 56 - } - }, - { - "filename": "890", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 56, - "h": 42 - }, - "spriteSourceSize": { - "x": 1, - "y": 0, - "w": 55, - "h": 42 - }, - "frame": { - "x": 67, - "y": 0, - "w": 55, - "h": 42 - } - }, { "filename": "716", "rotated": false, @@ -66,8 +24,8 @@ "h": 31 }, "frame": { - "x": 122, - "y": 0, + "x": 1, + "y": 1, "w": 31, "h": 31 } @@ -87,12 +45,54 @@ "h": 27 }, "frame": { - "x": 122, - "y": 31, + "x": 1, + "y": 34, "w": 38, "h": 27 } }, + { + "filename": "890eternamax", + "rotated": false, + "trimmed": false, + "sourceSize": { + "w": 38, + "h": 30 + }, + "spriteSourceSize": { + "x": 0, + "y": 0, + "w": 38, + "h": 30 + }, + "frame": { + "x": 34, + "y": 1, + "w": 38, + "h": 30 + } + }, + { + "filename": "890", + "rotated": false, + "trimmed": false, + "sourceSize": { + "w": 33, + "h": 28 + }, + "spriteSourceSize": { + "x": 0, + "y": 0, + "w": 33, + "h": 28 + }, + "frame": { + "x": 41, + "y": 33, + "w": 33, + "h": 28 + } + }, { "filename": "979", "rotated": false, @@ -108,8 +108,8 @@ "h": 30 }, "frame": { - "x": 160, - "y": 0, + "x": 74, + "y": 1, "w": 32, "h": 30 } @@ -129,8 +129,8 @@ "h": 28 }, "frame": { - "x": 160, - "y": 30, + "x": 76, + "y": 33, "w": 32, "h": 28 } @@ -141,6 +141,6 @@ "meta": { "app": "https://www.codeandweb.com/texturepacker", "version": "3.0", - "smartupdate": "$TexturePacker:SmartUpdate:56c494a24236874eac973adb00bb5fd9:06e134328126c54e98e3c55aa35c82b0:6a6cc46d6db7bee1b3e18054101832f5$" + "smartupdate": "$TexturePacker:SmartUpdate:c06b7621c68cbf5898042db33f0e26b6:72170fc6edbf589a4b81617a8b4ac580:96737d38f2029744a75c1ee001bc1929$" } } diff --git a/public/images/ui/pokemon_icons_6.png b/public/images/ui/pokemon_icons_6.png index 74de21022..9c139fad6 100644 Binary files a/public/images/ui/pokemon_icons_6.png and b/public/images/ui/pokemon_icons_6.png differ diff --git a/src/modifier/modifier.ts b/src/modifier/modifier.ts index 75a07eafa..fcde1cb4d 100644 --- a/src/modifier/modifier.ts +++ b/src/modifier/modifier.ts @@ -384,11 +384,8 @@ export abstract class PokemonHeldItemModifier extends PersistentModifier { if (pokemon.getSpeciesForm().generation <= 5) { const iconKey = isIconShown ? pokemon.getIconKey() : 'pkmn_icon__000'; pokemonIcon.play(iconKey).stop(); - } else { - if (pokemon.species.speciesId === Species.ETERNATUS) - pokemonIcon.setScale(0.5, 0.5); + } else pokemonIcon.setFrame(pokemon.getIconId()); - } pokemonIcon.setOrigin(0, 0.5); container.add(pokemonIcon);