From 7e6ab9b099842c83c61f47c063d91c772f7c161a Mon Sep 17 00:00:00 2001 From: Ridaz Date: Sun, 10 Sep 2017 09:46:00 +0100 Subject: [PATCH] Fix Oceanic Operetta move animation --- data/graphics.js | 34 ++++++++++++++++------------------ 1 file changed, 16 insertions(+), 18 deletions(-) diff --git a/data/graphics.js b/data/graphics.js index a0474eb83..7a470e9f6 100644 --- a/data/graphics.js +++ b/data/graphics.js @@ -6070,9 +6070,6 @@ var BattleMoveAnims = { milkdrink: { anim: BattleOtherAnims.consume.anim }, - slackoff: { - anim: BattleOtherAnims.selfstatus.anim - }, happyhour: { anim: BattleOtherAnims.selfstatus.anim }, @@ -31420,7 +31417,7 @@ var BattleMoveAnims = { }, 'linear'); } }, - oceanicoperatta: { + oceanicoperetta: { anim: function (battle, args) { var attacker = args[0]; var defender = args[1]; @@ -31985,6 +31982,20 @@ var BattleMoveAnims = { time: 2600 }, 'decel'); + battle.showEffect(attacker.sp, { + x: attacker.x, + y: attacker.y, + z: attacker.z, + opacity: 0.3, + scale: 1, + time: 1900 + }, { + x: attacker.x, + y: attacker.y + 250, + z: attacker.behind(-50), + opacity: 0, + time: 2300 + }, 'accel'); battle.showEffect(attacker.sp, { x: attacker.x, y: attacker.y, @@ -32013,20 +32024,6 @@ var BattleMoveAnims = { opacity: 0, time: 2340 }, 'accel'); - battle.showEffect(attacker.sp, { - x: attacker.x, - y: attacker.y, - z: attacker.z, - opacity: 0.3, - scale: 1, - time: 1960 - }, { - x: attacker.x, - y: attacker.y + 250, - z: attacker.behind(-50), - opacity: 0, - time: 2360 - }, 'accel'); battle.showEffect('shadowball', { x: defender.x, @@ -32407,6 +32404,7 @@ BattleMoveAnims['purify'] = {anim:BattleMoveAnims['weatherball'].anim}; BattleMoveAnims['pollenpuff'] = {anim:BattleMoveAnims['revelationdance'].anim}; BattleMoveAnims['amnesia'] = {anim:BattleMoveAnims['rest'].anim}; +BattleMoveAnims['slackoff'] = {anim:BattleMoveAnims['rest'].anim}; BattleMoveAnims['secretpower'] = {anim:BattleMoveAnims['technoblast'].anim}; BattleMoveAnims['naturalgift'] = {anim:BattleMoveAnims['technoblast'].anim};