diff --git a/data/moves/animations.asm b/data/moves/animations.asm index b6f82e1b1..4c3486d18 100644 --- a/data/moves/animations.asm +++ b/data/moves/animations.asm @@ -1669,15 +1669,7 @@ BattleAnim_Absorb: anim_1gfx BATTLE_ANIM_GFX_CHARGE anim_obj BATTLE_ANIM_OBJ_ABSORB_CENTER, 44, 88, $0 .loop - anim_sound 6, 3, SFX_WATER_GUN - anim_obj BATTLE_ANIM_OBJ_ABSORB, 128, 48, $2 - anim_wait 6 - anim_sound 6, 3, SFX_WATER_GUN - anim_obj BATTLE_ANIM_OBJ_ABSORB, 136, 64, $3 - anim_wait 6 - anim_sound 6, 3, SFX_WATER_GUN - anim_obj BATTLE_ANIM_OBJ_ABSORB, 136, 32, $4 - anim_wait 6 + anim_call BattleAnimSub_Drain anim_loop 5, .loop anim_wait 32 anim_ret @@ -1686,19 +1678,10 @@ BattleAnim_MegaDrain: anim_setobjpal PAL_BATTLE_OB_YELLOW, PAL_BTLCUSTOM_LIME anim_bgeffect BATTLE_BG_EFFECT_CYCLE_OBPALS_GRAY_AND_YELLOW, $0, $6, $0 anim_1gfx BATTLE_ANIM_GFX_CHARGE - anim_call BattleAnim_TargetObj_1Row anim_bgeffect BATTLE_BG_EFFECT_FADE_MONS_TO_BLACK_REPEATING, $0, BG_EFFECT_TARGET, $10 anim_setvar $0 .loop - anim_sound 6, 3, SFX_WATER_GUN - anim_obj BATTLE_ANIM_OBJ_ABSORB, 128, 48, $2 - anim_wait 6 - anim_sound 6, 3, SFX_WATER_GUN - anim_obj BATTLE_ANIM_OBJ_ABSORB, 136, 64, $3 - anim_wait 6 - anim_sound 6, 3, SFX_WATER_GUN - anim_obj BATTLE_ANIM_OBJ_ABSORB, 136, 32, $4 - anim_wait 6 + anim_call BattleAnimSub_Drain anim_incvar anim_if_var_equal $7, .done anim_if_var_equal $2, .spawn @@ -1714,6 +1697,18 @@ BattleAnim_MegaDrain: anim_call BattleAnim_ShowMon_0 anim_ret +BattleAnimSub_Drain: + anim_sound 6, 3, SFX_WATER_GUN + anim_obj BATTLE_ANIM_OBJ_ABSORB, 128, 48, $2 + anim_wait 6 + anim_sound 6, 3, SFX_WATER_GUN + anim_obj BATTLE_ANIM_OBJ_ABSORB, 136, 64, $3 + anim_wait 6 + anim_sound 6, 3, SFX_WATER_GUN + anim_obj BATTLE_ANIM_OBJ_ABSORB, 136, 32, $4 + anim_wait 6 + anim_ret + BattleAnim_EggBomb: anim_setobjpal PAL_BATTLE_OB_RED, PAL_BTLCUSTOM_FIRE anim_2gfx BATTLE_ANIM_GFX_EGG, BATTLE_ANIM_GFX_EXPLOSION @@ -2389,17 +2384,15 @@ BattleAnim_PetalDance: anim_setobjpal PAL_BATTLE_OB_RED, PAL_BTLCUSTOM_PINK anim_3gfx BATTLE_ANIM_GFX_PETALS, BATTLE_ANIM_GFX_FLOWER, BATTLE_ANIM_GFX_HIT anim_sound 0, 1, SFX_GAME_FREAK_LOGO_GS + anim_battlergfx_2row anim_bgeffect BATTLE_BG_EFFECT_CYCLE_MON_LIGHT_DARK_REPEATING, $0, BG_EFFECT_USER, $20 .loop anim_obj BATTLE_ANIM_OBJ_PETAL_DANCE, 48, 56, $1 anim_wait 11 anim_loop 8, .loop - anim_wait 48 + anim_wait 88 anim_incbgeffect BATTLE_BG_EFFECT_CYCLE_MON_LIGHT_DARK_REPEATING - anim_wait 32 - anim_clearobjs - anim_wait 1 - anim_call BattleAnim_TargetObj_1Row + anim_bgeffect BATTLE_BG_EFFECT_BATTLEROBJ_1ROW, $0, BG_EFFECT_TARGET, $0 anim_bgeffect BATTLE_BG_EFFECT_TACKLE, $0, BG_EFFECT_USER, $0 anim_sound 0, 1, SFX_COMET_PUNCH anim_obj BATTLE_ANIM_OBJ_HIT_YFIX, 136, 56, $0 @@ -2592,7 +2585,6 @@ BattleAnim_Guillotine: anim_obj BATTLE_ANIM_OBJ_CUT_UP_RIGHT, 124, 76, $0 anim_obj BATTLE_ANIM_OBJ_CUT_UP_RIGHT, 120, 72, $0 anim_obj BATTLE_ANIM_OBJ_CUT_UP_RIGHT, 116, 68, $0 - anim_obj BATTLE_ANIM_OBJ_CUT_UP_RIGHT, 120, 72, $0 anim_wait 32 anim_ret @@ -2811,15 +2803,7 @@ BattleAnim_LeechLife: anim_wait 12 anim_1gfx BATTLE_ANIM_GFX_CHARGE .loop - anim_sound 6, 3, SFX_WATER_GUN - anim_obj BATTLE_ANIM_OBJ_ABSORB, 128, 48, $2 - anim_wait 6 - anim_sound 6, 3, SFX_WATER_GUN - anim_obj BATTLE_ANIM_OBJ_ABSORB, 136, 64, $3 - anim_wait 6 - anim_sound 6, 3, SFX_WATER_GUN - anim_obj BATTLE_ANIM_OBJ_ABSORB, 136, 32, $4 - anim_wait 6 + anim_call BattleAnimSub_Drain anim_loop 4, .loop anim_wait 28 anim_ret @@ -3841,7 +3825,6 @@ BattleAnim_GigaDrain: anim_setobjpal PAL_BATTLE_OB_YELLOW, PAL_BTLCUSTOM_LIME anim_bgeffect BATTLE_BG_EFFECT_CYCLE_OBPALS_GRAY_AND_YELLOW, $0, $6, $0 anim_2gfx BATTLE_ANIM_GFX_CHARGE, BATTLE_ANIM_GFX_SHINE - anim_call BattleAnim_TargetObj_1Row anim_bgeffect BATTLE_BG_EFFECT_FADE_MONS_TO_BLACK_REPEATING, $0, BG_EFFECT_TARGET, $10 anim_setvar $0 anim_sound 6, 3, SFX_GIGA_DRAIN