diff --git a/public/images/effects/pb_particles.json b/public/images/effects/pb_particles.json index d947096ab93..74a0131ec73 100644 --- a/public/images/effects/pb_particles.json +++ b/public/images/effects/pb_particles.json @@ -4,7 +4,7 @@ "image": "pb_particles.png", "format": "RGBA8888", "size": { - "w": 66, + "w": 80, "h": 8 }, "scale": 1, @@ -197,6 +197,48 @@ "w": 6, "h": 6 } + }, + { + "filename": "9.png", + "rotated": false, + "trimmed": false, + "sourceSize": { + "w": 8, + "h": 8 + }, + "spriteSourceSize": { + "x": 0, + "y": 0, + "w": 8, + "h": 8 + }, + "frame": { + "x": 66, + "y": 0, + "w": 8, + "h": 8 + } + }, + { + "filename": "10.png", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 8, + "h": 8 + }, + "spriteSourceSize": { + "x": 1, + "y": 1, + "w": 6, + "h": 6 + }, + "frame": { + "x": 74, + "y": 0, + "w": 6, + "h": 6 + } } ] } diff --git a/public/images/effects/pb_particles.png b/public/images/effects/pb_particles.png index c2b2ab8ac93..386ca9b29e7 100644 Binary files a/public/images/effects/pb_particles.png and b/public/images/effects/pb_particles.png differ diff --git a/public/images/items.json b/public/images/items.json index 787674d1ef7..fae7ffcb120 100644 --- a/public/images/items.json +++ b/public/images/items.json @@ -6378,6 +6378,6 @@ "meta": { "app": "https://www.codeandweb.com/texturepacker", "version": "3.0", - "smartupdate": "$TexturePacker:SmartUpdate:1cf92132837bda39e18985a8b2d7242a:b3f43222d272320ba3c1bca23cdbadec:110e074689c9edd2c54833ce2e4d9270$" + "smartupdate": "$TexturePacker:SmartUpdate:8fcd45e3fbd07eb2ba83b10c307721d8:fbf9c1e68dedfd251e00376b88d5c1fb:110e074689c9edd2c54833ce2e4d9270$" } } diff --git a/public/images/items.png b/public/images/items.png index 4bd42f1f043..c661bd50ed3 100644 Binary files a/public/images/items.png and b/public/images/items.png differ diff --git a/public/images/items/rb.png b/public/images/items/rb.png index c62e1bff25f..6bcad969b59 100644 Binary files a/public/images/items/rb.png and b/public/images/items/rb.png differ diff --git a/public/images/pb.json b/public/images/pb.json index c45d722e2ef..d55dd5efa63 100644 --- a/public/images/pb.json +++ b/public/images/pb.json @@ -393,6 +393,6 @@ "meta": { "app": "https://www.codeandweb.com/texturepacker", "version": "3.0", - "smartupdate": "$TexturePacker:SmartUpdate:d0201027b060060859e6dd538ff09720:06e35198d6d176c5d754233d7a871f7c:8bcd206ed4f9371dcc2f2cbe354ed6ed$" + "smartupdate": "$TexturePacker:SmartUpdate:0efebcf5a0349e3198f05490d6ab3701:bd953ec0b847e86511a613c51d748a6b:8bcd206ed4f9371dcc2f2cbe354ed6ed$" } } diff --git a/public/images/pb.png b/public/images/pb.png index c82530404a4..af62128f0fb 100644 Binary files a/public/images/pb.png and b/public/images/pb.png differ diff --git a/public/images/pokeball/rb.png b/public/images/pokeball/rb.png index f972d83fc8e..3d83ce0ecf0 100644 Binary files a/public/images/pokeball/rb.png and b/public/images/pokeball/rb.png differ diff --git a/public/images/pokeball/rb_open.png b/public/images/pokeball/rb_open.png index b91b547d819..ff72ae05f50 100644 Binary files a/public/images/pokeball/rb_open.png and b/public/images/pokeball/rb_open.png differ diff --git a/public/images/pokeball/rb_opening.png b/public/images/pokeball/rb_opening.png index 21075b528d7..18f5ca4e9d1 100644 Binary files a/public/images/pokeball/rb_opening.png and b/public/images/pokeball/rb_opening.png differ diff --git a/src/field/anims.ts b/src/field/anims.ts index 4a6bd2bc6f8..bbe35d9312b 100644 --- a/src/field/anims.ts +++ b/src/field/anims.ts @@ -11,8 +11,10 @@ export function addPokeballOpenParticles(scene: BattleScene, x: number, y: numbe doDefaultPbOpenParticles(scene, x, y, 96); break; case PokeballType.ULTRA_BALL: + doUbOpenParticles(scene, x, y, 8); + break; case PokeballType.ROGUE_BALL: - doUbOpenParticles(scene, x, y); + doUbOpenParticles(scene, x, y, 10); break; case PokeballType.MASTER_BALL: doMbOpenParticles(scene, x, y); @@ -63,10 +65,10 @@ function doDefaultPbOpenParticles(scene: BattleScene, x: number, y: number, radi }); } -function doUbOpenParticles(scene: BattleScene, x: number, y: number) { +function doUbOpenParticles(scene: BattleScene, x: number, y: number, frameIndex: integer) { let particles: Phaser.GameObjects.Image[] = []; for (let i = 0; i < 10; i++) - particles.push(doFanOutParticle(scene, i * 25, x, y, 1, 1, 5, 8)); + particles.push(doFanOutParticle(scene, i * 25, x, y, 1, 1, 5, frameIndex)); scene.tweens.add({ targets: particles,