diff options
| author | ProjectRevoTPP <projectrevotpp@hotmail.com> | 2018-02-13 21:47:44 -0500 |
|---|---|---|
| committer | ProjectRevoTPP <projectrevotpp@hotmail.com> | 2018-02-13 21:47:44 -0500 |
| commit | 17e1da554b016116bbceba86a8d0dfd360f8340c (patch) | |
| tree | 700a36306e9bf9461f0855bda10247c47b9ececb /data | |
| parent | 8b8ccbbc41141637297cfe847f1ce62e6139d965 (diff) | |
| parent | 28987bb1cd0e6864257ff0434508dddcddb22e98 (diff) | |
Merge branch 'master' of https://github.com/pret/pokeruby into visual_studio
Diffstat (limited to 'data')
| -rw-r--r-- | data/battle_ai_scripts.s | 272 | ||||
| -rw-r--r-- | data/battle_anim_80CA710.s | 32 | ||||
| -rw-r--r-- | data/battle_anim_scripts.s | 732 |
3 files changed, 518 insertions, 518 deletions
diff --git a/data/battle_ai_scripts.s b/data/battle_ai_scripts.s index 17b27fae5..ab83f2bf8 100644 --- a/data/battle_ai_scripts.s +++ b/data/battle_ai_scripts.s @@ -47,7 +47,7 @@ BattleAIs:: @ 81DA01C AI_CheckBadMove: @ 81DA09C is_most_powerful_move if_equal 0, AI_CheckBadMove_CheckSoundproof - if_damage_bonus 0, Score_Down10 + if_damage_bonus 0, Score_Minus10 get_ability TARGET if_equal ABILITY_VOLT_ABSORB, CheckIfVoltAbsorbCancelsElectric if_equal ABILITY_WATER_ABSORB, CheckIfWaterAbsorbCancelsWater @@ -58,39 +58,39 @@ AI_CheckBadMove: @ 81DA09C CheckIfVoltAbsorbCancelsElectric: @ 81DA0CE get_type CURRENT_MOVE - if_arg_equal TYPE_ELECTRIC, Score_Down12 + if_arg_equal TYPE_ELECTRIC, Score_Minus12 jump AI_CheckBadMove_CheckSoundproof CheckIfWaterAbsorbCancelsWater: @ 81DA0DB get_type CURRENT_MOVE - if_arg_equal TYPE_WATER, Score_Down12 + if_arg_equal TYPE_WATER, Score_Minus12 jump AI_CheckBadMove_CheckSoundproof CheckIfFlashFireCancelsFire: @ 81DA0E8 get_type CURRENT_MOVE - if_arg_equal TYPE_FIRE, Score_Down12 + if_arg_equal TYPE_FIRE, Score_Minus12 jump AI_CheckBadMove_CheckSoundproof CheckIfWonderGuardCancelsMove: @ 81DA0F5 if_damage_bonus 80, AI_CheckBadMove_CheckSoundproof - jump Score_Down10 + jump Score_Minus10 CheckIfLevitateCancelsGroundMove: @ 81DA100 get_type CURRENT_MOVE - if_arg_equal TYPE_GROUND, Score_Down10 + if_arg_equal TYPE_GROUND, Score_Minus10 AI_CheckBadMove_CheckSoundproof: @ 81DA108 get_ability TARGET if_not_equal ABILITY_SOUNDPROOF, AI_CheckBadMove_CheckEffect - if_move MOVE_GROWL, Score_Down10 - if_move MOVE_ROAR, Score_Down10 - if_move MOVE_SING, Score_Down10 - if_move MOVE_SUPERSONIC, Score_Down10 - if_move MOVE_SCREECH, Score_Down10 - if_move MOVE_SNORE, Score_Down10 - if_move MOVE_UPROAR, Score_Down10 - if_move MOVE_METAL_SOUND, Score_Down10 - if_move MOVE_GRASS_WHISTLE, Score_Down10 + if_move MOVE_GROWL, Score_Minus10 + if_move MOVE_ROAR, Score_Minus10 + if_move MOVE_SING, Score_Minus10 + if_move MOVE_SUPERSONIC, Score_Minus10 + if_move MOVE_SCREECH, Score_Minus10 + if_move MOVE_SNORE, Score_Minus10 + if_move MOVE_UPROAR, Score_Minus10 + if_move MOVE_METAL_SOUND, Score_Minus10 + if_move MOVE_GRASS_WHISTLE, Score_Minus10 AI_CheckBadMove_CheckEffect: @ 81DA14F if_effect EFFECT_SLEEP, AI_CBM_Sleep @@ -173,7 +173,7 @@ AI_CheckBadMove_CheckEffect: @ 81DA14F if_effect EFFECT_MIRROR_COAT, AI_CBM_HighRiskForDamage if_effect EFFECT_SKULL_BASH, AI_CBM_HighRiskForDamage if_effect EFFECT_FUTURE_SIGHT, AI_CBM_FutureSight - if_effect EFFECT_TELEPORT, Score_Down10 + if_effect EFFECT_TELEPORT, Score_Minus10 if_effect EFFECT_DEFENSE_CURL, AI_CBM_DefenseUp if_effect EFFECT_FAKE_OUT, AI_CBM_FakeOut if_effect EFFECT_STOCKPILE, AI_CBM_Stockpile @@ -206,100 +206,100 @@ AI_CheckBadMove_CheckEffect: @ 81DA14F AI_CBM_Sleep: @ 81DA3DE get_ability TARGET - if_equal ABILITY_INSOMNIA, Score_Down10 - if_equal ABILITY_VITAL_SPIRIT, Score_Down10 - if_status TARGET, SLP | PSN | BRN | FRZ | PAR | TOX, Score_Down10 + if_equal ABILITY_INSOMNIA, Score_Minus10 + if_equal ABILITY_VITAL_SPIRIT, Score_Minus10 + if_status TARGET, SLP | PSN | BRN | FRZ | PAR | TOX, Score_Minus10 end AI_CBM_Explosion: @ 81DA3F7 - if_damage_bonus 0, Score_Down10 + if_damage_bonus 0, Score_Minus10 get_ability TARGET - if_equal ABILITY_DAMP, Score_Down10 + if_equal ABILITY_DAMP, Score_Minus10 count_alive_pokemon USER if_not_equal 0, AI_CBM_Explosion_End count_alive_pokemon TARGET - if_not_equal 0, Score_Down10 - jump Score_Down1 + if_not_equal 0, Score_Minus10 + jump Score_Minus1 AI_CBM_Explosion_End: @ 81DA41A end AI_CBM_Nightmare: @ 81DA41B - if_status2 TARGET, S_NIGHTMARE, Score_Down10 - if_not_status TARGET, SLP, Score_Down8 + if_status2 TARGET, S_NIGHTMARE, Score_Minus10 + if_not_status TARGET, SLP, Score_Minus8 end AI_CBM_DreamEater: @ 81DA430 - if_not_status TARGET, SLP, Score_Down8 - if_damage_bonus 0, Score_Down10 + if_not_status TARGET, SLP, Score_Minus8 + if_damage_bonus 0, Score_Minus10 end AI_CBM_BellyDrum: @ 81DA441 - if_hp_less_than USER, 51, Score_Down10 + if_hp_less_than USER, 51, Score_Minus10 AI_CBM_AttackUp: @ 81DA448 - if_stat_level_equal USER, ATTACK, 12, Score_Down10 + if_stat_level_equal USER, ATTACK, 12, Score_Minus10 end AI_CBM_DefenseUp: @ 81DA451 - if_stat_level_equal USER, DEFENSE, 12, Score_Down10 + if_stat_level_equal USER, DEFENSE, 12, Score_Minus10 end AI_CBM_SpeedUp: @ 81DA45A - if_stat_level_equal USER, SPEED, 12, Score_Down10 + if_stat_level_equal USER, SPEED, 12, Score_Minus10 end AI_CBM_SpAtkUp: @ 81DA463 - if_stat_level_equal USER, SP_ATTACK, 12, Score_Down10 + if_stat_level_equal USER, SP_ATTACK, 12, Score_Minus10 end AI_CBM_SpDefUp: @ 81DA46C - if_stat_level_equal USER, SP_DEFENSE, 12, Score_Down10 + if_stat_level_equal USER, SP_DEFENSE, 12, Score_Minus10 end AI_CBM_AccUp: @ 81DA475 - if_stat_level_equal USER, ACCURACY, 12, Score_Down10 + if_stat_level_equal USER, ACCURACY, 12, Score_Minus10 end AI_CBM_EvasionUp: @ 81DA47E - if_stat_level_equal USER, EVASION, 12, Score_Down10 + if_stat_level_equal USER, EVASION, 12, Score_Minus10 end AI_CBM_AttackDown: @ 81DA487 - if_stat_level_equal TARGET, ATTACK, 0, Score_Down10 + if_stat_level_equal TARGET, ATTACK, 0, Score_Minus10 get_ability TARGET - if_equal ABILITY_HYPER_CUTTER, Score_Down10 + if_equal ABILITY_HYPER_CUTTER, Score_Minus10 jump CheckIfAbilityBlocksStatChange AI_CBM_DefenseDown: @ 81DA49C - if_stat_level_equal TARGET, DEFENSE, 0, Score_Down10 + if_stat_level_equal TARGET, DEFENSE, 0, Score_Minus10 jump CheckIfAbilityBlocksStatChange AI_CBM_SpeedDown: @ 81DA4A9 - if_stat_level_equal TARGET, SPEED, 0, Score_Down10 + if_stat_level_equal TARGET, SPEED, 0, Score_Minus10 jump CheckIfAbilityBlocksStatChange AI_CBM_SpAtkDown: @ 81DA4B6 - if_stat_level_equal TARGET, SP_ATTACK, 0, Score_Down10 + if_stat_level_equal TARGET, SP_ATTACK, 0, Score_Minus10 jump CheckIfAbilityBlocksStatChange AI_CBM_SpDefDown: @ 81DA4C3 - if_stat_level_equal TARGET, SP_DEFENSE, 0, Score_Down10 + if_stat_level_equal TARGET, SP_DEFENSE, 0, Score_Minus10 jump CheckIfAbilityBlocksStatChange AI_CBM_AccDown: @ 81DA4D0 - if_stat_level_equal TARGET, ACCURACY, 0, Score_Down10 + if_stat_level_equal TARGET, ACCURACY, 0, Score_Minus10 get_ability TARGET - if_equal ABILITY_KEEN_EYE, Score_Down10 + if_equal ABILITY_KEEN_EYE, Score_Minus10 jump CheckIfAbilityBlocksStatChange AI_CBM_EvasionDown: @ 81DA4E5 - if_stat_level_equal TARGET, EVASION, 0, Score_Down10 + if_stat_level_equal TARGET, EVASION, 0, Score_Minus10 CheckIfAbilityBlocksStatChange: @ 81DA4ED get_ability TARGET - if_equal ABILITY_CLEAR_BODY, Score_Down10 - if_equal ABILITY_WHITE_SMOKE, Score_Down10 + if_equal ABILITY_CLEAR_BODY, Score_Minus10 + if_equal ABILITY_WHITE_SMOKE, Score_Minus10 end AI_CBM_Haze: @ 81DA4FC @@ -317,299 +317,299 @@ AI_CBM_Haze: @ 81DA4FC if_stat_level_more_than TARGET, SP_DEFENSE, 6, AI_CBM_Haze_End if_stat_level_more_than TARGET, ACCURACY, 6, AI_CBM_Haze_End if_stat_level_more_than TARGET, EVASION, 6, AI_CBM_Haze_End - jump Score_Down10 + jump Score_Minus10 AI_CBM_Haze_End: @ 81DA571 end AI_CBM_Roar: @ 81DA572 count_alive_pokemon TARGET - if_equal 0, Score_Down10 + if_equal 0, Score_Minus10 get_ability TARGET - if_equal ABILITY_SUCTION_CUPS, Score_Down10 + if_equal ABILITY_SUCTION_CUPS, Score_Minus10 end AI_CBM_Toxic: @ 81DA583 get_type ENEMY_TYPE1 - if_equal TYPE_STEEL, Score_Down10 - if_equal TYPE_POISON, Score_Down10 + if_equal TYPE_STEEL, Score_Minus10 + if_equal TYPE_POISON, Score_Minus10 get_type PLAYER_TYPE1 - if_equal TYPE_STEEL, Score_Down10 - if_equal TYPE_POISON, Score_Down10 + if_equal TYPE_STEEL, Score_Minus10 + if_equal TYPE_POISON, Score_Minus10 get_ability TARGET - if_equal ABILITY_IMMUNITY, Score_Down10 - if_status TARGET, SLP | PSN | BRN | FRZ | PAR | TOX, Score_Down10 + if_equal ABILITY_IMMUNITY, Score_Minus10 + if_status TARGET, SLP | PSN | BRN | FRZ | PAR | TOX, Score_Minus10 end AI_CBM_LightScreen: @ 81DA5B2 - if_status4 USER, S_LIGHT_SCREEN, Score_Down8 + if_status4 USER, S_LIGHT_SCREEN, Score_Minus8 end AI_CBM_OneHitKO: @ 81DA5BD - if_damage_bonus 0, Score_Down10 + if_damage_bonus 0, Score_Minus10 get_ability TARGET - if_equal ABILITY_STURDY, Score_Down10 - if_target_higher_level Score_Down10 + if_equal ABILITY_STURDY, Score_Minus10 + if_target_higher_level Score_Minus10 end AI_CBM_Magnitude: @ 81DA5D2 get_ability TARGET - if_equal ABILITY_LEVITATE, Score_Down10 + if_equal ABILITY_LEVITATE, Score_Minus10 AI_CBM_HighRiskForDamage: @ 81DA5DA - if_damage_bonus 0, Score_Down10 + if_damage_bonus 0, Score_Minus10 get_ability TARGET if_not_equal ABILITY_WONDER_GUARD, AI_CBM_HighRiskForDamage_End if_damage_bonus 80, AI_CBM_HighRiskForDamage_End - jump Score_Down10 + jump Score_Minus10 AI_CBM_HighRiskForDamage_End: @ 81DA5F3 end AI_CBM_Mist: @ 81DA5F4 - if_status4 USER, S_MIST, Score_Down8 + if_status4 USER, S_MIST, Score_Minus8 end AI_CBM_FocusEnergy: @ 81DA5FF - if_status2 USER, S_FOCUS_ENERGY, Score_Down10 + if_status2 USER, S_FOCUS_ENERGY, Score_Minus10 end AI_CBM_Confuse: @ 81DA60A - if_status2 TARGET, S_CONFUSED, Score_Down5 + if_status2 TARGET, S_CONFUSED, Score_Minus5 get_ability TARGET - if_equal ABILITY_OWN_TEMPO, Score_Down10 + if_equal ABILITY_OWN_TEMPO, Score_Minus10 end AI_CBM_Reflect: @ 81DA61D - if_status4 USER, S_REFLECT, Score_Down8 + if_status4 USER, S_REFLECT, Score_Minus8 end AI_CBM_Paralyze: @ 81DA628 - if_damage_bonus 0, Score_Down10 + if_damage_bonus 0, Score_Minus10 get_ability TARGET - if_equal ABILITY_LIMBER, Score_Down10 - if_status TARGET, SLP | PSN | BRN | FRZ | PAR | TOX, Score_Down10 + if_equal ABILITY_LIMBER, Score_Minus10 + if_status TARGET, SLP | PSN | BRN | FRZ | PAR | TOX, Score_Minus10 end AI_CBM_Substitute: @ 81DA641 - if_status2 USER, S_SUBSTITUTE, Score_Down8 - if_hp_less_than USER, 26, Score_Down10 + if_status2 USER, S_SUBSTITUTE, Score_Minus8 + if_hp_less_than USER, 26, Score_Minus10 end AI_CBM_LeechSeed: @ 81DA653 - if_status3 TARGET, S_LEECH_SEED, Score_Down10 + if_status3 TARGET, S_LEECH_SEED, Score_Minus10 get_type ENEMY_TYPE1 - if_equal TYPE_GRASS, Score_Down10 + if_equal TYPE_GRASS, Score_Minus10 get_type PLAYER_TYPE1 - if_equal TYPE_GRASS, Score_Down10 + if_equal TYPE_GRASS, Score_Minus10 end AI_CBM_Disable: @ 81DA66E - if_last_move_did_damage TARGET, 0, Score_Down8 + if_last_move_did_damage TARGET, 0, Score_Minus8 end AI_CBM_Encore: @ 81DA676 - if_last_move_did_damage TARGET, 1, Score_Down8 + if_last_move_did_damage TARGET, 1, Score_Minus8 end AI_CBM_DamageDuringSleep: @ 81DA67E - if_not_status USER, SLP, Score_Down8 + if_not_status USER, SLP, Score_Minus8 end AI_CBM_CantEscape: @ 81DA689 - if_status2 TARGET, S_MEAN_LOOK, Score_Down10 + if_status2 TARGET, S_MEAN_LOOK, Score_Minus10 end AI_CBM_Curse: @ 81DA694 - if_stat_level_equal USER, ATTACK, 12, Score_Down10 - if_stat_level_equal USER, DEFENSE, 12, Score_Down8 + if_stat_level_equal USER, ATTACK, 12, Score_Minus10 + if_stat_level_equal USER, DEFENSE, 12, Score_Minus8 end AI_CBM_Spikes: @ 81DA6A5 - if_status4 TARGET, S_SPIKES, Score_Down10 + if_status4 TARGET, S_SPIKES, Score_Minus10 end AI_CBM_Foresight: @ 81DA6B0 - if_status2 TARGET, S_FORESIGHT, Score_Down10 + if_status2 TARGET, S_FORESIGHT, Score_Minus10 end AI_CBM_PerishSong: @ 81DA6BB - if_status3 TARGET, S_PERISH_SONG, Score_Down10 + if_status3 TARGET, S_PERISH_SONG, Score_Minus10 end AI_CBM_Sandstorm: @ 81DA6C6 get_weather - if_equal BATTLE_WEATHER_SANDSTORM, Score_Down8 + if_equal BATTLE_WEATHER_SANDSTORM, Score_Minus8 end AI_CBM_Attract: @ 81DA6CE - if_status2 TARGET, S_INFATUATED, Score_Down10 + if_status2 TARGET, S_INFATUATED, Score_Minus10 get_ability TARGET - if_equal ABILITY_OBLIVIOUS, Score_Down10 + if_equal ABILITY_OBLIVIOUS, Score_Minus10 get_gender USER if_equal 0, AI_CBM_Attract_CheckIfTargetIsFemale if_equal 254, AI_CBM_Attract_CheckIfTargetIsMale - jump Score_Down10 + jump Score_Minus10 AI_CBM_Attract_CheckIfTargetIsFemale: @ 81DA6F3 get_gender TARGET if_equal 254, AI_CBM_Attract_End - jump Score_Down10 + jump Score_Minus10 AI_CBM_Attract_CheckIfTargetIsMale: @ 81DA700 get_gender TARGET if_equal 0, AI_CBM_Attract_End - jump Score_Down10 + jump Score_Minus10 AI_CBM_Attract_End: @ 81DA70D end AI_CBM_Safeguard: @ 81DA70E - if_status4 USER, S_SAFEGUARD, Score_Down8 + if_status4 USER, S_SAFEGUARD, Score_Minus8 end AI_CBM_Memento: @ 81DA719 - if_stat_level_equal TARGET, ATTACK, 0, Score_Down10 - if_stat_level_equal TARGET, SP_ATTACK, 0, Score_Down8 + if_stat_level_equal TARGET, ATTACK, 0, Score_Minus10 + if_stat_level_equal TARGET, SP_ATTACK, 0, Score_Minus8 AI_CBM_BatonPass: @ 81DA729 count_alive_pokemon USER - if_equal 0, Score_Down10 + if_equal 0, Score_Minus10 end AI_CBM_RainDance: @ 81DA732 get_weather - if_equal BATTLE_WEATHER_RAIN, Score_Down8 + if_equal BATTLE_WEATHER_RAIN, Score_Minus8 end AI_CBM_SunnyDay: @ 81DA73A get_weather - if_equal BATTLE_WEATHER_SUN, Score_Down8 + if_equal BATTLE_WEATHER_SUN, Score_Minus8 end AI_CBM_FutureSight: @ 81DA742 - if_status4 TARGET, S_FUTURE_SIGHT, Score_Down10 + if_status4 TARGET, S_FUTURE_SIGHT, Score_Minus10 end AI_CBM_FakeOut: @ 81DA74D is_first_turn USER - if_equal 0, Score_Down10 + if_equal 0, Score_Minus10 end AI_CBM_Stockpile: @ 81DA756 get_stockpile_count USER - if_equal 3, Score_Down10 + if_equal 3, Score_Minus10 end AI_CBM_SpitUpAndSwallow: @ 81DA75F - if_damage_bonus 0, Score_Down10 + if_damage_bonus 0, Score_Minus10 get_stockpile_count USER - if_equal 0, Score_Down10 + if_equal 0, Score_Minus10 end AI_CBM_Hail: @ 81DA76E get_weather - if_equal BATTLE_WEATHER_HAIL, Score_Down8 + if_equal BATTLE_WEATHER_HAIL, Score_Minus8 end AI_CBM_Torment: @ 81DA776 - if_status2 TARGET, S_TORMENT, Score_Down10 + if_status2 TARGET, S_TORMENT, Score_Minus10 end AI_CBM_WillOWisp: @ 81DA781 get_ability TARGET - if_equal ABILITY_WATER_VEIL, Score_Down10 - if_status TARGET, SLP | PSN | BRN | FRZ | PAR | TOX, Score_Down10 - if_damage_bonus 0, Score_Down10 - if_damage_bonus 20, Score_Down10 - if_damage_bonus 10, Score_Down10 + if_equal ABILITY_WATER_VEIL, Score_Minus10 + if_status TARGET, SLP | PSN | BRN | FRZ | PAR | TOX, Score_Minus10 + if_damage_bonus 0, Score_Minus10 + if_damage_bonus 20, Score_Minus10 + if_damage_bonus 10, Score_Minus10 end AI_CBM_HelpingHand: @ 81DA7A6 is_double_battle - if_equal 0, Score_Down10 + if_equal 0, Score_Minus10 end AI_CBM_TrickAndKnockOff: @ 81DA7AE get_ability TARGET - if_equal ABILITY_STICKY_HOLD, Score_Down10 + if_equal ABILITY_STICKY_HOLD, Score_Minus10 end AI_CBM_Ingrain: @ 81DA7B7 - if_status3 USER, S_ROOTED, Score_Down10 + if_status3 USER, S_ROOTED, Score_Minus10 end AI_CBM_Recycle: @ 81DA7C2 get_item USER - if_equal ITEM_NONE, Score_Down10 + if_equal ITEM_NONE, Score_Minus10 end AI_CBM_Imprison: @ 81DA7CB - if_status3 USER, S_IMPRISONED, Score_Down10 + if_status3 USER, S_IMPRISONED, Score_Minus10 end AI_CBM_Refresh: @ 81DA7D6 - if_not_status USER, PSN | BRN | PAR | TOX, Score_Down10 + if_not_status USER, PSN | BRN | PAR | TOX, Score_Minus10 end AI_CBM_MudSport: @ 81DA7E1 - if_status3 USER, S_MUD_SPORT, Score_Down10 + if_status3 USER, S_MUD_SPORT, Score_Minus10 end AI_CBM_Tickle: @ 81DA7EC - if_stat_level_equal TARGET, ATTACK, 0, Score_Down10 - if_stat_level_equal TARGET, DEFENSE, 0, Score_Down8 + if_stat_level_equal TARGET, ATTACK, 0, Score_Minus10 + if_stat_level_equal TARGET, DEFENSE, 0, Score_Minus8 end AI_CBM_CosmicPower: @ 81DA7FD - if_stat_level_equal USER, DEFENSE, 12, Score_Down10 - if_stat_level_equal USER, SP_DEFENSE, 12, Score_Down8 + if_stat_level_equal USER, DEFENSE, 12, Score_Minus10 + if_stat_level_equal USER, SP_DEFENSE, 12, Score_Minus8 end AI_CBM_BulkUp: @ 81DA80E - if_stat_level_equal USER, ATTACK, 12, Score_Down10 - if_stat_level_equal USER, DEFENSE, 12, Score_Down8 + if_stat_level_equal USER, ATTACK, 12, Score_Minus10 + if_stat_level_equal USER, DEFENSE, 12, Score_Minus8 end AI_CBM_WaterSport: @ 81DA81F - if_status3 USER, S_WATER_SPORT, Score_Down10 + if_status3 USER, S_WATER_SPORT, Score_Minus10 end AI_CBM_CalmMind: @ 81DA82A - if_stat_level_equal USER, SP_ATTACK, 12, Score_Down10 - if_stat_level_equal USER, SP_DEFENSE, 12, Score_Down8 + if_stat_level_equal USER, SP_ATTACK, 12, Score_Minus10 + if_stat_level_equal USER, SP_DEFENSE, 12, Score_Minus8 end AI_CBM_DragonDance: @ 81DA83B - if_stat_level_equal USER, ATTACK, 12, Score_Down10 - if_stat_level_equal USER, SPEED, 12, Score_Down8 + if_stat_level_equal USER, ATTACK, 12, Score_Minus10 + if_stat_level_equal USER, SPEED, 12, Score_Minus8 end -Score_Down1: @ 81DA84C +Score_Minus1: @ 81DA84C score -1 end -Score_Down2: @ 81DA84F +Score_Minus2: @ 81DA84F score -2 end -Score_Down3: @ 81DA852 +Score_Minus3: @ 81DA852 score -3 end -Score_Down5: @ 81DA855 +Score_Minus5: @ 81DA855 score -5 end -Score_Down8: @ 81DA858 +Score_Minus8: @ 81DA858 score -8 end -Score_Down10: @ 81DA85B +Score_Minus10: @ 81DA85B score -10 end -Score_Down12: @ 81DA85E +Score_Minus12: @ 81DA85E score -12 end @@ -788,7 +788,7 @@ AI_CV_SelfKO_Encourage1: @ 81DAB94 if_hp_less_than USER, 80, AI_CV_SelfKO_Encourage2 if_would_go_first USER, AI_CV_SelfKO_Encourage2 if_random_less_than 50, AI_CV_SelfKO_End - jump Score_Down3 + jump Score_Minus3 AI_CV_SelfKO_Encourage2: @ 81DABAC if_hp_more_than USER, 50, AI_CV_SelfKO_Encourage4 @@ -1354,7 +1354,7 @@ AI_CV_Conversion: @ 81DB17A AI_CV_Conversion2: @ 81DB183 get_turn_count if_equal 0, AI_CV_Conversion_End - if_random_less_than 200, Score_Down2 + if_random_less_than 200, Score_Minus2 AI_CV_Conversion_End: @ 81DB190 end @@ -2695,7 +2695,7 @@ AI_CV_DragonDance_End: @ 81DBE96 AI_TryToFaint: @ 81DBE97 if_can_faint AI_TryToFaint_TryToEncourageQuickAttack is_most_powerful_move - if_equal 1, Score_Down1 + if_equal 1, Score_Minus1 end AI_TryToFaint_TryToEncourageQuickAttack: @ 81DBEA4 diff --git a/data/battle_anim_80CA710.s b/data/battle_anim_80CA710.s index c7c83e7bd..e1a1511c0 100644 --- a/data/battle_anim_80CA710.s +++ b/data/battle_anim_80CA710.s @@ -20,11 +20,11 @@ gSpriteAnimTable_83D6220:: @ 83D6220 .4byte gSpriteAnim_83D61FC .align 2 -gBattleAnimSpriteTemplate_83D6224:: @ 83D6224 +gSleepPowderParticleSpriteTemplate:: @ 83D6224 spr_template 10067, 10067, gOamData_837DF64, gSpriteAnimTable_83D6220, NULL, gDummySpriteAffineAnimTable, AnimMovePowderParticle .align 2 -gBattleAnimSpriteTemplate_83D623C:: @ 83D623C +gStunSporeParticleSpriteTemplate:: @ 83D623C spr_template 10068, 10068, gOamData_837DF64, gSpriteAnimTable_83D6220, NULL, gDummySpriteAffineAnimTable, AnimMovePowderParticle .align 2 @@ -243,7 +243,7 @@ gBattleAnimSpriteTemplate_83D649C:: @ 83D649C .align 2 gBattleAnimSpriteTemplate_83D64B4:: @ 83D64B4 - spr_template 10063, 10063, gOamData_837DF2C, gSpriteAnimTable_83D6494, NULL, gDummySpriteAffineAnimTable, sub_80CB144 + spr_template 10063, 10063, gOamData_837DF2C, gSpriteAnimTable_83D6494, NULL, gDummySpriteAffineAnimTable, AnimMoveTwisterParticle .align 2 gSpriteAnim_83D64CC:: @ 83D64CC @@ -259,7 +259,7 @@ gSpriteAnimTable_83D64E0:: @ 83D64E0 .align 2 gBattleAnimSpriteTemplate_83D64E4:: @ 83D64E4 - spr_template 10160, 10160, gOamData_837DF54, gSpriteAnimTable_83D64E0, NULL, gDummySpriteAffineAnimTable, sub_80CAFD0 + spr_template 10160, 10160, gOamData_837DF54, gSpriteAnimTable_83D64E0, NULL, gDummySpriteAffineAnimTable, AnimTranslateLinearSingleSineWave .align 2 gSpriteAffineAnim_83D64FC:: @ 83D64FC @@ -271,8 +271,8 @@ gSpriteAffineAnimTable_83D650C:: @ 83D650C .4byte gSpriteAffineAnim_83D64FC .align 2 -gBattleAnimSpriteTemplate_83D6510:: @ 83D6510 - spr_template 10174, 10174, gOamData_837DF94, gDummySpriteAnimTable, NULL, gSpriteAffineAnimTable_83D650C, sub_80CAFD0 +gSwiftStarSpriteTemplate:: @ 83D6510 + spr_template 10174, 10174, gOamData_837DF94, gDummySpriteAnimTable, NULL, gSpriteAffineAnimTable_83D650C, AnimTranslateLinearSingleSineWave .align 2 gSpriteAnim_83D6528:: @ 83D6528 @@ -1031,7 +1031,7 @@ gBattleAnimSpriteTemplate_83D6EF0:: @ 83D6EF0 .align 2 gBattleAnimSpriteTemplate_83D6F08:: @ 83D6F08 - spr_template 10017, 10017, gOamData_837DF24, gDummySpriteAnimTable, NULL, gDummySpriteAffineAnimTable, sub_807941C + spr_template 10017, 10017, gOamData_837DF24, gDummySpriteAnimTable, NULL, gDummySpriteAffineAnimTable, TranslateAnimSpriteToTargetMonLocation .align 2 gSpriteAnim_83D6F20:: @ 83D6F20 @@ -1490,16 +1490,16 @@ gSpriteAffineAnimTable_83D7530:: @ 83D7530 .4byte gSpriteAffineAnim_83D74EC .align 2 -gBattleAnimSpriteTemplate_83D7534:: @ 83D7534 - spr_template 10163, 10163, gOamData_837E034, gDummySpriteAnimTable, NULL, gSpriteAffineAnimTable_83D752C, sub_807941C +gSupersonicWaveSpriteTemplate:: @ 83D7534 + spr_template 10163, 10163, gOamData_837E034, gDummySpriteAnimTable, NULL, gSpriteAffineAnimTable_83D752C, TranslateAnimSpriteToTargetMonLocation .align 2 -gBattleAnimSpriteTemplate_83D754C:: @ 83D754C - spr_template 10164, 10164, gOamData_837E034, gDummySpriteAnimTable, NULL, gSpriteAffineAnimTable_83D752C, sub_807941C +gScreechWaveSpriteTemplate:: @ 83D754C + spr_template 10164, 10164, gOamData_837E034, gDummySpriteAnimTable, NULL, gSpriteAffineAnimTable_83D752C, TranslateAnimSpriteToTargetMonLocation .align 2 gBattleAnimSpriteTemplate_83D7564:: @ 83D7564 - spr_template 10260, 10260, gOamData_837E03C, gDummySpriteAnimTable, NULL, gSpriteAffineAnimTable_83D752C, sub_807941C + spr_template 10260, 10260, gOamData_837E03C, gDummySpriteAnimTable, NULL, gSpriteAffineAnimTable_83D752C, TranslateAnimSpriteToTargetMonLocation .align 2 gBattleAnimSpriteTemplate_83D757C:: @ 83D757C @@ -2449,7 +2449,7 @@ gSpriteAnimTable_83D95E0:: @ 83D95E0 .align 2 gBattleAnimSpriteTemplate_83D95E4:: @ 83D95E4 - spr_template 10029, 10029, gOamData_837DF34, gDummySpriteAnimTable, NULL, gDummySpriteAffineAnimTable, sub_807941C + spr_template 10029, 10029, gOamData_837DF34, gDummySpriteAnimTable, NULL, gDummySpriteAffineAnimTable, TranslateAnimSpriteToTargetMonLocation .align 2 gBattleAnimSpriteTemplate_83D95FC:: @ 83D95FC @@ -2631,7 +2631,7 @@ gBattleAnimSpriteTemplate_83D985C:: @ 83D985C .align 2 gBattleAnimSpriteTemplate_83D9874:: @ 83D9874 - spr_template 10171, 10171, gOamData_837DF2C, gDummySpriteAnimTable, NULL, gDummySpriteAffineAnimTable, sub_807941C + spr_template 10171, 10171, gOamData_837DF2C, gDummySpriteAnimTable, NULL, gDummySpriteAffineAnimTable, TranslateAnimSpriteToTargetMonLocation .align 2 gSpriteAffineAnim_83D988C:: @ 83D988C @@ -3713,7 +3713,7 @@ gBattleAnimSpriteTemplate_83DA76C:: @ 83DA76C .align 2 gBattleAnimSpriteTemplate_83DA784:: @ 83DA784 - spr_template 10163, 10163, gOamData_837DF74, gDummySpriteAnimTable, NULL, gDummySpriteAffineAnimTable, sub_807941C + spr_template 10163, 10163, gOamData_837DF74, gDummySpriteAnimTable, NULL, gDummySpriteAffineAnimTable, TranslateAnimSpriteToTargetMonLocation .align 2 gSpriteAnim_83DA79C:: @ 83DA79C @@ -4151,7 +4151,7 @@ gBattleAnimSpriteTemplate_83DAE00:: @ 83DAE00 .align 2 gBattleAnimSpriteTemplate_83DAE18:: @ 83DAE18 - spr_template 10058, 10058, gOamData_837DF34, gSpriteAnimTable_83DAD58, NULL, gSpriteAffineAnimTable_83DADE0, sub_80CB144 + spr_template 10058, 10058, gOamData_837DF34, gSpriteAnimTable_83DAD58, NULL, gSpriteAffineAnimTable_83DADE0, AnimMoveTwisterParticle .align 2 gBattleAnimSpriteTemplate_83DAE30:: @ 83DAE30 diff --git a/data/battle_anim_scripts.s b/data/battle_anim_scripts.s index ae28bc16a..48af05ca4 100644 --- a/data/battle_anim_scripts.s +++ b/data/battle_anim_scripts.s @@ -479,48 +479,48 @@ Move_POISON_POWDER: @ 81C7818 Move_STUN_SPORE: @ 81C7949 loadspritegfx 10068 loopsewithpan SE_W077, 63, 10, 6 - createsprite gBattleAnimSpriteTemplate_83D623C, 130, -30, -22, 117, 80, 5, 1 - createsprite gBattleAnimSpriteTemplate_83D623C, 130, 10, -22, 117, 80, -5, 1 - createsprite gBattleAnimSpriteTemplate_83D623C, 130, -25, -22, 117, 112, 5, 3 + createsprite gStunSporeParticleSpriteTemplate, 130, -30, -22, 117, 80, 5, 1 + createsprite gStunSporeParticleSpriteTemplate, 130, 10, -22, 117, 80, -5, 1 + createsprite gStunSporeParticleSpriteTemplate, 130, -25, -22, 117, 112, 5, 3 delay 15 - createsprite gBattleAnimSpriteTemplate_83D623C, 130, -5, -22, 117, 80, -5, 1 - createsprite gBattleAnimSpriteTemplate_83D623C, 130, 5, -22, 117, 96, 5, 1 - createsprite gBattleAnimSpriteTemplate_83D623C, 130, 0, -22, 117, 69, -5, 1 - createsprite gBattleAnimSpriteTemplate_83D623C, 130, -15, -22, 117, 112, 5, 2 + createsprite gStunSporeParticleSpriteTemplate, 130, -5, -22, 117, 80, -5, 1 + createsprite gStunSporeParticleSpriteTemplate, 130, 5, -22, 117, 96, 5, 1 + createsprite gStunSporeParticleSpriteTemplate, 130, 0, -22, 117, 69, -5, 1 + createsprite gStunSporeParticleSpriteTemplate, 130, -15, -22, 117, 112, 5, 2 delay 30 - createsprite gBattleAnimSpriteTemplate_83D623C, 130, -15, -22, 117, 112, 5, 2 - createsprite gBattleAnimSpriteTemplate_83D623C, 130, 15, -22, 117, 80, -5, 1 - createsprite gBattleAnimSpriteTemplate_83D623C, 130, -10, -22, 117, 96, 7, 2 - createsprite gBattleAnimSpriteTemplate_83D623C, 130, -5, -22, 117, 90, -8, 0 + createsprite gStunSporeParticleSpriteTemplate, 130, -15, -22, 117, 112, 5, 2 + createsprite gStunSporeParticleSpriteTemplate, 130, 15, -22, 117, 80, -5, 1 + createsprite gStunSporeParticleSpriteTemplate, 130, -10, -22, 117, 96, 7, 2 + createsprite gStunSporeParticleSpriteTemplate, 130, -5, -22, 117, 90, -8, 0 delay 20 - createsprite gBattleAnimSpriteTemplate_83D623C, 130, -10, -22, 117, 80, -5, 1 - createsprite gBattleAnimSpriteTemplate_83D623C, 130, 0, -22, 117, 89, 5, 2 - createsprite gBattleAnimSpriteTemplate_83D623C, 130, 20, -22, 117, 112, -8, 2 - createsprite gBattleAnimSpriteTemplate_83D623C, 130, 5, -22, 117, 80, 5, 1 + createsprite gStunSporeParticleSpriteTemplate, 130, -10, -22, 117, 80, -5, 1 + createsprite gStunSporeParticleSpriteTemplate, 130, 0, -22, 117, 89, 5, 2 + createsprite gStunSporeParticleSpriteTemplate, 130, 20, -22, 117, 112, -8, 2 + createsprite gStunSporeParticleSpriteTemplate, 130, 5, -22, 117, 80, 5, 1 waitforvisualfinish end Move_SLEEP_POWDER: @ 81C7A77 loadspritegfx 10067 loopsewithpan SE_W077, 63, 10, 6 - createsprite gBattleAnimSpriteTemplate_83D6224, 130, -30, -22, 117, 80, 5, 1 - createsprite gBattleAnimSpriteTemplate_83D6224, 130, 10, -22, 117, 80, -5, 1 - createsprite gBattleAnimSpriteTemplate_83D6224, 130, -25, -22, 117, 112, 5, 3 + createsprite gSleepPowderParticleSpriteTemplate, 130, -30, -22, 117, 80, 5, 1 + createsprite gSleepPowderParticleSpriteTemplate, 130, 10, -22, 117, 80, -5, 1 + createsprite gSleepPowderParticleSpriteTemplate, 130, -25, -22, 117, 112, 5, 3 delay 15 - createsprite gBattleAnimSpriteTemplate_83D6224, 130, -5, -22, 117, 80, -5, 1 - createsprite gBattleAnimSpriteTemplate_83D6224, 130, 5, -22, 117, 96, 5, 1 - createsprite gBattleAnimSpriteTemplate_83D6224, 130, 0, -22, 117, 69, -5, 1 - createsprite gBattleAnimSpriteTemplate_83D6224, 130, -15, -22, 117, 112, 5, 2 + createsprite gSleepPowderParticleSpriteTemplate, 130, -5, -22, 117, 80, -5, 1 + createsprite gSleepPowderParticleSpriteTemplate, 130, 5, -22, 117, 96, 5, 1 + createsprite gSleepPowderParticleSpriteTemplate, 130, 0, -22, 117, 69, -5, 1 + createsprite gSleepPowderParticleSpriteTemplate, 130, -15, -22, 117, 112, 5, 2 delay 30 - createsprite gBattleAnimSpriteTemplate_83D6224, 130, -15, -22, 117, 112, 5, 2 - createsprite gBattleAnimSpriteTemplate_83D6224, 130, 15, -22, 117, 80, -5, 1 - createsprite gBattleAnimSpriteTemplate_83D6224, 130, -10, -22, 117, 96, 7, 2 - createsprite gBattleAnimSpriteTemplate_83D6224, 130, -5, -22, 117, 90, -8, 0 + createsprite gSleepPowderParticleSpriteTemplate, 130, -15, -22, 117, 112, 5, 2 + createsprite gSleepPowderParticleSpriteTemplate, 130, 15, -22, 117, 80, -5, 1 + createsprite gSleepPowderParticleSpriteTemplate, 130, -10, -22, 117, 96, 7, 2 + createsprite gSleepPowderParticleSpriteTemplate, 130, -5, -22, 117, 90, -8, 0 delay 20 - createsprite gBattleAnimSpriteTemplate_83D6224, 130, -10, -22, 117, 80, -5, 1 - createsprite gBattleAnimSpriteTemplate_83D6224, 130, 0, -22, 117, 89, 5, 2 - createsprite gBattleAnimSpriteTemplate_83D6224, 130, 20, -22, 117, 112, -8, 2 - createsprite gBattleAnimSpriteTemplate_83D6224, 130, 5, -22, 117, 80, 5, 1 + createsprite gSleepPowderParticleSpriteTemplate, 130, -10, -22, 117, 80, -5, 1 + createsprite gSleepPowderParticleSpriteTemplate, 130, 0, -22, 117, 89, 5, 2 + createsprite gSleepPowderParticleSpriteTemplate, 130, 20, -22, 117, 112, -8, 2 + createsprite gSleepPowderParticleSpriteTemplate, 130, 5, -22, 117, 80, 5, 1 waitforvisualfinish end @@ -530,21 +530,21 @@ Move_SWIFT: @ 81C7BA5 monbg ANIM_BANK_DEF_PARTNER setalpha 12, 8 playsewithpan SE_W129, 192 - createsprite gBattleAnimSpriteTemplate_83D6510, 131, 20, -10, 20, 0, 22, 20, 1 + createsprite gSwiftStarSpriteTemplate, 131, 20, -10, 20, 0, 22, 20, 1 delay 5 playsewithpan SE_W129, 192 - createsprite gBattleAnimSpriteTemplate_83D6510, 131, 20, -10, 20, 5, 22, -18, 1 + createsprite gSwiftStarSpriteTemplate, 131, 20, -10, 20, 5, 22, -18, 1 delay 5 playsewithpan SE_W129, 192 - createsprite gBattleAnimSpriteTemplate_83D6510, 131, 20, -10, 20, -10, 22, 15, 1 - createvisualtask sub_80A7FA0, 2, 1, 2, 0, 18, 1 - createvisualtask sub_80A7FA0, 2, 3, 2, 0, 18, 1 + createsprite gSwiftStarSpriteTemplate, 131, 20, -10, 20, -10, 22, 15, 1 + createvisualtask AnimTask_ShakeMon2, 2, ANIM_BANK_TARGET, 2, 0, 18, 1 + createvisualtask AnimTask_ShakeMon2, 2, ANIM_BANK_DEF_PARTNER, 2, 0, 18, 1 delay 5 playsewithpan SE_W129, 192 - createsprite gBattleAnimSpriteTemplate_83D6510, 131, 20, -10, 20, 0, 22, -20, 1 + createsprite gSwiftStarSpriteTemplate, 131, 20, -10, 20, 0, 22, -20, 1 delay 5 playsewithpan SE_W129, 192 - createsprite gBattleAnimSpriteTemplate_83D6510, 131, 20, -10, 20, 0, 22, 12, 1 + createsprite gSwiftStarSpriteTemplate, 131, 20, -10, 20, 0, 22, 12, 1 delay 5 waitforvisualfinish clearmonbg ANIM_BANK_DEF_PARTNER @@ -556,11 +556,11 @@ Move_STRENGTH: @ 81C7C5E monbg ANIM_BANK_DEF_PARTNER setalpha 12, 8 playsewithpan SE_W036, 192 - createvisualtask sub_80A8314, 5, 0, 2, 0, 96, 30 + createvisualtask AnimTask_ShakeAndSinkMon, 5, ANIM_BANK_ATTACKER, 2, 0, 96, 30 waitforvisualfinish delay 10 - createsprite gBattleAnimSpriteTemplate_83C1FE0, 2, 0, 0, 4 - createvisualtask sub_80A8500, 2, 1, 18, 6, 2, 4 + createsprite gSlideMonToOriginalPosSpriteTemplate, 2, 0, 0, 4 + createvisualtask AnimTask_TranslateMonEllipticalRespectSide, 2, ANIM_BANK_TARGET, 18, 6, 2, 4 delay 4 playsewithpan SE_W025B, 63 createsprite gBasicHitSplatSpriteTemplate, 3, 16, 12, 1, 1 @@ -571,7 +571,7 @@ Move_STRENGTH: @ 81C7C5E playsewithpan SE_W025B, 63 createsprite gBasicHitSplatSpriteTemplate, 3, 3, 4, 1, 1 waitforvisualfinish - createvisualtask sub_80A7FA0, 2, 1, 2, 0, 8, 1 + createvisualtask AnimTask_ShakeMon2, 2, ANIM_BANK_TARGET, 2, 0, 8, 1 waitforvisualfinish clearmonbg ANIM_BANK_DEF_PARTNER blendoff @@ -581,7 +581,7 @@ Move_TACKLE: @ 81C7CF2 loadspritegfx 10135 monbg ANIM_BANK_TARGET setalpha 12, 8 - createsprite gBattleAnimSpriteTemplate_83C1FB0, 2, 4, 4 + createsprite gHorizontalLungeSpriteTemplate, 2, 4, 4 delay 6 createsprite gBasicHitSplatSpriteTemplate, 2, 0, 0, 1, 2 createvisualtask AnimTask_ShakeMon, 2, ANIM_BANK_TARGET, 3, 0, 6, 1 @@ -596,22 +596,22 @@ Move_BODY_SLAM: @ 81C7D30 monbg ANIM_BANK_DEF_PARTNER setalpha 12, 8 playsewithpan SE_W036, 192 - createsprite gBattleAnimSpriteTemplate_83C1FC8, 2, 6, 1, 0 + createsprite gVerticalDipSpriteTemplate, 2, 6, 1, ANIM_BANK_ATTACKER waitforvisualfinish delay 11 - createsprite gBattleAnimSpriteTemplate_83C1FF8, 2, 0, 26, 0, 0, 5 + createsprite gSlideMonToOffsetSpriteTemplate, 2, 0, 26, 0, 0, 5 delay 6 createsprite gBasicHitSplatSpriteTemplate, 4, -10, 0, 1, 0 loopsewithpan SE_W025B, 63, 10, 2 delay 1 - createsprite gBattleAnimSpriteTemplate_83C1FF8, 2, 1, -28, 0, 0, 3 + createsprite gSlideMonToOffsetSpriteTemplate, 2, 1, -28, 0, 0, 3 waitforvisualfinish - createvisualtask sub_80A8154, 2, 1, 4, 0, 12, 1 + createvisualtask AnimTask_ShakeMonInPlace, 2, ANIM_BANK_TARGET, 4, 0, 12, 1 waitforvisualfinish delay 10 - createsprite gBattleAnimSpriteTemplate_83C1FE0, 2, 0, 0, 6 + createsprite gSlideMonToOriginalPosSpriteTemplate, 2, 0, 0, 6 delay 5 - createsprite gBattleAnimSpriteTemplate_83C1FE0, 2, 1, 0, 6 + createsprite gSlideMonToOriginalPosSpriteTemplate, 2, 1, 0, 6 waitforvisualfinish clearmonbg ANIM_BANK_DEF_PARTNER blendoff @@ -620,44 +620,44 @@ Move_BODY_SLAM: @ 81C7D30 Move_SUPERSONIC: @ 81C7DBD loadspritegfx 10163 monbg ANIM_BANK_ATK_PARTNER - monbgprio_2A 0 + monbgprio_2A ANIM_BANK_ATTACKER setalpha 12, 8 - createvisualtask sub_80A7FA0, 2, 0, 2, 0, 8, 1 - call _81C7DFB - call _81C7DFB - call _81C7DFB - call _81C7DFB - call _81C7DFB - call _81C7DFB + createvisualtask AnimTask_ShakeMon2, 2, ANIM_BANK_ATTACKER, 2, 0, 8, 1 + call Move_SUPERSONIC_CreateWaveSprite + call Move_SUPERSONIC_CreateWaveSprite + call Move_SUPERSONIC_CreateWaveSprite + call Move_SUPERSONIC_CreateWaveSprite + call Move_SUPERSONIC_CreateWaveSprite + call Move_SUPERSONIC_CreateWaveSprite waitforvisualfinish clearmonbg ANIM_BANK_ATK_PARTNER blendoff end -_81C7DFB: +Move_SUPERSONIC_CreateWaveSprite: playsewithpan SE_W048, 192 - createsprite gBattleAnimSpriteTemplate_83D7534, 130, 16, 0, 0, 0, 30, 0 + createsprite gSupersonicWaveSpriteTemplate, 130, 16, 0, 0, 0, 30, 0 delay 2 return Move_SCREECH: @ 81C7E15 loadspritegfx 10164 - createvisualtask sub_80A7FA0, 2, 0, 3, 0, 2, 1 - call _81C7E48 - call _81C7E48 + createvisualtask AnimTask_ShakeMon2, 2, ANIM_BANK_ATTACKER, 3, 0, 2, 1 + call Move_SCREECH_CreateWaveSprite + call Move_SCREECH_CreateWaveSprite delay 16 - createvisualtask sub_80A8B88, 5, 0, 6, 2048, 2, 1 + createvisualtask AnimTask_SwayMon, 5, 0, 6, 2048, 2, 1 waitforvisualfinish end -_81C7E48: +Move_SCREECH_CreateWaveSprite: playsewithpan SE_W103, 192 - createsprite gBattleAnimSpriteTemplate_83D754C, 130, 16, 0, 0, 0, 30, 0 + createsprite gScreechWaveSpriteTemplate, 130, 16, 0, 0, 0, 30, 0 delay 2 return Move_FLAME_WHEEL: @ 81C7E62 loadspritegfx 10029 monbg ANIM_BANK_DEF_PARTNER - monbgprio_2A 1 + monbgprio_2A ANIM_BANK_TARGET createsprite gBattleAnimSpriteTemplate_83D9694, 3, 0, 0, 56, 0 playsewithpan SE_W172, 192 delay 2 @@ -679,14 +679,14 @@ Move_FLAME_WHEEL: @ 81C7E62 createsprite gBattleAnimSpriteTemplate_83D9694, 3, 0, 0, 56, 24 playsewithpan SE_W172, 192 waitforvisualfinish - createsprite gBattleAnimSpriteTemplate_83C1FF8, 2, 0, 24, 0, 0, 6 + createsprite gSlideMonToOffsetSpriteTemplate, 2, 0, 24, 0, 0, 6 delay 4 createvisualtask AnimTask_ShakeMon, 2, ANIM_BANK_TARGET, 5, 0, 8, 1 createvisualtask sub_8079790, 3, 1, 31, 12, 1, 1 playsewithpan SE_W172B, 63 call _81D11A2 delay 7 - createsprite gBattleAnimSpriteTemplate_83C1FE0, 2, 0, 0, 9 + createsprite gSlideMonToOriginalPosSpriteTemplate, 2, 0, 0, 9 waitforvisualfinish clearmonbg ANIM_BANK_DEF_PARTNER end @@ -709,17 +709,17 @@ Move_PIN_MISSILE: @ 81C7F5C delay 4 playsewithpan SE_W030, 63 createsprite gBasicHitSplatSpriteTemplate, 3, -8, -8, 1, 2 - createvisualtask sub_80A7FA0, 2, 1, 3, 0, 2, 1 + createvisualtask AnimTask_ShakeMon2, 2, ANIM_BANK_TARGET, 3, 0, 2, 1 delay 9 createsprite gBattleAnimSpriteTemplate_83DABA4, 2, 20, -8, 0, 0, 20, -32 delay 4 playsewithpan SE_W030, 63 createsprite gBasicHitSplatSpriteTemplate, 3, 8, 8, 1, 2 - createvisualtask sub_80A7FA0, 2, 1, 3, 0, 2, 1 + createvisualtask AnimTask_ShakeMon2, 2, ANIM_BANK_TARGET, 3, 0, 2, 1 delay 14 playsewithpan SE_W030, 63 createsprite gBasicHitSplatSpriteTemplate, 3, 0, 0, 1, 2 - createvisualtask sub_80A7FA0, 2, 1, 3, 0, 2, 1 + createvisualtask AnimTask_ShakeMon2, 2, ANIM_BANK_TARGET, 3, 0, 2, 1 waitforvisualfinish clearmonbg ANIM_BANK_TARGET blendoff @@ -738,17 +738,17 @@ Move_ICICLE_SPEAR: @ 81C8021 delay 4 playsewithpan SE_W030, 63 createsprite gBasicHitSplatSpriteTemplate, 3, -8, -8, 1, 2 - createvisualtask sub_80A7FA0, 2, 1, 3, 0, 2, 1 + createvisualtask AnimTask_ShakeMon2, 2, ANIM_BANK_TARGET, 3, 0, 2, 1 delay 9 createsprite gBattleAnimSpriteTemplate_83DABBC, 2, 20, -8, 0, 0, 20, -32 delay 4 playsewithpan SE_W030, 63 createsprite gBasicHitSplatSpriteTemplate, 3, 8, 8, 1, 2 - createvisualtask sub_80A7FA0, 2, 1, 3, 0, 2, 1 + createvisualtask AnimTask_ShakeMon2, 2, ANIM_BANK_TARGET, 3, 0, 2, 1 delay 14 playsewithpan SE_W030, 63 createsprite gBasicHitSplatSpriteTemplate, 3, 0, 0, 1, 2 - createvisualtask sub_80A7FA0, 2, 1, 3, 0, 2, 1 + createvisualtask AnimTask_ShakeMon2, 2, ANIM_BANK_TARGET, 3, 0, 2, 1 waitforvisualfinish clearmonbg ANIM_BANK_TARGET blendoff @@ -765,14 +765,14 @@ Move_TAKE_DOWN: @ 81C80E6 createsprite gBasicHitSplatSpriteTemplate, 4, -10, 0, 1, 0 playsewithpan SE_W025B, 63 delay 1 - createsprite gBattleAnimSpriteTemplate_83C1FF8, 2, 1, -16, 0, 0, 4 + createsprite gSlideMonToOffsetSpriteTemplate, 2, 1, -16, 0, 0, 4 waitforvisualfinish - createvisualtask sub_80A8154, 2, 1, 4, 0, 12, 1 + createvisualtask AnimTask_ShakeMonInPlace, 2, ANIM_BANK_TARGET, 4, 0, 12, 1 waitforvisualfinish delay 2 - createsprite gBattleAnimSpriteTemplate_83C1FE0, 2, 0, 0, 5 + createsprite gSlideMonToOriginalPosSpriteTemplate, 2, 0, 0, 5 delay 3 - createsprite gBattleAnimSpriteTemplate_83C1FE0, 2, 1, 0, 7 + createsprite gSlideMonToOriginalPosSpriteTemplate, 2, 1, 0, 7 waitforvisualfinish clearmonbg ANIM_BANK_DEF_PARTNER blendoff @@ -786,28 +786,28 @@ Move_DOUBLE_EDGE: @ 81C817A delay 10 playsewithpan SE_W207, 192 waitplaysewithpan SE_W207, 192, 8 - createvisualtask sub_80A8500, 2, 0, 18, 6, 2, 4 + createvisualtask AnimTask_TranslateMonEllipticalRespectSide, 2, ANIM_BANK_ATTACKER, 18, 6, 2, 4 waitforvisualfinish createsprite gBattleAnimSpriteTemplate_83DB3C4, 2, 1, 0, 16, 16, 32767 - createsprite gBattleAnimSpriteTemplate_83C1FF8, 2, 0, 20, 0, 0, 4 + createsprite gSlideMonToOffsetSpriteTemplate, 2, 0, 20, 0, 0, 4 delay 3 waitforvisualfinish playsewithpan SE_W025B, 63 createsprite gBasicHitSplatSpriteTemplate, 132, -10, 0, 1, 0 - createsprite gBattleAnimSpriteTemplate_83C1FF8, 2, 1, -32, 0, 0, 3 + createsprite gSlideMonToOffsetSpriteTemplate, 2, 1, -32, 0, 0, 3 waitforvisualfinish createvisualtask sub_80A8E04, 2, 8, -256, 0, 0 createvisualtask sub_80A8E04, 2, 8, -256, 1, 0 - createvisualtask sub_80A8154, 2, 0, 4, 0, 12, 1 - createvisualtask sub_80A8154, 2, 1, 4, 0, 12, 1 + createvisualtask AnimTask_ShakeMonInPlace, 2, ANIM_BANK_ATTACKER, 4, 0, 12, 1 + createvisualtask AnimTask_ShakeMonInPlace, 2, ANIM_BANK_TARGET, 4, 0, 12, 1 createsprite gBattleAnimSpriteTemplate_83DB3C4, 2, 1, 2, 16, 0, 32767 waitforvisualfinish createvisualtask sub_80A8E04, 2, 8, -256, 0, 1 createvisualtask sub_80A8E04, 2, 8, -256, 1, 1 waitforvisualfinish - createsprite gBattleAnimSpriteTemplate_83C1FE0, 2, 0, 0, 5 + createsprite gSlideMonToOriginalPosSpriteTemplate, 2, 0, 0, 5 delay 3 - createsprite gBattleAnimSpriteTemplate_83C1FE0, 2, 1, 0, 7 + createsprite gSlideMonToOriginalPosSpriteTemplate, 2, 1, 0, 7 waitforvisualfinish end @@ -822,7 +822,7 @@ Move_POISON_STING: @ 81C828D createsprite gBattleAnimSpriteTemplate_83DAB8C, 130, 20, 0, -8, 0, 20 waitforvisualfinish createsprite gBasicHitSplatSpriteTemplate, 3, 0, 0, 1, 2 - createvisualtask sub_80A7FA0, 2, 1, 2, 0, 5, 1 + createvisualtask AnimTask_ShakeMon2, 2, ANIM_BANK_TARGET, 2, 0, 5, 1 playsewithpan SE_W030, 63 waitforvisualfinish call Unknown_81D5F87 @@ -841,7 +841,7 @@ Move_TWINEEDLE: @ 81C82E2 createsprite gBattleAnimSpriteTemplate_83DAB8C, 130, 10, -4, 0, -4, 20 createsprite gBattleAnimSpriteTemplate_83DAB8C, 130, 20, 12, 10, 12, 20 delay 20 - createvisualtask sub_80A7FA0, 2, 1, 2, 0, 5, 1 + createvisualtask AnimTask_ShakeMon2, 2, ANIM_BANK_TARGET, 2, 0, 5, 1 createsprite gBattleAnimSpriteTemplate_83DB4C0, 3, 0, -4, 1, 3 loopsewithpan SE_W030, 63, 5, 2 delay 1 @@ -946,7 +946,7 @@ Move_MEGA_PUNCH: @ 81C854D delay 50 call _81C85E9 createsprite gBasicHitSplatSpriteTemplate, 2, 0, 0, 1, 0 - createvisualtask sub_80A7FA0, 2, 1, 4, 0, 22, 1 + createvisualtask AnimTask_ShakeMon2, 2, ANIM_BANK_TARGET, 4, 0, 22, 1 createvisualtask sub_80E2A38, 10, 4, 2, 0, 0, 32767 createsprite gBattleAnimSpriteTemplate_83DB3DC, 2, 31, 3, 1, 0, 8, 0, 0 playsewithpan SE_W233B, 63 @@ -990,7 +990,7 @@ Move_MEGA_KICK: @ 81C8627 playsewithpan SE_W025B, 63 call _81C85E9 createsprite gBasicHitSplatSpriteTemplate, 2, 0, 0, 1, 0 - createvisualtask sub_80A7FA0, 2, 1, 4, 0, 22, 1 + createvisualtask AnimTask_ShakeMon2, 2, ANIM_BANK_TARGET, 4, 0, 22, 1 createvisualtask sub_80E2A38, 10, 4, 2, 0, 0, 32767 createsprite gBattleAnimSpriteTemplate_83DB3DC, 2, 31, 3, 1, 0, 8, 0, 0 waitforvisualfinish @@ -1191,7 +1191,7 @@ Move_STOMP: @ 81C8B2A Move_TAIL_WHIP: @ 81C8B71 loopsewithpan SE_W039, 192, 24, 3 - createvisualtask sub_80A8500, 2, 0, 12, 4, 2, 3 + createvisualtask AnimTask_TranslateMonEllipticalRespectSide, 2, ANIM_BANK_ATTACKER, 12, 4, 2, 3 waitforvisualfinish end @@ -1258,7 +1258,7 @@ Move_REVERSAL: @ 81C8CA5 createsprite gBattleAnimSpriteTemplate_8402738, 2, 26, 210 waitforvisualfinish delay 20 - createsprite gBattleAnimSpriteTemplate_83C1FB0, 2, 6, 4 + createsprite gHorizontalLungeSpriteTemplate, 2, 6, 4 delay 8 playsewithpan SE_W233B, 63 createsprite gBattleAnimSpriteTemplate_83DB3DC, 2, 31, 3, 1, 32767, 8, 0, 0 @@ -1303,7 +1303,7 @@ Move_SPIKE_CANNON: @ 81C8DF1 createvisualtask sub_80A8920, 5, 0, -4, 0, 4, 6, 8, 4 waitforvisualfinish loopsewithpan SE_W013B, 192, 5, 3 - createsprite gBattleAnimSpriteTemplate_83C1FE0, 2, 0, 0, 5 + createsprite gSlideMonToOriginalPosSpriteTemplate, 2, 0, 0, 5 createsprite gBattleAnimSpriteTemplate_83DAB8C, 2, 10, -8, -8, -8, 20 createsprite gBattleAnimSpriteTemplate_83DAB8C, 2, 18, 0, 0, 0, 20 createsprite gBattleAnimSpriteTemplate_83DAB8C, 2, 26, 8, 8, 8, 20 @@ -1311,7 +1311,7 @@ Move_SPIKE_CANNON: @ 81C8DF1 createsprite gBattleAnimSpriteTemplate_83DB4C0, 3, -8, -8, 1, 2 createsprite gBattleAnimSpriteTemplate_83DB4C0, 3, 0, 0, 1, 2 createsprite gBattleAnimSpriteTemplate_83DB4C0, 3, 8, 8, 1, 2 - createvisualtask sub_80A7FA0, 2, 1, 3, 0, 7, 1 + createvisualtask AnimTask_ShakeMon2, 2, ANIM_BANK_TARGET, 3, 0, 7, 1 loopsewithpan SE_W030, 63, 5, 3 waitforvisualfinish clearmonbg ANIM_BANK_TARGET @@ -1323,7 +1323,7 @@ Move_SWORDS_DANCE: @ 81C8EA4 monbg ANIM_BANK_ATTACKER setalpha 12, 8 playsewithpan SE_W014, 192 - createvisualtask sub_80A8500, 2, 0, 16, 6, 1, 4 + createvisualtask AnimTask_TranslateMonEllipticalRespectSide, 2, ANIM_BANK_ATTACKER, 16, 6, 1, 4 createsprite gBattleAnimSpriteTemplate_83D748C, 2, 0, 0 delay 22 createvisualtask sub_80E21A8, 2, 10005, 2, 2, 32754, 16, 0, 0 @@ -1340,7 +1340,7 @@ Move_PSYCH_UP: @ 81C8EEA setalpha 12, 8 loopsewithpan SE_W060B, 192, 5, 10 createsprite gBattleAnimSpriteTemplate_83DA690, 2, 0, 0, 0, 0 - createvisualtask sub_80A8B88, 5, 0, 5, 2560, 8, 0 + createvisualtask AnimTask_SwayMon, 5, 0, 5, 2560, 8, 0 delay 127 delay 4 playsewithpan SE_W060, 192 @@ -1384,9 +1384,9 @@ Move_DIZZY_PUNCH: @ 81C8F5C blendoff end _81C9077: - createsprite gBattleAnimSpriteTemplate_83C1FB0, 2, 6, 4 + createsprite gHorizontalLungeSpriteTemplate, 2, 6, 4 delay 6 - createvisualtask sub_80A7FA0, 2, 1, 3, 0, 7, 1 + createvisualtask AnimTask_ShakeMon2, 2, ANIM_BANK_TARGET, 3, 0, 7, 1 return Move_FIRE_SPIN: @ 81C9096 @@ -1454,11 +1454,11 @@ _81C91FF: Move_SELF_DESTRUCT: @ 81C9219 loadspritegfx 10198 createvisualtask sub_80E2A38, 10, 2, 1, 0, 9, 31 - createvisualtask sub_80A7FA0, 5, 4, 6, 0, 38, 1 - createvisualtask sub_80A7FA0, 5, 5, 6, 0, 38, 1 - createvisualtask sub_80A7FA0, 5, 6, 6, 0, 38, 1 - createvisualtask sub_80A7FA0, 5, 7, 6, 0, 38, 1 - createvisualtask sub_80A7FA0, 5, 8, 6, 0, 38, 1 + createvisualtask AnimTask_ShakeMon2, 5, 4, 6, 0, 38, 1 + createvisualtask AnimTask_ShakeMon2, 5, 5, 6, 0, 38, 1 + createvisualtask AnimTask_ShakeMon2, 5, 6, 6, 0, 38, 1 + createvisualtask AnimTask_ShakeMon2, 5, 7, 6, 0, 38, 1 + createvisualtask AnimTask_ShakeMon2, 5, 8, 6, 0, 38, 1 call _81C929F call _81C929F waitforvisualfinish @@ -1488,19 +1488,19 @@ Move_SLAM: @ 81C9309 monbg ANIM_BANK_TARGET setalpha 12, 8 playsewithpan SE_W004, 192 - createsprite gBattleAnimSpriteTemplate_83C1FF8, 2, 0, 20, 3, 0, 4 + createsprite gSlideMonToOffsetSpriteTemplate, 2, 0, 20, 3, 0, 4 delay 1 createsprite gBattleAnimSpriteTemplate_83D69DC, 2, 0, 0 delay 3 playsewithpan SE_W025B, 63 createsprite gBasicHitSplatSpriteTemplate, 3, 0, 0, 1, 1 - createsprite gBattleAnimSpriteTemplate_83C1FF8, 2, 1, -12, 10, 0, 3 - createsprite gBattleAnimSpriteTemplate_83C1FE0, 2, 0, 0, 5 + createsprite gSlideMonToOffsetSpriteTemplate, 2, 1, -12, 10, 0, 3 + createsprite gSlideMonToOriginalPosSpriteTemplate, 2, 0, 0, 5 delay 3 - createvisualtask sub_80A8154, 2, 1, 0, 3, 6, 1 + createvisualtask AnimTask_ShakeMonInPlace, 2, ANIM_BANK_TARGET, 0, 3, 6, 1 waitforvisualfinish delay 5 - createsprite gBattleAnimSpriteTemplate_83C1FE0, 2, 1, 0, 6 + createsprite gSlideMonToOriginalPosSpriteTemplate, 2, 1, 0, 6 waitforvisualfinish clearmonbg ANIM_BANK_TARGET blendoff @@ -1509,12 +1509,12 @@ Move_SLAM: @ 81C9309 Move_VINE_WHIP: @ 81C9391 loadspritegfx 10287 playsewithpan SE_W026, 192 - createsprite gBattleAnimSpriteTemplate_83C1FB0, 2, 4, 6 + createsprite gHorizontalLungeSpriteTemplate, 2, 4, 6 delay 6 playsewithpan SE_W010, 63 createsprite gBattleAnimSpriteTemplate_83D69F4, 130, 0, 0 delay 6 - createvisualtask sub_80A7FA0, 2, 1, 2, 0, 6, 1 + createvisualtask AnimTask_ShakeMon2, 2, ANIM_BANK_TARGET, 2, 0, 6, 1 end Move_DRILL_PECK: @ 81C93C8 @@ -1528,11 +1528,11 @@ Move_DRILL_PECK: @ 81C93C8 delay 2 loopsewithpan SE_W030, 63, 4, 8 createvisualtask sub_80DB0E8, 5 - createvisualtask sub_80A7FA0, 2, 1, 4, 0, 18, 1 + createvisualtask AnimTask_ShakeMon2, 2, ANIM_BANK_TARGET, 4, 0, 18, 1 waitforvisualfinish createsprite gBattleAnimSpriteTemplate_83D6DE4, 2, 2 waitforvisualfinish - createsprite gBattleAnimSpriteTemplate_83C1FE0, 2, 0, 0, 6 + createsprite gSlideMonToOriginalPosSpriteTemplate, 2, 0, 0, 6 waitforvisualfinish end @@ -1569,7 +1569,7 @@ Move_WATERFALL: @ 81C9421 createsprite gBattleAnimSpriteTemplate_83D9348, 2, 12, 0, 25, 0 waitforvisualfinish delay 10 - createsprite gBattleAnimSpriteTemplate_83C1FB0, 2, 6, 5 + createsprite gHorizontalLungeSpriteTemplate, 2, 6, 5 delay 6 call _81C9502 waitforvisualfinish @@ -1578,7 +1578,7 @@ Move_WATERFALL: @ 81C9421 end _81C9502: playsewithpan SE_W127, 63 - createvisualtask sub_80A7FA0, 5, 1, 4, 0, 17, 1 + createvisualtask AnimTask_ShakeMon2, 5, 1, 4, 0, 17, 1 createsprite gBattleAnimSpriteTemplate_83DB4D8, 3, 0, 20, 1, 1 createsprite gBattleAnimSpriteTemplate_83D9360, 4, 0, 20 createsprite gBattleAnimSpriteTemplate_83D9360, 4, 0, 20 @@ -1619,11 +1619,11 @@ _81C9502: Move_EXPLOSION: @ 81C9675 loadspritegfx 10198 createsprite gBattleAnimSpriteTemplate_83DB3DC, 2, 1, 8, 9, 8474, 8, 0, 8 - createvisualtask sub_80A7FA0, 5, 4, 8, 0, 40, 1 - createvisualtask sub_80A7FA0, 5, 5, 8, 0, 40, 1 - createvisualtask sub_80A7FA0, 5, 6, 8, 0, 40, 1 - createvisualtask sub_80A7FA0, 5, 7, 8, 0, 40, 1 - createvisualtask sub_80A7FA0, 5, 8, 8, 0, 40, 1 + createvisualtask AnimTask_ShakeMon2, 5, 4, 8, 0, 40, 1 + createvisualtask AnimTask_ShakeMon2, 5, 5, 8, 0, 40, 1 + createvisualtask AnimTask_ShakeMon2, 5, 6, 8, 0, 40, 1 + createvisualtask AnimTask_ShakeMon2, 5, 7, 8, 0, 40, 1 + createvisualtask AnimTask_ShakeMon2, 5, 8, 8, 0, 40, 1 call _81C9712 call _81C9712 waitforvisualfinish @@ -1703,7 +1703,7 @@ _81C985F: end _81C9864: playsewithpan SE_W082, 192 - createvisualtask sub_80A7FA0, 5, 0, 1, 0, 15, 1 + createvisualtask AnimTask_ShakeMon2, 5, 0, 1, 0, 15, 1 createvisualtask sub_80E2A38, 10, 2, 3, 0, 9, 31 waitforvisualfinish delay 20 @@ -1714,9 +1714,9 @@ _81C9864: createsprite gBattleAnimSpriteTemplate_83D7798, 2, 0, 20, -28 waitforvisualfinish delay 10 - createvisualtask sub_80A8B88, 5, 0, 16, 6144, 8, 0 + createvisualtask AnimTask_SwayMon, 5, 0, 16, 6144, 8, 0 delay 5 - createvisualtask sub_80A7FA0, 5, 1, 4, 0, 30, 1 + createvisualtask AnimTask_ShakeMon2, 5, 1, 4, 0, 30, 1 createsprite gBasicHitSplatSpriteTemplate, 3, 0, 0, 1, 0 playsewithpan SE_W004, 63 delay 5 @@ -1739,7 +1739,7 @@ _81C9864: goto _81C985F _81C996A: playsewithpan SE_W082, 192 - createvisualtask sub_80A7FA0, 5, 0, 1, 0, 15, 1 + createvisualtask AnimTask_ShakeMon2, 5, 0, 1, 0, 15, 1 createvisualtask sub_80E2A38, 10, 2, 3, 0, 9, 31 waitforvisualfinish delay 20 @@ -1751,15 +1751,15 @@ _81C996A: delay 7 playsewithpan SE_W004, 63 createsprite gBasicHitSplatSpriteTemplate, 3, 0, 8, 1, 1 - createvisualtask sub_80A7FA0, 5, 1, 4, 0, 6, 1 + createvisualtask AnimTask_ShakeMon2, 5, 1, 4, 0, 6, 1 delay 14 playsewithpan SE_W004, 63 createsprite gBasicHitSplatSpriteTemplate, 3, 12, -6, 1, 1 - createvisualtask sub_80A7FA0, 5, 1, 4, 0, 6, 1 + createvisualtask AnimTask_ShakeMon2, 5, 1, 4, 0, 6, 1 delay 14 playsewithpan SE_W004, 63 createsprite gBasicHitSplatSpriteTemplate, 3, -12, -6, 1, 1 - createvisualtask sub_80A7FA0, 5, 1, 4, 0, 6, 1 + createvisualtask AnimTask_ShakeMon2, 5, 1, 4, 0, 6, 1 waitforvisualfinish createvisualtask sub_80E2A38, 10, 2, 3, 9, 0, 31 goto _81C985F @@ -1768,27 +1768,27 @@ _81C9A37: createsprite gBattleAnimSpriteTemplate_83D7798, 2, 0, 20, -28 waitforvisualfinish delay 5 - createsprite gBattleAnimSpriteTemplate_83C1FB0, 2, 4, 4 + createsprite gHorizontalLungeSpriteTemplate, 2, 4, 4 delay 6 playsewithpan SE_W004, 63 createsprite gBasicHitSplatSpriteTemplate, 2, 10, 4, 1, 1 - createvisualtask sub_80A7FA0, 2, 1, 3, 0, 6, 1 + createvisualtask AnimTask_ShakeMon2, 2, ANIM_BANK_TARGET, 3, 0, 6, 1 waitforvisualfinish - createsprite gBattleAnimSpriteTemplate_83C1FB0, 2, 4, 4 + createsprite gHorizontalLungeSpriteTemplate, 2, 4, 4 delay 6 playsewithpan SE_W004, 63 createsprite gBasicHitSplatSpriteTemplate, 2, -10, -4, 1, 2 - createvisualtask sub_80A7FA0, 2, 1, 3, 0, 6, 1 + createvisualtask AnimTask_ShakeMon2, 2, ANIM_BANK_TARGET, 3, 0, 6, 1 goto _81C985F _81C9AB3: createsprite gBattleAnimSpriteTemplate_8402630, 2, 20, -28 waitforvisualfinish delay 10 - createsprite gBattleAnimSpriteTemplate_83C1FB0, 2, 10, 2 + createsprite gHorizontalLungeSpriteTemplate, 2, 10, 2 delay 12 playsewithpan SE_W004, 63 createsprite gBasicHitSplatSpriteTemplate, 2, 0, 0, 1, 2 - createvisualtask sub_80A7FA0, 2, 1, 1, 0, 6, 1 + createvisualtask AnimTask_ShakeMon2, 2, ANIM_BANK_TARGET, 1, 0, 6, 1 goto _81C985F Move_SAFEGUARD: @ 81C9AF7 @@ -1843,7 +1843,7 @@ Move_VICE_GRIP: @ 81C9BE1 createsprite gBattleAnimSpriteTemplate_83D769C, 2, 1 delay 9 createsprite gBasicHitSplatSpriteTemplate, 1, 0, 0, 1, 2 - createvisualtask sub_80A7FA0, 5, 1, 2, 0, 5, 1 + createvisualtask AnimTask_ShakeMon2, 5, 1, 2, 0, 5, 1 waitforvisualfinish clearmonbg ANIM_BANK_DEF_PARTNER blendoff @@ -1861,9 +1861,9 @@ Move_GUILLOTINE: @ 81C9C29 createsprite gBattleAnimSpriteTemplate_83D76DC, 2, 1 createvisualtask sub_80E2A38, 10, 4, 2, 0, 16, 0 delay 9 - createvisualtask sub_80A7FA0, 5, 1, 2, 0, 23, 1 + createvisualtask AnimTask_ShakeMon2, 5, 1, 2, 0, 23, 1 delay 46 - createvisualtask sub_80A7FA0, 5, 1, 4, 0, 8, 1 + createvisualtask AnimTask_ShakeMon2, 5, 1, 4, 0, 8, 1 createsprite gBasicHitSplatSpriteTemplate, 3, 0, 0, 1, 0 createsprite gBattleAnimSpriteTemplate_83DB3DC, 2, 31, 3, 1, 0, 8, 0, 0 playsewithpan SE_W013, 63 @@ -1886,7 +1886,7 @@ Move_PAY_DAY: @ 81C9CB5 playsewithpan SE_W006, 63 createsprite gBasicHitSplatSpriteTemplate, 1, 0, 0, 1, 2 createsprite gBattleAnimSpriteTemplate_83D75FC, 2 - createvisualtask sub_80A7FA0, 2, 1, 1, 0, 6, 1 + createvisualtask AnimTask_ShakeMon2, 2, ANIM_BANK_TARGET, 1, 0, 6, 1 waitforvisualfinish clearmonbg ANIM_BANK_TARGET blendoff @@ -1896,7 +1896,7 @@ Move_OUTRAGE: @ 81C9D08 loadspritegfx 10029 loopsewithpan SE_W082, 192, 8, 3 createvisualtask sub_80E1F8C, 2, 7, 2, 5, 3, 8, 430 - createvisualtask sub_80A8500, 2, 0, 12, 6, 5, 4 + createvisualtask AnimTask_TranslateMonEllipticalRespectSide, 2, ANIM_BANK_ATTACKER, 12, 6, 5, 4 delay 0 createsprite gBattleAnimSpriteTemplate_83DAFCC, 130, 0, 0, 30, 1280, 0, 3 delay 0 @@ -1906,7 +1906,7 @@ Move_OUTRAGE: @ 81C9D08 delay 0 createsprite gBattleAnimSpriteTemplate_83DAFCC, 130, 0, 0, 30, 0, -1280, 3 delay 0 - createvisualtask sub_80A7FA0, 2, 1, 2, 0, 40, 1 + createvisualtask AnimTask_ShakeMon2, 2, ANIM_BANK_TARGET, 2, 0, 40, 1 createsprite gBattleAnimSpriteTemplate_83DAFCC, 130, 0, 0, 30, 1280, 768, 3 delay 0 createsprite gBattleAnimSpriteTemplate_83DAFCC, 130, 0, 0, 30, -1280, 768, 3 @@ -1972,7 +1972,7 @@ Move_SPARK: @ 81C9EA3 delay 4 waitforvisualfinish createvisualtask sub_80E1F8C, 2, 3, -31, 1, 0, 0, 23551 - createsprite gBattleAnimSpriteTemplate_83C1FB0, 2, 4, 4 + createsprite gHorizontalLungeSpriteTemplate, 2, 4, 4 delay 4 playsewithpan SE_W063, 63 createsprite gBasicHitSplatSpriteTemplate, 130, 0, 0, 1, 2 @@ -1986,7 +1986,7 @@ Move_SPARK: @ 81C9EA3 Move_ATTRACT: @ 81CA0BA loadspritegfx 10216 loopsewithpan SE_W204, 192, 12, 3 - createvisualtask sub_80A8B88, 5, 0, 12, 4096, 4, 0 + createvisualtask AnimTask_SwayMon, 5, 0, 12, 4096, 4, 0 delay 15 createsprite gBattleAnimSpriteTemplate_83D7AB0, 131, 20, -8 waitforvisualfinish @@ -2034,9 +2034,9 @@ Move_WHIRLWIND: @ 81CA1E9 createsprite gBattleAnimSpriteTemplate_83DA51C, 2, 0, 32, 1, 60, 0 delay 5 loopsewithpan SE_W104, 63, 10, 4 - createvisualtask sub_80A7FA0, 2, 1, 4, 0, 15, 1 + createvisualtask AnimTask_ShakeMon2, 2, ANIM_BANK_TARGET, 4, 0, 15, 1 delay 29 - createvisualtask sub_80A8500, 2, 1, 12, 6, 1, 5 + createvisualtask AnimTask_TranslateMonEllipticalRespectSide, 2, ANIM_BANK_TARGET, 12, 6, 1, 5 delay 7 playsewithpan SE_W081, 63 createvisualtask sub_80A8A80, 5, 1, 8 @@ -2168,11 +2168,11 @@ Move_THIEF: @ 81CA52C fadetobg 1 waitbgfadein setalpha 12, 8 - createsprite gBattleAnimSpriteTemplate_83C1FB0, 2, 6, 4 + createsprite gHorizontalLungeSpriteTemplate, 2, 6, 4 delay 6 playsewithpan SE_W233, 63 createsprite gBasicHitSplatSpriteTemplate, 2, 0, 0, 1, 2 - createvisualtask sub_80A7FA0, 2, 1, 1, 0, 8, 1 + createvisualtask AnimTask_ShakeMon2, 2, ANIM_BANK_TARGET, 1, 0, 8, 1 waitforvisualfinish delay 20 clearmonbg ANIM_BANK_TARGET @@ -2189,7 +2189,7 @@ Move_BUBBLE_BEAM: @ 81CA573 setalpha 12, 8 delay 1 call _81CA5AD - createvisualtask sub_80A8B88, 5, 0, 3, 3072, 8, 1 + createvisualtask AnimTask_SwayMon, 5, 0, 3, 3072, 8, 1 call _81CA5AD call _81CA5AD waitforvisualfinish @@ -2334,7 +2334,7 @@ Move_CONVERSION: @ 81CA809 Move_CONVERSION_2: @ 81CA91E loadspritegfx 10018 monbg ANIM_BANK_DEF_PARTNER - monbgprio_2A 1 + monbgprio_2A ANIM_BANK_TARGET setalpha 0, 16 delay 0 playsewithpan SE_W112, 63 @@ -2381,19 +2381,19 @@ Move_ROLLING_KICK: @ 81CAA3A loadspritegfx 10135 monbg ANIM_BANK_TARGET setalpha 12, 8 - createvisualtask sub_80A8500, 2, 0, 18, 6, 1, 4 + createvisualtask AnimTask_TranslateMonEllipticalRespectSide, 2, ANIM_BANK_ATTACKER, 18, 6, 1, 4 playsewithpan SE_W104, 192 delay 6 playsewithpan SE_W104, 192 waitforvisualfinish - createsprite gBattleAnimSpriteTemplate_83C1FF8, 2, 0, 20, 0, 0, 4 + createsprite gSlideMonToOffsetSpriteTemplate, 2, 0, 20, 0, 0, 4 createsprite gBattleAnimSpriteTemplate_83D9FF0, 2, -24, 0, 48, 10, 160, 0 delay 5 playsewithpan SE_W233B, 63 createsprite gBasicHitSplatSpriteTemplate, 2, -8, 0, 1, 2 createvisualtask AnimTask_ShakeMon, 2, ANIM_BANK_TARGET, 5, 0, 6, 1 waitforvisualfinish - createsprite gBattleAnimSpriteTemplate_83C1FE0, 2, 0, 1, 8 + createsprite gSlideMonToOriginalPosSpriteTemplate, 2, 0, 1, 8 clearmonbg ANIM_BANK_TARGET blendoff end @@ -2406,7 +2406,7 @@ Move_HEADBUTT: @ 81CAABD delay 2 createsprite gBattleAnimSpriteTemplate_83D6DE4, 2, 1 waitforvisualfinish - createvisualtask sub_80A8154, 2, 0, 2, 0, 4, 1 + createvisualtask AnimTask_ShakeMonInPlace, 2, ANIM_BANK_ATTACKER, 2, 0, 4, 1 createvisualtask AnimTask_ShakeMon, 2, ANIM_BANK_TARGET, 5, 0, 6, 1 createsprite gBattleAnimSpriteTemplate_83D6DE4, 2, 2 createsprite gBattleAnimSpriteTemplate_83DB538, 131, 0, 0, 1, 1 @@ -2424,7 +2424,7 @@ Move_HORN_ATTACK: @ 81CAB1A createsprite gBattleAnimSpriteTemplate_83D6DE4, 2, 1 createsprite gBattleAnimSpriteTemplate_83D7050, 132, 0, 0, 10 waitforvisualfinish - createvisualtask sub_80A8154, 2, 0, 2, 0, 4, 1 + createvisualtask AnimTask_ShakeMonInPlace, 2, ANIM_BANK_ATTACKER, 2, 0, 4, 1 createvisualtask AnimTask_ShakeMon, 2, ANIM_BANK_TARGET, 5, 0, 6, 1 createsprite gBattleAnimSpriteTemplate_83D6DE4, 2, 2 createsprite gBattleAnimSpriteTemplate_83DB538, 131, 0, 0, 1, 1 @@ -2472,8 +2472,8 @@ _81CAC21: createsprite gBattleAnimSpriteTemplate_83D7050, 132, 0, 0, 12 waitforvisualfinish playse SE_BAN - createvisualtask sub_80A8154, 2, 0, 2, 0, 40, 1 - createvisualtask sub_80A8154, 2, 1, 10, 0, 40, 1 + createvisualtask AnimTask_ShakeMonInPlace, 2, ANIM_BANK_ATTACKER, 2, 0, 40, 1 + createvisualtask AnimTask_ShakeMonInPlace, 2, ANIM_BANK_TARGET, 10, 0, 40, 1 createsprite gBattleAnimSpriteTemplate_83DB538, 131, 0, 0, 1, 3 playsewithpan SE_W030, 63 delay 4 @@ -2526,15 +2526,15 @@ Move_THRASH: @ 81CAD81 createvisualtask sub_80D0A4C, 2 createvisualtask sub_80D0AB8, 2 createsprite gBattleAnimSpriteTemplate_83D9FC0, 131, 1, 10, 0 - createvisualtask sub_80A8154, 2, 1, 4, 0, 7, 1 + createvisualtask AnimTask_ShakeMonInPlace, 2, ANIM_BANK_TARGET, 4, 0, 7, 1 playsewithpan SE_W004, 63 delay 28 createsprite gBattleAnimSpriteTemplate_83D9FC0, 131, 1, 10, 1 - createvisualtask sub_80A8154, 2, 1, 4, 0, 7, 1 + createvisualtask AnimTask_ShakeMonInPlace, 2, ANIM_BANK_TARGET, 4, 0, 7, 1 playsewithpan SE_W233B, 63 delay 28 createsprite gBattleAnimSpriteTemplate_83D9FC0, 131, 1, 10, 3 - createvisualtask sub_80A8154, 2, 1, 8, 0, 16, 1 + createvisualtask AnimTask_ShakeMonInPlace, 2, ANIM_BANK_TARGET, 8, 0, 16, 1 playsewithpan SE_W025B, 63 end @@ -2577,14 +2577,14 @@ Move_SING: @ 81CAE00 Move_LOW_KICK: @ 81CAED4 loadspritegfx 10143 loadspritegfx 10135 - createsprite gBattleAnimSpriteTemplate_83C1FF8, 2, 0, 20, 0, 0, 4 + createsprite gSlideMonToOffsetSpriteTemplate, 2, 0, 20, 0, 0, 4 createsprite gBattleAnimSpriteTemplate_83D9FF0, 130, -24, 28, 40, 8, 160, 0 delay 4 createsprite gBasicHitSplatSpriteTemplate, 130, -8, 8, 1, 2 createvisualtask sub_80A8E04, 2, 6, 384, 1, 2 playsewithpan SE_W233B, 63 waitforvisualfinish - createsprite gBattleAnimSpriteTemplate_83C1FE0, 2, 0, 1, 4 + createsprite gSlideMonToOriginalPosSpriteTemplate, 2, 0, 1, 4 end Move_EARTHQUAKE: @ 81CAF31 @@ -2699,7 +2699,7 @@ Move_MEDITATE: @ 81CB1BD Move_AGILITY: @ 81CB1DA monbg ANIM_BANK_ATK_PARTNER setalpha 12, 8 - createvisualtask sub_80A8500, 2, 0, 24, 6, 4, 4 + createvisualtask AnimTask_TranslateMonEllipticalRespectSide, 2, ANIM_BANK_ATTACKER, 24, 6, 4, 4 createvisualtask sub_80E2DD8, 2, 0, 4, 7, 10 playsewithpan SE_W104, 192 delay 12 @@ -2721,7 +2721,7 @@ Move_QUICK_ATTACK: @ 81CB224 loadspritegfx 10135 monbg ANIM_BANK_ATK_PARTNER setalpha 12, 8 - createvisualtask sub_80A8500, 2, 0, 24, 6, 1, 5 + createvisualtask AnimTask_TranslateMonEllipticalRespectSide, 2, ANIM_BANK_ATTACKER, 24, 6, 1, 5 createvisualtask sub_80E2DD8, 2, 0, 4, 7, 3 playsewithpan SE_W026, 192 delay 4 @@ -2746,7 +2746,7 @@ Move_RAGE: @ 81CB27C createsprite gBattleAnimSpriteTemplate_83D7798, 2, 0, 20, -28 playsewithpan SE_W207B, 192 waitforvisualfinish - createsprite gBattleAnimSpriteTemplate_83C1FB0, 2, 4, 6 + createsprite gHorizontalLungeSpriteTemplate, 2, 4, 6 delay 4 createsprite gBasicHitSplatSpriteTemplate, 2, 0, 0, 1, 2 createvisualtask sub_80A9058, 2, 1, 1, 10, 1, 0 @@ -2836,8 +2836,8 @@ _81CB3E6: waitforvisualfinish playse SE_BAN createsprite gBattleAnimSpriteTemplate_83DB3DC, 2, 1, 3, 1, 0, 14, 32767, 14 - createvisualtask sub_80A8154, 2, 0, 2, 0, 40, 1 - createvisualtask sub_80A8154, 2, 1, 10, 0, 40, 1 + createvisualtask AnimTask_ShakeMonInPlace, 2, ANIM_BANK_ATTACKER, 2, 0, 40, 1 + createvisualtask AnimTask_ShakeMonInPlace, 2, ANIM_BANK_TARGET, 10, 0, 40, 1 createsprite gBattleAnimSpriteTemplate_83DB538, 132, 0, 0, 1, 0 loopsewithpan SE_W025B, 63, 8, 3 waitforvisualfinish @@ -2959,7 +2959,7 @@ _81CB68E: createvisualtask sub_812B340, 5, 238, -64 createsprite gBattleAnimSpriteTemplate_83DA65C, 130 delay 14 - createvisualtask sub_80A7FA0, 2, 1, 10, 0, 18, 1 + createvisualtask AnimTask_ShakeMon2, 2, ANIM_BANK_TARGET, 10, 0, 18, 1 createvisualtask sub_812B30C, 5, 141, 63 delay 20 createvisualtask sub_80DFD24, 5, 1 @@ -3002,14 +3002,14 @@ Move_SHARPEN: @ 81CB74E Move_SUPER_FANG: @ 81CB75A loadspritegfx 10192 - createvisualtask sub_80A8154, 2, 0, 1, 0, 20, 1 + createvisualtask AnimTask_ShakeMonInPlace, 2, ANIM_BANK_ATTACKER, 1, 0, 20, 1 playsewithpan SE_W082, 192 waitforvisualfinish - createvisualtask sub_80A8154, 2, 0, 3, 0, 48, 1 + createvisualtask AnimTask_ShakeMonInPlace, 2, ANIM_BANK_ATTACKER, 3, 0, 48, 1 createvisualtask sub_8079790, 2, 0, 1247, 12, 4, 1 waitforvisualfinish delay 20 - createsprite gBattleAnimSpriteTemplate_83C1FB0, 2, 4, 4 + createsprite gHorizontalLungeSpriteTemplate, 2, 4, 4 delay 4 createsprite gBattleAnimSpriteTemplate_83D7080, 130 playsewithpan SE_W044, 63 @@ -3026,7 +3026,7 @@ Move_SLASH: @ 81CB7DB playsewithpan SE_W013, 63 delay 4 createsprite gBattleAnimSpriteTemplate_83D6E38, 130, 1, 8, 0 - createvisualtask sub_80A7FA0, 2, 1, 4, 0, 18, 1 + createvisualtask AnimTask_ShakeMon2, 2, ANIM_BANK_TARGET, 4, 0, 18, 1 playsewithpan SE_W013, 63 waitforvisualfinish end @@ -3036,13 +3036,13 @@ Move_STRUGGLE: @ 81CB815 loadspritegfx 10215 monbg ANIM_BANK_TARGET setalpha 12, 8 - createvisualtask sub_80A8154, 2, 0, 3, 0, 12, 4 + createvisualtask AnimTask_ShakeMonInPlace, 2, ANIM_BANK_ATTACKER, 3, 0, 12, 4 createsprite gBattleAnimSpriteTemplate_83D7C90, 2, 0, 0, 2 createsprite gBattleAnimSpriteTemplate_83D7C90, 2, 0, 1, 2 loopsewithpan SE_W029, 192, 12, 4 waitforvisualfinish createsprite gBasicHitSplatSpriteTemplate, 3, 0, 0, 1, 2 - createvisualtask sub_80A8154, 2, 1, 3, 0, 6, 1 + createvisualtask AnimTask_ShakeMonInPlace, 2, ANIM_BANK_TARGET, 3, 0, 6, 1 playsewithpan SE_W025B, 63 waitforvisualfinish clearmonbg ANIM_BANK_TARGET @@ -3170,7 +3170,7 @@ Move_DESTINY_BOND: @ 81CBA2C createvisualtask sub_80DE918, 5, 0, 48 playsewithpan SE_W109, 192 delay 48 - createvisualtask sub_80A8154, 2, 0, 2, 0, 24, 1 + createvisualtask AnimTask_ShakeMonInPlace, 2, ANIM_BANK_ATTACKER, 2, 0, 24, 1 createvisualtask sub_80E2A7C, 2, 6, 1, 0, 12, 30653 delay 24 createvisualtask sub_80E2A7C, 2, 6, 1, 12, 0, 30653 @@ -3188,7 +3188,7 @@ Move_ENDURE: @ 81CBA87 call EndureFlamesAnim delay 8 createvisualtask sub_80E1F8C, 2, 2, 2, 2, 0, 11, 31 - createvisualtask sub_80A7FA0, 2, 0, 1, 0, 32, 1 + createvisualtask AnimTask_ShakeMon2, 2, ANIM_BANK_ATTACKER, 1, 0, 32, 1 call EndureFlamesAnim delay 8 call EndureFlamesAnim @@ -3534,7 +3534,7 @@ Move_SMELLING_SALT: @ 81CC156 loopsewithpan SE_W003, 63, 12, 2 waitforvisualfinish delay 4 - createvisualtask sub_80A7FA0, 2, 1, 2, 0, 6, 2 + createvisualtask AnimTask_ShakeMon2, 2, ANIM_BANK_TARGET, 2, 0, 6, 2 createsprite gBattleAnimSpriteTemplate_84029F4, 130, 1, 8, 3 loopsewithpan SE_W207B, 63, 16, 3 end @@ -3611,13 +3611,13 @@ Move_HELPING_HAND: @ 81CC2BF createsprite gBattleAnimSpriteTemplate_8402A0C, 40, 1 delay 19 playsewithpan SE_W227, 0 - createvisualtask sub_80A7FA0, 2, 2, 2, 0, 5, 1 + createvisualtask AnimTask_ShakeMon2, 2, ANIM_BANK_ATK_PARTNER, 2, 0, 5, 1 delay 14 playsewithpan SE_W227, 0 - createvisualtask sub_80A7FA0, 2, 2, 2, 0, 5, 1 + createvisualtask AnimTask_ShakeMon2, 2, ANIM_BANK_ATK_PARTNER, 2, 0, 5, 1 delay 20 playsewithpan SE_W227, 0 - createvisualtask sub_80A7FA0, 2, 2, 3, 0, 10, 1 + createvisualtask AnimTask_ShakeMon2, 2, ANIM_BANK_ATK_PARTNER, 3, 0, 10, 1 createvisualtask sub_8079790, 2, 2, 1023, 12, 1, 1 end @@ -3664,7 +3664,7 @@ Move_SUPERPOWER: @ 81CC3A3 createsprite gBattleAnimSpriteTemplate_83DA12C, 131, 0 playsewithpan SE_W207, 192 delay 16 - createvisualtask sub_80A7FA0, 2, 1, 8, 0, 16, 1 + createvisualtask AnimTask_ShakeMon2, 2, ANIM_BANK_TARGET, 8, 0, 16, 1 playsewithpan SE_W025B, 63 waitforvisualfinish clearmonbg ANIM_BANK_ATK_PARTNER @@ -3697,14 +3697,14 @@ Move_BRICK_BREAK: @ 81CC492 _81CC4A7: monbg ANIM_BANK_TARGET setalpha 12, 8 - createsprite gBattleAnimSpriteTemplate_83C1FB0, 2, 3, 8 + createsprite gHorizontalLungeSpriteTemplate, 2, 3, 8 delay 4 delay 1 createsprite gBasicHitSplatSpriteTemplate, 3, -18, -18, 1, 1 createsprite gBattleAnimSpriteTemplate_83D9FA8, 2, -18, -18, 10, 1, 0 playsewithpan SE_W233, 63 delay 20 - createsprite gBattleAnimSpriteTemplate_83C1FB0, 2, 3, 8 + createsprite gHorizontalLungeSpriteTemplate, 2, 3, 8 delay 5 createsprite gBasicHitSplatSpriteTemplate, 3, 18, 18, 1, 1 createsprite gBattleAnimSpriteTemplate_83D9FA8, 2, 18, 18, 10, 1, 0 @@ -3724,7 +3724,7 @@ _81CC4A7: _81CC576: monbg ANIM_BANK_TARGET setalpha 12, 8 - createsprite gBattleAnimSpriteTemplate_83C1FB0, 2, 3, 8 + createsprite gHorizontalLungeSpriteTemplate, 2, 3, 8 delay 4 createsprite gBattleAnimSpriteTemplate_83DA0A0, 3, 1, 0, 0, 90, 10 delay 1 @@ -3732,7 +3732,7 @@ _81CC576: createsprite gBattleAnimSpriteTemplate_83D9FA8, 2, -18, -18, 10, 1, 0 playsewithpan SE_W233, 63 delay 20 - createsprite gBattleAnimSpriteTemplate_83C1FB0, 2, 3, 8 + createsprite gHorizontalLungeSpriteTemplate, 2, 3, 8 delay 5 createsprite gBasicHitSplatSpriteTemplate, 3, 18, 18, 1, 1 createsprite gBattleAnimSpriteTemplate_83D9FA8, 2, 18, 18, 10, 1, 0 @@ -4076,7 +4076,7 @@ Move_NEEDLE_ARM: @ 81CCD73 delay 2 createsprite gBattleAnimSpriteTemplate_83D6994, 130, 1, 0, 16, 16, 16 waitforvisualfinish - createvisualtask sub_80A7FA0, 2, 1, 4, 0, 18, 1 + createvisualtask AnimTask_ShakeMon2, 2, ANIM_BANK_TARGET, 4, 0, 18, 1 createsprite gBasicHitSplatSpriteTemplate, 131, 0, 0, 1, 1 createsprite gBattleAnimSpriteTemplate_83D9FA8, 132, 0, 0, 8, 1, 0 playsewithpan SE_W233B, 63 @@ -4105,9 +4105,9 @@ Move_CRUSH_CLAW: @ 81CCF3B loadspritegfx 10208 monbg ANIM_BANK_TARGET setalpha 12, 8 - createsprite gBattleAnimSpriteTemplate_83C1FB0, 2, 6, 4 + createsprite gHorizontalLungeSpriteTemplate, 2, 6, 4 delay 4 - createvisualtask sub_80A7FA0, 2, 1, 2, 0, 18, 1 + createvisualtask AnimTask_ShakeMon2, 2, ANIM_BANK_TARGET, 2, 0, 18, 1 createsprite gBattleAnimSpriteTemplate_83DB288, 130, -10, -10, 0 createsprite gBattleAnimSpriteTemplate_83DB288, 130, -10, 10, 0 playsewithpan SE_W013, 63 @@ -4196,8 +4196,8 @@ Move_AIR_CUTTER: @ 81CD19D playsewithpan SE_W015, 63 createsprite gBattleAnimSpriteTemplate_83D6B40, 2, 40, -32, 0, 2 delay 5 - createvisualtask sub_80A7FA0, 2, 1, 2, 0, 8, 1 - createvisualtask sub_80A7FA0, 2, 3, 2, 0, 8, 1 + createvisualtask AnimTask_ShakeMon2, 2, ANIM_BANK_TARGET, 2, 0, 8, 1 + createvisualtask AnimTask_ShakeMon2, 2, ANIM_BANK_DEF_PARTNER, 2, 0, 8, 1 waitforvisualfinish blendoff clearmonbg ANIM_BANK_DEF_PARTNER @@ -4208,10 +4208,10 @@ Move_ODOR_SLEUTH: @ 81CD1FF monbg ANIM_BANK_TARGET createvisualtask sub_81316F8, 5 delay 24 - createsprite gBattleAnimSpriteTemplate_83C1FB0, 2, 3, 4 + createsprite gHorizontalLungeSpriteTemplate, 2, 3, 4 playsewithpan SE_W207, 192 delay 6 - createsprite gBattleAnimSpriteTemplate_83C1FB0, 2, 3, 4 + createsprite gHorizontalLungeSpriteTemplate, 2, 3, 4 playsewithpan SE_W207, 192 waitforvisualfinish clearmonbg ANIM_BANK_TARGET @@ -4268,7 +4268,7 @@ Move_TICKLE: @ 81CD33C createsprite gBattleAnimSpriteTemplate_83DB3C4, 2, 2, 0, 16, 0, 0 waitforvisualfinish delay 20 - createvisualtask sub_80A8B88, 3, 0, 6, 1280, 3, 0 + createvisualtask AnimTask_SwayMon, 3, 0, 6, 1280, 3, 0 delay 12 createvisualtask sub_812E568, 3, 1, 6, 2 loopsewithpan SE_W039, 63, 8, 8 @@ -4338,7 +4338,7 @@ Move_AERIAL_ACE: @ 81CD499 loadspritegfx 10138 monbg ANIM_BANK_TARGET setalpha 12, 8 - createvisualtask sub_80A8500, 2, 0, 24, 6, 1, 5 + createvisualtask AnimTask_TranslateMonEllipticalRespectSide, 2, ANIM_BANK_ATTACKER, 24, 6, 1, 5 createvisualtask sub_80E2DD8, 2, 0, 4, 7, 3 createsprite gBattleAnimSpriteTemplate_83D6B28, 2, 40, -32, 0 playsewithpan SE_W013B, 192 @@ -4397,7 +4397,7 @@ Move_COVET: @ 81CD57C createsprite gBattleAnimSpriteTemplate_83D7A80, 3, 20, 20 playsewithpan SE_W204, 192 waitforvisualfinish - createvisualtask sub_80A7FA0, 2, 1, 2, 0, 8, 1 + createvisualtask AnimTask_ShakeMon2, 2, ANIM_BANK_TARGET, 2, 0, 8, 1 loopsewithpan SE_W146, 63, 4, 3 end @@ -4430,7 +4430,7 @@ Move_VOLT_TACKLE: @ 81CD5D9 createvisualtask sub_80D700C, 5, 4 playsewithpan SE_W085, 192 delay 8 - createvisualtask sub_80A7FA0, 2, 1, 10, 0, 18, 1 + createvisualtask AnimTask_ShakeMon2, 2, ANIM_BANK_TARGET, 10, 0, 18, 1 playsewithpan SE_W120, 63 createsprite gBattleAnimSpriteTemplate_83D9A9C, 2, 1, 16, 16 delay 2 @@ -4438,7 +4438,7 @@ Move_VOLT_TACKLE: @ 81CD5D9 delay 8 createvisualtask sub_80D6E9C, 5 waitforvisualfinish - createvisualtask sub_80A7FA0, 2, 0, 3, 0, 9, 1 + createvisualtask AnimTask_ShakeMon2, 2, ANIM_BANK_ATTACKER, 3, 0, 9, 1 playsewithpan SE_W085B, 192 createsprite gBattleAnimSpriteTemplate_83D9A9C, 2, 0, 16, 16 delay 2 @@ -4489,19 +4489,19 @@ Move_LEAF_BLADE: @ 81CD775 loadspritegfx 10285 createvisualtask sub_80CBDF4, 5 delay 2 - createvisualtask sub_80A7FA0, 2, 1, 2, 0, 8, 1 + createvisualtask AnimTask_ShakeMon2, 2, ANIM_BANK_TARGET, 2, 0, 8, 1 playsewithpan SE_W015, 63 delay 50 - createvisualtask sub_80A7FA0, 2, 1, 2, 0, 8, 1 + createvisualtask AnimTask_ShakeMon2, 2, ANIM_BANK_TARGET, 2, 0, 8, 1 playsewithpan SE_W015, 63 delay 50 - createvisualtask sub_80A7FA0, 2, 1, 2, 0, 8, 1 + createvisualtask AnimTask_ShakeMon2, 2, ANIM_BANK_TARGET, 2, 0, 8, 1 playsewithpan SE_W015, 63 waitforvisualfinish monbg ANIM_BANK_TARGET setalpha 12, 8 delay 12 - createvisualtask sub_80A7FA0, 2, 1, 8, 0, 18, 1 + createvisualtask AnimTask_ShakeMon2, 2, ANIM_BANK_TARGET, 8, 0, 18, 1 createsprite gBattleAnimSpriteTemplate_83DB520, 130, 0, 0, 1, 36 playsewithpan SE_W043, 63 waitforvisualfinish @@ -4701,7 +4701,7 @@ Move_CONFUSION: @ 81CDC69 monbg ANIM_BANK_DEF_PARTNER call Unknown_81D61E7 setalpha 8, 8 - createvisualtask sub_80A7FA0, 2, 0, 1, 0, 10, 1 + createvisualtask AnimTask_ShakeMon2, 2, ANIM_BANK_ATTACKER, 1, 0, 10, 1 createvisualtask sub_80E1F8C, 2, 2, 0, 2, 0, 8, 32767 waitforvisualfinish playsewithpan SE_W048, 63 @@ -4718,7 +4718,7 @@ Move_PSYCHIC: @ 81CDCCA monbg ANIM_BANK_DEF_PARTNER call Unknown_81D61E7 setalpha 8, 8 - createvisualtask sub_80A7FA0, 2, 0, 1, 0, 10, 1 + createvisualtask AnimTask_ShakeMon2, 2, ANIM_BANK_ATTACKER, 1, 0, 10, 1 createvisualtask sub_80E1F8C, 2, 2, 0, 2, 0, 8, 767 waitforvisualfinish loopsewithpan SE_W048, 63, 10, 3 @@ -4940,7 +4940,7 @@ Move_DRAGON_BREATH: @ 81CE20A createvisualtask sub_80E2A38, 10, 4, 1, 0, 9, 31 createsprite gBattleAnimSpriteTemplate_83DB044, 130, 0, 0, 0, 0, 20 delay 2 - createvisualtask sub_80A7FA0, 2, 1, 2, 0, 21, 1 + createvisualtask AnimTask_ShakeMon2, 2, ANIM_BANK_TARGET, 2, 0, 21, 1 createsprite gBattleAnimSpriteTemplate_83DB044, 130, 0, 0, 0, 0, 20 delay 2 createsprite gBattleAnimSpriteTemplate_83DB044, 130, 0, 0, 0, 0, 20 @@ -4993,8 +4993,8 @@ Move_GROWL: @ 81CE3AF createvisualtask sub_812B18C, 2, 0, 255 call _81CE35E delay 10 - createvisualtask sub_80A7FA0, 2, 1, 1, 0, 9, 1 - createvisualtask sub_80A7FA0, 2, 3, 1, 0, 9, 1 + createvisualtask AnimTask_ShakeMon2, 2, ANIM_BANK_TARGET, 1, 0, 9, 1 + createvisualtask AnimTask_ShakeMon2, 2, ANIM_BANK_DEF_PARTNER, 1, 0, 9, 1 waitforvisualfinish delay 20 end @@ -5013,7 +5013,7 @@ Move_SNORE: @ 81CE3EA _81CE403: playsewithpan SE_W173, 192 createvisualtask sub_80A8D34, 5, -7, -7, 7, 0, 1 - createvisualtask sub_80A7FA0, 2, 1, 4, 0, 7, 1 + createvisualtask AnimTask_ShakeMon2, 2, ANIM_BANK_TARGET, 4, 0, 7, 1 createsprite gBattleAnimSpriteTemplate_83DB428, 2, 6, 1, 14, 0, 0 createsprite gBattleAnimSpriteTemplate_83D77F8, 2, 0, 0, -42, -38, 24, 0, 0 createsprite gBattleAnimSpriteTemplate_83D77F8, 2, 0, 0, 0, -42, 24, 0, 0 @@ -5139,7 +5139,7 @@ Move_SMOG: @ 81CE672 loopsewithpan SE_W092, 63, 18, 2 createvisualtask sub_80E1F8C, 2, 4, 2, 2, 0, 12, 26650 delay 10 - createvisualtask sub_80A7FA0, 2, 1, 2, 0, 15, 1 + createvisualtask AnimTask_ShakeMon2, 2, ANIM_BANK_TARGET, 2, 0, 15, 1 waitforvisualfinish clearmonbg ANIM_BANK_DEF_PARTNER blendoff @@ -5156,7 +5156,7 @@ Move_FAINT_ATTACK: @ 81CE6ED waitbgfadein delay 0 playsewithpan SE_W185, 192 - createvisualtask sub_80A8500, 2, 0, 18, 6, 1, 3 + createvisualtask AnimTask_TranslateMonEllipticalRespectSide, 2, ANIM_BANK_ATTACKER, 18, 6, 1, 3 createvisualtask sub_80DFC24, 2, 1 waitforvisualfinish clearmonbg ANIM_BANK_ATTACKER @@ -5168,7 +5168,7 @@ Move_FAINT_ATTACK: @ 81CE6ED delay 1 playsewithpan SE_W233B, 63 createsprite gBasicHitSplatSpriteTemplate, 2, 0, 0, 1, 1 - createvisualtask sub_80A7FA0, 2, 1, 2, 0, 9, 1 + createvisualtask AnimTask_ShakeMon2, 2, ANIM_BANK_TARGET, 2, 0, 9, 1 waitforvisualfinish clearmonbg ANIM_BANK_TARGET blendoff @@ -5191,9 +5191,9 @@ Move_SAND_ATTACK: @ 81CE774 monbgprio_28 0 setalpha 12, 8 playsewithpan SE_W028, 192 - createsprite gBattleAnimSpriteTemplate_83C1FF8, 2, 0, -10, 0, 0, 3 + createsprite gSlideMonToOffsetSpriteTemplate, 2, 0, -10, 0, 0, 3 waitforvisualfinish - createsprite gBattleAnimSpriteTemplate_83C1FE0, 2, 0, 0, 2 + createsprite gSlideMonToOriginalPosSpriteTemplate, 2, 0, 0, 2 call _81CE7C4 call _81CE7C4 call _81CE7C4 @@ -5216,9 +5216,9 @@ _81CE7C4: Move_MUD_SLAP: @ 81CE81C loadspritegfx 10074 playsewithpan SE_W028, 192 - createsprite gBattleAnimSpriteTemplate_83C1FF8, 2, 0, -10, 0, 0, 3 + createsprite gSlideMonToOffsetSpriteTemplate, 2, 0, -10, 0, 0, 3 waitforvisualfinish - createsprite gBattleAnimSpriteTemplate_83C1FE0, 2, 0, 0, 2 + createsprite gSlideMonToOriginalPosSpriteTemplate, 2, 0, 0, 2 call _81CE862 call _81CE862 call _81CE862 @@ -5242,7 +5242,7 @@ Move_DRAGON_RAGE: @ 81CE8BA playsewithpan SE_W082, 192 createvisualtask AnimTask_ShakeMon, 5, 0, 0, 2, 40, 1 waitforvisualfinish - createsprite gBattleAnimSpriteTemplate_83C1FF8, 130, 0, 15, 0, 0, 4 + createsprite gSlideMonToOffsetSpriteTemplate, 130, 0, 15, 0, 0, 4 waitforvisualfinish createsprite gBattleAnimSpriteTemplate_83DB0D0, 130, 30, 15, 0, 10, 10 waitforvisualfinish @@ -5264,7 +5264,7 @@ Move_DRAGON_RAGE: @ 81CE8BA delay 1 createsprite gBattleAnimSpriteTemplate_83DB078, 194, 1, 0, 8 waitforvisualfinish - createsprite gBattleAnimSpriteTemplate_83C1FE0, 194, 0, 0, 4 + createsprite gSlideMonToOriginalPosSpriteTemplate, 194, 0, 0, 4 waitforvisualfinish end @@ -5359,7 +5359,7 @@ Move_ICE_BEAM: @ 81CEB4D call _81CEC4E call _81CEC4E createsprite gBattleAnimSpriteTemplate_83DB3C4, 2, 4, -31, 0, 7, 32384 - createvisualtask sub_80A7FA0, 2, 1, 2, 0, 25, 1 + createvisualtask AnimTask_ShakeMon2, 2, ANIM_BANK_TARGET, 2, 0, 25, 1 call _81CEC4E call _81CEC4E call _81CEC4E @@ -5402,13 +5402,13 @@ Move_AURORA_BEAM: @ 81CEC91 setarg 7, 0 createvisualtask sub_80D3490, 10, 130 call _81CED18 - createvisualtask sub_80A7FA0, 5, 1, 1, 0, 17, 1 + createvisualtask AnimTask_ShakeMon2, 5, 1, 1, 0, 17, 1 call _81CED18 call _81CED18 call _81CED18 setarg 7, -1 createsoundtask sub_812B058, 183, -64, 63, 3, 6, 0, 10 - createvisualtask sub_80A7FA0, 5, 1, 2, 0, 40, 1 + createvisualtask AnimTask_ShakeMon2, 5, 1, 2, 0, 40, 1 call _81CED18 call _81CED18 call _81CED18 @@ -5487,7 +5487,7 @@ _81CEE70: createvisualtask sub_80E2A38, 10, 4, 1, 0, 10, 1017 createsprite gBattleAnimSpriteTemplate_83D6304, 131, 15, 0, 20, 2 delay 4 - createvisualtask sub_80A7FA0, 5, 1, 2, 0, 65, 1 + createvisualtask AnimTask_ShakeMon2, 5, 1, 2, 0, 65, 1 createsprite gBattleAnimSpriteTemplate_83D6304, 131, 15, 0, 20, 3 delay 4 createsprite gBattleAnimSpriteTemplate_83D6304, 131, 15, 0, 20, 4 @@ -5698,7 +5698,7 @@ Move_ABSORB: @ 81CF427 loadspritegfx 10031 loadspritegfx 10135 monbg ANIM_BANK_DEF_PARTNER - monbgprio_2A 1 + monbgprio_2A ANIM_BANK_TARGET setalpha 12, 8 createsprite gBattleAnimSpriteTemplate_83DB3C4, 2, 1, 1, 0, 4, 13293 waitforvisualfinish @@ -5750,7 +5750,7 @@ Move_MEGA_DRAIN: @ 81CF53F loadspritegfx 10031 loadspritegfx 10135 monbg ANIM_BANK_DEF_PARTNER - monbgprio_2A 1 + monbgprio_2A ANIM_BANK_TARGET setalpha 12, 8 createsprite gBattleAnimSpriteTemplate_83DB3C4, 2, 1, 1, 0, 8, 13293 waitforvisualfinish @@ -5810,7 +5810,7 @@ Move_GIGA_DRAIN: @ 81CF6CF loadspritegfx 10031 loadspritegfx 10135 monbg ANIM_BANK_DEF_PARTNER - monbgprio_2A 1 + monbgprio_2A ANIM_BANK_TARGET setalpha 12, 8 createsprite gBattleAnimSpriteTemplate_83DB3C4, 2, 1, 1, 0, 12, 13293 waitforvisualfinish @@ -5880,7 +5880,7 @@ Move_LEECH_LIFE: @ 81CF8D7 loadspritegfx 10031 loadspritegfx 10135 monbg ANIM_BANK_DEF_PARTNER - monbgprio_2A 1 + monbgprio_2A ANIM_BANK_TARGET setalpha 12, 8 delay 1 createsprite gBattleAnimSpriteTemplate_83DAB10, 2, -20, 15, 12 @@ -5962,7 +5962,7 @@ Move_SLUDGE_BOMB: @ 81CFA34 call _81CFB44 call _81CFB44 call _81CFB44 - createvisualtask sub_80A7FA0, 5, 1, 3, 0, 15, 1 + createvisualtask AnimTask_ShakeMon2, 5, 1, 3, 0, 15, 1 createvisualtask sub_80E1F8C, 2, 4, 1, 2, 0, 12, 31774 createsprite gBattleAnimSpriteTemplate_83DA2E8, 130, 42, 27, 20 createsprite gBattleAnimSpriteTemplate_83DA2E8, 130, -27, 44, 20 @@ -6005,8 +6005,8 @@ Move_ACID: @ 81CFB5A createsprite gBattleAnimSpriteTemplate_83DA2D0, 130, 20, 0, 40, 1, -24, 0 playsewithpan SE_W145C, 192 delay 15 - createvisualtask sub_80A7FA0, 5, 1, 2, 0, 10, 1 - createvisualtask sub_80A7FA0, 5, 3, 2, 0, 10, 1 + createvisualtask AnimTask_ShakeMon2, 5, 1, 2, 0, 10, 1 + createvisualtask AnimTask_ShakeMon2, 5, 3, 2, 0, 10, 1 createvisualtask sub_80E1F8C, 2, 20, 2, 2, 0, 12, 31774 createsprite gBattleAnimSpriteTemplate_83DA31C, 130, 0, -22, 0, 15, 55 playsewithpan SE_W145, 63 @@ -6040,7 +6040,7 @@ Move_BONEMERANG: @ 81CFC54 createvisualtask AnimTask_ShakeMon, 5, 1, 5, 0, 5, 1 delay 17 playsewithpan SE_W233, 192 - createsprite gBattleAnimSpriteTemplate_83C1FB0, 2, 6, -4 + createsprite gHorizontalLungeSpriteTemplate, 2, 6, -4 waitforvisualfinish clearmonbg ANIM_BANK_DEF_PARTNER blendoff @@ -6112,20 +6112,20 @@ _81CFDCF: createvisualtask AnimTask_ShakeMon, 5, 0, 2, 0, 15, 1 waitforvisualfinish delay 10 - createsprite gBattleAnimSpriteTemplate_83C1FF8, 2, 0, 24, 0, 0, 6 + createsprite gSlideMonToOffsetSpriteTemplate, 2, 0, 24, 0, 0, 6 delay 3 createsprite gBattleAnimSpriteTemplate_83DAABC, 3, -42, 25, 0, 0, 6 delay 4 playsewithpan SE_W011, 63 createsprite gBasicHitSplatSpriteTemplate, 2, 0, 0, 1, 0 - createsprite gBattleAnimSpriteTemplate_83C1FF8, 2, 1, -16, 4, 1, 4 + createsprite gSlideMonToOffsetSpriteTemplate, 2, 1, -16, 4, 1, 4 waitforvisualfinish - createvisualtask sub_80A8154, 2, 1, -4, 1, 12, 1 + createvisualtask AnimTask_ShakeMonInPlace, 2, ANIM_BANK_TARGET, -4, 1, 12, 1 createsprite gBattleAnimSpriteTemplate_83DB3DC, 2, 7, 5, 1, 32767, 10, 0, 0 delay 10 - createsprite gBattleAnimSpriteTemplate_83C1FE0, 2, 0, 0, 11 + createsprite gSlideMonToOriginalPosSpriteTemplate, 2, 0, 0, 11 delay 3 - createsprite gBattleAnimSpriteTemplate_83C1FE0, 2, 1, 0, 7 + createsprite gSlideMonToOriginalPosSpriteTemplate, 2, 1, 0, 7 waitforvisualfinish waitforvisualfinish clearmonbg ANIM_BANK_DEF_PARTNER @@ -6151,7 +6151,7 @@ Move_GUST: @ 81CFE9A createsprite gBattleAnimSpriteTemplate_83DA380, 2, 0, -16 createvisualtask sub_80DA09C, 5, 1, 70 waitforvisualfinish - createvisualtask sub_80A7FA0, 5, 1, 1, 0, 7, 1 + createvisualtask AnimTask_ShakeMon2, 5, 1, 1, 0, 7, 1 createsprite gBasicHitSplatSpriteTemplate, 2, 0, 0, 1, 2 playsewithpan SE_W016B, 63 waitforvisualfinish @@ -6166,18 +6166,18 @@ Move_WING_ATTACK: @ 81CFEEB monbgprio_28 1 setalpha 12, 8 loopsewithpan SE_W017, 192, 20, 2 - createvisualtask sub_80A8408, 2, 0, 12, 4, 1, 4 + createvisualtask AnimTask_TranslateMonElliptical, 2, ANIM_BANK_ATTACKER, 12, 4, 1, 4 createvisualtask sub_80DA09C, 5, 1, 70 createsprite gBattleAnimSpriteTemplate_83DA3B4, 2, -25, 0, 0, 0, 20 createsprite gBattleAnimSpriteTemplate_83DA3B4, 2, 25, 0, 0, 0, 20 delay 24 - createsprite gBattleAnimSpriteTemplate_83C1FF8, 2, 0, 24, 0, 0, 9 + createsprite gSlideMonToOffsetSpriteTemplate, 2, 0, 24, 0, 0, 9 delay 17 createsprite gBasicHitSplatSpriteTemplate, 2, 16, 0, 1, 1 createsprite gBasicHitSplatSpriteTemplate, 2, -16, 0, 1, 1 loopsewithpan SE_W003, 63, 5, 2 waitforvisualfinish - createsprite gBattleAnimSpriteTemplate_83C1FE0, 2, 0, 0, 11 + createsprite gSlideMonToOriginalPosSpriteTemplate, 2, 0, 0, 11 waitforvisualfinish clearmonbg ANIM_BANK_DEF_PARTNER blendoff @@ -6241,7 +6241,7 @@ Move_WATER_GUN: @ 81D00CC createsprite gBattleAnimSpriteTemplate_83D9318, 2, 20, 0, 0, 0, 40, -25 playsewithpan SE_W145, 192 waitforvisualfinish - createvisualtask sub_80A7FA0, 5, 1, 1, 0, 8, 1 + createvisualtask AnimTask_ShakeMon2, 5, 1, 1, 0, 8, 1 createsprite gBattleAnimSpriteTemplate_83DB4D8, 4, 0, 0, 1, 2 createsprite gBattleAnimSpriteTemplate_83D9330, 2, 0, -15, 0, 15, 55 playsewithpan SE_W152, 63 @@ -6265,11 +6265,11 @@ Move_CRABHAMMER: @ 81D0159 playsewithpan SE_W233B, 63 delay 1 createsprite gBattleAnimSpriteTemplate_83DB3DC, 2, 31, 3, 1, 32429, 10, 0, 0 - createsprite gBattleAnimSpriteTemplate_83C1FF8, 2, 1, -24, 0, 0, 4 + createsprite gSlideMonToOffsetSpriteTemplate, 2, 1, -24, 0, 0, 4 waitforvisualfinish delay 8 waitforvisualfinish - createsprite gBattleAnimSpriteTemplate_83C1FE0, 2, 1, 0, 4 + createsprite gSlideMonToOriginalPosSpriteTemplate, 2, 1, 0, 4 waitforvisualfinish loopsewithpan SE_W152, 63, 20, 3 createvisualtask AnimTask_ShakeMon, 5, 1, 0, 4, 8, 1 @@ -6473,7 +6473,7 @@ Move_JUMP_KICK: @ 81D05F7 loadspritegfx 10135 monbg ANIM_BANK_DEF_PARTNER setalpha 12, 8 - createsprite gBattleAnimSpriteTemplate_83C1FB0, 2, 4, 4 + createsprite gHorizontalLungeSpriteTemplate, 2, 4, 4 delay 3 createsprite gBattleAnimSpriteTemplate_83D9F90, 2, -16, 8, 0, 0, 10, 1, 1, 1 playsewithpan SE_W026, 63 @@ -6491,22 +6491,22 @@ Move_HI_JUMP_KICK: @ 81D0654 loadspritegfx 10135 monbg ANIM_BANK_DEF_PARTNER setalpha 12, 8 - createsprite gBattleAnimSpriteTemplate_83C1FF8, 2, 0, -24, 0, 0, 8 + createsprite gSlideMonToOffsetSpriteTemplate, 2, 0, -24, 0, 0, 8 waitforvisualfinish delay 10 - createsprite gBattleAnimSpriteTemplate_83C1FE0, 2, 0, 0, 3 + createsprite gSlideMonToOriginalPosSpriteTemplate, 2, 0, 0, 3 delay 2 createsprite gBattleAnimSpriteTemplate_83D9F90, 2, -16, 8, 0, 0, 10, 1, 1, 1 playsewithpan SE_W026, 63 waitforvisualfinish createsprite gBasicHitSplatSpriteTemplate, 2, 0, 0, 1, 1 playsewithpan SE_W233B, 63 - createsprite gBattleAnimSpriteTemplate_83C1FF8, 2, 1, -28, 0, 0, 3 + createsprite gSlideMonToOffsetSpriteTemplate, 2, 1, -28, 0, 0, 3 delay 3 - createvisualtask sub_80A8154, 2, 1, 3, 0, 11, 1 + createvisualtask AnimTask_ShakeMonInPlace, 2, ANIM_BANK_TARGET, 3, 0, 11, 1 waitforvisualfinish delay 5 - createsprite gBattleAnimSpriteTemplate_83C1FE0, 2, 1, 0, 6 + createsprite gSlideMonToOriginalPosSpriteTemplate, 2, 1, 0, 6 waitforvisualfinish clearmonbg ANIM_BANK_DEF_PARTNER blendoff @@ -6571,7 +6571,7 @@ Move_DYNAMIC_PUNCH: @ 81D07E4 delay 1 waitsound playsewithpan SE_W120, 63 - createvisualtask sub_80A7FA0, 5, 1, 5, 0, 28, 1 + createvisualtask AnimTask_ShakeMon2, 5, 1, 5, 0, 28, 1 createsprite gBattleAnimSpriteTemplate_83D7828, 3, 0, 0, 1, 1 delay 6 playsewithpan SE_W120, 63 @@ -6595,10 +6595,10 @@ Move_COUNTER: @ 81D08AC loadspritegfx 10143 monbg ANIM_BANK_DEF_PARTNER setalpha 12, 8 - createvisualtask sub_80A8500, 2, 0, 18, 6, 1, 4 + createvisualtask AnimTask_TranslateMonEllipticalRespectSide, 2, ANIM_BANK_ATTACKER, 18, 6, 1, 4 playsewithpan SE_W233, 192 waitforvisualfinish - createsprite gBattleAnimSpriteTemplate_83C1FF8, 2, 0, 20, 0, 0, 4 + createsprite gSlideMonToOffsetSpriteTemplate, 2, 0, 20, 0, 0, 4 delay 4 createsprite gBasicHitSplatSpriteTemplate, 2, -15, 18, 1, 0 playsewithpan SE_W233B, 63 @@ -6616,7 +6616,7 @@ Move_COUNTER: @ 81D08AC delay 1 createsprite gBattleAnimSpriteTemplate_83D9FA8, 3, 15, 9, 8, 1, 0 delay 5 - createsprite gBattleAnimSpriteTemplate_83C1FE0, 2, 0, 0, 5 + createsprite gSlideMonToOriginalPosSpriteTemplate, 2, 0, 0, 5 waitforvisualfinish clearmonbg ANIM_BANK_DEF_PARTNER blendoff @@ -6627,19 +6627,19 @@ Move_VITAL_THROW: @ 81D097B monbg ANIM_BANK_DEF_PARTNER setalpha 12, 8 playsewithpan SE_W233, 192 - createvisualtask sub_80A8500, 2, 0, 12, 4, 1, 2 + createvisualtask AnimTask_TranslateMonEllipticalRespectSide, 2, ANIM_BANK_ATTACKER, 12, 4, 1, 2 waitforvisualfinish - createsprite gBattleAnimSpriteTemplate_83C1FF8, 2, 0, 20, 0, 0, 4 + createsprite gSlideMonToOffsetSpriteTemplate, 2, 0, 20, 0, 0, 4 delay 2 createsprite gBasicHitSplatSpriteTemplate, 3, 0, 0, 1, 1 playsewithpan SE_W233B, 63 delay 1 - createsprite gBattleAnimSpriteTemplate_83C1FF8, 2, 1, -24, 0, 0, 4 + createsprite gSlideMonToOffsetSpriteTemplate, 2, 1, -24, 0, 0, 4 waitforvisualfinish delay 3 - createsprite gBattleAnimSpriteTemplate_83C1FE0, 2, 0, 0, 7 + createsprite gSlideMonToOriginalPosSpriteTemplate, 2, 0, 0, 7 delay 11 - createsprite gBattleAnimSpriteTemplate_83C1FE0, 2, 1, 0, 10 + createsprite gSlideMonToOriginalPosSpriteTemplate, 2, 1, 0, 10 waitforvisualfinish clearmonbg ANIM_BANK_DEF_PARTNER blendoff @@ -6686,8 +6686,8 @@ Move_SUBMISSION: @ 81D0AEE waitplaysewithpan SE_W004, 63, 70 waitplaysewithpan SE_W104, 192, 80 waitplaysewithpan SE_W004, 63, 90 - createvisualtask sub_80A8408, 2, 0, -18, 6, 6, 4 - createvisualtask sub_80A8408, 2, 1, 18, 6, 6, 4 + createvisualtask AnimTask_TranslateMonElliptical, 2, ANIM_BANK_ATTACKER, -18, 6, 6, 4 + createvisualtask AnimTask_TranslateMonElliptical, 2, ANIM_BANK_TARGET, 18, 6, 6, 4 call _81D0B5D call _81D0B5D call _81D0B5D @@ -6775,7 +6775,7 @@ Move_PETAL_DANCE: @ 81D0CA6 monbg ANIM_BANK_DEF_PARTNER setalpha 12, 8 playsewithpan SE_W080, 192 - createvisualtask sub_80A8500, 2, 0, 12, 6, 6, 3 + createvisualtask AnimTask_TranslateMonEllipticalRespectSide, 2, ANIM_BANK_ATTACKER, 12, 6, 6, 3 createsprite gBattleAnimSpriteTemplate_83D6428, 2, 0, -24, 8, 140 createsprite gBattleAnimSpriteTemplate_83D6440, 2, 16, -24, 8, 100 createsprite gBattleAnimSpriteTemplate_83D6440, 2, -16, -24, 8, 100 @@ -6794,14 +6794,14 @@ Move_PETAL_DANCE: @ 81D0CA6 createsprite gBattleAnimSpriteTemplate_83D6440, 2, 20, -16, 14, 80 createsprite gBattleAnimSpriteTemplate_83D6440, 2, -20, -14, 16, 80 waitforvisualfinish - createsprite gBattleAnimSpriteTemplate_83C1FF8, 2, 0, 24, 0, 0, 5 + createsprite gSlideMonToOffsetSpriteTemplate, 2, 0, 24, 0, 0, 5 delay 3 playsewithpan SE_W025B, 63 createsprite gBasicHitSplatSpriteTemplate, 3, 0, 0, 1, 0 createvisualtask AnimTask_ShakeMon, 2, ANIM_BANK_TARGET, 6, 0, 8, 1 waitforvisualfinish delay 8 - createsprite gBattleAnimSpriteTemplate_83C1FE0, 2, 0, 0, 7 + createsprite gSlideMonToOriginalPosSpriteTemplate, 2, 0, 0, 7 waitforvisualfinish clearmonbg ANIM_BANK_DEF_PARTNER blendoff @@ -6840,8 +6840,8 @@ Move_RAZOR_LEAF: @ 81D0DDE createsprite gBattleAnimSpriteTemplate_83D64E4, 131, 20, -10, 20, 0, 22, -20, 1 delay 20 playsewithpan SE_W013, 63 - createvisualtask sub_80A7FA0, 2, 1, 2, 0, 8, 1 - createvisualtask sub_80A7FA0, 2, 3, 2, 0, 8, 1 + createvisualtask AnimTask_ShakeMon2, 2, ANIM_BANK_TARGET, 2, 0, 8, 1 + createvisualtask AnimTask_ShakeMon2, 2, ANIM_BANK_DEF_PARTNER, 2, 0, 8, 1 waitforvisualfinish clearmonbg ANIM_BANK_DEF_PARTNER blendoff @@ -6859,7 +6859,7 @@ Move_ANCIENT_POWER: @ 81D0EE5 createsprite gBattleAnimSpriteTemplate_83DAD60, 2, -20, 32, -48, 50, 2 createsprite gBattleAnimSpriteTemplate_83DAD60, 2, 20, 32, -28, 60, 1 createsprite gBattleAnimSpriteTemplate_83DAD60, 2, 0, 32, -28, 30, 4 - createvisualtask sub_80A7FA0, 2, 0, 1, 0, 30, 1 + createvisualtask AnimTask_ShakeMon2, 2, ANIM_BANK_ATTACKER, 1, 0, 30, 1 playsewithpan SE_W082, 192 delay 10 createsprite gBattleAnimSpriteTemplate_83DAD60, 2, 15, 32, -48, 25, 5 @@ -6868,13 +6868,13 @@ Move_ANCIENT_POWER: @ 81D0EE5 createsprite gBattleAnimSpriteTemplate_83DAD60, 2, 0, 32, -42, 25, 5 createsprite gBattleAnimSpriteTemplate_83DAD60, 2, -25, 32, -48, 30, 4 waitforvisualfinish - createsprite gBattleAnimSpriteTemplate_83C1FF8, 2, 0, 16, 0, 0, 4 + createsprite gSlideMonToOffsetSpriteTemplate, 2, 0, 16, 0, 0, 4 delay 3 playsewithpan SE_W120, 63 createsprite gBasicHitSplatSpriteTemplate, 3, 0, 0, 1, 1 - createvisualtask sub_80A7FA0, 2, 1, 3, 0, 6, 1 + createvisualtask AnimTask_ShakeMon2, 2, ANIM_BANK_TARGET, 3, 0, 6, 1 waitforvisualfinish - createsprite gBattleAnimSpriteTemplate_83C1FE0, 2, 0, 0, 7 + createsprite gSlideMonToOriginalPosSpriteTemplate, 2, 0, 0, 7 waitforvisualfinish clearmonbg ANIM_BANK_DEF_PARTNER blendoff @@ -6975,8 +6975,8 @@ Move_LEER: @ 81D121A createvisualtask sub_80A8D34, 5, -5, -5, 10, 0, 1 waitforvisualfinish delay 10 - createvisualtask sub_80A7FA0, 2, 1, 1, 0, 9, 1 - createvisualtask sub_80A7FA0, 2, 3, 1, 0, 9, 1 + createvisualtask AnimTask_ShakeMon2, 2, ANIM_BANK_TARGET, 1, 0, 9, 1 + createvisualtask AnimTask_ShakeMon2, 2, ANIM_BANK_DEF_PARTNER, 1, 0, 9, 1 waitforvisualfinish clearmonbg ANIM_BANK_ATTACKER blendoff @@ -6988,7 +6988,7 @@ Move_DREAM_EATER: @ 81D1271 loadspritegfx 10147 loadspritegfx 10031 monbg ANIM_BANK_DEF_PARTNER - monbgprio_2A 1 + monbgprio_2A ANIM_BANK_TARGET playsewithpan SE_W060, 192 call Unknown_81D61E7 setalpha 8, 8 @@ -7086,7 +7086,7 @@ Move_POISON_GAS: @ 81D1474 end Move_BIND: @ 81D1552 - createvisualtask sub_80A8B88, 5, 0, 6, 3328, 4, 0 + createvisualtask AnimTask_SwayMon, 5, 0, 6, 3328, 4, 0 goto _81D1568 _81D1568: playsewithpan SE_W020, 63 @@ -7100,7 +7100,7 @@ _81D1578: return Move_WRAP: @ 81D158C - createvisualtask sub_80A8500, 2, 0, 6, 4, 2, 4 + createvisualtask AnimTask_TranslateMonEllipticalRespectSide, 2, ANIM_BANK_ATTACKER, 6, 4, 2, 4 goto _81D1568 Move_PSYBEAM: @ 81D15A2 @@ -7110,7 +7110,7 @@ Move_PSYBEAM: @ 81D15A2 createsoundtask sub_812B058, 200, -64, 63, 3, 4, 0, 15 call _81D1626 call _81D1626 - createvisualtask sub_80A8B88, 5, 0, 6, 2048, 4, 1 + createvisualtask AnimTask_SwayMon, 5, 0, 6, 2048, 4, 1 createvisualtask sub_80E1F8C, 2, 4, 2, 2, 0, 12, 32351 call _81D1626 call _81D1626 @@ -7186,7 +7186,7 @@ Move_ZAP_CANNON: @ 81D1722 createsprite gBattleAnimSpriteTemplate_83D98A0, 132, 10, 0, 8, 30, 160, 40, 0 createsprite gBattleAnimSpriteTemplate_83D98A0, 132, 10, 0, 8, 30, 224, 40, 2 waitforvisualfinish - createvisualtask sub_80A7FA0, 2, 1, 4, 0, 5, 1 + createvisualtask AnimTask_ShakeMon2, 2, ANIM_BANK_TARGET, 4, 0, 5, 1 delay 15 waitplaysewithpan SE_W085B, 63, 19 call Unknown_81D6100 @@ -7203,18 +7203,18 @@ Move_STEEL_WING: @ 81D1807 monbgprio_28 1 setalpha 12, 8 loopsewithpan SE_W017, 192, 20, 2 - createvisualtask sub_80A8408, 2, 0, 12, 4, 1, 4 + createvisualtask AnimTask_TranslateMonElliptical, 2, ANIM_BANK_ATTACKER, 12, 4, 1, 4 createvisualtask sub_80DA09C, 5, 1, 70 createsprite gBattleAnimSpriteTemplate_83DA3B4, 2, -25, 0, 0, 0, 20 createsprite gBattleAnimSpriteTemplate_83DA3B4, 2, 25, 0, 0, 0, 20 delay 24 - createsprite gBattleAnimSpriteTemplate_83C1FF8, 2, 0, 24, 0, 0, 9 + createsprite gSlideMonToOffsetSpriteTemplate, 2, 0, 24, 0, 0, 9 delay 17 createsprite gBasicHitSplatSpriteTemplate, 2, 16, 0, 1, 1 createsprite gBasicHitSplatSpriteTemplate, 2, -16, 0, 1, 1 playsewithpan SE_W013, 63 waitforvisualfinish - createsprite gBattleAnimSpriteTemplate_83C1FE0, 2, 0, 0, 11 + createsprite gSlideMonToOriginalPosSpriteTemplate, 2, 0, 0, 11 waitforvisualfinish clearmonbg ANIM_BANK_DEF_PARTNER blendoff @@ -7227,7 +7227,7 @@ Move_IRON_TAIL: @ 81D18B6 waitforvisualfinish monbg ANIM_BANK_TARGET setalpha 12, 8 - createsprite gBattleAnimSpriteTemplate_83C1FB0, 2, 4, 4 + createsprite gHorizontalLungeSpriteTemplate, 2, 4, 4 delay 6 createsprite gBasicHitSplatSpriteTemplate, 130, 0, 0, 1, 2 createvisualtask AnimTask_ShakeMon, 2, ANIM_BANK_TARGET, 3, 0, 6, 1 @@ -7247,7 +7247,7 @@ Move_POISON_TAIL: @ 81D1914 waitforvisualfinish monbg ANIM_BANK_TARGET setalpha 12, 8 - createsprite gBattleAnimSpriteTemplate_83C1FB0, 2, 4, 4 + createsprite gHorizontalLungeSpriteTemplate, 2, 4, 4 delay 6 createsprite gBasicHitSplatSpriteTemplate, 130, 0, 0, 1, 2 createvisualtask AnimTask_ShakeMon, 2, ANIM_BANK_TARGET, 3, 0, 6, 1 @@ -7265,14 +7265,14 @@ Move_METAL_CLAW: @ 81D197A loopsewithpan SE_W231, 192, 28, 2 createvisualtask sub_80E0A4C, 5, 0, 0, 0 waitforvisualfinish - createsprite gBattleAnimSpriteTemplate_83C1FB0, 2, 6, 4 + createsprite gHorizontalLungeSpriteTemplate, 2, 6, 4 delay 2 playsewithpan SE_W013, 63 createsprite gBattleAnimSpriteTemplate_83DB288, 130, -10, -10, 0 createsprite gBattleAnimSpriteTemplate_83DB288, 130, -10, 10, 0 createsprite gBattleAnimSpriteTemplate_83DB428, 2, -4, 1, 10, 3, 1 delay 8 - createsprite gBattleAnimSpriteTemplate_83C1FB0, 2, 6, 4 + createsprite gHorizontalLungeSpriteTemplate, 2, 6, 4 delay 2 playsewithpan SE_W013, 63 createsprite gBattleAnimSpriteTemplate_83DB288, 130, 10, -10, 1 @@ -7291,7 +7291,7 @@ Move_NIGHT_SHADE: @ 81D1A0D playsewithpan SE_W043, 192 createvisualtask sub_80DDDF0, 5, 85 delay 70 - createvisualtask sub_80A7FA0, 2, 1, 2, 0, 12, 1 + createvisualtask AnimTask_ShakeMon2, 2, ANIM_BANK_TARGET, 2, 0, 12, 1 createvisualtask sub_80E1F8C, 2, 4, 0, 2, 0, 13, 0 waitforvisualfinish clearmonbg ANIM_BANK_ATTACKER @@ -7306,7 +7306,7 @@ Move_EGG_BOMB: @ 81D1A55 playsewithpan SE_W039, 192 createsprite gBattleAnimSpriteTemplate_83D7594, 130, 10, 0, 0, 0, 25, -32 waitforvisualfinish - createvisualtask sub_80A7FA0, 2, 1, 4, 0, 16, 1 + createvisualtask AnimTask_ShakeMon2, 2, ANIM_BANK_TARGET, 4, 0, 16, 1 createsprite gBattleAnimSpriteTemplate_83D7828, 132, 6, 5, 1, 0 playsewithpan SE_W120, 63 delay 3 @@ -7334,7 +7334,7 @@ Move_SHADOW_BALL: @ 81D1AEF createsprite gBattleAnimSpriteTemplate_83DAEA8, 130, 16, 16, 8 waitforvisualfinish playsewithpan SE_W028, 63 - createvisualtask sub_80A7FA0, 2, 1, 4, 0, 8, 1 + createvisualtask AnimTask_ShakeMon2, 2, ANIM_BANK_TARGET, 4, 0, 8, 1 waitforvisualfinish restorebg waitbgfadein @@ -7345,7 +7345,7 @@ Move_LICK: @ 81D1B32 delay 15 playsewithpan SE_W122, 63 createsprite gBattleAnimSpriteTemplate_83DAEDC, 130, 0, 0 - createvisualtask sub_80A7FA0, 2, 1, 1, 0, 16, 1 + createvisualtask AnimTask_ShakeMon2, 2, ANIM_BANK_TARGET, 1, 0, 16, 1 waitforvisualfinish end @@ -7355,7 +7355,7 @@ Move_FOCUS_ENERGY: @ 81D1B59 call EndureFlamesAnim delay 8 createvisualtask sub_80E1F8C, 2, 2, 2, 2, 0, 11, 32767 - createvisualtask sub_80A7FA0, 2, 0, 1, 0, 32, 1 + createvisualtask AnimTask_ShakeMon2, 2, ANIM_BANK_ATTACKER, 1, 0, 32, 1 call EndureFlamesAnim delay 8 call EndureFlamesAnim @@ -7368,7 +7368,7 @@ Move_BIDE: @ 81D1B99 _81D1BA3: loopsewithpan SE_W036, 192, 9, 2 createvisualtask sub_80E1F8C, 2, 2, 2, 2, 0, 11, 31 - createvisualtask sub_80A7FA0, 2, 0, 1, 0, 32, 1 + createvisualtask AnimTask_ShakeMon2, 2, ANIM_BANK_ATTACKER, 1, 0, 32, 1 waitforvisualfinish end _81D1BCF: @@ -7377,12 +7377,12 @@ _81D1BCF: setalpha 12, 8 loopsewithpan SE_W036, 192, 9, 2 createvisualtask sub_80E2A38, 10, 2, 2, 0, 11, 31 - createvisualtask sub_80A7FA0, 2, 0, 1, 0, 32, 1 + createvisualtask AnimTask_ShakeMon2, 2, ANIM_BANK_ATTACKER, 1, 0, 32, 1 waitforvisualfinish - createsprite gBattleAnimSpriteTemplate_83C1FF8, 2, 0, 24, 0, 0, 4 + createsprite gSlideMonToOffsetSpriteTemplate, 2, 0, 24, 0, 0, 4 waitforvisualfinish - createvisualtask sub_80A8154, 2, 0, 2, 0, 12, 1 - createvisualtask sub_80A7FA0, 2, 1, 3, 0, 16, 1 + createvisualtask AnimTask_ShakeMonInPlace, 2, ANIM_BANK_ATTACKER, 2, 0, 12, 1 + createvisualtask AnimTask_ShakeMon2, 2, ANIM_BANK_TARGET, 3, 0, 16, 1 playsewithpan SE_W004, 63 createsprite gBasicHitSplatSpriteTemplate, 1, 18, -8, 1, 1 delay 5 @@ -7393,7 +7393,7 @@ _81D1BCF: createsprite gBasicHitSplatSpriteTemplate, 1, -8, -5, 1, 1 waitforvisualfinish delay 5 - createsprite gBattleAnimSpriteTemplate_83C1FE0, 2, 0, 0, 7 + createsprite gSlideMonToOriginalPosSpriteTemplate, 2, 0, 0, 7 waitforvisualfinish createvisualtask sub_80E2A38, 10, 2, 2, 11, 0, 31 waitforvisualfinish @@ -7510,8 +7510,8 @@ _81D1E66: createsprite gBattleAnimSpriteTemplate_83DA3E4, 2, 14, 12, -16, -14, 22, 0, 1 delay 17 playsewithpan SE_W013, 63 - createvisualtask sub_80A7FA0, 2, 1, 2, 0, 10, 1 - createvisualtask sub_80A7FA0, 2, 3, 2, 0, 10, 1 + createvisualtask AnimTask_ShakeMon2, 2, ANIM_BANK_TARGET, 2, 0, 10, 1 + createvisualtask AnimTask_ShakeMon2, 2, ANIM_BANK_DEF_PARTNER, 2, 0, 10, 1 waitforvisualfinish clearmonbg ANIM_BANK_TARGET blendoff @@ -7595,7 +7595,7 @@ Move_CONSTRICT: @ 81D2013 delay 7 createsprite gBattleAnimSpriteTemplate_83D65A0, 131, 0, -8, 1, 2 delay 8 - createvisualtask sub_80A7FA0, 2, 1, 3, 0, 6, 1 + createvisualtask AnimTask_ShakeMon2, 2, ANIM_BANK_TARGET, 3, 0, 6, 1 delay 20 playsewithpan SE_W020, 63 setarg 7, -1 @@ -7624,18 +7624,18 @@ _81D2084: monbg ANIM_BANK_DEF_PARTNER playsewithpan SE_W171, 63 createsprite gBattleAnimSpriteTemplate_83DAF38, 130 - createvisualtask sub_80A7FA0, 2, 1, 2, 0, 14, 1 + createvisualtask AnimTask_ShakeMon2, 2, ANIM_BANK_TARGET, 2, 0, 14, 1 waitforvisualfinish createsprite gBattleAnimSpriteTemplate_83DB3C4, 2, 1, 1, 16, 0, 0 waitforvisualfinish clearmonbg ANIM_BANK_DEF_PARTNER end _81D20EB: - createvisualtask sub_80A7FA0, 2, 0, 4, 0, 10, 0 + createvisualtask AnimTask_ShakeMon2, 2, ANIM_BANK_ATTACKER, 4, 0, 10, 0 playsewithpan SE_W020, 192 return _81D2101: - createvisualtask sub_80A8B88, 5, 0, 10, 1536, 3, 0 + createvisualtask AnimTask_SwayMon, 5, 0, 10, 1536, 3, 0 waitforvisualfinish delay 10 call _81D211C @@ -7722,7 +7722,7 @@ Move_FAKE_OUT: @ 81D23A8 createvisualtask sub_80D1CD0, 5 waitforvisualfinish playsewithpan SE_W166, 63 - createvisualtask sub_80A7FA0, 2, 1, 4, 0, 5, 1 + createvisualtask AnimTask_ShakeMon2, 2, ANIM_BANK_TARGET, 4, 0, 5, 1 createvisualtask sub_80D1E38, 3 waitforvisualfinish createsprite gBattleAnimSpriteTemplate_83DB3C4, 2, 1, 3, 16, 0, 32767 @@ -7780,17 +7780,17 @@ Move_LOVELY_KISS: @ 81D24AF Move_FURY_SWIPES: @ 81D24F6 loadspritegfx 10222 - createsprite gBattleAnimSpriteTemplate_83C1FB0, 2, 5, 5 + createsprite gHorizontalLungeSpriteTemplate, 2, 5, 5 delay 4 playsewithpan SE_W010, 63 createsprite gBattleAnimSpriteTemplate_83D7C48, 130, 16, 0, 1 - createvisualtask sub_80A7FA0, 2, 1, 3, 0, 5, 1 + createvisualtask AnimTask_ShakeMon2, 2, ANIM_BANK_TARGET, 3, 0, 5, 1 delay 10 - createsprite gBattleAnimSpriteTemplate_83C1FB0, 130, 5, 5 + createsprite gHorizontalLungeSpriteTemplate, 130, 5, 5 delay 4 playsewithpan SE_W010, 63 createsprite gBattleAnimSpriteTemplate_83D7C48, 130, -16, 0, 0 - createvisualtask sub_80A7FA0, 2, 1, 4, 0, 7, 1 + createvisualtask AnimTask_ShakeMon2, 2, ANIM_BANK_TARGET, 4, 0, 7, 1 end Move_INGRAIN: @ 81D255A @@ -7926,7 +7926,7 @@ Move_PERISH_SONG: @ 81D2784 Move_SLEEP_TALK: @ 81D28ED loadspritegfx 10228 - createvisualtask sub_80A8B88, 5, 0, 4, 4096, 2, 0 + createvisualtask AnimTask_SwayMon, 5, 0, 4, 4096, 2, 0 delay 20 createsprite gBattleAnimSpriteTemplate_84022F0, 130, 0, 20, 5, -1 playsewithpan SE_W173, 192 @@ -8035,7 +8035,7 @@ Move_WILL_O_WISP: @ 81D2B83 loadspritegfx 10232 loadspritegfx 10231 monbg ANIM_BANK_DEF_PARTNER - monbgprio_2A 1 + monbgprio_2A ANIM_BANK_TARGET playsewithpan SE_W052, 192 waitplaysewithpan SE_W052, 192, 10 createvisualtask sub_812B374, 2, -64, -64, 1, 0 @@ -8051,7 +8051,7 @@ Move_WILL_O_WISP: @ 81D2B83 waitforvisualfinish monbgprio_29 playsewithpan SE_W172B, 63 - createvisualtask sub_80A7FA0, 2, 1, 4, 0, 13, 1 + createvisualtask AnimTask_ShakeMon2, 2, ANIM_BANK_TARGET, 4, 0, 13, 1 createsprite gBattleAnimSpriteTemplate_83D977C, 2, 0 createsprite gBattleAnimSpriteTemplate_83D977C, 2, 42 createsprite gBattleAnimSpriteTemplate_83D977C, 2, 84 @@ -8075,7 +8075,7 @@ Move_ENCORE: @ 81D2C41 createsprite gBattleAnimSpriteTemplate_84023BC, 3, 2, 0, 1, 0, 9 delay 16 createvisualtask sub_812B340, 5, 223, 63 - createvisualtask sub_80A8B88, 5, 1, 8, 1536, 5, 1 + createvisualtask AnimTask_SwayMon, 5, 1, 8, 1536, 5, 1 waitforvisualfinish createvisualtask sub_80E2D78, 2, 248, 3, 10, 0, 1 waitforvisualfinish @@ -8160,7 +8160,7 @@ Move_SPIT_UP: @ 81D2E65 loadspritegfx 10135 playsewithpan SE_W036, 192 createvisualtask sub_812D6CC, 5 - createvisualtask sub_80A7FA0, 2, 0, 1, 0, 8, 2 + createvisualtask AnimTask_ShakeMon2, 2, ANIM_BANK_ATTACKER, 1, 0, 8, 2 delay 45 playsewithpan SE_W255, 192 delay 3 @@ -8207,10 +8207,10 @@ Move_SWALLOW: @ 81D2FA8 loadspritegfx 10031 playsewithpan SE_W036, 192 createvisualtask sub_812D790, 5 - createvisualtask sub_80A7FA0, 2, 0, 1, 0, 8, 2 + createvisualtask AnimTask_ShakeMon2, 2, ANIM_BANK_ATTACKER, 1, 0, 8, 2 delay 38 playsewithpan SE_W255, 192 - createvisualtask sub_80A7FA0, 2, 0, 2, 0, 12, 1 + createvisualtask AnimTask_ShakeMon2, 2, ANIM_BANK_ATTACKER, 2, 0, 12, 1 call _81D2FF9 jumpifmoveturn 2, _81D303B jumpifmoveturn 3, _81D3045 @@ -8323,7 +8323,7 @@ Move_HYPER_BEAM: @ 81D31EA waitforvisualfinish delay 10 playsewithpan SE_W063, 192 - createvisualtask sub_80A7FA0, 2, 0, 1, 0, 4, 1 + createvisualtask AnimTask_ShakeMon2, 2, ANIM_BANK_ATTACKER, 1, 0, 4, 1 waitforvisualfinish delay 30 createsoundtask sub_812B058, 247, -64, 63, 1, 15, 0, 5 @@ -8334,7 +8334,7 @@ Move_HYPER_BEAM: @ 81D31EA call _81D331B call _81D331B call _81D331B - createvisualtask sub_80A7FA0, 2, 1, 4, 0, 50, 1 + createvisualtask AnimTask_ShakeMon2, 2, ANIM_BANK_TARGET, 4, 0, 50, 1 createvisualtask sub_80E2A38, 10, 4, 2, 0, 11, 26425 call _81D331B call _81D331B @@ -8376,9 +8376,9 @@ Move_FLATTER: @ 81D332C waitforvisualfinish createsprite gBattleAnimSpriteTemplate_8402720, 130, 0, -8, 80 delay 0 - createsprite gBattleAnimSpriteTemplate_83C1FC8, 2, 5, 2, 1 + createsprite gVerticalDipSpriteTemplate, 2, 5, 2, ANIM_BANK_TARGET delay 10 - createsprite gBattleAnimSpriteTemplate_83C1FC8, 2, 5, 2, 1 + createsprite gVerticalDipSpriteTemplate, 2, 5, 2, ANIM_BANK_TARGET delay 0 createvisualtask sub_812B30C, 5, 229, -64 call _81D3415 @@ -8453,7 +8453,7 @@ Move_BLAZE_KICK: @ 81D34C8 delay 30 playsewithpan SE_W007, 63 createsprite gBasicHitSplatSpriteTemplate, 130, 0, 0, 1, 0 - createvisualtask sub_80A7FA0, 2, 1, 3, 0, 14, 1 + createvisualtask AnimTask_ShakeMon2, 2, ANIM_BANK_TARGET, 3, 0, 14, 1 createvisualtask sub_80E2A38, 10, 4, 2, 0, 0, 32767 createsprite gBattleAnimSpriteTemplate_83DB3DC, 2, 31, 3, 1, 0, 8, 0, 0 call _81D11A2 @@ -8475,8 +8475,8 @@ _81D3562: createsprite gBattleAnimSpriteTemplate_83DB3C4, 2, 31, 3, 8, 0, 1023 createvisualtask sub_80A8D34, 5, -5, -5, 5, 0, 0 createsprite gBattleAnimSpriteTemplate_83D798C, 0, 45, 0, 0, 0, 0, 0, 1 - createvisualtask sub_80A7FA0, 2, 1, 1, 0, 6, 1 - createvisualtask sub_80A7FA0, 2, 3, 1, 0, 6, 1 + createvisualtask AnimTask_ShakeMon2, 2, ANIM_BANK_TARGET, 1, 0, 6, 1 + createvisualtask AnimTask_ShakeMon2, 2, ANIM_BANK_DEF_PARTNER, 1, 0, 6, 1 createvisualtask sub_80E26BC, 2, 1, 0, 6, 1 return @@ -8532,7 +8532,7 @@ Move_ARM_THRUST: @ 81D36CF setalpha 12, 8 createvisualtask sub_80A8E04, 5, 8, 5, 0, 0 delay 6 - createsprite gBattleAnimSpriteTemplate_83C1FB0, 2, 4, 3 + createsprite gHorizontalLungeSpriteTemplate, 2, 4, 3 delay 4 playsewithpan SE_W207, 63 createsprite gBattleAnimSpriteTemplate_83DA144, 130, 10, -8, 14, 3 @@ -8566,7 +8566,7 @@ Move_BULLET_SEED: @ 81D3776 delay 5 createsprite gBattleAnimSpriteTemplate_83D7628, 130, 20, 0 delay 5 - createvisualtask sub_80A7FA0, 2, 1, 2, 0, 30, 1 + createvisualtask AnimTask_ShakeMon2, 2, ANIM_BANK_TARGET, 2, 0, 30, 1 createsprite gBattleAnimSpriteTemplate_83D7628, 130, 20, 0 delay 5 createsprite gBattleAnimSpriteTemplate_83D7628, 130, 20, 0 @@ -8591,7 +8591,7 @@ Move_DRAGON_CLAW: @ 81D380C createvisualtask AnimTask_ShakeMon, 5, 0, 0, 2, 15, 1 call _81D39E9 call _81D39E9 - createsprite gBattleAnimSpriteTemplate_83C1FB0, 2, 6, 4 + createsprite gHorizontalLungeSpriteTemplate, 2, 6, 4 createsprite gBattleAnimSpriteTemplate_83DACD0, 2, 0, 28, 528, 30, 13, 50, 0 delay 2 createvisualtask sub_812B30C, 5, 136, 63 @@ -8604,7 +8604,7 @@ Move_DRAGON_CLAW: @ 81D380C delay 2 createsprite gBattleAnimSpriteTemplate_83DACD0, 2, 0, 31, 400, 25, 11, -42, 0 delay 2 - createsprite gBattleAnimSpriteTemplate_83C1FB0, 2, 6, 4 + createsprite gHorizontalLungeSpriteTemplate, 2, 6, 4 createsprite gBattleAnimSpriteTemplate_83DACD0, 2, 0, 28, 512, 25, 16, 46, 0 delay 2 createvisualtask sub_812B30C, 5, 136, 63 @@ -8694,7 +8694,7 @@ Move_METEOR_MASH: @ 81D3B12 delay 20 playsewithpan SE_W233B, 63 createsprite gBasicHitSplatSpriteTemplate, 131, 0, 0, 1, 1 - createvisualtask sub_80A7FA0, 2, 1, 5, 0, 20, 1 + createvisualtask AnimTask_ShakeMon2, 2, ANIM_BANK_TARGET, 5, 0, 20, 1 waitforvisualfinish delay 10 restorebg @@ -8713,14 +8713,14 @@ Move_REVENGE: @ 81D3B99 waitforvisualfinish unloadspritegfx 10245 loadspritegfx 10246 - createsprite gBattleAnimSpriteTemplate_83C1FB0, 2, 6, 4 + createsprite gHorizontalLungeSpriteTemplate, 2, 6, 4 delay 4 playsewithpan SE_W207, 63 createsprite gBattleAnimSpriteTemplate_83DA1E0, 130, 10, -10 waitforvisualfinish unloadspritegfx 10246 loadspritegfx 10135 - createvisualtask sub_80A7FA0, 2, 1, 3, 0, 10, 1 + createvisualtask AnimTask_ShakeMon2, 2, ANIM_BANK_TARGET, 3, 0, 10, 1 createsprite gBattleAnimSpriteTemplate_83DB550, 131, -10, -8, 1, 1, 8 playsewithpan SE_W233B, 63 delay 8 @@ -8812,8 +8812,8 @@ Move_FRENZY_PLANT: @ 81D3C7B Move_METAL_SOUND: @ 81D3E1F loadspritegfx 10260 monbg ANIM_BANK_DEF_PARTNER - monbgprio_2A 1 - createvisualtask sub_80A7FA0, 2, 0, 2, 0, 8, 1 + monbgprio_2A ANIM_BANK_TARGET + createvisualtask AnimTask_ShakeMon2, 2, ANIM_BANK_ATTACKER, 2, 0, 8, 1 call _81D3E52 call _81D3E52 call _81D3E52 @@ -8893,39 +8893,39 @@ _81D3F67: blendoff end _81D3F6C: - createsprite gBattleAnimSpriteTemplate_83C1FC8, 2, 16, 1, 0 + createsprite gVerticalDipSpriteTemplate, 2, 16, 1, ANIM_BANK_ATTACKER createvisualtask sub_812B340, 5, 167, -64 waitforvisualfinish - createsprite gBattleAnimSpriteTemplate_83C1FC8, 2, 16, 1, 0 + createsprite gVerticalDipSpriteTemplate, 2, 16, 1, ANIM_BANK_ATTACKER createvisualtask sub_812B340, 5, 167, -64 delay 5 createsprite gBasicHitSplatSpriteTemplate, 2, -10, -8, 1, 2 createvisualtask sub_812B30C, 5, 139, 63 goto _81D3F67 _81D3FBE: - createsprite gBattleAnimSpriteTemplate_83C1FC8, 2, 6, 1, 0 + createsprite gVerticalDipSpriteTemplate, 2, 6, 1, ANIM_BANK_ATTACKER createvisualtask sub_812B340, 5, 167, -64 waitforvisualfinish - createsprite gBattleAnimSpriteTemplate_83C1FC8, 2, 6, 1, 0 + createsprite gVerticalDipSpriteTemplate, 2, 6, 1, ANIM_BANK_ATTACKER createvisualtask sub_812B340, 5, 167, -64 waitforvisualfinish delay 11 - createsprite gBattleAnimSpriteTemplate_83C1FB0, 2, 5, 4 + createsprite gHorizontalLungeSpriteTemplate, 2, 5, 4 delay 6 createsprite gBasicHitSplatSpriteTemplate, 3, 0, 0, 1, 2 createvisualtask sub_812B30C, 5, 141, 63 goto _81D3F67 _81D401E: - createsprite gBattleAnimSpriteTemplate_83C1FC8, 2, 6, 1, 0 + createsprite gVerticalDipSpriteTemplate, 2, 6, 1, ANIM_BANK_ATTACKER createvisualtask sub_812B340, 5, 167, -64 waitforvisualfinish - createsprite gBattleAnimSpriteTemplate_83C1FC8, 2, 6, 1, 0 + createsprite gVerticalDipSpriteTemplate, 2, 6, 1, ANIM_BANK_ATTACKER createvisualtask sub_812B340, 5, 167, -64 waitforvisualfinish - createsprite gBattleAnimSpriteTemplate_83C1FC8, 2, 6, 1, 0 + createsprite gVerticalDipSpriteTemplate, 2, 6, 1, ANIM_BANK_ATTACKER createvisualtask sub_812B340, 5, 167, -64 waitforvisualfinish - createsprite gBattleAnimSpriteTemplate_83C1FC8, 2, 6, 1, 0 + createsprite gVerticalDipSpriteTemplate, 2, 6, 1, ANIM_BANK_ATTACKER createvisualtask sub_812B340, 5, 167, -64 waitforvisualfinish createsprite gBasicHitSplatSpriteTemplate, 2, -10, -8, 1, 2 @@ -8947,13 +8947,13 @@ _81D401E: _81D4139: createsprite gBattleAnimSpriteTemplate_83DB3C4, 2, 1, 0, 0, 6, 0 waitforvisualfinish - createsprite gBattleAnimSpriteTemplate_83C1FC8, 2, 16, 1, 0 + createsprite gVerticalDipSpriteTemplate, 2, 16, 1, ANIM_BANK_ATTACKER createvisualtask sub_812B340, 5, 167, -64 delay 8 createsprite gBasicHitSplatSpriteTemplate, 2, 3, -5, 1, 2 createvisualtask sub_812B30C, 5, 123, 63 waitforvisualfinish - createsprite gBattleAnimSpriteTemplate_83C1FC8, 2, 12, 1, 0 + createsprite gVerticalDipSpriteTemplate, 2, 12, 1, ANIM_BANK_ATTACKER createvisualtask sub_812B340, 5, 167, -64 delay 5 createsprite gBasicHitSplatSpriteTemplate, 2, -10, -8, 1, 2 @@ -8961,7 +8961,7 @@ _81D4139: createvisualtask AnimTask_ShakeMon, 5, 1, 6, 0, 8, 1 waitforvisualfinish delay 4 - createsprite gBattleAnimSpriteTemplate_83C1FC8, 2, 8, 1, 0 + createsprite gVerticalDipSpriteTemplate, 2, 8, 1, ANIM_BANK_ATTACKER createvisualtask sub_812B340, 5, 167, -64 delay 5 createsprite gBasicHitSplatSpriteTemplate, 2, -10, -8, 1, 2 @@ -8970,14 +8970,14 @@ _81D4139: waitforvisualfinish delay 2 createvisualtask sub_80E2DD8, 2, 0, 4, 5, 1 - createsprite gBattleAnimSpriteTemplate_83C1FC8, 2, 4, 1, 0 + createsprite gVerticalDipSpriteTemplate, 2, 4, 1, ANIM_BANK_ATTACKER createvisualtask sub_812B340, 5, 167, -64 createsprite gBasicHitSplatSpriteTemplate, 2, -10, -8, 1, 2 createvisualtask sub_812B30C, 5, 123, 63 createvisualtask AnimTask_ShakeMon, 5, 1, 6, 0, 8, 1 createvisualtask sub_80E2DD8, 2, 0, 4, 5, 1 waitforvisualfinish - createsprite gBattleAnimSpriteTemplate_83C1FC8, 2, 4, 2, 0 + createsprite gVerticalDipSpriteTemplate, 2, 4, 2, ANIM_BANK_ATTACKER createvisualtask sub_812B340, 5, 167, -64 delay 5 createsprite gBasicHitSplatSpriteTemplate, 2, -10, -8, 1, 2 @@ -9005,7 +9005,7 @@ _81D4139: createsprite gBattleAnimSpriteTemplate_83DB3C4, 2, 1, 0, 6, 0, 0 goto _81D3F67 _81D4371: - createsprite gBattleAnimSpriteTemplate_83C1FC8, 2, 4, 3, 0 + createsprite gVerticalDipSpriteTemplate, 2, 4, 3, ANIM_BANK_ATTACKER createvisualtask sub_812B340, 5, 167, -64 createsprite gBasicHitSplatSpriteTemplate, 2, 0, 0, 1, 2 createvisualtask sub_812B30C, 5, 123, 63 @@ -9226,7 +9226,7 @@ _81D4A48: Move_ROCK_BLAST: @ 81D4A5F loadspritegfx 10058 loadspritegfx 10135 - createsprite gBattleAnimSpriteTemplate_83C1FB0, 2, 4, 6 + createsprite gHorizontalLungeSpriteTemplate, 2, 4, 6 delay 3 playsewithpan SE_W207, 192 createsprite gBattleAnimSpriteTemplate_83DADE8, 130, 16, 0, 0, 0, 25, 257 @@ -9363,12 +9363,12 @@ _81D4EA8: Move_ASTONISH: @ 81D4F10 loadspritegfx 10273 playsewithpan SE_W227, 192 - createsprite gBattleAnimSpriteTemplate_83C1FB0, 2, 4, 6 + createsprite gHorizontalLungeSpriteTemplate, 2, 4, 6 delay 25 createsprite gBattleAnimSpriteTemplate_83DA62C, 133, 0, 1 playsewithpan SE_W166, 63 createsprite gBattleAnimSpriteTemplate_83DA62C, 133, 1, 1 - createvisualtask sub_80A7FA0, 2, 1, 4, 0, 5, 1 + createvisualtask AnimTask_ShakeMon2, 2, ANIM_BANK_TARGET, 4, 0, 5, 1 createvisualtask sub_80D1E38, 3 waitforvisualfinish end @@ -9500,7 +9500,7 @@ Move_PSYCHO_BOOST: @ 81D51C7 delay 110 loopsewithpan SE_W060B, 192, 7, 10 waitforvisualfinish - createvisualtask sub_80A7FA0, 2, 1, -8, 1, 24, 1 + createvisualtask AnimTask_ShakeMon2, 2, ANIM_BANK_TARGET, -8, 1, 24, 1 playsewithpan SE_W043, 63 waitforvisualfinish clearmonbg ANIM_BANK_ATK_PARTNER @@ -9511,7 +9511,7 @@ Move_PSYCHO_BOOST: @ 81D51C7 Move_KNOCK_OFF: @ 81D523B loadspritegfx 10277 loadspritegfx 10135 - createsprite gBattleAnimSpriteTemplate_83C1FB0, 2, 4, 6 + createsprite gHorizontalLungeSpriteTemplate, 2, 4, 6 delay 4 playsewithpan SE_W233, 63 createsprite gBattleAnimSpriteTemplate_8402AE4, 130, -16, -16 @@ -9519,12 +9519,12 @@ Move_KNOCK_OFF: @ 81D523B createsprite gBattleAnimSpriteTemplate_83DB3DC, 2, 31, 5, 1, 32767, 10, 0, 0 createsprite gBasicHitSplatSpriteTemplate, 131, 0, 0, 1, 2 playsewithpan SE_W004, 63 - createsprite gBattleAnimSpriteTemplate_83C1FF8, 2, 1, -12, 10, 0, 3 - createsprite gBattleAnimSpriteTemplate_83C1FE0, 2, 0, 0, 5 + createsprite gSlideMonToOffsetSpriteTemplate, 2, 1, -12, 10, 0, 3 + createsprite gSlideMonToOriginalPosSpriteTemplate, 2, 0, 0, 5 delay 3 - createvisualtask sub_80A8154, 2, 1, 0, 3, 6, 1 + createvisualtask AnimTask_ShakeMonInPlace, 2, ANIM_BANK_TARGET, 0, 3, 6, 1 delay 5 - createsprite gBattleAnimSpriteTemplate_83C1FE0, 2, 1, 0, 6 + createsprite gSlideMonToOriginalPosSpriteTemplate, 2, 1, 0, 6 delay 10 waitforvisualfinish end @@ -9561,7 +9561,7 @@ Unknown_81D532F: @ 81D532F delay 10 playsewithpan SE_W109, 63 delay 23 - createvisualtask sub_80A8154, 2, 1, 10, 0, 20, 1 + createvisualtask AnimTask_ShakeMonInPlace, 2, ANIM_BANK_TARGET, 10, 0, 20, 1 playsewithpan SE_W120, 63 createsprite gBattleAnimSpriteTemplate_83D7828, 3, 0, 0, 1, 1 delay 6 @@ -9592,9 +9592,9 @@ Move_SKY_UPPERCUT: @ 81D53ED waitbgfadein setalpha 12, 8 delay 38 - createsprite gBattleAnimSpriteTemplate_83C1FF8, 2, 0, 28, 0, 0, 5 + createsprite gSlideMonToOffsetSpriteTemplate, 2, 0, 28, 0, 0, 5 delay 4 - createvisualtask sub_80A7FA0, 2, 1, 4, 0, 6, 1 + createvisualtask AnimTask_ShakeMon2, 2, ANIM_BANK_TARGET, 4, 0, 6, 1 playsewithpan SE_W233B, 63 createsprite gBasicHitSplatSpriteTemplate, 131, -28, 28, 1, 1 delay 1 @@ -9610,13 +9610,13 @@ Move_SKY_UPPERCUT: @ 81D53ED delay 1 playsewithpan SE_W233B, 63 createsprite gBasicHitSplatSpriteTemplate, 131, 5, -52, 1, 1 - createsprite gBattleAnimSpriteTemplate_83C1FF8, 2, 1, -26, 16, 1, 4 + createsprite gSlideMonToOffsetSpriteTemplate, 2, 1, -26, 16, 1, 4 delay 4 - createvisualtask sub_80A8154, 2, 1, 0, 3, 6, 1 + createvisualtask AnimTask_ShakeMonInPlace, 2, ANIM_BANK_TARGET, 0, 3, 6, 1 delay 30 - createsprite gBattleAnimSpriteTemplate_83C1FE0, 2, 0, 0, 6 + createsprite gSlideMonToOriginalPosSpriteTemplate, 2, 0, 0, 6 delay 4 - createsprite gBattleAnimSpriteTemplate_83C1FE0, 2, 1, 0, 6 + createsprite gSlideMonToOriginalPosSpriteTemplate, 2, 1, 0, 6 clearmonbg ANIM_BANK_DEF_PARTNER blendoff restorebg @@ -9668,8 +9668,8 @@ Move_TWISTER: @ 81D553A waitforvisualfinish createsprite gBasicHitSplatSpriteTemplate, 131, -32, -16, 1, 3 playsewithpan SE_W004, 63 - createvisualtask sub_80A8154, 2, 1, 3, 0, 12, 1 - createvisualtask sub_80A8154, 2, 3, 3, 0, 12, 1 + createvisualtask AnimTask_ShakeMonInPlace, 2, ANIM_BANK_TARGET, 3, 0, 12, 1 + createvisualtask AnimTask_ShakeMonInPlace, 2, ANIM_BANK_DEF_PARTNER, 3, 0, 12, 1 delay 4 createsprite gBattleAnimSpriteTemplate_83DB4F0, 131, 1, 3 playsewithpan SE_W004, 63 @@ -9720,7 +9720,7 @@ Move_MAGICAL_LEAF: @ 81D5699 playsewithpan SE_W013, 63 createsprite gBasicHitSplatSpriteTemplate, 132, -10, -4, 1, 2 createsprite gBasicHitSplatSpriteTemplate, 132, 10, 4, 1, 2 - createvisualtask sub_80A7FA0, 2, 1, 2, 0, 8, 1 + createvisualtask AnimTask_ShakeMon2, 2, ANIM_BANK_TARGET, 2, 0, 8, 1 delay 20 setarg 7, -1 waitforvisualfinish @@ -9820,7 +9820,7 @@ _81D597D: Move_WEATHER_BALL: @ 81D5989 loadspritegfx 10283 - createsprite gBattleAnimSpriteTemplate_83C1FC8, 2, 8, 1, 0 + createsprite gVerticalDipSpriteTemplate, 2, 8, 1, ANIM_BANK_ATTACKER delay 8 playsewithpan SE_W207, 192 createsprite gBattleAnimSpriteTemplate_83930A8, 2 @@ -9891,7 +9891,7 @@ _81D5AF9: createsprite gBattleAnimSpriteTemplate_83DAE00, 130, 8, 28, 3, 4 createsprite gBattleAnimSpriteTemplate_83DAE00, 130, -4, 30, 2, 3 createsprite gBattleAnimSpriteTemplate_83DAE00, 130, 12, 25, 4, 4 - createvisualtask sub_80A7FA0, 2, 1, 2, 0, 8, 1 + createvisualtask AnimTask_ShakeMon2, 2, ANIM_BANK_TARGET, 2, 0, 8, 1 waitforvisualfinish end _81D5B99: @@ -9906,7 +9906,7 @@ _81D5B99: createsprite gBattleAnimSpriteTemplate_83D9E54, 130, -30, -100, 25, 25, 0, 0 playsewithpan SE_W258, 63 waitforvisualfinish - createvisualtask sub_80A7FA0, 2, 1, 2, 0, 8, 1 + createvisualtask AnimTask_ShakeMon2, 2, ANIM_BANK_TARGET, 2, 0, 8, 1 playsewithpan SE_W196, 63 call Unknown_81D5C36 waitforvisualfinish @@ -10212,7 +10212,7 @@ Unknown_81D626D: @ 81D626D StatusCondition_Poison: @ 81D6270 loopsewithpan SE_W092, 63, 13, 6 - createvisualtask sub_80A7FA0, 2, 0, 1, 0, 18, 2 + createvisualtask AnimTask_ShakeMon2, 2, ANIM_BANK_ATTACKER, 1, 0, 18, 2 createvisualtask sub_80E1F8C, 2, 2, 2, 2, 0, 12, 31774 end @@ -10256,7 +10256,7 @@ StatusCondition_Sleep: @ 81D6309 StatusCondition_Paralysis: @ 81D6335 loadspritegfx 10011 - createvisualtask sub_80A7FA0, 2, 0, 1, 0, 10, 1 + createvisualtask AnimTask_ShakeMon2, 2, ANIM_BANK_ATTACKER, 1, 0, 10, 1 call Unknown_81D6100 end @@ -10276,7 +10276,7 @@ StatusCondition_Curse: @ 81D636A monbg ANIM_BANK_DEF_PARTNER playsewithpan SE_W171, 63 createsprite gBattleAnimSpriteTemplate_83DAF38, 130 - createvisualtask sub_80A7FA0, 2, 1, 2, 0, 14, 1 + createvisualtask AnimTask_ShakeMon2, 2, ANIM_BANK_TARGET, 2, 0, 14, 1 waitforvisualfinish clearmonbg ANIM_BANK_DEF_PARTNER end @@ -10286,7 +10286,7 @@ StatusCondition_Nightmare: @ 81D638F monbg ANIM_BANK_DEF_PARTNER playsewithpan SE_W171, 63 createsprite gBattleAnimSpriteTemplate_83DAF50, 130 - createvisualtask sub_80A7FA0, 2, 1, 2, 0, 14, 1 + createvisualtask AnimTask_ShakeMon2, 2, ANIM_BANK_TARGET, 2, 0, 14, 1 waitforvisualfinish clearmonbg ANIM_BANK_DEF_PARTNER end @@ -10337,7 +10337,7 @@ General_PokeblockThrow: @ 81D6438 createsprite gBattleAnimSpriteTemplate_840B4FC, 131, -16, 7, 0, 32 delay 50 loopsewithpan SE_W039, 63, 19, 2 - createvisualtask sub_80A8B88, 5, 1, 8, 1536, 2, 1 + createvisualtask AnimTask_SwayMon, 5, 1, 8, 1536, 2, 1 waitforvisualfinish createvisualtask sub_8141C08, 2 end @@ -10361,7 +10361,7 @@ _81D64B5: delay 7 createsprite gBattleAnimSpriteTemplate_83D65A0, 130, 0, 8, 1, 1 delay 3 - createvisualtask sub_80A7FA0, 2, 1, 2, 0, 8, 1 + createvisualtask AnimTask_ShakeMon2, 2, ANIM_BANK_TARGET, 2, 0, 8, 1 delay 20 setarg 7, -1 playsewithpan SE_W020, 63 @@ -10491,7 +10491,7 @@ General_HangedOn: @ 81D676E createsprite gBattleAnimSpriteTemplate_83DB3C4, 0, 2, 4, 9, 0, 31 waitforvisualfinish delay 6 - createsprite gBattleAnimSpriteTemplate_83C1FE0, 0, 0, 0, 15 + createsprite gSlideMonToOriginalPosSpriteTemplate, 0, 0, 0, 15 end General_Rain: @ 81D67BB @@ -10546,7 +10546,7 @@ General_SnatchMove: @ 81D6877 createvisualtask sub_80E4234, 2 call Unknown_81D6AB6 delay 1 - createvisualtask sub_80A8B88, 2, 0, 5, 5120, 4, 1 + createvisualtask AnimTask_SwayMon, 2, 0, 5, 5120, 4, 1 waitforvisualfinish createvisualtask sub_80E4264, 2 jumpargeq 7, 0, _81D68B5 @@ -10598,7 +10598,7 @@ General_DoomDesireHit: @ 81D6934 delay 9 playsewithpan SE_W109, 63 delay 25 - createvisualtask sub_80A8154, 2, 1, 10, 0, 20, 1 + createvisualtask AnimTask_ShakeMonInPlace, 2, ANIM_BANK_TARGET, 10, 0, 20, 1 playsewithpan SE_W120, 63 createsprite gBattleAnimSpriteTemplate_83D7828, 3, 0, 0, 1, 1 delay 6 @@ -10624,7 +10624,7 @@ General_FocusPunchSetUp: @ 81D69F9 call EndureFlamesAnim delay 8 createvisualtask sub_80E1F8C, 2, 2, 2, 2, 0, 11, 31 - createvisualtask sub_80A7FA0, 2, 0, 1, 0, 32, 1 + createvisualtask AnimTask_ShakeMon2, 2, ANIM_BANK_ATTACKER, 1, 0, 32, 1 call EndureFlamesAnim delay 8 call EndureFlamesAnim |