diff options
118 files changed, 3538 insertions, 3068 deletions
diff --git a/asm/battle_anim_812C144.s b/asm/battle_anim_812C144.s index 8a062e352..ded2b5848 100644 --- a/asm/battle_anim_812C144.s +++ b/asm/battle_anim_812C144.s @@ -189,7 +189,7 @@ _08131A44: ldrh r5, [r0] ldr r0, _08131A70 @ =gAnimBankAttacker ldrb r0, [r0] - bl sub_8079E90 + bl GetBattlerSubpriority lsls r0, 24 lsrs r4, r0, 24 movs r7, 0 diff --git a/asm/water.s b/asm/water.s index 20bba76c6..f3d5ada68 100644 --- a/asm/water.s +++ b/asm/water.s @@ -1174,7 +1174,7 @@ sub_80D4418: @ 80D4418 lsrs r6, r0, 24 movs r5, 0xAC ldrb r0, [r4] - bl sub_8079E90 + bl GetBattlerSubpriority subs r0, 0x1 lsls r0, 24 lsrs r0, 24 @@ -2445,7 +2445,7 @@ _080D4DF2: strh r0, [r4, 0x30] ldr r0, _080D4E3C @ =gAnimBankAttacker ldrb r0, [r0] - bl sub_8079E90 + bl GetBattlerSubpriority subs r0, 0x1 adds r1, r4, 0 adds r1, 0x43 @@ -2503,7 +2503,7 @@ _080D4E68: strh r0, [r4, 0x30] ldr r0, _080D4EB4 @ =gAnimBankAttacker ldrb r0, [r0] - bl sub_8079E90 + bl GetBattlerSubpriority subs r0, 0x1 adds r1, r4, 0 adds r1, 0x43 diff --git a/data/battle_anim_scripts.s b/data/battle_anim_scripts.s index 6e3355ff0..0c14c22f5 100644 --- a/data/battle_anim_scripts.s +++ b/data/battle_anim_scripts.s @@ -14,7 +14,7 @@ gSingingMoves:: @ 81C7160 .2byte MOVE_SING .2byte MOVE_PERISH_SONG .2byte MOVE_GRASS_WHISTLE - .2byte -1 + .2byte 0xFFFF .align 2 gBattleAnims_Moves:: @ 81C7168 @@ -424,10 +424,10 @@ gBattleAnims_Special:: @ 81C7778 .4byte Special_MonToSubstitute Move_POUND: @ 81C7794 - loadspritegfx 10135 + loadspritegfx ANIM_TAG_IMPACT monbg ANIM_BANK_TARGET setalpha 12, 8 - playsewithpan SE_W003, 63 + playsewithpan SE_W003, SOUND_PAN_TARGET createsprite gBasicHitSplatSpriteTemplate, 2, 0, 0, 1, 2 createvisualtask AnimTask_ShakeMon, 2, ANIM_BANK_TARGET, 3, 0, 6, 1 waitforvisualfinish @@ -436,13 +436,13 @@ Move_POUND: @ 81C7794 end Move_DOUBLE_SLAP: @ 81C77C5 - loadspritegfx 10135 + loadspritegfx ANIM_TAG_IMPACT monbg ANIM_BANK_TARGET setalpha 12, 8 choosetwoturnanim Move_DOUBLE_SLAP_FirstHit, Move_DOUBLE_SLAP_SecondHit Move_DOUBLE_SLAP_End: createvisualtask AnimTask_ShakeMon, 2, ANIM_BANK_TARGET, 3, 0, 6, 1 - playsewithpan SE_W003, 63 + playsewithpan SE_W003, SOUND_PAN_TARGET waitforvisualfinish clearmonbg ANIM_BANK_TARGET blendoff @@ -455,9 +455,9 @@ Move_DOUBLE_SLAP_SecondHit: goto Move_DOUBLE_SLAP_End Move_POISON_POWDER: @ 81C7818 - loadspritegfx 10065 - loadspritegfx 10150 - loopsewithpan SE_W077, 63, 10, 6 + loadspritegfx ANIM_TAG_POISON_POWDER + loadspritegfx ANIM_TAG_POISON_BUBBLE + loopsewithpan SE_W077, SOUND_PAN_TARGET, 10, 6 createsprite gPoisonPowderParticleSpriteTemplate, 130, -30, -22, 117, 80, 5, 1 createsprite gPoisonPowderParticleSpriteTemplate, 130, 10, -22, 117, 80, -5, 1 createsprite gPoisonPowderParticleSpriteTemplate, 130, -25, -22, 117, 112, 5, 3 @@ -480,8 +480,8 @@ Move_POISON_POWDER: @ 81C7818 end Move_STUN_SPORE: @ 81C7949 - loadspritegfx 10068 - loopsewithpan SE_W077, 63, 10, 6 + loadspritegfx ANIM_TAG_STUN_SPORE + loopsewithpan SE_W077, SOUND_PAN_TARGET, 10, 6 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 @@ -504,8 +504,8 @@ Move_STUN_SPORE: @ 81C7949 end Move_SLEEP_POWDER: @ 81C7A77 - loadspritegfx 10067 - loopsewithpan SE_W077, 63, 10, 6 + loadspritegfx ANIM_TAG_SLEEP_POWDER + loopsewithpan SE_W077, SOUND_PAN_TARGET, 10, 6 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 @@ -528,25 +528,25 @@ Move_SLEEP_POWDER: @ 81C7A77 end Move_SWIFT: @ 81C7BA5 - loadspritegfx 10174 - loadspritegfx 10135 + loadspritegfx ANIM_TAG_YELLOW_STAR + loadspritegfx ANIM_TAG_IMPACT monbg ANIM_BANK_DEF_PARTNER setalpha 12, 8 - playsewithpan SE_W129, 192 + playsewithpan SE_W129, SOUND_PAN_ATTACKER createsprite gSwiftStarSpriteTemplate, 131, 20, -10, 20, 0, 22, 20, 1 delay 5 - playsewithpan SE_W129, 192 + playsewithpan SE_W129, SOUND_PAN_ATTACKER createsprite gSwiftStarSpriteTemplate, 131, 20, -10, 20, 5, 22, -18, 1 delay 5 - playsewithpan SE_W129, 192 + playsewithpan SE_W129, SOUND_PAN_ATTACKER 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 + playsewithpan SE_W129, SOUND_PAN_ATTACKER createsprite gSwiftStarSpriteTemplate, 131, 20, -10, 20, 0, 22, -20, 1 delay 5 - playsewithpan SE_W129, 192 + playsewithpan SE_W129, SOUND_PAN_ATTACKER createsprite gSwiftStarSpriteTemplate, 131, 20, -10, 20, 0, 22, 12, 1 delay 5 waitforvisualfinish @@ -555,23 +555,23 @@ Move_SWIFT: @ 81C7BA5 end Move_STRENGTH: @ 81C7C5E - loadspritegfx 10135 + loadspritegfx ANIM_TAG_IMPACT monbg ANIM_BANK_DEF_PARTNER setalpha 12, 8 - playsewithpan SE_W036, 192 + playsewithpan SE_W036, SOUND_PAN_ATTACKER createvisualtask AnimTask_ShakeAndSinkMon, 5, ANIM_BANK_ATTACKER, 2, 0, 96, 30 waitforvisualfinish delay 10 createsprite gSlideMonToOriginalPosSpriteTemplate, 2, 0, 0, 4 createvisualtask AnimTask_TranslateMonEllipticalRespectSide, 2, ANIM_BANK_TARGET, 18, 6, 2, 4 delay 4 - playsewithpan SE_W025B, 63 + playsewithpan SE_W025B, SOUND_PAN_TARGET createsprite gBasicHitSplatSpriteTemplate, 3, 16, 12, 1, 1 delay 4 - playsewithpan SE_W025B, 63 + playsewithpan SE_W025B, SOUND_PAN_TARGET createsprite gBasicHitSplatSpriteTemplate, 3, -16, -12, 1, 1 delay 4 - playsewithpan SE_W025B, 63 + playsewithpan SE_W025B, SOUND_PAN_TARGET createsprite gBasicHitSplatSpriteTemplate, 3, 3, 4, 1, 1 waitforvisualfinish createvisualtask AnimTask_ShakeMon2, 2, ANIM_BANK_TARGET, 2, 0, 8, 1 @@ -581,31 +581,31 @@ Move_STRENGTH: @ 81C7C5E end Move_TACKLE: @ 81C7CF2 - loadspritegfx 10135 + loadspritegfx ANIM_TAG_IMPACT monbg ANIM_BANK_TARGET setalpha 12, 8 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 - playsewithpan SE_W004, 63 + playsewithpan SE_W004, SOUND_PAN_TARGET waitforvisualfinish clearmonbg ANIM_BANK_TARGET blendoff end Move_BODY_SLAM: @ 81C7D30 - loadspritegfx 10135 + loadspritegfx ANIM_TAG_IMPACT monbg ANIM_BANK_DEF_PARTNER setalpha 12, 8 - playsewithpan SE_W036, 192 + playsewithpan SE_W036, SOUND_PAN_ATTACKER createsprite gVerticalDipSpriteTemplate, 2, 6, 1, ANIM_BANK_ATTACKER waitforvisualfinish delay 11 createsprite gSlideMonToOffsetSpriteTemplate, 2, 0, 26, 0, 0, 5 delay 6 createsprite gBasicHitSplatSpriteTemplate, 4, -10, 0, 1, 0 - loopsewithpan SE_W025B, 63, 10, 2 + loopsewithpan SE_W025B, SOUND_PAN_TARGET, 10, 2 delay 1 createsprite gSlideMonToOffsetSpriteTemplate, 2, 1, -28, 0, 0, 3 waitforvisualfinish @@ -621,7 +621,7 @@ Move_BODY_SLAM: @ 81C7D30 end Move_SUPERSONIC: @ 81C7DBD - loadspritegfx 10163 + loadspritegfx ANIM_TAG_GOLD_RING monbg ANIM_BANK_ATK_PARTNER monbgprio_2A ANIM_BANK_ATTACKER setalpha 12, 8 @@ -637,13 +637,13 @@ Move_SUPERSONIC: @ 81C7DBD blendoff end Move_SUPERSONIC_CreateWaveSprite: - playsewithpan SE_W048, 192 + playsewithpan SE_W048, SOUND_PAN_ATTACKER createsprite gSupersonicWaveSpriteTemplate, 130, 16, 0, 0, 0, 30, 0 delay 2 return Move_SCREECH: @ 81C7E15 - loadspritegfx 10164 + loadspritegfx ANIM_TAG_PURPLE_RING createvisualtask AnimTask_ShakeMon2, 2, ANIM_BANK_ATTACKER, 3, 0, 2, 1 call Move_SCREECH_CreateWaveSprite call Move_SCREECH_CreateWaveSprite @@ -652,41 +652,41 @@ Move_SCREECH: @ 81C7E15 waitforvisualfinish end Move_SCREECH_CreateWaveSprite: - playsewithpan SE_W103, 192 + playsewithpan SE_W103, SOUND_PAN_ATTACKER createsprite gScreechWaveSpriteTemplate, 130, 16, 0, 0, 0, 30, 0 delay 2 return Move_FLAME_WHEEL: @ 81C7E62 - loadspritegfx 10029 + loadspritegfx ANIM_TAG_SMALL_EMBER monbg ANIM_BANK_DEF_PARTNER monbgprio_2A ANIM_BANK_TARGET createsprite gBattleAnimSpriteTemplate_83D9694, 3, 0, 0, 56, 0 - playsewithpan SE_W172, 192 + playsewithpan SE_W172, SOUND_PAN_ATTACKER delay 2 createsprite gBattleAnimSpriteTemplate_83D9694, 3, 0, 0, 56, 4 - playsewithpan SE_W172, 192 + playsewithpan SE_W172, SOUND_PAN_ATTACKER delay 2 createsprite gBattleAnimSpriteTemplate_83D9694, 3, 0, 0, 56, 8 - playsewithpan SE_W172, 192 + playsewithpan SE_W172, SOUND_PAN_ATTACKER delay 2 createsprite gBattleAnimSpriteTemplate_83D9694, 3, 0, 0, 56, 12 - playsewithpan SE_W172, 192 + playsewithpan SE_W172, SOUND_PAN_ATTACKER delay 2 createsprite gBattleAnimSpriteTemplate_83D9694, 3, 0, 0, 56, 16 - playsewithpan SE_W172, 192 + playsewithpan SE_W172, SOUND_PAN_ATTACKER delay 2 createsprite gBattleAnimSpriteTemplate_83D9694, 3, 0, 0, 56, 20 - playsewithpan SE_W172, 192 + playsewithpan SE_W172, SOUND_PAN_ATTACKER delay 2 createsprite gBattleAnimSpriteTemplate_83D9694, 3, 0, 0, 56, 24 - playsewithpan SE_W172, 192 + playsewithpan SE_W172, SOUND_PAN_ATTACKER waitforvisualfinish createsprite gSlideMonToOffsetSpriteTemplate, 2, 0, 24, 0, 0, 6 delay 4 createvisualtask AnimTask_ShakeMon, 2, ANIM_BANK_TARGET, 5, 0, 8, 1 createvisualtask AnimTask_BlendMonInAndOut, 3, ANIM_BANK_TARGET, 31, 12, 1, 1 - playsewithpan SE_W172B, 63 + playsewithpan SE_W172B, SOUND_PAN_TARGET call _81D11A2 delay 7 createsprite gSlideMonToOriginalPosSpriteTemplate, 2, 0, 0, 9 @@ -700,27 +700,27 @@ Unknown_81C7F4C: @ 81C7F4C return Move_PIN_MISSILE: @ 81C7F5C - loadspritegfx 10161 - loadspritegfx 10135 + loadspritegfx ANIM_TAG_NEEDLE + loadspritegfx ANIM_TAG_IMPACT monbg ANIM_BANK_TARGET monbgprio_28 1 setalpha 12, 8 - playsewithpan SE_W026, 192 + playsewithpan SE_W026, SOUND_PAN_ATTACKER createsprite gPinMissileSpriteTemplate, 2, 20, -8, -8, -8, 20, -32 delay 15 createsprite gPinMissileSpriteTemplate, 2, 20, -8, 8, 8, 20, -40 delay 4 - playsewithpan SE_W030, 63 + playsewithpan SE_W030, SOUND_PAN_TARGET createsprite gBasicHitSplatSpriteTemplate, 3, -8, -8, 1, 2 createvisualtask AnimTask_ShakeMon2, 2, ANIM_BANK_TARGET, 3, 0, 2, 1 delay 9 createsprite gPinMissileSpriteTemplate, 2, 20, -8, 0, 0, 20, -32 delay 4 - playsewithpan SE_W030, 63 + playsewithpan SE_W030, SOUND_PAN_TARGET createsprite gBasicHitSplatSpriteTemplate, 3, 8, 8, 1, 2 createvisualtask AnimTask_ShakeMon2, 2, ANIM_BANK_TARGET, 3, 0, 2, 1 delay 14 - playsewithpan SE_W030, 63 + playsewithpan SE_W030, SOUND_PAN_TARGET createsprite gBasicHitSplatSpriteTemplate, 3, 0, 0, 1, 2 createvisualtask AnimTask_ShakeMon2, 2, ANIM_BANK_TARGET, 3, 0, 2, 1 waitforvisualfinish @@ -729,27 +729,27 @@ Move_PIN_MISSILE: @ 81C7F5C end Move_ICICLE_SPEAR: @ 81C8021 - loadspritegfx 10262 - loadspritegfx 10135 + loadspritegfx ANIM_TAG_ICICLE_SPEAR + loadspritegfx ANIM_TAG_IMPACT monbg ANIM_BANK_TARGET monbgprio_28 1 setalpha 12, 8 - playsewithpan SE_W196, 192 + playsewithpan SE_W196, SOUND_PAN_ATTACKER createsprite gIcicleSpearSpriteTemplate, 2, 20, -8, -8, -8, 20, -32 delay 15 createsprite gIcicleSpearSpriteTemplate, 2, 20, -8, 8, 8, 20, -40 delay 4 - playsewithpan SE_W030, 63 + playsewithpan SE_W030, SOUND_PAN_TARGET createsprite gBasicHitSplatSpriteTemplate, 3, -8, -8, 1, 2 createvisualtask AnimTask_ShakeMon2, 2, ANIM_BANK_TARGET, 3, 0, 2, 1 delay 9 createsprite gIcicleSpearSpriteTemplate, 2, 20, -8, 0, 0, 20, -32 delay 4 - playsewithpan SE_W030, 63 + playsewithpan SE_W030, SOUND_PAN_TARGET createsprite gBasicHitSplatSpriteTemplate, 3, 8, 8, 1, 2 createvisualtask AnimTask_ShakeMon2, 2, ANIM_BANK_TARGET, 3, 0, 2, 1 delay 14 - playsewithpan SE_W030, 63 + playsewithpan SE_W030, SOUND_PAN_TARGET createsprite gBasicHitSplatSpriteTemplate, 3, 0, 0, 1, 2 createvisualtask AnimTask_ShakeMon2, 2, ANIM_BANK_TARGET, 3, 0, 2, 1 waitforvisualfinish @@ -758,15 +758,15 @@ Move_ICICLE_SPEAR: @ 81C8021 end Move_TAKE_DOWN: @ 81C80E6 - loadspritegfx 10135 + loadspritegfx ANIM_TAG_IMPACT monbg ANIM_BANK_DEF_PARTNER setalpha 12, 8 - playsewithpan SE_W036, 192 + playsewithpan SE_W036, SOUND_PAN_ATTACKER createvisualtask AnimTask_WindUpLunge, 5, ANIM_BANK_ATTACKER, -24, 8, 23, 10, 40, 10 delay 35 createsprite gBattleAnimSpriteTemplate_83DB3DC, 2, 31, 3, 1, 0, 10, 0, 0 createsprite gBasicHitSplatSpriteTemplate, 4, -10, 0, 1, 0 - playsewithpan SE_W025B, 63 + playsewithpan SE_W025B, SOUND_PAN_TARGET delay 1 createsprite gSlideMonToOffsetSpriteTemplate, 2, 1, -16, 0, 0, 4 waitforvisualfinish @@ -782,20 +782,20 @@ Move_TAKE_DOWN: @ 81C80E6 end Move_DOUBLE_EDGE: @ 81C817A - loadspritegfx 10135 - playsewithpan SE_W129, 192 + loadspritegfx ANIM_TAG_IMPACT + playsewithpan SE_W129, SOUND_PAN_ATTACKER createsprite gBattleAnimSpriteTemplate_83DB3DC, 2, 2, 4, 2, 32767, 10, 0, 0 waitforvisualfinish delay 10 - playsewithpan SE_W207, 192 - waitplaysewithpan SE_W207, 192, 8 + playsewithpan SE_W207, SOUND_PAN_ATTACKER + waitplaysewithpan SE_W207, SOUND_PAN_ATTACKER, 8 createvisualtask AnimTask_TranslateMonEllipticalRespectSide, 2, ANIM_BANK_ATTACKER, 18, 6, 2, 4 waitforvisualfinish createsprite gSimplePaletteBlendSpriteTemplate, 2, 1, 0, 16, 16, rgb(31, 31, 31) createsprite gSlideMonToOffsetSpriteTemplate, 2, 0, 20, 0, 0, 4 delay 3 waitforvisualfinish - playsewithpan SE_W025B, 63 + playsewithpan SE_W025B, SOUND_PAN_TARGET createsprite gBasicHitSplatSpriteTemplate, 132, -10, 0, 1, 0 createsprite gSlideMonToOffsetSpriteTemplate, 2, 1, -32, 0, 0, 3 waitforvisualfinish @@ -815,18 +815,18 @@ Move_DOUBLE_EDGE: @ 81C817A end Move_POISON_STING: @ 81C828D - loadspritegfx 10161 - loadspritegfx 10135 - loadspritegfx 10150 + loadspritegfx ANIM_TAG_NEEDLE + loadspritegfx ANIM_TAG_IMPACT + loadspritegfx ANIM_TAG_POISON_BUBBLE monbg ANIM_BANK_TARGET monbgprio_28 1 setalpha 12, 8 - playsewithpan SE_W013B, 192 + playsewithpan SE_W013B, SOUND_PAN_ATTACKER createsprite gLinearStingerSpriteTemplate, 130, 20, 0, -8, 0, 20 waitforvisualfinish createsprite gBasicHitSplatSpriteTemplate, 3, 0, 0, 1, 2 createvisualtask AnimTask_ShakeMon2, 2, ANIM_BANK_TARGET, 2, 0, 5, 1 - playsewithpan SE_W030, 63 + playsewithpan SE_W030, SOUND_PAN_TARGET waitforvisualfinish call PoisonBubblesAnim waitforvisualfinish @@ -835,18 +835,18 @@ Move_POISON_STING: @ 81C828D end Move_TWINEEDLE: @ 81C82E2 - loadspritegfx 10161 - loadspritegfx 10135 + loadspritegfx ANIM_TAG_NEEDLE + loadspritegfx ANIM_TAG_IMPACT monbg ANIM_BANK_TARGET monbgprio_28 1 setalpha 12, 8 - loopsewithpan SE_W013B, 192, 6, 2 + loopsewithpan SE_W013B, SOUND_PAN_ATTACKER, 6, 2 createsprite gLinearStingerSpriteTemplate, 130, 10, -4, 0, -4, 20 createsprite gLinearStingerSpriteTemplate, 130, 20, 12, 10, 12, 20 delay 20 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 + loopsewithpan SE_W030, SOUND_PAN_TARGET, 5, 2 delay 1 createsprite gBattleAnimSpriteTemplate_83DB4C0, 3, 10, 12, 1, 3 waitforvisualfinish @@ -855,13 +855,13 @@ Move_TWINEEDLE: @ 81C82E2 end Move_FIRE_BLAST: @ 81C8355 - loadspritegfx 10029 + loadspritegfx ANIM_TAG_SMALL_EMBER createsoundtask sub_812AF30, 144, 145 call Move_FIRE_BLAST_CreateFireRing call Move_FIRE_BLAST_CreateFireRing call Move_FIRE_BLAST_CreateFireRing delay 24 - createvisualtask sub_80E2A38, 10, 1, 3, 0, 8, 0 + createvisualtask sub_80E2A38, 10, 1, 3, 0, 8, rgb(0, 0, 0) waitforvisualfinish delay 19 createvisualtask AnimTask_ShakeMon, 2, ANIM_BANK_TARGET, 5, 0, 20, 1 @@ -903,30 +903,30 @@ Move_FIRE_BLAST_CreateFireCross: return Move_LEECH_SEED: @ 81C8483 - loadspritegfx 10006 - playsewithpan SE_W077, 192 + loadspritegfx ANIM_TAG_SEED + playsewithpan SE_W077, SOUND_PAN_ATTACKER createsprite gLeechSeedSpriteTemplate, 130, 15, 0, 0, 24, 35, -32 delay 8 - playsewithpan SE_W077, 192 + playsewithpan SE_W077, SOUND_PAN_ATTACKER createsprite gLeechSeedSpriteTemplate, 130, 15, 0, -16, 24, 35, -40 delay 8 - playsewithpan SE_W077, 192 + playsewithpan SE_W077, SOUND_PAN_ATTACKER createsprite gLeechSeedSpriteTemplate, 130, 15, 0, 16, 24, 35, -37 delay 12 - loopsewithpan SE_W039, 63, 10, 8 + loopsewithpan SE_W039, SOUND_PAN_TARGET, 10, 8 waitforvisualfinish end Move_EMBER: @ 81C84D9 - loadspritegfx 10029 - loopsewithpan SE_W052, 192, 5, 2 + loadspritegfx ANIM_TAG_SMALL_EMBER + loopsewithpan SE_W052, SOUND_PAN_ATTACKER, 5, 2 createsprite gEmberSpriteTemplate, 130, 20, 0, -16, 24, 20, 1 delay 4 createsprite gEmberSpriteTemplate, 130, 20, 0, 0, 24, 20, 1 delay 4 createsprite gEmberSpriteTemplate, 130, 20, 0, 16, 24, 20, 1 delay 16 - playsewithpan SE_W172, 63 + playsewithpan SE_W172, SOUND_PAN_TARGET call Move_EMBER_CreateFlare call Move_EMBER_CreateFlare call Move_EMBER_CreateFlare @@ -937,13 +937,13 @@ Move_EMBER_CreateFlare: return Move_MEGA_PUNCH: @ 81C854D - loadspritegfx 10135 - loadspritegfx 10143 + loadspritegfx ANIM_TAG_IMPACT + loadspritegfx ANIM_TAG_HANDS_AND_FEET monbg ANIM_BANK_TARGET delay 2 createsprite gSimplePaletteBlendSpriteTemplate, 2, 1, 0, 0, 16, rgb(0, 0, 0) setalpha 12, 8 - playsewithpan SE_W025, 63 + playsewithpan SE_W025, SOUND_PAN_TARGET createsprite gMegaPunchKickSpriteTemplate, 3, 0, 0, 0, 50 createvisualtask sub_80E2A38, 10, 4, 2, 0, 7, 32767 delay 50 @@ -952,7 +952,7 @@ Move_MEGA_PUNCH: @ 81C854D 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 + playsewithpan SE_W233B, SOUND_PAN_TARGET waitforvisualfinish clearmonbg ANIM_BANK_TARGET blendoff @@ -970,27 +970,27 @@ _81C85E9: _81C8611: return _81C8612: - changebg 4 + changebg BG_IMPACT_OPPONENT goto _81C8611 _81C8619: - changebg 5 + changebg BG_IMPACT_PLAYER goto _81C8611 _81C8620: - changebg 6 + changebg BG_IMPACT_CONTESTS goto _81C8611 Move_MEGA_KICK: @ 81C8627 - loadspritegfx 10135 - loadspritegfx 10143 + loadspritegfx ANIM_TAG_IMPACT + loadspritegfx ANIM_TAG_HANDS_AND_FEET monbg ANIM_BANK_TARGET delay 2 createsprite gSimplePaletteBlendSpriteTemplate, 2, 1, 0, 0, 16, rgb(0, 0, 0) setalpha 12, 8 - playsewithpan SE_W025, 63 + playsewithpan SE_W025, SOUND_PAN_TARGET createsprite gMegaPunchKickSpriteTemplate, 3, 0, 0, 1, 50 createvisualtask sub_80E2A38, 10, 4, 2, 0, 7, 32767 delay 50 - playsewithpan SE_W025B, 63 + playsewithpan SE_W025B, SOUND_PAN_TARGET call _81C85E9 createsprite gBasicHitSplatSpriteTemplate, 2, 0, 0, 1, 0 createvisualtask AnimTask_ShakeMon2, 2, ANIM_BANK_TARGET, 4, 0, 22, 1 @@ -1005,14 +1005,14 @@ Move_MEGA_KICK: @ 81C8627 end Move_COMET_PUNCH: @ 81C86C3 - loadspritegfx 10135 - loadspritegfx 10143 + loadspritegfx ANIM_TAG_IMPACT + loadspritegfx ANIM_TAG_HANDS_AND_FEET monbg ANIM_BANK_TARGET setalpha 12, 8 choosetwoturnanim Move_COMET_PUNCH_Even, Move_COMET_PUNCH_Odd Move_COMET_PUNCH_End: createvisualtask AnimTask_ShakeMon, 2, ANIM_BANK_TARGET, 3, 0, 6, 1 - playsewithpan SE_W004, 63 + playsewithpan SE_W004, SOUND_PAN_TARGET waitforvisualfinish clearmonbg ANIM_BANK_TARGET blendoff @@ -1027,8 +1027,8 @@ Move_COMET_PUNCH_Odd: goto Move_COMET_PUNCH_End Move_SONIC_BOOM: @ 81C873B - loadspritegfx 10003 - loadspritegfx 10135 + loadspritegfx ANIM_TAG_AIR_WAVE + loadspritegfx ANIM_TAG_IMPACT monbg ANIM_BANK_DEF_PARTNER monbgprio_28 1 setalpha 12, 8 @@ -1042,7 +1042,7 @@ Move_SONIC_BOOM: @ 81C873B blendoff end Move_SONIC_BOOM_CreateBlast: - playsewithpan SE_W013B, 192 + playsewithpan SE_W013B, SOUND_PAN_ATTACKER createsprite gSonicBoomSpriteTemplate, 130, 16, 0, 0, 0, 15 delay 4 return @@ -1052,13 +1052,13 @@ Move_SONIC_BOOM_CreateHitSplat: return Move_THUNDER_SHOCK: @ 81C879C - loadspritegfx 10001 - loadspritegfx 10011 + loadspritegfx ANIM_TAG_SPARK + loadspritegfx ANIM_TAG_SPARK_2 createvisualtask sub_80E2A38, 10, 1, 0, 0, 6, 0 waitforvisualfinish delay 10 createvisualtask sub_80D681C, 5, 0, -44, 0 - playsewithpan SE_W085, 63 + playsewithpan SE_W085, SOUND_PAN_TARGET delay 9 createvisualtask sub_80E2A38, 10, 4, 0, 0, 13, 0 waitforvisualfinish @@ -1073,20 +1073,20 @@ Move_THUNDER_SHOCK: @ 81C879C end Move_THUNDERBOLT: @ 81C880A - loadspritegfx 10001 - loadspritegfx 10282 - loadspritegfx 10011 + loadspritegfx ANIM_TAG_SPARK + loadspritegfx ANIM_TAG_SHOCK_3 + loadspritegfx ANIM_TAG_SPARK_2 createvisualtask sub_80E2A38, 10, 1, 0, 0, 6, 0 waitforvisualfinish delay 10 createvisualtask sub_80D681C, 5, 24, -52, 0 - playsewithpan SE_W085, 63 + playsewithpan SE_W085, SOUND_PAN_TARGET delay 7 createvisualtask sub_80D681C, 5, -24, -52, 0 - playsewithpan SE_W085, 63 + playsewithpan SE_W085, SOUND_PAN_TARGET delay 7 createvisualtask sub_80D681C, 5, 0, -60, 1 - playsewithpan SE_W085, 63 + playsewithpan SE_W085, SOUND_PAN_TARGET delay 9 createvisualtask sub_80E2A38, 10, 4, 0, 0, 13, 0 waitforvisualfinish @@ -1102,7 +1102,7 @@ Move_THUNDERBOLT: @ 81C880A createsprite gBattleAnimSpriteTemplate_83D9908, 132, 0, 0, 16, 44, 96, 40, 1, -32765 createsprite gBattleAnimSpriteTemplate_83D9908, 132, 0, 0, 16, 44, 160, 40, 0, -32765 createsprite gBattleAnimSpriteTemplate_83D9908, 132, 0, 0, 16, 44, 224, 40, 2, -32765 - playsewithpan SE_W063, 63 + playsewithpan SE_W063, SOUND_PAN_TARGET delay 0 createvisualtask sub_80E2A38, 10, 1, 0, 2, 2, 0 delay 6 @@ -1113,7 +1113,7 @@ Move_THUNDERBOLT: @ 81C880A createvisualtask sub_80E2A38, 10, 1, 0, 6, 6, 0 waitforvisualfinish delay 20 - waitplaysewithpan SE_W085B, 63, 19 + waitplaysewithpan SE_W085B, SOUND_PAN_TARGET, 19 call ElectricityEffect waitforvisualfinish delay 20 @@ -1122,16 +1122,16 @@ Move_THUNDERBOLT: @ 81C880A end Move_THUNDER_WAVE: @ 81C89C0 - loadspritegfx 10001 - loadspritegfx 10011 - loadspritegfx 10173 + loadspritegfx ANIM_TAG_SPARK + loadspritegfx ANIM_TAG_SPARK_2 + loadspritegfx ANIM_TAG_SPARK_H createvisualtask sub_80E2A38, 10, 1, 0, 0, 6, 0 waitforvisualfinish delay 10 createvisualtask sub_80D681C, 5, 0, -48, 0 - playsewithpan SE_W086, 63 + playsewithpan SE_W086, SOUND_PAN_TARGET delay 20 - loopsewithpan SE_W085B, 63, 10, 4 + loopsewithpan SE_W085B, SOUND_PAN_TARGET, 10, 4 createsprite gBattleAnimSpriteTemplate_83D9950, 130, -16, -16 delay 4 createsprite gBattleAnimSpriteTemplate_83D9950, 130, -16, 0 @@ -1143,8 +1143,8 @@ Move_THUNDER_WAVE: @ 81C89C0 end Move_BEAT_UP: @ 81C8A2F - loadspritegfx 10135 - loadspritegfx 10143 + loadspritegfx ANIM_TAG_IMPACT + loadspritegfx ANIM_TAG_HANDS_AND_FEET monbg ANIM_BANK_TARGET setalpha 12, 8 choosetwoturnanim Move_BEAT_UP_Even, Move_BEAT_UP_Odd @@ -1157,52 +1157,52 @@ Move_BEAT_UP_Even: createsprite gBasicHitSplatSpriteTemplate, 130, -20, -20, 1, 2 createsprite gFistFootSpriteTemplate, 131, -20, -12, 8, 1, 0 createvisualtask AnimTask_ShakeMon, 2, ANIM_BANK_TARGET, 3, 0, 6, 1 - playsewithpan SE_W233B, 63 + playsewithpan SE_W233B, SOUND_PAN_TARGET delay 8 createsprite gBasicHitSplatSpriteTemplate, 130, 8, 0, 1, 2 createsprite gFistFootSpriteTemplate, 131, 8, 8, 8, 1, 0 createvisualtask AnimTask_ShakeMon, 2, ANIM_BANK_TARGET, 3, 0, 6, 1 - playsewithpan SE_W233B, 63 + playsewithpan SE_W233B, SOUND_PAN_TARGET goto Move_BEAT_UP_End Move_BEAT_UP_Odd: createsprite gBasicHitSplatSpriteTemplate, 130, 12, -20, 1, 2 createsprite gFistFootSpriteTemplate, 131, 12, -12, 8, 1, 0 createvisualtask AnimTask_ShakeMon, 2, ANIM_BANK_TARGET, 3, 0, 6, 1 - playsewithpan SE_W233B, 63 + playsewithpan SE_W233B, SOUND_PAN_TARGET delay 8 createsprite gBasicHitSplatSpriteTemplate, 130, -12, 0, 1, 2 createsprite gFistFootSpriteTemplate, 131, -12, 8, 8, 1, 0 createvisualtask AnimTask_ShakeMon, 2, ANIM_BANK_TARGET, 3, 0, 6, 1 - playsewithpan SE_W233B, 63 + playsewithpan SE_W233B, SOUND_PAN_TARGET goto Move_BEAT_UP_End Move_STOMP: @ 81C8B2A - loadspritegfx 10143 - loadspritegfx 10135 + loadspritegfx ANIM_TAG_HANDS_AND_FEET + loadspritegfx ANIM_TAG_IMPACT monbg ANIM_BANK_TARGET setalpha 12, 8 - playsewithpan SE_W104, 63 + playsewithpan SE_W104, SOUND_PAN_TARGET createsprite gStompFootSpriteTemplate, 3, 0, -32, 15 delay 19 createsprite gBasicHitSplatSpriteTemplate, 2, 0, -8, 1, 1 createvisualtask AnimTask_ShakeMon, 2, ANIM_BANK_TARGET, 0, 4, 9, 1 - playsewithpan SE_W025B, 63 + playsewithpan SE_W025B, SOUND_PAN_TARGET waitforvisualfinish clearmonbg ANIM_BANK_TARGET blendoff end Move_TAIL_WHIP: @ 81C8B71 - loopsewithpan SE_W039, 192, 24, 3 + loopsewithpan SE_W039, SOUND_PAN_ATTACKER, 24, 3 createvisualtask AnimTask_TranslateMonEllipticalRespectSide, 2, ANIM_BANK_ATTACKER, 12, 4, 2, 3 waitforvisualfinish end Move_CUT: @ 81C8B8A - loadspritegfx 10138 + loadspritegfx ANIM_TAG_CUT monbg ANIM_BANK_TARGET setalpha 12, 8 - playsewithpan SE_W015, 63 + playsewithpan SE_W015, SOUND_PAN_TARGET createsprite gCuttingSliceSpriteTemplate, 2, 40, -32, 0 delay 5 createvisualtask AnimTask_ShakeMon, 2, ANIM_BANK_TARGET, 0, 3, 10, 1 @@ -1213,15 +1213,15 @@ Move_CUT: @ 81C8B8A end Move_HIDDEN_POWER: @ 81C8BBC - loadspritegfx 10217 - playsewithpan SE_W036, 192 + loadspritegfx ANIM_TAG_RED_ORB + playsewithpan SE_W036, SOUND_PAN_ATTACKER createvisualtask AnimTask_ScaleMonAndRestore, 5, -7, -7, 11, ANIM_BANK_ATTACKER, 0 waitforvisualfinish delay 30 createvisualtask AnimTask_BlendMonInAndOut, 5, ANIM_BANK_ATTACKER, 20479, 12, 5, 1 delay 4 createvisualtask AnimTask_ScaleMonAndRestore, 5, -7, -7, 11, ANIM_BANK_ATTACKER, 0 - playsewithpan SE_W179, 192 + playsewithpan SE_W179, SOUND_PAN_ATTACKER createsprite gHiddenPowerOrbSpriteTemplate, 2, 26, 0 createsprite gHiddenPowerOrbSpriteTemplate, 2, 26, 42 createsprite gHiddenPowerOrbSpriteTemplate, 2, 26, 84 @@ -1229,8 +1229,8 @@ Move_HIDDEN_POWER: @ 81C8BBC createsprite gHiddenPowerOrbSpriteTemplate, 2, 26, 168 createsprite gHiddenPowerOrbSpriteTemplate, 2, 26, 210 delay 52 - setarg 7, -1 - playsewithpan SE_W115, 192 + setarg ARG_RET_ID, -1 + playsewithpan SE_W115, SOUND_PAN_ATTACKER createvisualtask AnimTask_ScaleMonAndRestore, 5, -7, -7, 11, ANIM_BANK_ATTACKER, 0 createsprite gHiddenPowerOrbScatterSpriteTemplate, 130, 0 createsprite gHiddenPowerOrbScatterSpriteTemplate, 130, 32 @@ -1243,16 +1243,16 @@ Move_HIDDEN_POWER: @ 81C8BBC end Move_REVERSAL: @ 81C8CA5 - loadspritegfx 10236 - loadspritegfx 10143 - loadspritegfx 10135 - playsewithpan SE_W197, 192 + loadspritegfx ANIM_TAG_BLUE_ORB + loadspritegfx ANIM_TAG_HANDS_AND_FEET + loadspritegfx ANIM_TAG_IMPACT + playsewithpan SE_W197, SOUND_PAN_ATTACKER createsprite gBattleAnimSpriteTemplate_83DB3DC, 2, 31, 3, 3, 32767, 8, 0, 0 waitforvisualfinish delay 30 createvisualtask sub_80E1F8C, 2, 31, 3, 2, 0, 10, 32767 delay 10 - playsewithpan SE_W179, 192 + playsewithpan SE_W179, SOUND_PAN_ATTACKER createsprite gBattleAnimSpriteTemplate_8402738, 2, 26, 0 createsprite gBattleAnimSpriteTemplate_8402738, 2, 26, 42 createsprite gBattleAnimSpriteTemplate_8402738, 2, 26, 84 @@ -1263,7 +1263,7 @@ Move_REVERSAL: @ 81C8CA5 delay 20 createsprite gHorizontalLungeSpriteTemplate, 2, 6, 4 delay 8 - playsewithpan SE_W233B, 63 + playsewithpan SE_W233B, SOUND_PAN_TARGET createsprite gBattleAnimSpriteTemplate_83DB3DC, 2, 31, 3, 1, 32767, 8, 0, 0 createsprite gFistFootSpriteTemplate, 132, 0, 0, 10, 1, 0 createsprite gBasicHitSplatSpriteTemplate, 131, 0, 0, 1, 1 @@ -1271,9 +1271,9 @@ Move_REVERSAL: @ 81C8CA5 end Move_PURSUIT: @ 81C8D80 - loadspritegfx 10135 + loadspritegfx ANIM_TAG_IMPACT monbg ANIM_BANK_TARGET - fadetobg 1 + fadetobg BG_DARK waitbgfadein delay 0 setalpha 12, 8 @@ -1287,25 +1287,25 @@ _81C8D96: waitbgfadein end _81C8D9F: - playsewithpan SE_W004, 63 + playsewithpan SE_W004, SOUND_PAN_TARGET createsprite gBasicHitSplatSpriteTemplate, 3, 0, 0, 1, 2 createvisualtask sub_80A9058, 5, 0, 1, 6, 1, 0 goto _81C8D96 _81C8DC8: - playsewithpan SE_W004, 63 + playsewithpan SE_W004, SOUND_PAN_TARGET createsprite gBasicHitSplatSpriteTemplate, 3, 0, 0, 1, 1 createvisualtask sub_80A9058, 5, 0, 1, 6, 1, 0 goto _81C8D96 Move_SPIKE_CANNON: @ 81C8DF1 - loadspritegfx 10161 - loadspritegfx 10135 + loadspritegfx ANIM_TAG_NEEDLE + loadspritegfx ANIM_TAG_IMPACT monbg ANIM_BANK_TARGET monbgprio_28 1 setalpha 12, 8 createvisualtask AnimTask_WindUpLunge, 5, ANIM_BANK_ATTACKER, -4, 0, 4, 6, 8, 4 waitforvisualfinish - loopsewithpan SE_W013B, 192, 5, 3 + loopsewithpan SE_W013B, SOUND_PAN_ATTACKER, 5, 3 createsprite gSlideMonToOriginalPosSpriteTemplate, 2, 0, 0, 5 createsprite gLinearStingerSpriteTemplate, 2, 10, -8, -8, -8, 20 createsprite gLinearStingerSpriteTemplate, 2, 18, 0, 0, 0, 20 @@ -1315,17 +1315,17 @@ Move_SPIKE_CANNON: @ 81C8DF1 createsprite gBattleAnimSpriteTemplate_83DB4C0, 3, 0, 0, 1, 2 createsprite gBattleAnimSpriteTemplate_83DB4C0, 3, 8, 8, 1, 2 createvisualtask AnimTask_ShakeMon2, 2, ANIM_BANK_TARGET, 3, 0, 7, 1 - loopsewithpan SE_W030, 63, 5, 3 + loopsewithpan SE_W030, SOUND_PAN_TARGET, 5, 3 waitforvisualfinish clearmonbg ANIM_BANK_TARGET blendoff end Move_SWORDS_DANCE: @ 81C8EA4 - loadspritegfx 10005 + loadspritegfx ANIM_TAG_SWORD monbg ANIM_BANK_ATTACKER setalpha 12, 8 - playsewithpan SE_W014, 192 + playsewithpan SE_W014, SOUND_PAN_ATTACKER createvisualtask AnimTask_TranslateMonEllipticalRespectSide, 2, ANIM_BANK_ATTACKER, 16, 6, 1, 4 createsprite gBattleAnimSpriteTemplate_83D748C, 2, 0, 0 delay 22 @@ -1337,16 +1337,16 @@ Move_SWORDS_DANCE: @ 81C8EA4 end Move_PSYCH_UP: @ 81C8EEA - loadspritegfx 10196 + loadspritegfx ANIM_TAG_SPIRAL monbg ANIM_BANK_ATK_PARTNER createvisualtask sub_80E1F8C, 2, 25, 2, 6, 1, 11, 0 setalpha 12, 8 - loopsewithpan SE_W060B, 192, 5, 10 + loopsewithpan SE_W060B, SOUND_PAN_ATTACKER, 5, 10 createsprite gBattleAnimSpriteTemplate_83DA690, 2, 0, 0, 0, 0 createvisualtask AnimTask_SwayMon, 5, 0, 5, 2560, 8, 0 delay 127 delay 4 - playsewithpan SE_W060, 192 + playsewithpan SE_W060, SOUND_PAN_ATTACKER createvisualtask AnimTask_ScaleMonAndRestore, 5, -5, -5, 10, ANIM_BANK_ATTACKER, 1 createvisualtask sub_80E2A38, 9, 2, 2, 10, 0, 1023 delay 30 @@ -1356,15 +1356,15 @@ Move_PSYCH_UP: @ 81C8EEA end Move_DIZZY_PUNCH: @ 81C8F5C - loadspritegfx 10073 - loadspritegfx 10143 - loadspritegfx 10135 + loadspritegfx ANIM_TAG_DUCK + loadspritegfx ANIM_TAG_HANDS_AND_FEET + loadspritegfx ANIM_TAG_IMPACT monbg ANIM_BANK_TARGET setalpha 12, 8 call _81C9077 createsprite gFistFootSpriteTemplate, 133, 16, 8, 20, 1, 0 createsprite gBasicHitSplatSpriteTemplate, 132, 16, 0, 1, 1 - playsewithpan SE_W004, 63 + playsewithpan SE_W004, SOUND_PAN_TARGET createsprite gBattleAnimSpriteTemplate_83DA088, 131, 16, 8, 160, -32 createsprite gBattleAnimSpriteTemplate_83DA088, 131, 16, 8, -256, -40 createsprite gBattleAnimSpriteTemplate_83DA088, 131, 16, 8, 128, -16 @@ -1375,7 +1375,7 @@ Move_DIZZY_PUNCH: @ 81C8F5C call _81C9077 createsprite gFistFootSpriteTemplate, 133, -16, -8, 20, 1, 0 createsprite gBasicHitSplatSpriteTemplate, 132, -16, -16, 1, 1 - playsewithpan SE_W233B, 63 + playsewithpan SE_W233B, SOUND_PAN_TARGET createsprite gBattleAnimSpriteTemplate_83DA088, 131, -16, -8, 160, -32 createsprite gBattleAnimSpriteTemplate_83DA088, 131, -16, -8, -256, -40 createsprite gBattleAnimSpriteTemplate_83DA088, 131, -16, -8, 128, -16 @@ -1393,8 +1393,8 @@ _81C9077: return Move_FIRE_SPIN: @ 81C9096 - loadspritegfx 10029 - playsewithpan SE_W221B, 63 + loadspritegfx ANIM_TAG_SMALL_EMBER + playsewithpan SE_W221B, SOUND_PAN_TARGET createvisualtask AnimTask_ShakeMon, 5, 1, 0, 2, 47, 1 call _81C90BF call _81C90BF @@ -1417,10 +1417,10 @@ _81C90BF: return Move_FURY_CUTTER: @ 81C914A - loadspritegfx 10138 + loadspritegfx ANIM_TAG_CUT monbg ANIM_BANK_TARGET setalpha 12, 8 - playsewithpan SE_W013, 63 + playsewithpan SE_W013, SOUND_PAN_TARGET createvisualtask UpdateFuryCutterAnimDirection, 2 jumpargeq 7, 0, _81C91A7 goto _81C91B9 @@ -1455,7 +1455,7 @@ _81C91FF: goto _81C918E Move_SELF_DESTRUCT: @ 81C9219 - loadspritegfx 10198 + loadspritegfx ANIM_TAG_EXPLOSION createvisualtask sub_80E2A38, 10, 2, 1, 0, 9, 31 createvisualtask AnimTask_ShakeMon2, 5, 4, 6, 0, 38, 1 createvisualtask AnimTask_ShakeMon2, 5, 5, 6, 0, 38, 1 @@ -1468,34 +1468,34 @@ Move_SELF_DESTRUCT: @ 81C9219 createvisualtask sub_80E2A38, 10, 2, 1, 9, 0, 31 end _81C929F: - playsewithpan SE_W120, 192 + playsewithpan SE_W120, SOUND_PAN_ATTACKER createsprite gBattleAnimSpriteTemplate_83D7828, 3, 0, 0, 0, 1 delay 6 - playsewithpan SE_W120, 192 + playsewithpan SE_W120, SOUND_PAN_ATTACKER createsprite gBattleAnimSpriteTemplate_83D7828, 3, 24, -24, 0, 1 delay 6 - playsewithpan SE_W120, 192 + playsewithpan SE_W120, SOUND_PAN_ATTACKER createsprite gBattleAnimSpriteTemplate_83D7828, 3, -16, 16, 0, 1 delay 6 - playsewithpan SE_W120, 192 + playsewithpan SE_W120, SOUND_PAN_ATTACKER createsprite gBattleAnimSpriteTemplate_83D7828, 3, -24, -12, 0, 1 delay 6 - playsewithpan SE_W120, 192 + playsewithpan SE_W120, SOUND_PAN_ATTACKER createsprite gBattleAnimSpriteTemplate_83D7828, 3, 16, 16, 0, 1 delay 6 return Move_SLAM: @ 81C9309 - loadspritegfx 10056 - loadspritegfx 10135 + loadspritegfx ANIM_TAG_SLAM_HIT + loadspritegfx ANIM_TAG_IMPACT monbg ANIM_BANK_TARGET setalpha 12, 8 - playsewithpan SE_W004, 192 + playsewithpan SE_W004, SOUND_PAN_ATTACKER createsprite gSlideMonToOffsetSpriteTemplate, 2, 0, 20, 3, 0, 4 delay 1 createsprite gBattleAnimSpriteTemplate_83D69DC, 2, 0, 0 delay 3 - playsewithpan SE_W025B, 63 + playsewithpan SE_W025B, SOUND_PAN_TARGET createsprite gBasicHitSplatSpriteTemplate, 3, 0, 0, 1, 1 createsprite gSlideMonToOffsetSpriteTemplate, 2, 1, -12, 10, 0, 3 createsprite gSlideMonToOriginalPosSpriteTemplate, 2, 0, 0, 5 @@ -1510,26 +1510,26 @@ Move_SLAM: @ 81C9309 end Move_VINE_WHIP: @ 81C9391 - loadspritegfx 10287 - playsewithpan SE_W026, 192 + loadspritegfx ANIM_TAG_WHIP_HIT + playsewithpan SE_W026, SOUND_PAN_ATTACKER createsprite gHorizontalLungeSpriteTemplate, 2, 4, 6 delay 6 - playsewithpan SE_W010, 63 + playsewithpan SE_W010, SOUND_PAN_TARGET createsprite gBattleAnimSpriteTemplate_83D69F4, 130, 0, 0 delay 6 createvisualtask AnimTask_ShakeMon2, 2, ANIM_BANK_TARGET, 2, 0, 6, 1 end Move_DRILL_PECK: @ 81C93C8 - loadspritegfx 10135 - loadspritegfx 10162 + loadspritegfx ANIM_TAG_IMPACT + loadspritegfx ANIM_TAG_WHIRLWIND_LINES createsprite gBattleAnimSpriteTemplate_83D6DE4, 2, 0 - playsewithpan SE_W029, 192 + playsewithpan SE_W029, SOUND_PAN_ATTACKER waitforvisualfinish delay 2 createsprite gBattleAnimSpriteTemplate_83D6DE4, 2, 1 delay 2 - loopsewithpan SE_W030, 63, 4, 8 + loopsewithpan SE_W030, SOUND_PAN_TARGET, 4, 8 createvisualtask sub_80DB0E8, 5 createvisualtask AnimTask_ShakeMon2, 2, ANIM_BANK_TARGET, 4, 0, 18, 1 waitforvisualfinish @@ -1540,35 +1540,35 @@ Move_DRILL_PECK: @ 81C93C8 end Move_WATERFALL: @ 81C9421 - loadspritegfx 10148 - loadspritegfx 10155 - loadspritegfx 10141 + loadspritegfx ANIM_TAG_WATER_IMPACT + loadspritegfx ANIM_TAG_SMALL_BUBBLES + loadspritegfx ANIM_TAG_ICE_CRYSTALS monbg ANIM_BANK_DEF_PARTNER setalpha 12, 8 createvisualtask AnimTask_ShakeMon, 5, 0, 0, 2, 23, 1 delay 5 - playsewithpan SE_W152, 192 + playsewithpan SE_W152, SOUND_PAN_ATTACKER createsprite gBattleAnimSpriteTemplate_83D9348, 2, 10, 10, 25, 0 delay 4 - playsewithpan SE_W152, 192 + playsewithpan SE_W152, SOUND_PAN_ATTACKER createsprite gBattleAnimSpriteTemplate_83D9348, 2, -15, 0, 25, 0 delay 4 - playsewithpan SE_W152, 192 + playsewithpan SE_W152, SOUND_PAN_ATTACKER createsprite gBattleAnimSpriteTemplate_83D9348, 2, 20, 10, 25, 0 delay 4 - playsewithpan SE_W152, 192 + playsewithpan SE_W152, SOUND_PAN_ATTACKER createsprite gBattleAnimSpriteTemplate_83D9348, 2, 0, -10, 25, 0 delay 4 - playsewithpan SE_W152, 192 + playsewithpan SE_W152, SOUND_PAN_ATTACKER createsprite gBattleAnimSpriteTemplate_83D9348, 2, -10, 15, 25, 0 delay 4 - playsewithpan SE_W152, 192 + playsewithpan SE_W152, SOUND_PAN_ATTACKER createsprite gBattleAnimSpriteTemplate_83D9348, 2, 25, 20, 25, 0 delay 4 - playsewithpan SE_W152, 192 + playsewithpan SE_W152, SOUND_PAN_ATTACKER createsprite gBattleAnimSpriteTemplate_83D9348, 2, -20, 20, 25, 0 delay 4 - playsewithpan SE_W152, 192 + playsewithpan SE_W152, SOUND_PAN_ATTACKER createsprite gBattleAnimSpriteTemplate_83D9348, 2, 12, 0, 25, 0 waitforvisualfinish delay 10 @@ -1580,7 +1580,7 @@ Move_WATERFALL: @ 81C9421 blendoff end _81C9502: - playsewithpan SE_W127, 63 + playsewithpan SE_W127, SOUND_PAN_TARGET createvisualtask AnimTask_ShakeMon2, 5, 1, 4, 0, 17, 1 createsprite gBattleAnimSpriteTemplate_83DB4D8, 3, 0, 20, 1, 1 createsprite gBattleAnimSpriteTemplate_83D9360, 4, 0, 20 @@ -1620,7 +1620,7 @@ _81C9502: return Move_EXPLOSION: @ 81C9675 - loadspritegfx 10198 + loadspritegfx ANIM_TAG_EXPLOSION createsprite gBattleAnimSpriteTemplate_83DB3DC, 2, 1, 8, 9, 8474, 8, 0, 8 createvisualtask AnimTask_ShakeMon2, 5, 4, 8, 0, 40, 1 createvisualtask AnimTask_ShakeMon2, 5, 5, 8, 0, 40, 1 @@ -1635,26 +1635,26 @@ Move_EXPLOSION: @ 81C9675 createvisualtask sub_80E2A38, 10, 1, 3, 16, 0, 32767 end _81C9712: - playsewithpan SE_W153, 192 + playsewithpan SE_W153, SOUND_PAN_ATTACKER createsprite gBattleAnimSpriteTemplate_83D7828, 3, 0, 0, 0, 1 delay 6 - playsewithpan SE_W153, 192 + playsewithpan SE_W153, SOUND_PAN_ATTACKER createsprite gBattleAnimSpriteTemplate_83D7828, 3, 24, -24, 0, 1 delay 6 - playsewithpan SE_W153, 192 + playsewithpan SE_W153, SOUND_PAN_ATTACKER createsprite gBattleAnimSpriteTemplate_83D7828, 3, -16, 16, 0, 1 delay 6 - playsewithpan SE_W153, 192 + playsewithpan SE_W153, SOUND_PAN_ATTACKER createsprite gBattleAnimSpriteTemplate_83D7828, 3, -24, -12, 0, 1 delay 6 - playsewithpan SE_W153, 192 + playsewithpan SE_W153, SOUND_PAN_ATTACKER createsprite gBattleAnimSpriteTemplate_83D7828, 3, 16, 16, 0, 1 delay 6 return Move_DEFENSE_CURL: @ 81C977C - loadspritegfx 10234 - loopsewithpan SE_W161, 192, 18, 3 + loadspritegfx ANIM_TAG_ECLIPSING_ORB + loopsewithpan SE_W161, SOUND_PAN_ATTACKER, 18, 3 createvisualtask sub_80E0E24, 5, 0, 0 createvisualtask sub_812D350, 5 waitforvisualfinish @@ -1665,22 +1665,22 @@ Move_DEFENSE_CURL: @ 81C977C end Move_PROTECT: @ 81C97B5 - loadspritegfx 10280 + loadspritegfx ANIM_TAG_PROTECT monbg ANIM_BANK_ATK_PARTNER monbgprio_28 0 - waitplaysewithpan SE_W115, 192, 16 + waitplaysewithpan SE_W115, SOUND_PAN_ATTACKER, 16 createsprite gBattleAnimSpriteTemplate_83D6BE8, 2, 24, 0, 90 waitforvisualfinish clearmonbg ANIM_BANK_ATK_PARTNER end Move_DETECT: @ 81C97D2 - loadspritegfx 10071 + loadspritegfx ANIM_TAG_SPARKLE_4 createsprite gSimplePaletteBlendSpriteTemplate, 2, 1, 2, 0, 9, rgb(0, 0, 0) waitforvisualfinish createvisualtask sub_80E2A38, 10, 2, 1, 0, 9, 32767 delay 18 - playsewithpan SE_W197, 192 + playsewithpan SE_W197, SOUND_PAN_ATTACKER createsprite gBattleAnimSpriteTemplate_83930F4, 13, 20, -20 waitforvisualfinish delay 10 @@ -1690,8 +1690,8 @@ Move_DETECT: @ 81C97D2 end Move_FRUSTRATION: @ 81C9830 - loadspritegfx 10135 - loadspritegfx 10087 + loadspritegfx ANIM_TAG_IMPACT + loadspritegfx ANIM_TAG_ANGER monbg ANIM_BANK_DEF_PARTNER setalpha 12, 8 createvisualtask sub_8079CEC, 1 @@ -1705,15 +1705,15 @@ _81C985F: blendoff end _81C9864: - playsewithpan SE_W082, 192 + playsewithpan SE_W082, SOUND_PAN_ATTACKER createvisualtask AnimTask_ShakeMon2, 5, 0, 1, 0, 15, 1 createvisualtask sub_80E2A38, 10, 2, 3, 0, 9, 31 waitforvisualfinish delay 20 - playsewithpan SE_W207B, 192 + playsewithpan SE_W207B, SOUND_PAN_ATTACKER createsprite gBattleAnimSpriteTemplate_83D7798, 2, 0, 20, -28 waitforvisualfinish - playsewithpan SE_W207B, 192 + playsewithpan SE_W207B, SOUND_PAN_ATTACKER createsprite gBattleAnimSpriteTemplate_83D7798, 2, 0, 20, -28 waitforvisualfinish delay 10 @@ -1721,65 +1721,65 @@ _81C9864: delay 5 createvisualtask AnimTask_ShakeMon2, 5, 1, 4, 0, 30, 1 createsprite gBasicHitSplatSpriteTemplate, 3, 0, 0, 1, 0 - playsewithpan SE_W004, 63 + playsewithpan SE_W004, SOUND_PAN_TARGET delay 5 createsprite gBasicHitSplatSpriteTemplate, 3, 24, 8, 1, 0 - playsewithpan SE_W004, 63 + playsewithpan SE_W004, SOUND_PAN_TARGET delay 5 createsprite gBasicHitSplatSpriteTemplate, 3, -24, -16, 1, 0 - playsewithpan SE_W004, 63 + playsewithpan SE_W004, SOUND_PAN_TARGET delay 5 createsprite gBasicHitSplatSpriteTemplate, 3, 8, 4, 1, 0 - playsewithpan SE_W004, 63 + playsewithpan SE_W004, SOUND_PAN_TARGET delay 5 createsprite gBasicHitSplatSpriteTemplate, 3, -16, 19, 1, 0 - playsewithpan SE_W004, 63 + playsewithpan SE_W004, SOUND_PAN_TARGET delay 5 createsprite gBasicHitSplatSpriteTemplate, 3, 18, -18, 1, 0 - playsewithpan SE_W004, 63 + playsewithpan SE_W004, SOUND_PAN_TARGET waitforvisualfinish createvisualtask sub_80E2A38, 10, 2, 3, 9, 0, 31 goto _81C985F _81C996A: - playsewithpan SE_W082, 192 + playsewithpan SE_W082, SOUND_PAN_ATTACKER createvisualtask AnimTask_ShakeMon2, 5, 0, 1, 0, 15, 1 createvisualtask sub_80E2A38, 10, 2, 3, 0, 9, 31 waitforvisualfinish delay 20 - playsewithpan SE_W207B, 192 + playsewithpan SE_W207B, SOUND_PAN_ATTACKER createsprite gBattleAnimSpriteTemplate_83D7798, 2, 0, 20, -28 waitforvisualfinish delay 5 createvisualtask sub_812E498, 5 delay 7 - playsewithpan SE_W004, 63 + playsewithpan SE_W004, SOUND_PAN_TARGET createsprite gBasicHitSplatSpriteTemplate, 3, 0, 8, 1, 1 createvisualtask AnimTask_ShakeMon2, 5, 1, 4, 0, 6, 1 delay 14 - playsewithpan SE_W004, 63 + playsewithpan SE_W004, SOUND_PAN_TARGET createsprite gBasicHitSplatSpriteTemplate, 3, 12, -6, 1, 1 createvisualtask AnimTask_ShakeMon2, 5, 1, 4, 0, 6, 1 delay 14 - playsewithpan SE_W004, 63 + playsewithpan SE_W004, SOUND_PAN_TARGET createsprite gBasicHitSplatSpriteTemplate, 3, -12, -6, 1, 1 createvisualtask AnimTask_ShakeMon2, 5, 1, 4, 0, 6, 1 waitforvisualfinish createvisualtask sub_80E2A38, 10, 2, 3, 9, 0, 31 goto _81C985F _81C9A37: - playsewithpan SE_W207B, 192 + playsewithpan SE_W207B, SOUND_PAN_ATTACKER createsprite gBattleAnimSpriteTemplate_83D7798, 2, 0, 20, -28 waitforvisualfinish delay 5 createsprite gHorizontalLungeSpriteTemplate, 2, 4, 4 delay 6 - playsewithpan SE_W004, 63 + playsewithpan SE_W004, SOUND_PAN_TARGET createsprite gBasicHitSplatSpriteTemplate, 2, 10, 4, 1, 1 createvisualtask AnimTask_ShakeMon2, 2, ANIM_BANK_TARGET, 3, 0, 6, 1 waitforvisualfinish createsprite gHorizontalLungeSpriteTemplate, 2, 4, 4 delay 6 - playsewithpan SE_W004, 63 + playsewithpan SE_W004, SOUND_PAN_TARGET createsprite gBasicHitSplatSpriteTemplate, 2, -10, -4, 1, 2 createvisualtask AnimTask_ShakeMon2, 2, ANIM_BANK_TARGET, 3, 0, 6, 1 goto _81C985F @@ -1789,23 +1789,23 @@ _81C9AB3: delay 10 createsprite gHorizontalLungeSpriteTemplate, 2, 10, 2 delay 12 - playsewithpan SE_W004, 63 + playsewithpan SE_W004, SOUND_PAN_TARGET createsprite gBasicHitSplatSpriteTemplate, 2, 0, 0, 1, 2 createvisualtask AnimTask_ShakeMon2, 2, ANIM_BANK_TARGET, 1, 0, 6, 1 goto _81C985F Move_SAFEGUARD: @ 81C9AF7 - loadspritegfx 10244 + loadspritegfx ANIM_TAG_GUARD_RING monbg ANIM_BANK_ATK_PARTNER setalpha 8, 8 - playsewithpan SE_W208, 192 + playsewithpan SE_W208, SOUND_PAN_ATTACKER createsprite gBattleAnimSpriteTemplate_83D7D74, 2 delay 4 createsprite gBattleAnimSpriteTemplate_83D7D74, 2 delay 4 createsprite gBattleAnimSpriteTemplate_83D7D74, 2 waitforvisualfinish - playsewithpan SE_REAPOKE, 192 + playsewithpan SE_REAPOKE, SOUND_PAN_ATTACKER createvisualtask sub_80E1F8C, 2, 10, 0, 2, 0, 10, 32767 waitforvisualfinish clearmonbg ANIM_BANK_ATK_PARTNER @@ -1813,7 +1813,7 @@ Move_SAFEGUARD: @ 81C9AF7 end Move_PAIN_SPLIT: @ 81C9B39 - loadspritegfx 10239 + loadspritegfx ANIM_TAG_PAIN_SPLIT createsprite gBattleAnimSpriteTemplate_84026F0, 2, -8, -42, 0 createsprite gBattleAnimSpriteTemplate_84026F0, 130, -8, -42, 1 delay 10 @@ -1837,11 +1837,11 @@ Move_PAIN_SPLIT: @ 81C9B39 end Move_VICE_GRIP: @ 81C9BE1 - loadspritegfx 10138 - loadspritegfx 10135 + loadspritegfx ANIM_TAG_CUT + loadspritegfx ANIM_TAG_IMPACT monbg ANIM_BANK_DEF_PARTNER setalpha 12, 8 - playsewithpan SE_W011, 63 + playsewithpan SE_W011, SOUND_PAN_TARGET createsprite gBattleAnimSpriteTemplate_83D769C, 2, 0 createsprite gBattleAnimSpriteTemplate_83D769C, 2, 1 delay 9 @@ -1853,13 +1853,13 @@ Move_VICE_GRIP: @ 81C9BE1 end Move_GUILLOTINE: @ 81C9C29 - loadspritegfx 10138 - loadspritegfx 10135 + loadspritegfx ANIM_TAG_CUT + loadspritegfx ANIM_TAG_IMPACT monbg ANIM_BANK_DEF_PARTNER setalpha 12, 8 - fadetobgfromset 12, 13, 14 + fadetobgfromset BG_GUILLOTINE_OPPONENT, BG_GUILLOTINE_PLAYER, BG_GUILLOTINE_CONTESTS waitbgfadein - playsewithpan SE_W011, 63 + playsewithpan SE_W011, SOUND_PAN_TARGET createsprite gBattleAnimSpriteTemplate_83D76DC, 2, 0 createsprite gBattleAnimSpriteTemplate_83D76DC, 2, 1 createvisualtask sub_80E2A38, 10, 4, 2, 0, 16, 0 @@ -1869,7 +1869,7 @@ Move_GUILLOTINE: @ 81C9C29 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 + playsewithpan SE_W013, SOUND_PAN_TARGET waitforvisualfinish clearmonbg ANIM_BANK_DEF_PARTNER blendoff @@ -1878,15 +1878,15 @@ Move_GUILLOTINE: @ 81C9C29 end Move_PAY_DAY: @ 81C9CB5 - loadspritegfx 10100 - loadspritegfx 10135 + loadspritegfx ANIM_TAG_COIN + loadspritegfx ANIM_TAG_IMPACT monbg ANIM_BANK_TARGET monbgprio_28 1 setalpha 12, 8 - playsewithpan SE_W013B, 192 + playsewithpan SE_W013B, SOUND_PAN_ATTACKER createsprite gBattleAnimSpriteTemplate_83D75E4, 2, 20, 0, 0, 0, 1152 waitforvisualfinish - playsewithpan SE_W006, 63 + playsewithpan SE_W006, SOUND_PAN_TARGET createsprite gBasicHitSplatSpriteTemplate, 1, 0, 0, 1, 2 createsprite gBattleAnimSpriteTemplate_83D75FC, 2 createvisualtask AnimTask_ShakeMon2, 2, ANIM_BANK_TARGET, 1, 0, 6, 1 @@ -1896,8 +1896,8 @@ Move_PAY_DAY: @ 81C9CB5 end Move_OUTRAGE: @ 81C9D08 - loadspritegfx 10029 - loopsewithpan SE_W082, 192, 8, 3 + loadspritegfx ANIM_TAG_SMALL_EMBER + loopsewithpan SE_W082, SOUND_PAN_ATTACKER, 8, 3 createvisualtask sub_80E1F8C, 2, 7, 2, 5, 3, 8, 430 createvisualtask AnimTask_TranslateMonEllipticalRespectSide, 2, ANIM_BANK_ATTACKER, 12, 6, 5, 4 delay 0 @@ -1941,11 +1941,11 @@ _81C9E0F: return Move_SPARK: @ 81C9EA3 - loadspritegfx 10135 - loadspritegfx 10011 + loadspritegfx ANIM_TAG_IMPACT + loadspritegfx ANIM_TAG_SPARK_2 delay 0 createvisualtask sub_80E1F8C, 2, 3, -31, 1, 5, 5, 23551 - playsewithpan SE_W085B, 192 + playsewithpan SE_W085B, SOUND_PAN_ATTACKER createsprite gBattleAnimSpriteTemplate_83D985C, 0, 32, 24, 190, 12, 0, 1, 0 delay 0 createsprite gBattleAnimSpriteTemplate_83D985C, 0, 80, 24, 22, 12, 0, 1, 0 @@ -1954,7 +1954,7 @@ Move_SPARK: @ 81C9EA3 createvisualtask sub_80E1F8C, 2, 3, -31, 1, 0, 0, 23551 delay 10 createvisualtask sub_80E1F8C, 2, 3, -31, 1, 5, 5, 23551 - playsewithpan SE_W085B, 192 + playsewithpan SE_W085B, SOUND_PAN_ATTACKER createsprite gBattleAnimSpriteTemplate_83D985C, 0, 100, 24, 60, 10, 0, 1, 0 createsprite gBattleAnimSpriteTemplate_83D985C, 0, 170, 24, 42, 11, 0, 1, 1 delay 0 @@ -1963,7 +1963,7 @@ Move_SPARK: @ 81C9EA3 createvisualtask sub_80E1F8C, 2, 3, -31, 1, 0, 0, 23551 delay 20 createvisualtask sub_80E1F8C, 2, 3, -31, 1, 7, 7, 23551 - playsewithpan SE_W085B, 192 + playsewithpan SE_W085B, SOUND_PAN_ATTACKER createsprite gBattleAnimSpriteTemplate_83D9908, 4, 0, 0, 32, 12, 0, 20, 0, 0 createsprite gBattleAnimSpriteTemplate_83D9908, 4, 0, 0, 32, 12, 64, 20, 1, 0 createsprite gBattleAnimSpriteTemplate_83D9908, 4, 0, 0, 32, 12, 128, 20, 0, 0 @@ -1977,7 +1977,7 @@ Move_SPARK: @ 81C9EA3 createvisualtask sub_80E1F8C, 2, 3, -31, 1, 0, 0, 23551 createsprite gHorizontalLungeSpriteTemplate, 2, 4, 4 delay 4 - playsewithpan SE_W063, 63 + playsewithpan SE_W063, SOUND_PAN_TARGET createsprite gBasicHitSplatSpriteTemplate, 130, 0, 0, 1, 2 createvisualtask AnimTask_ShakeMon, 2, ANIM_BANK_TARGET, 3, 0, 6, 1 waitforvisualfinish @@ -1987,13 +1987,13 @@ Move_SPARK: @ 81C9EA3 end Move_ATTRACT: @ 81CA0BA - loadspritegfx 10216 - loopsewithpan SE_W204, 192, 12, 3 + loadspritegfx ANIM_TAG_RED_HEART + loopsewithpan SE_W204, SOUND_PAN_ATTACKER, 12, 3 createvisualtask AnimTask_SwayMon, 5, 0, 12, 4096, 4, 0 delay 15 createsprite gBattleAnimSpriteTemplate_83D7AB0, 131, 20, -8 waitforvisualfinish - playsewithpan SE_W213, 63 + playsewithpan SE_W213, SOUND_PAN_TARGET createsprite gBattleAnimSpriteTemplate_83D7AC8, 131, 160, -32 createsprite gBattleAnimSpriteTemplate_83D7AC8, 131, -256, -40 createsprite gBattleAnimSpriteTemplate_83D7AC8, 131, 128, -16 @@ -2023,12 +2023,12 @@ Move_GROWTH: @ 81CA1B3 end _81CA1C0: createvisualtask sub_80E1F8C, 2, 2, 0, 2, 0, 8, 32767 - playsewithpan SE_W036, 192 + playsewithpan SE_W036, SOUND_PAN_ATTACKER createvisualtask AnimTask_ScaleMonAndRestore, 5, -3, -3, 16, ANIM_BANK_ATTACKER, 0 return Move_WHIRLWIND: @ 81CA1E9 - loadspritegfx 10162 + loadspritegfx ANIM_TAG_WHIRLWIND_LINES createsprite gBattleAnimSpriteTemplate_83DA51C, 2, 0, -8, 1, 60, 0 createsprite gBattleAnimSpriteTemplate_83DA51C, 2, 0, 0, 1, 60, 1 createsprite gBattleAnimSpriteTemplate_83DA51C, 2, 0, 8, 1, 60, 2 @@ -2036,27 +2036,27 @@ Move_WHIRLWIND: @ 81CA1E9 createsprite gBattleAnimSpriteTemplate_83DA51C, 2, 0, 24, 1, 60, 4 createsprite gBattleAnimSpriteTemplate_83DA51C, 2, 0, 32, 1, 60, 0 delay 5 - loopsewithpan SE_W104, 63, 10, 4 + loopsewithpan SE_W104, SOUND_PAN_TARGET, 10, 4 createvisualtask AnimTask_ShakeMon2, 2, ANIM_BANK_TARGET, 4, 0, 15, 1 delay 29 createvisualtask AnimTask_TranslateMonEllipticalRespectSide, 2, ANIM_BANK_TARGET, 12, 6, 1, 5 delay 7 - playsewithpan SE_W081, 63 + playsewithpan SE_W081, SOUND_PAN_TARGET createvisualtask sub_80A8A80, 5, 1, 8 waitforvisualfinish end Move_CONFUSE_RAY: @ 81CA291 - loadspritegfx 10013 + loadspritegfx ANIM_TAG_YELLOW_BALL monbg ANIM_BANK_DEF_PARTNER - fadetobg 2 + fadetobg BG_GHOST waitbgfadein createvisualtask sub_812B374, 2, -64, 63, 2, 0 createvisualtask sub_80E2094, 2, 10013, 0, 6, 0, 14, 351 createsprite gBattleAnimSpriteTemplate_83DAE64, 130, 28, 0, 288 waitforvisualfinish setalpha 8, 8 - playsewithpan SE_W081B, 63 + playsewithpan SE_W081B, SOUND_PAN_TARGET createsprite gBattleAnimSpriteTemplate_83DAE7C, 130, 0, -16 waitforvisualfinish delay 0 @@ -2067,24 +2067,24 @@ Move_CONFUSE_RAY: @ 81CA291 end Move_LOCK_ON: @ 81CA2E4 - loadspritegfx 10014 + loadspritegfx ANIM_TAG_LOCK_ON createsprite gBattleAnimSpriteTemplate_83D6DAC, 40 createsprite gBattleAnimSpriteTemplate_83D6DC4, 40, 1 createsprite gBattleAnimSpriteTemplate_83D6DC4, 40, 2 createsprite gBattleAnimSpriteTemplate_83D6DC4, 40, 3 createsprite gBattleAnimSpriteTemplate_83D6DC4, 40, 4 delay 120 - setarg 7, -1 + setarg ARG_RET_ID, -1 waitforvisualfinish end Move_MEAN_LOOK: @ 81CA31A - loadspritegfx 10187 + loadspritegfx ANIM_TAG_EYE monbg ANIM_BANK_DEF_PARTNER - playsewithpan SE_W060, 192 + playsewithpan SE_W060, SOUND_PAN_ATTACKER createsprite gSimplePaletteBlendSpriteTemplate, 2, 1, 1, 0, 16, rgb(0, 0, 0) - loopsewithpan SE_W109, 63, 15, 4 - waitplaysewithpan SE_W043, 63, 85 + loopsewithpan SE_W109, SOUND_PAN_TARGET, 15, 4 + waitplaysewithpan SE_W043, SOUND_PAN_TARGET, 85 createsprite gBattleAnimSpriteTemplate_8402264, 2 delay 120 createsprite gSimplePaletteBlendSpriteTemplate, 2, 1, 2, 16, 0, rgb(0, 0, 0) @@ -2094,41 +2094,41 @@ Move_MEAN_LOOK: @ 81CA31A end Move_ROCK_THROW: @ 81CA35F - loadspritegfx 10058 + loadspritegfx ANIM_TAG_ROCKS createsprite gBattleAnimSpriteTemplate_83DB428, 130, 6, 1, 15, 1 createsprite gBattleAnimSpriteTemplate_83DAC4C, 130, 0, 1, 0, 0 - playsewithpan SE_W088, 63 + playsewithpan SE_W088, SOUND_PAN_TARGET delay 6 createsprite gBattleAnimSpriteTemplate_83DAC4C, 130, 19, 1, 10, 0 - playsewithpan SE_W088, 63 + playsewithpan SE_W088, SOUND_PAN_TARGET delay 6 createsprite gBattleAnimSpriteTemplate_83DAC4C, 130, -23, 2, -10, 0 - playsewithpan SE_W088, 63 + playsewithpan SE_W088, SOUND_PAN_TARGET createvisualtask AnimTask_ShakeMon, 2, ANIM_BANK_TARGET, 0, 5, 20, 1 delay 6 createsprite gBattleAnimSpriteTemplate_83DAC4C, 130, -15, 1, -10, 0 - playsewithpan SE_W088, 63 + playsewithpan SE_W088, SOUND_PAN_TARGET delay 6 createsprite gBattleAnimSpriteTemplate_83DAC4C, 130, 23, 2, 10, 0 - playsewithpan SE_W088, 63 + playsewithpan SE_W088, SOUND_PAN_TARGET waitforvisualfinish end Move_ROCK_SLIDE: @ 81CA3EB - loadspritegfx 10058 + loadspritegfx ANIM_TAG_ROCKS monbg ANIM_BANK_DEF_PARTNER createsprite gBattleAnimSpriteTemplate_83DB428, 2, 7, 1, 11, 1 createsprite gBattleAnimSpriteTemplate_83DAC4C, 130, -5, 1, -5, 1 - playsewithpan SE_W088, 63 + playsewithpan SE_W088, SOUND_PAN_TARGET delay 2 createsprite gBattleAnimSpriteTemplate_83DAC4C, 130, 5, 0, 6, 1 - playsewithpan SE_W088, 63 + playsewithpan SE_W088, SOUND_PAN_TARGET delay 2 createsprite gBattleAnimSpriteTemplate_83DAC4C, 130, 19, 1, 10, 1 - playsewithpan SE_W088, 63 + playsewithpan SE_W088, SOUND_PAN_TARGET delay 2 createsprite gBattleAnimSpriteTemplate_83DAC4C, 130, -23, 2, -10, 1 - playsewithpan SE_W088, 63 + playsewithpan SE_W088, SOUND_PAN_TARGET createvisualtask AnimTask_ShakeMon, 2, ANIM_BANK_TARGET, 0, 5, 50, 1 createvisualtask AnimTask_ShakeMon, 2, ANIM_BANK_DEF_PARTNER, 0, 5, 50, 1 delay 2 @@ -2139,41 +2139,41 @@ Move_ROCK_SLIDE: @ 81CA3EB end _81CA483: createsprite gBattleAnimSpriteTemplate_83DAC4C, 130, -20, 0, -10, 1 - playsewithpan SE_W088, 63 + playsewithpan SE_W088, SOUND_PAN_TARGET delay 2 createsprite gBattleAnimSpriteTemplate_83DAC4C, 130, 28, 1, 10, 1 - playsewithpan SE_W088, 63 + playsewithpan SE_W088, SOUND_PAN_TARGET delay 2 createsprite gBattleAnimSpriteTemplate_83DAC4C, 130, -10, 1, -5, 1 - playsewithpan SE_W088, 63 + playsewithpan SE_W088, SOUND_PAN_TARGET delay 2 createsprite gBattleAnimSpriteTemplate_83DAC4C, 130, 10, 0, 6, 1 - playsewithpan SE_W088, 63 + playsewithpan SE_W088, SOUND_PAN_TARGET delay 2 createsprite gBattleAnimSpriteTemplate_83DAC4C, 130, 24, 1, 10, 1 - playsewithpan SE_W088, 63 + playsewithpan SE_W088, SOUND_PAN_TARGET delay 2 createsprite gBattleAnimSpriteTemplate_83DAC4C, 130, -32, 2, -10, 1 - playsewithpan SE_W088, 63 + playsewithpan SE_W088, SOUND_PAN_TARGET delay 2 createsprite gBattleAnimSpriteTemplate_83DAC4C, 130, -20, 0, -10, 1 - playsewithpan SE_W088, 63 + playsewithpan SE_W088, SOUND_PAN_TARGET delay 2 createsprite gBattleAnimSpriteTemplate_83DAC4C, 130, 30, 2, 10, 1 - playsewithpan SE_W088, 63 + playsewithpan SE_W088, SOUND_PAN_TARGET delay 2 return Move_THIEF: @ 81CA52C - loadspritegfx 10135 + loadspritegfx ANIM_TAG_IMPACT monbg ANIM_BANK_TARGET delay 1 - fadetobg 1 + fadetobg BG_DARK waitbgfadein setalpha 12, 8 createsprite gHorizontalLungeSpriteTemplate, 2, 6, 4 delay 6 - playsewithpan SE_W233, 63 + playsewithpan SE_W233, SOUND_PAN_TARGET createsprite gBasicHitSplatSpriteTemplate, 2, 0, 0, 1, 2 createvisualtask AnimTask_ShakeMon2, 2, ANIM_BANK_TARGET, 1, 0, 8, 1 waitforvisualfinish @@ -2185,8 +2185,8 @@ Move_THIEF: @ 81CA52C end Move_BUBBLE_BEAM: @ 81CA573 - loadspritegfx 10146 - loadspritegfx 10155 + loadspritegfx ANIM_TAG_BUBBLE + loadspritegfx ANIM_TAG_SMALL_BUBBLES monbg ANIM_BANK_TARGET monbgprio_28 1 setalpha 12, 8 @@ -2203,40 +2203,40 @@ Move_BUBBLE_BEAM: @ 81CA573 end _81CA5AD: createsprite gBattleAnimSpriteTemplate_83D9178, 2, 18, 0, 35, 70, 0, 256, 50 - playsewithpan SE_W145, 192 + playsewithpan SE_W145, SOUND_PAN_ATTACKER delay 3 createsprite gBattleAnimSpriteTemplate_83D9178, 2, 18, 0, 20, 40, -10, 256, 50 - playsewithpan SE_W145, 192 + playsewithpan SE_W145, SOUND_PAN_ATTACKER delay 3 createsprite gBattleAnimSpriteTemplate_83D9178, 2, 18, 0, 10, -60, 0, 256, 50 - playsewithpan SE_W145, 192 + playsewithpan SE_W145, SOUND_PAN_ATTACKER delay 3 createsprite gBattleAnimSpriteTemplate_83D9178, 2, 18, 0, 15, -15, 10, 256, 50 - playsewithpan SE_W145, 192 + playsewithpan SE_W145, SOUND_PAN_ATTACKER delay 3 createsprite gBattleAnimSpriteTemplate_83D9178, 2, 18, 0, 30, 10, -10, 256, 50 - playsewithpan SE_W145, 192 + playsewithpan SE_W145, SOUND_PAN_ATTACKER delay 3 createsprite gBattleAnimSpriteTemplate_83D9178, 2, 18, 0, 25, -30, 10, 256, 50 - playsewithpan SE_W145, 192 + playsewithpan SE_W145, SOUND_PAN_ATTACKER delay 3 return Move_ICY_WIND: @ 81CA650 - loadspritegfx 10141 - loadspritegfx 10142 + loadspritegfx ANIM_TAG_ICE_CRYSTALS + loadspritegfx ANIM_TAG_ICE_SPIKES monbg ANIM_BANK_DEF_PARTNER createvisualtask sub_80E2A38, 10, 11, 4, 0, 4, 0 - fadetobg 15 + fadetobg BG_ICE waitbgfadeout playsewithpan SE_W196, 0 waitbgfadein waitforvisualfinish - panse_1B SE_W016, 192, 63, 2, 0 + panse_1B SE_W016, SOUND_PAN_ATTACKER, SOUND_PAN_TARGET, 2, 0 call _81CA6A8 delay 5 call _81CA6A8 - playsewithpan SE_W016B, 63 + playsewithpan SE_W016B, SOUND_PAN_TARGET delay 55 call Unknown_81D5E0E waitforvisualfinish @@ -2259,14 +2259,14 @@ _81CA6A8: return Move_SMOKESCREEN: @ 81CA710 - loadspritegfx 10016 - loadspritegfx 10017 - playsewithpan SE_W104, 192 + loadspritegfx ANIM_TAG_BLACK_SMOKE + loadspritegfx ANIM_TAG_BLACK_BALL + playsewithpan SE_W104, SOUND_PAN_ATTACKER createsprite gBattleAnimSpriteTemplate_84021B0, 130, 20, 0, 0, 0, 35, -25 waitforvisualfinish createvisualtask sub_812C1D0, 2 delay 2 - playsewithpan SE_W028, 63 + playsewithpan SE_W028, SOUND_PAN_TARGET createsprite gBattleAnimSpriteTemplate_8402198, 132, 0, -12, 104, 0, 75 createsprite gBattleAnimSpriteTemplate_8402198, 132, 0, -12, 72, 1, 75 createsprite gBattleAnimSpriteTemplate_8402198, 132, 0, -6, 56, 1, 75 @@ -2283,12 +2283,12 @@ Move_SMOKESCREEN: @ 81CA710 end Move_CONVERSION: @ 81CA809 - loadspritegfx 10018 + loadspritegfx ANIM_TAG_CONVERSION monbg ANIM_BANK_ATK_PARTNER monbgprio_28 0 setalpha 16, 0 delay 0 - playsewithpan SE_W129, 192 + playsewithpan SE_W129, SOUND_PAN_ATTACKER createsprite gBattleAnimSpriteTemplate_83D6F80, 2, -24, -24 delay 3 createsprite gBattleAnimSpriteTemplate_83D6F80, 2, -8, -24 @@ -2297,7 +2297,7 @@ Move_CONVERSION: @ 81CA809 delay 3 createsprite gBattleAnimSpriteTemplate_83D6F80, 2, 24, -24 delay 3 - playsewithpan SE_W129, 192 + playsewithpan SE_W129, SOUND_PAN_ATTACKER createsprite gBattleAnimSpriteTemplate_83D6F80, 2, -24, -8 delay 3 createsprite gBattleAnimSpriteTemplate_83D6F80, 2, -8, -8 @@ -2306,7 +2306,7 @@ Move_CONVERSION: @ 81CA809 delay 3 createsprite gBattleAnimSpriteTemplate_83D6F80, 2, 24, -8 delay 3 - playsewithpan SE_W129, 192 + playsewithpan SE_W129, SOUND_PAN_ATTACKER createsprite gBattleAnimSpriteTemplate_83D6F80, 2, -24, 8 delay 3 createsprite gBattleAnimSpriteTemplate_83D6F80, 2, -8, 8 @@ -2315,7 +2315,7 @@ Move_CONVERSION: @ 81CA809 delay 3 createsprite gBattleAnimSpriteTemplate_83D6F80, 2, 24, 8 delay 3 - playsewithpan SE_W129, 192 + playsewithpan SE_W129, SOUND_PAN_ATTACKER createsprite gBattleAnimSpriteTemplate_83D6F80, 2, -24, 24 delay 3 createsprite gBattleAnimSpriteTemplate_83D6F80, 2, -8, 24 @@ -2324,7 +2324,7 @@ Move_CONVERSION: @ 81CA809 delay 3 createsprite gBattleAnimSpriteTemplate_83D6F80, 2, 24, 24 delay 20 - playsewithpan SE_W112, 192 + playsewithpan SE_W112, SOUND_PAN_ATTACKER createvisualtask sub_80E21A8, 2, 10018, 1, 1, 14335, 12, 0, 0 delay 6 createvisualtask sub_80CE108, 5 @@ -2335,12 +2335,12 @@ Move_CONVERSION: @ 81CA809 end Move_CONVERSION_2: @ 81CA91E - loadspritegfx 10018 + loadspritegfx ANIM_TAG_CONVERSION monbg ANIM_BANK_DEF_PARTNER monbgprio_2A ANIM_BANK_TARGET setalpha 0, 16 delay 0 - playsewithpan SE_W112, 63 + playsewithpan SE_W112, SOUND_PAN_TARGET createsprite gBattleAnimSpriteTemplate_83D6FB0, 2, -24, -24, 60 createsprite gBattleAnimSpriteTemplate_83D6FB0, 2, -8, -24, 65 createsprite gBattleAnimSpriteTemplate_83D6FB0, 2, 8, -24, 70 @@ -2359,40 +2359,40 @@ Move_CONVERSION_2: @ 81CA91E createsprite gBattleAnimSpriteTemplate_83D6FB0, 2, 24, 24, 135 createvisualtask sub_80CE210, 5 delay 60 - playsewithpan SE_W129, 63 + playsewithpan SE_W129, SOUND_PAN_TARGET delay 10 - playsewithpan SE_W129, 63 + playsewithpan SE_W129, SOUND_PAN_TARGET delay 10 - playsewithpan SE_W129, 63 + playsewithpan SE_W129, SOUND_PAN_TARGET delay 10 - playsewithpan SE_W129, 63 + playsewithpan SE_W129, SOUND_PAN_TARGET delay 10 - playsewithpan SE_W129, 63 + playsewithpan SE_W129, SOUND_PAN_TARGET delay 10 - playsewithpan SE_W129, 63 + playsewithpan SE_W129, SOUND_PAN_TARGET delay 10 - playsewithpan SE_W129, 63 + playsewithpan SE_W129, SOUND_PAN_TARGET delay 10 - playsewithpan SE_W129, 63 + playsewithpan SE_W129, SOUND_PAN_TARGET waitforvisualfinish clearmonbg ANIM_BANK_DEF_PARTNER blendoff end Move_ROLLING_KICK: @ 81CAA3A - loadspritegfx 10143 - loadspritegfx 10135 + loadspritegfx ANIM_TAG_HANDS_AND_FEET + loadspritegfx ANIM_TAG_IMPACT monbg ANIM_BANK_TARGET setalpha 12, 8 createvisualtask AnimTask_TranslateMonEllipticalRespectSide, 2, ANIM_BANK_ATTACKER, 18, 6, 1, 4 - playsewithpan SE_W104, 192 + playsewithpan SE_W104, SOUND_PAN_ATTACKER delay 6 - playsewithpan SE_W104, 192 + playsewithpan SE_W104, SOUND_PAN_ATTACKER waitforvisualfinish createsprite gSlideMonToOffsetSpriteTemplate, 2, 0, 20, 0, 0, 4 createsprite gBattleAnimSpriteTemplate_83D9FF0, 2, -24, 0, 48, 10, 160, 0 delay 5 - playsewithpan SE_W233B, 63 + playsewithpan SE_W233B, SOUND_PAN_TARGET createsprite gBasicHitSplatSpriteTemplate, 2, -8, 0, 1, 2 createvisualtask AnimTask_ShakeMon, 2, ANIM_BANK_TARGET, 5, 0, 6, 1 waitforvisualfinish @@ -2402,9 +2402,9 @@ Move_ROLLING_KICK: @ 81CAA3A end Move_HEADBUTT: @ 81CAABD - loadspritegfx 10135 + loadspritegfx ANIM_TAG_IMPACT createsprite gBattleAnimSpriteTemplate_83D6DE4, 2, 0 - playsewithpan SE_W029, 192 + playsewithpan SE_W029, SOUND_PAN_ATTACKER waitforvisualfinish delay 2 createsprite gBattleAnimSpriteTemplate_83D6DE4, 2, 1 @@ -2413,15 +2413,15 @@ Move_HEADBUTT: @ 81CAABD createvisualtask AnimTask_ShakeMon, 2, ANIM_BANK_TARGET, 5, 0, 6, 1 createsprite gBattleAnimSpriteTemplate_83D6DE4, 2, 2 createsprite gBattleAnimSpriteTemplate_83DB538, 131, 0, 0, 1, 1 - playsewithpan SE_W233B, 63 + playsewithpan SE_W233B, SOUND_PAN_TARGET waitforvisualfinish end Move_HORN_ATTACK: @ 81CAB1A - loadspritegfx 10135 - loadspritegfx 10020 + loadspritegfx ANIM_TAG_IMPACT + loadspritegfx ANIM_TAG_HORN_HIT createsprite gBattleAnimSpriteTemplate_83D6DE4, 2, 0 - playsewithpan SE_W029, 192 + playsewithpan SE_W029, SOUND_PAN_ATTACKER waitforvisualfinish delay 2 createsprite gBattleAnimSpriteTemplate_83D6DE4, 2, 1 @@ -2431,13 +2431,13 @@ Move_HORN_ATTACK: @ 81CAB1A createvisualtask AnimTask_ShakeMon, 2, ANIM_BANK_TARGET, 5, 0, 6, 1 createsprite gBattleAnimSpriteTemplate_83D6DE4, 2, 2 createsprite gBattleAnimSpriteTemplate_83DB538, 131, 0, 0, 1, 1 - playsewithpan SE_W030, 63 + playsewithpan SE_W030, SOUND_PAN_TARGET waitforvisualfinish end Move_FURY_ATTACK: @ 81CAB87 - loadspritegfx 10135 - loadspritegfx 10020 + loadspritegfx ANIM_TAG_IMPACT + loadspritegfx ANIM_TAG_HORN_HIT createvisualtask sub_80A8E04, 2, 4, 256, 0, 2 choosetwoturnanim _81CABB8, _81CABDE _81CABA5: @@ -2448,27 +2448,27 @@ _81CABB8: createsprite gBattleAnimSpriteTemplate_83D7050, 132, 8, 8, 10 waitforvisualfinish createsprite gBattleAnimSpriteTemplate_83DB538, 131, 0, 0, 1, 1 - playsewithpan SE_W030, 63 + playsewithpan SE_W030, SOUND_PAN_TARGET goto _81CABA5 _81CABDE: createsprite gBattleAnimSpriteTemplate_83D7050, 132, -8, -8, 10 waitforvisualfinish createsprite gBattleAnimSpriteTemplate_83DB538, 131, 0, 0, 1, 1 - playsewithpan SE_W030, 63 + playsewithpan SE_W030, SOUND_PAN_TARGET goto _81CABA5 Move_HORN_DRILL: @ 81CAC04 - loadspritegfx 10135 - loadspritegfx 10020 + loadspritegfx ANIM_TAG_IMPACT + loadspritegfx ANIM_TAG_HORN_HIT jumpifcontest _81CAD6A - fadetobg 7 + fadetobg BG_DRILL waitbgfadeout createvisualtask sub_80E3A58, 5, -2304, 768, 1, -1 _81CAC21: waitbgfadein setalpha 12, 8 createsprite gBattleAnimSpriteTemplate_83D6DE4, 2, 0 - playsewithpan SE_W029, 192 + playsewithpan SE_W029, SOUND_PAN_ATTACKER waitforvisualfinish delay 2 createsprite gBattleAnimSpriteTemplate_83D6DE4, 2, 1 @@ -2478,75 +2478,75 @@ _81CAC21: 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 + playsewithpan SE_W030, SOUND_PAN_TARGET delay 4 createsprite gBattleAnimSpriteTemplate_83DB538, 131, 0, 2, 1, 3 - playsewithpan SE_W030, 63 + playsewithpan SE_W030, SOUND_PAN_TARGET delay 4 createsprite gBattleAnimSpriteTemplate_83DB538, 131, -4, 3, 1, 3 - playsewithpan SE_W030, 63 + playsewithpan SE_W030, SOUND_PAN_TARGET delay 4 createsprite gBattleAnimSpriteTemplate_83DB538, 131, -8, -5, 1, 3 - playsewithpan SE_W030, 63 + playsewithpan SE_W030, SOUND_PAN_TARGET delay 4 createsprite gBattleAnimSpriteTemplate_83DB538, 131, 4, -12, 1, 3 - playsewithpan SE_W030, 63 + playsewithpan SE_W030, SOUND_PAN_TARGET delay 4 createsprite gBattleAnimSpriteTemplate_83DB538, 131, 16, 0, 1, 3 - playsewithpan SE_W030, 63 + playsewithpan SE_W030, SOUND_PAN_TARGET delay 4 createsprite gBattleAnimSpriteTemplate_83DB538, 131, 5, 18, 1, 3 - playsewithpan SE_W030, 63 + playsewithpan SE_W030, SOUND_PAN_TARGET delay 4 createsprite gBattleAnimSpriteTemplate_83DB538, 131, -17, 12, 1, 2 - playsewithpan SE_W030, 63 + playsewithpan SE_W030, SOUND_PAN_TARGET delay 4 createsprite gBattleAnimSpriteTemplate_83DB538, 131, -21, -15, 1, 2 - playsewithpan SE_W030, 63 + playsewithpan SE_W030, SOUND_PAN_TARGET delay 4 createsprite gBattleAnimSpriteTemplate_83DB538, 131, 8, -27, 1, 2 - playsewithpan SE_W030, 63 + playsewithpan SE_W030, SOUND_PAN_TARGET delay 4 createsprite gBattleAnimSpriteTemplate_83DB538, 131, 32, 0, 1, 2 - playsewithpan SE_W030, 63 + playsewithpan SE_W030, SOUND_PAN_TARGET delay 4 createsprite gBattleAnimSpriteTemplate_83D6DE4, 2, 2 waitforvisualfinish restorebg waitbgfadeout - setarg 7, -1 + setarg ARG_RET_ID, -1 waitbgfadein end _81CAD6A: - fadetobg 8 + fadetobg BG_DRILL_CONTESTS waitbgfadeout createvisualtask sub_80E3A58, 5, 2304, 768, 0, -1 goto _81CAC21 Move_THRASH: @ 81CAD81 - loadspritegfx 10135 - loadspritegfx 10143 + loadspritegfx ANIM_TAG_IMPACT + loadspritegfx ANIM_TAG_HANDS_AND_FEET createvisualtask sub_80D0A4C, 2 createvisualtask sub_80D0AB8, 2 createsprite gBattleAnimSpriteTemplate_83D9FC0, 131, 1, 10, 0 createvisualtask AnimTask_ShakeMonInPlace, 2, ANIM_BANK_TARGET, 4, 0, 7, 1 - playsewithpan SE_W004, 63 + playsewithpan SE_W004, SOUND_PAN_TARGET delay 28 createsprite gBattleAnimSpriteTemplate_83D9FC0, 131, 1, 10, 1 createvisualtask AnimTask_ShakeMonInPlace, 2, ANIM_BANK_TARGET, 4, 0, 7, 1 - playsewithpan SE_W233B, 63 + playsewithpan SE_W233B, SOUND_PAN_TARGET delay 28 createsprite gBattleAnimSpriteTemplate_83D9FC0, 131, 1, 10, 3 createvisualtask AnimTask_ShakeMonInPlace, 2, ANIM_BANK_TARGET, 8, 0, 16, 1 - playsewithpan SE_W025B, 63 + playsewithpan SE_W025B, SOUND_PAN_TARGET end Move_SING: @ 81CAE00 - loadspritegfx 10072 + loadspritegfx ANIM_TAG_MUSIC_NOTES monbg ANIM_BANK_DEF_PARTNER createvisualtask sub_80CEA20, 2 waitforvisualfinish - panse_1B SE_W047, 192, 63, 2, 0 + panse_1B SE_W047, SOUND_PAN_ATTACKER, SOUND_PAN_TARGET, 2, 0 createsprite gBattleAnimSpriteTemplate_83D7114, 130, 7, 0, 12 delay 5 createsprite gBattleAnimSpriteTemplate_83D7114, 130, 6, 1, 12 @@ -2578,14 +2578,14 @@ Move_SING: @ 81CAE00 end Move_LOW_KICK: @ 81CAED4 - loadspritegfx 10143 - loadspritegfx 10135 + loadspritegfx ANIM_TAG_HANDS_AND_FEET + loadspritegfx ANIM_TAG_IMPACT 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 + playsewithpan SE_W233B, SOUND_PAN_TARGET waitforvisualfinish createsprite gSlideMonToOriginalPosSpriteTemplate, 2, 0, 1, 4 end @@ -2601,10 +2601,10 @@ Move_EARTHQUAKE: @ 81CAF31 end Move_FISSURE: @ 81CAF7E - loadspritegfx 10074 + loadspritegfx ANIM_TAG_MUD_SAND createvisualtask sub_80E1864, 3, 5, 10, 50 createvisualtask sub_80E1864, 3, 1, 10, 50 - playsewithpan SE_W089, 63 + playsewithpan SE_W089, SOUND_PAN_TARGET delay 8 call _81CAFFF delay 15 @@ -2616,14 +2616,14 @@ Move_FISSURE: @ 81CAF7E delay 15 call _81CAFFF delay 50 - fadetobg 21 + fadetobg BG_FISSURE waitbgfadeout createvisualtask sub_80E1BB0, 5, 1, 5, -1 waitbgfadein delay 40 restorebg waitbgfadeout - setarg 7, -1 + setarg ARG_RET_ID, -1 waitbgfadein end _81CAFFF: @@ -2631,14 +2631,14 @@ _81CAFFF: createsprite gDirtPlumeSpriteTemplate, 130, 1, 0, 16, -16, -10, 24 createsprite gDirtPlumeSpriteTemplate, 130, 1, 1, 14, -52, -18, 24 createsprite gDirtPlumeSpriteTemplate, 130, 1, 1, 12, -32, -16, 24 - playsewithpan SE_W091, 63 + playsewithpan SE_W091, SOUND_PAN_TARGET return _81CB050: createsprite gDirtPlumeSpriteTemplate, 130, 1, 0, 12, -24, -16, 24 createsprite gDirtPlumeSpriteTemplate, 130, 1, 0, 16, -38, -10, 24 createsprite gDirtPlumeSpriteTemplate, 130, 1, 1, 14, -20, -18, 24 createsprite gDirtPlumeSpriteTemplate, 130, 1, 1, 12, -36, -16, 24 - playsewithpan SE_W091, 63 + playsewithpan SE_W091, SOUND_PAN_TARGET return Move_DIG: @ 81CB0A1 @@ -2646,11 +2646,11 @@ Move_DIG: @ 81CB0A1 _81CB0AA: end _81CB0AB: - loadspritegfx 10074 - loadspritegfx 10281 + loadspritegfx ANIM_TAG_MUD_SAND + loadspritegfx ANIM_TAG_DIRT_MOUND createsprite gDigDirtMoundSpriteTemplate, 1, 0, 0, 180 createsprite gDigDirtMoundSpriteTemplate, 1, 0, 1, 180 - monbg_22 0 + monbg_22 ANIM_BANK_ATTACKER delay 1 createvisualtask sub_80E1244, 2, 0 delay 6 @@ -2660,13 +2660,13 @@ _81CB0AB: call _81CB16A call _81CB16A waitforvisualfinish - clearmonbg_23 0 + clearmonbg_23 ANIM_BANK_ATTACKER delay 1 createvisualtask sub_80E1244, 2, 1 goto _81CB0AA _81CB106: - loadspritegfx 10135 - loadspritegfx 10281 + loadspritegfx ANIM_TAG_IMPACT + loadspritegfx ANIM_TAG_DIRT_MOUND createvisualtask sub_80E149C, 2, 0 waitforvisualfinish monbg ANIM_BANK_ATTACKER @@ -2677,7 +2677,7 @@ _81CB106: delay 16 createsprite gBasicHitSplatSpriteTemplate, 2, -8, 0, 1, 2 createvisualtask AnimTask_ShakeMon, 2, ANIM_BANK_TARGET, 5, 0, 6, 1 - playsewithpan SE_W025B, 192 + playsewithpan SE_W025B, SOUND_PAN_ATTACKER clearmonbg ANIM_BANK_ATTACKER goto _81CB0AA _81CB16A: @@ -2685,16 +2685,16 @@ _81CB16A: createsprite gDirtPlumeSpriteTemplate, 2, 0, 0, 16, 4, -10, 18 createsprite gDirtPlumeSpriteTemplate, 2, 0, 1, 14, 4, -18, 18 createsprite gDirtPlumeSpriteTemplate, 2, 0, 1, 12, 4, -16, 18 - playsewithpan SE_W091, 192 + playsewithpan SE_W091, SOUND_PAN_ATTACKER delay 32 return Move_MEDITATE: @ 81CB1BD call Unknown_81D61E7 createvisualtask sub_80DBC94, 2 - playsewithpan SE_W029, 192 + playsewithpan SE_W029, SOUND_PAN_ATTACKER delay 16 - playsewithpan SE_W036, 192 + playsewithpan SE_W036, SOUND_PAN_ATTACKER waitforvisualfinish call Unknown_81D61F3 end @@ -2704,15 +2704,15 @@ Move_AGILITY: @ 81CB1DA setalpha 12, 8 createvisualtask AnimTask_TranslateMonEllipticalRespectSide, 2, ANIM_BANK_ATTACKER, 24, 6, 4, 4 createvisualtask sub_80E2DD8, 2, 0, 4, 7, 10 - playsewithpan SE_W104, 192 + playsewithpan SE_W104, SOUND_PAN_ATTACKER delay 12 - playsewithpan SE_W104, 192 + playsewithpan SE_W104, SOUND_PAN_ATTACKER delay 12 - playsewithpan SE_W104, 192 + playsewithpan SE_W104, SOUND_PAN_ATTACKER delay 12 - playsewithpan SE_W104, 192 + playsewithpan SE_W104, SOUND_PAN_ATTACKER delay 12 - playsewithpan SE_W104, 192 + playsewithpan SE_W104, SOUND_PAN_ATTACKER delay 12 waitforvisualfinish clearmonbg ANIM_BANK_ATK_PARTNER @@ -2721,16 +2721,16 @@ Move_AGILITY: @ 81CB1DA end Move_QUICK_ATTACK: @ 81CB224 - loadspritegfx 10135 + loadspritegfx ANIM_TAG_IMPACT monbg ANIM_BANK_ATK_PARTNER setalpha 12, 8 createvisualtask AnimTask_TranslateMonEllipticalRespectSide, 2, ANIM_BANK_ATTACKER, 24, 6, 1, 5 createvisualtask sub_80E2DD8, 2, 0, 4, 7, 3 - playsewithpan SE_W026, 192 + playsewithpan SE_W026, SOUND_PAN_ATTACKER delay 4 createvisualtask AnimTask_ShakeMon, 2, ANIM_BANK_TARGET, 5, 0, 6, 1 createsprite gBasicHitSplatSpriteTemplate, 132, 0, 0, 1, 1 - playsewithpan SE_W233B, 63 + playsewithpan SE_W233B, SOUND_PAN_TARGET waitforvisualfinish clearmonbg ANIM_BANK_ATK_PARTNER blendoff @@ -2738,22 +2738,22 @@ Move_QUICK_ATTACK: @ 81CB224 end Move_RAGE: @ 81CB27C - loadspritegfx 10135 - loadspritegfx 10087 + loadspritegfx ANIM_TAG_IMPACT + loadspritegfx ANIM_TAG_ANGER monbg ANIM_BANK_TARGET setalpha 12, 8 createvisualtask AnimTask_BlendMonInAndOut, 3, ANIM_BANK_ATTACKER, 31, 10, 0, 2 createsprite gBattleAnimSpriteTemplate_83D7798, 2, 0, -20, -28 - playsewithpan SE_W207B, 192 + playsewithpan SE_W207B, SOUND_PAN_ATTACKER delay 20 createsprite gBattleAnimSpriteTemplate_83D7798, 2, 0, 20, -28 - playsewithpan SE_W207B, 192 + playsewithpan SE_W207B, SOUND_PAN_ATTACKER waitforvisualfinish createsprite gHorizontalLungeSpriteTemplate, 2, 4, 6 delay 4 createsprite gBasicHitSplatSpriteTemplate, 2, 0, 0, 1, 2 createvisualtask sub_80A9058, 2, 1, 1, 10, 1, 0 - playsewithpan SE_W233B, 63 + playsewithpan SE_W233B, SOUND_PAN_TARGET waitforvisualfinish clearmonbg ANIM_BANK_TARGET end @@ -2761,7 +2761,7 @@ Move_RAGE: @ 81CB27C Move_TELEPORT: @ 81CB2F2 call Unknown_81D61E7 createvisualtask sub_80DBCFC, 2 - playsewithpan SE_W100, 192 + playsewithpan SE_W100, SOUND_PAN_ATTACKER delay 15 call Unknown_81D61F3 waitforvisualfinish @@ -2771,23 +2771,23 @@ Move_DOUBLE_TEAM: @ 81CB30B monbg ANIM_BANK_ATK_PARTNER setalpha 12, 8 createvisualtask sub_80CE7E0, 2 - playsewithpan SE_W104, 192 + playsewithpan SE_W104, SOUND_PAN_ATTACKER delay 32 - playsewithpan SE_W104, 192 + playsewithpan SE_W104, SOUND_PAN_ATTACKER delay 24 - playsewithpan SE_W104, 192 + playsewithpan SE_W104, SOUND_PAN_ATTACKER delay 16 - playsewithpan SE_W104, 192 + playsewithpan SE_W104, SOUND_PAN_ATTACKER delay 8 - playsewithpan SE_W104, 192 + playsewithpan SE_W104, SOUND_PAN_ATTACKER delay 8 - playsewithpan SE_W104, 192 + playsewithpan SE_W104, SOUND_PAN_ATTACKER delay 8 - playsewithpan SE_W104, 192 + playsewithpan SE_W104, SOUND_PAN_ATTACKER delay 8 - playsewithpan SE_W104, 192 + playsewithpan SE_W104, SOUND_PAN_ATTACKER delay 8 - playsewithpan SE_W104, 192 + playsewithpan SE_W104, SOUND_PAN_ATTACKER waitforvisualfinish clearmonbg ANIM_BANK_ATK_PARTNER blendoff @@ -2797,20 +2797,20 @@ Move_DOUBLE_TEAM: @ 81CB30B Move_MINIMIZE: @ 81CB352 setalpha 10, 8 createvisualtask sub_80D0488, 2 - loopsewithpan SE_W107, 192, 34, 3 + loopsewithpan SE_W107, SOUND_PAN_ATTACKER, 34, 3 waitforvisualfinish blendoff end Move_METRONOME: @ 81CB365 - loadspritegfx 10064 - loadspritegfx 10209 + loadspritegfx ANIM_TAG_FINGER + loadspritegfx ANIM_TAG_THOUGHT_BUBBLE createsprite gBattleAnimSpriteTemplate_83D7220, 11, 0, 100 - playsewithpan SE_W118, 192 + playsewithpan SE_W118, SOUND_PAN_ATTACKER delay 6 createsprite gBattleAnimSpriteTemplate_83D72C8, 12, 0 delay 24 - loopsewithpan SE_W039, 192, 22, 3 + loopsewithpan SE_W039, SOUND_PAN_ATTACKER, 22, 3 waitforvisualfinish end @@ -2825,7 +2825,7 @@ _81CB399: goto _81CB398 _81CB3A9: createsprite gBattleAnimSpriteTemplate_83C2010, 2, 0, -24, 0, 0, 10, 0 - playsewithpan SE_W036, 192 + playsewithpan SE_W036, SOUND_PAN_ATTACKER waitforvisualfinish createvisualtask sub_80A8E04, 2, 16, 96, 0, 2 waitforvisualfinish @@ -2833,63 +2833,63 @@ _81CB3A9: waitforvisualfinish return _81CB3E6: - loadspritegfx 10135 + loadspritegfx ANIM_TAG_IMPACT createvisualtask sub_80CDAC8, 2, 0 - playsewithpan SE_W036, 192 + playsewithpan SE_W036, SOUND_PAN_ATTACKER waitforvisualfinish playse SE_BAN createsprite gBattleAnimSpriteTemplate_83DB3DC, 2, 1, 3, 1, 0, 14, 32767, 14 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 + loopsewithpan SE_W025B, SOUND_PAN_TARGET, 8, 3 waitforvisualfinish createvisualtask sub_80CDAC8, 2, 1 goto _81CB398 Move_AMNESIA: @ 81CB455 - loadspritegfx 10093 + loadspritegfx ANIM_TAG_AMNESIA call Unknown_81D61E7 delay 8 createsprite gBattleAnimSpriteTemplate_83DA88C, 20 - playsewithpan SE_W118, 192 + playsewithpan SE_W118, SOUND_PAN_ATTACKER delay 54 - loopsewithpan SE_W118, 192, 16, 3 + loopsewithpan SE_W118, SOUND_PAN_ATTACKER, 16, 3 waitforvisualfinish call Unknown_81D61F3 end Move_KINESIS: @ 81CB479 - loadspritegfx 10075 - loadspritegfx 10097 - playsewithpan SE_W060, 192 + loadspritegfx ANIM_TAG_ALERT + loadspritegfx ANIM_TAG_BENT_SPOON + playsewithpan SE_W060, SOUND_PAN_ATTACKER call Unknown_81D61E7 createsprite gBattleAnimSpriteTemplate_83DA824, 20 createsprite gBattleAnimSpriteTemplate_83D7450, 19, 32, -8, 0 createsprite gBattleAnimSpriteTemplate_83D7450, 19, 32, 16, 1 - loopsewithpan SE_W109, 192, 21, 2 + loopsewithpan SE_W109, SOUND_PAN_ATTACKER, 21, 2 delay 60 - playsewithpan SE_W146, 192 + playsewithpan SE_W146, SOUND_PAN_ATTACKER delay 30 - loopsewithpan SE_W146, 192, 20, 2 + loopsewithpan SE_W146, SOUND_PAN_ATTACKER, 20, 2 delay 70 - playsewithpan SE_W207B, 192 + playsewithpan SE_W207B, SOUND_PAN_ATTACKER waitforvisualfinish call Unknown_81D61F3 end Move_GLARE: @ 81CB4CA - loadspritegfx 10248 - loadspritegfx 10218 + loadspritegfx ANIM_TAG_SMALL_RED_EYE + loadspritegfx ANIM_TAG_EYE_SPARKLE createvisualtask sub_81301EC, 5, 0 - playsewithpan SE_W060B, 192 + playsewithpan SE_W060B, SOUND_PAN_ATTACKER waitforvisualfinish createvisualtask sub_80E2A38, 5, 1, 0, 0, 16, 0 waitforvisualfinish createsprite gBattleAnimSpriteTemplate_83D7B94, 0, -16, -8 createsprite gBattleAnimSpriteTemplate_83D7B94, 0, 16, -8 createvisualtask sub_80D23B4, 5 - playsewithpan SE_W043, 192 + playsewithpan SE_W043, SOUND_PAN_ATTACKER delay 2 createvisualtask sub_80D60B4, 3, 20, 1, 0 waitforvisualfinish @@ -2897,14 +2897,14 @@ Move_GLARE: @ 81CB4CA end Move_BARRAGE: @ 81CB533 - loadspritegfx 10254 + loadspritegfx ANIM_TAG_RED_BALL createvisualtask sub_8130554, 3 - playsewithpan SE_W207, 192 + playsewithpan SE_W207, SOUND_PAN_ATTACKER delay 24 createsprite gBattleAnimSpriteTemplate_83DB428, 2, 8, 1, 40, 1 createvisualtask AnimTask_ShakeMon, 3, 1, 0, 4, 20, 1 createvisualtask AnimTask_ShakeMon, 3, 3, 0, 4, 20, 1 - loopsewithpan SE_W070, 63, 8, 2 + loopsewithpan SE_W070, SOUND_PAN_TARGET, 8, 2 end Move_SKY_ATTACK: @ 81CB57B @@ -2923,7 +2923,7 @@ _81CB5A0: delay 12 createvisualtask sub_80E2A38, 10, 2, 1, 8, 0, 0 createvisualtask sub_80E1864, 5, 0, 2, 16 - loopsewithpan SE_W287, 192, 4, 8 + loopsewithpan SE_W287, SOUND_PAN_ATTACKER, 4, 8 createvisualtask sub_80E2A38, 10, 2, 1, 0, 15, 32767 delay 20 createvisualtask sub_80E2A38, 10, 2, 1, 15, 0, 32767 @@ -2939,7 +2939,7 @@ _81CB617: delay 12 createvisualtask sub_80E2A38, 10, 2, 1, 8, 0, 0 createvisualtask sub_80E1864, 5, 0, 2, 16 - playsewithpan SE_W287, 192 + playsewithpan SE_W287, SOUND_PAN_ATTACKER delay 8 createvisualtask sub_80E2A38, 10, 2, 1, 0, 15, 32767 delay 20 @@ -2951,8 +2951,8 @@ _81CB617: blendoff goto _81CB584 _81CB68E: - loadspritegfx 10135 - loadspritegfx 10284 + loadspritegfx ANIM_TAG_IMPACT + loadspritegfx ANIM_TAG_BIRD call Unknown_81D61FB monbg ANIM_BANK_ATTACKER createvisualtask sub_80E2A38, 10, 2, 0, 0, 16, 32767 @@ -2974,7 +2974,7 @@ _81CB68E: goto _81CB584 Move_FLASH: @ 81CB713 - playsewithpan SE_W043, 192 + playsewithpan SE_W043, SOUND_PAN_ATTACKER createvisualtask sub_80E388C, 2 waitforvisualfinish end @@ -2982,7 +2982,7 @@ Move_FLASH: @ 81CB713 Move_SPLASH: @ 81CB720 createvisualtask AnimTask_Splash, 2, 0, 3 delay 8 - loopsewithpan SE_W039, 192, 38, 3 + loopsewithpan SE_W039, SOUND_PAN_ATTACKER, 38, 3 waitforvisualfinish end @@ -2990,7 +2990,7 @@ Move_ACID_ARMOR: @ 81CB735 monbg ANIM_BANK_ATTACKER setalpha 15, 0 createvisualtask sub_812F314, 2, 0 - playsewithpan SE_W151, 192 + playsewithpan SE_W151, SOUND_PAN_ATTACKER waitforvisualfinish blendoff clearmonbg ANIM_BANK_ATTACKER @@ -2998,15 +2998,15 @@ Move_ACID_ARMOR: @ 81CB735 end Move_SHARPEN: @ 81CB74E - loadspritegfx 10185 + loadspritegfx ANIM_TAG_SPHERE_TO_CUBE createsprite gBattleAnimSpriteTemplate_83D6EF0, 2 waitforvisualfinish end Move_SUPER_FANG: @ 81CB75A - loadspritegfx 10192 + loadspritegfx ANIM_TAG_FANG_ATTACK createvisualtask AnimTask_ShakeMonInPlace, 2, ANIM_BANK_ATTACKER, 1, 0, 20, 1 - playsewithpan SE_W082, 192 + playsewithpan SE_W082, SOUND_PAN_ATTACKER waitforvisualfinish createvisualtask AnimTask_ShakeMonInPlace, 2, ANIM_BANK_ATTACKER, 3, 0, 48, 1 createvisualtask AnimTask_BlendMonInAndOut, 2, ANIM_BANK_ATTACKER, 1247, 12, 4, 1 @@ -3015,7 +3015,7 @@ Move_SUPER_FANG: @ 81CB75A createsprite gHorizontalLungeSpriteTemplate, 2, 4, 4 delay 4 createsprite gBattleAnimSpriteTemplate_83D7080, 130 - playsewithpan SE_W044, 63 + playsewithpan SE_W044, SOUND_PAN_TARGET delay 8 createsprite gBattleAnimSpriteTemplate_83DB3DC, 2, 1, 3, 1, 2143, 14, 32767, 14 createvisualtask AnimTask_ShakeMon, 2, ANIM_BANK_TARGET, 0, 7, 12, 1 @@ -3024,53 +3024,53 @@ Move_SUPER_FANG: @ 81CB75A end Move_SLASH: @ 81CB7DB - loadspritegfx 10183 + loadspritegfx ANIM_TAG_SLASH createsprite gBattleAnimSpriteTemplate_83D6E38, 130, 1, -8, 0 - playsewithpan SE_W013, 63 + playsewithpan SE_W013, SOUND_PAN_TARGET delay 4 createsprite gBattleAnimSpriteTemplate_83D6E38, 130, 1, 8, 0 createvisualtask AnimTask_ShakeMon2, 2, ANIM_BANK_TARGET, 4, 0, 18, 1 - playsewithpan SE_W013, 63 + playsewithpan SE_W013, SOUND_PAN_TARGET waitforvisualfinish end Move_STRUGGLE: @ 81CB815 - loadspritegfx 10135 - loadspritegfx 10215 + loadspritegfx ANIM_TAG_IMPACT + loadspritegfx ANIM_TAG_MOVEMENT_WAVES monbg ANIM_BANK_TARGET setalpha 12, 8 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 + loopsewithpan SE_W029, SOUND_PAN_ATTACKER, 12, 4 waitforvisualfinish createsprite gBasicHitSplatSpriteTemplate, 3, 0, 0, 1, 2 createvisualtask AnimTask_ShakeMonInPlace, 2, ANIM_BANK_TARGET, 3, 0, 6, 1 - playsewithpan SE_W025B, 63 + playsewithpan SE_W025B, SOUND_PAN_TARGET waitforvisualfinish clearmonbg ANIM_BANK_TARGET blendoff end Move_SKETCH: @ 81CB87B - loadspritegfx 10002 + loadspritegfx ANIM_TAG_PENCIL monbg ANIM_BANK_TARGET createvisualtask sub_80D0C88, 2 createsprite gBattleAnimSpriteTemplate_83D77E0, 130 waitforvisualfinish clearmonbg ANIM_BANK_TARGET createvisualtask AnimTask_Splash, 2, 0, 2 - loopsewithpan SE_W039, 192, 38, 2 + loopsewithpan SE_W039, SOUND_PAN_ATTACKER, 38, 2 end Move_NIGHTMARE: @ 81CB8A3 - fadetobg 2 + fadetobg BG_GHOST waitbgfadein jumpifcontest _81CB8CF monbg ANIM_BANK_DEF_PARTNER createvisualtask sub_80DE1B0, 2 createvisualtask AnimTask_ShakeMon, 2, ANIM_BANK_TARGET, 3, 0, 40, 1 - playsewithpan SE_W171, 63 + playsewithpan SE_W171, SOUND_PAN_TARGET waitforvisualfinish clearmonbg ANIM_BANK_DEF_PARTNER restorebg @@ -3079,35 +3079,35 @@ Move_NIGHTMARE: @ 81CB8A3 _81CB8CF: createvisualtask AnimTask_BlendMonInAndOut, 2, ANIM_BANK_ATTACKER, 32767, 10, 2, 1 createvisualtask AnimTask_ShakeMon, 2, ANIM_BANK_ATTACKER, 3, 0, 32, 1 - playsewithpan SE_W171, 63 + playsewithpan SE_W171, SOUND_PAN_TARGET waitforvisualfinish restorebg waitbgfadein end Move_FLAIL: @ 81CB8F9 - loadspritegfx 10135 + loadspritegfx ANIM_TAG_IMPACT monbg ANIM_BANK_TARGET setalpha 12, 8 createvisualtask sub_812E860, 2, 0 - loopsewithpan SE_W029, 192, 8, 2 + loopsewithpan SE_W029, SOUND_PAN_ATTACKER, 8, 2 waitforvisualfinish createsprite gBattleAnimSpriteTemplate_83DB4F0, 131, 1, 3 createvisualtask sub_80A9058, 2, 0, 1, 30, 1, 0 - playsewithpan SE_W025B, 63 + playsewithpan SE_W025B, SOUND_PAN_TARGET waitforvisualfinish clearmonbg ANIM_BANK_TARGET blendoff end Move_SPITE: @ 81CB936 - fadetobg 2 - playsewithpan SE_W060, 192 + fadetobg BG_GHOST + playsewithpan SE_W060, SOUND_PAN_ATTACKER waitbgfadein monbg ANIM_BANK_DEF_PARTNER createvisualtask sub_80E1F8C, 2, 2, 2, 6, 0, 8, 32767 createvisualtask sub_80DE3AC, 2 - loopsewithpan SE_W060, 63, 20, 3 + loopsewithpan SE_W060, SOUND_PAN_TARGET, 20, 3 waitforvisualfinish restorebg waitbgfadein @@ -3115,12 +3115,12 @@ Move_SPITE: @ 81CB936 end Move_MACH_PUNCH: @ 81CB965 - loadspritegfx 10135 - loadspritegfx 10143 + loadspritegfx ANIM_TAG_IMPACT + loadspritegfx ANIM_TAG_HANDS_AND_FEET monbg ANIM_BANK_ATK_PARTNER createvisualtask sub_80E3B4C, 2 jumpargeq 7, 1, _81CB9E6 - fadetobg 9 + fadetobg BG_HIGHSPEED_OPPONENT _81CB97E: waitbgfadeout createvisualtask sub_80E3A58, 5, -2304, 0, 1, -1 @@ -3128,56 +3128,56 @@ _81CB97E: delay 0 setalpha 9, 8 createvisualtask sub_807A69C, 2, 28968, 10 - playsewithpan SE_W026, 192 + playsewithpan SE_W026, SOUND_PAN_ATTACKER delay 6 createsprite gBasicHitSplatSpriteTemplate, 131, 0, 0, 1, 1 createsprite gFistFootSpriteTemplate, 132, 0, 0, 8, 1, 0 - playsewithpan SE_W004, 63 + playsewithpan SE_W004, SOUND_PAN_TARGET createvisualtask AnimTask_ShakeMon, 2, ANIM_BANK_TARGET, 3, 0, 6, 1 waitforvisualfinish clearmonbg ANIM_BANK_ATK_PARTNER blendoff restorebg waitbgfadeout - setarg 7, -1 + setarg ARG_RET_ID, -1 waitbgfadein end _81CB9E6: - fadetobg 10 + fadetobg BG_HIGHSPEED_PLAYER goto _81CB97E Move_FORESIGHT: @ 81CB9ED - loadspritegfx 10258 + loadspritegfx ANIM_TAG_MAGNIFYING_GLASS monbg ANIM_BANK_DEF_PARTNER monbgprio_28 1 setalpha 16, 0 createsprite gBattleAnimSpriteTemplate_8402A24, 130, 1 delay 17 - loopsewithpan SE_W166, 63, 16, 4 + loopsewithpan SE_W166, SOUND_PAN_TARGET, 16, 4 delay 48 delay 24 - playsewithpan SE_W166, 63 + playsewithpan SE_W166, SOUND_PAN_TARGET delay 10 createvisualtask AnimTask_BlendMonInAndOut, 5, ANIM_BANK_TARGET, 32767, 12, 2, 1 - playsewithpan SE_W197, 63 + playsewithpan SE_W197, SOUND_PAN_TARGET waitforvisualfinish blendoff clearmonbg ANIM_BANK_DEF_PARTNER end Move_DESTINY_BOND: @ 81CBA2C - loadspritegfx 10188 - fadetobg 2 - playsewithpan SE_W060, 192 + loadspritegfx ANIM_TAG_WHITE_SHADOW + fadetobg BG_GHOST + playsewithpan SE_W060, SOUND_PAN_ATTACKER waitbgfadein createvisualtask sub_80DE918, 5, 0, 48 - playsewithpan SE_W109, 192 + playsewithpan SE_W109, SOUND_PAN_ATTACKER delay 48 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 - playsewithpan SE_W171, 63 + playsewithpan SE_W171, SOUND_PAN_TARGET waitforvisualfinish restorebg waitbgfadein @@ -3186,8 +3186,8 @@ Move_DESTINY_BOND: @ 81CBA2C end Move_ENDURE: @ 81CBA87 - loadspritegfx 10184 - playsewithpan SE_W082, 192 + loadspritegfx ANIM_TAG_FOCUS_ENERGY + playsewithpan SE_W082, SOUND_PAN_ATTACKER call EndureFlamesAnim delay 8 createvisualtask sub_80E1F8C, 2, 2, 2, 2, 0, 11, 31 @@ -3211,23 +3211,23 @@ EndureFlamesAnim: return Move_CHARM: @ 81CBB1B - loadspritegfx 10210 + loadspritegfx ANIM_TAG_MAGENTA_HEART createvisualtask sub_812E568, 5, 0, 2, 0 createsprite gBattleAnimSpriteTemplate_83D7A80, 3, 0, 20 - playsewithpan SE_W204, 192 + playsewithpan SE_W204, SOUND_PAN_ATTACKER delay 15 createsprite gBattleAnimSpriteTemplate_83D7A80, 3, -20, 20 - playsewithpan SE_W204, 192 + playsewithpan SE_W204, SOUND_PAN_ATTACKER delay 15 createsprite gBattleAnimSpriteTemplate_83D7A80, 3, 20, 20 - playsewithpan SE_W204, 192 + playsewithpan SE_W204, SOUND_PAN_ATTACKER waitforvisualfinish end Move_ROLLOUT: @ 81CBB5E - loadspritegfx 10135 - loadspritegfx 10074 - loadspritegfx 10058 + loadspritegfx ANIM_TAG_IMPACT + loadspritegfx ANIM_TAG_MUD_SAND + loadspritegfx ANIM_TAG_ROCKS monbg ANIM_BANK_DEF_PARTNER monbgprio_28 1 setalpha 12, 8 @@ -3235,72 +3235,72 @@ Move_ROLLOUT: @ 81CBB5E waitforvisualfinish createvisualtask sub_80A9058, 2, 0, 1, 30, 1, 0 createsprite gBasicHitSplatSpriteTemplate, 4, 0, 0, 1, 2 - playsewithpan SE_W025B, 63 + playsewithpan SE_W025B, SOUND_PAN_TARGET waitforvisualfinish clearmonbg ANIM_BANK_DEF_PARTNER blendoff end Move_FALSE_SWIPE: @ 81CBB9F - loadspritegfx 10286 - loadspritegfx 10135 + loadspritegfx ANIM_TAG_SLASH_2 + loadspritegfx ANIM_TAG_IMPACT createsprite gBattleAnimSpriteTemplate_83D6E50, 130 - playsewithpan SE_W233, 63 + playsewithpan SE_W233, SOUND_PAN_TARGET delay 16 createsprite gBattleAnimSpriteTemplate_83D6E68, 130, 0 - playsewithpan SE_W104, 63 + playsewithpan SE_W104, SOUND_PAN_TARGET delay 2 createsprite gBattleAnimSpriteTemplate_83D6E68, 130, 16 delay 2 createsprite gBattleAnimSpriteTemplate_83D6E68, 130, 32 - playsewithpan SE_W104, 63 + playsewithpan SE_W104, SOUND_PAN_TARGET delay 2 createsprite gBattleAnimSpriteTemplate_83D6E68, 130, 48 delay 2 createsprite gBattleAnimSpriteTemplate_83D6E68, 130, 64 - playsewithpan SE_W104, 63 + playsewithpan SE_W104, SOUND_PAN_TARGET delay 2 createsprite gBattleAnimSpriteTemplate_83D6E68, 130, 80 delay 2 waitforvisualfinish createvisualtask AnimTask_ShakeMon, 2, ANIM_BANK_TARGET, 5, 0, 6, 1 createsprite gBasicHitSplatSpriteTemplate, 132, 0, 0, 1, 3 - playsewithpan SE_W004, 63 + playsewithpan SE_W004, SOUND_PAN_TARGET end Move_SWAGGER: @ 81CBC26 - loadspritegfx 10086 - loadspritegfx 10087 + loadspritegfx ANIM_TAG_BREATH + loadspritegfx ANIM_TAG_ANGER createvisualtask sub_80D08C8, 2 - playsewithpan SE_W207, 192 + playsewithpan SE_W207, SOUND_PAN_ATTACKER waitforvisualfinish createsprite gBattleAnimSpriteTemplate_83D7764, 2 - loopsewithpan SE_W207, 192, 4, 2 + loopsewithpan SE_W207, SOUND_PAN_ATTACKER, 4, 2 waitforvisualfinish delay 24 createsprite gBattleAnimSpriteTemplate_83D7798, 130, 1, -20, -28 - playsewithpan SE_W207B, 63 + playsewithpan SE_W207B, SOUND_PAN_TARGET delay 12 createsprite gBattleAnimSpriteTemplate_83D7798, 130, 1, 20, -28 - playsewithpan SE_W207B, 63 + playsewithpan SE_W207B, SOUND_PAN_TARGET waitforvisualfinish end Move_MILK_DRINK: @ 81CBC6E - loadspritegfx 10099 - loadspritegfx 10203 - loadspritegfx 10031 + loadspritegfx ANIM_TAG_MILK_BOTTLE + loadspritegfx ANIM_TAG_THIN_RING + loadspritegfx ANIM_TAG_BLUE_STAR monbg ANIM_BANK_TARGET createsprite gBattleAnimSpriteTemplate_83D6C48, 2 delay 40 - playsewithpan SE_W152, 192 + playsewithpan SE_W152, SOUND_PAN_ATTACKER delay 12 - playsewithpan SE_W152, 192 + playsewithpan SE_W152, SOUND_PAN_ATTACKER delay 20 - playsewithpan SE_W152, 192 + playsewithpan SE_W152, SOUND_PAN_ATTACKER waitforvisualfinish createsprite gBattleAnimSpriteTemplate_83D7928, 3, 0, 0, 1, 0 - playsewithpan SE_W208, 192 + playsewithpan SE_W208, SOUND_PAN_ATTACKER waitforvisualfinish clearmonbg ANIM_BANK_TARGET call Unknown_81D5F3E @@ -3317,12 +3317,12 @@ _81CBCC8: _81CBCC9: createvisualtask sub_80E1864, 5, 5, 0, 50 createvisualtask sub_80E1864, 5, 4, 0, 50 - loopsewithpan SE_W070, 63, 8, 10 + loopsewithpan SE_W070, SOUND_PAN_TARGET, 8, 10 goto _81CBCC8 _81CBCEE: createvisualtask sub_80E1864, 5, 5, 0, 50 createvisualtask sub_80E1864, 5, 4, 0, 50 - loopsewithpan SE_W070, 63, 8, 10 + loopsewithpan SE_W070, SOUND_PAN_TARGET, 8, 10 delay 10 createsprite gBattleAnimSpriteTemplate_83DB3DC, 2, 1, 3, 1, 0, 14, 32767, 14 delay 16 @@ -3330,28 +3330,28 @@ _81CBCEE: goto _81CBCC8 Move_RAPID_SPIN: @ 81CBD41 - loadspritegfx 10135 - loadspritegfx 10229 + loadspritegfx ANIM_TAG_IMPACT + loadspritegfx ANIM_TAG_RAPID_SPIN monbg ANIM_BANK_ATTACKER createsprite gBattleAnimSpriteTemplate_84023E8, 2, 0, 0, 32, -32, 40, -2 createvisualtask sub_812CDC8, 2, 0, 2, 0 - loopsewithpan SE_W013B, 192, 8, 4 + loopsewithpan SE_W013B, SOUND_PAN_ATTACKER, 8, 4 waitforvisualfinish createsprite gBasicHitSplatSpriteTemplate, 130, 0, 0, 1, 2 createvisualtask sub_80A9058, 2, 0, 1, 10, 1, 0 - playsewithpan SE_W003, 63 + playsewithpan SE_W003, SOUND_PAN_TARGET waitforvisualfinish delay 8 createvisualtask sub_812CDC8, 2, 0, 2, 1 - loopsewithpan SE_W013B, 192, 8, 4 + loopsewithpan SE_W013B, SOUND_PAN_ATTACKER, 8, 4 waitforvisualfinish clearmonbg ANIM_BANK_ATTACKER end Move_MOONLIGHT: @ 81CBDAE - loadspritegfx 10194 - loadspritegfx 10195 - loadspritegfx 10031 + loadspritegfx ANIM_TAG_MOON + loadspritegfx ANIM_TAG_SPARKLE_5 + loadspritegfx ANIM_TAG_BLUE_STAR setalpha 0, 16 createsprite gSimplePaletteBlendSpriteTemplate, 2, 1, 1, 0, 16, rgb(0, 0, 0) waitforvisualfinish @@ -3376,17 +3376,17 @@ Move_MOONLIGHT: @ 81CBDAE end Move_EXTREME_SPEED: @ 81CBE3E - loadspritegfx 10207 - loadspritegfx 10135 + loadspritegfx ANIM_TAG_SPEED_DUST + loadspritegfx ANIM_TAG_IMPACT createvisualtask sub_80E3B4C, 2 jumpargeq 7, 1, _81CBEF5 - fadetobg 9 + fadetobg BG_HIGHSPEED_OPPONENT _81CBE55: waitbgfadeout createvisualtask sub_80E3A58, 5, -2304, 0, 1, -1 waitbgfadein createvisualtask sub_80D15A4, 2 - loopsewithpan SE_W013B, 192, 8, 3 + loopsewithpan SE_W013B, SOUND_PAN_ATTACKER, 8, 3 waitforvisualfinish delay 1 createvisualtask sub_80E4300, 2 @@ -3395,53 +3395,53 @@ _81CBE55: delay 18 createvisualtask sub_80D1638, 2 delay 2 - playsewithpan SE_W004, 63 + playsewithpan SE_W004, SOUND_PAN_TARGET createsprite gBattleAnimSpriteTemplate_83DB508, 130, 1, 0, -12, 3 delay 10 - playsewithpan SE_W004, 63 + playsewithpan SE_W004, SOUND_PAN_TARGET createsprite gBattleAnimSpriteTemplate_83DB508, 130, 1, 0, 12, 3 delay 10 - playsewithpan SE_W233B, 63 + playsewithpan SE_W233B, SOUND_PAN_TARGET createsprite gBattleAnimSpriteTemplate_83DB508, 130, 1, 0, 0, 3 waitforvisualfinish createvisualtask sub_80D18D4, 2 delay 10 createvisualtask sub_80D17C4, 2 - loopsewithpan SE_W104, 192, 8, 4 + loopsewithpan SE_W104, SOUND_PAN_ATTACKER, 8, 4 waitforvisualfinish restorebg waitbgfadeout - setarg 7, -1 + setarg ARG_RET_ID, -1 waitbgfadein clearmonbg ANIM_BANK_TARGET blendoff delay 1 - setarg 7, 4096 + setarg ARG_RET_ID, 4096 delay 1 end _81CBEF5: - fadetobg 10 + fadetobg BG_HIGHSPEED_PLAYER goto _81CBE55 Move_UPROAR: @ 81CBEFC - loadspritegfx 10225 - loadspritegfx 10203 + loadspritegfx ANIM_TAG_JAGGED_MUSIC_NOTE + loadspritegfx ANIM_TAG_THIN_RING monbg ANIM_BANK_DEF_PARTNER createvisualtask sub_80D2CF8, 2, 0 createsprite gBattleAnimSpriteTemplate_83D79A4, 3, 0, 0, 0, 0, 31, 8 - playsewithpan SE_W253, 192 + playsewithpan SE_W253, SOUND_PAN_ATTACKER createsprite gBattleAnimSpriteTemplate_83D7CC8, 2, 0, 29, -12, 0 createsprite gBattleAnimSpriteTemplate_83D7CC8, 2, 0, -12, -29, 1 delay 16 createvisualtask sub_80D2CF8, 2, 0 createsprite gBattleAnimSpriteTemplate_83D79A4, 3, 0, 0, 0, 0, 31, 8 - playsewithpan SE_W253, 192 + playsewithpan SE_W253, SOUND_PAN_ATTACKER createsprite gBattleAnimSpriteTemplate_83D7CC8, 2, 0, 12, -29, 1 createsprite gBattleAnimSpriteTemplate_83D7CC8, 2, 0, -29, -12, 0 delay 16 createvisualtask sub_80D2CF8, 2, 0 createsprite gBattleAnimSpriteTemplate_83D79A4, 3, 0, 0, 0, 0, 31, 8 - playsewithpan SE_W253, 192 + playsewithpan SE_W253, SOUND_PAN_ATTACKER createsprite gBattleAnimSpriteTemplate_83D7CC8, 2, 0, 24, -24, 1 createsprite gBattleAnimSpriteTemplate_83D7CC8, 2, 0, -24, -24, 0 waitforvisualfinish @@ -3449,11 +3449,11 @@ Move_UPROAR: @ 81CBEFC end Move_HEAT_WAVE: @ 81CBFC6 - loadspritegfx 10261 + loadspritegfx ANIM_TAG_FLYING_DIRT createvisualtask AnimTask_BlendSpriteColor, 5, 10261, 0, 6, 6, rgb(31, 0, 0) createvisualtask do_boulder_dust, 5, 1 createvisualtask AnimTask_BlendInterfaceColor, 6, 6, 31 - panse_1B SE_W257, 192, 63, 2, 0 + panse_1B SE_W257, SOUND_PAN_ATTACKER, SOUND_PAN_TARGET, 2, 0 delay 4 createvisualtask sub_80D5DDC, 5 delay 12 @@ -3473,8 +3473,8 @@ Move_HEAT_WAVE: @ 81CBFC6 end Move_HAIL: @ 81CC076 - loadspritegfx 10263 - loadspritegfx 10141 + loadspritegfx ANIM_TAG_HAIL + loadspritegfx ANIM_TAG_ICE_CRYSTALS createvisualtask sub_80E2A38, 10, 1, 3, 0, 6, 0 waitforvisualfinish createvisualtask AnimTask_Hail1, 5 @@ -3484,16 +3484,16 @@ Move_HAIL: @ 81CC076 end Move_TORMENT: @ 81CC0AE - loadspritegfx 10087 - loadspritegfx 10209 + loadspritegfx ANIM_TAG_ANGER + loadspritegfx ANIM_TAG_THOUGHT_BUBBLE createvisualtask sub_812D008, 2 waitforvisualfinish createvisualtask AnimTask_BlendMonInAndOut, 2, ANIM_BANK_TARGET, 31, 10, 1, 1 createsprite gBattleAnimSpriteTemplate_83D7798, 130, 1, -20, -28 - playsewithpan SE_W207B, 63 + playsewithpan SE_W207B, SOUND_PAN_TARGET delay 20 createsprite gBattleAnimSpriteTemplate_83D7798, 130, 1, 20, -28 - playsewithpan SE_W207B, 63 + playsewithpan SE_W207B, SOUND_PAN_TARGET end Move_MEMENTO: @ 81CC0F2 @@ -3502,85 +3502,85 @@ Move_MEMENTO: @ 81CC0F2 createvisualtask sub_80E0918, 2 delay 1 createvisualtask sub_80E00EC, 5 - playsewithpan SE_W060, 192 + playsewithpan SE_W060, SOUND_PAN_ATTACKER delay 48 - playsewithpan SE_W060B, 192 + playsewithpan SE_W060B, SOUND_PAN_ATTACKER waitforvisualfinish createvisualtask sub_80E09C4, 2 delay 12 setalpha 0, 16 delay 1 - monbg_22 1 + monbg_22 ANIM_BANK_TARGET createvisualtask sub_80E03BC, 5 - playsewithpan SE_W060, 63 + playsewithpan SE_W060, SOUND_PAN_TARGET waitforvisualfinish - clearmonbg_23 1 + clearmonbg_23 ANIM_BANK_TARGET delay 1 blendoff delay 1 end Move_FACADE: @ 81CC136 - loadspritegfx 10243 + loadspritegfx ANIM_TAG_SWEAT_DROP createvisualtask sub_812FD7C, 2, 0, 3 createvisualtask sub_812FFE4, 2, 0, 72 - loopsewithpan SE_W207, 192, 24, 3 + loopsewithpan SE_W207, SOUND_PAN_ATTACKER, 24, 3 end Move_SMELLING_SALT: @ 81CC156 - loadspritegfx 10247 - loadspritegfx 10255 + loadspritegfx ANIM_TAG_TAG_HAND + loadspritegfx ANIM_TAG_SMELLINGSALT_EFFECT createsprite gBattleAnimSpriteTemplate_84029C4, 130, 1, 0, 2 createsprite gBattleAnimSpriteTemplate_84029C4, 130, 1, 1, 2 delay 32 createvisualtask sub_8130918, 3, 1, 2 - loopsewithpan SE_W003, 63, 12, 2 + loopsewithpan SE_W003, SOUND_PAN_TARGET, 12, 2 waitforvisualfinish delay 4 createvisualtask AnimTask_ShakeMon2, 2, ANIM_BANK_TARGET, 2, 0, 6, 2 createsprite gBattleAnimSpriteTemplate_84029F4, 130, 1, 8, 3 - loopsewithpan SE_W207B, 63, 16, 3 + loopsewithpan SE_W207B, SOUND_PAN_TARGET, 16, 3 end Move_FOLLOW_ME: @ 81CC1B1 - loadspritegfx 10064 + loadspritegfx ANIM_TAG_FINGER createsprite gBattleAnimSpriteTemplate_83D72E0, 2, 0 - playsewithpan SE_W039, 192 + playsewithpan SE_W039, SOUND_PAN_ATTACKER delay 18 - playsewithpan SE_W213, 192 + playsewithpan SE_W213, SOUND_PAN_ATTACKER delay 71 - loopsewithpan SE_W039, 192, 22, 3 + loopsewithpan SE_W039, SOUND_PAN_ATTACKER, 22, 3 end Move_CHARGE: @ 81CC1D0 - loadspritegfx 10211 - loadspritegfx 10212 - loadspritegfx 10213 + loadspritegfx ANIM_TAG_ELECTRIC_ORBS + loadspritegfx ANIM_TAG_CIRCLE_OF_LIGHT + loadspritegfx ANIM_TAG_ELECTRICITY monbg ANIM_BANK_ATTACKER setalpha 12, 8 createsprite gSimplePaletteBlendSpriteTemplate, 2, 1, 2, 0, 4, rgb(0, 0, 0) waitforvisualfinish createvisualtask sub_80D6B3C, 2, 0, 60, 2, 12 - playsewithpan SE_W268, 192 + playsewithpan SE_W268, SOUND_PAN_ATTACKER delay 30 - playsewithpan SE_W268, 192 + playsewithpan SE_W268, SOUND_PAN_ATTACKER delay 30 - playsewithpan SE_W268, 192 + playsewithpan SE_W268, SOUND_PAN_ATTACKER createsprite gBattleAnimSpriteTemplate_83D9A6C, 2, 0 delay 25 - playsewithpan SE_W268, 192 + playsewithpan SE_W268, SOUND_PAN_ATTACKER delay 20 - playsewithpan SE_W268, 192 + playsewithpan SE_W268, SOUND_PAN_ATTACKER delay 15 - playsewithpan SE_W268, 192 + playsewithpan SE_W268, SOUND_PAN_ATTACKER delay 10 delay 6 - loopsewithpan SE_W268, 192, 6, 5 + loopsewithpan SE_W268, SOUND_PAN_ATTACKER, 6, 5 waitforvisualfinish createsprite gBattleAnimSpriteTemplate_83D9A9C, 2, 0, 16, 16 delay 2 createsprite gBattleAnimSpriteTemplate_83D9A9C, 2, 0, -16, -16 - playsewithpan SE_W085B, 192 + playsewithpan SE_W085B, SOUND_PAN_ATTACKER waitforvisualfinish createsprite gSimplePaletteBlendSpriteTemplate, 2, 1, 4, 4, 0, rgb(0, 0, 0) clearmonbg ANIM_BANK_ATTACKER @@ -3588,27 +3588,27 @@ Move_CHARGE: @ 81CC1D0 end Move_TAUNT: @ 81CC26B - loadspritegfx 10214 - loadspritegfx 10209 - loadspritegfx 10087 + loadspritegfx ANIM_TAG_FINGER_2 + loadspritegfx ANIM_TAG_THOUGHT_BUBBLE + loadspritegfx ANIM_TAG_ANGER createsprite gBattleAnimSpriteTemplate_83D7220, 11, 0, 45 - playsewithpan SE_W118, 192 + playsewithpan SE_W118, SOUND_PAN_ATTACKER delay 6 createsprite gBattleAnimSpriteTemplate_83D7358, 12, 0 delay 4 - loopsewithpan SE_W039, 192, 16, 2 + loopsewithpan SE_W039, SOUND_PAN_ATTACKER, 16, 2 waitforvisualfinish delay 8 createsprite gBattleAnimSpriteTemplate_83D7798, 130, 1, -20, -28 - playsewithpan SE_W207B, 63 + playsewithpan SE_W207B, SOUND_PAN_TARGET waitforvisualfinish delay 12 createsprite gBattleAnimSpriteTemplate_83D7798, 130, 1, 20, -28 - playsewithpan SE_W207B, 63 + playsewithpan SE_W207B, SOUND_PAN_TARGET end Move_HELPING_HAND: @ 81CC2BF - loadspritegfx 10247 + loadspritegfx ANIM_TAG_TAG_HAND createvisualtask sub_8130D20, 5 createsprite gBattleAnimSpriteTemplate_8402A0C, 40, 0 createsprite gBattleAnimSpriteTemplate_8402A0C, 40, 1 @@ -3625,7 +3625,7 @@ Move_HELPING_HAND: @ 81CC2BF end Move_ASSIST: @ 81CC332 - loadspritegfx 10252 + loadspritegfx ANIM_TAG_PAW_PRINT createsprite gBattleAnimSpriteTemplate_8402964, 50, 112, -16, 140, 128, 36 delay 2 createsprite gBattleAnimSpriteTemplate_8402964, 50, 208, 128, -16, 48, 36 @@ -3642,14 +3642,14 @@ Move_ASSIST: @ 81CC332 end Move_SUPERPOWER: @ 81CC3A3 - loadspritegfx 10212 - loadspritegfx 10256 - loadspritegfx 10257 + loadspritegfx ANIM_TAG_CIRCLE_OF_LIGHT + loadspritegfx ANIM_TAG_METEOR + loadspritegfx ANIM_TAG_FLAT_ROCK monbg ANIM_BANK_ATK_PARTNER monbgprio_28 0 setalpha 12, 8 createsprite gBattleAnimSpriteTemplate_83DA0FC, 130, 0 - playsewithpan SE_W025, 192 + playsewithpan SE_W025, SOUND_PAN_ATTACKER delay 20 createsprite gBattleAnimSpriteTemplate_83DB428, 2, 4, 1, 180, 1 createvisualtask sub_812B340, 5, 234, 0 @@ -3665,10 +3665,10 @@ Move_SUPERPOWER: @ 81CC3A3 createsprite gBattleAnimSpriteTemplate_83DA114, 41, 60, 288, 3, 88 delay 74 createsprite gBattleAnimSpriteTemplate_83DA12C, 131, 0 - playsewithpan SE_W207, 192 + playsewithpan SE_W207, SOUND_PAN_ATTACKER delay 16 createvisualtask AnimTask_ShakeMon2, 2, ANIM_BANK_TARGET, 8, 0, 16, 1 - playsewithpan SE_W025B, 63 + playsewithpan SE_W025B, SOUND_PAN_TARGET waitforvisualfinish clearmonbg ANIM_BANK_ATK_PARTNER blendoff @@ -3676,15 +3676,15 @@ Move_SUPERPOWER: @ 81CC3A3 end Move_RECYCLE: @ 81CC45E - loadspritegfx 10278 + loadspritegfx ANIM_TAG_RECYCLE monbg ANIM_BANK_ATTACKER setalpha 0, 16 delay 1 createsprite gBattleAnimSpriteTemplate_8402B10, 2 - loopsewithpan SE_W036, 192, 24, 3 + loopsewithpan SE_W036, SOUND_PAN_ATTACKER, 24, 3 waitforvisualfinish createvisualtask AnimTask_BlendMonInAndOut, 5, ANIM_BANK_ATTACKER, 32767, 12, 2, 1 - playsewithpan SE_W036, 192 + playsewithpan SE_W036, SOUND_PAN_ATTACKER waitforvisualfinish blendoff clearmonbg ANIM_BANK_ATTACKER @@ -3692,10 +3692,10 @@ Move_RECYCLE: @ 81CC45E end Move_BRICK_BREAK: @ 81CC492 - loadspritegfx 10167 - loadspritegfx 10135 - loadspritegfx 10143 - loadspritegfx 10208 + loadspritegfx ANIM_TAG_BLUE_LIGHT_WALL + loadspritegfx ANIM_TAG_IMPACT + loadspritegfx ANIM_TAG_HANDS_AND_FEET + loadspritegfx ANIM_TAG_TORN_METAL choosetwoturnanim _81CC4A7, _81CC576 _81CC4A7: monbg ANIM_BANK_TARGET @@ -3705,20 +3705,20 @@ _81CC4A7: delay 1 createsprite gBasicHitSplatSpriteTemplate, 3, -18, -18, 1, 1 createsprite gFistFootSpriteTemplate, 2, -18, -18, 10, 1, 0 - playsewithpan SE_W233, 63 + playsewithpan SE_W233, SOUND_PAN_TARGET delay 20 createsprite gHorizontalLungeSpriteTemplate, 2, 3, 8 delay 5 createsprite gBasicHitSplatSpriteTemplate, 3, 18, 18, 1, 1 createsprite gFistFootSpriteTemplate, 2, 18, 18, 10, 1, 0 - playsewithpan SE_W233, 63 + playsewithpan SE_W233, SOUND_PAN_TARGET delay 20 createvisualtask AnimTask_WindUpLunge, 2, ANIM_BANK_ATTACKER, -24, 0, 24, 10, 24, 3 createsprite gSimplePaletteBlendSpriteTemplate, 2, 1, 2, 0, 6, rgb(0, 0, 0) delay 37 createsprite gBasicHitSplatSpriteTemplate, 3, 0, 0, 1, 1 createsprite gFistFootSpriteTemplate, 2, 0, 0, 10, 1, 0 - playsewithpan SE_W233B, 63 + playsewithpan SE_W233B, SOUND_PAN_TARGET waitforvisualfinish createsprite gSimplePaletteBlendSpriteTemplate, 2, 1, 2, 6, 0, rgb(0, 0, 0) waitforvisualfinish @@ -3733,26 +3733,26 @@ _81CC576: delay 1 createsprite gBasicHitSplatSpriteTemplate, 3, -18, -18, 1, 1 createsprite gFistFootSpriteTemplate, 2, -18, -18, 10, 1, 0 - playsewithpan SE_W233, 63 + playsewithpan SE_W233, SOUND_PAN_TARGET delay 20 createsprite gHorizontalLungeSpriteTemplate, 2, 3, 8 delay 5 createsprite gBasicHitSplatSpriteTemplate, 3, 18, 18, 1, 1 createsprite gFistFootSpriteTemplate, 2, 18, 18, 10, 1, 0 - playsewithpan SE_W233, 63 + playsewithpan SE_W233, SOUND_PAN_TARGET delay 20 createvisualtask AnimTask_WindUpLunge, 2, ANIM_BANK_ATTACKER, -24, 0, 24, 10, 24, 3 createsprite gSimplePaletteBlendSpriteTemplate, 2, 1, 2, 0, 6, rgb(0, 0, 0) delay 37 createsprite gBasicHitSplatSpriteTemplate, 3, 0, 0, 1, 1 createsprite gFistFootSpriteTemplate, 2, 0, 0, 10, 1, 0 - playsewithpan SE_W233B, 63 + playsewithpan SE_W233B, SOUND_PAN_TARGET waitforvisualfinish createsprite gBattleAnimSpriteTemplate_83DA0B8, 2, 1, 0, -8, -12 createsprite gBattleAnimSpriteTemplate_83DA0B8, 2, 1, 1, 8, -12 createsprite gBattleAnimSpriteTemplate_83DA0B8, 2, 1, 2, -8, 12 createsprite gBattleAnimSpriteTemplate_83DA0B8, 2, 1, 3, 8, 12 - playsewithpan SE_W280, 63 + playsewithpan SE_W280, SOUND_PAN_TARGET waitforvisualfinish createsprite gSimplePaletteBlendSpriteTemplate, 2, 1, 2, 6, 0, rgb(0, 0, 0) waitforvisualfinish @@ -3760,46 +3760,46 @@ _81CC576: end Move_YAWN: @ 81CC697 - loadspritegfx 10242 + loadspritegfx ANIM_TAG_PINK_CLOUD createvisualtask sub_812F724, 2, 0 - playsewithpan SE_W281, 192 + playsewithpan SE_W281, SOUND_PAN_ATTACKER waitforvisualfinish createsprite gBattleAnimSpriteTemplate_84027EC, 133, 2 - playsewithpan SE_W255, 192 + playsewithpan SE_W255, SOUND_PAN_ATTACKER delay 4 createsprite gBattleAnimSpriteTemplate_84027EC, 133, 1 delay 4 createsprite gBattleAnimSpriteTemplate_84027EC, 133, 0 waitforvisualfinish createvisualtask sub_812F724, 2, 1 - playsewithpan SE_W281, 63 + playsewithpan SE_W281, SOUND_PAN_TARGET end Move_ENDEAVOR: @ 81CC6DA - loadspritegfx 10243 - loadspritegfx 10135 + loadspritegfx ANIM_TAG_SWEAT_DROP + loadspritegfx ANIM_TAG_IMPACT createvisualtask sub_812FD7C, 2, 0, 2 - loopsewithpan SE_W039, 192, 24, 2 + loopsewithpan SE_W039, SOUND_PAN_ATTACKER, 24, 2 createvisualtask AnimTask_BlendMonInAndOut, 5, ANIM_BANK_ATTACKER, 703, 12, 1, 2 delay 6 createvisualtask sub_80A9058, 5, 0, 1, 8, 1, 0 createsprite gBasicHitSplatSpriteTemplate, 130, 12, -12, 1, 2 - playsewithpan SE_W003, 63 + playsewithpan SE_W003, SOUND_PAN_TARGET delay 24 createvisualtask sub_80A9058, 5, 0, 1, 8, 1, 0 createsprite gBasicHitSplatSpriteTemplate, 130, -12, 12, 1, 2 - playsewithpan SE_W004, 63 + playsewithpan SE_W004, SOUND_PAN_TARGET end Move_ERUPTION: @ 81CC74F - loadspritegfx 10201 + loadspritegfx ANIM_TAG_WARM_ROCK createsprite gSimplePaletteBlendSpriteTemplate, 2, 31, 2, 0, 4, rgb(31, 0, 0) waitforvisualfinish createvisualtask sub_80D5470, 2 - waitplaysewithpan SE_W153, 192, 60 + waitplaysewithpan SE_W153, SOUND_PAN_ATTACKER, 60 waitforvisualfinish createvisualtask sub_80D5470, 2 - waitplaysewithpan SE_W153, 192, 60 + waitplaysewithpan SE_W153, SOUND_PAN_ATTACKER, 60 waitforvisualfinish delay 30 createsprite gBattleAnimSpriteTemplate_83D96F8, 40, 200, -32, 0, 100, 0 @@ -3811,17 +3811,17 @@ Move_ERUPTION: @ 81CC74F delay 22 createvisualtask sub_80E1864, 5, 5, 8, 60 createvisualtask sub_80E1864, 5, 4, 8, 60 - loopsewithpan SE_W088, 63, 16, 12 + loopsewithpan SE_W088, SOUND_PAN_TARGET, 16, 12 delay 80 createsprite gSimplePaletteBlendSpriteTemplate, 40, 31, 4, 4, 0, rgb(31, 0, 0) end Move_SKILL_SWAP: @ 81CC81C - loadspritegfx 10251 + loadspritegfx ANIM_TAG_BLUEGREEN_ORB call Unknown_81D61E7 createvisualtask sub_80DC0B0, 3, 1 createvisualtask AnimTask_BlendMonInAndOut, 5, ANIM_BANK_TARGET, 32767, 12, 3, 1 - loopsewithpan SE_W179, 192, 24, 3 + loopsewithpan SE_W179, SOUND_PAN_ATTACKER, 24, 3 delay 16 createvisualtask sub_80DC0B0, 3, 0 createvisualtask AnimTask_BlendMonInAndOut, 5, ANIM_BANK_ATTACKER, 32767, 12, 3, 1 @@ -3830,34 +3830,34 @@ Move_SKILL_SWAP: @ 81CC81C end Move_IMPRISON: @ 81CC867 - loadspritegfx 10249 - loadspritegfx 10250 + loadspritegfx ANIM_TAG_HOLLOW_ORB + loadspritegfx ANIM_TAG_X_SIGN call Unknown_81D61E7 monbg ANIM_BANK_DEF_PARTNER createvisualtask sub_80DBE00, 5 delay 8 - loopsewithpan SE_W030, 192, 8, 5 + loopsewithpan SE_W030, SOUND_PAN_ATTACKER, 8, 5 waitforvisualfinish delay 4 createsprite gBattleAnimSpriteTemplate_83DA8F4, 5, 0, 40 createvisualtask sub_80E1864, 5, 4, 1, 10 - playsewithpan SE_W063, 192 + playsewithpan SE_W063, SOUND_PAN_ATTACKER clearmonbg ANIM_BANK_DEF_PARTNER call Unknown_81D61F3 end Move_GRUDGE: @ 81CC8AA - loadspritegfx 10253 + loadspritegfx ANIM_TAG_PURPLE_FLAME monbg ANIM_BANK_ATTACKER monbgprio_29 - fadetobg 2 - playsewithpan SE_W060, 192 + fadetobg BG_GHOST + playsewithpan SE_W060, SOUND_PAN_ATTACKER waitbgfadein createvisualtask sub_80DF1A4, 3 - loopsewithpan SE_W052, 192, 16, 4 + loopsewithpan SE_W052, SOUND_PAN_ATTACKER, 16, 4 delay 10 delay 80 - playsewithpan SE_W171, 63 + playsewithpan SE_W171, SOUND_PAN_TARGET waitforvisualfinish restorebg waitbgfadein @@ -3871,7 +3871,7 @@ Move_CAMOUFLAGE: @ 81CC8D2 createvisualtask sub_80E2B74, 5, 2, 3, 0, 14 delay 16 createvisualtask sub_80DFC24, 2, 4 - playsewithpan SE_W185, 192 + playsewithpan SE_W185, SOUND_PAN_ATTACKER waitforvisualfinish delay 8 createvisualtask sub_80E2B74, 5, 2, 0, 0, 0 @@ -3883,14 +3883,14 @@ Move_CAMOUFLAGE: @ 81CC8D2 end Move_TAIL_GLOW: @ 81CC918 - loadspritegfx 10212 + loadspritegfx ANIM_TAG_CIRCLE_OF_LIGHT monbg ANIM_BANK_ATTACKER setalpha 12, 8 createsprite gSimplePaletteBlendSpriteTemplate, 2, 1, 2, 0, 4, rgb(0, 0, 0) waitforvisualfinish createsprite gBattleAnimSpriteTemplate_83DAC10, 66, 0 delay 18 - loopsewithpan SE_W234, 192, 16, 6 + loopsewithpan SE_W234, SOUND_PAN_ATTACKER, 16, 6 waitforvisualfinish createsprite gSimplePaletteBlendSpriteTemplate, 2, 1, 4, 4, 0, rgb(0, 0, 0) clearmonbg ANIM_BANK_ATTACKER @@ -3899,15 +3899,15 @@ Move_TAIL_GLOW: @ 81CC918 end Move_LUSTER_PURGE: @ 81CC95B - loadspritegfx 10267 - loadspritegfx 10135 - fadetobg 3 + loadspritegfx ANIM_TAG_WHITE_CIRCLE_OF_LIGHT + loadspritegfx ANIM_TAG_IMPACT + fadetobg BG_PSYCHIC waitbgfadeout createvisualtask sub_812C624, 5 waitbgfadein monbg ANIM_BANK_ATTACKER setalpha 12, 8 - playsewithpan SE_W076, 192 + playsewithpan SE_W076, SOUND_PAN_ATTACKER createsprite gBattleAnimSpriteTemplate_83DA9E0, 41, 0, 0, 0, 0 delay 20 createvisualtask sub_80E2A7C, 5, 5, 2, 0, 16, -1 @@ -3916,22 +3916,22 @@ Move_LUSTER_PURGE: @ 81CC95B createvisualtask AnimTask_BlendSpriteColor, 5, 10135, 0, 12, 12, rgb(0, 0, 23) waitforvisualfinish createsprite gBattleAnimSpriteTemplate_83DB4F0, 131, 1, 2 - createvisualtask sub_812B30C, 5, 215, 63 + createvisualtask sub_812B30C, 5, 215, SOUND_PAN_TARGET delay 3 createsprite gBattleAnimSpriteTemplate_83DB4F0, 131, 1, 2 - createvisualtask sub_812B30C, 5, 215, 63 + createvisualtask sub_812B30C, 5, 215, SOUND_PAN_TARGET delay 3 createsprite gBattleAnimSpriteTemplate_83DB4F0, 131, 1, 2 - createvisualtask sub_812B30C, 5, 215, 63 + createvisualtask sub_812B30C, 5, 215, SOUND_PAN_TARGET delay 3 createsprite gBattleAnimSpriteTemplate_83DB4F0, 131, 1, 2 - createvisualtask sub_812B30C, 5, 215, 63 + createvisualtask sub_812B30C, 5, 215, SOUND_PAN_TARGET delay 3 createsprite gBattleAnimSpriteTemplate_83DB4F0, 131, 1, 2 - createvisualtask sub_812B30C, 5, 215, 63 + createvisualtask sub_812B30C, 5, 215, SOUND_PAN_TARGET delay 3 createsprite gBattleAnimSpriteTemplate_83DB4F0, 131, 1, 2 - createvisualtask sub_812B30C, 5, 215, 63 + createvisualtask sub_812B30C, 5, 215, SOUND_PAN_TARGET waitforvisualfinish createvisualtask sub_80E2A7C, 5, 5, 2, 16, 0, -1 createvisualtask sub_80E1864, 5, 1, 5, 14 @@ -3942,13 +3942,13 @@ Move_LUSTER_PURGE: @ 81CC95B end Move_MIST_BALL: @ 81CCA72 - loadspritegfx 10155 - loadspritegfx 10270 + loadspritegfx ANIM_TAG_SMALL_BUBBLES + loadspritegfx ANIM_TAG_WHITE_FEATHER delay 0 - playsewithpan SE_W081, 192 + playsewithpan SE_W081, SOUND_PAN_ATTACKER createsprite gMistBallSpriteTemplate, 128, 0, 0, 0, 0, 30, 0 waitforvisualfinish - playsewithpan SE_W028, 63 + playsewithpan SE_W028, SOUND_PAN_TARGET createvisualtask AnimTask_ShakeMon, 2, ANIM_BANK_TARGET, 5, 0, 10, 0 createsprite gBattleAnimSpriteTemplate_83DB3DC, 0, 1, 1, 1, 32279, 16, 32767, 16 delay 0 @@ -3962,10 +3962,10 @@ Move_MIST_BALL: @ 81CCA72 end Move_FEATHER_DANCE: @ 81CCB01 - loadspritegfx 10270 + loadspritegfx ANIM_TAG_WHITE_FEATHER monbg ANIM_BANK_DEF_PARTNER monbgprio_29 - playsewithpan SE_W080, 63 + playsewithpan SE_W080, SOUND_PAN_TARGET delay 0 createsprite gBattleAnimSpriteTemplate_83DA498, 128, 0, -16, 64, 2, 104, 11304, 32, 1 delay 6 @@ -3984,40 +3984,40 @@ Move_FEATHER_DANCE: @ 81CCB01 end Move_TEETER_DANCE: @ 81CCBD1 - loadspritegfx 10072 - loadspritegfx 10073 + loadspritegfx ANIM_TAG_MUSIC_NOTES + loadspritegfx ANIM_TAG_DUCK createvisualtask sub_813219C, 5 createsprite gBattleAnimSpriteTemplate_83D715C, 2, 0, 16, -2 - playsewithpan SE_W298, 192 + playsewithpan SE_W298, SOUND_PAN_ATTACKER delay 24 createsprite gBattleAnimSpriteTemplate_83D715C, 2, 0, 0, -2 - playsewithpan SE_W298, 192 + playsewithpan SE_W298, SOUND_PAN_ATTACKER delay 24 createsprite gBattleAnimSpriteTemplate_83D715C, 2, 0, -16, -2 - playsewithpan SE_W298, 192 + playsewithpan SE_W298, SOUND_PAN_ATTACKER delay 24 createsprite gBattleAnimSpriteTemplate_83D715C, 2, 1, -8, -2 - playsewithpan SE_W298, 192 + playsewithpan SE_W298, SOUND_PAN_ATTACKER delay 24 createsprite gBattleAnimSpriteTemplate_83D715C, 2, 2, 8, -2 - playsewithpan SE_W298, 192 + playsewithpan SE_W298, SOUND_PAN_ATTACKER end Move_MUD_SPORT: @ 81CCC3C - loadspritegfx 10074 + loadspritegfx ANIM_TAG_MUD_SAND createvisualtask AnimTask_Splash, 2, 0, 6 delay 24 createsprite gMudSportDirtSpriteTemplate, 130, 0, -4, -16 createsprite gMudSportDirtSpriteTemplate, 130, 0, 4, -12 - playsewithpan SE_W091, 192 + playsewithpan SE_W091, SOUND_PAN_ATTACKER delay 32 createsprite gMudSportDirtSpriteTemplate, 130, 0, -3, -12 createsprite gMudSportDirtSpriteTemplate, 130, 0, 5, -14 - playsewithpan SE_W091, 192 + playsewithpan SE_W091, SOUND_PAN_ATTACKER delay 32 createsprite gMudSportDirtSpriteTemplate, 130, 0, -5, -18 createsprite gMudSportDirtSpriteTemplate, 130, 0, 3, -14 - playsewithpan SE_W091, 192 + playsewithpan SE_W091, SOUND_PAN_ATTACKER delay 16 createsprite gMudSportDirtSpriteTemplate, 130, 1, 220, 60 waitplaysewithpan SE_W145B, 0, 15 @@ -4051,10 +4051,10 @@ Move_MUD_SPORT: @ 81CCC3C end Move_NEEDLE_ARM: @ 81CCD73 - loadspritegfx 10266 - loadspritegfx 10135 - loadspritegfx 10143 - loopsewithpan SE_W030, 63, 2, 16 + loadspritegfx ANIM_TAG_GREEN_SPIKE + loadspritegfx ANIM_TAG_IMPACT + loadspritegfx ANIM_TAG_HANDS_AND_FEET + loopsewithpan SE_W030, SOUND_PAN_TARGET, 2, 16 createsprite gBattleAnimSpriteTemplate_83D6994, 130, 1, 0, 0, -32, 16 delay 2 createsprite gBattleAnimSpriteTemplate_83D6994, 130, 1, 0, 22, -22, 16 @@ -4082,7 +4082,7 @@ Move_NEEDLE_ARM: @ 81CCD73 createvisualtask AnimTask_ShakeMon2, 2, ANIM_BANK_TARGET, 4, 0, 18, 1 createsprite gBasicHitSplatSpriteTemplate, 131, 0, 0, 1, 1 createsprite gFistFootSpriteTemplate, 132, 0, 0, 8, 1, 0 - playsewithpan SE_W233B, 63 + playsewithpan SE_W233B, SOUND_PAN_TARGET createsprite gBattleAnimSpriteTemplate_83D6994, 130, 1, 1, 0, -24, 10 createsprite gBattleAnimSpriteTemplate_83D6994, 130, 1, 1, 17, -17, 10 createsprite gBattleAnimSpriteTemplate_83D6994, 130, 1, 1, 24, 0, 10 @@ -4094,18 +4094,18 @@ Move_NEEDLE_ARM: @ 81CCD73 end Move_SLACK_OFF: @ 81CCF23 - loadspritegfx 10031 + loadspritegfx ANIM_TAG_BLUE_STAR createvisualtask sub_813257C, 2, 0 - playsewithpan SE_W281, 192 + playsewithpan SE_W281, SOUND_PAN_ATTACKER waitforvisualfinish call Unknown_81D5EF5 waitforvisualfinish end Move_CRUSH_CLAW: @ 81CCF3B - loadspritegfx 10167 - loadspritegfx 10039 - loadspritegfx 10208 + loadspritegfx ANIM_TAG_BLUE_LIGHT_WALL + loadspritegfx ANIM_TAG_CLAW_SLASH + loadspritegfx ANIM_TAG_TORN_METAL monbg ANIM_BANK_TARGET setalpha 12, 8 createsprite gHorizontalLungeSpriteTemplate, 2, 6, 4 @@ -4113,11 +4113,11 @@ Move_CRUSH_CLAW: @ 81CCF3B 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 + playsewithpan SE_W013, SOUND_PAN_TARGET delay 12 createsprite gBattleAnimSpriteTemplate_83DB288, 130, 10, -10, 1 createsprite gBattleAnimSpriteTemplate_83DB288, 130, 10, 10, 1 - playsewithpan SE_W013, 63 + playsewithpan SE_W013, SOUND_PAN_TARGET waitforvisualfinish waitforvisualfinish blendoff @@ -4126,9 +4126,9 @@ Move_CRUSH_CLAW: @ 81CCF3B Move_AROMATHERAPY: @ 81CCFAB playsewithpan SE_W080, 0 - loadspritegfx 10159 - loadspritegfx 10203 - loadspritegfx 10049 + loadspritegfx ANIM_TAG_FLOWER + loadspritegfx ANIM_TAG_THIN_RING + loadspritegfx ANIM_TAG_SPARKLE_2 createsprite gSimplePaletteBlendSpriteTemplate, 0, 1, 0, 0, 7, rgb(13, 31, 12) delay 1 monbg ANIM_BANK_ATTACKER @@ -4149,28 +4149,28 @@ Move_AROMATHERAPY: @ 81CCFAB delay 1 createsprite gSimplePaletteBlendSpriteTemplate, 0, 1, 0, 7, 0, rgb(13, 31, 12) delay 1 - playsewithpan SE_W287, 192 + playsewithpan SE_W287, SOUND_PAN_ATTACKER createvisualtask sub_81300A4, 2, 1 waitforvisualfinish - playsewithpan SE_W234, 192 + playsewithpan SE_W234, SOUND_PAN_ATTACKER createsprite gBattleAnimSpriteTemplate_83D6CA0, 16, -15, 0, 0, 0, 32, 60, 1 delay 8 createsprite gBattleAnimSpriteTemplate_83D6CA0, 16, 12, -5, 0, 0, 32, 60, 1 waitforvisualfinish - playsewithpan SE_REAPOKE, 192 + playsewithpan SE_REAPOKE, SOUND_PAN_ATTACKER createsprite gSimplePaletteBlendSpriteTemplate, 0, 43, 3, 10, 0, rgb(13, 31, 12) createsprite gBattleAnimSpriteTemplate_83D7974, 16, 0, 0, 0, 1 waitforvisualfinish end Move_FAKE_TEARS: @ 81CD10D - loadspritegfx 10155 - loadspritegfx 10209 - loadspritegfx 10072 + loadspritegfx ANIM_TAG_SMALL_BUBBLES + loadspritegfx ANIM_TAG_THOUGHT_BUBBLE + loadspritegfx ANIM_TAG_MUSIC_NOTES createvisualtask AnimTask_BlendSpriteColor, 5, 10155, 0, 4, 4, rgb(12, 11, 31) waitforvisualfinish createvisualtask sub_812E568, 5, 0, 2, 1 - loopsewithpan SE_W039, 192, 12, 4 + loopsewithpan SE_W039, SOUND_PAN_ATTACKER, 12, 4 delay 8 createsprite gBattleAnimSpriteTemplate_83DB238, 2, 0, 0 createsprite gBattleAnimSpriteTemplate_83DB238, 2, 0, 1 @@ -4187,16 +4187,16 @@ Move_FAKE_TEARS: @ 81CD10D end Move_AIR_CUTTER: @ 81CD19D - loadspritegfx 10003 - loadspritegfx 10138 - loadspritegfx 10135 + loadspritegfx ANIM_TAG_AIR_WAVE + loadspritegfx ANIM_TAG_CUT + loadspritegfx ANIM_TAG_IMPACT delay 0 monbg ANIM_BANK_DEF_PARTNER setalpha 12, 8 delay 0 createvisualtask sub_80CFB04, 2, 32, -24, 1536, 2, 128 waitforvisualfinish - playsewithpan SE_W015, 63 + playsewithpan SE_W015, SOUND_PAN_TARGET createsprite gBattleAnimSpriteTemplate_83D6B40, 2, 40, -32, 0, 2 delay 5 createvisualtask AnimTask_ShakeMon2, 2, ANIM_BANK_TARGET, 2, 0, 8, 1 @@ -4212,24 +4212,24 @@ Move_ODOR_SLEUTH: @ 81CD1FF createvisualtask sub_81316F8, 5 delay 24 createsprite gHorizontalLungeSpriteTemplate, 2, 3, 4 - playsewithpan SE_W207, 192 + playsewithpan SE_W207, SOUND_PAN_ATTACKER delay 6 createsprite gHorizontalLungeSpriteTemplate, 2, 3, 4 - playsewithpan SE_W207, 192 + playsewithpan SE_W207, SOUND_PAN_ATTACKER waitforvisualfinish clearmonbg ANIM_BANK_TARGET delay 1 createsprite gBattleAnimSpriteTemplate_83DB3DC, 2, 1, 3, 1, -1, 16, -1, 0 - playsewithpan SE_W043, 192 + playsewithpan SE_W043, SOUND_PAN_ATTACKER end Move_GRASS_WHISTLE: @ 81CD249 - loadspritegfx 10072 + loadspritegfx ANIM_TAG_MUSIC_NOTES createsprite gSimplePaletteBlendSpriteTemplate, 2, 1, 2, 0, 4, rgb(18, 31, 12) waitforvisualfinish createvisualtask sub_80CEA20, 2 waitforvisualfinish - panse_1B SE_W320, 192, 63, 2, 0 + panse_1B SE_W320, SOUND_PAN_ATTACKER, SOUND_PAN_TARGET, 2, 0 createsprite gBattleAnimSpriteTemplate_83D7114, 130, 7, 1, 0 delay 5 createsprite gBattleAnimSpriteTemplate_83D7114, 130, 6, 1, 0 @@ -4261,12 +4261,12 @@ Move_GRASS_WHISTLE: @ 81CD249 end Move_TICKLE: @ 81CD33C - loadspritegfx 10218 + loadspritegfx ANIM_TAG_EYE_SPARKLE createsprite gSimplePaletteBlendSpriteTemplate, 2, 2, 0, 0, 16, rgb(0, 0, 0) waitforvisualfinish createsprite gBattleAnimSpriteTemplate_83D7B94, 0, -16, -8 createsprite gBattleAnimSpriteTemplate_83D7B94, 0, 16, -8 - playsewithpan SE_W197, 192 + playsewithpan SE_W197, SOUND_PAN_ATTACKER waitforvisualfinish createsprite gSimplePaletteBlendSpriteTemplate, 2, 2, 0, 16, 0, rgb(0, 0, 0) waitforvisualfinish @@ -4274,40 +4274,40 @@ Move_TICKLE: @ 81CD33C createvisualtask AnimTask_SwayMon, 3, 0, 6, 1280, 3, 0 delay 12 createvisualtask sub_812E568, 3, 1, 6, 2 - loopsewithpan SE_W039, 63, 8, 8 + loopsewithpan SE_W039, SOUND_PAN_TARGET, 8, 8 waitforvisualfinish end Move_WATER_SPOUT: @ 81CD3A8 - loadspritegfx 10268 - loadspritegfx 10148 + loadspritegfx ANIM_TAG_GLOWY_BLUE_ORB + loadspritegfx ANIM_TAG_WATER_IMPACT monbg ANIM_BANK_DEF_PARTNER setalpha 12, 8 createvisualtask sub_80D40F4, 5 - playsewithpan SE_W029, 192 + playsewithpan SE_W029, SOUND_PAN_ATTACKER delay 44 - playsewithpan SE_W291, 192 + playsewithpan SE_W291, SOUND_PAN_ATTACKER waitforvisualfinish delay 16 createvisualtask sub_80D45D8, 5 - playsewithpan SE_W057, 63 + playsewithpan SE_W057, SOUND_PAN_TARGET clearmonbg ANIM_BANK_DEF_PARTNER blendoff end Move_SHADOW_PUNCH: @ 81CD3D6 - loadspritegfx 10135 - loadspritegfx 10143 - fadetobg 2 + loadspritegfx ANIM_TAG_IMPACT + loadspritegfx ANIM_TAG_HANDS_AND_FEET + fadetobg BG_GHOST waitbgfadein monbg ANIM_BANK_ATK_PARTNER setalpha 9, 8 createvisualtask sub_807A69C, 2, 0, 13 - playsewithpan SE_W026, 192 + playsewithpan SE_W026, SOUND_PAN_ATTACKER delay 6 createsprite gBasicHitSplatSpriteTemplate, 131, 0, 0, 1, 1 createsprite gFistFootSpriteTemplate, 132, 0, 0, 8, 1, 0 - playsewithpan SE_W004, 63 + playsewithpan SE_W004, SOUND_PAN_TARGET createvisualtask AnimTask_ShakeMon, 2, ANIM_BANK_TARGET, 3, 0, 6, 1 waitforvisualfinish clearmonbg ANIM_BANK_ATK_PARTNER @@ -4322,15 +4322,15 @@ Move_EXTRASENSORY: @ 81CD431 setalpha 12, 8 createvisualtask AnimTask_BlendMonInAndOut, 5, ANIM_BANK_ATTACKER, 891, 12, 1, 1 createvisualtask sub_80DC2D4, 5, 0 - playsewithpan SE_W020, 63 + playsewithpan SE_W020, SOUND_PAN_TARGET waitforvisualfinish createvisualtask AnimTask_BlendMonInAndOut, 5, ANIM_BANK_ATTACKER, 891, 12, 1, 1 createvisualtask sub_80DC2D4, 5, 1 - playsewithpan SE_W020, 63 + playsewithpan SE_W020, SOUND_PAN_TARGET waitforvisualfinish createvisualtask sub_80DC4F4, 5, 0 createvisualtask sub_80DC2D4, 5, 2 - playsewithpan SE_W043, 192 + playsewithpan SE_W043, SOUND_PAN_ATTACKER waitforvisualfinish blendoff clearmonbg ANIM_BANK_DEF_PARTNER @@ -4338,37 +4338,37 @@ Move_EXTRASENSORY: @ 81CD431 end Move_AERIAL_ACE: @ 81CD499 - loadspritegfx 10138 + loadspritegfx ANIM_TAG_CUT monbg ANIM_BANK_TARGET setalpha 12, 8 createvisualtask AnimTask_TranslateMonEllipticalRespectSide, 2, ANIM_BANK_ATTACKER, 24, 6, 1, 5 createvisualtask sub_80E2DD8, 2, 0, 4, 7, 3 createsprite gCuttingSliceSpriteTemplate, 2, 40, -32, 0 - playsewithpan SE_W013B, 192 + playsewithpan SE_W013B, SOUND_PAN_ATTACKER delay 5 createvisualtask AnimTask_ShakeMon, 2, ANIM_BANK_TARGET, 0, 3, 10, 1 createsprite gBattleAnimSpriteTemplate_83DB3DC, 2, 31, 3, 1, 0, 10, 0, 0 - playsewithpan SE_W013, 63 + playsewithpan SE_W013, SOUND_PAN_TARGET waitforvisualfinish clearmonbg ANIM_BANK_TARGET blendoff end Move_IRON_DEFENSE: @ 81CD503 - loopsewithpan SE_REAPOKE, 192, 28, 2 + loopsewithpan SE_REAPOKE, SOUND_PAN_ATTACKER, 28, 2 createvisualtask sub_80E0A4C, 5, 0, 0, 0 createsprite gBattleAnimSpriteTemplate_83DB3DC, 2, 1, 8, 2, -1, 14, -1, 0 waitforvisualfinish end Move_BLOCK: @ 81CD52D - loadspritegfx 10250 + loadspritegfx ANIM_TAG_X_SIGN createsprite gBattleAnimSpriteTemplate_8402A6C, 194 - playsewithpan SE_W207, 63 + playsewithpan SE_W207, SOUND_PAN_TARGET end Move_HOWL: @ 81CD53C - loadspritegfx 10053 + loadspritegfx ANIM_TAG_NOISE_LINE createvisualtask sub_812F724, 2, 0 delay 12 call _81CE35E @@ -4378,63 +4378,63 @@ Move_HOWL: @ 81CD53C end Move_BULK_UP: @ 81CD55E - loadspritegfx 10086 + loadspritegfx ANIM_TAG_BREATH createvisualtask sub_80D08C8, 2 - playsewithpan SE_W207, 192 + playsewithpan SE_W207, SOUND_PAN_ATTACKER waitforvisualfinish createsprite gBattleAnimSpriteTemplate_83D7764, 2 - loopsewithpan SE_W207, 192, 4, 2 + loopsewithpan SE_W207, SOUND_PAN_ATTACKER, 4, 2 waitforvisualfinish end Move_COVET: @ 81CD57C - loadspritegfx 10210 - loadspritegfx 10224 + loadspritegfx ANIM_TAG_MAGENTA_HEART + loadspritegfx ANIM_TAG_ITEM_BAG createvisualtask sub_812E568, 5, 0, 2, 0 createsprite gBattleAnimSpriteTemplate_83D7A80, 3, 0, 20 - playsewithpan SE_W204, 192 + playsewithpan SE_W204, SOUND_PAN_ATTACKER delay 15 createsprite gBattleAnimSpriteTemplate_83D7A80, 3, -20, 20 - playsewithpan SE_W204, 192 + playsewithpan SE_W204, SOUND_PAN_ATTACKER delay 15 createsprite gBattleAnimSpriteTemplate_83D7A80, 3, 20, 20 - playsewithpan SE_W204, 192 + playsewithpan SE_W204, SOUND_PAN_ATTACKER waitforvisualfinish createvisualtask AnimTask_ShakeMon2, 2, ANIM_BANK_TARGET, 2, 0, 8, 1 - loopsewithpan SE_W146, 63, 4, 3 + loopsewithpan SE_W146, SOUND_PAN_TARGET, 4, 3 end Move_VOLT_TACKLE: @ 81CD5D9 - loadspritegfx 10001 - loadspritegfx 10212 - loadspritegfx 10213 + loadspritegfx ANIM_TAG_SPARK + loadspritegfx ANIM_TAG_CIRCLE_OF_LIGHT + loadspritegfx ANIM_TAG_ELECTRICITY monbg ANIM_BANK_ATTACKER setalpha 12, 8 createvisualtask sub_80E2A38, 10, 1, 0, 0, 8, 0 waitforvisualfinish createsprite gBattleAnimSpriteTemplate_83D9AB4, 1 - playsewithpan SE_W268, 192 + playsewithpan SE_W268, SOUND_PAN_ATTACKER waitforvisualfinish clearmonbg ANIM_BANK_ATTACKER blendoff delay 8 createvisualtask sub_80D700C, 5, 0 - playsewithpan SE_W085, 192 + playsewithpan SE_W085, SOUND_PAN_ATTACKER waitforvisualfinish createvisualtask sub_80D700C, 5, 1 - playsewithpan SE_W085, 63 + playsewithpan SE_W085, SOUND_PAN_TARGET waitforvisualfinish createvisualtask sub_80D700C, 5, 2 - playsewithpan SE_W085, 192 + playsewithpan SE_W085, SOUND_PAN_ATTACKER waitforvisualfinish createvisualtask sub_80D700C, 5, 3 - playsewithpan SE_W085, 63 + playsewithpan SE_W085, SOUND_PAN_TARGET waitforvisualfinish createvisualtask sub_80D700C, 5, 4 - playsewithpan SE_W085, 192 + playsewithpan SE_W085, SOUND_PAN_ATTACKER delay 8 createvisualtask AnimTask_ShakeMon2, 2, ANIM_BANK_TARGET, 10, 0, 18, 1 - playsewithpan SE_W120, 63 + playsewithpan SE_W120, SOUND_PAN_TARGET createsprite gBattleAnimSpriteTemplate_83D9A9C, 2, 1, 16, 16 delay 2 createsprite gBattleAnimSpriteTemplate_83D9A9C, 2, 1, -16, -16 @@ -4442,7 +4442,7 @@ Move_VOLT_TACKLE: @ 81CD5D9 createvisualtask sub_80D6E9C, 5 waitforvisualfinish createvisualtask AnimTask_ShakeMon2, 2, ANIM_BANK_ATTACKER, 3, 0, 9, 1 - playsewithpan SE_W085B, 192 + playsewithpan SE_W085B, SOUND_PAN_ATTACKER createsprite gBattleAnimSpriteTemplate_83D9A9C, 2, 0, 16, 16 delay 2 createsprite gBattleAnimSpriteTemplate_83D9A9C, 2, 0, -16, -16 @@ -4452,33 +4452,33 @@ Move_VOLT_TACKLE: @ 81CD5D9 end Move_WATER_SPORT: @ 81CD6D1 - loadspritegfx 10268 + loadspritegfx ANIM_TAG_GLOWY_BLUE_ORB createvisualtask sub_80D48F4, 5 delay 8 - playsewithpan SE_W057, 192 + playsewithpan SE_W057, SOUND_PAN_ATTACKER delay 44 - playsewithpan SE_W057, 192 + playsewithpan SE_W057, SOUND_PAN_ATTACKER delay 44 - playsewithpan SE_W057, 192 + playsewithpan SE_W057, SOUND_PAN_ATTACKER delay 44 - panse_1B SE_W057, 192, 63, 2, 0 + panse_1B SE_W057, SOUND_PAN_ATTACKER, SOUND_PAN_TARGET, 2, 0 end Move_CALM_MIND: @ 81CD6F7 - loadspritegfx 10203 + loadspritegfx ANIM_TAG_THIN_RING monbg ANIM_BANK_ATK_PARTNER createvisualtask sub_80E2A7C, 5, 0, 0, 0, 16, 0 waitforvisualfinish createvisualtask sub_80E3BDC, 5, 1 waitforvisualfinish createsprite gBattleAnimSpriteTemplate_83D795C, 40, 0, 0, 0, 0 - playsewithpan SE_W048, 192 + playsewithpan SE_W048, SOUND_PAN_ATTACKER delay 14 createsprite gBattleAnimSpriteTemplate_83D795C, 40, 0, 0, 0, 0 - playsewithpan SE_W048, 192 + playsewithpan SE_W048, SOUND_PAN_ATTACKER delay 14 createsprite gBattleAnimSpriteTemplate_83D795C, 40, 0, 0, 0, 0 - playsewithpan SE_W048, 192 + playsewithpan SE_W048, SOUND_PAN_ATTACKER waitforvisualfinish createvisualtask sub_80E3BDC, 5, 0 waitforvisualfinish @@ -4488,37 +4488,37 @@ Move_CALM_MIND: @ 81CD6F7 end Move_LEAF_BLADE: @ 81CD775 - loadspritegfx 10063 - loadspritegfx 10285 + loadspritegfx ANIM_TAG_LEAF + loadspritegfx ANIM_TAG_CROSS_IMPACT createvisualtask sub_80CBDF4, 5 delay 2 createvisualtask AnimTask_ShakeMon2, 2, ANIM_BANK_TARGET, 2, 0, 8, 1 - playsewithpan SE_W015, 63 + playsewithpan SE_W015, SOUND_PAN_TARGET delay 50 createvisualtask AnimTask_ShakeMon2, 2, ANIM_BANK_TARGET, 2, 0, 8, 1 - playsewithpan SE_W015, 63 + playsewithpan SE_W015, SOUND_PAN_TARGET delay 50 createvisualtask AnimTask_ShakeMon2, 2, ANIM_BANK_TARGET, 2, 0, 8, 1 - playsewithpan SE_W015, 63 + playsewithpan SE_W015, SOUND_PAN_TARGET waitforvisualfinish monbg ANIM_BANK_TARGET setalpha 12, 8 delay 12 createvisualtask AnimTask_ShakeMon2, 2, ANIM_BANK_TARGET, 8, 0, 18, 1 createsprite gBattleAnimSpriteTemplate_83DB520, 130, 0, 0, 1, 36 - playsewithpan SE_W043, 63 + playsewithpan SE_W043, SOUND_PAN_TARGET waitforvisualfinish clearmonbg ANIM_BANK_TARGET blendoff end Move_DRAGON_DANCE: @ 81CD7F8 - loadspritegfx 10249 + loadspritegfx ANIM_TAG_HOLLOW_ORB monbg ANIM_BANK_ATTACKER monbgprio_28 0 delay 1 createvisualtask sub_80DF924, 5 - playsewithpan SE_W100, 192 + playsewithpan SE_W100, SOUND_PAN_ATTACKER delay 8 createvisualtask sub_80798AC, 5, 10249, 19456, 14, 0, 3 createsprite gBattleAnimSpriteTemplate_83DB0E8, 2, 0 @@ -4528,25 +4528,25 @@ Move_DRAGON_DANCE: @ 81CD7F8 createsprite gBattleAnimSpriteTemplate_83DB0E8, 2, 170 createsprite gBattleAnimSpriteTemplate_83DB0E8, 2, 213 delay 30 - playsewithpan SE_W100, 192 + playsewithpan SE_W100, SOUND_PAN_ATTACKER delay 30 - playsewithpan SE_W100, 192 + playsewithpan SE_W100, SOUND_PAN_ATTACKER waitforvisualfinish clearmonbg ANIM_BANK_ATTACKER delay 1 end Move_SHOCK_WAVE: @ 81CD867 - loadspritegfx 10211 - loadspritegfx 10212 - loadspritegfx 10001 - loadspritegfx 10037 + loadspritegfx ANIM_TAG_ELECTRIC_ORBS + loadspritegfx ANIM_TAG_CIRCLE_OF_LIGHT + loadspritegfx ANIM_TAG_SPARK + loadspritegfx ANIM_TAG_LIGHTNING monbg ANIM_BANK_ATTACKER setalpha 12, 8 createsprite gSimplePaletteBlendSpriteTemplate, 2, 1, 2, 0, 4, rgb(0, 0, 0) waitforvisualfinish createvisualtask sub_80D6B3C, 2, 0, 20, 0, 2 - playsewithpan SE_W268, 192 + playsewithpan SE_W268, SOUND_PAN_ATTACKER delay 12 createsprite gBattleAnimSpriteTemplate_83D9B28, 2 delay 30 @@ -4554,7 +4554,7 @@ Move_SHOCK_WAVE: @ 81CD867 delay 12 waitforvisualfinish createvisualtask sub_80D759C, 5 - playsewithpan SE_W161B, 63 + playsewithpan SE_W161B, SOUND_PAN_TARGET waitforvisualfinish createvisualtask AnimTask_ShakeMon, 2, ANIM_BANK_TARGET, 0, 6, 18, 1 createvisualtask sub_80E2A38, 5, 1, 3, 16, 0, 32767 @@ -4567,39 +4567,39 @@ Move_SHOCK_WAVE: @ 81CD867 end Move_HARDEN: @ 81CD909 - loopsewithpan SE_W231, 192, 28, 2 + loopsewithpan SE_W231, SOUND_PAN_ATTACKER, 28, 2 createvisualtask sub_80E0A4C, 5, 0, 0, 0 waitforvisualfinish end Move_BELLY_DRUM: @ 81CD91E - loadspritegfx 10072 - loadspritegfx 10193 + loadspritegfx ANIM_TAG_MUSIC_NOTES + loadspritegfx ANIM_TAG_PURPLE_HAND_OUTLINE createvisualtask sub_80CEA20, 2 waitforvisualfinish call _81CD9EB createsprite gBattleAnimSpriteTemplate_83D71A8, 2, 0, 0, 0, 0 - playsewithpan SE_W187, 192 + playsewithpan SE_W187, SOUND_PAN_ATTACKER delay 15 call _81CD9D0 createsprite gBattleAnimSpriteTemplate_83D71A8, 2, 1, 1, 1, 0 - playsewithpan SE_W187, 192 + playsewithpan SE_W187, SOUND_PAN_ATTACKER delay 15 call _81CD9EB createsprite gBattleAnimSpriteTemplate_83D71A8, 2, 0, 3, 3, 128 - playsewithpan SE_W187, 192 + playsewithpan SE_W187, SOUND_PAN_ATTACKER delay 7 call _81CD9D0 createsprite gBattleAnimSpriteTemplate_83D71A8, 2, 1, 2, 0, 128 - playsewithpan SE_W187, 192 + playsewithpan SE_W187, SOUND_PAN_ATTACKER delay 7 call _81CD9EB createsprite gBattleAnimSpriteTemplate_83D71A8, 2, 0, 1, 1, 0 - playsewithpan SE_W187, 192 + playsewithpan SE_W187, SOUND_PAN_ATTACKER delay 7 call _81CD9D0 createsprite gBattleAnimSpriteTemplate_83D71A8, 2, 1, 0, 3, 0 - playsewithpan SE_W187, 192 + playsewithpan SE_W187, SOUND_PAN_ATTACKER waitforvisualfinish createvisualtask sub_80CEAD8, 2 waitforvisualfinish @@ -4614,15 +4614,15 @@ _81CD9EB: return Move_MIND_READER: @ 81CDA06 - loadspritegfx 10189 - loadspritegfx 10190 - loadspritegfx 10191 + loadspritegfx ANIM_TAG_TEAL_ALERT + loadspritegfx ANIM_TAG_OPENING_EYE + loadspritegfx ANIM_TAG_ROUND_WHITE_HALO monbg 4 - playsewithpan SE_W109, 63 + playsewithpan SE_W109, SOUND_PAN_TARGET createsprite gBattleAnimSpriteTemplate_84021DC, 5, 0, 0, 1, 0 createsprite gBattleAnimSpriteTemplate_84021F4, 5 delay 40 - playsewithpan SE_W043, 63 + playsewithpan SE_W043, SOUND_PAN_TARGET createvisualtask sub_80E1F8C, 2, 1, 1, 2, 0, 10, 0 call _81CDA4D waitforvisualfinish @@ -4655,13 +4655,13 @@ _81CDA4D: Move_ICE_PUNCH: @ 81CDB3E monbg ANIM_BANK_DEF_PARTNER setalpha 12, 8 - loadspritegfx 10141 - loadspritegfx 10135 - loadspritegfx 10143 + loadspritegfx ANIM_TAG_ICE_CRYSTALS + loadspritegfx ANIM_TAG_IMPACT + loadspritegfx ANIM_TAG_HANDS_AND_FEET createsprite gSimplePaletteBlendSpriteTemplate, 2, 1, 1, 0, 7, rgb(0, 0, 0) createvisualtask sub_80E2A38, 10, 4, 2, 0, 9, 32588 delay 20 - playsewithpan SE_W081, 63 + playsewithpan SE_W081, SOUND_PAN_TARGET createsprite gSmallIcePunchCrystalSpriteTemplate, 2, 0 createsprite gSmallIcePunchCrystalSpriteTemplate, 2, 64 createsprite gSmallIcePunchCrystalSpriteTemplate, 2, 128 @@ -4674,7 +4674,7 @@ Move_ICE_PUNCH: @ 81CDB3E delay 17 createsprite gFistFootSpriteTemplate, 4, 0, -10, 8, 1, 0 createsprite gBasicHitSplatSpriteTemplate, 3, 0, -10, 1, 1 - playsewithpan SE_W004, 63 + playsewithpan SE_W004, SOUND_PAN_TARGET delay 2 createvisualtask AnimTask_ShakeMon, 5, 1, 0, 5, 3, 1 waitforvisualfinish @@ -4690,8 +4690,8 @@ Move_ICE_PUNCH: @ 81CDB3E end Move_REST: @ 81CDC29 - playsewithpan SE_W173, 192 - loadspritegfx 10228 + playsewithpan SE_W173, SOUND_PAN_ATTACKER + loadspritegfx ANIM_TAG_LETTER_Z createsprite gBattleAnimSpriteTemplate_83D6D94, 2, 4, -10, 16, 0, 0 delay 20 createsprite gBattleAnimSpriteTemplate_83D6D94, 2, 4, -10, 16, 0, 0 @@ -4707,7 +4707,7 @@ Move_CONFUSION: @ 81CDC69 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 + playsewithpan SE_W048, SOUND_PAN_TARGET createvisualtask AnimTask_ShakeMon, 2, ANIM_BANK_TARGET, 3, 0, 15, 1 createvisualtask AnimTask_ScaleMonAndRestore, 5, -4, -4, 15, ANIM_BANK_TARGET, 1 waitforvisualfinish @@ -4724,7 +4724,7 @@ Move_PSYCHIC: @ 81CDCCA 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 + loopsewithpan SE_W048, SOUND_PAN_TARGET, 10, 3 createvisualtask AnimTask_ShakeMon, 2, ANIM_BANK_TARGET, 5, 0, 15, 1 createvisualtask AnimTask_ScaleMonAndRestore, 5, -6, -6, 15, ANIM_BANK_TARGET, 1 waitforvisualfinish @@ -4743,10 +4743,10 @@ _81CDD32: end _81CDD3B: monbg ANIM_BANK_ATK_PARTNER - playsewithpan SE_W060, 192 + playsewithpan SE_W060, SOUND_PAN_ATTACKER call Unknown_81D61E7 setalpha 8, 8 - playsewithpan SE_W048, 192 + playsewithpan SE_W048, SOUND_PAN_ATTACKER createvisualtask sub_80E1F8C, 2, 2, 0, 2, 0, 8, 32767 createvisualtask AnimTask_ScaleMonAndRestore, 5, -4, -4, 15, ANIM_BANK_ATTACKER, 1 waitforvisualfinish @@ -4756,11 +4756,11 @@ _81CDD3B: Unknown_81CDD7A: @ 81CDD7A monbg ANIM_BANK_DEF_PARTNER - playsewithpan SE_W060, 192 + playsewithpan SE_W060, SOUND_PAN_ATTACKER call Unknown_81D61E7 setalpha 8, 8 - playsewithpan SE_W048, 63 - waitplaysewithpan SE_W048, 63, 8 + playsewithpan SE_W048, SOUND_PAN_TARGET + waitplaysewithpan SE_W048, SOUND_PAN_TARGET, 8 createvisualtask AnimTask_ShakeMon, 2, ANIM_BANK_TARGET, 4, 0, 15, 1 createvisualtask AnimTask_ScaleMonAndRestore, 5, -5, -5, 15, ANIM_BANK_TARGET, 1 waitforvisualfinish @@ -4771,15 +4771,15 @@ Unknown_81CDD7A: @ 81CDD7A goto _81CDD32 Move_THUNDER: @ 81CDDCE - loadspritegfx 10037 - fadetobg 11 + loadspritegfx ANIM_TAG_LIGHTNING + fadetobg BG_THUNDER waitbgfadeout createvisualtask sub_80E3A58, 5, -256, 0, 1, -1 waitbgfadein createsprite gSimplePaletteBlendSpriteTemplate, 2, 1, 2, 0, 16, rgb(0, 0, 0) delay 16 createvisualtask sub_80E2324, 2, 257, 257, 257 - playsewithpan SE_W086, 63 + playsewithpan SE_W086, SOUND_PAN_TARGET delay 1 createsprite gBattleAnimSpriteTemplate_83D97D0, 130, 16, -36 delay 1 @@ -4788,12 +4788,12 @@ Move_THUNDER: @ 81CDDCE createsprite gBattleAnimSpriteTemplate_83D97D0, 130, 16, 12 delay 20 createsprite gBattleAnimSpriteTemplate_83D97D0, 134, -16, -32 - playsewithpan SE_W086, 63 + playsewithpan SE_W086, SOUND_PAN_TARGET delay 1 createsprite gBattleAnimSpriteTemplate_83D97D0, 134, -16, -16 delay 1 createsprite gBattleAnimSpriteTemplate_83D97D0, 134, -16, 16 - playsewithpan SE_W086, 63 + playsewithpan SE_W086, SOUND_PAN_TARGET delay 5 createvisualtask sub_80E2324, 2, 257, 257, 257 delay 1 @@ -4808,7 +4808,7 @@ Move_THUNDER: @ 81CDDCE createvisualtask sub_80E2324, 2, 257, 257, 257 delay 1 createsprite gBattleAnimSpriteTemplate_83D97D0, 130, 0, -32 - playsewithpan SE_W161B, 63 + playsewithpan SE_W161B, SOUND_PAN_TARGET delay 1 createsprite gBattleAnimSpriteTemplate_83D97D0, 130, 0, -16 delay 1 @@ -4824,19 +4824,19 @@ Move_THUNDER: @ 81CDDCE waitforvisualfinish restorebg waitbgfadeout - setarg 7, -1 + setarg ARG_RET_ID, -1 waitbgfadein end Move_THUNDER_PUNCH: @ 81CDF28 - loadspritegfx 10135 - loadspritegfx 10143 - loadspritegfx 10037 + loadspritegfx ANIM_TAG_IMPACT + loadspritegfx ANIM_TAG_HANDS_AND_FEET + loadspritegfx ANIM_TAG_LIGHTNING monbg ANIM_BANK_TARGET setalpha 12, 8 createsprite gSimplePaletteBlendSpriteTemplate, 2, 1, 2, 0, 16, rgb(0, 0, 0) waitforvisualfinish - playsewithpan SE_W004, 63 + playsewithpan SE_W004, SOUND_PAN_TARGET createsprite gFistFootSpriteTemplate, 132, 0, 0, 8, 1, 0 createsprite gBasicHitSplatSpriteTemplate, 131, 0, 0, 1, 1 delay 1 @@ -4848,7 +4848,7 @@ Move_THUNDER_PUNCH: @ 81CDF28 delay 1 createsprite gBattleAnimSpriteTemplate_83D97D0, 2, 0, 16 delay 1 - playsewithpan SE_W161B, 63 + playsewithpan SE_W161B, SOUND_PAN_TARGET createvisualtask sub_80E2324, 2, 257, 257, 257 delay 2 createvisualtask AnimTask_ShakeMon, 2, ANIM_BANK_TARGET, 0, 3, 15, 1 @@ -4862,9 +4862,9 @@ Move_THUNDER_PUNCH: @ 81CDF28 end Move_SACRED_FIRE: @ 81CDFF1 - loadspritegfx 10033 - loadspritegfx 10035 - loopsewithpan SE_W221, 192, 7, 5 + loadspritegfx ANIM_TAG_FIRE + loadspritegfx ANIM_TAG_FIRE_PLUME + loopsewithpan SE_W221, SOUND_PAN_ATTACKER, 7, 5 createsprite gBattleAnimSpriteTemplate_83D9538, 2, -32, 0, 50, 5, -2, 0 delay 1 createsprite gBattleAnimSpriteTemplate_83D9538, 66, -20, -10, 50, 5, -1, -1 @@ -4885,13 +4885,13 @@ Move_SACRED_FIRE: @ 81CDFF1 createvisualtask sub_80E2324, 2, 257, 257, 257 delay 1 waitforvisualfinish - playsewithpan SE_W221B, 63 + playsewithpan SE_W221B, SOUND_PAN_TARGET createsprite gBattleAnimSpriteTemplate_83D9508, 130, -16, 0, 70, 16, 0, 1 delay 10 - playsewithpan SE_W221B, 63 + playsewithpan SE_W221B, SOUND_PAN_TARGET createsprite gBattleAnimSpriteTemplate_83D9508, 130, 0, 0, 70, 16, 0, 1 delay 10 - playsewithpan SE_W221B, 63 + playsewithpan SE_W221B, SOUND_PAN_TARGET createsprite gBattleAnimSpriteTemplate_83D9508, 130, 16, 0, 80, 16, 0, 1 delay 1 createvisualtask sub_80E2324, 2, 257, 257, 257 @@ -4899,7 +4899,7 @@ Move_SACRED_FIRE: @ 81CDFF1 waitforvisualfinish createvisualtask sub_80E2324, 2, 257, 257, 257 delay 1 - playsewithpan SE_W172B, 63 + playsewithpan SE_W172B, SOUND_PAN_TARGET createsprite gBattleAnimSpriteTemplate_83D9520, 130, 0, 0, 30, 30, -1, 0 delay 1 createsprite gBattleAnimSpriteTemplate_83D9520, 130, 0, 0, 30, 30, 0, 1 @@ -4919,10 +4919,10 @@ Move_SACRED_FIRE: @ 81CDFF1 end Move_SCRATCH: @ 81CE1D8 - loadspritegfx 10137 + loadspritegfx ANIM_TAG_SCRATCH monbg ANIM_BANK_TARGET setalpha 12, 8 - playsewithpan SE_W010, 63 + playsewithpan SE_W010, SOUND_PAN_TARGET createsprite gBattleAnimSpriteTemplate_8402180, 2, 0, 0, 1, 0 createvisualtask AnimTask_ShakeMon, 2, ANIM_BANK_TARGET, 3, 0, 6, 1 waitforvisualfinish @@ -4932,10 +4932,10 @@ Move_SCRATCH: @ 81CE1D8 end Move_DRAGON_BREATH: @ 81CE20A - loadspritegfx 10029 + loadspritegfx ANIM_TAG_SMALL_EMBER monbg ANIM_BANK_DEF_PARTNER monbgprio_28 1 - loopsewithpan SE_W172, 192, 7, 7 + loopsewithpan SE_W172, SOUND_PAN_ATTACKER, 7, 7 createsprite gBattleAnimSpriteTemplate_83DB044, 130, 0, 0, 0, 0, 20 delay 2 createsprite gBattleAnimSpriteTemplate_83DB044, 130, 0, 0, 0, 0, 20 @@ -4966,7 +4966,7 @@ Move_DRAGON_BREATH: @ 81CE20A end Move_ROAR: @ 81CE31E - loadspritegfx 10053 + loadspritegfx ANIM_TAG_NOISE_LINE monbg ANIM_BANK_ATTACKER monbgprio_28 0 setalpha 8, 8 @@ -4992,7 +4992,7 @@ _81CE35E: return Move_GROWL: @ 81CE3AF - loadspritegfx 10053 + loadspritegfx ANIM_TAG_NOISE_LINE createvisualtask sub_812B18C, 2, 0, 255 call _81CE35E delay 10 @@ -5003,7 +5003,7 @@ Move_GROWL: @ 81CE3AF end Move_SNORE: @ 81CE3EA - loadspritegfx 10197 + loadspritegfx ANIM_TAG_SNORE_Z monbg ANIM_BANK_ATK_PARTNER setalpha 8, 8 call _81CE403 @@ -5014,7 +5014,7 @@ Move_SNORE: @ 81CE3EA blendoff end _81CE403: - playsewithpan SE_W173, 192 + playsewithpan SE_W173, SOUND_PAN_ATTACKER createvisualtask AnimTask_ScaleMonAndRestore, 5, -7, -7, 7, ANIM_BANK_ATTACKER, 1 createvisualtask AnimTask_ShakeMon2, 2, ANIM_BANK_TARGET, 4, 0, 7, 1 createsprite gBattleAnimSpriteTemplate_83DB428, 2, 6, 1, 14, 0, 0 @@ -5024,10 +5024,10 @@ _81CE403: return Move_LIGHT_SCREEN: @ 81CE47A - loadspritegfx 10070 - loadspritegfx 10166 + loadspritegfx ANIM_TAG_SPARKLE_3 + loadspritegfx ANIM_TAG_GREEN_LIGHT_WALL setalpha 0, 16 - waitplaysewithpan SE_W115, 192, 15 + waitplaysewithpan SE_W115, SOUND_PAN_ATTACKER, 15 createsprite gBattleAnimSpriteTemplate_83DA6A8, 1, 40, 0, 10166 delay 10 call _81CE4A1 @@ -5050,12 +5050,12 @@ _81CE4A1: return Move_MIRROR_COAT: @ 81CE506 - loadspritegfx 10070 - loadspritegfx 10168 + loadspritegfx ANIM_TAG_SPARKLE_3 + loadspritegfx ANIM_TAG_RED_LIGHT_WALL setalpha 0, 16 createsprite gBattleAnimSpriteTemplate_83DA6D8, 1, 40, 0, 10168 delay 10 - playsewithpan SE_W115, 192 + playsewithpan SE_W115, SOUND_PAN_ATTACKER call _81CE4A1 waitforvisualfinish delay 1 @@ -5063,10 +5063,10 @@ Move_MIRROR_COAT: @ 81CE506 end Move_REFLECT: @ 81CE52C - loadspritegfx 10071 - loadspritegfx 10167 + loadspritegfx ANIM_TAG_SPARKLE_4 + loadspritegfx ANIM_TAG_BLUE_LIGHT_WALL setalpha 0, 16 - waitplaysewithpan SE_W115, 192, 15 + waitplaysewithpan SE_W115, SOUND_PAN_ATTACKER, 15 createsprite gBattleAnimSpriteTemplate_83DA6C0, 1, 40, 0, 10167 delay 20 createsprite gBattleAnimSpriteTemplate_83DA73C, 2, 30, 0, 0, 1 @@ -5080,9 +5080,9 @@ Move_REFLECT: @ 81CE52C end Move_BARRIER: @ 81CE57F - loadspritegfx 10169 + loadspritegfx ANIM_TAG_GRAY_LIGHT_WALL setalpha 0, 16 - waitplaysewithpan SE_W112, 192, 15 + waitplaysewithpan SE_W112, SOUND_PAN_ATTACKER, 15 createsprite gBattleAnimSpriteTemplate_83DA6F0, 3, 40, 0, 10169 waitforvisualfinish delay 1 @@ -5090,34 +5090,34 @@ Move_BARRIER: @ 81CE57F end Move_BUBBLE: @ 81CE59C - loadspritegfx 10146 - loadspritegfx 10155 + loadspritegfx ANIM_TAG_BUBBLE + loadspritegfx ANIM_TAG_SMALL_BUBBLES monbg ANIM_BANK_TARGET setalpha 12, 8 delay 1 createsprite gBattleAnimSpriteTemplate_83D9178, 2, 18, 0, 15, -15, 10, 128, 100 - playsewithpan SE_W145, 192 - waitplaysewithpan SE_W145B, 63, 100 + playsewithpan SE_W145, SOUND_PAN_ATTACKER + waitplaysewithpan SE_W145B, SOUND_PAN_TARGET, 100 delay 6 createsprite gBattleAnimSpriteTemplate_83D9178, 2, 18, 0, 35, 37, 40, 128, 100 - playsewithpan SE_W145, 192 - waitplaysewithpan SE_W145B, 63, 100 + playsewithpan SE_W145, SOUND_PAN_ATTACKER + waitplaysewithpan SE_W145B, SOUND_PAN_TARGET, 100 delay 6 createsprite gBattleAnimSpriteTemplate_83D9178, 2, 18, 0, 10, -37, 30, 128, 100 - playsewithpan SE_W145, 192 - waitplaysewithpan SE_W145B, 63, 100 + playsewithpan SE_W145, SOUND_PAN_ATTACKER + waitplaysewithpan SE_W145B, SOUND_PAN_TARGET, 100 delay 6 createsprite gBattleAnimSpriteTemplate_83D9178, 2, 18, 0, 30, 10, 15, 128, 100 - playsewithpan SE_W145, 192 - waitplaysewithpan SE_W145B, 63, 100 + playsewithpan SE_W145, SOUND_PAN_ATTACKER + waitplaysewithpan SE_W145B, SOUND_PAN_TARGET, 100 delay 6 createsprite gBattleAnimSpriteTemplate_83D9178, 2, 18, 0, 20, 33, 20, 128, 100 - playsewithpan SE_W145, 192 - waitplaysewithpan SE_W145B, 63, 100 + playsewithpan SE_W145, SOUND_PAN_ATTACKER + waitplaysewithpan SE_W145B, SOUND_PAN_TARGET, 100 delay 6 createsprite gBattleAnimSpriteTemplate_83D9178, 2, 18, 0, 25, -30, 10, 128, 100 - playsewithpan SE_W145, 192 - waitplaysewithpan SE_W145B, 63, 100 + playsewithpan SE_W145, SOUND_PAN_ATTACKER + waitplaysewithpan SE_W145B, SOUND_PAN_TARGET, 100 waitforvisualfinish call WaterBubbleEffect2 waitforvisualfinish @@ -5126,11 +5126,11 @@ Move_BUBBLE: @ 81CE59C end Move_SMOG: @ 81CE672 - loadspritegfx 10172 + loadspritegfx ANIM_TAG_PURPLE_GAS_CLOUD monbg ANIM_BANK_DEF_PARTNER monbgprio_29 setalpha 12, 8 - loopsewithpan SE_W054, 63, 17, 10 + loopsewithpan SE_W054, SOUND_PAN_TARGET, 17, 10 call _81CE6D7 call _81CE6D7 call _81CE6D7 @@ -5139,7 +5139,7 @@ Move_SMOG: @ 81CE672 call _81CE6D7 call _81CE6D7 delay 120 - loopsewithpan SE_W092, 63, 18, 2 + loopsewithpan SE_W092, SOUND_PAN_TARGET, 18, 2 createvisualtask sub_80E1F8C, 2, 4, 2, 2, 0, 12, 26650 delay 10 createvisualtask AnimTask_ShakeMon2, 2, ANIM_BANK_TARGET, 2, 0, 15, 1 @@ -5153,30 +5153,30 @@ _81CE6D7: return Move_FAINT_ATTACK: @ 81CE6ED - loadspritegfx 10135 + loadspritegfx ANIM_TAG_IMPACT monbg ANIM_BANK_ATTACKER - fadetobg 1 + fadetobg BG_DARK waitbgfadein delay 0 - playsewithpan SE_W185, 192 + playsewithpan SE_W185, SOUND_PAN_ATTACKER createvisualtask AnimTask_TranslateMonEllipticalRespectSide, 2, ANIM_BANK_ATTACKER, 18, 6, 1, 3 createvisualtask sub_80DFC24, 2, 1 waitforvisualfinish clearmonbg ANIM_BANK_ATTACKER - invisible 0 + invisible ANIM_BANK_ATTACKER delay 1 createvisualtask sub_80E4300, 2 monbg ANIM_BANK_TARGET setalpha 12, 8 delay 1 - playsewithpan SE_W233B, 63 + playsewithpan SE_W233B, SOUND_PAN_TARGET createsprite gBasicHitSplatSpriteTemplate, 2, 0, 0, 1, 1 createvisualtask AnimTask_ShakeMon2, 2, ANIM_BANK_TARGET, 2, 0, 9, 1 waitforvisualfinish clearmonbg ANIM_BANK_TARGET blendoff delay 1 - setarg 7, 4096 + setarg ARG_RET_ID, 4096 delay 32 createvisualtask sub_80DFDC0, 2 monbg ANIM_BANK_ATTACKER @@ -5189,11 +5189,11 @@ Move_FAINT_ATTACK: @ 81CE6ED end Move_SAND_ATTACK: @ 81CE774 - loadspritegfx 10074 + loadspritegfx ANIM_TAG_MUD_SAND monbg ANIM_BANK_ATK_PARTNER monbgprio_28 0 setalpha 12, 8 - playsewithpan SE_W028, 192 + playsewithpan SE_W028, SOUND_PAN_ATTACKER createsprite gSlideMonToOffsetSpriteTemplate, 2, 0, -10, 0, 0, 3 waitforvisualfinish createsprite gSlideMonToOriginalPosSpriteTemplate, 2, 0, 0, 2 @@ -5217,8 +5217,8 @@ Move_SAND_ATTACK_CreateDirtSpray: return Move_MUD_SLAP: @ 81CE81C - loadspritegfx 10074 - playsewithpan SE_W028, 192 + loadspritegfx ANIM_TAG_MUD_SAND + playsewithpan SE_W028, SOUND_PAN_ATTACKER createsprite gSlideMonToOffsetSpriteTemplate, 2, 0, -10, 0, 0, 3 waitforvisualfinish createsprite gSlideMonToOriginalPosSpriteTemplate, 2, 0, 0, 2 @@ -5240,16 +5240,16 @@ Move_MUD_SLAP_CreateMudSpray: return Move_DRAGON_RAGE: @ 81CE8BA - loadspritegfx 10029 - loadspritegfx 10035 - playsewithpan SE_W082, 192 + loadspritegfx ANIM_TAG_SMALL_EMBER + loadspritegfx ANIM_TAG_FIRE_PLUME + playsewithpan SE_W082, SOUND_PAN_ATTACKER createvisualtask AnimTask_ShakeMon, 5, 0, 0, 2, 40, 1 waitforvisualfinish createsprite gSlideMonToOffsetSpriteTemplate, 130, 0, 15, 0, 0, 4 waitforvisualfinish createsprite gBattleAnimSpriteTemplate_83DB0D0, 130, 30, 15, 0, 10, 10 waitforvisualfinish - loopsewithpan SE_W172B, 63, 11, 3 + loopsewithpan SE_W172B, SOUND_PAN_TARGET, 11, 3 createvisualtask AnimTask_ShakeMon, 5, 1, 0, 3, 25, 1 createsprite gBattleAnimSpriteTemplate_83DB078, 194, 1, 5, 0 delay 1 @@ -5272,8 +5272,8 @@ Move_DRAGON_RAGE: @ 81CE8BA end Move_RAIN_DANCE: @ 81CE997 - loadspritegfx 10115 - playsewithpan SE_W240, 192 + loadspritegfx ANIM_TAG_RAIN_DROPS + playsewithpan SE_W240, SOUND_PAN_ATTACKER createvisualtask sub_80E2A38, 10, 1921, 2, 0, 4, 0 waitforvisualfinish createvisualtask CreateAnimRaindrops, 2, 0, 3, 120 @@ -5286,11 +5286,11 @@ Move_RAIN_DANCE: @ 81CE997 end Move_BITE: @ 81CE9E2 - loadspritegfx 10139 - loadspritegfx 10135 + loadspritegfx ANIM_TAG_SHARP_TEETH + loadspritegfx ANIM_TAG_IMPACT monbg ANIM_BANK_TARGET setalpha 12, 8 - playsewithpan SE_W044, 63 + playsewithpan SE_W044, SOUND_PAN_TARGET createsprite gBattleAnimSpriteTemplate_83DB1D0, 2, 0, -32, 0, 0, 819, 10 createsprite gBattleAnimSpriteTemplate_83DB1D0, 2, 0, 32, 4, 0, -819, 10 delay 10 @@ -5303,20 +5303,20 @@ Move_BITE: @ 81CE9E2 end Move_CRUNCH: @ 81CEA40 - loadspritegfx 10139 - loadspritegfx 10135 + loadspritegfx ANIM_TAG_SHARP_TEETH + loadspritegfx ANIM_TAG_IMPACT monbg ANIM_BANK_TARGET - fadetobg 1 + fadetobg BG_DARK waitbgfadein setalpha 12, 8 - playsewithpan SE_W044, 63 + playsewithpan SE_W044, SOUND_PAN_TARGET createsprite gBattleAnimSpriteTemplate_83DB1D0, 2, -32, -32, 1, 819, 819, 10 createsprite gBattleAnimSpriteTemplate_83DB1D0, 2, 32, 32, 5, -819, -819, 10 delay 10 createsprite gBasicHitSplatSpriteTemplate, 2, -8, 0, 1, 1 createvisualtask AnimTask_ShakeMon, 5, 1, 0, 7, 5, 2 waitforvisualfinish - playsewithpan SE_W044, 63 + playsewithpan SE_W044, SOUND_PAN_TARGET createsprite gBattleAnimSpriteTemplate_83DB1D0, 2, 32, -32, 7, -819, 819, 10 createsprite gBattleAnimSpriteTemplate_83DB1D0, 2, -32, 32, 3, 819, -819, 10 delay 10 @@ -5331,11 +5331,11 @@ Move_CRUNCH: @ 81CEA40 end Move_CLAMP: @ 81CEAF0 - loadspritegfx 10145 - loadspritegfx 10135 + loadspritegfx ANIM_TAG_CLAMP + loadspritegfx ANIM_TAG_IMPACT monbg ANIM_BANK_TARGET setalpha 12, 8 - playsewithpan SE_W011, 63 + playsewithpan SE_W011, SOUND_PAN_TARGET createsprite gBattleAnimSpriteTemplate_83DB1E8, 2, -32, 0, 2, 819, 0, 10 createsprite gBattleAnimSpriteTemplate_83DB1E8, 2, 32, 0, 6, -819, 0, 10 delay 10 @@ -5351,7 +5351,7 @@ Move_ICE_BEAM: @ 81CEB4D monbg ANIM_BANK_TARGET monbgprio_28 1 setalpha 12, 8 - loadspritegfx 10141 + loadspritegfx ANIM_TAG_ICE_CRYSTALS createsprite gSimplePaletteBlendSpriteTemplate, 2, 1, 1, 0, 7, rgb(0, 0, 0) waitforvisualfinish createsoundtask sub_812B058, 183, -64, 63, 4, 4, 0, 10 @@ -5392,24 +5392,24 @@ _81CEC4E: return Move_WITHDRAW: @ 81CEC84 - playsewithpan SE_W029, 192 + playsewithpan SE_W029, SOUND_PAN_ATTACKER createvisualtask sub_80CF4D8, 5 waitforvisualfinish end Move_AURORA_BEAM: @ 81CEC91 - loadspritegfx 10140 - fadetobg 20 + loadspritegfx ANIM_TAG_RAINBOW_RINGS + fadetobg BG_AURORABEAM waitbgfadein - playsewithpan SE_W062, 192 - setarg 7, 0 + playsewithpan SE_W062, SOUND_PAN_ATTACKER + setarg ARG_RET_ID, 0 createvisualtask AnimTask_RotateMonPalette1, 10, 130 call _81CED18 createvisualtask AnimTask_ShakeMon2, 5, 1, 1, 0, 17, 1 call _81CED18 call _81CED18 call _81CED18 - setarg 7, -1 + setarg ARG_RET_ID, -1 createsoundtask sub_812B058, 183, -64, 63, 3, 6, 0, 10 createvisualtask AnimTask_ShakeMon2, 5, 1, 2, 0, 40, 1 call _81CED18 @@ -5434,7 +5434,7 @@ _81CED18: return Move_SOLAR_BEAM: @ 81CED65 - loadspritegfx 10147 + loadspritegfx ANIM_TAG_ORBS choosetwoturnanim _81CED73, _81CEE70 _81CED71: waitforvisualfinish @@ -5443,7 +5443,7 @@ _81CED73: monbg ANIM_BANK_ATK_PARTNER setalpha 12, 8 createvisualtask sub_80E1F8C, 2, 2, 1, 4, 0, 11, 12287 - playsewithpan SE_W025, 192 + playsewithpan SE_W025, SOUND_PAN_ATTACKER call _81CED9D waitforvisualfinish clearmonbg ANIM_BANK_ATK_PARTNER @@ -5481,7 +5481,7 @@ _81CED9D: return _81CEE70: call Unknown_81D6233 - panse_1B SE_W076, 192, 63, 2, 0 + panse_1B SE_W076, SOUND_PAN_ATTACKER, SOUND_PAN_TARGET, 2, 0 createvisualtask sub_80CA928, 5 createsprite gBattleAnimSpriteTemplate_83D6304, 131, 15, 0, 20, 0 delay 4 @@ -5523,20 +5523,20 @@ _81CEF42: return Move_BLIZZARD: @ 81CEFBA - loadspritegfx 10141 + loadspritegfx ANIM_TAG_ICE_CRYSTALS monbg ANIM_BANK_DEF_PARTNER createvisualtask sub_80E3B4C, 2 jumpargeq 7, 1, _81CF13F - fadetobg 9 + fadetobg BG_HIGHSPEED_OPPONENT _81CEFD0: waitbgfadeout createvisualtask sub_80E3A58, 5, -2304, 0, 1, -1 waitbgfadein waitforvisualfinish - panse_1B SE_W059, 192, 63, 2, 0 + panse_1B SE_W059, SOUND_PAN_ATTACKER, SOUND_PAN_TARGET, 2, 0 call _81CF00A call _81CF00A - playsewithpan SE_W059B, 63 + playsewithpan SE_W059B, SOUND_PAN_TARGET waitforvisualfinish call Effect_HeavyIceDamage waitforvisualfinish @@ -5544,7 +5544,7 @@ _81CEFD0: delay 20 restorebg waitbgfadeout - setarg 7, -1 + setarg ARG_RET_ID, -1 waitbgfadein end _81CF00A: @@ -5571,18 +5571,18 @@ _81CF00A: delay 3 return _81CF13F: - fadetobg 10 + fadetobg BG_HIGHSPEED_PLAYER goto _81CEFD0 Move_POWDER_SNOW: @ 81CF146 - loadspritegfx 10141 + loadspritegfx ANIM_TAG_ICE_CRYSTALS monbg ANIM_BANK_DEF_PARTNER createsprite gSimplePaletteBlendSpriteTemplate, 2, 31, 1, 0, 3, rgb(0, 0, 0) waitforvisualfinish - panse_1B SE_W016, 192, 63, 2, 0 + panse_1B SE_W016, SOUND_PAN_ATTACKER, SOUND_PAN_TARGET, 2, 0 call _81CF190 call _81CF190 - playsewithpan SE_W016B, 63 + playsewithpan SE_W016B, SOUND_PAN_TARGET waitforvisualfinish waitsound call Effect_HeavyIceDamage @@ -5609,14 +5609,14 @@ _81CF190: return Move_HYDRO_PUMP: @ 81CF240 - loadspritegfx 10149 - loadspritegfx 10148 + loadspritegfx ANIM_TAG_WATER_ORB + loadspritegfx ANIM_TAG_WATER_IMPACT monbg ANIM_BANK_DEF_PARTNER monbgprio_28 1 setalpha 12, 8 createvisualtask AnimTask_ShakeMon, 5, 0, 0, 2, 40, 1 delay 6 - panse_1B SE_W056, 192, 63, 2, 0 + panse_1B SE_W056, SOUND_PAN_ATTACKER, SOUND_PAN_TARGET, 2, 0 createvisualtask sub_80D3630, 5, 100 call _81CF2DF call _81CF2DF @@ -5656,12 +5656,12 @@ _81CF320: return Move_SIGNAL_BEAM: @ 81CF33F - loadspritegfx 10264 - loadspritegfx 10265 - loadspritegfx 10073 + loadspritegfx ANIM_TAG_GLOWY_RED_ORB + loadspritegfx ANIM_TAG_GLOWY_GREEN_ORB + loadspritegfx ANIM_TAG_DUCK createvisualtask AnimTask_ShakeMon, 5, 0, 0, 2, 25, 1 delay 6 - panse_1B SE_W062, 192, 63, 1, 0 + panse_1B SE_W062, SOUND_PAN_ATTACKER, SOUND_PAN_TARGET, 1, 0 createvisualtask sub_80D3630, 5, 100 call _81CF406 call _81CF406 @@ -5697,15 +5697,15 @@ _81CF406: return Move_ABSORB: @ 81CF427 - loadspritegfx 10147 - loadspritegfx 10031 - loadspritegfx 10135 + loadspritegfx ANIM_TAG_ORBS + loadspritegfx ANIM_TAG_BLUE_STAR + loadspritegfx ANIM_TAG_IMPACT monbg ANIM_BANK_DEF_PARTNER monbgprio_2A ANIM_BANK_TARGET setalpha 12, 8 createsprite gSimplePaletteBlendSpriteTemplate, 2, 1, 1, 0, 4, rgb(13, 31, 12) waitforvisualfinish - playsewithpan SE_W071, 63 + playsewithpan SE_W071, SOUND_PAN_TARGET createsprite gBasicHitSplatSpriteTemplate, 2, 0, 0, 1, 2 delay 2 createvisualtask AnimTask_ShakeMon, 5, 1, 0, 5, 5, 1 @@ -5722,42 +5722,42 @@ Move_ABSORB: @ 81CF427 blendoff end _81CF496: - playsewithpan SE_W152, 63 + playsewithpan SE_W152, SOUND_PAN_TARGET createsprite gBattleAnimSpriteTemplate_83D637C, 3, 0, 5, 8, 26 delay 4 - playsewithpan SE_W152, 63 + playsewithpan SE_W152, SOUND_PAN_TARGET createsprite gBattleAnimSpriteTemplate_83D637C, 3, 10, -5, -8, 26 delay 4 - playsewithpan SE_W152, 63 + playsewithpan SE_W152, SOUND_PAN_TARGET createsprite gBattleAnimSpriteTemplate_83D637C, 3, -5, 15, 16, 33 delay 4 - playsewithpan SE_W152, 63 + playsewithpan SE_W152, SOUND_PAN_TARGET createsprite gBattleAnimSpriteTemplate_83D637C, 3, 0, -15, -16, 36 delay 4 - playsewithpan SE_W152, 63 + playsewithpan SE_W152, SOUND_PAN_TARGET createsprite gBattleAnimSpriteTemplate_83D637C, 3, 0, 5, 8, 26 delay 4 - playsewithpan SE_W152, 63 + playsewithpan SE_W152, SOUND_PAN_TARGET createsprite gBattleAnimSpriteTemplate_83D637C, 3, 10, -5, -8, 26 delay 4 - playsewithpan SE_W152, 63 + playsewithpan SE_W152, SOUND_PAN_TARGET createsprite gBattleAnimSpriteTemplate_83D637C, 3, -10, 20, 20, 39 delay 4 - playsewithpan SE_W152, 63 + playsewithpan SE_W152, SOUND_PAN_TARGET createsprite gBattleAnimSpriteTemplate_83D637C, 3, 5, -18, -20, 35 delay 4 return Move_MEGA_DRAIN: @ 81CF53F - loadspritegfx 10147 - loadspritegfx 10031 - loadspritegfx 10135 + loadspritegfx ANIM_TAG_ORBS + loadspritegfx ANIM_TAG_BLUE_STAR + loadspritegfx ANIM_TAG_IMPACT monbg ANIM_BANK_DEF_PARTNER monbgprio_2A ANIM_BANK_TARGET setalpha 12, 8 createsprite gSimplePaletteBlendSpriteTemplate, 2, 1, 1, 0, 8, rgb(13, 31, 12) waitforvisualfinish - playsewithpan SE_W071, 63 + playsewithpan SE_W071, SOUND_PAN_TARGET createsprite gBasicHitSplatSpriteTemplate, 2, 0, 0, 1, 1 delay 2 createvisualtask AnimTask_ShakeMon, 5, 1, 0, 5, 5, 1 @@ -5774,50 +5774,50 @@ Move_MEGA_DRAIN: @ 81CF53F blendoff end _81CF5AE: - playsewithpan SE_W145C, 63 + playsewithpan SE_W145C, SOUND_PAN_TARGET createsprite gBattleAnimSpriteTemplate_83D637C, 3, 0, 5, 8, 26 createsprite gBattleAnimSpriteTemplate_83D637C, 3, 5, -18, -20, 35 delay 4 - playsewithpan SE_W145C, 63 + playsewithpan SE_W145C, SOUND_PAN_TARGET createsprite gBattleAnimSpriteTemplate_83D637C, 3, 10, -5, -8, 26 createsprite gBattleAnimSpriteTemplate_83D637C, 3, -10, 20, 20, 39 delay 4 - playsewithpan SE_W145C, 63 + playsewithpan SE_W145C, SOUND_PAN_TARGET createsprite gBattleAnimSpriteTemplate_83D637C, 3, -5, 15, 16, 33 createsprite gBattleAnimSpriteTemplate_83D637C, 3, 10, -5, -8, 26 delay 4 - playsewithpan SE_W145C, 63 + playsewithpan SE_W145C, SOUND_PAN_TARGET createsprite gBattleAnimSpriteTemplate_83D637C, 3, 0, -15, -16, 36 createsprite gBattleAnimSpriteTemplate_83D637C, 3, 0, 5, 8, 26 delay 4 - playsewithpan SE_W145C, 63 + playsewithpan SE_W145C, SOUND_PAN_TARGET createsprite gBattleAnimSpriteTemplate_83D637C, 3, 0, 5, 8, 26 createsprite gBattleAnimSpriteTemplate_83D637C, 3, 0, -15, -16, 36 delay 4 - playsewithpan SE_W145C, 63 + playsewithpan SE_W145C, SOUND_PAN_TARGET createsprite gBattleAnimSpriteTemplate_83D637C, 3, 10, -5, -8, 26 createsprite gBattleAnimSpriteTemplate_83D637C, 3, -5, 15, 16, 33 delay 4 - playsewithpan SE_W145C, 63 + playsewithpan SE_W145C, SOUND_PAN_TARGET createsprite gBattleAnimSpriteTemplate_83D637C, 3, -10, 20, 20, 39 createsprite gBattleAnimSpriteTemplate_83D637C, 3, 10, -5, -8, 26 delay 4 - playsewithpan SE_W145C, 63 + playsewithpan SE_W145C, SOUND_PAN_TARGET createsprite gBattleAnimSpriteTemplate_83D637C, 3, 0, 5, 8, 26 createsprite gBattleAnimSpriteTemplate_83D637C, 3, 5, -18, -20, 35 delay 4 return Move_GIGA_DRAIN: @ 81CF6CF - loadspritegfx 10147 - loadspritegfx 10031 - loadspritegfx 10135 + loadspritegfx ANIM_TAG_ORBS + loadspritegfx ANIM_TAG_BLUE_STAR + loadspritegfx ANIM_TAG_IMPACT monbg ANIM_BANK_DEF_PARTNER monbgprio_2A ANIM_BANK_TARGET setalpha 12, 8 createsprite gSimplePaletteBlendSpriteTemplate, 2, 1, 1, 0, 12, rgb(13, 31, 12) waitforvisualfinish - playsewithpan SE_W071, 63 + playsewithpan SE_W071, SOUND_PAN_TARGET createsprite gBasicHitSplatSpriteTemplate, 2, 0, 0, 1, 0 delay 2 createvisualtask AnimTask_ShakeMon, 5, 1, 0, 5, 5, 1 @@ -5834,42 +5834,42 @@ Move_GIGA_DRAIN: @ 81CF6CF blendoff end _81CF73E: - playsewithpan SE_W202, 63 + playsewithpan SE_W202, SOUND_PAN_TARGET createsprite gBattleAnimSpriteTemplate_83D637C, 3, 0, 5, 8, 26 createsprite gBattleAnimSpriteTemplate_83D637C, 3, 5, -18, -40, 35 createsprite gBattleAnimSpriteTemplate_83D637C, 3, -10, 20, 20, 39 delay 4 - playsewithpan SE_W202, 63 + playsewithpan SE_W202, SOUND_PAN_TARGET createsprite gBattleAnimSpriteTemplate_83D637C, 3, 0, 5, 28, 26 createsprite gBattleAnimSpriteTemplate_83D637C, 3, 10, -5, -8, 26 createsprite gBattleAnimSpriteTemplate_83D637C, 3, -10, 20, 40, 39 delay 4 - playsewithpan SE_W202, 63 + playsewithpan SE_W202, SOUND_PAN_TARGET createsprite gBattleAnimSpriteTemplate_83D637C, 3, 10, -5, -8, 26 createsprite gBattleAnimSpriteTemplate_83D637C, 3, -5, 15, 16, 33 createsprite gBattleAnimSpriteTemplate_83D637C, 3, 10, -5, -32, 26 delay 4 - playsewithpan SE_W202, 63 + playsewithpan SE_W202, SOUND_PAN_TARGET createsprite gBattleAnimSpriteTemplate_83D637C, 3, 0, -15, -16, 36 createsprite gBattleAnimSpriteTemplate_83D637C, 3, 0, 5, 8, 26 createsprite gBattleAnimSpriteTemplate_83D637C, 3, 10, -5, -8, 26 delay 4 - playsewithpan SE_W202, 63 + playsewithpan SE_W202, SOUND_PAN_TARGET createsprite gBattleAnimSpriteTemplate_83D637C, 3, -5, 15, 16, 33 createsprite gBattleAnimSpriteTemplate_83D637C, 3, 0, -15, -16, 36 createsprite gBattleAnimSpriteTemplate_83D637C, 3, 0, 5, 8, 26 delay 4 - playsewithpan SE_W202, 63 + playsewithpan SE_W202, SOUND_PAN_TARGET createsprite gBattleAnimSpriteTemplate_83D637C, 3, 0, 5, 8, 26 createsprite gBattleAnimSpriteTemplate_83D637C, 3, -5, 15, 16, 33 createsprite gBattleAnimSpriteTemplate_83D637C, 3, 10, -5, -40, 26 delay 4 - playsewithpan SE_W202, 63 + playsewithpan SE_W202, SOUND_PAN_TARGET createsprite gBattleAnimSpriteTemplate_83D637C, 3, -5, 15, 36, 33 createsprite gBattleAnimSpriteTemplate_83D637C, 3, 10, -5, -8, 26 createsprite gBattleAnimSpriteTemplate_83D637C, 3, -10, 20, 20, 39 delay 4 - playsewithpan SE_W202, 63 + playsewithpan SE_W202, SOUND_PAN_TARGET createsprite gBattleAnimSpriteTemplate_83D637C, 3, 0, 5, 8, 26 createsprite gBattleAnimSpriteTemplate_83D637C, 3, 0, 5, 8, 26 createsprite gBattleAnimSpriteTemplate_83D637C, 3, 5, -18, -20, 35 @@ -5877,11 +5877,11 @@ _81CF73E: return Move_LEECH_LIFE: @ 81CF8D7 - loadspritegfx 10161 - loadspritegfx 10147 + loadspritegfx ANIM_TAG_NEEDLE + loadspritegfx ANIM_TAG_ORBS delay 1 - loadspritegfx 10031 - loadspritegfx 10135 + loadspritegfx ANIM_TAG_BLUE_STAR + loadspritegfx ANIM_TAG_IMPACT monbg ANIM_BANK_DEF_PARTNER monbgprio_2A ANIM_BANK_TARGET setalpha 12, 8 @@ -5889,7 +5889,7 @@ Move_LEECH_LIFE: @ 81CF8D7 createsprite gBattleAnimSpriteTemplate_83DAB10, 2, -20, 15, 12 waitforvisualfinish createsprite gBasicHitSplatSpriteTemplate, 2, 0, 0, 1, 2 - playsewithpan SE_W071, 63 + playsewithpan SE_W071, SOUND_PAN_TARGET delay 2 createvisualtask AnimTask_ShakeMon, 5, 1, 0, 5, 5, 1 waitforvisualfinish @@ -5907,10 +5907,10 @@ Move_LEECH_LIFE: @ 81CF8D7 end Move_SYNTHESIS: @ 81CF959 - loadspritegfx 10031 - loadspritegfx 10049 + loadspritegfx ANIM_TAG_BLUE_STAR + loadspritegfx ANIM_TAG_SPARKLE_2 createvisualtask sub_80E1F8C, 2, 2, 2, 2, 0, 16, 19451 - playsewithpan SE_W025, 192 + playsewithpan SE_W025, SOUND_PAN_ATTACKER call Unknown_81D5ECA waitforvisualfinish call Unknown_81D5EF5 @@ -5918,8 +5918,8 @@ Move_SYNTHESIS: @ 81CF959 end Move_TOXIC: @ 81CF983 - loadspritegfx 10151 - loadspritegfx 10150 + loadspritegfx ANIM_TAG_TOXIC_BUBBLE + loadspritegfx ANIM_TAG_POISON_BUBBLE call _81CF99D call _81CF99D waitforvisualfinish @@ -5929,22 +5929,22 @@ Move_TOXIC: @ 81CF983 end _81CF99D: createsprite gBattleAnimSpriteTemplate_83DA244, 130, -24, 16, 1, 1 - playsewithpan SE_W092, 63 + playsewithpan SE_W092, SOUND_PAN_TARGET delay 15 createsprite gBattleAnimSpriteTemplate_83DA244, 130, 8, 16, 1, 1 - playsewithpan SE_W092, 63 + playsewithpan SE_W092, SOUND_PAN_TARGET delay 15 createsprite gBattleAnimSpriteTemplate_83DA244, 130, -8, 16, 1, 1 - playsewithpan SE_W092, 63 + playsewithpan SE_W092, SOUND_PAN_TARGET delay 15 createsprite gBattleAnimSpriteTemplate_83DA244, 130, 24, 16, 1, 1 - playsewithpan SE_W092, 63 + playsewithpan SE_W092, SOUND_PAN_TARGET delay 15 return Move_SLUDGE: @ 81CF9F2 - loadspritegfx 10150 - playsewithpan SE_W145C, 192 + loadspritegfx ANIM_TAG_POISON_BUBBLE + playsewithpan SE_W145C, SOUND_PAN_ATTACKER createsprite gBattleAnimSpriteTemplate_83DA2B8, 130, 20, 0, 40, 0 waitforvisualfinish createvisualtask AnimTask_ShakeMon, 5, 1, 3, 0, 5, 1 @@ -5954,7 +5954,7 @@ Move_SLUDGE: @ 81CF9F2 end Move_SLUDGE_BOMB: @ 81CFA34 - loadspritegfx 10150 + loadspritegfx ANIM_TAG_POISON_BUBBLE call _81CFB44 call _81CFB44 call _81CFB44 @@ -5971,19 +5971,19 @@ Move_SLUDGE_BOMB: @ 81CFA34 createsprite gBattleAnimSpriteTemplate_83DA2E8, 130, -27, 44, 20 createsprite gBattleAnimSpriteTemplate_83DA2E8, 130, 39, -28, 20 createsprite gBattleAnimSpriteTemplate_83DA2E8, 130, -42, -42, 20 - playsewithpan SE_W091, 63 + playsewithpan SE_W091, SOUND_PAN_TARGET delay 5 createsprite gBattleAnimSpriteTemplate_83DA2E8, 130, 0, 40, 20 createsprite gBattleAnimSpriteTemplate_83DA2E8, 130, -8, -44, 20 createsprite gBattleAnimSpriteTemplate_83DA2E8, 130, -46, -28, 20 createsprite gBattleAnimSpriteTemplate_83DA2E8, 130, 46, 9, 20 - playsewithpan SE_W091, 63 + playsewithpan SE_W091, SOUND_PAN_TARGET delay 5 createsprite gBattleAnimSpriteTemplate_83DA2E8, 130, 42, 0, 20 createsprite gBattleAnimSpriteTemplate_83DA2E8, 130, -43, -12, 20 createsprite gBattleAnimSpriteTemplate_83DA2E8, 130, 16, -46, 20 createsprite gBattleAnimSpriteTemplate_83DA2E8, 130, -16, 44, 20 - playsewithpan SE_W091, 63 + playsewithpan SE_W091, SOUND_PAN_TARGET delay 0 waitsound waitforvisualfinish @@ -5991,58 +5991,58 @@ Move_SLUDGE_BOMB: @ 81CFA34 waitforvisualfinish end _81CFB44: - playsewithpan SE_W145C, 192 + playsewithpan SE_W145C, SOUND_PAN_ATTACKER createsprite gBattleAnimSpriteTemplate_83DA2B8, 130, 20, 0, 40, 0 delay 3 return Move_ACID: @ 81CFB5A - loadspritegfx 10150 + loadspritegfx ANIM_TAG_POISON_BUBBLE monbg ANIM_BANK_DEF_PARTNER createsprite gBattleAnimSpriteTemplate_83DA2D0, 130, 20, 0, 40, 1, 0, 0 - playsewithpan SE_W145C, 192 + playsewithpan SE_W145C, SOUND_PAN_ATTACKER delay 5 createsprite gBattleAnimSpriteTemplate_83DA2D0, 130, 20, 0, 40, 1, 24, 0 - playsewithpan SE_W145C, 192 + playsewithpan SE_W145C, SOUND_PAN_ATTACKER delay 5 createsprite gBattleAnimSpriteTemplate_83DA2D0, 130, 20, 0, 40, 1, -24, 0 - playsewithpan SE_W145C, 192 + playsewithpan SE_W145C, SOUND_PAN_ATTACKER delay 15 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 + playsewithpan SE_W145, SOUND_PAN_TARGET delay 10 createsprite gBattleAnimSpriteTemplate_83DA31C, 130, -26, -24, 0, 15, 55 - playsewithpan SE_W145, 63 + playsewithpan SE_W145, SOUND_PAN_TARGET delay 10 createsprite gBattleAnimSpriteTemplate_83DA31C, 130, 15, -27, 0, 15, 50 - playsewithpan SE_W145, 63 + playsewithpan SE_W145, SOUND_PAN_TARGET delay 10 createsprite gBattleAnimSpriteTemplate_83DA31C, 130, -15, -17, 0, 10, 45 - playsewithpan SE_W145, 63 + playsewithpan SE_W145, SOUND_PAN_TARGET delay 10 createsprite gBattleAnimSpriteTemplate_83DA31C, 130, 27, -22, 0, 15, 50 - playsewithpan SE_W145, 63 + playsewithpan SE_W145, SOUND_PAN_TARGET waitforvisualfinish clearmonbg ANIM_BANK_DEF_PARTNER end Move_BONEMERANG: @ 81CFC54 - loadspritegfx 10000 - loadspritegfx 10135 + loadspritegfx ANIM_TAG_BONE + loadspritegfx ANIM_TAG_IMPACT monbg ANIM_BANK_DEF_PARTNER monbgprio_28 1 setalpha 12, 8 - playsewithpan SE_W155, 192 + playsewithpan SE_W155, SOUND_PAN_ATTACKER createsprite gBonemerangSpriteTemplate, 2 delay 20 - playsewithpan SE_W030, 63 + playsewithpan SE_W030, SOUND_PAN_TARGET createsprite gBasicHitSplatSpriteTemplate, 2, 0, 0, 1, 1 createvisualtask AnimTask_ShakeMon, 5, 1, 5, 0, 5, 1 delay 17 - playsewithpan SE_W233, 192 + playsewithpan SE_W233, SOUND_PAN_ATTACKER createsprite gHorizontalLungeSpriteTemplate, 2, 6, -4 waitforvisualfinish clearmonbg ANIM_BANK_DEF_PARTNER @@ -6050,63 +6050,63 @@ Move_BONEMERANG: @ 81CFC54 end Move_BONE_CLUB: @ 81CFCA8 - loadspritegfx 10000 - loadspritegfx 10135 + loadspritegfx ANIM_TAG_BONE + loadspritegfx ANIM_TAG_IMPACT monbg ANIM_BANK_DEF_PARTNER monbgprio_28 1 setalpha 12, 8 - playsewithpan SE_W155, 63 + playsewithpan SE_W155, SOUND_PAN_TARGET createsprite gBoneHitSpriteTemplate, 2, -42, -25, 0, 0, 15 delay 12 createsprite gBasicHitSplatSpriteTemplate, 2, 0, 0, 1, 1 createvisualtask AnimTask_ShakeMon, 5, 1, 0, 5, 5, 1 createsprite gBattleAnimSpriteTemplate_83DB3DC, 2, 7, 5, 1, 0, 10, 0, 0 - playsewithpan SE_W233B, 63 + playsewithpan SE_W233B, SOUND_PAN_TARGET waitforvisualfinish clearmonbg ANIM_BANK_DEF_PARTNER blendoff end Move_BONE_RUSH: @ 81CFD0A - loadspritegfx 10000 - loadspritegfx 10135 + loadspritegfx ANIM_TAG_BONE + loadspritegfx ANIM_TAG_IMPACT monbg ANIM_BANK_DEF_PARTNER setalpha 12, 8 - playsewithpan SE_W155, 63 + playsewithpan SE_W155, SOUND_PAN_TARGET createsprite gBoneHitSpriteTemplate, 2, -42, -25, 0, 0, 15 delay 12 createsprite gBasicHitSplatSpriteTemplate, 2, 0, 0, 1, 2 createvisualtask AnimTask_ShakeMon, 5, 1, 0, 3, 5, 1 - playsewithpan SE_W030, 63 + playsewithpan SE_W030, SOUND_PAN_TARGET waitforvisualfinish clearmonbg ANIM_BANK_DEF_PARTNER blendoff end Move_SPIKES: @ 81CFD55 - loadspritegfx 10152 + loadspritegfx ANIM_TAG_SPIKES monbg ANIM_BANK_DEF_PARTNER - playsewithpan SE_W026, 192 - waitplaysewithpan SE_W030, 63, 28 + playsewithpan SE_W026, SOUND_PAN_ATTACKER + waitplaysewithpan SE_W030, SOUND_PAN_TARGET, 28 createsprite gBattleAnimSpriteTemplate_840227C, 130, 20, 0, 0, 24, 30 delay 10 - playsewithpan SE_W026, 192 - waitplaysewithpan SE_W030, 63, 28 + playsewithpan SE_W026, SOUND_PAN_ATTACKER + waitplaysewithpan SE_W030, SOUND_PAN_TARGET, 28 createsprite gBattleAnimSpriteTemplate_840227C, 130, 20, 0, -24, 24, 30 delay 10 - waitplaysewithpan SE_W030, 63, 28 + waitplaysewithpan SE_W030, SOUND_PAN_TARGET, 28 createsprite gBattleAnimSpriteTemplate_840227C, 130, 20, 0, 24, 24, 30 waitforvisualfinish clearmonbg ANIM_BANK_DEF_PARTNER end Move_MEGAHORN: @ 81CFDAC - loadspritegfx 10153 - loadspritegfx 10135 + loadspritegfx ANIM_TAG_HORN_HIT_2 + loadspritegfx ANIM_TAG_IMPACT monbg ANIM_BANK_DEF_PARTNER - playsewithpan SE_W082, 192 + playsewithpan SE_W082, SOUND_PAN_ATTACKER jumpifcontest _81CFE83 - fadetobg 7 + fadetobg BG_DRILL waitbgfadeout createvisualtask sub_80E3A58, 5, -2304, 768, 1, -1 _81CFDCF: @@ -6119,7 +6119,7 @@ _81CFDCF: delay 3 createsprite gBattleAnimSpriteTemplate_83DAABC, 3, -42, 25, 0, 0, 6 delay 4 - playsewithpan SE_W011, 63 + playsewithpan SE_W011, SOUND_PAN_TARGET createsprite gBasicHitSplatSpriteTemplate, 2, 0, 0, 1, 0 createsprite gSlideMonToOffsetSpriteTemplate, 2, 1, -16, 4, 1, 4 waitforvisualfinish @@ -6135,40 +6135,40 @@ _81CFDCF: blendoff restorebg waitbgfadeout - setarg 7, -1 + setarg ARG_RET_ID, -1 waitbgfadein end _81CFE83: - fadetobg 8 + fadetobg BG_DRILL_CONTESTS waitbgfadeout createvisualtask sub_80E3A58, 5, 2304, 768, 0, -1 goto _81CFDCF Move_GUST: @ 81CFE9A - loadspritegfx 10009 - loadspritegfx 10135 + loadspritegfx ANIM_TAG_GUST + loadspritegfx ANIM_TAG_IMPACT monbg ANIM_BANK_DEF_PARTNER monbgprio_28 1 setalpha 12, 8 - playsewithpan SE_W016, 63 + playsewithpan SE_W016, SOUND_PAN_TARGET createsprite gBattleAnimSpriteTemplate_83DA380, 2, 0, -16 createvisualtask sub_80DA09C, 5, 1, 70 waitforvisualfinish createvisualtask AnimTask_ShakeMon2, 5, 1, 1, 0, 7, 1 createsprite gBasicHitSplatSpriteTemplate, 2, 0, 0, 1, 2 - playsewithpan SE_W016B, 63 + playsewithpan SE_W016B, SOUND_PAN_TARGET waitforvisualfinish clearmonbg ANIM_BANK_DEF_PARTNER blendoff end Move_WING_ATTACK: @ 81CFEEB - loadspritegfx 10009 - loadspritegfx 10135 + loadspritegfx ANIM_TAG_GUST + loadspritegfx ANIM_TAG_IMPACT monbg ANIM_BANK_DEF_PARTNER monbgprio_28 1 setalpha 12, 8 - loopsewithpan SE_W017, 192, 20, 2 + loopsewithpan SE_W017, SOUND_PAN_ATTACKER, 20, 2 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 @@ -6178,7 +6178,7 @@ Move_WING_ATTACK: @ 81CFEEB delay 17 createsprite gBasicHitSplatSpriteTemplate, 2, 16, 0, 1, 1 createsprite gBasicHitSplatSpriteTemplate, 2, -16, 0, 1, 1 - loopsewithpan SE_W003, 63, 5, 2 + loopsewithpan SE_W003, SOUND_PAN_TARGET, 5, 2 waitforvisualfinish createsprite gSlideMonToOriginalPosSpriteTemplate, 2, 0, 0, 11 waitforvisualfinish @@ -6187,16 +6187,16 @@ Move_WING_ATTACK: @ 81CFEEB end Move_PECK: @ 81CFF88 - loadspritegfx 10135 - playsewithpan SE_W030, 63 + loadspritegfx ANIM_TAG_IMPACT + playsewithpan SE_W030, SOUND_PAN_TARGET createvisualtask sub_80A8EFC, 2, 3, -768, 1, 2 createsprite gBattleAnimSpriteTemplate_83DB538, 131, -12, 0, 1, 3 waitforvisualfinish end Move_AEROBLAST: @ 81CFFAF - loadspritegfx 10154 - loadspritegfx 10135 + loadspritegfx ANIM_TAG_AIR_WAVE_2 + loadspritegfx ANIM_TAG_IMPACT monbg ANIM_BANK_DEF_PARTNER call Unknown_81D61FB monbgprio_28 1 @@ -6209,7 +6209,7 @@ Move_AEROBLAST: @ 81CFFAF call _81D000B waitforvisualfinish createsprite gBasicHitSplatSpriteTemplate, 2, 0, 0, 1, 0 - playsewithpan SE_W013, 63 + playsewithpan SE_W013, SOUND_PAN_TARGET waitforvisualfinish clearmonbg ANIM_BANK_DEF_PARTNER blendoff @@ -6217,55 +6217,55 @@ Move_AEROBLAST: @ 81CFFAF call Unknown_81D622B end _81D000B: - playsewithpan SE_W026, 192 + playsewithpan SE_W026, SOUND_PAN_ATTACKER createsprite gBattleAnimSpriteTemplate_83DA3E4, 2, 14, -12, 0, -12, 15, 0, 0 createsprite gBattleAnimSpriteTemplate_83DA3E4, 2, 26, 8, 12, 8, 15, 0, 0 delay 3 - playsewithpan SE_W026, 192 + playsewithpan SE_W026, SOUND_PAN_ATTACKER createsprite gBattleAnimSpriteTemplate_83DA3E4, 2, 14, -12, 0, -12, 15, 1, 0 createsprite gBattleAnimSpriteTemplate_83DA3E4, 2, 26, 8, 12, 8, 15, 1, 0 delay 3 - playsewithpan SE_W026, 192 + playsewithpan SE_W026, SOUND_PAN_ATTACKER createsprite gBattleAnimSpriteTemplate_83DA3E4, 2, 14, -12, 0, -12, 15, 2, 0 createsprite gBattleAnimSpriteTemplate_83DA3E4, 2, 26, 8, 12, 8, 15, 2, 0 delay 3 - playsewithpan SE_W026, 192 + playsewithpan SE_W026, SOUND_PAN_ATTACKER createsprite gBattleAnimSpriteTemplate_83DA3E4, 2, 14, -12, 0, -12, 15, 3, 0 createsprite gBattleAnimSpriteTemplate_83DA3E4, 2, 26, 8, 12, 8, 15, 3, 0 delay 3 return Move_WATER_GUN: @ 81D00CC - loadspritegfx 10155 - loadspritegfx 10148 + loadspritegfx ANIM_TAG_SMALL_BUBBLES + loadspritegfx ANIM_TAG_WATER_IMPACT monbg ANIM_BANK_DEF_PARTNER monbgprio_28 1 setalpha 12, 8 createsprite gBattleAnimSpriteTemplate_83D9318, 2, 20, 0, 0, 0, 40, -25 - playsewithpan SE_W145, 192 + playsewithpan SE_W145, SOUND_PAN_ATTACKER waitforvisualfinish 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 + playsewithpan SE_W152, SOUND_PAN_TARGET delay 10 createsprite gBattleAnimSpriteTemplate_83D9330, 2, 15, -20, 0, 15, 50 - playsewithpan SE_W152, 63 + playsewithpan SE_W152, SOUND_PAN_TARGET delay 10 createsprite gBattleAnimSpriteTemplate_83D9330, 2, -15, -10, 0, 10, 45 - playsewithpan SE_W152, 63 + playsewithpan SE_W152, SOUND_PAN_TARGET waitforvisualfinish clearmonbg ANIM_BANK_DEF_PARTNER blendoff end Move_CRABHAMMER: @ 81D0159 - loadspritegfx 10141 - loadspritegfx 10148 + loadspritegfx ANIM_TAG_ICE_CRYSTALS + loadspritegfx ANIM_TAG_WATER_IMPACT monbg ANIM_BANK_DEF_PARTNER setalpha 12, 8 createsprite gBattleAnimSpriteTemplate_83DB4D8, 4, 0, 0, 1, 0 - playsewithpan SE_W233B, 63 + playsewithpan SE_W233B, SOUND_PAN_TARGET delay 1 createsprite gBattleAnimSpriteTemplate_83DB3DC, 2, 31, 3, 1, 32429, 10, 0, 0 createsprite gSlideMonToOffsetSpriteTemplate, 2, 1, -24, 0, 0, 4 @@ -6274,7 +6274,7 @@ Move_CRABHAMMER: @ 81D0159 waitforvisualfinish createsprite gSlideMonToOriginalPosSpriteTemplate, 2, 1, 0, 4 waitforvisualfinish - loopsewithpan SE_W152, 63, 20, 3 + loopsewithpan SE_W152, SOUND_PAN_TARGET, 20, 3 createvisualtask AnimTask_ShakeMon, 5, 1, 0, 4, 8, 1 createsprite gBattleAnimSpriteTemplate_83D9348, 2, 10, 10, 20, 1 delay 4 @@ -6299,19 +6299,19 @@ Move_CRABHAMMER: @ 81D0159 Move_SURF: @ 81D0253 createvisualtask sub_80D38BC, 2, 0 delay 24 - panse_1B SE_W057, 192, 63, 2, 0 + panse_1B SE_W057, SOUND_PAN_ATTACKER, SOUND_PAN_TARGET, 2, 0 waitforvisualfinish end Move_FLAMETHROWER: @ 81D0267 - loadspritegfx 10029 + loadspritegfx ANIM_TAG_SMALL_EMBER monbg ANIM_BANK_DEF_PARTNER monbgprio_28 1 setalpha 12, 8 createvisualtask AnimTask_ShakeMon, 5, 0, 0, 2, 46, 1 delay 6 createvisualtask sub_80D3630, 5, 100 - panse_1B SE_W053, 192, 63, 2, 0 + panse_1B SE_W053, SOUND_PAN_ATTACKER, SOUND_PAN_TARGET, 2, 0 call _81D02E1 call _81D02E1 call _81D02E1 @@ -6336,7 +6336,7 @@ _81D02E1: return Move_SANDSTORM: @ 81D0304 - loadspritegfx 10261 + loadspritegfx ANIM_TAG_FLYING_DIRT playsewithpan SE_W201, 0 createvisualtask do_boulder_dust, 5, 0 delay 16 @@ -6356,13 +6356,13 @@ Move_SANDSTORM: @ 81D0304 end Move_WHIRLPOOL: @ 81D038C - loadspritegfx 10149 + loadspritegfx ANIM_TAG_WATER_ORB monbg ANIM_BANK_DEF_PARTNER monbgprio_28 1 setalpha 12, 8 delay 0 createsprite gSimplePaletteBlendSpriteTemplate, 0, 4, 2, 0, 7, rgb(0, 13, 23) - playsewithpan SE_W250, 63 + playsewithpan SE_W250, SOUND_PAN_TARGET createvisualtask AnimTask_ShakeMon, 5, 1, 0, 2, 50, 1 call _81D03E4 call _81D03E4 @@ -6388,47 +6388,47 @@ _81D03E4: return Move_FLY: @ 81D046F - loadspritegfx 10156 - loadspritegfx 10135 + loadspritegfx ANIM_TAG_ROUND_SHADOW + loadspritegfx ANIM_TAG_IMPACT choosetwoturnanim _81D0480, _81D0498 _81D047E: waitforvisualfinish end _81D0480: - playsewithpan SE_W019, 192 + playsewithpan SE_W019, SOUND_PAN_ATTACKER createsprite gBattleAnimSpriteTemplate_83DA450, 2, 0, 0, 13, 336 goto _81D047E _81D0498: monbg ANIM_BANK_DEF_PARTNER setalpha 12, 8 - playsewithpan SE_W104, 192 + playsewithpan SE_W104, SOUND_PAN_ATTACKER createsprite gBattleAnimSpriteTemplate_83DA468, 2, 20 delay 20 createsprite gBasicHitSplatSpriteTemplate, 2, 0, 0, 1, 0 createvisualtask AnimTask_ShakeMon, 5, 1, 6, 0, 8, 1 - playsewithpan SE_W013, 63 + playsewithpan SE_W013, SOUND_PAN_TARGET waitforvisualfinish clearmonbg ANIM_BANK_DEF_PARTNER blendoff goto _81D047E Move_BOUNCE: @ 81D04D9 - loadspritegfx 10156 - loadspritegfx 10135 + loadspritegfx ANIM_TAG_ROUND_SHADOW + loadspritegfx ANIM_TAG_IMPACT choosetwoturnanim _81D04E9, _81D04FD _81D04E8: end _81D04E9: - playsewithpan SE_W100, 192 + playsewithpan SE_W100, SOUND_PAN_ATTACKER createsprite gBattleAnimSpriteTemplate_83DA568, 2, 0, 0 goto _81D04E8 _81D04FD: monbg ANIM_BANK_DEF_PARTNER setalpha 12, 8 - playsewithpan SE_W207, 63 + playsewithpan SE_W207, SOUND_PAN_TARGET createsprite gBattleAnimSpriteTemplate_83DA594, 131 delay 7 - playsewithpan SE_W025B, 63 + playsewithpan SE_W025B, SOUND_PAN_TARGET createsprite gBasicHitSplatSpriteTemplate, 130, 0, 0, 1, 0 createvisualtask AnimTask_ShakeMon, 5, 1, 0, 5, 11, 1 waitforvisualfinish @@ -6437,15 +6437,15 @@ _81D04FD: goto _81D04E8 Move_KARATE_CHOP: @ 81D053C - loadspritegfx 10143 - loadspritegfx 10135 + loadspritegfx ANIM_TAG_HANDS_AND_FEET + loadspritegfx ANIM_TAG_IMPACT monbg ANIM_BANK_DEF_PARTNER monbgprio_28 1 setalpha 12, 8 - playsewithpan SE_W104, 63 + playsewithpan SE_W104, SOUND_PAN_TARGET createsprite gBattleAnimSpriteTemplate_83D9F78, 2, -16, 0, 0, 0, 10, 1, 3, 0 waitforvisualfinish - playsewithpan SE_W004, 63 + playsewithpan SE_W004, SOUND_PAN_TARGET createsprite gBasicHitSplatSpriteTemplate, 3, 0, 0, 1, 2 createvisualtask AnimTask_ShakeMon, 5, 1, 4, 0, 6, 1 waitforvisualfinish @@ -6454,15 +6454,15 @@ Move_KARATE_CHOP: @ 81D053C end Move_CROSS_CHOP: @ 81D058E - loadspritegfx 10143 - loadspritegfx 10285 + loadspritegfx ANIM_TAG_HANDS_AND_FEET + loadspritegfx ANIM_TAG_CROSS_IMPACT monbg ANIM_BANK_DEF_PARTNER setalpha 12, 8 - playsewithpan SE_W025, 63 + playsewithpan SE_W025, SOUND_PAN_TARGET createsprite gBattleAnimSpriteTemplate_83D9FD8, 2, 0, 0, 0 createsprite gBattleAnimSpriteTemplate_83D9FD8, 2, 0, 0, 1 delay 40 - playsewithpan SE_W013, 63 + playsewithpan SE_W013, SOUND_PAN_TARGET createsprite gBattleAnimSpriteTemplate_83DB3DC, 2, 31, 3, 1, 32767, 10, 0, 10 createsprite gBattleAnimSpriteTemplate_83DB520, 3, 0, 0, 1, 20 createvisualtask AnimTask_ShakeMon, 5, 1, 7, 0, 9, 1 @@ -6472,26 +6472,26 @@ Move_CROSS_CHOP: @ 81D058E end Move_JUMP_KICK: @ 81D05F7 - loadspritegfx 10143 - loadspritegfx 10135 + loadspritegfx ANIM_TAG_HANDS_AND_FEET + loadspritegfx ANIM_TAG_IMPACT monbg ANIM_BANK_DEF_PARTNER setalpha 12, 8 createsprite gHorizontalLungeSpriteTemplate, 2, 4, 4 delay 3 createsprite gBattleAnimSpriteTemplate_83D9F90, 2, -16, 8, 0, 0, 10, 1, 1, 1 - playsewithpan SE_W026, 63 + playsewithpan SE_W026, SOUND_PAN_TARGET waitforvisualfinish createsprite gBasicHitSplatSpriteTemplate, 1, 0, 0, 1, 1 createvisualtask AnimTask_ShakeMon, 5, 1, 5, 0, 7, 1 - playsewithpan SE_W004, 63 + playsewithpan SE_W004, SOUND_PAN_TARGET waitforvisualfinish clearmonbg ANIM_BANK_DEF_PARTNER blendoff end Move_HI_JUMP_KICK: @ 81D0654 - loadspritegfx 10143 - loadspritegfx 10135 + loadspritegfx ANIM_TAG_HANDS_AND_FEET + loadspritegfx ANIM_TAG_IMPACT monbg ANIM_BANK_DEF_PARTNER setalpha 12, 8 createsprite gSlideMonToOffsetSpriteTemplate, 2, 0, -24, 0, 0, 8 @@ -6500,10 +6500,10 @@ Move_HI_JUMP_KICK: @ 81D0654 createsprite gSlideMonToOriginalPosSpriteTemplate, 2, 0, 0, 3 delay 2 createsprite gBattleAnimSpriteTemplate_83D9F90, 2, -16, 8, 0, 0, 10, 1, 1, 1 - playsewithpan SE_W026, 63 + playsewithpan SE_W026, SOUND_PAN_TARGET waitforvisualfinish createsprite gBasicHitSplatSpriteTemplate, 2, 0, 0, 1, 1 - playsewithpan SE_W233B, 63 + playsewithpan SE_W233B, SOUND_PAN_TARGET createsprite gSlideMonToOffsetSpriteTemplate, 2, 1, -28, 0, 0, 3 delay 3 createvisualtask AnimTask_ShakeMonInPlace, 2, ANIM_BANK_TARGET, 3, 0, 11, 1 @@ -6516,13 +6516,13 @@ Move_HI_JUMP_KICK: @ 81D0654 end Move_DOUBLE_KICK: @ 81D06EA - loadspritegfx 10143 - loadspritegfx 10135 + loadspritegfx ANIM_TAG_HANDS_AND_FEET + loadspritegfx ANIM_TAG_IMPACT monbg ANIM_BANK_DEF_PARTNER setalpha 12, 8 createsprite gBattleAnimSpriteTemplate_83D9FC0, 3, 1, 20, 1 createvisualtask AnimTask_ShakeMon, 5, 1, 4, 0, 6, 1 - playsewithpan SE_W233B, 63 + playsewithpan SE_W233B, SOUND_PAN_TARGET waitforvisualfinish waitforvisualfinish clearmonbg ANIM_BANK_DEF_PARTNER @@ -6530,11 +6530,11 @@ Move_DOUBLE_KICK: @ 81D06EA end Move_TRIPLE_KICK: @ 81D071D - loadspritegfx 10143 - loadspritegfx 10135 + loadspritegfx ANIM_TAG_HANDS_AND_FEET + loadspritegfx ANIM_TAG_IMPACT monbg ANIM_BANK_DEF_PARTNER setalpha 12, 8 - playsewithpan SE_W233B, 63 + playsewithpan SE_W233B, SOUND_PAN_TARGET jumpifmoveturn 0, _81D0742 jumpifmoveturn 1, _81D0778 goto _81D07AE @@ -6560,33 +6560,33 @@ _81D07AE: goto _81D073D Move_DYNAMIC_PUNCH: @ 81D07E4 - loadspritegfx 10143 - loadspritegfx 10135 - loadspritegfx 10198 - loadspritegfx 10007 + loadspritegfx ANIM_TAG_HANDS_AND_FEET + loadspritegfx ANIM_TAG_IMPACT + loadspritegfx ANIM_TAG_EXPLOSION + loadspritegfx ANIM_TAG_UNUSED_EXPLOSION delay 1 monbg ANIM_BANK_DEF_PARTNER setalpha 12, 8 - playsewithpan SE_W233B, 63 + playsewithpan SE_W233B, SOUND_PAN_TARGET createsprite gFistFootSpriteTemplate, 131, 0, 0, 20, 1, 0 createsprite gBasicHitSplatSpriteTemplate, 130, 0, 0, 1, 0 createvisualtask AnimTask_ShakeMon, 5, 1, 5, 0, 7, 1 delay 1 waitsound - playsewithpan SE_W120, 63 + playsewithpan SE_W120, SOUND_PAN_TARGET createvisualtask AnimTask_ShakeMon2, 5, 1, 5, 0, 28, 1 createsprite gBattleAnimSpriteTemplate_83D7828, 3, 0, 0, 1, 1 delay 6 - playsewithpan SE_W120, 63 + playsewithpan SE_W120, SOUND_PAN_TARGET createsprite gBattleAnimSpriteTemplate_83D7828, 3, 24, -24, 1, 1 delay 6 - playsewithpan SE_W120, 63 + playsewithpan SE_W120, SOUND_PAN_TARGET createsprite gBattleAnimSpriteTemplate_83D7828, 3, -16, 16, 1, 1 delay 6 - playsewithpan SE_W120, 63 + playsewithpan SE_W120, SOUND_PAN_TARGET createsprite gBattleAnimSpriteTemplate_83D7828, 3, -24, -12, 1, 1 delay 6 - playsewithpan SE_W120, 63 + playsewithpan SE_W120, SOUND_PAN_TARGET createsprite gBattleAnimSpriteTemplate_83D7828, 3, 16, 16, 1, 1 waitforvisualfinish clearmonbg ANIM_BANK_DEF_PARTNER @@ -6594,28 +6594,28 @@ Move_DYNAMIC_PUNCH: @ 81D07E4 end Move_COUNTER: @ 81D08AC - loadspritegfx 10135 - loadspritegfx 10143 + loadspritegfx ANIM_TAG_IMPACT + loadspritegfx ANIM_TAG_HANDS_AND_FEET monbg ANIM_BANK_DEF_PARTNER setalpha 12, 8 createvisualtask AnimTask_TranslateMonEllipticalRespectSide, 2, ANIM_BANK_ATTACKER, 18, 6, 1, 4 - playsewithpan SE_W233, 192 + playsewithpan SE_W233, SOUND_PAN_ATTACKER waitforvisualfinish createsprite gSlideMonToOffsetSpriteTemplate, 2, 0, 20, 0, 0, 4 delay 4 createsprite gBasicHitSplatSpriteTemplate, 2, -15, 18, 1, 0 - playsewithpan SE_W233B, 63 + playsewithpan SE_W233B, SOUND_PAN_TARGET delay 1 createvisualtask AnimTask_ShakeMon, 2, ANIM_BANK_TARGET, 5, 0, 25, 1 createsprite gFistFootSpriteTemplate, 3, -15, 18, 8, 1, 0 delay 3 createsprite gBasicHitSplatSpriteTemplate, 2, 0, -4, 1, 0 - playsewithpan SE_W233B, 63 + playsewithpan SE_W233B, SOUND_PAN_TARGET delay 1 createsprite gFistFootSpriteTemplate, 3, 0, -4, 8, 1, 0 delay 3 createsprite gBasicHitSplatSpriteTemplate, 2, 15, 9, 1, 0 - playsewithpan SE_W233B, 63 + playsewithpan SE_W233B, SOUND_PAN_TARGET delay 1 createsprite gFistFootSpriteTemplate, 3, 15, 9, 8, 1, 0 delay 5 @@ -6626,16 +6626,16 @@ Move_COUNTER: @ 81D08AC end Move_VITAL_THROW: @ 81D097B - loadspritegfx 10135 + loadspritegfx ANIM_TAG_IMPACT monbg ANIM_BANK_DEF_PARTNER setalpha 12, 8 - playsewithpan SE_W233, 192 + playsewithpan SE_W233, SOUND_PAN_ATTACKER createvisualtask AnimTask_TranslateMonEllipticalRespectSide, 2, ANIM_BANK_ATTACKER, 12, 4, 1, 2 waitforvisualfinish createsprite gSlideMonToOffsetSpriteTemplate, 2, 0, 20, 0, 0, 4 delay 2 createsprite gBasicHitSplatSpriteTemplate, 3, 0, 0, 1, 1 - playsewithpan SE_W233B, 63 + playsewithpan SE_W233B, SOUND_PAN_TARGET delay 1 createsprite gSlideMonToOffsetSpriteTemplate, 2, 1, -24, 0, 0, 4 waitforvisualfinish @@ -6649,18 +6649,18 @@ Move_VITAL_THROW: @ 81D097B end Move_ROCK_SMASH: @ 81D09F6 - loadspritegfx 10058 - loadspritegfx 10135 - loadspritegfx 10143 + loadspritegfx ANIM_TAG_ROCKS + loadspritegfx ANIM_TAG_IMPACT + loadspritegfx ANIM_TAG_HANDS_AND_FEET monbg ANIM_BANK_DEF_PARTNER setalpha 12, 8 delay 1 createsprite gBasicHitSplatSpriteTemplate, 3, 0, 0, 1, 1 createsprite gFistFootSpriteTemplate, 2, 0, 0, 8, 1, 0 - playsewithpan SE_W233B, 63 + playsewithpan SE_W233B, SOUND_PAN_TARGET createvisualtask AnimTask_ShakeMon, 2, ANIM_BANK_TARGET, 3, 0, 5, 1 waitforvisualfinish - playsewithpan SE_W088, 63 + playsewithpan SE_W088, SOUND_PAN_TARGET createsprite gBattleAnimSpriteTemplate_83DAC64, 2, 0, 0, 20, 24, 14, 2 createsprite gBattleAnimSpriteTemplate_83DAC64, 2, 5, 0, -20, 24, 14, 1 createsprite gBattleAnimSpriteTemplate_83DAC64, 2, 0, 5, 20, -24, 14, 2 @@ -6676,19 +6676,19 @@ Move_ROCK_SMASH: @ 81D09F6 end Move_SUBMISSION: @ 81D0AEE - loadspritegfx 10135 + loadspritegfx ANIM_TAG_IMPACT monbg ANIM_BANK_DEF_PARTNER setalpha 12, 8 - playsewithpan SE_W104, 192 - waitplaysewithpan SE_W004, 63, 10 - waitplaysewithpan SE_W104, 192, 20 - waitplaysewithpan SE_W004, 63, 30 - waitplaysewithpan SE_W104, 192, 40 - waitplaysewithpan SE_W004, 63, 50 - waitplaysewithpan SE_W104, 192, 60 - waitplaysewithpan SE_W004, 63, 70 - waitplaysewithpan SE_W104, 192, 80 - waitplaysewithpan SE_W004, 63, 90 + playsewithpan SE_W104, SOUND_PAN_ATTACKER + waitplaysewithpan SE_W004, SOUND_PAN_TARGET, 10 + waitplaysewithpan SE_W104, SOUND_PAN_ATTACKER, 20 + waitplaysewithpan SE_W004, SOUND_PAN_TARGET, 30 + waitplaysewithpan SE_W104, SOUND_PAN_ATTACKER, 40 + waitplaysewithpan SE_W004, SOUND_PAN_TARGET, 50 + waitplaysewithpan SE_W104, SOUND_PAN_ATTACKER, 60 + waitplaysewithpan SE_W004, SOUND_PAN_TARGET, 70 + waitplaysewithpan SE_W104, SOUND_PAN_ATTACKER, 80 + waitplaysewithpan SE_W004, SOUND_PAN_TARGET, 90 createvisualtask AnimTask_TranslateMonElliptical, 2, ANIM_BANK_ATTACKER, -18, 6, 6, 4 createvisualtask AnimTask_TranslateMonElliptical, 2, ANIM_BANK_TARGET, 18, 6, 6, 4 call _81D0B5D @@ -6708,12 +6708,12 @@ _81D0B5D: return Move_SUNNY_DAY: @ 81D0B91 - loadspritegfx 10157 + loadspritegfx ANIM_TAG_SUNLIGHT monbg ANIM_BANK_ATK_PARTNER setalpha 13, 3 createvisualtask sub_80E2A38, 10, 1921, 1, 0, 6, 32767 waitforvisualfinish - panse_26 SE_W080, 192, 63, 1, 0 + panse_26 SE_W080, SOUND_PAN_ATTACKER, SOUND_PAN_TARGET, 1, 0 call _81D0BDD call _81D0BDD call _81D0BDD @@ -6730,10 +6730,10 @@ _81D0BDD: return Move_COTTON_SPORE: @ 81D0BE7 - loadspritegfx 10158 + loadspritegfx ANIM_TAG_SPORE monbg ANIM_BANK_DEF_PARTNER monbgprio_28 1 - loopsewithpan SE_W077, 63, 18, 10 + loopsewithpan SE_W077, SOUND_PAN_TARGET, 18, 10 call _81D0C07 call _81D0C07 call _81D0C07 @@ -6750,11 +6750,11 @@ _81D0C07: return Move_SPORE: @ 81D0C41 - loadspritegfx 10158 + loadspritegfx ANIM_TAG_SPORE monbg ANIM_BANK_DEF_PARTNER setalpha 12, 8 createvisualtask sub_80CACEC, 2 - loopsewithpan SE_W077, 63, 16, 11 + loopsewithpan SE_W077, SOUND_PAN_TARGET, 16, 11 call _81D0C6C call _81D0C6C call _81D0C6C @@ -6773,11 +6773,11 @@ _81D0C6C: return Move_PETAL_DANCE: @ 81D0CA6 - loadspritegfx 10159 - loadspritegfx 10135 + loadspritegfx ANIM_TAG_FLOWER + loadspritegfx ANIM_TAG_IMPACT monbg ANIM_BANK_DEF_PARTNER setalpha 12, 8 - playsewithpan SE_W080, 192 + playsewithpan SE_W080, SOUND_PAN_ATTACKER 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 @@ -6799,7 +6799,7 @@ Move_PETAL_DANCE: @ 81D0CA6 waitforvisualfinish createsprite gSlideMonToOffsetSpriteTemplate, 2, 0, 24, 0, 0, 5 delay 3 - playsewithpan SE_W025B, 63 + playsewithpan SE_W025B, SOUND_PAN_TARGET createsprite gBasicHitSplatSpriteTemplate, 3, 0, 0, 1, 0 createvisualtask AnimTask_ShakeMon, 2, ANIM_BANK_TARGET, 6, 0, 8, 1 waitforvisualfinish @@ -6811,13 +6811,13 @@ Move_PETAL_DANCE: @ 81D0CA6 end Move_RAZOR_LEAF: @ 81D0DDE - loadspritegfx 10063 - loadspritegfx 10160 - loadspritegfx 10135 + loadspritegfx ANIM_TAG_LEAF + loadspritegfx ANIM_TAG_RAZOR_LEAF + loadspritegfx ANIM_TAG_IMPACT monbg ANIM_BANK_DEF_PARTNER setalpha 12, 8 delay 1 - loopsewithpan SE_W077, 192, 10, 5 + loopsewithpan SE_W077, SOUND_PAN_ATTACKER, 10, 5 createsprite gBattleAnimSpriteTemplate_83D649C, 2, -3, -2, 10 delay 2 createsprite gBattleAnimSpriteTemplate_83D649C, 2, -1, -1, 15 @@ -6838,11 +6838,11 @@ Move_RAZOR_LEAF: @ 81D0DDE delay 2 createsprite gBattleAnimSpriteTemplate_83D649C, 2, -3, -5, 8 delay 60 - playsewithpan SE_W013B, 192 + playsewithpan SE_W013B, SOUND_PAN_ATTACKER createsprite gBattleAnimSpriteTemplate_83D64E4, 131, 20, -10, 20, 0, 22, 20, 1 createsprite gBattleAnimSpriteTemplate_83D64E4, 131, 20, -10, 20, 0, 22, -20, 1 delay 20 - playsewithpan SE_W013, 63 + playsewithpan SE_W013, SOUND_PAN_TARGET createvisualtask AnimTask_ShakeMon2, 2, ANIM_BANK_TARGET, 2, 0, 8, 1 createvisualtask AnimTask_ShakeMon2, 2, ANIM_BANK_DEF_PARTNER, 2, 0, 8, 1 waitforvisualfinish @@ -6851,8 +6851,8 @@ Move_RAZOR_LEAF: @ 81D0DDE end Move_ANCIENT_POWER: @ 81D0EE5 - loadspritegfx 10058 - loadspritegfx 10135 + loadspritegfx ANIM_TAG_ROCKS + loadspritegfx ANIM_TAG_IMPACT monbg ANIM_BANK_DEF_PARTNER setalpha 12, 8 createsprite gBattleAnimSpriteTemplate_83DB428, 2, 4, 1, 10, 1 @@ -6863,7 +6863,7 @@ Move_ANCIENT_POWER: @ 81D0EE5 createsprite gAncientPowerRockSpriteTemplate, 2, 20, 32, -28, 60, 1 createsprite gAncientPowerRockSpriteTemplate, 2, 0, 32, -28, 30, 4 createvisualtask AnimTask_ShakeMon2, 2, ANIM_BANK_ATTACKER, 1, 0, 30, 1 - playsewithpan SE_W082, 192 + playsewithpan SE_W082, SOUND_PAN_ATTACKER delay 10 createsprite gAncientPowerRockSpriteTemplate, 2, 15, 32, -48, 25, 5 createsprite gAncientPowerRockSpriteTemplate, 2, -10, 32, -42, 30, 4 @@ -6873,7 +6873,7 @@ Move_ANCIENT_POWER: @ 81D0EE5 waitforvisualfinish createsprite gSlideMonToOffsetSpriteTemplate, 2, 0, 16, 0, 0, 4 delay 3 - playsewithpan SE_W120, 63 + playsewithpan SE_W120, SOUND_PAN_TARGET createsprite gBasicHitSplatSpriteTemplate, 3, 0, 0, 1, 1 createvisualtask AnimTask_ShakeMon2, 2, ANIM_BANK_TARGET, 3, 0, 6, 1 waitforvisualfinish @@ -6884,12 +6884,12 @@ Move_ANCIENT_POWER: @ 81D0EE5 end Move_OCTAZOOKA: @ 81D100D - loadspritegfx 10030 - loadspritegfx 10017 - playsewithpan SE_W025B, 192 + loadspritegfx ANIM_TAG_GRAY_SMOKE + loadspritegfx ANIM_TAG_BLACK_BALL + playsewithpan SE_W025B, SOUND_PAN_ATTACKER createsprite gBattleAnimSpriteTemplate_83D6F08, 130, 20, 0, 0, 0, 20, 0 waitforvisualfinish - playsewithpan SE_W120, 63 + playsewithpan SE_W120, SOUND_PAN_TARGET createsprite gBattleAnimSpriteTemplate_83D6F3C, 130, 8, 8, 1, 0 delay 2 createsprite gBattleAnimSpriteTemplate_83D6F3C, 130, -8, -8, 1, 0 @@ -6901,10 +6901,10 @@ Move_OCTAZOOKA: @ 81D100D end Move_MIST: @ 81D1073 - loadspritegfx 10144 + loadspritegfx ANIM_TAG_MIST_CLOUD monbg ANIM_BANK_ATK_PARTNER setalpha 12, 8 - loopsewithpan SE_W054, 192, 20, 15 + loopsewithpan SE_W054, SOUND_PAN_ATTACKER, 20, 15 call _81D10BE call _81D10BE call _81D10BE @@ -6934,9 +6934,9 @@ Move_HAZE: @ 81D10D4 end Move_FIRE_PUNCH: @ 81D1107 - loadspritegfx 10143 - loadspritegfx 10029 - loadspritegfx 10135 + loadspritegfx ANIM_TAG_HANDS_AND_FEET + loadspritegfx ANIM_TAG_SMALL_EMBER + loadspritegfx ANIM_TAG_IMPACT monbg ANIM_BANK_DEF_PARTNER setalpha 12, 8 createvisualtask sub_80E2A38, 10, 4, 2, 0, 9, 31 @@ -6944,14 +6944,14 @@ Move_FIRE_PUNCH: @ 81D1107 createsprite gBattleAnimSpriteTemplate_83D9478, 129, 64 createsprite gBattleAnimSpriteTemplate_83D9478, 129, 128 createsprite gBattleAnimSpriteTemplate_83D9478, 129, 196 - playsewithpan SE_W172, 63 + playsewithpan SE_W172, SOUND_PAN_TARGET waitforvisualfinish createsprite gFistFootSpriteTemplate, 131, 0, 0, 8, 1, 0 createsprite gBasicHitSplatSpriteTemplate, 130, 0, 0, 1, 1 createvisualtask AnimTask_ShakeMon, 2, ANIM_BANK_TARGET, 0, 3, 15, 1 call _81D11A2 delay 4 - playsewithpan SE_W007, 63 + playsewithpan SE_W007, SOUND_PAN_TARGET waitforvisualfinish createvisualtask sub_80E2A38, 10, 4, 0, 9, 0, 31 waitforvisualfinish @@ -6969,11 +6969,11 @@ _81D11A2: return Move_LEER: @ 81D121A - loadspritegfx 10027 + loadspritegfx ANIM_TAG_LEER monbg ANIM_BANK_ATTACKER monbgprio_28 0 setalpha 8, 8 - playsewithpan SE_W043, 192 + playsewithpan SE_W043, SOUND_PAN_ATTACKER createsprite gBattleAnimSpriteTemplate_84022B0, 2, 24, -12 createvisualtask AnimTask_ScaleMonAndRestore, 5, -5, -5, 10, ANIM_BANK_ATTACKER, 1 waitforvisualfinish @@ -6988,14 +6988,14 @@ Move_LEER: @ 81D121A end Move_DREAM_EATER: @ 81D1271 - loadspritegfx 10147 - loadspritegfx 10031 + loadspritegfx ANIM_TAG_ORBS + loadspritegfx ANIM_TAG_BLUE_STAR monbg ANIM_BANK_DEF_PARTNER monbgprio_2A ANIM_BANK_TARGET - playsewithpan SE_W060, 192 + playsewithpan SE_W060, SOUND_PAN_ATTACKER call Unknown_81D61E7 setalpha 8, 8 - playsewithpan SE_W107, 63 + playsewithpan SE_W107, SOUND_PAN_TARGET createvisualtask AnimTask_ShakeMon, 2, ANIM_BANK_TARGET, 5, 0, 15, 1 createvisualtask AnimTask_ScaleMonAndRestore, 5, -6, -6, 15, ANIM_BANK_TARGET, 1 waitforvisualfinish @@ -7012,42 +7012,42 @@ Move_DREAM_EATER: @ 81D1271 call Unknown_81D61F3 end _81D12DB: - playsewithpan SE_W207, 63 + playsewithpan SE_W207, SOUND_PAN_TARGET createsprite gBattleAnimSpriteTemplate_83D637C, 3, 0, 5, 8, 26 createsprite gBattleAnimSpriteTemplate_83D637C, 3, 5, -18, -40, 35 createsprite gBattleAnimSpriteTemplate_83D637C, 3, -10, 20, 20, 39 delay 4 - playsewithpan SE_W207, 63 + playsewithpan SE_W207, SOUND_PAN_TARGET createsprite gBattleAnimSpriteTemplate_83D637C, 3, 0, 5, 28, 26 createsprite gBattleAnimSpriteTemplate_83D637C, 3, 10, -5, -8, 26 createsprite gBattleAnimSpriteTemplate_83D637C, 3, -10, 20, 40, 39 delay 4 - playsewithpan SE_W207, 63 + playsewithpan SE_W207, SOUND_PAN_TARGET createsprite gBattleAnimSpriteTemplate_83D637C, 3, 10, -5, -8, 26 createsprite gBattleAnimSpriteTemplate_83D637C, 3, -5, 15, 16, 33 createsprite gBattleAnimSpriteTemplate_83D637C, 3, 10, -5, -32, 26 delay 4 - playsewithpan SE_W207, 63 + playsewithpan SE_W207, SOUND_PAN_TARGET createsprite gBattleAnimSpriteTemplate_83D637C, 3, 0, -15, -16, 36 createsprite gBattleAnimSpriteTemplate_83D637C, 3, 0, 5, 8, 26 createsprite gBattleAnimSpriteTemplate_83D637C, 3, 10, -5, -8, 26 delay 4 - playsewithpan SE_W207, 63 + playsewithpan SE_W207, SOUND_PAN_TARGET createsprite gBattleAnimSpriteTemplate_83D637C, 3, -5, 15, 16, 33 createsprite gBattleAnimSpriteTemplate_83D637C, 3, 0, -15, -16, 36 createsprite gBattleAnimSpriteTemplate_83D637C, 3, 0, 5, 8, 26 delay 4 - playsewithpan SE_W207, 63 + playsewithpan SE_W207, SOUND_PAN_TARGET createsprite gBattleAnimSpriteTemplate_83D637C, 3, 0, 5, 8, 26 createsprite gBattleAnimSpriteTemplate_83D637C, 3, -5, 15, 16, 33 createsprite gBattleAnimSpriteTemplate_83D637C, 3, 10, -5, -40, 26 delay 4 - playsewithpan SE_W207, 63 + playsewithpan SE_W207, SOUND_PAN_TARGET createsprite gBattleAnimSpriteTemplate_83D637C, 3, -5, 15, 36, 33 createsprite gBattleAnimSpriteTemplate_83D637C, 3, 10, -5, -8, 26 createsprite gBattleAnimSpriteTemplate_83D637C, 3, -10, 20, 20, 39 delay 4 - playsewithpan SE_W207, 63 + playsewithpan SE_W207, SOUND_PAN_TARGET createsprite gBattleAnimSpriteTemplate_83D637C, 3, 0, 5, 8, 26 createsprite gBattleAnimSpriteTemplate_83D637C, 3, 0, 5, 8, 26 createsprite gBattleAnimSpriteTemplate_83D637C, 3, 5, -18, -20, 35 @@ -7055,32 +7055,32 @@ _81D12DB: return Move_POISON_GAS: @ 81D1474 - loadspritegfx 10172 - loadspritegfx 10150 + loadspritegfx ANIM_TAG_PURPLE_GAS_CLOUD + loadspritegfx ANIM_TAG_POISON_BUBBLE delay 0 monbg ANIM_BANK_DEF_PARTNER monbgprio_29 setalpha 12, 8 delay 0 - playsewithpan SE_W054, 192 + playsewithpan SE_W054, SOUND_PAN_ATTACKER createsprite gPoisonGasCloudSpriteTemplate, 128, 64, 0, 0, -32, -6, 4192, 1072, 0 delay 4 - playsewithpan SE_W054, 192 + playsewithpan SE_W054, SOUND_PAN_ATTACKER createsprite gPoisonGasCloudSpriteTemplate, 128, 64, 0, 0, -32, -6, 4192, 1072, 0 delay 4 - playsewithpan SE_W054, 192 + playsewithpan SE_W054, SOUND_PAN_ATTACKER createsprite gPoisonGasCloudSpriteTemplate, 128, 64, 0, 0, -32, -6, 4192, 1072, 0 delay 4 - playsewithpan SE_W054, 192 + playsewithpan SE_W054, SOUND_PAN_ATTACKER createsprite gPoisonGasCloudSpriteTemplate, 128, 64, 0, 0, -32, -6, 4192, 1072, 0 delay 4 - playsewithpan SE_W054, 192 + playsewithpan SE_W054, SOUND_PAN_ATTACKER createsprite gPoisonGasCloudSpriteTemplate, 128, 64, 0, 0, -32, -6, 4192, 1072, 0 delay 4 - playsewithpan SE_W054, 192 + playsewithpan SE_W054, SOUND_PAN_ATTACKER createsprite gPoisonGasCloudSpriteTemplate, 128, 64, 0, 0, -32, -6, 4192, 1072, 0 delay 40 - loopsewithpan SE_W054, 63, 28, 6 + loopsewithpan SE_W054, SOUND_PAN_TARGET, 28, 6 createvisualtask sub_80E1F8C, 2, 4, 6, 2, 0, 12, 26650 waitforvisualfinish blendoff @@ -7092,7 +7092,7 @@ Move_BIND: @ 81D1552 createvisualtask AnimTask_SwayMon, 5, 0, 6, 3328, 4, 0 goto _81D1568 _81D1568: - playsewithpan SE_W020, 63 + playsewithpan SE_W020, SOUND_PAN_TARGET call _81D1578 call _81D1578 waitforvisualfinish @@ -7107,8 +7107,8 @@ Move_WRAP: @ 81D158C goto _81D1568 Move_PSYBEAM: @ 81D15A2 - loadspritegfx 10163 - playsewithpan SE_W060, 192 + loadspritegfx ANIM_TAG_GOLD_RING + playsewithpan SE_W060, SOUND_PAN_ATTACKER call Unknown_81D61E7 createsoundtask sub_812B058, 200, -64, 63, 3, 4, 0, 15 call _81D1626 @@ -7134,7 +7134,7 @@ _81D1626: return Move_HYPNOSIS: @ 81D163C - loadspritegfx 10163 + loadspritegfx ANIM_TAG_GOLD_RING call Unknown_81D61E7 call _81D166F call _81D166F @@ -7145,15 +7145,15 @@ Move_HYPNOSIS: @ 81D163C call Unknown_81D61F3 end _81D166F: - playsewithpan SE_W048, 192 + playsewithpan SE_W048, SOUND_PAN_ATTACKER createsprite gBattleAnimSpriteTemplate_83DA784, 130, 0, 8, 0, 8, 27, 0 createsprite gBattleAnimSpriteTemplate_83DA784, 130, 16, -8, 0, -8, 27, 0 delay 6 return Move_PSYWAVE: @ 81D169C - loadspritegfx 10165 - playsewithpan SE_W060, 192 + loadspritegfx ANIM_TAG_BLUE_RING + playsewithpan SE_W060, SOUND_PAN_ATTACKER call Unknown_81D61E7 createvisualtask sub_80D3630, 5, 100 createsoundtask sub_812B058, 203, -64, 63, 2, 9, 0, 10 @@ -7176,9 +7176,9 @@ _81D16FF: return Move_ZAP_CANNON: @ 81D1722 - loadspritegfx 10171 - loadspritegfx 10011 - playsewithpan SE_W086, 192 + loadspritegfx ANIM_TAG_BLACK_BALL_2 + loadspritegfx ANIM_TAG_SPARK_2 + playsewithpan SE_W086, SOUND_PAN_ATTACKER createsprite gBattleAnimSpriteTemplate_83D9874, 131, 10, 0, 0, 0, 30, 0 createsprite gBattleAnimSpriteTemplate_83D98A0, 132, 10, 0, 16, 30, 0, 40, 0 createsprite gBattleAnimSpriteTemplate_83D98A0, 132, 10, 0, 16, 30, 64, 40, 1 @@ -7191,21 +7191,21 @@ Move_ZAP_CANNON: @ 81D1722 waitforvisualfinish createvisualtask AnimTask_ShakeMon2, 2, ANIM_BANK_TARGET, 4, 0, 5, 1 delay 15 - waitplaysewithpan SE_W085B, 63, 19 + waitplaysewithpan SE_W085B, SOUND_PAN_TARGET, 19 call ElectricityEffect waitforvisualfinish end Move_STEEL_WING: @ 81D1807 - loadspritegfx 10009 - loadspritegfx 10135 - loopsewithpan SE_W231, 192, 28, 2 + loadspritegfx ANIM_TAG_GUST + loadspritegfx ANIM_TAG_IMPACT + loopsewithpan SE_W231, SOUND_PAN_ATTACKER, 28, 2 createvisualtask sub_80E0A4C, 5, 0, 0, 0 waitforvisualfinish monbg ANIM_BANK_DEF_PARTNER monbgprio_28 1 setalpha 12, 8 - loopsewithpan SE_W017, 192, 20, 2 + loopsewithpan SE_W017, SOUND_PAN_ATTACKER, 20, 2 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 @@ -7215,7 +7215,7 @@ Move_STEEL_WING: @ 81D1807 delay 17 createsprite gBasicHitSplatSpriteTemplate, 2, 16, 0, 1, 1 createsprite gBasicHitSplatSpriteTemplate, 2, -16, 0, 1, 1 - playsewithpan SE_W013, 63 + playsewithpan SE_W013, SOUND_PAN_TARGET waitforvisualfinish createsprite gSlideMonToOriginalPosSpriteTemplate, 2, 0, 0, 11 waitforvisualfinish @@ -7224,8 +7224,8 @@ Move_STEEL_WING: @ 81D1807 end Move_IRON_TAIL: @ 81D18B6 - loadspritegfx 10135 - loopsewithpan SE_W231, 192, 28, 2 + loadspritegfx ANIM_TAG_IMPACT + loopsewithpan SE_W231, SOUND_PAN_ATTACKER, 28, 2 createvisualtask sub_80E0A4C, 5, 1, 0, 0 waitforvisualfinish monbg ANIM_BANK_TARGET @@ -7234,7 +7234,7 @@ Move_IRON_TAIL: @ 81D18B6 delay 6 createsprite gBasicHitSplatSpriteTemplate, 130, 0, 0, 1, 2 createvisualtask AnimTask_ShakeMon, 2, ANIM_BANK_TARGET, 3, 0, 6, 1 - playsewithpan SE_W233B, 63 + playsewithpan SE_W233B, SOUND_PAN_TARGET waitforvisualfinish createvisualtask sub_80E0E24, 5, 0, 1 clearmonbg ANIM_BANK_TARGET @@ -7243,9 +7243,9 @@ Move_IRON_TAIL: @ 81D18B6 end Move_POISON_TAIL: @ 81D1914 - loadspritegfx 10135 - loadspritegfx 10150 - loopsewithpan SE_W231, 192, 28, 2 + loadspritegfx ANIM_TAG_IMPACT + loadspritegfx ANIM_TAG_POISON_BUBBLE + loopsewithpan SE_W231, SOUND_PAN_ATTACKER, 28, 2 createvisualtask sub_80E0A4C, 5, 1, 1, 23768 waitforvisualfinish monbg ANIM_BANK_TARGET @@ -7254,7 +7254,7 @@ Move_POISON_TAIL: @ 81D1914 delay 6 createsprite gBasicHitSplatSpriteTemplate, 130, 0, 0, 1, 2 createvisualtask AnimTask_ShakeMon, 2, ANIM_BANK_TARGET, 3, 0, 6, 1 - playsewithpan SE_W233B, 63 + playsewithpan SE_W233B, SOUND_PAN_TARGET waitforvisualfinish createvisualtask sub_80E0E24, 5, 0, 1 clearmonbg ANIM_BANK_TARGET @@ -7264,20 +7264,20 @@ Move_POISON_TAIL: @ 81D1914 end Move_METAL_CLAW: @ 81D197A - loadspritegfx 10039 - loopsewithpan SE_W231, 192, 28, 2 + loadspritegfx ANIM_TAG_CLAW_SLASH + loopsewithpan SE_W231, SOUND_PAN_ATTACKER, 28, 2 createvisualtask sub_80E0A4C, 5, 0, 0, 0 waitforvisualfinish createsprite gHorizontalLungeSpriteTemplate, 2, 6, 4 delay 2 - playsewithpan SE_W013, 63 + playsewithpan SE_W013, SOUND_PAN_TARGET 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 gHorizontalLungeSpriteTemplate, 2, 6, 4 delay 2 - playsewithpan SE_W013, 63 + playsewithpan SE_W013, SOUND_PAN_TARGET createsprite gBattleAnimSpriteTemplate_83DB288, 130, 10, -10, 1 createsprite gBattleAnimSpriteTemplate_83DB288, 130, 10, 10, 1 createsprite gBattleAnimSpriteTemplate_83DB428, 2, -4, 1, 10, 3, 1 @@ -7287,11 +7287,11 @@ Move_METAL_CLAW: @ 81D197A Move_NIGHT_SHADE: @ 81D1A0D monbg ANIM_BANK_ATTACKER monbgprio_28 0 - playsewithpan SE_W060, 192 - fadetobg 2 + playsewithpan SE_W060, SOUND_PAN_ATTACKER + fadetobg BG_GHOST waitbgfadein delay 10 - playsewithpan SE_W043, 192 + playsewithpan SE_W043, SOUND_PAN_ATTACKER createvisualtask sub_80DDDF0, 5, 85 delay 70 createvisualtask AnimTask_ShakeMon2, 2, ANIM_BANK_TARGET, 2, 0, 12, 1 @@ -7304,39 +7304,39 @@ Move_NIGHT_SHADE: @ 81D1A0D end Move_EGG_BOMB: @ 81D1A55 - loadspritegfx 10198 - loadspritegfx 10175 - playsewithpan SE_W039, 192 + loadspritegfx ANIM_TAG_EXPLOSION + loadspritegfx ANIM_TAG_LARGE_FRESH_EGG + playsewithpan SE_W039, SOUND_PAN_ATTACKER createsprite gBattleAnimSpriteTemplate_83D7594, 130, 10, 0, 0, 0, 25, -32 waitforvisualfinish createvisualtask AnimTask_ShakeMon2, 2, ANIM_BANK_TARGET, 4, 0, 16, 1 createsprite gBattleAnimSpriteTemplate_83D7828, 132, 6, 5, 1, 0 - playsewithpan SE_W120, 63 + playsewithpan SE_W120, SOUND_PAN_TARGET delay 3 createsprite gBattleAnimSpriteTemplate_83D7828, 132, -16, -15, 1, 0 - playsewithpan SE_W120, 63 + playsewithpan SE_W120, SOUND_PAN_TARGET delay 3 createsprite gBattleAnimSpriteTemplate_83D7828, 132, 16, -5, 1, 0 - playsewithpan SE_W120, 63 + playsewithpan SE_W120, SOUND_PAN_TARGET delay 3 createsprite gBattleAnimSpriteTemplate_83D7828, 132, -12, 18, 1, 0 - playsewithpan SE_W120, 63 + playsewithpan SE_W120, SOUND_PAN_TARGET delay 3 createsprite gBattleAnimSpriteTemplate_83D7828, 132, 0, 5, 1, 0 - playsewithpan SE_W120, 63 + playsewithpan SE_W120, SOUND_PAN_TARGET delay 3 waitforvisualfinish end Move_SHADOW_BALL: @ 81D1AEF - loadspritegfx 10176 - fadetobg 2 + loadspritegfx ANIM_TAG_SHADOW_BALL + fadetobg BG_GHOST waitbgfadein delay 15 createsoundtask sub_812B058, 168, -64, 63, 5, 5, 0, 5 createsprite gShadowBallSpriteTemplate, 130, 16, 16, 8 waitforvisualfinish - playsewithpan SE_W028, 63 + playsewithpan SE_W028, SOUND_PAN_TARGET createvisualtask AnimTask_ShakeMon2, 2, ANIM_BANK_TARGET, 4, 0, 8, 1 waitforvisualfinish restorebg @@ -7344,17 +7344,17 @@ Move_SHADOW_BALL: @ 81D1AEF end Move_LICK: @ 81D1B32 - loadspritegfx 10177 + loadspritegfx ANIM_TAG_LICK delay 15 - playsewithpan SE_W122, 63 + playsewithpan SE_W122, SOUND_PAN_TARGET createsprite gBattleAnimSpriteTemplate_83DAEDC, 130, 0, 0 createvisualtask AnimTask_ShakeMon2, 2, ANIM_BANK_TARGET, 1, 0, 16, 1 waitforvisualfinish end Move_FOCUS_ENERGY: @ 81D1B59 - loadspritegfx 10184 - playsewithpan SE_W082, 192 + loadspritegfx ANIM_TAG_FOCUS_ENERGY + playsewithpan SE_W082, SOUND_PAN_ATTACKER call EndureFlamesAnim delay 8 createvisualtask sub_80E1F8C, 2, 2, 2, 2, 0, 11, 32767 @@ -7369,16 +7369,16 @@ Move_BIDE: @ 81D1B99 choosetwoturnanim _81D1BA3, _81D1BCF end _81D1BA3: - loopsewithpan SE_W036, 192, 9, 2 + loopsewithpan SE_W036, SOUND_PAN_ATTACKER, 9, 2 createvisualtask sub_80E1F8C, 2, 2, 2, 2, 0, 11, 31 createvisualtask AnimTask_ShakeMon2, 2, ANIM_BANK_ATTACKER, 1, 0, 32, 1 waitforvisualfinish end _81D1BCF: - loadspritegfx 10135 + loadspritegfx ANIM_TAG_IMPACT monbg ANIM_BANK_DEF_PARTNER setalpha 12, 8 - loopsewithpan SE_W036, 192, 9, 2 + loopsewithpan SE_W036, SOUND_PAN_ATTACKER, 9, 2 createvisualtask sub_80E2A38, 10, 2, 2, 0, 11, 31 createvisualtask AnimTask_ShakeMon2, 2, ANIM_BANK_ATTACKER, 1, 0, 32, 1 waitforvisualfinish @@ -7386,13 +7386,13 @@ _81D1BCF: waitforvisualfinish 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 + playsewithpan SE_W004, SOUND_PAN_TARGET createsprite gBasicHitSplatSpriteTemplate, 1, 18, -8, 1, 1 delay 5 - playsewithpan SE_W004, 63 + playsewithpan SE_W004, SOUND_PAN_TARGET createsprite gBasicHitSplatSpriteTemplate, 1, -18, 8, 1, 1 delay 5 - playsewithpan SE_W004, 63 + playsewithpan SE_W004, SOUND_PAN_TARGET createsprite gBasicHitSplatSpriteTemplate, 1, -8, -5, 1, 1 waitforvisualfinish delay 5 @@ -7405,13 +7405,13 @@ _81D1BCF: end Move_STRING_SHOT: @ 81D1C98 - loadspritegfx 10179 - loadspritegfx 10180 + loadspritegfx ANIM_TAG_STRING + loadspritegfx ANIM_TAG_STRING_DOT monbg ANIM_BANK_DEF_PARTNER delay 0 createsprite gSimplePaletteBlendSpriteTemplate, 5, 1, 2, 0, 9, rgb(0, 0, 0) waitforvisualfinish - loopsewithpan SE_W081, 192, 9, 6 + loopsewithpan SE_W081, SOUND_PAN_ATTACKER, 9, 6 call _81D1D56 call _81D1D56 call _81D1D56 @@ -7431,7 +7431,7 @@ Move_STRING_SHOT: @ 81D1C98 call _81D1D56 call _81D1D56 waitforvisualfinish - playsewithpan SE_W081B, 63 + playsewithpan SE_W081B, SOUND_PAN_TARGET createsprite gBattleAnimSpriteTemplate_83DAB40, 130, 0, 10 delay 4 createsprite gBattleAnimSpriteTemplate_83DAB40, 130, 0, -2 @@ -7449,14 +7449,14 @@ _81D1D56: return Move_SPIDER_WEB: @ 81D1D6A - loadspritegfx 10181 - loadspritegfx 10180 + loadspritegfx ANIM_TAG_WEB + loadspritegfx ANIM_TAG_STRING_DOT monbg ANIM_BANK_DEF_PARTNER delay 0 createsprite gSimplePaletteBlendSpriteTemplate, 5, 1, 2, 0, 9, rgb(0, 0, 0) waitforvisualfinish monbgprio_28 1 - loopsewithpan SE_W081, 192, 9, 6 + loopsewithpan SE_W081, SOUND_PAN_ATTACKER, 9, 6 call _81D1DF7 call _81D1DF7 call _81D1DF7 @@ -7472,7 +7472,7 @@ Move_SPIDER_WEB: @ 81D1D6A call _81D1DF7 call _81D1DF7 waitforvisualfinish - playsewithpan SE_W081B, 63 + playsewithpan SE_W081B, SOUND_PAN_TARGET createsprite gBattleAnimSpriteTemplate_83DAB74, 2 waitforvisualfinish clearmonbg ANIM_BANK_DEF_PARTNER @@ -7490,29 +7490,29 @@ _81D1E14: waitforvisualfinish end _81D1E16: - loadspritegfx 10009 - playsewithpan SE_W016, 192 + loadspritegfx ANIM_TAG_GUST + playsewithpan SE_W016, SOUND_PAN_ATTACKER createsprite gBattleAnimSpriteTemplate_83D765C, 2, 32, 0, 16, 16, 0, 7, 40 createsprite gBattleAnimSpriteTemplate_83D765C, 2, 32, 0, 16, 16, 85, 7, 40 createsprite gBattleAnimSpriteTemplate_83D765C, 2, 32, 0, 16, 16, 170, 7, 40 waitforvisualfinish - playsewithpan SE_W016B, 192 + playsewithpan SE_W016B, SOUND_PAN_ATTACKER goto _81D1E14 _81D1E66: - loadspritegfx 10154 - loadspritegfx 10135 + loadspritegfx ANIM_TAG_AIR_WAVE_2 + loadspritegfx ANIM_TAG_IMPACT monbg ANIM_BANK_TARGET setalpha 12, 8 - playsewithpan SE_W013B, 192 + playsewithpan SE_W013B, SOUND_PAN_ATTACKER createsprite gBattleAnimSpriteTemplate_83DA3E4, 2, 14, 8, 0, 0, 22, 2, 1 delay 2 - playsewithpan SE_W013B, 192 + playsewithpan SE_W013B, SOUND_PAN_ATTACKER createsprite gBattleAnimSpriteTemplate_83DA3E4, 2, 14, -8, 16, 14, 22, 1, 1 delay 2 - playsewithpan SE_W013B, 192 + playsewithpan SE_W013B, SOUND_PAN_ATTACKER createsprite gBattleAnimSpriteTemplate_83DA3E4, 2, 14, 12, -16, -14, 22, 0, 1 delay 17 - playsewithpan SE_W013, 63 + playsewithpan SE_W013, SOUND_PAN_TARGET createvisualtask AnimTask_ShakeMon2, 2, ANIM_BANK_TARGET, 2, 0, 10, 1 createvisualtask AnimTask_ShakeMon2, 2, ANIM_BANK_DEF_PARTNER, 2, 0, 10, 1 waitforvisualfinish @@ -7521,15 +7521,15 @@ _81D1E66: goto _81D1E14 Move_DISABLE: @ 81D1EF1 - loadspritegfx 10071 + loadspritegfx ANIM_TAG_SPARKLE_4 monbg ANIM_BANK_TARGET monbgprio_28 1 setalpha 8, 8 - playsewithpan SE_W197, 192 + playsewithpan SE_W197, SOUND_PAN_ATTACKER createsprite gBattleAnimSpriteTemplate_83930F4, 13, 24, -16 waitforvisualfinish createvisualtask sub_80D03C4, 5 - loopsewithpan SE_W020, 63, 15, 4 + loopsewithpan SE_W020, SOUND_PAN_TARGET, 15, 4 waitforvisualfinish delay 1 clearmonbg ANIM_BANK_TARGET @@ -7537,11 +7537,11 @@ Move_DISABLE: @ 81D1EF1 end Move_RECOVER: @ 81D1F1F - loadspritegfx 10147 - loadspritegfx 10031 + loadspritegfx ANIM_TAG_ORBS + loadspritegfx ANIM_TAG_BLUE_STAR monbg ANIM_BANK_ATK_PARTNER setalpha 12, 8 - loopsewithpan SE_W025, 192, 13, 3 + loopsewithpan SE_W025, SOUND_PAN_ATTACKER, 13, 3 createvisualtask sub_80E1F8C, 2, 2, 0, 6, 0, 11, 12287 call _81D1F5F call _81D1F5F @@ -7571,26 +7571,26 @@ _81D1F5F: return Move_MIMIC: @ 81D1FC9 - loadspritegfx 10147 - monbg_22 3 + loadspritegfx ANIM_TAG_ORBS + monbg_22 ANIM_BANK_DEF_PARTNER setalpha 11, 5 - panse_1B SE_W107, 63, 192, 253, 0 + panse_1B SE_W107, SOUND_PAN_TARGET, SOUND_PAN_ATTACKER, 253, 0 createvisualtask sub_80CB340, 5, 128, 24 delay 15 createsprite gBattleAnimSpriteTemplate_83D65E8, 130, -12, 24 delay 10 - setarg 7, -1 + setarg ARG_RET_ID, -1 waitforvisualfinish - playsewithpan SE_W036, 192 + playsewithpan SE_W036, SOUND_PAN_ATTACKER createvisualtask sub_80E1F8C, 2, 2, 0, 2, 0, 11, 32767 waitforvisualfinish - clearmonbg_23 3 + clearmonbg_23 ANIM_BANK_DEF_PARTNER blendoff end Move_CONSTRICT: @ 81D2013 - loadspritegfx 10186 - loopsewithpan SE_W010, 63, 6, 4 + loadspritegfx ANIM_TAG_TENDRILS + loopsewithpan SE_W010, SOUND_PAN_TARGET, 6, 4 createsprite gBattleAnimSpriteTemplate_83D65A0, 132, 0, 16, 0, 2 delay 7 createsprite gBattleAnimSpriteTemplate_83D65A0, 131, 0, 0, 0, 2 @@ -7600,16 +7600,16 @@ Move_CONSTRICT: @ 81D2013 delay 8 createvisualtask AnimTask_ShakeMon2, 2, ANIM_BANK_TARGET, 3, 0, 6, 1 delay 20 - playsewithpan SE_W020, 63 - setarg 7, -1 + playsewithpan SE_W020, SOUND_PAN_TARGET + setarg ARG_RET_ID, -1 waitforvisualfinish end Move_CURSE: @ 81D207B choosetwoturnanim _81D2084, _81D2101 _81D2084: - loadspritegfx 10199 - loadspritegfx 10200 + loadspritegfx ANIM_TAG_NAIL + loadspritegfx ANIM_TAG_GHOSTLY_SPIRIT monbg ANIM_BANK_ATK_PARTNER createvisualtask sub_80DECB0, 5 waitforvisualfinish @@ -7625,7 +7625,7 @@ _81D2084: clearmonbg ANIM_BANK_ATK_PARTNER delay 1 monbg ANIM_BANK_DEF_PARTNER - playsewithpan SE_W171, 63 + playsewithpan SE_W171, SOUND_PAN_TARGET createsprite gBattleAnimSpriteTemplate_83DAF38, 130 createvisualtask AnimTask_ShakeMon2, 2, ANIM_BANK_TARGET, 2, 0, 14, 1 waitforvisualfinish @@ -7635,7 +7635,7 @@ _81D2084: end _81D20EB: createvisualtask AnimTask_ShakeMon2, 2, ANIM_BANK_ATTACKER, 4, 0, 10, 0 - playsewithpan SE_W020, 192 + playsewithpan SE_W020, SOUND_PAN_ATTACKER return _81D2101: createvisualtask AnimTask_SwayMon, 5, 0, 10, 1536, 3, 0 @@ -7645,39 +7645,39 @@ _81D2101: waitforvisualfinish end _81D211C: - playsewithpan SE_W082, 192 + playsewithpan SE_W082, SOUND_PAN_ATTACKER createvisualtask sub_80E2F2C, 5 createvisualtask sub_80E1F8C, 5, 2, 4, 2, 0, 10, 31 return Move_SOFT_BOILED: @ 81D213B - loadspritegfx 10202 - loadspritegfx 10203 - loadspritegfx 10031 + loadspritegfx ANIM_TAG_BREAKING_EGG + loadspritegfx ANIM_TAG_THIN_RING + loadspritegfx ANIM_TAG_BLUE_STAR monbg ANIM_BANK_ATK_PARTNER - playsewithpan SE_W039, 192 + playsewithpan SE_W039, SOUND_PAN_ATTACKER createvisualtask AnimTask_ShakeMon, 2, ANIM_BANK_ATTACKER, 0, 2, 6, 1 createsprite gBattleAnimSpriteTemplate_83D78BC, 4, 0, 16, 0 createsprite gBattleAnimSpriteTemplate_83D78BC, 4, 0, 16, 1 delay 120 delay 7 - playsewithpan SE_W030, 192 + playsewithpan SE_W030, SOUND_PAN_ATTACKER createsprite gSimplePaletteBlendSpriteTemplate, 2, 31, 3, 10, 0, rgb(12, 24, 30) createsprite gBattleAnimSpriteTemplate_83D7928, 3, 31, 16, 0, 1 delay 8 createsprite gBattleAnimSpriteTemplate_83D7928, 3, 31, 16, 0, 1 delay 60 - setarg 7, -1 + setarg ARG_RET_ID, -1 waitforvisualfinish clearmonbg ANIM_BANK_ATK_PARTNER call Unknown_81D5F3E end Move_HEAL_BELL: @ 81D21BD - loadspritegfx 10205 - loadspritegfx 10206 - loadspritegfx 10203 - loadspritegfx 10049 + loadspritegfx ANIM_TAG_BELL + loadspritegfx ANIM_TAG_MUSIC_NOTES_2 + loadspritegfx ANIM_TAG_THIN_RING + loadspritegfx ANIM_TAG_SPARKLE_2 createvisualtask sub_80E2A38, 10, 10, 0, 0, 10, 32767 waitforvisualfinish createvisualtask sub_80D1ADC, 5 @@ -7703,12 +7703,12 @@ Move_HEAL_BELL: @ 81D21BD waitforvisualfinish createvisualtask sub_80D1B80, 5 waitforvisualfinish - playsewithpan SE_W234, 192 + playsewithpan SE_W234, SOUND_PAN_ATTACKER createsprite gBattleAnimSpriteTemplate_83D6CA0, 16, -15, 0, 0, 0, 32, 60, 1 delay 8 createsprite gBattleAnimSpriteTemplate_83D6CA0, 16, 12, -5, 0, 0, 32, 60, 1 waitforvisualfinish - playsewithpan SE_REAPOKE, 192 + playsewithpan SE_REAPOKE, SOUND_PAN_ATTACKER createvisualtask sub_80E2A7C, 10, 4, 3, 10, 0, 31500 createvisualtask sub_80E2A38, 10, 10, 3, 10, 0, 32767 createsprite gBattleAnimSpriteTemplate_83D7974, 16, 0, 0, 0, 1 @@ -7717,14 +7717,14 @@ _81D2372: createvisualtask sub_80E2A7C, 10, 4, 3, 8, 0, 31500 createvisualtask sub_80E2A38, 10, 10, 3, 2, 10, 32767 createsprite gBattleAnimSpriteTemplate_83D7928, 40, 0, -24, 0, 1 - playsewithpan SE_W215, 192 + playsewithpan SE_W215, SOUND_PAN_ATTACKER return Move_FAKE_OUT: @ 81D23A8 playsewithpan SE_W260, 0 createvisualtask sub_80D1CD0, 5 waitforvisualfinish - playsewithpan SE_W166, 63 + playsewithpan SE_W166, SOUND_PAN_TARGET createvisualtask AnimTask_ShakeMon2, 2, ANIM_BANK_TARGET, 4, 0, 5, 1 createvisualtask sub_80D1E38, 3 waitforvisualfinish @@ -7732,35 +7732,35 @@ Move_FAKE_OUT: @ 81D23A8 end Move_SCARY_FACE: @ 81D23E3 - loadspritegfx 10218 + loadspritegfx ANIM_TAG_EYE_SPARKLE createsprite gSimplePaletteBlendSpriteTemplate, 2, 27, 3, 0, 16, rgb(0, 0, 0) - playsewithpan SE_W060, 192 + playsewithpan SE_W060, SOUND_PAN_ATTACKER waitforvisualfinish delay 10 - playsewithpan SE_W043, 192 + playsewithpan SE_W043, SOUND_PAN_ATTACKER createvisualtask sub_80D23B4, 5 delay 13 createsprite gBattleAnimSpriteTemplate_83D7B94, 0, -16, -8 createsprite gBattleAnimSpriteTemplate_83D7B94, 0, 16, -8 waitforvisualfinish createvisualtask sub_80D60B4, 3, 20, 1, 0 - playsewithpan SE_W081B, 63 + playsewithpan SE_W081B, SOUND_PAN_TARGET createsprite gSimplePaletteBlendSpriteTemplate, 2, 27, 3, 16, 0, rgb(0, 0, 0) waitforvisualfinish end Move_SWEET_KISS: @ 81D2446 - loadspritegfx 10216 - loadspritegfx 10220 + loadspritegfx ANIM_TAG_RED_HEART + loadspritegfx ANIM_TAG_ANGEL createsprite gBattleAnimSpriteTemplate_83D7BB8, 130, 16, -48 - playsewithpan SE_W215, 63 + playsewithpan SE_W215, SOUND_PAN_TARGET delay 23 - playsewithpan SE_W215, 63 + playsewithpan SE_W215, SOUND_PAN_TARGET delay 23 - playsewithpan SE_W215, 63 + playsewithpan SE_W215, SOUND_PAN_TARGET waitforvisualfinish createsprite gBattleAnimSpriteTemplate_83D7AC8, 131, 160, -30 - playsewithpan SE_W213, 63 + playsewithpan SE_W213, SOUND_PAN_TARGET createsprite gBattleAnimSpriteTemplate_83D7AC8, 131, -256, -42 createsprite gBattleAnimSpriteTemplate_83D7AC8, 131, 128, -14 createsprite gBattleAnimSpriteTemplate_83D7AC8, 131, 416, -38 @@ -7769,12 +7769,12 @@ Move_SWEET_KISS: @ 81D2446 end Move_LOVELY_KISS: @ 81D24AF - loadspritegfx 10219 - loadspritegfx 10221 + loadspritegfx ANIM_TAG_PINK_HEART + loadspritegfx ANIM_TAG_DEVIL createsprite gBattleAnimSpriteTemplate_83D7C00, 130, 0, -24 - playsewithpan SE_W060B, 63 + playsewithpan SE_W060B, SOUND_PAN_TARGET waitforvisualfinish - playsewithpan SE_W213, 63 + playsewithpan SE_W213, SOUND_PAN_TARGET createsprite gBattleAnimSpriteTemplate_83D7BD0, 131, -256, -42 createsprite gBattleAnimSpriteTemplate_83D7BD0, 131, 128, -14 createsprite gBattleAnimSpriteTemplate_83D7BD0, 131, 416, -38 @@ -7782,86 +7782,86 @@ Move_LOVELY_KISS: @ 81D24AF end Move_FURY_SWIPES: @ 81D24F6 - loadspritegfx 10222 + loadspritegfx ANIM_TAG_SWIPE createsprite gHorizontalLungeSpriteTemplate, 2, 5, 5 delay 4 - playsewithpan SE_W010, 63 + playsewithpan SE_W010, SOUND_PAN_TARGET createsprite gBattleAnimSpriteTemplate_83D7C48, 130, 16, 0, 1 createvisualtask AnimTask_ShakeMon2, 2, ANIM_BANK_TARGET, 3, 0, 5, 1 delay 10 createsprite gHorizontalLungeSpriteTemplate, 130, 5, 5 delay 4 - playsewithpan SE_W010, 63 + playsewithpan SE_W010, SOUND_PAN_TARGET createsprite gBattleAnimSpriteTemplate_83D7C48, 130, -16, 0, 0 createvisualtask AnimTask_ShakeMon2, 2, ANIM_BANK_TARGET, 4, 0, 7, 1 end Move_INGRAIN: @ 81D255A - loadspritegfx 10223 - loadspritegfx 10147 + loadspritegfx ANIM_TAG_ROOTS + loadspritegfx ANIM_TAG_ORBS createsprite gBattleAnimSpriteTemplate_83D6658, 2, 16, 26, -1, 2, 150 - playsewithpan SE_W010, 192 + playsewithpan SE_W010, SOUND_PAN_ATTACKER delay 10 createsprite gBattleAnimSpriteTemplate_83D6658, 2, -32, 20, 1, 1, 140 - playsewithpan SE_W010, 192 + playsewithpan SE_W010, SOUND_PAN_ATTACKER delay 10 createsprite gBattleAnimSpriteTemplate_83D6658, 2, 32, 22, 1, 0, 130 - playsewithpan SE_W010, 192 + playsewithpan SE_W010, SOUND_PAN_ATTACKER delay 10 createsprite gBattleAnimSpriteTemplate_83D6658, 2, -16, 25, -1, 3, 120 - playsewithpan SE_W010, 192 + playsewithpan SE_W010, SOUND_PAN_ATTACKER delay 40 createsprite gBattleAnimSpriteTemplate_83D6698, 3, 32, 26, -1, 3, 30 delay 5 - playsewithpan SE_W145C, 192 + playsewithpan SE_W145C, SOUND_PAN_ATTACKER delay 5 createsprite gBattleAnimSpriteTemplate_83D6698, 3, -48, 20, 1, 2, 30 - playsewithpan SE_W145C, 192 + playsewithpan SE_W145C, SOUND_PAN_ATTACKER delay 5 - playsewithpan SE_W145C, 192 + playsewithpan SE_W145C, SOUND_PAN_ATTACKER delay 5 createsprite gBattleAnimSpriteTemplate_83D6698, 3, 48, 26, -2, 3, 18 - playsewithpan SE_W145C, 192 + playsewithpan SE_W145C, SOUND_PAN_ATTACKER delay 10 waitforvisualfinish end Move_PRESENT: @ 81D260B - loadspritegfx 10224 + loadspritegfx ANIM_TAG_ITEM_BAG createvisualtask sub_812C960, 2 createsprite gBattleAnimSpriteTemplate_83D671C, 130, 0, -5, 10, 2, -1 - playsewithpan SE_W039, 192 + playsewithpan SE_W039, SOUND_PAN_ATTACKER delay 14 - playsewithpan SE_W145B, 192 + playsewithpan SE_W145B, SOUND_PAN_ATTACKER delay 14 playsewithpan SE_W145B, 0 delay 20 - playsewithpan SE_W145B, 63 + playsewithpan SE_W145B, SOUND_PAN_TARGET waitforvisualfinish jumpargeq 7, 0, _81D264E jumpargeq 7, 1, _81D26B9 end _81D264E: - loadspritegfx 10198 - playsewithpan SE_W120, 63 + loadspritegfx ANIM_TAG_EXPLOSION + playsewithpan SE_W120, SOUND_PAN_TARGET createsprite gBattleAnimSpriteTemplate_83D7828, 131, 0, 0, 1, 1 delay 6 - playsewithpan SE_W120, 63 + playsewithpan SE_W120, SOUND_PAN_TARGET createsprite gBattleAnimSpriteTemplate_83D7828, 131, 24, -24, 1, 1 delay 6 - playsewithpan SE_W120, 63 + playsewithpan SE_W120, SOUND_PAN_TARGET createsprite gBattleAnimSpriteTemplate_83D7828, 131, -16, 16, 1, 1 delay 6 - playsewithpan SE_W120, 63 + playsewithpan SE_W120, SOUND_PAN_TARGET createsprite gBattleAnimSpriteTemplate_83D7828, 131, -24, -12, 1, 1 delay 6 - playsewithpan SE_W120, 63 + playsewithpan SE_W120, SOUND_PAN_TARGET createsprite gBattleAnimSpriteTemplate_83D7828, 131, 16, 16, 1, 1 end _81D26B9: - loadspritegfx 10195 - loadspritegfx 10031 - playsewithpan SE_W234, 63 + loadspritegfx ANIM_TAG_SPARKLE_5 + loadspritegfx ANIM_TAG_BLUE_STAR + playsewithpan SE_W234, SOUND_PAN_TARGET createsprite gBattleAnimSpriteTemplate_83D6764, 132, -16, 32, -3, 1 delay 3 createsprite gBattleAnimSpriteTemplate_83D6764, 132, 16, 32, -3, -1 @@ -7885,14 +7885,14 @@ _81D26B9: end Move_BATON_PASS: @ 81D2762 - loadspritegfx 10226 - playsewithpan SE_W226, 192 + loadspritegfx ANIM_TAG_POKEBALL + playsewithpan SE_W226, SOUND_PAN_ATTACKER createvisualtask sub_80E1F8C, 2, 31, 1, 2, 0, 11, 31455 createsprite gBattleAnimSpriteTemplate_84024D0, 2 end Move_PERISH_SONG: @ 81D2784 - loadspritegfx 10206 + loadspritegfx ANIM_TAG_MUSIC_NOTES_2 createsprite gBattleAnimSpriteTemplate_83D7D1C, 4, 0, 0, 0 createsprite gBattleAnimSpriteTemplate_83D7D1C, 4, 1, 1, 16 createsprite gBattleAnimSpriteTemplate_83D7D1C, 4, 2, 1, 32 @@ -7911,7 +7911,7 @@ Move_PERISH_SONG: @ 81D2784 createsprite gBattleAnimSpriteTemplate_83D7D1C, 4, 15, 0, 240 createsprite gBattleAnimSpriteTemplate_83D7D34, 4, 15, 0, 0 delay 20 - panse_1B SE_W195, 192, 63, 2, 0 + panse_1B SE_W195, SOUND_PAN_ATTACKER, SOUND_PAN_TARGET, 2, 0 delay 80 createsprite gSimplePaletteBlendSpriteTemplate, 2, 1, 3, 0, 16, rgb(0, 0, 0) createvisualtask sub_80E0E24, 5, 4, 0 @@ -7928,25 +7928,25 @@ Move_PERISH_SONG: @ 81D2784 end Move_SLEEP_TALK: @ 81D28ED - loadspritegfx 10228 + loadspritegfx ANIM_TAG_LETTER_Z createvisualtask AnimTask_SwayMon, 5, 0, 4, 4096, 2, 0 delay 20 createsprite gBattleAnimSpriteTemplate_84022F0, 130, 0, 20, 5, -1 - playsewithpan SE_W173, 192 + playsewithpan SE_W173, SOUND_PAN_ATTACKER delay 6 createsprite gBattleAnimSpriteTemplate_84022F0, 130, 0, 20, 5, -1 delay 6 createsprite gBattleAnimSpriteTemplate_84022F0, 130, 0, 20, 5, -1 delay 20 createsprite gBattleAnimSpriteTemplate_84022F0, 130, 0, 20, 5, -5 - playsewithpan SE_W173, 192 + playsewithpan SE_W173, SOUND_PAN_ATTACKER delay 6 createsprite gBattleAnimSpriteTemplate_84022F0, 130, 0, 20, 5, -5 delay 6 createsprite gBattleAnimSpriteTemplate_84022F0, 130, 0, 20, 5, -5 delay 20 createsprite gBattleAnimSpriteTemplate_84022F0, 130, 0, 20, 5, -3 - playsewithpan SE_W173, 192 + playsewithpan SE_W173, SOUND_PAN_ATTACKER delay 6 createsprite gBattleAnimSpriteTemplate_84022F0, 130, 0, 20, 5, -3 delay 6 @@ -7955,8 +7955,8 @@ Move_SLEEP_TALK: @ 81D28ED end Move_HYPER_FANG: @ 81D29A8 - loadspritegfx 10192 - playsewithpan SE_W044, 63 + loadspritegfx ANIM_TAG_FANG_ATTACK + playsewithpan SE_W044, SOUND_PAN_TARGET delay 1 delay 2 createvisualtask sub_80E4200, 2 @@ -7969,36 +7969,36 @@ _81D29D6: createsprite gBattleAnimSpriteTemplate_840233C, 130 waitbgfadein createvisualtask AnimTask_ShakeMon, 3, 1, 0, 10, 10, 1 - playsewithpan SE_W043, 63 + playsewithpan SE_W043, SOUND_PAN_TARGET delay 20 restorebg waitbgfadein waitforvisualfinish end _81D29FA: - fadetobg 4 + fadetobg BG_IMPACT_OPPONENT goto _81D29D6 _81D2A01: - fadetobg 5 + fadetobg BG_IMPACT_PLAYER goto _81D29D6 _81D2A08: - fadetobg 6 + fadetobg BG_IMPACT_CONTESTS goto _81D29D6 Move_TRI_ATTACK: @ 81D2A0F - loadspritegfx 10230 + loadspritegfx ANIM_TAG_TRI_FORCE_TRIANGLE createsprite gBattleAnimSpriteTemplate_8402458, 130, 16, 0 - playsewithpan SE_W161, 192 + playsewithpan SE_W161, SOUND_PAN_ATTACKER delay 20 - playsewithpan SE_W161, 192 + playsewithpan SE_W161, SOUND_PAN_ATTACKER delay 20 createsoundtask sub_812B058, 220, -64, 63, 5, 6, 0, 7 waitforvisualfinish createsprite gSimplePaletteBlendSpriteTemplate, 2, 1, 2, 0, 16, rgb(0, 0, 0) delay 16 - loadspritegfx 10033 + loadspritegfx ANIM_TAG_FIRE createsprite gBattleAnimSpriteTemplate_83D9520, 130, 0, 0, 30, 30, -1, 0 - playsewithpan SE_W172B, 63 + playsewithpan SE_W172B, SOUND_PAN_TARGET createsprite gBattleAnimSpriteTemplate_83D9520, 130, 0, 0, 30, 30, 0, 1 delay 1 createsprite gBattleAnimSpriteTemplate_83D9520, 130, 0, 0, 30, 30, -1, -1 @@ -8015,9 +8015,9 @@ Move_TRI_ATTACK: @ 81D2A0F delay 2 createvisualtask sub_80D60B4, 2, 20, 3, 1, 1 waitforvisualfinish - loadspritegfx 10037 + loadspritegfx ANIM_TAG_LIGHTNING createvisualtask sub_80E2324, 2, 257, 257, 257 - playsewithpan SE_W161B, 63 + playsewithpan SE_W161B, SOUND_PAN_TARGET createsprite gBattleAnimSpriteTemplate_83D97D0, 130, 0, -48 delay 1 createsprite gBattleAnimSpriteTemplate_83D97D0, 130, 0, -16 @@ -8028,19 +8028,19 @@ Move_TRI_ATTACK: @ 81D2A0F delay 2 createvisualtask sub_80E2324, 2, 257, 257, 257 waitforvisualfinish - loadspritegfx 10141 + loadspritegfx ANIM_TAG_ICE_CRYSTALS call Effect_LightIceDamage createsprite gSimplePaletteBlendSpriteTemplate, 2, 1, 2, 16, 0, rgb(0, 0, 0) waitforvisualfinish end Move_WILL_O_WISP: @ 81D2B83 - loadspritegfx 10232 - loadspritegfx 10231 + loadspritegfx ANIM_TAG_WISP_FIRE + loadspritegfx ANIM_TAG_WISP_ORB monbg ANIM_BANK_DEF_PARTNER monbgprio_2A ANIM_BANK_TARGET - playsewithpan SE_W052, 192 - waitplaysewithpan SE_W052, 192, 10 + playsewithpan SE_W052, SOUND_PAN_ATTACKER + waitplaysewithpan SE_W052, SOUND_PAN_ATTACKER, 10 createvisualtask sub_812B374, 2, -64, -64, 1, 0 createsprite gBattleAnimSpriteTemplate_83D974C, 2, 0, 0, 0 delay 3 @@ -8053,7 +8053,7 @@ Move_WILL_O_WISP: @ 81D2B83 createvisualtask sub_812B374, 2, -64, 63, 2, 0 waitforvisualfinish monbgprio_29 - playsewithpan SE_W172B, 63 + playsewithpan SE_W172B, SOUND_PAN_TARGET createvisualtask AnimTask_ShakeMon2, 2, ANIM_BANK_TARGET, 4, 0, 13, 1 createsprite gBattleAnimSpriteTemplate_83D977C, 2, 0 createsprite gBattleAnimSpriteTemplate_83D977C, 2, 42 @@ -8066,8 +8066,8 @@ Move_WILL_O_WISP: @ 81D2B83 end Move_ENCORE: @ 81D2C41 - loadspritegfx 10227 - loadspritegfx 10247 + loadspritegfx ANIM_TAG_SPOTLIGHT + loadspritegfx ANIM_TAG_TAG_HAND createvisualtask sub_812CC44, 2 createvisualtask sub_80E2D78, 2, 248, 3, 0, 10, 0 waitforvisualfinish @@ -8086,8 +8086,8 @@ Move_ENCORE: @ 81D2C41 end Move_TRICK: @ 81D2CE8 - loadspritegfx 10224 - loadspritegfx 10207 + loadspritegfx ANIM_TAG_ITEM_BAG + loadspritegfx ANIM_TAG_SPEED_DUST createsprite gBattleAnimSpriteTemplate_83D67F4, 2, -40, 80 createsprite gBattleAnimSpriteTemplate_83D67F4, 2, -40, 208 delay 16 @@ -8114,15 +8114,15 @@ Move_TRICK: @ 81D2CE8 end Move_WISH: @ 81D2D66 - loadspritegfx 10233 - loadspritegfx 10049 + loadspritegfx ANIM_TAG_GOLD_STARS + loadspritegfx ANIM_TAG_SPARKLE_2 createsprite gSimplePaletteBlendSpriteTemplate, 2, 1, 3, 0, 10, rgb(0, 0, 0) waitforvisualfinish - panse_27 SE_W115, 63, 192, 253, 0 + panse_27 SE_W115, SOUND_PAN_TARGET, SOUND_PAN_ATTACKER, 253, 0 createsprite gBattleAnimSpriteTemplate_84024E8, 40 waitforvisualfinish delay 60 - loopsewithpan SE_W215, 192, 16, 3 + loopsewithpan SE_W215, SOUND_PAN_ATTACKER, 16, 3 call Unknown_81D5ECA waitforvisualfinish createsprite gSimplePaletteBlendSpriteTemplate, 2, 1, 3, 10, 0, rgb(0, 0, 0) @@ -8130,8 +8130,8 @@ Move_WISH: @ 81D2D66 end Move_STOCKPILE: @ 81D2DAE - loadspritegfx 10235 - playsewithpan SE_W025, 192 + loadspritegfx ANIM_TAG_GRAY_ORB + playsewithpan SE_W025, SOUND_PAN_ATTACKER createvisualtask sub_80E1F8C, 2, 2, 8, 1, 0, 12, 32767 createvisualtask sub_812D674, 5 call _81D2DEC @@ -8159,13 +8159,13 @@ _81D2DEC: return Move_SPIT_UP: @ 81D2E65 - loadspritegfx 10237 - loadspritegfx 10135 - playsewithpan SE_W036, 192 + loadspritegfx ANIM_TAG_RED_ORB_2 + loadspritegfx ANIM_TAG_IMPACT + playsewithpan SE_W036, SOUND_PAN_ATTACKER createvisualtask sub_812D6CC, 5 createvisualtask AnimTask_ShakeMon2, 2, ANIM_BANK_ATTACKER, 1, 0, 8, 2 delay 45 - playsewithpan SE_W255, 192 + playsewithpan SE_W255, SOUND_PAN_ATTACKER delay 3 createsprite gBattleAnimSpriteTemplate_83D7B60, 2, 0, 12 createsprite gBattleAnimSpriteTemplate_83D7B60, 2, 32, 12 @@ -8181,10 +8181,10 @@ Move_SPIT_UP: @ 81D2E65 _81D2EF5: delay 5 createvisualtask sub_80A9058, 2, 0, 1, 8, 1, 0 - playsewithpan SE_W003, 63 + playsewithpan SE_W003, SOUND_PAN_TARGET createsprite gBattleAnimSpriteTemplate_83DB538, 131, -12, 10, 1, 1 delay 5 - playsewithpan SE_W003, 63 + playsewithpan SE_W003, SOUND_PAN_TARGET createsprite gBattleAnimSpriteTemplate_83DB538, 131, 12, -10, 1, 1 waitforvisualfinish end @@ -8206,13 +8206,13 @@ _81D2F5B: goto _81D2EF5 Move_SWALLOW: @ 81D2FA8 - loadspritegfx 10236 - loadspritegfx 10031 - playsewithpan SE_W036, 192 + loadspritegfx ANIM_TAG_BLUE_ORB + loadspritegfx ANIM_TAG_BLUE_STAR + playsewithpan SE_W036, SOUND_PAN_ATTACKER createvisualtask sub_812D790, 5 createvisualtask AnimTask_ShakeMon2, 2, ANIM_BANK_ATTACKER, 1, 0, 8, 2 delay 38 - playsewithpan SE_W255, 192 + playsewithpan SE_W255, SOUND_PAN_ATTACKER createvisualtask AnimTask_ShakeMon2, 2, ANIM_BANK_ATTACKER, 2, 0, 12, 1 call _81D2FF9 jumpifmoveturn 2, _81D303B @@ -8243,16 +8243,16 @@ _81D3045: Move_TRANSFORM: @ 81D3054 monbg ANIM_BANK_ATTACKER - playsewithpan SE_W100, 192 - waitplaysewithpan SE_W107, 192, 48 + playsewithpan SE_W100, SOUND_PAN_ATTACKER + waitplaysewithpan SE_W107, SOUND_PAN_ATTACKER, 48 createvisualtask sub_812D7E8, 2, 0 waitforvisualfinish clearmonbg ANIM_BANK_ATTACKER end Move_MORNING_SUN: @ 81D306C - loadspritegfx 10241 - loadspritegfx 10031 + loadspritegfx ANIM_TAG_GREEN_STAR + loadspritegfx ANIM_TAG_BLUE_STAR createvisualtask sub_812DB84, 5 delay 8 createvisualtask sub_80E2A38, 10, 1921, 8, 0, 12, 32767 @@ -8283,14 +8283,14 @@ _81D30F2: return Move_SWEET_SCENT: @ 81D3100 - loadspritegfx 10238 - playsewithpan SE_W230, 192 + loadspritegfx ANIM_TAG_PINK_PETAL + playsewithpan SE_W230, SOUND_PAN_ATTACKER createsprite gBattleAnimSpriteTemplate_84026A4, 2, 100, 0, 100 delay 25 setpan 0 call _81D3144 createsprite gBattleAnimSpriteTemplate_84026A4, 2, 55, 0 - setpan 63 + setpan SOUND_PAN_TARGET createvisualtask sub_80E1F8C, 2, 20, 1, 5, 5, 13, 22207 call _81D3144 waitforvisualfinish @@ -8321,11 +8321,11 @@ _81D3144: return Move_HYPER_BEAM: @ 81D31EA - loadspritegfx 10147 + loadspritegfx ANIM_TAG_ORBS createsprite gSimplePaletteBlendSpriteTemplate, 2, 1, 4, 0, 16, rgb(0, 0, 0) waitforvisualfinish delay 10 - playsewithpan SE_W063, 192 + playsewithpan SE_W063, SOUND_PAN_ATTACKER createvisualtask AnimTask_ShakeMon2, 2, ANIM_BANK_ATTACKER, 1, 0, 4, 1 waitforvisualfinish delay 30 @@ -8371,8 +8371,8 @@ _81D331B: return Move_FLATTER: @ 81D332C - loadspritegfx 10227 - loadspritegfx 10240 + loadspritegfx ANIM_TAG_SPOTLIGHT + loadspritegfx ANIM_TAG_CONFETTI createvisualtask sub_812B340, 5, 223, 63 createvisualtask sub_812CC44, 2 createvisualtask sub_80E2D78, 2, 248, 3, 0, 10, 0 @@ -8420,8 +8420,8 @@ Move_ROLE_PLAY: @ 81D3428 createvisualtask sub_80E2A38, 10, 4, 2, 0, 16, 32767 createsprite gSimplePaletteBlendSpriteTemplate, 2, 1, 2, 0, 10, rgb(0, 0, 0) waitforvisualfinish - playsewithpan SE_W161, 192 - waitplaysewithpan SE_W197, 192, 30 + playsewithpan SE_W161, SOUND_PAN_ATTACKER + waitplaysewithpan SE_W197, SOUND_PAN_ATTACKER, 30 createvisualtask sub_812EFC8, 2 waitforvisualfinish clearmonbg ANIM_BANK_ATK_PARTNER @@ -8431,30 +8431,30 @@ Move_ROLE_PLAY: @ 81D3428 end Move_REFRESH: @ 81D3485 - loadspritegfx 10203 - loadspritegfx 10049 - playsewithpan SE_W287, 192 + loadspritegfx ANIM_TAG_THIN_RING + loadspritegfx ANIM_TAG_SPARKLE_2 + playsewithpan SE_W287, SOUND_PAN_ATTACKER createvisualtask sub_81300A4, 2, 0 waitforvisualfinish - playsewithpan SE_W234, 192 + playsewithpan SE_W234, SOUND_PAN_ATTACKER call Unknown_81D5ECA waitforvisualfinish - playsewithpan SE_REAPOKE, 192 + playsewithpan SE_REAPOKE, SOUND_PAN_ATTACKER createsprite gSimplePaletteBlendSpriteTemplate, 2, 31, 3, 10, 0, rgb(12, 24, 30) createsprite gBattleAnimSpriteTemplate_83D7928, 3, 0, 0, 0, 0 end Move_BLAZE_KICK: @ 81D34C8 - loadspritegfx 10135 - loadspritegfx 10143 - loadspritegfx 10029 + loadspritegfx ANIM_TAG_IMPACT + loadspritegfx ANIM_TAG_HANDS_AND_FEET + loadspritegfx ANIM_TAG_SMALL_EMBER monbg ANIM_BANK_TARGET setalpha 12, 8 - playsewithpan SE_W172, 63 + playsewithpan SE_W172, SOUND_PAN_TARGET createsprite gBattleAnimSpriteTemplate_83DA024, 131, 0, 0, 1, 30 createvisualtask sub_80E2A38, 10, 4, 2, 0, 7, 32767 delay 30 - playsewithpan SE_W007, 63 + playsewithpan SE_W007, SOUND_PAN_TARGET createsprite gBasicHitSplatSpriteTemplate, 130, 0, 0, 1, 0 createvisualtask AnimTask_ShakeMon2, 2, ANIM_BANK_TARGET, 3, 0, 14, 1 createvisualtask sub_80E2A38, 10, 4, 2, 0, 0, 32767 @@ -8466,7 +8466,7 @@ Move_BLAZE_KICK: @ 81D34C8 end Move_HYPER_VOICE: @ 81D3550 - loadspritegfx 10203 + loadspritegfx ANIM_TAG_THIN_RING call _81D3562 waitforvisualfinish delay 8 @@ -8484,10 +8484,10 @@ _81D3562: return Move_SAND_TOMB: @ 81D35D2 - loadspritegfx 10074 + loadspritegfx ANIM_TAG_MUD_SAND createsprite gSimplePaletteBlendSpriteTemplate, 0, 4, 2, 0, 7, rgb(19, 17, 0) createvisualtask AnimTask_ShakeMon, 5, 1, 0, 2, 43, 1 - playsewithpan SE_W328, 63 + playsewithpan SE_W328, SOUND_PAN_TARGET call _81D361F call _81D361F call _81D361F @@ -8511,16 +8511,16 @@ _81D361F: return Move_SHEER_COLD: @ 81D36AA - fadetobg 15 + fadetobg BG_ICE waitbgfadeout playsewithpan SE_W196, 0 waitbgfadein - loadspritegfx 10010 + loadspritegfx ANIM_TAG_ICE_CUBE monbg ANIM_BANK_DEF_PARTNER monbgprio_28 1 setalpha 12, 8 createvisualtask sub_807B920, 2 - waitplaysewithpan SE_W258, 63, 17 + waitplaysewithpan SE_W258, SOUND_PAN_TARGET, 17 waitforvisualfinish clearmonbg ANIM_BANK_DEF_PARTNER blendoff @@ -8529,19 +8529,19 @@ Move_SHEER_COLD: @ 81D36AA end Move_ARM_THRUST: @ 81D36CF - loadspritegfx 10143 - loadspritegfx 10135 + loadspritegfx ANIM_TAG_HANDS_AND_FEET + loadspritegfx ANIM_TAG_IMPACT monbgprio_28 1 setalpha 12, 8 createvisualtask sub_80A8E04, 5, 8, 5, 0, 0 delay 6 createsprite gHorizontalLungeSpriteTemplate, 2, 4, 3 delay 4 - playsewithpan SE_W207, 63 + playsewithpan SE_W207, SOUND_PAN_TARGET createsprite gBattleAnimSpriteTemplate_83DA144, 130, 10, -8, 14, 3 waitforvisualfinish createvisualtask sub_80A8E04, 5, 8, 5, 0, 1 - playsewithpan SE_W003, 63 + playsewithpan SE_W003, SOUND_PAN_TARGET choosetwoturnanim _81D373C, _81D3750 _81D3728: createvisualtask AnimTask_ShakeMon, 5, 1, 4, 0, 6, 1 @@ -8556,13 +8556,13 @@ _81D3750: goto _81D3728 Move_MUDDY_WATER: @ 81D3764 - panse_1B SE_W250, 192, 63, 2, 0 + panse_1B SE_W250, SOUND_PAN_ATTACKER, SOUND_PAN_TARGET, 2, 0 createvisualtask sub_80D38BC, 2, 1 waitforvisualfinish end Move_BULLET_SEED: @ 81D3776 - loadspritegfx 10006 + loadspritegfx ANIM_TAG_SEED createsprite gBattleAnimSpriteTemplate_83D7628, 130, 20, 0 delay 5 createsprite gBattleAnimSpriteTemplate_83D7628, 130, 20, 0 @@ -8587,9 +8587,9 @@ Move_BULLET_SEED: @ 81D3776 end Move_DRAGON_CLAW: @ 81D380C - loadspritegfx 10029 - loadspritegfx 10039 - playsewithpan SE_W221B, 192 + loadspritegfx ANIM_TAG_SMALL_EMBER + loadspritegfx ANIM_TAG_CLAW_SLASH + playsewithpan SE_W221B, SOUND_PAN_ATTACKER createvisualtask sub_80E2A38, 10, 2, 4, 0, 8, 639 createvisualtask AnimTask_ShakeMon, 5, 0, 0, 2, 15, 1 call _81D39E9 @@ -8649,14 +8649,14 @@ Unknown_81D3A74: @ 81D3A74 end Move_MUD_SHOT: @ 81D3A75 - loadspritegfx 10259 + loadspritegfx ANIM_TAG_BROWN_ORB monbg ANIM_BANK_DEF_PARTNER monbgprio_28 1 setalpha 12, 8 createvisualtask AnimTask_ShakeMon, 5, 0, 0, 2, 46, 1 delay 6 createvisualtask sub_80D3630, 5, 100 - panse_1B SE_W250, 192, 63, 1, 0 + panse_1B SE_W250, SOUND_PAN_ATTACKER, SOUND_PAN_TARGET, 1, 0 call _81D3AEF call _81D3AEF call _81D3AEF @@ -8681,11 +8681,11 @@ _81D3AEF: return Move_METEOR_MASH: @ 81D3B12 - loadspritegfx 10233 - loadspritegfx 10135 - loadspritegfx 10143 - panse_1B SE_W112, 192, 63, 3, 0 - fadetobg 16 + loadspritegfx ANIM_TAG_GOLD_STARS + loadspritegfx ANIM_TAG_IMPACT + loadspritegfx ANIM_TAG_HANDS_AND_FEET + panse_1B SE_W112, SOUND_PAN_ATTACKER, SOUND_PAN_TARGET, 3, 0 + fadetobg BG_COSMIC waitbgfadein waitforvisualfinish createsprite gBattleAnimSpriteTemplate_8402A3C, 131, -48, -64, 72, 32, 30 @@ -8695,7 +8695,7 @@ Move_METEOR_MASH: @ 81D3B12 createsprite gBattleAnimSpriteTemplate_83DA024, 131, 0, 0, 0, 30 createsprite gBattleAnimSpriteTemplate_8402A3C, 131, -80, -64, 40, 32, 30 delay 20 - playsewithpan SE_W233B, 63 + playsewithpan SE_W233B, SOUND_PAN_TARGET createsprite gBasicHitSplatSpriteTemplate, 131, 0, 0, 1, 1 createvisualtask AnimTask_ShakeMon2, 2, ANIM_BANK_TARGET, 5, 0, 20, 1 waitforvisualfinish @@ -8706,38 +8706,38 @@ Move_METEOR_MASH: @ 81D3B12 end Move_REVENGE: @ 81D3B99 - loadspritegfx 10245 + loadspritegfx ANIM_TAG_PURPLE_SCRATCH monbg ANIM_BANK_TARGET setalpha 12, 8 - playsewithpan SE_W036, 192 + playsewithpan SE_W036, SOUND_PAN_ATTACKER createsprite gBattleAnimSpriteTemplate_83DA198, 2, 10, -10 waitforvisualfinish createvisualtask sub_80E1F8C, 2, 2, 0, 4, 2, 8, 31 waitforvisualfinish - unloadspritegfx 10245 - loadspritegfx 10246 + unloadspritegfx ANIM_TAG_PURPLE_SCRATCH + loadspritegfx ANIM_TAG_PURPLE_SWIPE createsprite gHorizontalLungeSpriteTemplate, 2, 6, 4 delay 4 - playsewithpan SE_W207, 63 + playsewithpan SE_W207, SOUND_PAN_TARGET createsprite gBattleAnimSpriteTemplate_83DA1E0, 130, 10, -10 waitforvisualfinish - unloadspritegfx 10246 - loadspritegfx 10135 + unloadspritegfx ANIM_TAG_PURPLE_SWIPE + loadspritegfx ANIM_TAG_IMPACT createvisualtask AnimTask_ShakeMon2, 2, ANIM_BANK_TARGET, 3, 0, 10, 1 createsprite gBattleAnimSpriteTemplate_83DB550, 131, -10, -8, 1, 1, 8 - playsewithpan SE_W233B, 63 + playsewithpan SE_W233B, SOUND_PAN_TARGET delay 8 createsprite gBattleAnimSpriteTemplate_83DB550, 131, 10, 8, 1, 1, 8 - playsewithpan SE_W025B, 63 + playsewithpan SE_W025B, SOUND_PAN_TARGET waitforvisualfinish clearmonbg ANIM_BANK_TARGET blendoff end Move_POISON_FANG: @ 81D3C30 - loadspritegfx 10192 - loadspritegfx 10150 - playsewithpan SE_W044, 63 + loadspritegfx ANIM_TAG_FANG_ATTACK + loadspritegfx ANIM_TAG_POISON_BUBBLE + playsewithpan SE_W044, SOUND_PAN_TARGET createsprite gBattleAnimSpriteTemplate_840233C, 130 delay 10 createvisualtask AnimTask_ShakeMon, 3, 1, 3, 0, 10, 1 @@ -8748,20 +8748,20 @@ Move_POISON_FANG: @ 81D3C30 end Move_SUBSTITUTE: @ 81D3C6F - playsewithpan SE_W213, 192 + playsewithpan SE_W213, SOUND_PAN_ATTACKER createvisualtask sub_81312E4, 2 end Move_FRENZY_PLANT: @ 81D3C7B - loadspritegfx 10223 - loadspritegfx 10135 + loadspritegfx ANIM_TAG_ROOTS + loadspritegfx ANIM_TAG_IMPACT monbg ANIM_BANK_TARGET monbgprio_28 1 setalpha 12, 8 createsprite gSimplePaletteBlendSpriteTemplate, 0, 1, 2, 0, 5, rgb(0, 0, 0) waitforvisualfinish createsprite gBattleAnimSpriteTemplate_83D6670, 2, 10, 8, 2, 0, 0, 100 - playsewithpan SE_W010, 192 + playsewithpan SE_W010, SOUND_PAN_ATTACKER delay 5 createsprite gBattleAnimSpriteTemplate_83D6670, 2, 20, -8, -2, 0, 1, 95 playsewithpan SE_W010, 213 @@ -8779,32 +8779,32 @@ Move_FRENZY_PLANT: @ 81D3C7B playsewithpan SE_W010, 42 delay 5 createsprite gBattleAnimSpriteTemplate_83D6670, 2, 75, 8, 0, 0, 0, 85 - playsewithpan SE_W010, 63 + playsewithpan SE_W010, SOUND_PAN_TARGET delay 5 createsprite gBattleAnimSpriteTemplate_83D6670, 2, 85, 16, 6, 0, 3, 80 - playsewithpan SE_W010, 63 + playsewithpan SE_W010, SOUND_PAN_TARGET delay 5 createsprite gBattleAnimSpriteTemplate_83D6670, 2, 85, -16, -6, 0, 2, 75 - playsewithpan SE_W010, 63 + playsewithpan SE_W010, SOUND_PAN_TARGET delay 5 createsprite gBasicHitSplatSpriteTemplate, 2, -10, -10, 1, 3 - playsewithpan SE_W003, 63 + playsewithpan SE_W003, SOUND_PAN_TARGET createvisualtask AnimTask_ShakeMon, 3, 1, 8, 0, 20, 1 delay 3 createsprite gBasicHitSplatSpriteTemplate, 2, 10, 8, 1, 3 - playsewithpan SE_W003, 63 + playsewithpan SE_W003, SOUND_PAN_TARGET delay 3 createsprite gBasicHitSplatSpriteTemplate, 2, 10, -3, 1, 2 - playsewithpan SE_W003, 63 + playsewithpan SE_W003, SOUND_PAN_TARGET delay 3 createsprite gBasicHitSplatSpriteTemplate, 2, -3, 1, 1, 2 - playsewithpan SE_W003, 63 + playsewithpan SE_W003, SOUND_PAN_TARGET delay 2 createsprite gBasicHitSplatSpriteTemplate, 2, -10, 1, 1, 1 - playsewithpan SE_W003, 63 + playsewithpan SE_W003, SOUND_PAN_TARGET delay 2 createsprite gBasicHitSplatSpriteTemplate, 2, 0, 10, 1, 1 - playsewithpan SE_W003, 63 + playsewithpan SE_W003, SOUND_PAN_TARGET waitforvisualfinish createsprite gSimplePaletteBlendSpriteTemplate, 0, 1, 2, 5, 0, rgb(0, 0, 0) waitforvisualfinish @@ -8813,7 +8813,7 @@ Move_FRENZY_PLANT: @ 81D3C7B end Move_METAL_SOUND: @ 81D3E1F - loadspritegfx 10260 + loadspritegfx ANIM_TAG_METAL_SOUND_WAVES monbg ANIM_BANK_DEF_PARTNER monbgprio_2A ANIM_BANK_TARGET createvisualtask AnimTask_ShakeMon2, 2, ANIM_BANK_ATTACKER, 2, 0, 8, 1 @@ -8827,7 +8827,7 @@ Move_METAL_SOUND: @ 81D3E1F waitforvisualfinish end _81D3E52: - panse_1B SE_W103, 192, 63, 2, 0 + panse_1B SE_W103, SOUND_PAN_ATTACKER, SOUND_PAN_TARGET, 2, 0 createsprite gBattleAnimSpriteTemplate_83D7564, 130, 16, 0, 0, 0, 30, 0 delay 2 return @@ -8838,8 +8838,8 @@ _81D3E74: waitforvisualfinish end _81D3E76: - loadspritegfx 10135 - loadspritegfx 10143 + loadspritegfx ANIM_TAG_IMPACT + loadspritegfx ANIM_TAG_HANDS_AND_FEET delay 1 createvisualtask sub_80E4200, 2 jumpargeq 7, 1, _81D3F2F @@ -8850,20 +8850,20 @@ _81D3EA4: waitbgfadein monbg ANIM_BANK_DEF_PARTNER setalpha 12, 8 - playsewithpan SE_W207, 63 + playsewithpan SE_W207, SOUND_PAN_TARGET createsprite gBattleAnimSpriteTemplate_83DA214, 130 delay 10 createsprite gBasicHitSplatSpriteTemplate, 2, -10, -8, 1, 0 createvisualtask AnimTask_ShakeMon, 5, 1, 8, 0, 24, 1 delay 8 createsprite gBasicHitSplatSpriteTemplate, 2, 10, 2, 1, 0 - playsewithpan SE_W233B, 63 + playsewithpan SE_W233B, SOUND_PAN_TARGET delay 8 createsprite gBasicHitSplatSpriteTemplate, 2, 10, -6, 1, 0 - playsewithpan SE_W233B, 63 + playsewithpan SE_W233B, SOUND_PAN_TARGET delay 8 createsprite gBasicHitSplatSpriteTemplate, 2, 0, 8, 1, 0 - playsewithpan SE_W025B, 63 + playsewithpan SE_W025B, SOUND_PAN_TARGET waitforvisualfinish restorebg waitbgfadein @@ -8871,17 +8871,17 @@ _81D3EA4: blendoff goto _81D3E74 _81D3F21: - fadetobg 4 + fadetobg BG_IMPACT_OPPONENT goto _81D3EA4 _81D3F28: - fadetobg 5 + fadetobg BG_IMPACT_PLAYER goto _81D3EA4 _81D3F2F: - fadetobg 6 + fadetobg BG_IMPACT_CONTESTS goto _81D3EA4 Move_RETURN: @ 81D3F36 - loadspritegfx 10135 + loadspritegfx ANIM_TAG_IMPACT monbg ANIM_BANK_DEF_PARTNER setalpha 12, 8 createvisualtask sub_81318F0, 2 @@ -9018,12 +9018,12 @@ _81D4371: return Move_COSMIC_POWER: @ 81D43C5 - loadspritegfx 10049 + loadspritegfx ANIM_TAG_SPARKLE_2 createvisualtask sub_812B340, 5, 243, 0 playsewithpan SE_W322, 0 createvisualtask sub_80E3A08, 2, 0, 0, 15, 0 waitforvisualfinish - fadetobg 16 + fadetobg BG_COSMIC waitbgfadeout createvisualtask sub_80E3A58, 2, 0, 128, 0, -1 waitbgfadein @@ -9037,17 +9037,17 @@ Move_COSMIC_POWER: @ 81D43C5 waitforvisualfinish restorebg waitbgfadeout - setarg 7, -1 + setarg ARG_RET_ID, -1 waitbgfadein waitforvisualfinish end Move_BLAST_BURN: @ 81D444A - loadspritegfx 10035 - loadspritegfx 10135 + loadspritegfx ANIM_TAG_FIRE_PLUME + loadspritegfx ANIM_TAG_IMPACT monbg ANIM_BANK_DEF_PARTNER setalpha 12, 8 - playsewithpan SE_W221, 192 + playsewithpan SE_W221, SOUND_PAN_ATTACKER createsprite gBattleAnimSpriteTemplate_83D9538, 2, -32, 0, 24, 0, 0, 0 createsprite gBattleAnimSpriteTemplate_83D9538, 2, -20, -10, 24, 0, 0, 0 createsprite gBattleAnimSpriteTemplate_83D9538, 66, 0, -16, 24, 0, 0, 0 @@ -9057,7 +9057,7 @@ Move_BLAST_BURN: @ 81D444A createsprite gBattleAnimSpriteTemplate_83D9538, 2, 0, 16, 24, 0, 0, 0 createsprite gBattleAnimSpriteTemplate_83D9538, 2, -20, 10, 24, 0, 0, 0 delay 25 - playsewithpan SE_W172B, 192 + playsewithpan SE_W172B, SOUND_PAN_ATTACKER createsprite gBattleAnimSpriteTemplate_83D9538, 2, -64, 0, 24, 0, 0, 0 createsprite gBattleAnimSpriteTemplate_83D9538, 6, -40, -20, 24, 0, 0, 0 createsprite gBattleAnimSpriteTemplate_83D9538, 70, 0, -32, 24, 0, 0, 0 @@ -9069,7 +9069,7 @@ Move_BLAST_BURN: @ 81D444A createsprite gBattleAnimSpriteTemplate_83D9538, 2, -40, 20, 24, 0, 0, 0 createvisualtask sub_80E2324, 2, 257, 257, 257 delay 25 - playsewithpan SE_W172B, 192 + playsewithpan SE_W172B, SOUND_PAN_ATTACKER createsprite gBattleAnimSpriteTemplate_83D9538, 2, -96, 0, 24, 0, 0, 0 createsprite gBattleAnimSpriteTemplate_83D9538, 6, -60, -30, 24, 0, 0, 0 createsprite gBattleAnimSpriteTemplate_83D9538, 70, 0, -48, 24, 0, 0, 0 @@ -9088,31 +9088,31 @@ Move_BLAST_BURN: @ 81D444A end Move_ROCK_TOMB: @ 81D468C - loadspritegfx 10250 - loadspritegfx 10058 + loadspritegfx ANIM_TAG_X_SIGN + loadspritegfx ANIM_TAG_ROCKS createvisualtask sub_80E26BC, 2, 2, 0, 10, 1 waitforvisualfinish createsprite gBattleAnimSpriteTemplate_83DADA8, 130, 20, 12, 64, 114, 0 delay 8 createvisualtask sub_80E26BC, 2, 0, 2, 3, 1 - playsewithpan SE_W070, 63 + playsewithpan SE_W070, SOUND_PAN_TARGET delay 8 createsprite gBattleAnimSpriteTemplate_83DADA8, 130, -20, 12, 64, 98, 0 delay 8 createvisualtask sub_80E26BC, 2, 0, 2, 3, 1 - playsewithpan SE_W070, 63 + playsewithpan SE_W070, SOUND_PAN_TARGET delay 8 createsprite gBattleAnimSpriteTemplate_83DADA8, 194, 3, 6, 64, 82, 0 delay 8 createvisualtask sub_80E26BC, 2, 0, 2, 3, 1 - playsewithpan SE_W070, 63 + playsewithpan SE_W070, SOUND_PAN_TARGET delay 8 createsprite gBattleAnimSpriteTemplate_83DADA8, 130, -3, 13, 64, 66, 0 delay 8 createvisualtask sub_80E26BC, 2, 0, 2, 3, 1 - playsewithpan SE_W070, 63 + playsewithpan SE_W070, SOUND_PAN_TARGET delay 24 - playsewithpan SE_W063, 63 + playsewithpan SE_W063, SOUND_PAN_TARGET createsprite gBattleAnimSpriteTemplate_83DA8F4, 133, 1, 50 createvisualtask AnimTask_ShakeMon, 5, 1, 3, 0, 20, 1 createvisualtask sub_80E26BC, 2, 2, 0, 10, 1 @@ -9120,8 +9120,8 @@ Move_ROCK_TOMB: @ 81D468C end Move_SILVER_WIND: @ 81D4773 - loadspritegfx 10271 - panse_1B SE_W016, 192, 63, 2, 0 + loadspritegfx ANIM_TAG_SPARKLE_6 + panse_1B SE_W016, SOUND_PAN_ATTACKER, SOUND_PAN_TARGET, 2, 0 playsewithpan SE_W234, 0 delay 0 monbg ANIM_BANK_DEF_PARTNER @@ -9130,7 +9130,7 @@ Move_SILVER_WIND: @ 81D4773 createvisualtask sub_80E2A7C, 10, 1, 0, 0, 4, 0 createvisualtask sub_80E3B78, 2 jumpargeq 7, 1, _81D4974 - fadetobg 22 + fadetobg BG_BUG_OPPONENT waitbgfadeout createvisualtask sub_80E3A58, 5, 1536, 0, 0, -1 _81D47BA: @@ -9161,36 +9161,36 @@ _81D47BA: createsprite gBattleAnimSpriteTemplate_83D696C, 194, -4, 16, 0, 6, 1, 2, 1 createsprite gBattleAnimSpriteTemplate_83D696C, 194, -16, 12, 192, 5, 2, 3, 1 waitforvisualfinish - playsewithpan SE_W016B, 63 + playsewithpan SE_W016B, SOUND_PAN_TARGET clearmonbg ANIM_BANK_DEF_PARTNER delay 0 restorebg waitbgfadeout createvisualtask sub_80E2A7C, 10, 1, 0, 4, 0, 0 - setarg 7, -1 + setarg ARG_RET_ID, -1 waitbgfadein end _81D4974: - fadetobg 23 + fadetobg BG_BUG_PLAYER waitbgfadeout createvisualtask sub_80E3A58, 5, -1536, 0, 0, -1 goto _81D47BA Move_SNATCH: @ 81D498B - playsewithpan SE_W036, 192 + playsewithpan SE_W036, SOUND_PAN_ATTACKER createvisualtask AnimTask_WindUpLunge, 5, ANIM_BANK_ATTACKER, -12, 4, 10, 10, 12, 6 end Move_DIVE: @ 81D49A5 - loadspritegfx 10272 - loadspritegfx 10273 + loadspritegfx ANIM_TAG_SPLASH + loadspritegfx ANIM_TAG_SWEAT_BEAD choosetwoturnanim _81D49B4, _81D4A09 _81D49B4: - loadspritegfx 10156 - playsewithpan SE_W029, 192 + loadspritegfx ANIM_TAG_ROUND_SHADOW + playsewithpan SE_W029, SOUND_PAN_ATTACKER createsprite gBattleAnimSpriteTemplate_83DA5D8, 2, 0, 0, 13, 336 waitforvisualfinish - playsewithpan SE_W291, 192 + playsewithpan SE_W291, SOUND_PAN_ATTACKER createsprite gBattleAnimSpriteTemplate_83DA614, 3, 0 call _81D49F2 call _81D49F2 @@ -9203,11 +9203,11 @@ _81D49F2: createsprite gBattleAnimSpriteTemplate_83DA62C, 5, 1, 0 return _81D4A09: - loadspritegfx 10148 - loadspritegfx 10155 + loadspritegfx ANIM_TAG_WATER_IMPACT + loadspritegfx ANIM_TAG_SMALL_BUBBLES monbg ANIM_BANK_DEF_PARTNER setalpha 12, 8 - playsewithpan SE_W153, 63 + playsewithpan SE_W153, SOUND_PAN_TARGET createsprite gBattleAnimSpriteTemplate_83DA614, 131, 1 call _81D4A48 call _81D4A48 @@ -9217,7 +9217,7 @@ _81D4A09: delay 12 call _81C9502 waitforvisualfinish - visible 0 + visible ANIM_BANK_ATTACKER clearmonbg ANIM_BANK_DEF_PARTNER blendoff end @@ -9227,15 +9227,15 @@ _81D4A48: return Move_ROCK_BLAST: @ 81D4A5F - loadspritegfx 10058 - loadspritegfx 10135 + loadspritegfx ANIM_TAG_ROCKS + loadspritegfx ANIM_TAG_IMPACT createsprite gHorizontalLungeSpriteTemplate, 2, 4, 6 delay 3 - playsewithpan SE_W207, 192 + playsewithpan SE_W207, SOUND_PAN_ATTACKER createsprite gBattleAnimSpriteTemplate_83DADE8, 130, 16, 0, 0, 0, 25, 257 waitforvisualfinish createsprite gBasicHitSplatSpriteTemplate, 131, 0, 0, 1, 1 - playsewithpan SE_W088, 63 + playsewithpan SE_W088, SOUND_PAN_TARGET createsprite gBattleAnimSpriteTemplate_83DAC64, 130, 0, 0, 20, 24, 14, 2 createvisualtask AnimTask_ShakeMon, 2, ANIM_BANK_TARGET, 3, 0, 5, 1 createsprite gBattleAnimSpriteTemplate_83DAC64, 130, 5, 0, -20, 24, 14, 1 @@ -9245,8 +9245,8 @@ Move_ROCK_BLAST: @ 81D4A5F end Move_OVERHEAT: @ 81D4AFC - loadspritegfx 10029 - loadspritegfx 10135 + loadspritegfx ANIM_TAG_SMALL_EMBER + loadspritegfx ANIM_TAG_IMPACT monbg ANIM_BANK_DEF_PARTNER setalpha 12, 18 createsprite gSimplePaletteBlendSpriteTemplate, 2, 1, 1, 0, 5, rgb(28, 0, 0) @@ -9255,13 +9255,13 @@ Move_OVERHEAT: @ 81D4AFC delay 1 createvisualtask sub_80E4178, 5, 0 delay 1 - playsewithpan SE_W082, 192 + playsewithpan SE_W082, SOUND_PAN_ATTACKER createvisualtask sub_80E4028, 5, 1, 0 delay 1 createsprite gSimplePaletteBlendSpriteTemplate, 2, 2, 1, 0, 13, rgb(28, 0, 0) createvisualtask AnimTask_ShakeMon, 5, 0, 2, 0, 15, 1 waitforvisualfinish - playsewithpan SE_W172B, 192 + playsewithpan SE_W172B, SOUND_PAN_ATTACKER createsprite gBattleAnimSpriteTemplate_83DB100, 2, 1, 0, 30, 25, -20 createsprite gBattleAnimSpriteTemplate_83DB100, 2, 1, 32, 30, 25, -20 createsprite gBattleAnimSpriteTemplate_83DB100, 2, 1, 64, 30, 25, -20 @@ -9291,17 +9291,17 @@ Move_OVERHEAT: @ 81D4AFC delay 5 waitforvisualfinish createsprite gBasicHitSplatSpriteTemplate, 131, -5, 3, 1, 0 - playsewithpan SE_W007, 63 + playsewithpan SE_W007, SOUND_PAN_TARGET createvisualtask AnimTask_ShakeMon, 2, ANIM_BANK_TARGET, 10, 0, 25, 1 delay 6 createsprite gBasicHitSplatSpriteTemplate, 131, 8, -5, 1, 0 - playsewithpan SE_W007, 63 + playsewithpan SE_W007, SOUND_PAN_TARGET delay 8 createsprite gBasicHitSplatSpriteTemplate, 131, 10, 10, 1, 0 - playsewithpan SE_W007, 63 + playsewithpan SE_W007, SOUND_PAN_TARGET delay 8 createsprite gBasicHitSplatSpriteTemplate, 131, 0, 0, 1, 0 - playsewithpan SE_W007, 63 + playsewithpan SE_W007, SOUND_PAN_TARGET createvisualtask sub_80E4178, 5, 1 delay 1 createsprite gSimplePaletteBlendSpriteTemplate, 2, 2, -1, 0, 13, rgb(18, 18, 18) @@ -9322,16 +9322,16 @@ Move_OVERHEAT: @ 81D4AFC end Move_HYDRO_CANNON: @ 81D4DDE - loadspritegfx 10149 - loadspritegfx 10148 + loadspritegfx ANIM_TAG_WATER_ORB + loadspritegfx ANIM_TAG_WATER_IMPACT monbg ANIM_BANK_DEF_PARTNER setalpha 12, 8 - playsewithpan SE_W057, 192 + playsewithpan SE_W057, SOUND_PAN_ATTACKER createsprite gBattleAnimSpriteTemplate_83D92D0, 130 delay 10 createvisualtask sub_80E2324, 2, 257, 257, 257 delay 30 - panse_1B SE_W056, 192, 63, 2, 0 + panse_1B SE_W056, SOUND_PAN_ATTACKER, SOUND_PAN_TARGET, 2, 0 call _81D4EA8 createvisualtask AnimTask_ShakeMon, 5, 1, 10, 0, 40, 1 createsprite gBattleAnimSpriteTemplate_83DB4D8, 130, 0, 0, 1, 0 @@ -9364,12 +9364,12 @@ _81D4EA8: return Move_ASTONISH: @ 81D4F10 - loadspritegfx 10273 - playsewithpan SE_W227, 192 + loadspritegfx ANIM_TAG_SWEAT_BEAD + playsewithpan SE_W227, SOUND_PAN_ATTACKER createsprite gHorizontalLungeSpriteTemplate, 2, 4, 6 delay 25 createsprite gBattleAnimSpriteTemplate_83DA62C, 133, 0, 1 - playsewithpan SE_W166, 63 + playsewithpan SE_W166, SOUND_PAN_TARGET createsprite gBattleAnimSpriteTemplate_83DA62C, 133, 1, 1 createvisualtask AnimTask_ShakeMon2, 2, ANIM_BANK_TARGET, 4, 0, 5, 1 createvisualtask sub_80D1E38, 3 @@ -9377,15 +9377,15 @@ Move_ASTONISH: @ 81D4F10 end Move_SEISMIC_TOSS: @ 81D4F58 - loadspritegfx 10135 - loadspritegfx 10058 - setarg 7, 0 + loadspritegfx ANIM_TAG_IMPACT + loadspritegfx ANIM_TAG_ROCKS + setarg ARG_RET_ID, 0 monbg ANIM_BANK_DEF_PARTNER setalpha 12, 8 waitforvisualfinish createvisualtask sub_80DDA4C, 3 delay 1 - fadetobg 17 + fadetobg BG_SEISMICTOSS_SKUUPPERCUT waitbgfadeout createvisualtask sub_80DDA8C, 3 playsewithpan SE_W327, 0 @@ -9398,7 +9398,7 @@ Move_SEISMIC_TOSS: @ 81D4F58 _81D4FA0: restorebg waitbgfadeout - setarg 7, 4095 + setarg ARG_RET_ID, 4095 waitbgfadein clearmonbg ANIM_BANK_DEF_PARTNER blendoff @@ -9426,7 +9426,7 @@ _81D4FD4: goto _81D4FA0 _81D4FF3: createsprite gBasicHitSplatSpriteTemplate, 131, -10, -8, 1, 1 - playsewithpan SE_W070, 63 + playsewithpan SE_W070, SOUND_PAN_TARGET createvisualtask AnimTask_ShakeMon, 2, ANIM_BANK_TARGET, 0, 3, 5, 1 createsprite gBattleAnimSpriteTemplate_83DAE00, 130, -12, 27, 2, 3 createsprite gBattleAnimSpriteTemplate_83DAE00, 130, 8, 28, 3, 4 @@ -9435,7 +9435,7 @@ _81D4FF3: return _81D5054: createsprite gBasicHitSplatSpriteTemplate, 131, 10, -8, 1, 1 - playsewithpan SE_W088, 63 + playsewithpan SE_W088, SOUND_PAN_TARGET createvisualtask AnimTask_ShakeMon, 2, ANIM_BANK_TARGET, 0, 3, 5, 1 createsprite gBattleAnimSpriteTemplate_83DAE00, 130, -12, 32, 3, 4 createsprite gBattleAnimSpriteTemplate_83DAE00, 130, 8, 31, 2, 2 @@ -9444,9 +9444,9 @@ _81D5054: return Move_MAGIC_COAT: @ 81D50B5 - loadspritegfx 10170 + loadspritegfx ANIM_TAG_ORANGE_LIGHT_WALL setalpha 0, 16 - waitplaysewithpan SE_W112, 192, 15 + waitplaysewithpan SE_W112, SOUND_PAN_ATTACKER, 15 createsprite gBattleAnimSpriteTemplate_83DA708, 3, 40, 0, 10170 waitforvisualfinish delay 1 @@ -9454,11 +9454,11 @@ Move_MAGIC_COAT: @ 81D50B5 end Move_WATER_PULSE: @ 81D50D2 - loadspritegfx 10155 - loadspritegfx 10288 + loadspritegfx ANIM_TAG_SMALL_BUBBLES + loadspritegfx ANIM_TAG_BLUE_RING_2 monbg ANIM_BANK_TARGET monbgprio_28 1 - playsewithpan SE_W145C, 192 + playsewithpan SE_W145C, SOUND_PAN_ATTACKER createsprite gSimplePaletteBlendSpriteTemplate, 2, 1, 0, 0, 7, rgb(0, 25, 28) delay 10 createsprite gBattleAnimSpriteTemplate_83D9408, 66, 100, 100, 8, 1, 20, 40, 0 @@ -9466,15 +9466,15 @@ Move_WATER_PULSE: @ 81D50D2 createsprite gBattleAnimSpriteTemplate_83D9408, 66, 200, 80, 8, 1, 40, 20, 0 createsprite gBattleAnimSpriteTemplate_83D9408, 66, 80, 60, 10, 3, 20, 50, 0 createsprite gBattleAnimSpriteTemplate_83D9408, 66, 140, 100, 16, 1, 20, 30, 1 - playsewithpan SE_W145C, 63 + playsewithpan SE_W145C, SOUND_PAN_TARGET waitforvisualfinish - playsewithpan SE_W202, 192 + playsewithpan SE_W202, SOUND_PAN_ATTACKER createsprite gBattleAnimSpriteTemplate_83D757C, 130, 0, 0, 40, 15 delay 5 - playsewithpan SE_W202, 192 + playsewithpan SE_W202, SOUND_PAN_ATTACKER createsprite gBattleAnimSpriteTemplate_83D757C, 130, 0, 0, 40, 15 delay 5 - playsewithpan SE_W202, 192 + playsewithpan SE_W202, SOUND_PAN_ATTACKER createsprite gBattleAnimSpriteTemplate_83D757C, 130, 0, 0, 40, 15 delay 13 createvisualtask AnimTask_ShakeMon, 2, ANIM_BANK_TARGET, 0, 8, 18, 1 @@ -9485,9 +9485,9 @@ Move_WATER_PULSE: @ 81D50D2 end Move_PSYCHO_BOOST: @ 81D51C7 - loadspritegfx 10212 + loadspritegfx ANIM_TAG_CIRCLE_OF_LIGHT monbg ANIM_BANK_ATK_PARTNER - fadetobg 3 + fadetobg BG_PSYCHIC waitbgfadeout createvisualtask sub_812C624, 5 waitbgfadein @@ -9498,13 +9498,13 @@ Move_PSYCHO_BOOST: @ 81D51C7 setalpha 8, 8 delay 10 createvisualtask AnimTask_ShakeMon, 2, ANIM_BANK_ATTACKER, 3, 0, 240, 0 - loopsewithpan SE_W060B, 192, 14, 10 + loopsewithpan SE_W060B, SOUND_PAN_ATTACKER, 14, 10 createsprite gBattleAnimSpriteTemplate_83DAA68, 2 delay 110 - loopsewithpan SE_W060B, 192, 7, 10 + loopsewithpan SE_W060B, SOUND_PAN_ATTACKER, 7, 10 waitforvisualfinish createvisualtask AnimTask_ShakeMon2, 2, ANIM_BANK_TARGET, -8, 1, 24, 1 - playsewithpan SE_W043, 63 + playsewithpan SE_W043, SOUND_PAN_TARGET waitforvisualfinish clearmonbg ANIM_BANK_ATK_PARTNER blendoff @@ -9512,16 +9512,16 @@ Move_PSYCHO_BOOST: @ 81D51C7 end Move_KNOCK_OFF: @ 81D523B - loadspritegfx 10277 - loadspritegfx 10135 + loadspritegfx ANIM_TAG_SLAM_HIT_2 + loadspritegfx ANIM_TAG_IMPACT createsprite gHorizontalLungeSpriteTemplate, 2, 4, 6 delay 4 - playsewithpan SE_W233, 63 + playsewithpan SE_W233, SOUND_PAN_TARGET createsprite gBattleAnimSpriteTemplate_8402AE4, 130, -16, -16 delay 8 createsprite gBattleAnimSpriteTemplate_83DB3DC, 2, 31, 5, 1, 32767, 10, 0, 0 createsprite gBasicHitSplatSpriteTemplate, 131, 0, 0, 1, 2 - playsewithpan SE_W004, 63 + playsewithpan SE_W004, SOUND_PAN_TARGET createsprite gSlideMonToOffsetSpriteTemplate, 2, 1, -12, 10, 0, 3 createsprite gSlideMonToOriginalPosSpriteTemplate, 2, 0, 0, 5 delay 3 @@ -9540,7 +9540,7 @@ Move_DOOM_DESIRE: @ 81D52CB createsprite gSimplePaletteBlendSpriteTemplate, 2, 1, 1, 0, 4, rgb(0, 0, 0) waitforvisualfinish setalpha 8, 8 - playsewithpan SE_W060, 192 + playsewithpan SE_W060, SOUND_PAN_ATTACKER createvisualtask AnimTask_ScaleMonAndRestore, 5, -4, -4, 15, ANIM_BANK_ATTACKER, 1 waitforvisualfinish delay 20 @@ -9552,32 +9552,32 @@ Move_DOOM_DESIRE: @ 81D52CB end Move_DOOM_DESIRE_Activate: @ 81D532F - loadspritegfx 10198 + loadspritegfx ANIM_TAG_EXPLOSION createsprite gSimplePaletteBlendSpriteTemplate, 2, 1, 3, 0, 16, rgb(31, 31, 31) waitforvisualfinish delay 10 createvisualtask sub_812E14C, 5 delay 5 - playsewithpan SE_W109, 192 + playsewithpan SE_W109, SOUND_PAN_ATTACKER delay 10 playsewithpan SE_W109, 0 delay 10 - playsewithpan SE_W109, 63 + playsewithpan SE_W109, SOUND_PAN_TARGET delay 23 createvisualtask AnimTask_ShakeMonInPlace, 2, ANIM_BANK_TARGET, 10, 0, 20, 1 - playsewithpan SE_W120, 63 + playsewithpan SE_W120, SOUND_PAN_TARGET createsprite gBattleAnimSpriteTemplate_83D7828, 3, 0, 0, 1, 1 delay 6 - playsewithpan SE_W120, 63 + playsewithpan SE_W120, SOUND_PAN_TARGET createsprite gBattleAnimSpriteTemplate_83D7828, 3, 24, -24, 1, 1 delay 6 - playsewithpan SE_W120, 63 + playsewithpan SE_W120, SOUND_PAN_TARGET createsprite gBattleAnimSpriteTemplate_83D7828, 3, -16, 16, 1, 1 delay 6 - playsewithpan SE_W120, 63 + playsewithpan SE_W120, SOUND_PAN_TARGET createsprite gBattleAnimSpriteTemplate_83D7828, 3, -24, -12, 1, 1 delay 6 - playsewithpan SE_W120, 63 + playsewithpan SE_W120, SOUND_PAN_TARGET createsprite gBattleAnimSpriteTemplate_83D7828, 3, 16, 16, 1, 1 waitforvisualfinish createsprite gSimplePaletteBlendSpriteTemplate, 2, 1, 3, 16, 0, rgb(31, 31, 31) @@ -9585,12 +9585,12 @@ Move_DOOM_DESIRE_Activate: @ 81D532F end Move_SKY_UPPERCUT: @ 81D53ED - loadspritegfx 10135 + loadspritegfx ANIM_TAG_IMPACT monbg ANIM_BANK_DEF_PARTNER monbgprio_28 1 - fadetobg 17 + fadetobg BG_SEISMICTOSS_SKUUPPERCUT waitbgfadeout - playsewithpan SE_W327, 192 + playsewithpan SE_W327, SOUND_PAN_ATTACKER createvisualtask sub_80D9C80, 5, 55 waitbgfadein setalpha 12, 8 @@ -9598,20 +9598,20 @@ Move_SKY_UPPERCUT: @ 81D53ED createsprite gSlideMonToOffsetSpriteTemplate, 2, 0, 28, 0, 0, 5 delay 4 createvisualtask AnimTask_ShakeMon2, 2, ANIM_BANK_TARGET, 4, 0, 6, 1 - playsewithpan SE_W233B, 63 + playsewithpan SE_W233B, SOUND_PAN_TARGET createsprite gBasicHitSplatSpriteTemplate, 131, -28, 28, 1, 1 delay 1 - playsewithpan SE_W233B, 63 + playsewithpan SE_W233B, SOUND_PAN_TARGET createsprite gBasicHitSplatSpriteTemplate, 131, -15, 8, 1, 1 - playsewithpan SE_W233B, 63 + playsewithpan SE_W233B, SOUND_PAN_TARGET delay 1 - playsewithpan SE_W233B, 63 + playsewithpan SE_W233B, SOUND_PAN_TARGET createsprite gBasicHitSplatSpriteTemplate, 131, -5, -12, 1, 1 delay 1 - playsewithpan SE_W233B, 63 + playsewithpan SE_W233B, SOUND_PAN_TARGET createsprite gBasicHitSplatSpriteTemplate, 131, 0, -32, 1, 1 delay 1 - playsewithpan SE_W233B, 63 + playsewithpan SE_W233B, SOUND_PAN_TARGET createsprite gBasicHitSplatSpriteTemplate, 131, 5, -52, 1, 1 createsprite gSlideMonToOffsetSpriteTemplate, 2, 1, -26, 16, 1, 4 delay 4 @@ -9624,7 +9624,7 @@ Move_SKY_UPPERCUT: @ 81D53ED blendoff restorebg waitbgfadeout - setarg 7, -1 + setarg ARG_RET_ID, -1 waitbgfadein end @@ -9642,12 +9642,12 @@ Move_SECRET_POWER: @ 81D54E6 goto Move_SLAM Move_TWISTER: @ 81D553A - loadspritegfx 10063 - loadspritegfx 10135 - loadspritegfx 10058 + loadspritegfx ANIM_TAG_LEAF + loadspritegfx ANIM_TAG_IMPACT + loadspritegfx ANIM_TAG_ROCKS monbg ANIM_BANK_DEF_PARTNER monbgprio_28 1 - playsewithpan SE_W239, 63 + playsewithpan SE_W239, SOUND_PAN_TARGET createsprite gBattleAnimSpriteTemplate_83D64B4, 130, 120, 70, 5, 70, 30 delay 1 createsprite gBattleAnimSpriteTemplate_83D64B4, 130, 115, 55, 6, 60, 25 @@ -9670,31 +9670,31 @@ Move_TWISTER: @ 81D553A createsprite gBattleAnimSpriteTemplate_83D64B4, 130, 110, 10, 8, 32, 20 waitforvisualfinish createsprite gBasicHitSplatSpriteTemplate, 131, -32, -16, 1, 3 - playsewithpan SE_W004, 63 + playsewithpan SE_W004, SOUND_PAN_TARGET 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 + playsewithpan SE_W004, SOUND_PAN_TARGET delay 4 createsprite gBattleAnimSpriteTemplate_83DB4F0, 131, 1, 3 - playsewithpan SE_W004, 63 + playsewithpan SE_W004, SOUND_PAN_TARGET delay 4 createsprite gBasicHitSplatSpriteTemplate, 131, 32, 20, 1, 3 - playsewithpan SE_W004, 63 + playsewithpan SE_W004, SOUND_PAN_TARGET waitforvisualfinish clearmonbg ANIM_BANK_DEF_PARTNER blendoff end Move_MAGICAL_LEAF: @ 81D5699 - loadspritegfx 10063 - loadspritegfx 10160 - loadspritegfx 10135 + loadspritegfx ANIM_TAG_LEAF + loadspritegfx ANIM_TAG_RAZOR_LEAF + loadspritegfx ANIM_TAG_IMPACT monbg ANIM_BANK_DEF_PARTNER setalpha 12, 8 delay 1 - loopsewithpan SE_W077, 192, 10, 5 + loopsewithpan SE_W077, SOUND_PAN_ATTACKER, 10, 5 createvisualtask sub_80CC5F8, 5 createsprite gBattleAnimSpriteTemplate_83D649C, 2, -3, -2, 10 delay 2 @@ -9716,31 +9716,31 @@ Move_MAGICAL_LEAF: @ 81D5699 delay 2 createsprite gBattleAnimSpriteTemplate_83D649C, 2, -3, -5, 8 delay 60 - playsewithpan SE_W013B, 192 + playsewithpan SE_W013B, SOUND_PAN_ATTACKER createsprite gBattleAnimSpriteTemplate_83D64E4, 131, 20, -10, 20, 0, 32, 20, 0 createsprite gBattleAnimSpriteTemplate_83D64E4, 131, 20, -10, 20, 0, 32, -20, 0 delay 30 - playsewithpan SE_W013, 63 + playsewithpan SE_W013, SOUND_PAN_TARGET createsprite gBasicHitSplatSpriteTemplate, 132, -10, -4, 1, 2 createsprite gBasicHitSplatSpriteTemplate, 132, 10, 4, 1, 2 createvisualtask AnimTask_ShakeMon2, 2, ANIM_BANK_TARGET, 2, 0, 8, 1 delay 20 - setarg 7, -1 + setarg ARG_RET_ID, -1 waitforvisualfinish clearmonbg ANIM_BANK_DEF_PARTNER blendoff end Move_ICE_BALL: @ 81D57BA - loadspritegfx 10043 - loadspritegfx 10141 + loadspritegfx ANIM_TAG_ICE_CHUNK + loadspritegfx ANIM_TAG_ICE_CRYSTALS createvisualtask AnimTask_CountIceBallThrows, 5, 0 jumpargeq 0, 4, _81D5831 _81D57D1: - playsewithpan SE_W196, 192 + playsewithpan SE_W196, SOUND_PAN_ATTACKER createsprite gIceBallSpriteTemplate, 130, 15, 0, -12, -16, 30, -40 delay 28 - playsewithpan SE_W280, 63 + playsewithpan SE_W280, SOUND_PAN_TARGET createvisualtask AnimTask_CountIceBallThrows, 5, 0 jumpargeq 0, 0, _81D5842 jumpargeq 0, 1, _81D5871 @@ -9753,7 +9753,7 @@ _81D581F: _81D5830: end _81D5831: - fadetobg 15 + fadetobg BG_ICE goto _81D57D1 _81D5838: waitbgfadein @@ -9822,10 +9822,10 @@ _81D597D: return Move_WEATHER_BALL: @ 81D5989 - loadspritegfx 10283 + loadspritegfx ANIM_TAG_WEATHER_BALL createsprite gVerticalDipSpriteTemplate, 2, 8, 1, ANIM_BANK_ATTACKER delay 8 - playsewithpan SE_W207, 192 + playsewithpan SE_W207, SOUND_PAN_ATTACKER createsprite gBattleAnimSpriteTemplate_83930A8, 2 waitforvisualfinish delay 15 @@ -9840,56 +9840,56 @@ Move_WEATHER_BALL: @ 81D5989 jumpargeq 7, 3, _81D5AF9 jumpargeq 7, 4, _81D5B99 _81D59F4: - loadspritegfx 10135 + loadspritegfx ANIM_TAG_IMPACT createsprite gBattleAnimSpriteTemplate_83930C0, 130, -30, -100, 25, 1, 0, 0 waitforvisualfinish - playsewithpan SE_W025B, 63 + playsewithpan SE_W025B, SOUND_PAN_TARGET createsprite gBasicHitSplatSpriteTemplate, 132, -10, 0, 1, 2 createvisualtask AnimTask_ShakeMon, 2, ANIM_BANK_TARGET, 0, 3, 8, 1 waitforvisualfinish end _81D5A31: - loadspritegfx 10029 + loadspritegfx ANIM_TAG_SMALL_EMBER createsprite gBattleAnimSpriteTemplate_83D96AC, 130, -30, -100, 25, 1, 40, 10 - playsewithpan SE_W172, 63 + playsewithpan SE_W172, SOUND_PAN_TARGET delay 10 createsprite gBattleAnimSpriteTemplate_83D96AC, 130, -30, -100, 25, 1, -40, 20 - playsewithpan SE_W172, 63 + playsewithpan SE_W172, SOUND_PAN_TARGET delay 10 createsprite gBattleAnimSpriteTemplate_83D96AC, 130, -30, -100, 25, 1, 0, 0 - playsewithpan SE_W172, 63 + playsewithpan SE_W172, SOUND_PAN_TARGET waitforvisualfinish - playsewithpan SE_W172B, 63 + playsewithpan SE_W172B, SOUND_PAN_TARGET createvisualtask AnimTask_ShakeMon, 2, ANIM_BANK_TARGET, 0, 3, 8, 1 waitforvisualfinish end _81D5A95: - loadspritegfx 10155 + loadspritegfx ANIM_TAG_SMALL_BUBBLES createsprite gBattleAnimSpriteTemplate_83D9438, 130, -30, -100, 25, 1, 50, 10 - playsewithpan SE_W152, 63 + playsewithpan SE_W152, SOUND_PAN_TARGET delay 8 createsprite gBattleAnimSpriteTemplate_83D9438, 130, -30, -100, 25, 1, -20, 20 - playsewithpan SE_W152, 63 + playsewithpan SE_W152, SOUND_PAN_TARGET delay 13 createsprite gBattleAnimSpriteTemplate_83D9438, 130, -30, -100, 25, 1, 0, 0 - playsewithpan SE_W152, 63 + playsewithpan SE_W152, SOUND_PAN_TARGET waitforvisualfinish createvisualtask AnimTask_ShakeMon, 2, ANIM_BANK_TARGET, 0, 3, 8, 1 - playsewithpan SE_W202, 63 + playsewithpan SE_W202, SOUND_PAN_TARGET waitforvisualfinish end _81D5AF9: - loadspritegfx 10058 + loadspritegfx ANIM_TAG_ROCKS createsprite gBattleAnimSpriteTemplate_83DAE30, 130, -30, -100, 25, 1, 30, 0 - playsewithpan SE_W088, 63 + playsewithpan SE_W088, SOUND_PAN_TARGET delay 5 createsprite gBattleAnimSpriteTemplate_83DAE30, 130, -30, -100, 25, 1, -40, 20 - playsewithpan SE_W088, 63 + playsewithpan SE_W088, SOUND_PAN_TARGET delay 14 createsprite gBattleAnimSpriteTemplate_83DAE30, 130, -30, -100, 25, 1, 0, 0 - playsewithpan SE_W088, 63 + playsewithpan SE_W088, SOUND_PAN_TARGET waitforvisualfinish - playsewithpan SE_W070, 63 + playsewithpan SE_W070, SOUND_PAN_TARGET createsprite gBattleAnimSpriteTemplate_83DAE00, 130, -12, 27, 2, 3 createsprite gBattleAnimSpriteTemplate_83DAE00, 130, 8, 28, 3, 4 createsprite gBattleAnimSpriteTemplate_83DAE00, 130, -4, 30, 2, 3 @@ -9898,28 +9898,28 @@ _81D5AF9: waitforvisualfinish end _81D5B99: - loadspritegfx 10263 - loadspritegfx 10141 + loadspritegfx ANIM_TAG_HAIL + loadspritegfx ANIM_TAG_ICE_CRYSTALS createsprite gWeatherBallHailSpriteTemplate, 130, -30, -100, 25, 25, -40, 20 - playsewithpan SE_W258, 63 + playsewithpan SE_W258, SOUND_PAN_TARGET delay 10 createsprite gWeatherBallHailSpriteTemplate, 130, -30, -100, 25, 25, 40, 0 - playsewithpan SE_W258, 63 + playsewithpan SE_W258, SOUND_PAN_TARGET delay 10 createsprite gWeatherBallHailSpriteTemplate, 130, -30, -100, 25, 25, 0, 0 - playsewithpan SE_W258, 63 + playsewithpan SE_W258, SOUND_PAN_TARGET waitforvisualfinish createvisualtask AnimTask_ShakeMon2, 2, ANIM_BANK_TARGET, 2, 0, 8, 1 - playsewithpan SE_W196, 63 + playsewithpan SE_W196, SOUND_PAN_TARGET call Effect_LightIceDamage waitforvisualfinish end PoundCopy: @ 81D5C05 - loadspritegfx 10135 + loadspritegfx ANIM_TAG_IMPACT monbg ANIM_BANK_TARGET setalpha 12, 8 - playsewithpan SE_W003, 63 + playsewithpan SE_W003, SOUND_PAN_TARGET createsprite gBasicHitSplatSpriteTemplate, 2, 0, 0, 1, 2 createvisualtask AnimTask_ShakeMon, 2, ANIM_BANK_TARGET, 3, 0, 6, 1 waitforvisualfinish @@ -9929,64 +9929,64 @@ PoundCopy: @ 81D5C05 Effect_LightIceDamage: @ 81D5C36 createsprite gLargeIceEffectParticleSpriteTemplate, 130, -10, -10, 0 - playsewithpan SE_W196, 63 + playsewithpan SE_W196, SOUND_PAN_TARGET delay 4 createsprite gSmallIceEffectParticleSpriteTemplate, 130, 10, 20, 0 - playsewithpan SE_W196, 63 + playsewithpan SE_W196, SOUND_PAN_TARGET delay 4 createsprite gLargeIceEffectParticleSpriteTemplate, 130, -5, 10, 0 - playsewithpan SE_W196, 63 + playsewithpan SE_W196, SOUND_PAN_TARGET delay 4 createsprite gSmallIceEffectParticleSpriteTemplate, 130, 17, -12, 0 - playsewithpan SE_W196, 63 + playsewithpan SE_W196, SOUND_PAN_TARGET delay 4 createsprite gSmallIceEffectParticleSpriteTemplate, 130, -15, 15, 0 - playsewithpan SE_W196, 63 + playsewithpan SE_W196, SOUND_PAN_TARGET delay 4 createsprite gSmallIceEffectParticleSpriteTemplate, 130, 0, 0, 0 - playsewithpan SE_W196, 63 + playsewithpan SE_W196, SOUND_PAN_TARGET delay 4 createsprite gLargeIceEffectParticleSpriteTemplate, 130, 20, 2, 0 - playsewithpan SE_W196, 63 + playsewithpan SE_W196, SOUND_PAN_TARGET return Effect_HeavyIceDamage: @ 81D5CBA createsprite gLargeIceEffectParticleSpriteTemplate, 130, -10, -10, 1 - playsewithpan SE_W196, 63 + playsewithpan SE_W196, SOUND_PAN_TARGET delay 4 createsprite gSmallIceEffectParticleSpriteTemplate, 130, 10, 20, 1 - playsewithpan SE_W196, 63 + playsewithpan SE_W196, SOUND_PAN_TARGET delay 4 createsprite gLargeIceEffectParticleSpriteTemplate, 130, -29, 0, 1 - playsewithpan SE_W196, 63 + playsewithpan SE_W196, SOUND_PAN_TARGET delay 4 createsprite gSmallIceEffectParticleSpriteTemplate, 130, 29, -20, 1 - playsewithpan SE_W196, 63 + playsewithpan SE_W196, SOUND_PAN_TARGET delay 4 createsprite gLargeIceEffectParticleSpriteTemplate, 130, -5, 10, 1 - playsewithpan SE_W196, 63 + playsewithpan SE_W196, SOUND_PAN_TARGET delay 4 createsprite gSmallIceEffectParticleSpriteTemplate, 130, 17, -12, 1 - playsewithpan SE_W196, 63 + playsewithpan SE_W196, SOUND_PAN_TARGET delay 4 createsprite gLargeIceEffectParticleSpriteTemplate, 130, -20, 0, 1 - playsewithpan SE_W196, 63 + playsewithpan SE_W196, SOUND_PAN_TARGET delay 4 createsprite gSmallIceEffectParticleSpriteTemplate, 130, -15, 15, 1 - playsewithpan SE_W196, 63 + playsewithpan SE_W196, SOUND_PAN_TARGET delay 4 createsprite gSmallIceEffectParticleSpriteTemplate, 130, 26, -5, 1 - playsewithpan SE_W196, 63 + playsewithpan SE_W196, SOUND_PAN_TARGET delay 4 createsprite gSmallIceEffectParticleSpriteTemplate, 130, 0, 0, 1 - playsewithpan SE_W196, 63 + playsewithpan SE_W196, SOUND_PAN_TARGET delay 4 createsprite gLargeIceEffectParticleSpriteTemplate, 130, 20, 2, 1 - playsewithpan SE_W196, 63 + playsewithpan SE_W196, SOUND_PAN_TARGET return Unknown_81D5D8A: @ 81D5D8A - loopsewithpan SE_W196, 63, 6, 4 + loopsewithpan SE_W196, SOUND_PAN_TARGET, 6, 4 createsprite gIceSpikeSpriteTemplate, 130, 0, 24, 0 delay 4 createsprite gIceSpikeSpriteTemplate, 130, 8, 24, 0 @@ -10003,7 +10003,7 @@ Unknown_81D5D8A: @ 81D5D8A return Unknown_81D5E0E: @ 81D5E0E Icy Wind animates end bit with the wavy shiz - loopsewithpan SE_W196, 63, 6, 4 + loopsewithpan SE_W196, SOUND_PAN_TARGET, 6, 4 createsprite gIceSpikeSpriteTemplate, 130, 0, 24, 1 delay 4 createsprite gIceSpikeSpriteTemplate, 130, 8, 24, 1 @@ -10033,7 +10033,7 @@ Unknown_81D5ECA: @ 81D5ECA return Unknown_81D5EF5: @ 81D5EF5 - playsewithpan SE_W071B, 192 + playsewithpan SE_W071B, SOUND_PAN_ATTACKER createsprite gBattleAnimSpriteTemplate_83D7038, 2, 0, -5, 0, 0 delay 7 createsprite gBattleAnimSpriteTemplate_83D7038, 2, -15, 10, 0, 0 @@ -10045,7 +10045,7 @@ Unknown_81D5EF5: @ 81D5EF5 return Unknown_81D5F3E: @ 81D5F3E - playsewithpan SE_W071B, 63 + playsewithpan SE_W071B, SOUND_PAN_TARGET createsprite gBattleAnimSpriteTemplate_83D7038, 130, 0, -5, 1, 0 delay 7 createsprite gBattleAnimSpriteTemplate_83D7038, 130, -15, 10, 1, 0 @@ -10058,72 +10058,72 @@ Unknown_81D5F3E: @ 81D5F3E PoisonBubblesAnim: @ 81D5F87 createsprite gPoisonBubbleSpriteTemplate, 130, 10, 10, 0 - playsewithpan SE_W092, 63 + playsewithpan SE_W092, SOUND_PAN_TARGET delay 6 createsprite gPoisonBubbleSpriteTemplate, 130, 20, -20, 0 - playsewithpan SE_W092, 63 + playsewithpan SE_W092, SOUND_PAN_TARGET delay 6 createsprite gPoisonBubbleSpriteTemplate, 130, -20, 15, 0 - playsewithpan SE_W092, 63 + playsewithpan SE_W092, SOUND_PAN_TARGET delay 6 createsprite gPoisonBubbleSpriteTemplate, 130, 0, 0, 0 - playsewithpan SE_W092, 63 + playsewithpan SE_W092, SOUND_PAN_TARGET delay 6 createsprite gPoisonBubbleSpriteTemplate, 130, -20, -20, 0 - playsewithpan SE_W092, 63 + playsewithpan SE_W092, SOUND_PAN_TARGET delay 6 createsprite gPoisonBubbleSpriteTemplate, 130, 16, -8, 0 - playsewithpan SE_W092, 63 + playsewithpan SE_W092, SOUND_PAN_TARGET return WaterBubbleEffect: @ 81D5FF8 createsprite gWaterBubbleSpriteTemplate, 2, 10, 10, 0 - playsewithpan SE_W145C, 63 + playsewithpan SE_W145C, SOUND_PAN_TARGET delay 6 createsprite gWaterBubbleSpriteTemplate, 2, 20, -20, 0 - playsewithpan SE_W145C, 63 + playsewithpan SE_W145C, SOUND_PAN_TARGET delay 6 createsprite gWaterBubbleSpriteTemplate, 2, -20, 15, 0 - playsewithpan SE_W145C, 63 + playsewithpan SE_W145C, SOUND_PAN_TARGET delay 6 createsprite gWaterBubbleSpriteTemplate, 2, 0, 0, 0 - playsewithpan SE_W145C, 63 + playsewithpan SE_W145C, SOUND_PAN_TARGET delay 6 createsprite gWaterBubbleSpriteTemplate, 2, -20, -20, 0 - playsewithpan SE_W145C, 63 + playsewithpan SE_W145C, SOUND_PAN_TARGET delay 6 createsprite gWaterBubbleSpriteTemplate, 2, 16, -8, 0 - playsewithpan SE_W145C, 63 + playsewithpan SE_W145C, SOUND_PAN_TARGET return WaterBubbleEffect2: @ 81D6069 createsprite gWaterBubbleSpriteTemplate, 2, 10, 10, 1 - playsewithpan SE_W145C, 63 + playsewithpan SE_W145C, SOUND_PAN_TARGET delay 6 createsprite gWaterBubbleSpriteTemplate, 2, -28, -10, 1 - playsewithpan SE_W145C, 63 + playsewithpan SE_W145C, SOUND_PAN_TARGET delay 6 createsprite gWaterBubbleSpriteTemplate, 2, 20, -20, 1 - playsewithpan SE_W145C, 63 + playsewithpan SE_W145C, SOUND_PAN_TARGET delay 6 createsprite gWaterBubbleSpriteTemplate, 2, -20, 15, 1 - playsewithpan SE_W145C, 63 + playsewithpan SE_W145C, SOUND_PAN_TARGET delay 6 createsprite gWaterBubbleSpriteTemplate, 2, 0, 0, 1 - playsewithpan SE_W145C, 63 + playsewithpan SE_W145C, SOUND_PAN_TARGET delay 6 createsprite gWaterBubbleSpriteTemplate, 2, 27, 8, 1 - playsewithpan SE_W145C, 63 + playsewithpan SE_W145C, SOUND_PAN_TARGET delay 6 createsprite gWaterBubbleSpriteTemplate, 2, -20, -20, 1 - playsewithpan SE_W145C, 63 + playsewithpan SE_W145C, SOUND_PAN_TARGET delay 6 createsprite gWaterBubbleSpriteTemplate, 2, 16, -8, 1 - playsewithpan SE_W145C, 63 + playsewithpan SE_W145C, SOUND_PAN_TARGET return ElectricityEffect: @ 81D6100 - playsewithpan SE_W085B, 63 + playsewithpan SE_W085B, SOUND_PAN_TARGET createsprite gElectricitySpriteTemplate, 130, 5, 0, 5, 0 delay 2 createsprite gElectricitySpriteTemplate, 130, -5, 10, 5, 1 @@ -10142,7 +10142,7 @@ ElectricityEffect: @ 81D6100 return ConfusionEffect: @ 81D618B - loopsewithpan SE_W146, 63, 13, 6 + loopsewithpan SE_W146, SOUND_PAN_TARGET, 13, 6 createsprite gConfusionDuckSpriteTemplate, 130, 0, -15, 0, 3, 90 createsprite gConfusionDuckSpriteTemplate, 130, 0, -15, 51, 3, 90 createsprite gConfusionDuckSpriteTemplate, 130, 0, -15, 102, 3, 90 @@ -10151,7 +10151,7 @@ ConfusionEffect: @ 81D618B return Unknown_81D61E7: @ 81D61E7 - fadetobg 3 + fadetobg BG_PSYCHIC waitbgfadeout createvisualtask sub_812C560, 5 waitbgfadein @@ -10160,20 +10160,20 @@ Unknown_81D61E7: @ 81D61E7 Unknown_81D61F3: @ 81D61F3 restorebg waitbgfadeout - setarg 7, -1 + setarg ARG_RET_ID, -1 waitbgfadein return Unknown_81D61FB: @ 81D61FB jumpifcontest _81D6214 - fadetobg 18 + fadetobg BG_FLYING waitbgfadeout createvisualtask sub_80E3A58, 5, -2304, 768, 1, -1 _81D6212: waitbgfadein return _81D6214: - fadetobg 19 + fadetobg BG_FLYING_CONTESTS waitbgfadeout createvisualtask sub_80E3A58, 5, 2304, 768, 0, -1 goto _81D6212 @@ -10181,7 +10181,7 @@ _81D6214: Unknown_81D622B: @ 81D622B restorebg waitbgfadeout - setarg 7, -1 + setarg ARG_RET_ID, -1 waitbgfadein return @@ -10197,15 +10197,15 @@ Unknown_81D6256: @ 81D6256 return Unknown_81D6258: @ 81D6258 - fadetobg 26 + fadetobg BG_SOLARBEAM_CONTESTS goto Unknown_81D6256 Unknown_81D625F: @ 81D625F - fadetobg 25 + fadetobg BG_SOLARBEAM_PLAYER goto Unknown_81D6256 Unknown_81D6266: @ 81D6266 - fadetobg 24 + fadetobg BG_SOLARBEAM_OPPONENT goto Unknown_81D6256 Unknown_81D626D: @ 81D626D @@ -10214,19 +10214,19 @@ Unknown_81D626D: @ 81D626D return StatusCondition_Poison: @ 81D6270 - loopsewithpan SE_W092, 63, 13, 6 + loopsewithpan SE_W092, SOUND_PAN_TARGET, 13, 6 createvisualtask AnimTask_ShakeMon2, 2, ANIM_BANK_ATTACKER, 1, 0, 18, 2 createvisualtask sub_80E1F8C, 2, 2, 2, 2, 0, 12, 31774 end StatusCondition_Confusion: @ 81D629B - loadspritegfx 10073 + loadspritegfx ANIM_TAG_DUCK call ConfusionEffect end StatusCondition_Burn: @ 81D62A4 - loadspritegfx 10029 - playsewithpan SE_W172, 63 + loadspritegfx ANIM_TAG_SMALL_EMBER + playsewithpan SE_W172, SOUND_PAN_TARGET call _81D62BC call _81D62BC call _81D62BC @@ -10238,46 +10238,46 @@ _81D62BC: return StatusCondition_Love: @ 81D62D4 - loadspritegfx 10210 - playsewithpan SE_W204, 192 + loadspritegfx ANIM_TAG_MAGENTA_HEART + playsewithpan SE_W204, SOUND_PAN_ATTACKER createsprite gBattleAnimSpriteTemplate_83D7A80, 3, 0, 20 delay 15 - playsewithpan SE_W204, 192 + playsewithpan SE_W204, SOUND_PAN_ATTACKER createsprite gBattleAnimSpriteTemplate_83D7A80, 3, -20, 20 delay 15 - playsewithpan SE_W204, 192 + playsewithpan SE_W204, SOUND_PAN_ATTACKER createsprite gBattleAnimSpriteTemplate_83D7A80, 3, 20, 20 end StatusCondition_Sleep: @ 81D6309 - loadspritegfx 10228 - playsewithpan SE_W173, 192 + loadspritegfx ANIM_TAG_LETTER_Z + playsewithpan SE_W173, SOUND_PAN_ATTACKER createsprite gBattleAnimSpriteTemplate_83D6D94, 2, 4, -10, 16, 0, 0 delay 30 createsprite gBattleAnimSpriteTemplate_83D6D94, 2, 4, -10, 16, 0, 0 end StatusCondition_Paralysis: @ 81D6335 - loadspritegfx 10011 + loadspritegfx ANIM_TAG_SPARK_2 createvisualtask AnimTask_ShakeMon2, 2, ANIM_BANK_ATTACKER, 1, 0, 10, 1 call ElectricityEffect end StatusCondition_Ice: @ 81D634F playsewithpan SE_W196, 0 - loadspritegfx 10010 + loadspritegfx ANIM_TAG_ICE_CUBE monbg ANIM_BANK_DEF_PARTNER monbgprio_28 1 - waitplaysewithpan SE_W258, 63, 17 + waitplaysewithpan SE_W258, SOUND_PAN_TARGET, 17 createvisualtask sub_807B920, 2 waitforvisualfinish clearmonbg ANIM_BANK_DEF_PARTNER end StatusCondition_Curse: @ 81D636A - loadspritegfx 10200 + loadspritegfx ANIM_TAG_GHOSTLY_SPIRIT monbg ANIM_BANK_DEF_PARTNER - playsewithpan SE_W171, 63 + playsewithpan SE_W171, SOUND_PAN_TARGET createsprite gBattleAnimSpriteTemplate_83DAF38, 130 createvisualtask AnimTask_ShakeMon2, 2, ANIM_BANK_TARGET, 2, 0, 14, 1 waitforvisualfinish @@ -10285,9 +10285,9 @@ StatusCondition_Curse: @ 81D636A end StatusCondition_Nightmare: @ 81D638F - loadspritegfx 10221 + loadspritegfx ANIM_TAG_DEVIL monbg ANIM_BANK_DEF_PARTNER - playsewithpan SE_W171, 63 + playsewithpan SE_W171, SOUND_PAN_TARGET createsprite gBattleAnimSpriteTemplate_83DAF50, 130 createvisualtask AnimTask_ShakeMon2, 2, ANIM_BANK_TARGET, 2, 0, 14, 1 waitforvisualfinish @@ -10300,8 +10300,8 @@ General_CastformChange: @ 81D63B4 goto _81D63C8 _81D63C8: monbg ANIM_BANK_ATTACKER - playsewithpan SE_W100, 192 - waitplaysewithpan SE_W107, 192, 48 + playsewithpan SE_W100, SOUND_PAN_ATTACKER + waitplaysewithpan SE_W107, SOUND_PAN_ATTACKER, 48 createvisualtask sub_812D7E8, 2, 1 waitforvisualfinish clearmonbg ANIM_BANK_ATTACKER @@ -10336,17 +10336,17 @@ General_PokeblockThrow: @ 81D6438 createvisualtask sub_8141D7C, 2 createvisualtask sub_8141BD4, 2 delay 0 - waitplaysewithpan SE_W026, 192, 22 + waitplaysewithpan SE_W026, SOUND_PAN_ATTACKER, 22 createsprite gBattleAnimSpriteTemplate_840B4FC, 131, -16, 7, 0, 32 delay 50 - loopsewithpan SE_W039, 63, 19, 2 + loopsewithpan SE_W039, SOUND_PAN_TARGET, 19, 2 createvisualtask AnimTask_SwayMon, 5, 1, 8, 1536, 2, 1 waitforvisualfinish createvisualtask sub_8141C08, 2 end General_ItemKnockoff: @ 81D647E - loadspritegfx 10224 + loadspritegfx ANIM_TAG_ITEM_BAG createsprite gBattleAnimSpriteTemplate_83D6734, 130 end @@ -10358,21 +10358,21 @@ General_TurnTrap: @ 81D6489 jumpargeq 0, 4, _81D65D3 goto _81D64B5 _81D64B5: - loadspritegfx 10186 - loopsewithpan SE_W010, 63, 6, 2 + loadspritegfx ANIM_TAG_TENDRILS + loopsewithpan SE_W010, SOUND_PAN_TARGET, 6, 2 createsprite gBattleAnimSpriteTemplate_83D65A0, 132, 0, 16, 0, 1 delay 7 createsprite gBattleAnimSpriteTemplate_83D65A0, 130, 0, 8, 1, 1 delay 3 createvisualtask AnimTask_ShakeMon2, 2, ANIM_BANK_TARGET, 2, 0, 8, 1 delay 20 - setarg 7, -1 - playsewithpan SE_W020, 63 + setarg ARG_RET_ID, -1 + playsewithpan SE_W020, SOUND_PAN_TARGET waitforvisualfinish end _81D64FD: - loadspritegfx 10029 - playsewithpan SE_W221B, 63 + loadspritegfx ANIM_TAG_SMALL_EMBER + playsewithpan SE_W221B, SOUND_PAN_TARGET createvisualtask AnimTask_ShakeMon, 5, 1, 0, 2, 30, 1 call _81C90BF call _81C90BF @@ -10380,13 +10380,13 @@ _81D64FD: stopsound end _81D6522: - loadspritegfx 10149 + loadspritegfx ANIM_TAG_WATER_ORB monbg ANIM_BANK_DEF_PARTNER monbgprio_28 1 setalpha 12, 8 delay 0 createsprite gSimplePaletteBlendSpriteTemplate, 0, 4, 2, 0, 7, rgb(0, 13, 23) - playsewithpan SE_W250, 63 + playsewithpan SE_W250, SOUND_PAN_TARGET createvisualtask AnimTask_ShakeMon, 5, 1, 0, 2, 30, 1 call _81D03E4 call _81D03E4 @@ -10397,11 +10397,11 @@ _81D6522: clearmonbg ANIM_BANK_DEF_PARTNER end _81D6576: - loadspritegfx 10145 - loadspritegfx 10135 + loadspritegfx ANIM_TAG_CLAMP + loadspritegfx ANIM_TAG_IMPACT monbg ANIM_BANK_TARGET setalpha 12, 8 - playsewithpan SE_W011, 63 + playsewithpan SE_W011, SOUND_PAN_TARGET createsprite gBattleAnimSpriteTemplate_83DB1E8, 2, -32, 0, 2, 819, 0, 10 createsprite gBattleAnimSpriteTemplate_83DB1E8, 2, 32, 0, 6, -819, 0, 10 delay 10 @@ -10413,10 +10413,10 @@ _81D6576: waitforvisualfinish end _81D65D3: - loadspritegfx 10074 + loadspritegfx ANIM_TAG_MUD_SAND createsprite gSimplePaletteBlendSpriteTemplate, 0, 4, 2, 0, 7, rgb(19, 17, 0) createvisualtask AnimTask_ShakeMon, 5, 1, 0, 2, 30, 1 - playsewithpan SE_W328, 63 + playsewithpan SE_W328, SOUND_PAN_TARGET call _81D361F call _81D361F delay 22 @@ -10426,50 +10426,50 @@ _81D65D3: end General_ItemEffect: @ 81D661C - loadspritegfx 10203 - loadspritegfx 10049 + loadspritegfx ANIM_TAG_THIN_RING + loadspritegfx ANIM_TAG_SPARKLE_2 delay 0 - playsewithpan SE_W036, 192 + playsewithpan SE_W036, SOUND_PAN_ATTACKER createvisualtask sub_80A8EFC, 2, 16, 128, 0, 2 waitforvisualfinish - playsewithpan SE_W036, 192 + playsewithpan SE_W036, SOUND_PAN_ATTACKER createvisualtask sub_80A8EFC, 2, 16, 128, 0, 2 waitforvisualfinish - playsewithpan SE_W036, 192 + playsewithpan SE_W036, SOUND_PAN_ATTACKER createvisualtask sub_80A8EFC, 2, 16, 128, 0, 2 waitforvisualfinish - playsewithpan SE_W234, 192 + playsewithpan SE_W234, SOUND_PAN_ATTACKER call Unknown_81D5ECA waitforvisualfinish - playsewithpan SE_REAPOKE, 192 + playsewithpan SE_REAPOKE, SOUND_PAN_ATTACKER createsprite gSimplePaletteBlendSpriteTemplate, 2, 2, 3, 7, 0, rgb(17, 31, 25) createsprite gBattleAnimSpriteTemplate_83D7928, 3, 0, 0, 0, 0 waitforvisualfinish end General_SmokeballEscape: @ 81D6690 - loadspritegfx 10242 + loadspritegfx ANIM_TAG_PINK_CLOUD monbg ANIM_BANK_ATTACKER setalpha 12, 4 delay 0 - playsewithpan SE_BOWA2, 63 + playsewithpan SE_BOWA2, SOUND_PAN_TARGET createsprite gBattleAnimSpriteTemplate_8402894, 128, 0, 32, 28, 30 delay 4 - playsewithpan SE_BOWA2, 63 + playsewithpan SE_BOWA2, SOUND_PAN_TARGET createsprite gBattleAnimSpriteTemplate_8402894, 127, 2, 12, 20, 30 delay 12 - playsewithpan SE_BOWA2, 63 + playsewithpan SE_BOWA2, SOUND_PAN_TARGET createsprite gBattleAnimSpriteTemplate_8402894, 126, 2, -28, 4, 30 delay 4 delay 8 - playsewithpan SE_BOWA2, 63 + playsewithpan SE_BOWA2, SOUND_PAN_TARGET createsprite gBattleAnimSpriteTemplate_8402894, 124, 2, 14, -20, 30 delay 4 - playsewithpan SE_BOWA2, 63 + playsewithpan SE_BOWA2, SOUND_PAN_TARGET createvisualtask sub_80DFC24, 2, 2 createsprite gBattleAnimSpriteTemplate_8402894, 123, 3, 4, 4, 30 delay 14 - playsewithpan SE_BOWA2, 63 + playsewithpan SE_BOWA2, SOUND_PAN_TARGET createsprite gBattleAnimSpriteTemplate_8402894, 122, 3, -14, 18, 46 delay 0 createsprite gBattleAnimSpriteTemplate_8402894, 121, 3, 14, -14, 46 @@ -10481,14 +10481,14 @@ General_SmokeballEscape: @ 81D6690 createsprite gBattleAnimSpriteTemplate_8402894, 118, 3, 0, 0, 46 waitforvisualfinish clearmonbg ANIM_BANK_ATTACKER - invisible 0 + invisible ANIM_BANK_ATTACKER delay 0 blendoff end General_HangedOn: @ 81D676E createsprite gSimplePaletteBlendSpriteTemplate, 0, 2, 7, 0, 9, rgb(31, 0, 0) - playsewithpan SE_W082, 192 + playsewithpan SE_W082, SOUND_PAN_ATTACKER createvisualtask sub_812FC68, 5, 30, 128, 0, 1, 2, 0, 1 waitforvisualfinish createsprite gSimplePaletteBlendSpriteTemplate, 0, 2, 4, 9, 0, rgb(31, 0, 0) @@ -10498,8 +10498,8 @@ General_HangedOn: @ 81D676E end General_Rain: @ 81D67BB - loadspritegfx 10115 - playsewithpan SE_W240, 192 + loadspritegfx ANIM_TAG_RAIN_DROPS + playsewithpan SE_W240, SOUND_PAN_ATTACKER createvisualtask sub_80E2A38, 10, 1921, 2, 0, 4, 0 waitforvisualfinish createvisualtask CreateAnimRaindrops, 2, 0, 3, 60 @@ -10525,10 +10525,10 @@ General_LeechSeedDrain: @ 81D6813 goto Move_ABSORB General_MonHit: @ 81D6821 - loadspritegfx 10135 + loadspritegfx ANIM_TAG_IMPACT monbg ANIM_BANK_TARGET setalpha 12, 8 - playsewithpan SE_W003, 63 + playsewithpan SE_W003, SOUND_PAN_TARGET createsprite gBasicHitSplatSpriteTemplate, 2, 0, 0, 1, 2 createvisualtask AnimTask_ShakeMon, 2, ANIM_BANK_TARGET, 3, 0, 6, 1 waitforvisualfinish @@ -10537,7 +10537,7 @@ General_MonHit: @ 81D6821 end General_ItemSteal: @ 81D6852 - loadspritegfx 10224 + loadspritegfx ANIM_TAG_ITEM_BAG createvisualtask sub_80E42D0, 2 createvisualtask sub_8141808, 2 delay 1 @@ -10545,7 +10545,7 @@ General_ItemSteal: @ 81D6852 end General_SnatchMove: @ 81D6877 - loadspritegfx 10224 + loadspritegfx ANIM_TAG_ITEM_BAG createvisualtask sub_80E4234, 2 call Unknown_81D6AB6 delay 1 @@ -10559,22 +10559,22 @@ _81D68AE: call Unknown_81D6AD6 end _81D68B5: - playsewithpan SE_W104, 192 + playsewithpan SE_W104, SOUND_PAN_ATTACKER createvisualtask sub_8131944, 2 goto _81D68AE _81D68C5: - playsewithpan SE_W104, 192 + playsewithpan SE_W104, SOUND_PAN_ATTACKER createvisualtask sub_8131FFC, 2 goto _81D68AE General_FutureSightHit: @ 81D68D5 createvisualtask sub_80E42B0, 2 monbg ANIM_BANK_DEF_PARTNER - playsewithpan SE_W060, 192 + playsewithpan SE_W060, SOUND_PAN_ATTACKER call Unknown_81D61E7 setalpha 8, 8 - playsewithpan SE_W048, 63 - waitplaysewithpan SE_W048, 63, 8 + playsewithpan SE_W048, SOUND_PAN_TARGET + waitplaysewithpan SE_W048, SOUND_PAN_TARGET, 8 createvisualtask AnimTask_ShakeMon, 2, ANIM_BANK_TARGET, 4, 0, 15, 1 createvisualtask AnimTask_ScaleMonAndRestore, 5, -5, -5, 15, ANIM_BANK_TARGET, 1 waitforvisualfinish @@ -10589,32 +10589,32 @@ General_FutureSightHit: @ 81D68D5 General_DoomDesireHit: @ 81D6934 createvisualtask sub_80E42B0, 2 - loadspritegfx 10198 + loadspritegfx ANIM_TAG_EXPLOSION createsprite gSimplePaletteBlendSpriteTemplate, 2, 1, 3, 0, 16, rgb(31, 31, 31) waitforvisualfinish delay 10 createvisualtask sub_812E14C, 5 delay 9 - playsewithpan SE_W109, 192 + playsewithpan SE_W109, SOUND_PAN_ATTACKER delay 9 playsewithpan SE_W109, 0 delay 9 - playsewithpan SE_W109, 63 + playsewithpan SE_W109, SOUND_PAN_TARGET delay 25 createvisualtask AnimTask_ShakeMonInPlace, 2, ANIM_BANK_TARGET, 10, 0, 20, 1 - playsewithpan SE_W120, 63 + playsewithpan SE_W120, SOUND_PAN_TARGET createsprite gBattleAnimSpriteTemplate_83D7828, 3, 0, 0, 1, 1 delay 6 - playsewithpan SE_W120, 63 + playsewithpan SE_W120, SOUND_PAN_TARGET createsprite gBattleAnimSpriteTemplate_83D7828, 3, 24, -24, 1, 1 delay 6 - playsewithpan SE_W120, 63 + playsewithpan SE_W120, SOUND_PAN_TARGET createsprite gBattleAnimSpriteTemplate_83D7828, 3, -16, 16, 1, 1 delay 6 - playsewithpan SE_W120, 63 + playsewithpan SE_W120, SOUND_PAN_TARGET createsprite gBattleAnimSpriteTemplate_83D7828, 3, -24, -12, 1, 1 delay 6 - playsewithpan SE_W120, 63 + playsewithpan SE_W120, SOUND_PAN_TARGET createsprite gBattleAnimSpriteTemplate_83D7828, 3, 16, 16, 1, 1 waitforvisualfinish createsprite gSimplePaletteBlendSpriteTemplate, 2, 1, 3, 16, 0, rgb(31, 31, 31) @@ -10622,8 +10622,8 @@ General_DoomDesireHit: @ 81D6934 end General_FocusPunchSetUp: @ 81D69F9 - loadspritegfx 10184 - playsewithpan SE_W082, 192 + loadspritegfx ANIM_TAG_FOCUS_ENERGY + playsewithpan SE_W082, SOUND_PAN_ATTACKER call EndureFlamesAnim delay 8 createvisualtask sub_80E1F8C, 2, 2, 2, 2, 0, 11, 31 @@ -10635,8 +10635,8 @@ General_FocusPunchSetUp: @ 81D69F9 end General_IngrainHeal: @ 81D6A39 - loadspritegfx 10147 - loadspritegfx 10031 + loadspritegfx ANIM_TAG_ORBS + loadspritegfx ANIM_TAG_BLUE_STAR monbg ANIM_BANK_DEF_PARTNER setalpha 12, 8 createsprite gSimplePaletteBlendSpriteTemplate, 2, 1, 1, 0, 4, rgb(13, 31, 12) @@ -10654,11 +10654,11 @@ General_IngrainHeal: @ 81D6A39 end General_WishHeal: @ 81D6A7C - loadspritegfx 10031 - loadspritegfx 10049 + loadspritegfx ANIM_TAG_BLUE_STAR + loadspritegfx ANIM_TAG_SPARKLE_2 createsprite gSimplePaletteBlendSpriteTemplate, 2, 1, 3, 0, 10, rgb(0, 0, 0) waitforvisualfinish - playsewithpan SE_W025, 192 + playsewithpan SE_W025, SOUND_PAN_ATTACKER call Unknown_81D5ECA waitforvisualfinish call Unknown_81D5EF5 @@ -10721,12 +10721,12 @@ _81D6B5C: createvisualtask sub_813F9B8, 2 end _81D6B65: - loadspritegfx 10135 + loadspritegfx ANIM_TAG_IMPACT delay 25 monbg ANIM_BANK_DEF_PARTNER setalpha 12, 8 delay 0 - playsewithpan SE_W003, 63 + playsewithpan SE_W003, SOUND_PAN_TARGET createsprite gBasicHitSplatSpriteTemplate, 130, -4, -20, 1, 2 waitforvisualfinish clearmonbg ANIM_BANK_DEF_PARTNER diff --git a/include/battle_anim.h b/include/battle_anim.h index e3a3bd7b1..18ffd80d2 100644 --- a/include/battle_anim.h +++ b/include/battle_anim.h @@ -1,6 +1,9 @@ #ifndef GUARD_BATTLEANIM_H #define GUARD_BATTLEANIM_H +#include "constants/battle_anim.h" +#include "constants/songs.h" + #include "sprite.h" #define REG_BGnCNT_BITFIELD(n) (*(vBgCnt *)REG_ADDR_BG##n##CNT) diff --git a/include/constants/battle_anim.h b/include/constants/battle_anim.h index c173a8730..687ff15d5 100644 --- a/include/constants/battle_anim.h +++ b/include/constants/battle_anim.h @@ -1,9 +1,402 @@ #ifndef GUARD_BATTLEANIM_CONSTANTS_H #define GUARD_BATTLEANIM_CONSTANTS_H +#define ANIM_SPRITE_INDEX_COUNT 8 +#define ANIM_ARGS_COUNT 8 + +// Sprites start at 10000 and thus must be subtracted of 10000 to account for the true index. +#define GET_TRUE_SPRITE_INDEX(i) ((i - ANIM_SPRITES_START)) + +// Particle ids. +#define ANIM_SPRITES_START 10000 + +#define ANIM_TAG_BONE (ANIM_SPRITES_START + 0) +#define ANIM_TAG_SPARK (ANIM_SPRITES_START + 1) +#define ANIM_TAG_PENCIL (ANIM_SPRITES_START + 2) +#define ANIM_TAG_AIR_WAVE (ANIM_SPRITES_START + 3) +#define ANIM_TAG_UNUSED_ORB (ANIM_SPRITES_START + 4) +#define ANIM_TAG_SWORD (ANIM_SPRITES_START + 5) +#define ANIM_TAG_SEED (ANIM_SPRITES_START + 6) +#define ANIM_TAG_UNUSED_EXPLOSION (ANIM_SPRITES_START + 7) +#define ANIM_TAG_UNUSED_PINK_ORB (ANIM_SPRITES_START + 8) +#define ANIM_TAG_GUST (ANIM_SPRITES_START + 9) +#define ANIM_TAG_ICE_CUBE (ANIM_SPRITES_START + 10) +#define ANIM_TAG_SPARK_2 (ANIM_SPRITES_START + 11) +#define ANIM_TAG_UNUSED_ORANGE (ANIM_SPRITES_START + 12) +#define ANIM_TAG_YELLOW_BALL (ANIM_SPRITES_START + 13) +#define ANIM_TAG_LOCK_ON (ANIM_SPRITES_START + 14) +#define ANIM_TAG_TIED_BAG (ANIM_SPRITES_START + 15) +#define ANIM_TAG_BLACK_SMOKE (ANIM_SPRITES_START + 16) +#define ANIM_TAG_BLACK_BALL (ANIM_SPRITES_START + 17) +#define ANIM_TAG_CONVERSION (ANIM_SPRITES_START + 18) +#define ANIM_TAG_UNUSED_GLASS (ANIM_SPRITES_START + 19) +#define ANIM_TAG_HORN_HIT (ANIM_SPRITES_START + 20) +#define ANIM_TAG_UNUSED_HIT (ANIM_SPRITES_START + 21) +#define ANIM_TAG_UNUSED_HIT_2 (ANIM_SPRITES_START + 22) +#define ANIM_TAG_UNUSED_BLUE_SHARDS (ANIM_SPRITES_START + 23) +#define ANIM_TAG_UNUSED_CLOSING_EYE (ANIM_SPRITES_START + 24) +#define ANIM_TAG_UNUSED_WAVING_HAND (ANIM_SPRITES_START + 25) +#define ANIM_TAG_UNUSED_HIT_DUPLICATE (ANIM_SPRITES_START + 26) +#define ANIM_TAG_LEER (ANIM_SPRITES_START + 27) +#define ANIM_TAG_UNUSED_BLUE_BURST (ANIM_SPRITES_START + 28) +#define ANIM_TAG_SMALL_EMBER (ANIM_SPRITES_START + 29) +#define ANIM_TAG_GRAY_SMOKE (ANIM_SPRITES_START + 30) +#define ANIM_TAG_BLUE_STAR (ANIM_SPRITES_START + 31) +#define ANIM_TAG_UNUSED_BUBBLE_BURST (ANIM_SPRITES_START + 32) +#define ANIM_TAG_FIRE (ANIM_SPRITES_START + 33) +#define ANIM_TAG_UNUSED_SPINNING_FIRE (ANIM_SPRITES_START + 34) +#define ANIM_TAG_FIRE_PLUME (ANIM_SPRITES_START + 35) +#define ANIM_TAG_UNUSED_LIGHTNING (ANIM_SPRITES_START + 36) +#define ANIM_TAG_LIGHTNING (ANIM_SPRITES_START + 37) +#define ANIM_TAG_UNUSED_CLAW_SLASH (ANIM_SPRITES_START + 38) +#define ANIM_TAG_CLAW_SLASH (ANIM_SPRITES_START + 39) +#define ANIM_TAG_UNUSED_SCRATCH (ANIM_SPRITES_START + 40) +#define ANIM_TAG_UNUSED_SCRATCH_2 (ANIM_SPRITES_START + 41) +#define ANIM_TAG_UNUSED_BUBBLE_BURST_2 (ANIM_SPRITES_START + 42) +#define ANIM_TAG_ICE_CHUNK (ANIM_SPRITES_START + 43) +#define ANIM_TAG_UNUSED_GLASS_2 (ANIM_SPRITES_START + 44) +#define ANIM_TAG_UNUSED_PINK_HEART (ANIM_SPRITES_START + 45) +#define ANIM_TAG_UNUSED_SAP_DRIP (ANIM_SPRITES_START + 46) +#define ANIM_TAG_UNUSED_SAP_DRIP_2 (ANIM_SPRITES_START + 47) +#define ANIM_TAG_SPARKLE_1 (ANIM_SPRITES_START + 48) +#define ANIM_TAG_SPARKLE_2 (ANIM_SPRITES_START + 49) +#define ANIM_TAG_HUMANOID_FOOT (ANIM_SPRITES_START + 50) +#define ANIM_TAG_UNUSED_MONSTER_FOOT (ANIM_SPRITES_START + 51) +#define ANIM_TAG_UNUSED_HUMANOID_HAND (ANIM_SPRITES_START + 52) +#define ANIM_TAG_NOISE_LINE (ANIM_SPRITES_START + 53) +#define ANIM_TAG_UNUSED_YELLOW_UNK (ANIM_SPRITES_START + 54) +#define ANIM_TAG_UNUSED_RED_FIST (ANIM_SPRITES_START + 55) +#define ANIM_TAG_SLAM_HIT (ANIM_SPRITES_START + 56) +#define ANIM_TAG_UNUSED_RING (ANIM_SPRITES_START + 57) +#define ANIM_TAG_ROCKS (ANIM_SPRITES_START + 58) +#define ANIM_TAG_UNUSED_Z (ANIM_SPRITES_START + 59) +#define ANIM_TAG_UNUSED_YELLOW_UNK_2 (ANIM_SPRITES_START + 60) +#define ANIM_TAG_UNUSED_AIR_SLASH (ANIM_SPRITES_START + 61) +#define ANIM_TAG_UNUSED_SPINNING_GREEN_ORBS (ANIM_SPRITES_START + 62) +#define ANIM_TAG_LEAF (ANIM_SPRITES_START + 63) +#define ANIM_TAG_FINGER (ANIM_SPRITES_START + 64) +#define ANIM_TAG_POISON_POWDER (ANIM_SPRITES_START + 65) +#define ANIM_TAG_UNUSED_BROWN_TRIANGLE (ANIM_SPRITES_START + 66) +#define ANIM_TAG_SLEEP_POWDER (ANIM_SPRITES_START + 67) +#define ANIM_TAG_STUN_SPORE (ANIM_SPRITES_START + 68) +#define ANIM_TAG_UNUSED_POWDER (ANIM_SPRITES_START + 69) +#define ANIM_TAG_SPARKLE_3 (ANIM_SPRITES_START + 70) +#define ANIM_TAG_SPARKLE_4 (ANIM_SPRITES_START + 71) +#define ANIM_TAG_MUSIC_NOTES (ANIM_SPRITES_START + 72) +#define ANIM_TAG_DUCK (ANIM_SPRITES_START + 73) +#define ANIM_TAG_MUD_SAND (ANIM_SPRITES_START + 74) +#define ANIM_TAG_ALERT (ANIM_SPRITES_START + 75) +#define ANIM_TAG_UNUSED_BLUE_FLAMES (ANIM_SPRITES_START + 76) +#define ANIM_TAG_UNUSED_BLUE_FLAMES_2 (ANIM_SPRITES_START + 77) +#define ANIM_TAG_UNUSED_SHOCK (ANIM_SPRITES_START + 78) +#define ANIM_TAG_SHOCK (ANIM_SPRITES_START + 79) +#define ANIM_TAG_UNUSED_BELL (ANIM_SPRITES_START + 80) +#define ANIM_TAG_UNUSED_PINK_GLOVE (ANIM_SPRITES_START + 81) +#define ANIM_TAG_UNUSED_BLUE_LINES (ANIM_SPRITES_START + 82) +#define ANIM_TAG_UNUSED_IMPACT (ANIM_SPRITES_START + 83) +#define ANIM_TAG_UNUSED_IMPACT_2 (ANIM_SPRITES_START + 84) +#define ANIM_TAG_UNUSED_RETICLE (ANIM_SPRITES_START + 85) +#define ANIM_TAG_BREATH (ANIM_SPRITES_START + 86) +#define ANIM_TAG_ANGER (ANIM_SPRITES_START + 87) +#define ANIM_TAG_UNUSED_SNOWBALL (ANIM_SPRITES_START + 88) +#define ANIM_TAG_UNUSED_VINE (ANIM_SPRITES_START + 89) +#define ANIM_TAG_UNUSED_SWORD (ANIM_SPRITES_START + 90) +#define ANIM_TAG_UNUSED_CLAPPING (ANIM_SPRITES_START + 91) +#define ANIM_TAG_UNUSED_RED_TUBE (ANIM_SPRITES_START + 92) +#define ANIM_TAG_AMNESIA (ANIM_SPRITES_START + 93) +#define ANIM_TAG_UNUSED_STRING (ANIM_SPRITES_START + 94) +#define ANIM_TAG_UNUSED_PENCIL (ANIM_SPRITES_START + 95) +#define ANIM_TAG_UNUSED_PETAL (ANIM_SPRITES_START + 96) +#define ANIM_TAG_BENT_SPOON (ANIM_SPRITES_START + 97) +#define ANIM_TAG_UNUSED_WEB (ANIM_SPRITES_START + 98) +#define ANIM_TAG_MILK_BOTTLE (ANIM_SPRITES_START + 99) +#define ANIM_TAG_COIN (ANIM_SPRITES_START + 100) +#define ANIM_TAG_UNUSED_CRACKED_EGG (ANIM_SPRITES_START + 101) +#define ANIM_TAG_UNUSED_HATCHED_EGG (ANIM_SPRITES_START + 102) +#define ANIM_TAG_UNUSED_FRESH_EGG (ANIM_SPRITES_START + 103) +#define ANIM_TAG_UNUSED_FANGS (ANIM_SPRITES_START + 104) +#define ANIM_TAG_UNUSED_EXPLOSION_2 (ANIM_SPRITES_START + 105) +#define ANIM_TAG_UNUSED_EXPLOSION_3 (ANIM_SPRITES_START + 106) +#define ANIM_TAG_UNUSED_WATER_DROPLET (ANIM_SPRITES_START + 107) +#define ANIM_TAG_UNUSED_WATER_DROPLET_2 (ANIM_SPRITES_START + 108) +#define ANIM_TAG_UNUSED_SEED (ANIM_SPRITES_START + 109) +#define ANIM_TAG_UNUSED_SPROUT (ANIM_SPRITES_START + 110) +#define ANIM_TAG_UNUSED_RED_WAND (ANIM_SPRITES_START + 111) +#define ANIM_TAG_UNUSED_PURPLE_GREEN_UNK (ANIM_SPRITES_START + 112) +#define ANIM_TAG_UNUSED_WATER_COLUMN (ANIM_SPRITES_START + 113) +#define ANIM_TAG_UNUSED_MUD_UNK (ANIM_SPRITES_START + 114) +#define ANIM_TAG_RAIN_DROPS (ANIM_SPRITES_START + 115) +#define ANIM_TAG_UNUSED_FURY_SWIPES (ANIM_SPRITES_START + 116) +#define ANIM_TAG_UNUSED_VINE_2 (ANIM_SPRITES_START + 117) +#define ANIM_TAG_UNUSED_TEETH (ANIM_SPRITES_START + 118) +#define ANIM_TAG_UNUSED_BONE (ANIM_SPRITES_START + 119) +#define ANIM_TAG_UNUSED_WHITE_BAG (ANIM_SPRITES_START + 120) +#define ANIM_TAG_UNUSED_UNKNOWN (ANIM_SPRITES_START + 121) +#define ANIM_TAG_UNUSED_PURPLE_CORAL (ANIM_SPRITES_START + 122) +#define ANIM_TAG_UNUSED_PURPLE_DROPLET (ANIM_SPRITES_START + 123) +#define ANIM_TAG_UNUSED_SHOCK_2 (ANIM_SPRITES_START + 124) +#define ANIM_TAG_UNUSED_CLOSING_EYE_2 (ANIM_SPRITES_START + 125) +#define ANIM_TAG_UNUSED_METAL_BALL (ANIM_SPRITES_START + 126) +#define ANIM_TAG_UNUSED_MONSTER_DOLL (ANIM_SPRITES_START + 127) +#define ANIM_TAG_UNUSED_WHIRLWIND (ANIM_SPRITES_START + 128) +#define ANIM_TAG_UNUSED_WHIRLWIND_2 (ANIM_SPRITES_START + 129) +#define ANIM_TAG_UNUSED_EXPLOSION_4 (ANIM_SPRITES_START + 130) +#define ANIM_TAG_UNUSED_EXPLOSION_5 (ANIM_SPRITES_START + 131) +#define ANIM_TAG_UNUSED_TONGUE (ANIM_SPRITES_START + 132) +#define ANIM_TAG_UNUSED_SMOKE (ANIM_SPRITES_START + 133) +#define ANIM_TAG_UNUSED_SMOKE_2 (ANIM_SPRITES_START + 134) +#define ANIM_TAG_IMPACT (ANIM_SPRITES_START + 135) +#define ANIM_TAG_CIRCLE_IMPACT (ANIM_SPRITES_START + 136) +#define ANIM_TAG_SCRATCH (ANIM_SPRITES_START + 137) +#define ANIM_TAG_CUT (ANIM_SPRITES_START + 138) +#define ANIM_TAG_SHARP_TEETH (ANIM_SPRITES_START + 139) +#define ANIM_TAG_RAINBOW_RINGS (ANIM_SPRITES_START + 140) +#define ANIM_TAG_ICE_CRYSTALS (ANIM_SPRITES_START + 141) +#define ANIM_TAG_ICE_SPIKES (ANIM_SPRITES_START + 142) +#define ANIM_TAG_HANDS_AND_FEET (ANIM_SPRITES_START + 143) +#define ANIM_TAG_MIST_CLOUD (ANIM_SPRITES_START + 144) +#define ANIM_TAG_CLAMP (ANIM_SPRITES_START + 145) +#define ANIM_TAG_BUBBLE (ANIM_SPRITES_START + 146) +#define ANIM_TAG_ORBS (ANIM_SPRITES_START + 147) +#define ANIM_TAG_WATER_IMPACT (ANIM_SPRITES_START + 148) +#define ANIM_TAG_WATER_ORB (ANIM_SPRITES_START + 149) +#define ANIM_TAG_POISON_BUBBLE (ANIM_SPRITES_START + 150) +#define ANIM_TAG_TOXIC_BUBBLE (ANIM_SPRITES_START + 151) +#define ANIM_TAG_SPIKES (ANIM_SPRITES_START + 152) +#define ANIM_TAG_HORN_HIT_2 (ANIM_SPRITES_START + 153) +#define ANIM_TAG_AIR_WAVE_2 (ANIM_SPRITES_START + 154) +#define ANIM_TAG_SMALL_BUBBLES (ANIM_SPRITES_START + 155) +#define ANIM_TAG_ROUND_SHADOW (ANIM_SPRITES_START + 156) +#define ANIM_TAG_SUNLIGHT (ANIM_SPRITES_START + 157) +#define ANIM_TAG_SPORE (ANIM_SPRITES_START + 158) +#define ANIM_TAG_FLOWER (ANIM_SPRITES_START + 159) +#define ANIM_TAG_RAZOR_LEAF (ANIM_SPRITES_START + 160) +#define ANIM_TAG_NEEDLE (ANIM_SPRITES_START + 161) +#define ANIM_TAG_WHIRLWIND_LINES (ANIM_SPRITES_START + 162) +#define ANIM_TAG_GOLD_RING (ANIM_SPRITES_START + 163) +#define ANIM_TAG_PURPLE_RING (ANIM_SPRITES_START + 164) +#define ANIM_TAG_BLUE_RING (ANIM_SPRITES_START + 165) +#define ANIM_TAG_GREEN_LIGHT_WALL (ANIM_SPRITES_START + 166) +#define ANIM_TAG_BLUE_LIGHT_WALL (ANIM_SPRITES_START + 167) +#define ANIM_TAG_RED_LIGHT_WALL (ANIM_SPRITES_START + 168) +#define ANIM_TAG_GRAY_LIGHT_WALL (ANIM_SPRITES_START + 169) +#define ANIM_TAG_ORANGE_LIGHT_WALL (ANIM_SPRITES_START + 170) +#define ANIM_TAG_BLACK_BALL_2 (ANIM_SPRITES_START + 171) +#define ANIM_TAG_PURPLE_GAS_CLOUD (ANIM_SPRITES_START + 172) +#define ANIM_TAG_SPARK_H (ANIM_SPRITES_START + 173) +#define ANIM_TAG_YELLOW_STAR (ANIM_SPRITES_START + 174) +#define ANIM_TAG_LARGE_FRESH_EGG (ANIM_SPRITES_START + 175) +#define ANIM_TAG_SHADOW_BALL (ANIM_SPRITES_START + 176) +#define ANIM_TAG_LICK (ANIM_SPRITES_START + 177) +#define ANIM_TAG_UNUSED_VOID_LINES (ANIM_SPRITES_START + 178) +#define ANIM_TAG_STRING (ANIM_SPRITES_START + 179) +#define ANIM_TAG_STRING_DOT (ANIM_SPRITES_START + 180) +#define ANIM_TAG_WEB (ANIM_SPRITES_START + 181) +#define ANIM_TAG_UNUSED_LIGHTBULB (ANIM_SPRITES_START + 182) +#define ANIM_TAG_SLASH (ANIM_SPRITES_START + 183) +#define ANIM_TAG_FOCUS_ENERGY (ANIM_SPRITES_START + 184) +#define ANIM_TAG_SPHERE_TO_CUBE (ANIM_SPRITES_START + 185) +#define ANIM_TAG_TENDRILS (ANIM_SPRITES_START + 186) +#define ANIM_TAG_EYE (ANIM_SPRITES_START + 187) +#define ANIM_TAG_WHITE_SHADOW (ANIM_SPRITES_START + 188) +#define ANIM_TAG_TEAL_ALERT (ANIM_SPRITES_START + 189) +#define ANIM_TAG_OPENING_EYE (ANIM_SPRITES_START + 190) +#define ANIM_TAG_ROUND_WHITE_HALO (ANIM_SPRITES_START + 191) +#define ANIM_TAG_FANG_ATTACK (ANIM_SPRITES_START + 192) +#define ANIM_TAG_PURPLE_HAND_OUTLINE (ANIM_SPRITES_START + 193) +#define ANIM_TAG_MOON (ANIM_SPRITES_START + 194) +#define ANIM_TAG_SPARKLE_5 (ANIM_SPRITES_START + 195) +#define ANIM_TAG_SPIRAL (ANIM_SPRITES_START + 196) +#define ANIM_TAG_SNORE_Z (ANIM_SPRITES_START + 197) +#define ANIM_TAG_EXPLOSION (ANIM_SPRITES_START + 198) +#define ANIM_TAG_NAIL (ANIM_SPRITES_START + 199) +#define ANIM_TAG_GHOSTLY_SPIRIT (ANIM_SPRITES_START + 200) +#define ANIM_TAG_WARM_ROCK (ANIM_SPRITES_START + 201) +#define ANIM_TAG_BREAKING_EGG (ANIM_SPRITES_START + 202) +#define ANIM_TAG_THIN_RING (ANIM_SPRITES_START + 203) +#define ANIM_TAG_UNUSED_PUNCH_IMPACT (ANIM_SPRITES_START + 204) +#define ANIM_TAG_BELL (ANIM_SPRITES_START + 205) +#define ANIM_TAG_MUSIC_NOTES_2 (ANIM_SPRITES_START + 206) +#define ANIM_TAG_SPEED_DUST (ANIM_SPRITES_START + 207) +#define ANIM_TAG_TORN_METAL (ANIM_SPRITES_START + 208) +#define ANIM_TAG_THOUGHT_BUBBLE (ANIM_SPRITES_START + 209) +#define ANIM_TAG_MAGENTA_HEART (ANIM_SPRITES_START + 210) +#define ANIM_TAG_ELECTRIC_ORBS (ANIM_SPRITES_START + 211) +#define ANIM_TAG_CIRCLE_OF_LIGHT (ANIM_SPRITES_START + 212) +#define ANIM_TAG_ELECTRICITY (ANIM_SPRITES_START + 213) +#define ANIM_TAG_FINGER_2 (ANIM_SPRITES_START + 214) +#define ANIM_TAG_MOVEMENT_WAVES (ANIM_SPRITES_START + 215) +#define ANIM_TAG_RED_HEART (ANIM_SPRITES_START + 216) +#define ANIM_TAG_RED_ORB (ANIM_SPRITES_START + 217) +#define ANIM_TAG_EYE_SPARKLE (ANIM_SPRITES_START + 218) +#define ANIM_TAG_PINK_HEART (ANIM_SPRITES_START + 219) +#define ANIM_TAG_ANGEL (ANIM_SPRITES_START + 220) +#define ANIM_TAG_DEVIL (ANIM_SPRITES_START + 221) +#define ANIM_TAG_SWIPE (ANIM_SPRITES_START + 222) +#define ANIM_TAG_ROOTS (ANIM_SPRITES_START + 223) +#define ANIM_TAG_ITEM_BAG (ANIM_SPRITES_START + 224) +#define ANIM_TAG_JAGGED_MUSIC_NOTE (ANIM_SPRITES_START + 225) +#define ANIM_TAG_POKEBALL (ANIM_SPRITES_START + 226) +#define ANIM_TAG_SPOTLIGHT (ANIM_SPRITES_START + 227) +#define ANIM_TAG_LETTER_Z (ANIM_SPRITES_START + 228) +#define ANIM_TAG_RAPID_SPIN (ANIM_SPRITES_START + 229) +#define ANIM_TAG_TRI_FORCE_TRIANGLE (ANIM_SPRITES_START + 230) +#define ANIM_TAG_WISP_ORB (ANIM_SPRITES_START + 231) +#define ANIM_TAG_WISP_FIRE (ANIM_SPRITES_START + 232) +#define ANIM_TAG_GOLD_STARS (ANIM_SPRITES_START + 233) +#define ANIM_TAG_ECLIPSING_ORB (ANIM_SPRITES_START + 234) +#define ANIM_TAG_GRAY_ORB (ANIM_SPRITES_START + 235) +#define ANIM_TAG_BLUE_ORB (ANIM_SPRITES_START + 236) +#define ANIM_TAG_RED_ORB_2 (ANIM_SPRITES_START + 237) +#define ANIM_TAG_PINK_PETAL (ANIM_SPRITES_START + 238) +#define ANIM_TAG_PAIN_SPLIT (ANIM_SPRITES_START + 239) +#define ANIM_TAG_CONFETTI (ANIM_SPRITES_START + 240) +#define ANIM_TAG_GREEN_STAR (ANIM_SPRITES_START + 241) +#define ANIM_TAG_PINK_CLOUD (ANIM_SPRITES_START + 242) +#define ANIM_TAG_SWEAT_DROP (ANIM_SPRITES_START + 243) +#define ANIM_TAG_GUARD_RING (ANIM_SPRITES_START + 244) +#define ANIM_TAG_PURPLE_SCRATCH (ANIM_SPRITES_START + 245) +#define ANIM_TAG_PURPLE_SWIPE (ANIM_SPRITES_START + 246) +#define ANIM_TAG_TAG_HAND (ANIM_SPRITES_START + 247) +#define ANIM_TAG_SMALL_RED_EYE (ANIM_SPRITES_START + 248) +#define ANIM_TAG_HOLLOW_ORB (ANIM_SPRITES_START + 249) +#define ANIM_TAG_X_SIGN (ANIM_SPRITES_START + 250) +#define ANIM_TAG_BLUEGREEN_ORB (ANIM_SPRITES_START + 251) +#define ANIM_TAG_PAW_PRINT (ANIM_SPRITES_START + 252) +#define ANIM_TAG_PURPLE_FLAME (ANIM_SPRITES_START + 253) +#define ANIM_TAG_RED_BALL (ANIM_SPRITES_START + 254) +#define ANIM_TAG_SMELLINGSALT_EFFECT (ANIM_SPRITES_START + 255) +#define ANIM_TAG_METEOR (ANIM_SPRITES_START + 256) +#define ANIM_TAG_FLAT_ROCK (ANIM_SPRITES_START + 257) +#define ANIM_TAG_MAGNIFYING_GLASS (ANIM_SPRITES_START + 258) +#define ANIM_TAG_BROWN_ORB (ANIM_SPRITES_START + 259) +#define ANIM_TAG_METAL_SOUND_WAVES (ANIM_SPRITES_START + 260) +#define ANIM_TAG_FLYING_DIRT (ANIM_SPRITES_START + 261) +#define ANIM_TAG_ICICLE_SPEAR (ANIM_SPRITES_START + 262) +#define ANIM_TAG_HAIL (ANIM_SPRITES_START + 263) +#define ANIM_TAG_GLOWY_RED_ORB (ANIM_SPRITES_START + 264) +#define ANIM_TAG_GLOWY_GREEN_ORB (ANIM_SPRITES_START + 265) +#define ANIM_TAG_GREEN_SPIKE (ANIM_SPRITES_START + 266) +#define ANIM_TAG_WHITE_CIRCLE_OF_LIGHT (ANIM_SPRITES_START + 267) +#define ANIM_TAG_GLOWY_BLUE_ORB (ANIM_SPRITES_START + 268) +#define ANIM_TAG_UNUSED_RED_BRICK (ANIM_SPRITES_START + 269) +#define ANIM_TAG_WHITE_FEATHER (ANIM_SPRITES_START + 270) +#define ANIM_TAG_SPARKLE_6 (ANIM_SPRITES_START + 271) +#define ANIM_TAG_SPLASH (ANIM_SPRITES_START + 272) +#define ANIM_TAG_SWEAT_BEAD (ANIM_SPRITES_START + 273) +#define ANIM_TAG_UNUSED_GEM_1 (ANIM_SPRITES_START + 274) +#define ANIM_TAG_UNUSED_GEM_2 (ANIM_SPRITES_START + 275) +#define ANIM_TAG_UNUSED_GEM_3 (ANIM_SPRITES_START + 276) +#define ANIM_TAG_SLAM_HIT_2 (ANIM_SPRITES_START + 277) +#define ANIM_TAG_RECYCLE (ANIM_SPRITES_START + 278) +#define ANIM_TAG_UNUSED_RED_PARTICLES (ANIM_SPRITES_START + 279) +#define ANIM_TAG_PROTECT (ANIM_SPRITES_START + 280) +#define ANIM_TAG_DIRT_MOUND (ANIM_SPRITES_START + 281) +#define ANIM_TAG_SHOCK_3 (ANIM_SPRITES_START + 282) +#define ANIM_TAG_WEATHER_BALL (ANIM_SPRITES_START + 283) +#define ANIM_TAG_BIRD (ANIM_SPRITES_START + 284) +#define ANIM_TAG_CROSS_IMPACT (ANIM_SPRITES_START + 285) +#define ANIM_TAG_SLASH_2 (ANIM_SPRITES_START + 286) +#define ANIM_TAG_WHIP_HIT (ANIM_SPRITES_START + 287) +#define ANIM_TAG_BLUE_RING_2 (ANIM_SPRITES_START + 288) + +// battlers #define ANIM_BANK_ATTACKER 0 #define ANIM_BANK_TARGET 1 #define ANIM_BANK_ATK_PARTNER 2 #define ANIM_BANK_DEF_PARTNER 3 +// move background ids +#define BG_DARK_ 0 // the same as BG_DARK but is unused +#define BG_DARK 1 +#define BG_GHOST 2 +#define BG_PSYCHIC 3 +#define BG_IMPACT_OPPONENT 4 +#define BG_IMPACT_PLAYER 5 +#define BG_IMPACT_CONTESTS 6 +#define BG_DRILL 7 +#define BG_DRILL_CONTESTS 8 +#define BG_HIGHSPEED_OPPONENT 9 +#define BG_HIGHSPEED_PLAYER 10 +#define BG_THUNDER 11 +#define BG_GUILLOTINE_OPPONENT 12 +#define BG_GUILLOTINE_PLAYER 13 +#define BG_GUILLOTINE_CONTESTS 14 +#define BG_ICE 15 +#define BG_COSMIC 16 +#define BG_SEISMICTOSS_SKUUPPERCUT 17 +#define BG_FLYING 18 +#define BG_FLYING_CONTESTS 19 +#define BG_AURORABEAM 20 +#define BG_FISSURE 21 +#define BG_BUG_OPPONENT 22 +#define BG_BUG_PLAYER 23 +#define BG_SOLARBEAM_OPPONENT 24 +#define BG_SOLARBEAM_PLAYER 25 +#define BG_SOLARBEAM_CONTESTS 26 + +// table ids for general animations +#define B_ANIM_CASTFORM_CHANGE 0x0 +#define B_ANIM_STATS_CHANGE 0x1 +#define B_ANIM_SUBSTITUTE_FADE 0x2 +#define B_ANIM_SUBSTITUTE_APPEAR 0x3 +#define B_ANIM_POKEBLOCK_THROW 0x4 +#define B_ANIM_ITEM_KNOCKOFF 0x5 +#define B_ANIM_TURN_TRAP 0x6 +#define B_ANIM_ITEM_EFFECT 0x7 +#define B_ANIM_SMOKEBALL_ESCAPE 0x8 +#define B_ANIM_HANGED_ON 0x9 +#define B_ANIM_RAIN_CONTINUES 0xA +#define B_ANIM_SUN_CONTINUES 0xB +#define B_ANIM_SANDSTORM_CONTINUES 0xC +#define B_ANIM_HAIL_CONTINUES 0xD +#define B_ANIM_LEECH_SEED_DRAIN 0xE +#define B_ANIM_MON_HIT 0xF +#define B_ANIM_ITEM_STEAL 0x10 +#define B_ANIM_SNATCH_MOVE 0x11 +#define B_ANIM_FUTURE_SIGHT_HIT 0x12 +#define B_ANIM_DOOM_DESIRE_HIT 0x13 +#define B_ANIM_FOCUS_PUNCH_SETUP 0x14 +#define B_ANIM_INGRAIN_HEAL 0x15 +#define B_ANIM_WISH_HEAL 0x16 + +// special animations table +#define B_ANIM_LVL_UP 0x0 +#define B_ANIM_SWITCH_OUT_PLAYER_MON 0x1 +#define B_ANIM_SWITCH_OUT_OPPONENT_MON 0x2 +#define B_ANIM_BALL_THROW 0x3 +#define B_ANIM_SAFARI_BALL_THROW 0x4 +#define B_ANIM_SUBSTITUTE_TO_MON 0x5 +#define B_ANIM_MON_TO_SUBSTITUTE 0x6 + +// status animation table +#define B_ANIM_STATUS_PSN 0x0 +#define B_ANIM_STATUS_CONFUSION 0x1 +#define B_ANIM_STATUS_BRN 0x2 +#define B_ANIM_STATUS_INFATUATION 0x3 +#define B_ANIM_STATUS_SLP 0x4 +#define B_ANIM_STATUS_PRZ 0x5 +#define B_ANIM_STATUS_FRZ 0x6 +#define B_ANIM_STATUS_CURSED 0x7 +#define B_ANIM_STATUS_NIGHTMARE 0x8 +#define B_ANIM_STATUS_WRAPPED 0x9 // does not actually exist + +// Most tasks return a value to gBattleAnimArgs[7]. +#define ARG_RET_ID 0x7 + +// Trapping Wrap-like moves end turn animation. +#define TRAP_ANIM_BIND 0 +#define TRAP_ANIM_WRAP 0 +#define TRAP_ANIM_FIRE_SPIN 1 +#define TRAP_ANIM_WHIRLPOOL 2 +#define TRAP_ANIM_CLAMP 3 +#define TRAP_ANIM_SAND_TOMB 4 + +// Weather defines for battle animation scripts. +#define ANIM_WEATHER_NONE 0 +#define ANIM_WEATHER_SUN 1 +#define ANIM_WEATHER_RAIN 2 +#define ANIM_WEATHER_SANDSTORM 3 +#define ANIM_WEATHER_HAIL 4 + #endif diff --git a/include/constants/songs.h b/include/constants/songs.h index 45e3d335a..1fa0cee4c 100644 --- a/include/constants/songs.h +++ b/include/constants/songs.h @@ -1,6 +1,21 @@ #ifndef GUARD_CONSTANTS_SONGS_H #define GUARD_CONSTANTS_SONGS_H +// stereo panning constants [0-255] +// +// 0 +// . . +// . . +// 192 . . 63 +// . . +// . . +// . . +// 127 +// +#define SOUND_PAN_TARGET 63 +#define SOUND_PAN_ATTACKER 192 +#define SOUND_PAN_ATTACKER_NEG -64 + #define SE_STOP 0 #define SE_KAIFUKU 1 // Healing Item #define SE_PC_LOGON 2 // PC Logon diff --git a/include/rom_8077ABC.h b/include/rom_8077ABC.h index ab192f4ac..5f5867423 100644 --- a/include/rom_8077ABC.h +++ b/include/rom_8077ABC.h @@ -62,8 +62,8 @@ void *sub_8079BFC(s16 bottom, s16 top); // u8 a2 := u8 sprite void sub_8079C08(struct Task *task, u8 a2, s16 a3, s16 a4, s16 a5, s16 a6, u16 a7); u8 sub_8079C74(struct Task *task); -void sub_8079E24(); -u8 sub_8079E90(u8 slot); +void UpdateBattlerSpritePriorities(); +u8 GetBattlerSubpriority(u8 bank); u8 GetBattlerPosition_permutated(u8 slot); void sub_807A784(u8 taskId); void sub_807A850(struct Task *task, u8 taskId); diff --git a/src/battle/anim/alert.c b/src/battle/anim/alert.c index 04ae15a5e..f0d437627 100644 --- a/src/battle/anim/alert.c +++ b/src/battle/anim/alert.c @@ -33,8 +33,8 @@ const union AnimCmd *const gSpriteAnimTable_83D744C[] = const struct SpriteTemplate gBattleAnimSpriteTemplate_83D7450 = { - .tileTag = 10075, - .paletteTag = 10075, + .tileTag = ANIM_TAG_ALERT, + .paletteTag = ANIM_TAG_ALERT, .oam = &gOamData_837DF54, .anims = gSpriteAnimTable_83D744C, .images = NULL, diff --git a/src/battle/anim/angel.c b/src/battle/anim/angel.c index be5b82ea1..4121e3c70 100644 --- a/src/battle/anim/angel.c +++ b/src/battle/anim/angel.c @@ -26,8 +26,8 @@ const union AnimCmd *const gSpriteAnimTable_83D7BB4[] = const struct SpriteTemplate gBattleAnimSpriteTemplate_83D7BB8 = { - .tileTag = 10220, - .paletteTag = 10220, + .tileTag = ANIM_TAG_ANGEL, + .paletteTag = ANIM_TAG_ANGEL, .oam = &gOamData_837DF34, .anims = gSpriteAnimTable_83D7BB4, .images = NULL, diff --git a/src/battle/anim/angel_kiss.c b/src/battle/anim/angel_kiss.c index 64abff6cf..1b395fded 100644 --- a/src/battle/anim/angel_kiss.c +++ b/src/battle/anim/angel_kiss.c @@ -16,8 +16,8 @@ void sub_80D2A38(struct Sprite* sprite); const struct SpriteTemplate gBattleAnimSpriteTemplate_83D7BD0 = { - .tileTag = 10219, - .paletteTag = 10219, + .tileTag = ANIM_TAG_PINK_HEART, + .paletteTag = ANIM_TAG_PINK_HEART, .oam = &gOamData_837DF2C, .anims = gDummySpriteAnimTable, .images = NULL, diff --git a/src/battle/anim/anger.c b/src/battle/anim/anger.c index a50404ddf..7abe53ab8 100644 --- a/src/battle/anim/anger.c +++ b/src/battle/anim/anger.c @@ -27,8 +27,8 @@ const union AffineAnimCmd *const gSpriteAffineAnimTable_83D7794[] = const struct SpriteTemplate gBattleAnimSpriteTemplate_83D7798 = { - .tileTag = 10087, - .paletteTag = 10087, + .tileTag = ANIM_TAG_ANGER, + .paletteTag = ANIM_TAG_ANGER, .oam = &gOamData_837DF8C, .anims = gDummySpriteAnimTable, .images = NULL, diff --git a/src/battle/anim/aurora.c b/src/battle/anim/aurora.c index 3564da811..ed41e9e79 100644 --- a/src/battle/anim/aurora.c +++ b/src/battle/anim/aurora.c @@ -46,8 +46,8 @@ const union AffineAnimCmd *const gSpriteAffineAnimTable_83D91C0[] = // Multi-colored rings used in Aurora Beam. const struct SpriteTemplate RainbowRingSpriteTemplate = { - .tileTag = 10140, - .paletteTag = 10140, + .tileTag = ANIM_TAG_RAINBOW_RINGS, + .paletteTag = ANIM_TAG_RAINBOW_RINGS, .oam = &gOamData_837E024, .anims = gSpriteAnimTable_83D91A0, .images = NULL, diff --git a/src/battle/anim/beta_beat_up.c b/src/battle/anim/beta_beat_up.c index 166782362..bc70b705c 100644 --- a/src/battle/anim/beta_beat_up.c +++ b/src/battle/anim/beta_beat_up.c @@ -27,8 +27,8 @@ const union AffineAnimCmd *const gSpriteAffineAnimTable_83D9808[] = const struct SpriteTemplate gSpriteTemplate_83D980C = { - .tileTag = 10143, - .paletteTag = 10143, + .tileTag = ANIM_TAG_HANDS_AND_FEET, + .paletteTag = ANIM_TAG_HANDS_AND_FEET, .oam = &gOamData_837DF94, .anims = gDummySpriteAnimTable, .images = NULL, diff --git a/src/battle/anim/blow_kiss.c b/src/battle/anim/blow_kiss.c index 80056614f..d66e4aade 100644 --- a/src/battle/anim/blow_kiss.c +++ b/src/battle/anim/blow_kiss.c @@ -16,8 +16,8 @@ static void sub_80D1FA4(struct Sprite* sprite); const struct SpriteTemplate gBattleAnimSpriteTemplate_83D7AB0 = { - .tileTag = 10216, - .paletteTag = 10216, + .tileTag = ANIM_TAG_RED_HEART, + .paletteTag = ANIM_TAG_RED_HEART, .oam = &gOamData_837DF2C, .anims = gDummySpriteAnimTable, .images = NULL, diff --git a/src/battle/anim/bottle.c b/src/battle/anim/bottle.c index 83a539f89..c5b43d7bc 100644 --- a/src/battle/anim/bottle.c +++ b/src/battle/anim/bottle.c @@ -39,8 +39,8 @@ const union AffineAnimCmd *const gSpriteAffineAnimTable_83D6C40[] = const struct SpriteTemplate gBattleAnimSpriteTemplate_83D6C48 = { - .tileTag = 10099, - .paletteTag = 10099, + .tileTag = ANIM_TAG_MILK_BOTTLE, + .paletteTag = ANIM_TAG_MILK_BOTTLE, .oam = &gOamData_837E0B4, .anims = gDummySpriteAnimTable, .images = NULL, diff --git a/src/battle/anim/brace.c b/src/battle/anim/brace.c index 89330788c..acf31e121 100644 --- a/src/battle/anim/brace.c +++ b/src/battle/anim/brace.c @@ -30,8 +30,8 @@ const union AnimCmd *const gSpriteAnimTable_83D6E94[] = const struct SpriteTemplate gBattleAnimSpriteTemplate_EndureFlame = { - .tileTag = 10184, - .paletteTag = 10184, + .tileTag = ANIM_TAG_FOCUS_ENERGY, + .paletteTag = ANIM_TAG_FOCUS_ENERGY, .oam = &gOamData_837DF74, .anims = gSpriteAnimTable_83D6E94, .images = NULL, diff --git a/src/battle/anim/breath.c b/src/battle/anim/breath.c index 87c737fac..b55ff729e 100644 --- a/src/battle/anim/breath.c +++ b/src/battle/anim/breath.c @@ -39,8 +39,8 @@ const union AnimCmd *const gSpriteAnimTable_83D775C[] = const struct SpriteTemplate gBattleAnimSpriteTemplate_83D7764 = { - .tileTag = 10086, - .paletteTag = 10086, + .tileTag = ANIM_TAG_BREATH, + .paletteTag = ANIM_TAG_BREATH, .oam = &gOamData_837DF2C, .anims = gSpriteAnimTable_83D775C, .images = NULL, diff --git a/src/battle/anim/bubble.c b/src/battle/anim/bubble.c index ceefd82cf..9caf4d918 100644 --- a/src/battle/anim/bubble.c +++ b/src/battle/anim/bubble.c @@ -43,8 +43,8 @@ const union AnimCmd *const gSpriteAnimTable_83D9174[] = const struct SpriteTemplate gBattleAnimSpriteTemplate_83D9178 = { - .tileTag = 10146, - .paletteTag = 10146, + .tileTag = ANIM_TAG_BUBBLE, + .paletteTag = ANIM_TAG_BUBBLE, .oam = &gOamData_837E0AC, .anims = gSpriteAnimTable_83D9174, .images = NULL, diff --git a/src/battle/anim/bug.c b/src/battle/anim/bug.c index e4ea01f5c..b9429a75a 100644 --- a/src/battle/anim/bug.c +++ b/src/battle/anim/bug.c @@ -49,8 +49,8 @@ const union AffineAnimCmd *const gSpriteAffineAnimTable_83DAAB0[] = const struct SpriteTemplate gBattleAnimSpriteTemplate_83DAABC = { - .tileTag = 10153, - .paletteTag = 10153, + .tileTag = ANIM_TAG_HORN_HIT_2, + .paletteTag = ANIM_TAG_HORN_HIT_2, .oam = &gOamData_837E014, .anims = gDummySpriteAnimTable, .images = NULL, @@ -85,8 +85,8 @@ const union AffineAnimCmd *const gSpriteAffineAnimTable_83DAB04[] = const struct SpriteTemplate gBattleAnimSpriteTemplate_83DAB10 = { - .tileTag = 10161, - .paletteTag = 10161, + .tileTag = ANIM_TAG_NEEDLE, + .paletteTag = ANIM_TAG_NEEDLE, .oam = &gOamData_837DF8C, .anims = gDummySpriteAnimTable, .images = NULL, @@ -96,8 +96,8 @@ const struct SpriteTemplate gBattleAnimSpriteTemplate_83DAB10 = const struct SpriteTemplate gBattleAnimSpriteTemplate_83DAB28 = { - .tileTag = 10180, - .paletteTag = 10180, + .tileTag = ANIM_TAG_STRING_DOT, + .paletteTag = ANIM_TAG_STRING_DOT, .oam = &gOamData_837DF24, .anims = gDummySpriteAnimTable, .images = NULL, @@ -107,8 +107,8 @@ const struct SpriteTemplate gBattleAnimSpriteTemplate_83DAB28 = const struct SpriteTemplate gBattleAnimSpriteTemplate_83DAB40 = { - .tileTag = 10179, - .paletteTag = 10179, + .tileTag = ANIM_TAG_STRING, + .paletteTag = ANIM_TAG_STRING, .oam = &gOamData_837DF5C, .anims = gDummySpriteAnimTable, .images = NULL, @@ -130,8 +130,8 @@ const union AffineAnimCmd *const gSpriteAffineAnimTable_83DAB70[] = const struct SpriteTemplate gBattleAnimSpriteTemplate_83DAB74 = { - .tileTag = 10181, - .paletteTag = 10181, + .tileTag = ANIM_TAG_WEB, + .paletteTag = ANIM_TAG_WEB, .oam = &gOamData_837E11C, .anims = gDummySpriteAnimTable, .images = NULL, @@ -141,8 +141,8 @@ const struct SpriteTemplate gBattleAnimSpriteTemplate_83DAB74 = const struct SpriteTemplate gLinearStingerSpriteTemplate = { - .tileTag = 10161, - .paletteTag = 10161, + .tileTag = ANIM_TAG_NEEDLE, + .paletteTag = ANIM_TAG_NEEDLE, .oam = &gOamData_837DF8C, .anims = gDummySpriteAnimTable, .images = NULL, @@ -152,8 +152,8 @@ const struct SpriteTemplate gLinearStingerSpriteTemplate = const struct SpriteTemplate gPinMissileSpriteTemplate = { - .tileTag = 10161, - .paletteTag = 10161, + .tileTag = ANIM_TAG_NEEDLE, + .paletteTag = ANIM_TAG_NEEDLE, .oam = &gOamData_837DF8C, .anims = gDummySpriteAnimTable, .images = NULL, @@ -163,8 +163,8 @@ const struct SpriteTemplate gPinMissileSpriteTemplate = const struct SpriteTemplate gIcicleSpearSpriteTemplate = { - .tileTag = 10262, - .paletteTag = 10262, + .tileTag = ANIM_TAG_ICICLE_SPEAR, + .paletteTag = ANIM_TAG_ICICLE_SPEAR, .oam = &gOamData_837DF94, .anims = gDummySpriteAnimTable, .images = NULL, @@ -190,8 +190,8 @@ const union AffineAnimCmd *const gSpriteAffineAnimTable_83DAC0C[] = const struct SpriteTemplate gBattleAnimSpriteTemplate_83DAC10 = { - .tileTag = 10212, - .paletteTag = 10212, + .tileTag = ANIM_TAG_CIRCLE_OF_LIGHT, + .paletteTag = ANIM_TAG_CIRCLE_OF_LIGHT, .oam = &gOamData_837E0BC, .anims = gDummySpriteAnimTable, .images = NULL, diff --git a/src/battle/anim/bullet.c b/src/battle/anim/bullet.c index 60c001853..a47cfeccc 100644 --- a/src/battle/anim/bullet.c +++ b/src/battle/anim/bullet.c @@ -29,8 +29,8 @@ const union AffineAnimCmd *const gSpriteAffineAnimTable_83D7624[] = const struct SpriteTemplate gBattleAnimSpriteTemplate_83D7628 = { - .tileTag = 10006, - .paletteTag = 10006, + .tileTag = ANIM_TAG_SEED, + .paletteTag = ANIM_TAG_SEED, .oam = &gOamData_837DF8C, .anims = gDummySpriteAnimTable, .images = NULL, @@ -54,7 +54,7 @@ static void sub_80D0030(struct Sprite* sprite) int i; u16 rand; s16* ptr; - PlaySE12WithPanning(0xA6, BattleAnimAdjustPanning(0x3F)); + PlaySE12WithPanning(0xA6, BattleAnimAdjustPanning(SOUND_PAN_TARGET)); sprite->pos1.x += sprite->pos2.x; sprite->pos1.y += sprite->pos2.y; sprite->pos2.y = 0; diff --git a/src/battle/anim/copy_orb.c b/src/battle/anim/copy_orb.c index d554a7e26..da42814fa 100644 --- a/src/battle/anim/copy_orb.c +++ b/src/battle/anim/copy_orb.c @@ -32,8 +32,8 @@ const union AffineAnimCmd *const gSpriteAffineAnimTable_83D65E0[] = { const struct SpriteTemplate gBattleAnimSpriteTemplate_83D65E8 = { - .tileTag = 10147, - .paletteTag = 10147, + .tileTag = ANIM_TAG_ORBS, + .paletteTag = ANIM_TAG_ORBS, .oam = &gOamData_837DFEC, .anims = gSpriteAnimTable_83D62D4, .images = NULL, diff --git a/src/battle/anim/cube.c b/src/battle/anim/cube.c index 9d713ba46..5dd83c4bd 100644 --- a/src/battle/anim/cube.c +++ b/src/battle/anim/cube.c @@ -41,8 +41,8 @@ const union AnimCmd *const gSpriteAnimTable_83D6EEC[] = const struct SpriteTemplate gBattleAnimSpriteTemplate_83D6EF0 = { - .tileTag = 10185, - .paletteTag = 10185, + .tileTag = ANIM_TAG_SPHERE_TO_CUBE, + .paletteTag = ANIM_TAG_SPHERE_TO_CUBE, .oam = &gOamData_837DF34, .anims = gSpriteAnimTable_83D6EEC, .images = NULL, @@ -59,7 +59,7 @@ void sub_80CDFB0(struct Sprite* sprite) sprite->data[2] = 0; sprite->data[3] = 0; sprite->data[4] = 0; - sprite->data[5] = BattleAnimAdjustPanning(-0x40); + sprite->data[5] = BattleAnimAdjustPanning(SOUND_PAN_ATTACKER_NEG); sprite->callback = sub_80CE000; } diff --git a/src/battle/anim/current.c b/src/battle/anim/current.c index ea73b0116..8547e9565 100644 --- a/src/battle/anim/current.c +++ b/src/battle/anim/current.c @@ -51,8 +51,8 @@ const union AffineAnimCmd *const gSpriteAffineAnimTable_83D989C[] = const struct SpriteTemplate gBattleAnimSpriteTemplate_83D98A0 = { - .tileTag = 10011, - .paletteTag = 10011, + .tileTag = ANIM_TAG_SPARK_2, + .paletteTag = ANIM_TAG_SPARK_2, .oam = &gOamData_837DF8C, .anims = gDummySpriteAnimTable, .images = NULL, @@ -88,8 +88,8 @@ const union AffineAnimCmd *const gSpriteAffineAnimTable_83D98EC[] = const struct SpriteTemplate gBattleAnimSpriteTemplate_83D98F0 = { - .tileTag = 10282, - .paletteTag = 10282, + .tileTag = ANIM_TAG_SHOCK_3, + .paletteTag = ANIM_TAG_SHOCK_3, .oam = &gOamData_837DF94, .anims = gSpriteAnimTable_83D98C8, .images = NULL, @@ -99,8 +99,8 @@ const struct SpriteTemplate gBattleAnimSpriteTemplate_83D98F0 = const struct SpriteTemplate gBattleAnimSpriteTemplate_83D9908 = { - .tileTag = 10011, - .paletteTag = 10011, + .tileTag = ANIM_TAG_SPARK_2, + .paletteTag = ANIM_TAG_SPARK_2, .oam = &gOamData_837DF8C, .anims = gDummySpriteAnimTable, .images = NULL, @@ -110,8 +110,8 @@ const struct SpriteTemplate gBattleAnimSpriteTemplate_83D9908 = const struct SpriteTemplate gElectricitySpriteTemplate = { - .tileTag = 10011, - .paletteTag = 10011, + .tileTag = ANIM_TAG_SPARK_2, + .paletteTag = ANIM_TAG_SPARK_2, .oam = &gOamData_837DF2C, .anims = gDummySpriteAnimTable, .images = NULL, @@ -121,8 +121,8 @@ const struct SpriteTemplate gElectricitySpriteTemplate = const struct SpriteTemplate gSpriteTemplate_83D9938 = { - .tileTag = 10001, - .paletteTag = 10001, + .tileTag = ANIM_TAG_SPARK, + .paletteTag = ANIM_TAG_SPARK, .oam = &gOamData_837DF24, .anims = gDummySpriteAnimTable, .images = NULL, @@ -132,8 +132,8 @@ const struct SpriteTemplate gSpriteTemplate_83D9938 = const struct SpriteTemplate gBattleAnimSpriteTemplate_83D9950 = { - .tileTag = 10173, - .paletteTag = 10173, + .tileTag = ANIM_TAG_SPARK_H, + .paletteTag = ANIM_TAG_SPARK_H, .oam = &gOamData_837DF54, .anims = gDummySpriteAnimTable, .images = NULL, @@ -187,8 +187,8 @@ const union AnimCmd *const gSpriteAnimTable_83D99B0[] = const struct SpriteTemplate gSpriteTemplate_83D99B8 = { - .tileTag = 10211, - .paletteTag = 10211, + .tileTag = ANIM_TAG_ELECTRIC_ORBS, + .paletteTag = ANIM_TAG_ELECTRIC_ORBS, .oam = &gOamData_837DF24, .anims = gSpriteAnimTable_83D99B0, .images = NULL, @@ -235,8 +235,8 @@ const union AffineAnimCmd *const gSpriteAffineAnimTable_83D9A60[] = const struct SpriteTemplate gBattleAnimSpriteTemplate_83D9A6C = { - .tileTag = 10212, - .paletteTag = 10212, + .tileTag = ANIM_TAG_CIRCLE_OF_LIGHT, + .paletteTag = ANIM_TAG_CIRCLE_OF_LIGHT, .oam = &gOamData_837E0BC, .anims = gDummySpriteAnimTable, .images = NULL, @@ -260,8 +260,8 @@ const union AnimCmd *const gSpriteAnimTable_83D9A98[] = const struct SpriteTemplate gBattleAnimSpriteTemplate_83D9A9C = { - .tileTag = 10213, - .paletteTag = 10213, + .tileTag = ANIM_TAG_ELECTRICITY, + .paletteTag = ANIM_TAG_ELECTRICITY, .oam = &gOamData_837DF34, .anims = gSpriteAnimTable_83D9A98, .images = NULL, @@ -271,8 +271,8 @@ const struct SpriteTemplate gBattleAnimSpriteTemplate_83D9A9C = const struct SpriteTemplate gBattleAnimSpriteTemplate_83D9AB4 = { - .tileTag = 10212, - .paletteTag = 10212, + .tileTag = ANIM_TAG_CIRCLE_OF_LIGHT, + .paletteTag = ANIM_TAG_CIRCLE_OF_LIGHT, .oam = &gOamData_837E0BC, .anims = gDummySpriteAnimTable, .images = NULL, @@ -325,8 +325,8 @@ const union AffineAnimCmd *const gSpriteAffineAnimTable_83D9B0C[] = const struct SpriteTemplate gSpriteTemplate_83D9B10 = { - .tileTag = 10001, - .paletteTag = 10001, + .tileTag = ANIM_TAG_SPARK, + .paletteTag = ANIM_TAG_SPARK, .oam = &gOamData_837E024, .anims = gSpriteAnimTable_83D9AEC, .images = NULL, @@ -336,8 +336,8 @@ const struct SpriteTemplate gSpriteTemplate_83D9B10 = const struct SpriteTemplate gBattleAnimSpriteTemplate_83D9B28 = { - .tileTag = 10212, - .paletteTag = 10212, + .tileTag = ANIM_TAG_CIRCLE_OF_LIGHT, + .paletteTag = ANIM_TAG_CIRCLE_OF_LIGHT, .oam = &gOamData_837E0BC, .anims = gDummySpriteAnimTable, .images = NULL, @@ -347,8 +347,8 @@ const struct SpriteTemplate gBattleAnimSpriteTemplate_83D9B28 = const struct SpriteTemplate gSpriteTemplate_83D9B40 = { - .tileTag = 10001, - .paletteTag = 10001, + .tileTag = ANIM_TAG_SPARK, + .paletteTag = ANIM_TAG_SPARK, .oam = &gOamData_837DF24, .anims = gDummySpriteAnimTable, .images = NULL, @@ -1175,7 +1175,7 @@ void sub_80D72DC(u8 taskId) task->data[5] = -1; task->data[11] = 12; task->data[12] = BattleAnimAdjustPanning(task->data[11] - 76); - task->data[13] = BattleAnimAdjustPanning(63); + task->data[13] = BattleAnimAdjustPanning(SOUND_PAN_TARGET); task->data[14] = task->data[12]; task->data[15] = (task->data[13] - task->data[12]) / 3; task->data[0]++; @@ -1298,7 +1298,7 @@ void sub_80D759C(u8 taskId) } task->data[13] = GetBattlerSpriteCoord(gAnimBankTarget, 2); - task->data[12] = sub_8079E90(gAnimBankTarget) - 2; + task->data[12] = GetBattlerSubpriority(gAnimBankTarget) - 2; task->data[0]++; break; case 1: diff --git a/src/battle/anim/cyclone.c b/src/battle/anim/cyclone.c index 8b868a436..8a7f34d5d 100644 --- a/src/battle/anim/cyclone.c +++ b/src/battle/anim/cyclone.c @@ -27,8 +27,8 @@ const union AffineAnimCmd *const gSpriteAffineAnimTable_83D7658[] = const struct SpriteTemplate gBattleAnimSpriteTemplate_83D765C = { - .tileTag = 10009, - .paletteTag = 10009, + .tileTag = ANIM_TAG_GUST, + .paletteTag = ANIM_TAG_GUST, .oam = &gOamData_837DFDC, .anims = gDummySpriteAnimTable, .images = NULL, diff --git a/src/battle/anim/dark.c b/src/battle/anim/dark.c index 09e16b8fe..fcbced40e 100644 --- a/src/battle/anim/dark.c +++ b/src/battle/anim/dark.c @@ -46,8 +46,8 @@ static void sub_80E0CD0(u8 taskId); const struct SpriteTemplate gSpriteTemplate_83DB118 = { - .tileTag = 10015, - .paletteTag = 10015, + .tileTag = ANIM_TAG_TIED_BAG, + .paletteTag = ANIM_TAG_TIED_BAG, .oam = &gOamData_837DF2C, .anims = gDummySpriteAnimTable, .images = NULL, @@ -117,8 +117,8 @@ const union AffineAnimCmd *const gSpriteAffineAnimTable_83DB1B0[] = const struct SpriteTemplate gBattleAnimSpriteTemplate_83DB1D0 = { - .tileTag = 10139, - .paletteTag = 10139, + .tileTag = ANIM_TAG_SHARP_TEETH, + .paletteTag = ANIM_TAG_SHARP_TEETH, .oam = &gOamData_837E0BC, .anims = gDummySpriteAnimTable, .images = NULL, @@ -128,8 +128,8 @@ const struct SpriteTemplate gBattleAnimSpriteTemplate_83DB1D0 = const struct SpriteTemplate gBattleAnimSpriteTemplate_83DB1E8 = { - .tileTag = 10145, - .paletteTag = 10145, + .tileTag = ANIM_TAG_CLAMP, + .paletteTag = ANIM_TAG_CLAMP, .oam = &gOamData_837E0BC, .anims = gDummySpriteAnimTable, .images = NULL, @@ -159,8 +159,8 @@ const union AffineAnimCmd *const gSpriteAffineAnimTable_83DB230[] = const struct SpriteTemplate gBattleAnimSpriteTemplate_83DB238 = { - .tileTag = 10155, - .paletteTag = 10155, + .tileTag = ANIM_TAG_SMALL_BUBBLES, + .paletteTag = ANIM_TAG_SMALL_BUBBLES, .oam = &gOamData_837DF8C, .anims = gDummySpriteAnimTable, .images = NULL, @@ -196,8 +196,8 @@ const union AnimCmd *const gSpriteAnimTable_83DB280[] = const struct SpriteTemplate gBattleAnimSpriteTemplate_83DB288 = { - .tileTag = 10039, - .paletteTag = 10039, + .tileTag = ANIM_TAG_CLAW_SLASH, + .paletteTag = ANIM_TAG_CLAW_SLASH, .oam = &gOamData_837DF34, .anims = gSpriteAnimTable_83DB280, .images = NULL, diff --git a/src/battle/anim/devil.c b/src/battle/anim/devil.c index 8183be2ba..8e1010d2b 100644 --- a/src/battle/anim/devil.c +++ b/src/battle/anim/devil.c @@ -29,8 +29,8 @@ const union AnimCmd *const gSpriteAnimTable_83D7BF8[] = const struct SpriteTemplate gBattleAnimSpriteTemplate_83D7C00 = { - .tileTag = 10221, - .paletteTag = 10221, + .tileTag = ANIM_TAG_DEVIL, + .paletteTag = ANIM_TAG_DEVIL, .oam = &gOamData_837DF34, .anims = gSpriteAnimTable_83D7BF8, .images = NULL, @@ -45,7 +45,7 @@ void sub_80D2ABC(struct Sprite *sprite) sprite->pos1.x += gBattleAnimArgs[0]; sprite->pos1.y += gBattleAnimArgs[1]; StartSpriteAnim(sprite, 0); - sprite->subpriority = sub_8079E90(gAnimBankTarget) - 1; + sprite->subpriority = GetBattlerSubpriority(gAnimBankTarget) - 1; sprite->data[2] = 1; } sprite->data[0] += sprite->data[2]; diff --git a/src/battle/anim/dragon.c b/src/battle/anim/dragon.c index 0b5b1b88b..c9a1d1539 100644 --- a/src/battle/anim/dragon.c +++ b/src/battle/anim/dragon.c @@ -42,8 +42,8 @@ const union AnimCmd *const gSpriteAnimTable_83DAFC8[] = const struct SpriteTemplate gBattleAnimSpriteTemplate_83DAFCC = { - .tileTag = 10029, - .paletteTag = 10029, + .tileTag = ANIM_TAG_SMALL_EMBER, + .paletteTag = ANIM_TAG_SMALL_EMBER, .oam = &gOamData_837DF34, .anims = gSpriteAnimTable_83DAFC8, .images = NULL, @@ -95,8 +95,8 @@ const union AffineAnimCmd *const gSpriteAffineAnimTable_83DB03C[] = const struct SpriteTemplate gBattleAnimSpriteTemplate_83DB044 = { - .tileTag = 10029, - .paletteTag = 10029, + .tileTag = ANIM_TAG_SMALL_EMBER, + .paletteTag = ANIM_TAG_SMALL_EMBER, .oam = &gOamData_837DFF4, .anims = gSpriteAnimTable_83DB004, .images = NULL, @@ -121,8 +121,8 @@ const union AnimCmd *const gSpriteAnimTable_83DB074[] = const struct SpriteTemplate gBattleAnimSpriteTemplate_83DB078 = { - .tileTag = 10035, - .paletteTag = 10035, + .tileTag = ANIM_TAG_FIRE_PLUME, + .paletteTag = ANIM_TAG_FIRE_PLUME, .oam = &gOamData_837DF34, .anims = gSpriteAnimTable_83DB074, .images = NULL, @@ -164,8 +164,8 @@ const union AffineAnimCmd *const gSpriteAffineAnimTable_83DB0C8[] = const struct SpriteTemplate gBattleAnimSpriteTemplate_83DB0D0 = { - .tileTag = 10029, - .paletteTag = 10029, + .tileTag = ANIM_TAG_SMALL_EMBER, + .paletteTag = ANIM_TAG_SMALL_EMBER, .oam = &gOamData_837DFF4, .anims = gSpriteAnimTable_83DB0A0, .images = NULL, @@ -175,8 +175,8 @@ const struct SpriteTemplate gBattleAnimSpriteTemplate_83DB0D0 = const struct SpriteTemplate gBattleAnimSpriteTemplate_83DB0E8 = { - .tileTag = 10249, - .paletteTag = 10249, + .tileTag = ANIM_TAG_HOLLOW_ORB, + .paletteTag = ANIM_TAG_HOLLOW_ORB, .oam = &gOamData_837DF2C, .anims = gDummySpriteAnimTable, .images = NULL, @@ -186,8 +186,8 @@ const struct SpriteTemplate gBattleAnimSpriteTemplate_83DB0E8 = const struct SpriteTemplate gBattleAnimSpriteTemplate_83DB100 = { - .tileTag = 10029, - .paletteTag = 10029, + .tileTag = ANIM_TAG_SMALL_EMBER, + .paletteTag = ANIM_TAG_SMALL_EMBER, .oam = &gOamData_837DF34, .anims = gSpriteAnimTable_83DAFC8, .images = NULL, diff --git a/src/battle/anim/draw.c b/src/battle/anim/draw.c index 08b09337f..b25c4fb9a 100644 --- a/src/battle/anim/draw.c +++ b/src/battle/anim/draw.c @@ -21,8 +21,8 @@ static void sub_80D0E8C(struct Sprite* sprite); const struct SpriteTemplate gBattleAnimSpriteTemplate_83D77E0 = { - .tileTag = 10002, - .paletteTag = 10002, + .tileTag = ANIM_TAG_PENCIL, + .paletteTag = ANIM_TAG_PENCIL, .oam = &gOamData_837DF34, .anims = gDummySpriteAnimTable, .images = NULL, @@ -128,7 +128,7 @@ void sub_80D0E30(struct Sprite* sprite) sprite->data[3] = 16; sprite->data[4] = 0; sprite->data[5] = sub_807A100(gAnimBankTarget, 0) + 2; - sprite->data[6] = BattleAnimAdjustPanning(0x3F); + sprite->data[6] = BattleAnimAdjustPanning(SOUND_PAN_TARGET); sprite->callback = sub_80D0E8C; } diff --git a/src/battle/anim/egg.c b/src/battle/anim/egg.c index 5b6d56dac..c47d223bf 100644 --- a/src/battle/anim/egg.c +++ b/src/battle/anim/egg.c @@ -6,8 +6,8 @@ const struct SpriteTemplate gBattleAnimSpriteTemplate_83D7594 = { - .tileTag = 10175, - .paletteTag = 10175, + .tileTag = ANIM_TAG_LARGE_FRESH_EGG, + .paletteTag = ANIM_TAG_LARGE_FRESH_EGG, .oam = &gOamData_837DF2C, .anims = gDummySpriteAnimTable, .images = NULL, diff --git a/src/battle/anim/energy_wave.c b/src/battle/anim/energy_wave.c index cbca5338c..cdf3e3ced 100644 --- a/src/battle/anim/energy_wave.c +++ b/src/battle/anim/energy_wave.c @@ -37,8 +37,8 @@ const union AnimCmd *const gSpriteAnimTable_83D91F0[] = const struct SpriteTemplate gBattleAnimSpriteTemplate_83D91F4 = { - .tileTag = 10149, - .paletteTag = 10149, + .tileTag = ANIM_TAG_WATER_ORB, + .paletteTag = ANIM_TAG_WATER_ORB, .oam = &gOamData_837E04C, .anims = gSpriteAnimTable_83D91F0, .images = NULL, @@ -48,8 +48,8 @@ const struct SpriteTemplate gBattleAnimSpriteTemplate_83D91F4 = const struct SpriteTemplate gBattleAnimSpriteTemplate_83D920C = { - .tileTag = 10259, - .paletteTag = 10259, + .tileTag = ANIM_TAG_BROWN_ORB, + .paletteTag = ANIM_TAG_BROWN_ORB, .oam = &gOamData_837E04C, .anims = gSpriteAnimTable_83D91F0, .images = NULL, @@ -59,8 +59,8 @@ const struct SpriteTemplate gBattleAnimSpriteTemplate_83D920C = const struct SpriteTemplate gBattleAnimSpriteTemplate_83D9224 = { - .tileTag = 10264, - .paletteTag = 10264, + .tileTag = ANIM_TAG_GLOWY_RED_ORB, + .paletteTag = ANIM_TAG_GLOWY_RED_ORB, .oam = &gOamData_837DF24, .anims = gDummySpriteAnimTable, .images = NULL, @@ -70,8 +70,8 @@ const struct SpriteTemplate gBattleAnimSpriteTemplate_83D9224 = const struct SpriteTemplate gBattleAnimSpriteTemplate_83D923C = { - .tileTag = 10265, - .paletteTag = 10265, + .tileTag = ANIM_TAG_GLOWY_GREEN_ORB, + .paletteTag = ANIM_TAG_GLOWY_GREEN_ORB, .oam = &gOamData_837DF24, .anims = gDummySpriteAnimTable, .images = NULL, @@ -94,8 +94,8 @@ const union AnimCmd *const gSpriteAnimTable_83D9264[] = const struct SpriteTemplate gBattleAnimSpriteTemplate_83D9268 = { - .tileTag = 10029, - .paletteTag = 10029, + .tileTag = ANIM_TAG_SMALL_EMBER, + .paletteTag = ANIM_TAG_SMALL_EMBER, .oam = &gOamData_837DF34, .anims = gSpriteAnimTable_83D9264, .images = NULL, @@ -105,8 +105,8 @@ const struct SpriteTemplate gBattleAnimSpriteTemplate_83D9268 = const struct SpriteTemplate gBattleAnimSpriteTemplate_83D9280 = { - .tileTag = 10165, - .paletteTag = 10165, + .tileTag = ANIM_TAG_BLUE_RING, + .paletteTag = ANIM_TAG_BLUE_RING, .oam = &gOamData_837E034, .anims = gDummySpriteAnimTable, .images = NULL, @@ -140,8 +140,8 @@ const union AffineAnimCmd *const gSpriteAffineAnimTable_83D92CC[] = const struct SpriteTemplate gBattleAnimSpriteTemplate_83D92D0 = { - .tileTag = 10149, - .paletteTag = 10149, + .tileTag = ANIM_TAG_WATER_ORB, + .paletteTag = ANIM_TAG_WATER_ORB, .oam = &gOamData_837E10C, .anims = gSpriteAnimTable_83D91F0, .images = NULL, @@ -151,8 +151,8 @@ const struct SpriteTemplate gBattleAnimSpriteTemplate_83D92D0 = const struct SpriteTemplate gBattleAnimSpriteTemplate_83D92E8 = { - .tileTag = 10149, - .paletteTag = 10149, + .tileTag = ANIM_TAG_WATER_ORB, + .paletteTag = ANIM_TAG_WATER_ORB, .oam = &gOamData_837E10C, .anims = gSpriteAnimTable_83D91F0, .images = NULL, @@ -232,7 +232,7 @@ void sub_80D3698(struct Sprite *sprite) sprite->pos1.y = GetBattlerSpriteCoord(gAnimBankAttacker, 1); sprite->pos2.y = -10; - subpriority = sub_8079E90(gAnimBankAttacker); + subpriority = GetBattlerSubpriority(gAnimBankAttacker); if (!IsContest()) { diff --git a/src/battle/anim/espeed.c b/src/battle/anim/espeed.c index a4f11c823..17d0b383f 100644 --- a/src/battle/anim/espeed.c +++ b/src/battle/anim/espeed.c @@ -40,8 +40,8 @@ const union AnimCmd *const gSpriteAnimTable_83D79E4[] = const struct SpriteTemplate gSpriteTemplate_83D79E8 = { - .tileTag = 10207, - .paletteTag = 10207, + .tileTag = ANIM_TAG_SPEED_DUST, + .paletteTag = ANIM_TAG_SPEED_DUST, .oam = &gOamData_837DF2C, .anims = gSpriteAnimTable_83D79E4, .images = NULL, diff --git a/src/battle/anim/fang.c b/src/battle/anim/fang.c index c35898eea..74de16b56 100644 --- a/src/battle/anim/fang.c +++ b/src/battle/anim/fang.c @@ -30,8 +30,8 @@ const union AnimCmd *const gSpriteAnimTable_83D707C[] = const struct SpriteTemplate gBattleAnimSpriteTemplate_83D7080 = { - .tileTag = 10192, - .paletteTag = 10192, + .tileTag = ANIM_TAG_FANG_ATTACK, + .paletteTag = ANIM_TAG_FANG_ATTACK, .oam = &gOamData_837DF34, .anims = gSpriteAnimTable_83D707C, .images = NULL, diff --git a/src/battle/anim/fight.c b/src/battle/anim/fight.c index 505356a57..76a8f2e7c 100644 --- a/src/battle/anim/fight.c +++ b/src/battle/anim/fight.c @@ -59,8 +59,8 @@ static void sub_80D99F4(struct Sprite *sprite); const struct SpriteTemplate gSpriteTemplate_83D9F24 = { - .tileTag = 10050, - .paletteTag = 10050, + .tileTag = ANIM_TAG_HUMANOID_FOOT, + .paletteTag = ANIM_TAG_HUMANOID_FOOT, .oam = &gOamData_837DF34, .anims = gDummySpriteAnimTable, .images = NULL, @@ -117,8 +117,8 @@ const union AnimCmd *const gSpriteAnimTable_83D9F70[] = const struct SpriteTemplate gBattleAnimSpriteTemplate_83D9F78 = { - .tileTag = 10143, - .paletteTag = 10143, + .tileTag = ANIM_TAG_HANDS_AND_FEET, + .paletteTag = ANIM_TAG_HANDS_AND_FEET, .oam = &gOamData_837DF34, .anims = gSpriteAnimTable_83D9F64, .images = NULL, @@ -128,8 +128,8 @@ const struct SpriteTemplate gBattleAnimSpriteTemplate_83D9F78 = const struct SpriteTemplate gBattleAnimSpriteTemplate_83D9F90 = { - .tileTag = 10143, - .paletteTag = 10143, + .tileTag = ANIM_TAG_HANDS_AND_FEET, + .paletteTag = ANIM_TAG_HANDS_AND_FEET, .oam = &gOamData_837DF34, .anims = gSpriteAnimTable_83D9F64, .images = NULL, @@ -139,8 +139,8 @@ const struct SpriteTemplate gBattleAnimSpriteTemplate_83D9F90 = const struct SpriteTemplate gFistFootSpriteTemplate = { - .tileTag = 10143, - .paletteTag = 10143, + .tileTag = ANIM_TAG_HANDS_AND_FEET, + .paletteTag = ANIM_TAG_HANDS_AND_FEET, .oam = &gOamData_837DF34, .anims = gSpriteAnimTable_83D9F64, .images = NULL, @@ -150,8 +150,8 @@ const struct SpriteTemplate gFistFootSpriteTemplate = const struct SpriteTemplate gBattleAnimSpriteTemplate_83D9FC0 = { - .tileTag = 10143, - .paletteTag = 10143, + .tileTag = ANIM_TAG_HANDS_AND_FEET, + .paletteTag = ANIM_TAG_HANDS_AND_FEET, .oam = &gOamData_837DF34, .anims = gSpriteAnimTable_83D9F64, .images = NULL, @@ -161,8 +161,8 @@ const struct SpriteTemplate gBattleAnimSpriteTemplate_83D9FC0 = const struct SpriteTemplate gBattleAnimSpriteTemplate_83D9FD8 = { - .tileTag = 10143, - .paletteTag = 10143, + .tileTag = ANIM_TAG_HANDS_AND_FEET, + .paletteTag = ANIM_TAG_HANDS_AND_FEET, .oam = &gOamData_837DF34, .anims = gSpriteAnimTable_83D9F70, .images = NULL, @@ -172,8 +172,8 @@ const struct SpriteTemplate gBattleAnimSpriteTemplate_83D9FD8 = const struct SpriteTemplate gBattleAnimSpriteTemplate_83D9FF0 = { - .tileTag = 10143, - .paletteTag = 10143, + .tileTag = ANIM_TAG_HANDS_AND_FEET, + .paletteTag = ANIM_TAG_HANDS_AND_FEET, .oam = &gOamData_837DF34, .anims = gSpriteAnimTable_83D9F68, .images = NULL, @@ -195,8 +195,8 @@ const union AffineAnimCmd *const gSpriteAffineAnimTable_83DA020[] = const struct SpriteTemplate gBattleAnimSpriteTemplate_83DA024 = { - .tileTag = 10143, - .paletteTag = 10143, + .tileTag = ANIM_TAG_HANDS_AND_FEET, + .paletteTag = ANIM_TAG_HANDS_AND_FEET, .oam = &gOamData_837DFF4, .anims = gSpriteAnimTable_83D9F64, .images = NULL, @@ -218,8 +218,8 @@ const union AffineAnimCmd *const gSpriteAffineAnimTable_83DA054[] = const struct SpriteTemplate gMegaPunchKickSpriteTemplate = { - .tileTag = 10143, - .paletteTag = 10143, + .tileTag = ANIM_TAG_HANDS_AND_FEET, + .paletteTag = ANIM_TAG_HANDS_AND_FEET, .oam = &gOamData_837DFF4, .anims = gSpriteAnimTable_83D9F64, .images = NULL, @@ -229,8 +229,8 @@ const struct SpriteTemplate gMegaPunchKickSpriteTemplate = const struct SpriteTemplate gStompFootSpriteTemplate = { - .tileTag = 10143, - .paletteTag = 10143, + .tileTag = ANIM_TAG_HANDS_AND_FEET, + .paletteTag = ANIM_TAG_HANDS_AND_FEET, .oam = &gOamData_837DF34, .anims = gSpriteAnimTable_83D9F68, .images = NULL, @@ -240,8 +240,8 @@ const struct SpriteTemplate gStompFootSpriteTemplate = const struct SpriteTemplate gBattleAnimSpriteTemplate_83DA088 = { - .tileTag = 10073, - .paletteTag = 10073, + .tileTag = ANIM_TAG_DUCK, + .paletteTag = ANIM_TAG_DUCK, .oam = &gOamData_837DF2C, .anims = gDummySpriteAnimTable, .images = NULL, @@ -251,8 +251,8 @@ const struct SpriteTemplate gBattleAnimSpriteTemplate_83DA088 = const struct SpriteTemplate gBattleAnimSpriteTemplate_83DA0A0 = { - .tileTag = 10167, - .paletteTag = 10167, + .tileTag = ANIM_TAG_BLUE_LIGHT_WALL, + .paletteTag = ANIM_TAG_BLUE_LIGHT_WALL, .oam = &gOamData_837E05C, .anims = gDummySpriteAnimTable, .images = NULL, @@ -262,8 +262,8 @@ const struct SpriteTemplate gBattleAnimSpriteTemplate_83DA0A0 = const struct SpriteTemplate gBattleAnimSpriteTemplate_83DA0B8 = { - .tileTag = 10208, - .paletteTag = 10208, + .tileTag = ANIM_TAG_TORN_METAL, + .paletteTag = ANIM_TAG_TORN_METAL, .oam = &gOamData_837DF34, .anims = gDummySpriteAnimTable, .images = NULL, @@ -287,8 +287,8 @@ const union AffineAnimCmd *const gSpriteAffineAnimTable_83DA0F8[] = const struct SpriteTemplate gBattleAnimSpriteTemplate_83DA0FC = { - .tileTag = 10212, - .paletteTag = 10212, + .tileTag = ANIM_TAG_CIRCLE_OF_LIGHT, + .paletteTag = ANIM_TAG_CIRCLE_OF_LIGHT, .oam = &gOamData_837E11C, .anims = gDummySpriteAnimTable, .images = NULL, @@ -298,8 +298,8 @@ const struct SpriteTemplate gBattleAnimSpriteTemplate_83DA0FC = const struct SpriteTemplate gBattleAnimSpriteTemplate_83DA114 = { - .tileTag = 10257, - .paletteTag = 10257, + .tileTag = ANIM_TAG_FLAT_ROCK, + .paletteTag = ANIM_TAG_FLAT_ROCK, .oam = &gOamData_837DF2C, .anims = gDummySpriteAnimTable, .images = NULL, @@ -309,8 +309,8 @@ const struct SpriteTemplate gBattleAnimSpriteTemplate_83DA114 = const struct SpriteTemplate gBattleAnimSpriteTemplate_83DA12C = { - .tileTag = 10256, - .paletteTag = 10256, + .tileTag = ANIM_TAG_METEOR, + .paletteTag = ANIM_TAG_METEOR, .oam = &gOamData_837DF3C, .anims = gDummySpriteAnimTable, .images = NULL, @@ -320,8 +320,8 @@ const struct SpriteTemplate gBattleAnimSpriteTemplate_83DA12C = const struct SpriteTemplate gBattleAnimSpriteTemplate_83DA144 = { - .tileTag = 10143, - .paletteTag = 10143, + .tileTag = ANIM_TAG_HANDS_AND_FEET, + .paletteTag = ANIM_TAG_HANDS_AND_FEET, .oam = &gOamData_837DF34, .anims = gSpriteAnimTable_83D9F64, .images = NULL, @@ -362,8 +362,8 @@ const union AnimCmd *const gSpriteAnimTable_83DA18C[] = const struct SpriteTemplate gBattleAnimSpriteTemplate_83DA198 = { - .tileTag = 10245, - .paletteTag = 10245, + .tileTag = ANIM_TAG_PURPLE_SCRATCH, + .paletteTag = ANIM_TAG_PURPLE_SCRATCH, .oam = &gOamData_837DF34, .anims = gSpriteAnimTable_83DA18C, .images = NULL, @@ -401,8 +401,8 @@ const union AnimCmd *const gSpriteAnimTable_83DA1D4[] = const struct SpriteTemplate gBattleAnimSpriteTemplate_83DA1E0 = { - .tileTag = 10246, - .paletteTag = 10246, + .tileTag = ANIM_TAG_PURPLE_SWIPE, + .paletteTag = ANIM_TAG_PURPLE_SWIPE, .oam = &gOamData_837DF3C, .anims = gSpriteAnimTable_83DA1D4, .images = NULL, @@ -424,8 +424,8 @@ const union AffineAnimCmd *const gSpriteAffineAnimTable_83DA210[] = const struct SpriteTemplate gBattleAnimSpriteTemplate_83DA214 = { - .tileTag = 10143, - .paletteTag = 10143, + .tileTag = ANIM_TAG_HANDS_AND_FEET, + .paletteTag = ANIM_TAG_HANDS_AND_FEET, .oam = &gOamData_837DFF4, .anims = gSpriteAnimTable_83D9F64, .images = NULL, diff --git a/src/battle/anim/finger.c b/src/battle/anim/finger.c index 66ca4ca06..fd4be79a9 100644 --- a/src/battle/anim/finger.c +++ b/src/battle/anim/finger.c @@ -59,8 +59,8 @@ const union AffineAnimCmd *const gSpriteAffineAnimTable_83D72C0[] = const struct SpriteTemplate gBattleAnimSpriteTemplate_83D72C8 = { - .tileTag = 10064, - .paletteTag = 10064, + .tileTag = ANIM_TAG_FINGER, + .paletteTag = ANIM_TAG_FINGER, .oam = &gOamData_837DFF4, .anims = gDummySpriteAnimTable, .images = NULL, @@ -70,8 +70,8 @@ const struct SpriteTemplate gBattleAnimSpriteTemplate_83D72C8 = const struct SpriteTemplate gBattleAnimSpriteTemplate_83D72E0 = { - .tileTag = 10064, - .paletteTag = 10064, + .tileTag = ANIM_TAG_FINGER, + .paletteTag = ANIM_TAG_FINGER, .oam = &gOamData_837DF94, .anims = gDummySpriteAnimTable, .images = NULL, @@ -125,8 +125,8 @@ const union AnimCmd *const gSpriteAnimTable_83D7348[] = const struct SpriteTemplate gBattleAnimSpriteTemplate_83D7358 = { - .tileTag = 10214, - .paletteTag = 10214, + .tileTag = ANIM_TAG_FINGER_2, + .paletteTag = ANIM_TAG_FINGER_2, .oam = &gOamData_837DF34, .anims = gSpriteAnimTable_83D7348, .images = NULL, diff --git a/src/battle/anim/fire.c b/src/battle/anim/fire.c index 929828ed4..c5d75d9a5 100644 --- a/src/battle/anim/fire.c +++ b/src/battle/anim/fire.c @@ -38,8 +38,8 @@ const union AnimCmd *const gSpriteAnimTable_83D9470[] = const struct SpriteTemplate gBattleAnimSpriteTemplate_83D9478 = { - .tileTag = 10029, - .paletteTag = 10029, + .tileTag = ANIM_TAG_SMALL_EMBER, + .paletteTag = ANIM_TAG_SMALL_EMBER, .oam = &gOamData_837DF34, .anims = gSpriteAnimTable_83D9470, .images = NULL, @@ -49,8 +49,8 @@ const struct SpriteTemplate gBattleAnimSpriteTemplate_83D9478 = const struct SpriteTemplate gBattleAnimSpriteTemplate_83D9490 = { - .tileTag = 10029, - .paletteTag = 10029, + .tileTag = ANIM_TAG_SMALL_EMBER, + .paletteTag = ANIM_TAG_SMALL_EMBER, .oam = &gOamData_837DF34, .anims = gSpriteAnimTable_83D9470, .images = NULL, @@ -105,8 +105,8 @@ const union AffineAnimCmd *const gSpriteAffineAnimTable_83D9504[] = const struct SpriteTemplate gBattleAnimSpriteTemplate_83D9508 = { - .tileTag = 10033, - .paletteTag = 10033, + .tileTag = ANIM_TAG_FIRE, + .paletteTag = ANIM_TAG_FIRE, .oam = &gOamData_837DF94, .anims = gSpriteAnimTable_83D94CC, .images = NULL, @@ -116,8 +116,8 @@ const struct SpriteTemplate gBattleAnimSpriteTemplate_83D9508 = const struct SpriteTemplate gBattleAnimSpriteTemplate_83D9520 = { - .tileTag = 10033, - .paletteTag = 10033, + .tileTag = ANIM_TAG_FIRE, + .paletteTag = ANIM_TAG_FIRE, .oam = &gOamData_837DF34, .anims = gSpriteAnimTable_83D94CC, .images = NULL, @@ -127,8 +127,8 @@ const struct SpriteTemplate gBattleAnimSpriteTemplate_83D9520 = const struct SpriteTemplate gBattleAnimSpriteTemplate_83D9538 = { - .tileTag = 10035, - .paletteTag = 10035, + .tileTag = ANIM_TAG_FIRE_PLUME, + .paletteTag = ANIM_TAG_FIRE_PLUME, .oam = &gOamData_837DF34, .anims = gSpriteAnimTable_83D94E8, .images = NULL, @@ -138,8 +138,8 @@ const struct SpriteTemplate gBattleAnimSpriteTemplate_83D9538 = const struct SpriteTemplate gSpriteTemplate_83D9550 = { - .tileTag = 10029, - .paletteTag = 10029, + .tileTag = ANIM_TAG_SMALL_EMBER, + .paletteTag = ANIM_TAG_SMALL_EMBER, .oam = &gOamData_837DF34, .anims = gSpriteAnimTable_83D94E8, .images = NULL, @@ -162,8 +162,8 @@ const union AnimCmd *const gSpriteAnimTable_83D9578[] = const struct SpriteTemplate gSpriteTemplate_83D957C = { - .tileTag = 10029, - .paletteTag = 10029, + .tileTag = ANIM_TAG_SMALL_EMBER, + .paletteTag = ANIM_TAG_SMALL_EMBER, .oam = &gOamData_837DF34, .anims = gSpriteAnimTable_83D9578, .images = NULL, diff --git a/src/battle/anim/fire_2.c b/src/battle/anim/fire_2.c index 68e13e1c1..9db989aac 100644 --- a/src/battle/anim/fire_2.c +++ b/src/battle/anim/fire_2.c @@ -45,8 +45,8 @@ const union AnimCmd *const gSpriteAnimTable_83D95E0[] = const struct SpriteTemplate gEmberSpriteTemplate = { - .tileTag = 10029, - .paletteTag = 10029, + .tileTag = ANIM_TAG_SMALL_EMBER, + .paletteTag = ANIM_TAG_SMALL_EMBER, .oam = &gOamData_837DF34, .anims = gDummySpriteAnimTable, .images = NULL, @@ -56,8 +56,8 @@ const struct SpriteTemplate gEmberSpriteTemplate = const struct SpriteTemplate gEmberFlareSpriteTemplate = { - .tileTag = 10029, - .paletteTag = 10029, + .tileTag = ANIM_TAG_SMALL_EMBER, + .paletteTag = ANIM_TAG_SMALL_EMBER, .oam = &gOamData_837DF34, .anims = gSpriteAnimTable_83D95E0, .images = NULL, @@ -67,8 +67,8 @@ const struct SpriteTemplate gEmberFlareSpriteTemplate = const struct SpriteTemplate gBattleAnimSpriteTemplate_83D9614 = { - .tileTag = 10029, - .paletteTag = 10029, + .tileTag = ANIM_TAG_SMALL_EMBER, + .paletteTag = ANIM_TAG_SMALL_EMBER, .oam = &gOamData_837DF34, .anims = gSpriteAnimTable_83D95E0, .images = NULL, @@ -78,8 +78,8 @@ const struct SpriteTemplate gBattleAnimSpriteTemplate_83D9614 = const struct SpriteTemplate gFireRingSpriteTemplate = { - .tileTag = 10029, - .paletteTag = 10029, + .tileTag = ANIM_TAG_SMALL_EMBER, + .paletteTag = ANIM_TAG_SMALL_EMBER, .oam = &gOamData_837DF34, .anims = gSpriteAnimTable_83D95E0, .images = NULL, @@ -119,8 +119,8 @@ const union AffineAnimCmd *const gSpriteAffineAnimTable_83D9674[] = const struct SpriteTemplate gFireCrossSpriteTemplate = { - .tileTag = 10029, - .paletteTag = 10029, + .tileTag = ANIM_TAG_SMALL_EMBER, + .paletteTag = ANIM_TAG_SMALL_EMBER, .oam = &gOamData_837DF34, .anims = gSpriteAnimTable_83D9650, .images = NULL, @@ -130,8 +130,8 @@ const struct SpriteTemplate gFireCrossSpriteTemplate = const struct SpriteTemplate gBattleAnimSpriteTemplate_83D9694 = { - .tileTag = 10029, - .paletteTag = 10029, + .tileTag = ANIM_TAG_SMALL_EMBER, + .paletteTag = ANIM_TAG_SMALL_EMBER, .oam = &gOamData_837DF34, .anims = gSpriteAnimTable_83D95E0, .images = NULL, @@ -141,8 +141,8 @@ const struct SpriteTemplate gBattleAnimSpriteTemplate_83D9694 = const struct SpriteTemplate gBattleAnimSpriteTemplate_83D96AC = { - .tileTag = 10029, - .paletteTag = 10029, + .tileTag = ANIM_TAG_SMALL_EMBER, + .paletteTag = ANIM_TAG_SMALL_EMBER, .oam = &gOamData_837DF34, .anims = gSpriteAnimTable_83D95E0, .images = NULL, @@ -153,8 +153,8 @@ const struct SpriteTemplate gBattleAnimSpriteTemplate_83D96AC = const struct SpriteTemplate gSpriteTemplate_83D96C4 = { - .tileTag = 10201, - .paletteTag = 10201, + .tileTag = ANIM_TAG_WARM_ROCK, + .paletteTag = ANIM_TAG_WARM_ROCK, .oam = &gOamData_837DF2C, .anims = gDummySpriteAnimTable, .images = NULL, @@ -175,8 +175,8 @@ const s16 gHeatedRockCoords[][2] = const struct SpriteTemplate gBattleAnimSpriteTemplate_83D96F8 = { - .tileTag = 10201, - .paletteTag = 10201, + .tileTag = ANIM_TAG_WARM_ROCK, + .paletteTag = ANIM_TAG_WARM_ROCK, .oam = &gOamData_837DF34, .anims = gDummySpriteAnimTable, .images = NULL, diff --git a/src/battle/anim/flying.c b/src/battle/anim/flying.c index 646c80c53..3e3e7dc6b 100644 --- a/src/battle/anim/flying.c +++ b/src/battle/anim/flying.c @@ -49,8 +49,8 @@ void sub_80DA0DC(u8 taskId); const struct SpriteTemplate gBattleAnimSpriteTemplate_83DA380 = { - .tileTag = 10009, - .paletteTag = 10009, + .tileTag = ANIM_TAG_GUST, + .paletteTag = ANIM_TAG_GUST, .oam = &gOamData_837DF7C, .anims = gDummySpriteAnimTable, .images = NULL, @@ -72,8 +72,8 @@ const union AffineAnimCmd *const gSpriteAffineAnimTable_83DA3B0[] = const struct SpriteTemplate gBattleAnimSpriteTemplate_83DA3B4 = { - .tileTag = 10009, - .paletteTag = 10009, + .tileTag = ANIM_TAG_GUST, + .paletteTag = ANIM_TAG_GUST, .oam = &gOamData_837DFDC, .anims = gDummySpriteAnimTable, .images = NULL, @@ -97,8 +97,8 @@ const union AnimCmd *const gSpriteAnimTable_83DA3E0[] = const struct SpriteTemplate gBattleAnimSpriteTemplate_83DA3E4 = { - .tileTag = 10154, - .paletteTag = 10154, + .tileTag = ANIM_TAG_AIR_WAVE_2, + .paletteTag = ANIM_TAG_AIR_WAVE_2, .oam = &gOamData_837DF54, .anims = gSpriteAnimTable_83DA3E0, .images = NULL, @@ -140,8 +140,8 @@ const union AffineAnimCmd *const gSpriteAffineAnimTable_83DA448[] = const struct SpriteTemplate gBattleAnimSpriteTemplate_83DA450 = { - .tileTag = 10156, - .paletteTag = 10156, + .tileTag = ANIM_TAG_ROUND_SHADOW, + .paletteTag = ANIM_TAG_ROUND_SHADOW, .oam = &gOamData_837DFFC, .anims = gDummySpriteAnimTable, .images = NULL, @@ -151,8 +151,8 @@ const struct SpriteTemplate gBattleAnimSpriteTemplate_83DA450 = const struct SpriteTemplate gBattleAnimSpriteTemplate_83DA468 = { - .tileTag = 10156, - .paletteTag = 10156, + .tileTag = ANIM_TAG_ROUND_SHADOW, + .paletteTag = ANIM_TAG_ROUND_SHADOW, .oam = &gOamData_837DF9C, .anims = gDummySpriteAnimTable, .images = NULL, @@ -180,8 +180,8 @@ const union AnimCmd *const gSpriteAnimTable_83DA490[] = const struct SpriteTemplate gBattleAnimSpriteTemplate_83DA498 = { - .tileTag = 10270, - .paletteTag = 10270, + .tileTag = ANIM_TAG_WHITE_FEATHER, + .paletteTag = ANIM_TAG_WHITE_FEATHER, .oam = &gOamData_837DF94, .anims = gSpriteAnimTable_83DA490, .images = NULL, @@ -193,8 +193,8 @@ const u16 gUnknownPalette_83DA4B0[] = INCBIN_U16("graphics/unknown/unknown_3DA4B const struct SpriteTemplate gSpriteTemplate_83DA4D0 = { - .tileTag = 10155, - .paletteTag = 10155, + .tileTag = ANIM_TAG_SMALL_BUBBLES, + .paletteTag = ANIM_TAG_SMALL_BUBBLES, .oam = &gOamData_837DF2C, .anims = gDummySpriteAnimTable, .images = NULL, @@ -204,8 +204,8 @@ const struct SpriteTemplate gSpriteTemplate_83DA4D0 = const struct SpriteTemplate gSpriteTemplate_83DA4E8 = { - .tileTag = 10270, - .paletteTag = 10270, + .tileTag = ANIM_TAG_WHITE_FEATHER, + .paletteTag = ANIM_TAG_WHITE_FEATHER, .oam = &gOamData_837DF94, .anims = gSpriteAnimTable_83DA490, .images = NULL, @@ -230,8 +230,8 @@ const union AnimCmd *const gSpriteAnimTable_83DA518[] = const struct SpriteTemplate gBattleAnimSpriteTemplate_83DA51C = { - .tileTag = 10162, - .paletteTag = 10162, + .tileTag = ANIM_TAG_WHIRLWIND_LINES, + .paletteTag = ANIM_TAG_WHIRLWIND_LINES, .oam = &gOamData_837DF54, .anims = gSpriteAnimTable_83DA518, .images = NULL, @@ -256,8 +256,8 @@ const union AffineAnimCmd *const gSpriteAffineAnimTable_83DA564[] = const struct SpriteTemplate gBattleAnimSpriteTemplate_83DA568 = { - .tileTag = 10156, - .paletteTag = 10156, + .tileTag = ANIM_TAG_ROUND_SHADOW, + .paletteTag = ANIM_TAG_ROUND_SHADOW, .oam = &gOamData_837DFFC, .anims = gDummySpriteAnimTable, .images = NULL, @@ -278,8 +278,8 @@ const union AffineAnimCmd *const gSpriteAffineAnimTable_83DA590[] = const struct SpriteTemplate gBattleAnimSpriteTemplate_83DA594 = { - .tileTag = 10156, - .paletteTag = 10156, + .tileTag = ANIM_TAG_ROUND_SHADOW, + .paletteTag = ANIM_TAG_ROUND_SHADOW, .oam = &gOamData_837DFFC, .anims = gDummySpriteAnimTable, .images = NULL, @@ -303,8 +303,8 @@ const union AffineAnimCmd *const gSpriteAffineAnimTable_83DA5D4[] = const struct SpriteTemplate gBattleAnimSpriteTemplate_83DA5D8 = { - .tileTag = 10156, - .paletteTag = 10156, + .tileTag = ANIM_TAG_ROUND_SHADOW, + .paletteTag = ANIM_TAG_ROUND_SHADOW, .oam = &gOamData_837DFFC, .anims = gDummySpriteAnimTable, .images = NULL, @@ -327,8 +327,8 @@ const union AffineAnimCmd *const gSpriteAffineAnimTable_83DA610[] = const struct SpriteTemplate gBattleAnimSpriteTemplate_83DA614 = { - .tileTag = 10272, - .paletteTag = 10272, + .tileTag = ANIM_TAG_SPLASH, + .paletteTag = ANIM_TAG_SPLASH, .oam = &gOamData_837DFFC, .anims = gDummySpriteAnimTable, .images = NULL, @@ -338,8 +338,8 @@ const struct SpriteTemplate gBattleAnimSpriteTemplate_83DA614 = const struct SpriteTemplate gBattleAnimSpriteTemplate_83DA62C = { - .tileTag = 10273, - .paletteTag = 10273, + .tileTag = ANIM_TAG_SWEAT_BEAD, + .paletteTag = ANIM_TAG_SWEAT_BEAD, .oam = &gOamData_837DF24, .anims = gDummySpriteAnimTable, .images = NULL, @@ -349,8 +349,8 @@ const struct SpriteTemplate gBattleAnimSpriteTemplate_83DA62C = const struct SpriteTemplate gSpriteTemplate_83DA644 = { - .tileTag = 10212, - .paletteTag = 10212, + .tileTag = ANIM_TAG_CIRCLE_OF_LIGHT, + .paletteTag = ANIM_TAG_CIRCLE_OF_LIGHT, .oam = &gOamData_837E05C, .anims = gDummySpriteAnimTable, .images = NULL, @@ -360,8 +360,8 @@ const struct SpriteTemplate gSpriteTemplate_83DA644 = const struct SpriteTemplate gBattleAnimSpriteTemplate_83DA65C = { - .tileTag = 10284, - .paletteTag = 10284, + .tileTag = ANIM_TAG_BIRD, + .paletteTag = ANIM_TAG_BIRD, .oam = &gOamData_837DFFC, .anims = gDummySpriteAnimTable, .images = NULL, diff --git a/src/battle/anim/flying_hearts.c b/src/battle/anim/flying_hearts.c index 2bba6c4cb..855b3b8a3 100644 --- a/src/battle/anim/flying_hearts.c +++ b/src/battle/anim/flying_hearts.c @@ -16,8 +16,8 @@ static void sub_80D2094(struct Sprite* sprite); const struct SpriteTemplate gBattleAnimSpriteTemplate_83D7AE0 = { - .tileTag = 10216, - .paletteTag = 10216, + .tileTag = ANIM_TAG_RED_HEART, + .paletteTag = ANIM_TAG_RED_HEART, .oam = &gOamData_837DF2C, .anims = gDummySpriteAnimTable, .images = NULL, diff --git a/src/battle/anim/flying_path.c b/src/battle/anim/flying_path.c index d2f85ad35..c9c506919 100644 --- a/src/battle/anim/flying_path.c +++ b/src/battle/anim/flying_path.c @@ -84,7 +84,7 @@ void sub_80CBDF4(u8 taskId) { struct Task *task = &gTasks[taskId]; - task->data[4] = sub_8079E90(gAnimBankTarget) - 1; + task->data[4] = GetBattlerSubpriority(gAnimBankTarget) - 1; task->data[6] = GetBattlerSpriteCoord(gAnimBankTarget, 2); task->data[7] = GetBattlerSpriteCoord(gAnimBankTarget, 3); task->data[10] = sub_807A100(gAnimBankTarget, 1); diff --git a/src/battle/anim/flying_petals.c b/src/battle/anim/flying_petals.c index 4696cbc6c..7135f4380 100644 --- a/src/battle/anim/flying_petals.c +++ b/src/battle/anim/flying_petals.c @@ -28,8 +28,8 @@ const union AffineAnimCmd *const gSpriteAffineAnimTable_83D68B4[] = { const struct SpriteTemplate gBattleAnimSpriteTemplate_83D68B8 = { - .tileTag = 10159, - .paletteTag = 10159, + .tileTag = ANIM_TAG_FLOWER, + .paletteTag = ANIM_TAG_FLOWER, .oam = &gOamData_837DF24, .anims = gSpriteAnimTable_83D6424, .images = NULL, @@ -39,8 +39,8 @@ const struct SpriteTemplate gBattleAnimSpriteTemplate_83D68B8 = const struct SpriteTemplate gBattleAnimSpriteTemplate_83D68D0 = { - .tileTag = 10159, - .paletteTag = 10159, + .tileTag = ANIM_TAG_FLOWER, + .paletteTag = ANIM_TAG_FLOWER, .oam = &gOamData_837DF8C, .anims = gSpriteAnimTable_83D6420, .images = NULL, @@ -80,8 +80,8 @@ const union AffineAnimCmd *const gSpriteAffineAnimTable_83D6938[] = { const struct SpriteTemplate gBattleAnimSpriteTemplate_83D693C = { - .tileTag = 10271, - .paletteTag = 10271, + .tileTag = ANIM_TAG_SPARKLE_6, + .paletteTag = ANIM_TAG_SPARKLE_6, .oam = &gOamData_837DF8C, .anims = gDummySpriteAnimTable, .images = NULL, @@ -91,8 +91,8 @@ const struct SpriteTemplate gBattleAnimSpriteTemplate_83D693C = const struct SpriteTemplate gBattleAnimSpriteTemplate_83D6954 = { - .tileTag = 10271, - .paletteTag = 10271, + .tileTag = ANIM_TAG_SPARKLE_6, + .paletteTag = ANIM_TAG_SPARKLE_6, .oam = &gOamData_837DF8C, .anims = gDummySpriteAnimTable, .images = NULL, @@ -102,8 +102,8 @@ const struct SpriteTemplate gBattleAnimSpriteTemplate_83D6954 = const struct SpriteTemplate gBattleAnimSpriteTemplate_83D696C = { - .tileTag = 10271, - .paletteTag = 10271, + .tileTag = ANIM_TAG_SPARKLE_6, + .paletteTag = ANIM_TAG_SPARKLE_6, .oam = &gOamData_837DF8C, .anims = gDummySpriteAnimTable, .images = NULL, diff --git a/src/battle/anim/ghost.c b/src/battle/anim/ghost.c index cba7b2b82..130e7ff92 100644 --- a/src/battle/anim/ghost.c +++ b/src/battle/anim/ghost.c @@ -63,8 +63,8 @@ const union AffineAnimCmd *const gSpriteAffineAnimTable_83DAE60[] = const struct SpriteTemplate gBattleAnimSpriteTemplate_83DAE64 = { - .tileTag = 10013, - .paletteTag = 10013, + .tileTag = ANIM_TAG_YELLOW_BALL, + .paletteTag = ANIM_TAG_YELLOW_BALL, .oam = &gOamData_837DFEC, .anims = gDummySpriteAnimTable, .images = NULL, @@ -74,8 +74,8 @@ const struct SpriteTemplate gBattleAnimSpriteTemplate_83DAE64 = const struct SpriteTemplate gBattleAnimSpriteTemplate_83DAE7C = { - .tileTag = 10013, - .paletteTag = 10013, + .tileTag = ANIM_TAG_YELLOW_BALL, + .paletteTag = ANIM_TAG_YELLOW_BALL, .oam = &gOamData_837E04C, .anims = gDummySpriteAnimTable, .images = NULL, @@ -96,8 +96,8 @@ const union AffineAnimCmd *const gSpriteAffineAnimTable_83DAEA4[] = const struct SpriteTemplate gShadowBallSpriteTemplate = { - .tileTag = 10176, - .paletteTag = 10176, + .tileTag = ANIM_TAG_SHADOW_BALL, + .paletteTag = ANIM_TAG_SHADOW_BALL, .oam = &gOamData_837DF94, .anims = gDummySpriteAnimTable, .images = NULL, @@ -122,8 +122,8 @@ const union AnimCmd *const gSpriteAnimTable_83DAED8[] = const struct SpriteTemplate gBattleAnimSpriteTemplate_83DAEDC = { - .tileTag = 10177, - .paletteTag = 10177, + .tileTag = ANIM_TAG_LICK, + .paletteTag = ANIM_TAG_LICK, .oam = &gOamData_837DF74, .anims = gSpriteAnimTable_83DAED8, .images = NULL, @@ -144,8 +144,8 @@ const union AffineAnimCmd *const gSpriteAffineAnimTable_83DAF04[] = const struct SpriteTemplate gSpriteTemplate_83DAF08 = { - .tileTag = 10188, - .paletteTag = 10188, + .tileTag = ANIM_TAG_WHITE_SHADOW, + .paletteTag = ANIM_TAG_WHITE_SHADOW, .oam = &gOamData_837E07C, .anims = gDummySpriteAnimTable, .images = NULL, @@ -155,8 +155,8 @@ const struct SpriteTemplate gSpriteTemplate_83DAF08 = const struct SpriteTemplate gBattleAnimSpriteTemplate_83DAF20 = { - .tileTag = 10199, - .paletteTag = 10199, + .tileTag = ANIM_TAG_NAIL, + .paletteTag = ANIM_TAG_NAIL, .oam = &gOamData_837E074, .anims = gDummySpriteAnimTable, .images = NULL, @@ -166,8 +166,8 @@ const struct SpriteTemplate gBattleAnimSpriteTemplate_83DAF20 = const struct SpriteTemplate gBattleAnimSpriteTemplate_83DAF38 = { - .tileTag = 10200, - .paletteTag = 10200, + .tileTag = ANIM_TAG_GHOSTLY_SPIRIT, + .paletteTag = ANIM_TAG_GHOSTLY_SPIRIT, .oam = &gOamData_837E054, .anims = gDummySpriteAnimTable, .images = NULL, @@ -177,8 +177,8 @@ const struct SpriteTemplate gBattleAnimSpriteTemplate_83DAF38 = const struct SpriteTemplate gBattleAnimSpriteTemplate_83DAF50 = { - .tileTag = 10221, - .paletteTag = 10221, + .tileTag = ANIM_TAG_DEVIL, + .paletteTag = ANIM_TAG_DEVIL, .oam = &gOamData_837E054, .anims = gDummySpriteAnimTable, .images = NULL, @@ -202,8 +202,8 @@ const union AnimCmd *const gSpriteAnimTable_83DAF7C[] = const struct SpriteTemplate gSpriteTemplate_83DAF80 = { - .tileTag = 10253, - .paletteTag = 10253, + .tileTag = ANIM_TAG_PURPLE_FLAME, + .paletteTag = ANIM_TAG_PURPLE_FLAME, .oam = &gOamData_837E094, .anims = gSpriteAnimTable_83DAF7C, .images = NULL, @@ -1219,7 +1219,7 @@ void sub_80DF1A4(u8 taskId) task->data[11] = (sub_807A100(gAnimBankAttacker, 1) / 2) + 8; task->data[7] = 0; task->data[5] = sub_8079ED4(gAnimBankAttacker); - task->data[6] = sub_8079E90(gAnimBankAttacker) - 2; + task->data[6] = GetBattlerSubpriority(gAnimBankAttacker) - 2; task->data[3] = 0; task->data[4] = 16; REG_BLDCNT = 0x3F40; diff --git a/src/battle/anim/glitter.c b/src/battle/anim/glitter.c index fb7443575..e0ef150ad 100644 --- a/src/battle/anim/glitter.c +++ b/src/battle/anim/glitter.c @@ -34,8 +34,8 @@ const union AnimCmd *const gSpriteAnimTable_83D6C84[] = const struct SpriteTemplate gBattleAnimSpriteTemplate_83D6C88 = { - .tileTag = 10049, - .paletteTag = 10049, + .tileTag = ANIM_TAG_SPARKLE_2, + .paletteTag = ANIM_TAG_SPARKLE_2, .oam = &gOamData_837DF34, .anims = gSpriteAnimTable_83D6C84, .images = NULL, @@ -45,8 +45,8 @@ const struct SpriteTemplate gBattleAnimSpriteTemplate_83D6C88 = const struct SpriteTemplate gBattleAnimSpriteTemplate_83D6CA0 = { - .tileTag = 10049, - .paletteTag = 10049, + .tileTag = ANIM_TAG_SPARKLE_2, + .paletteTag = ANIM_TAG_SPARKLE_2, .oam = &gOamData_837DF34, .anims = gSpriteAnimTable_83D6C84, .images = NULL, diff --git a/src/battle/anim/grip.c b/src/battle/anim/grip.c index b5c191449..8cf4e4bf9 100644 --- a/src/battle/anim/grip.c +++ b/src/battle/anim/grip.c @@ -38,8 +38,8 @@ const union AnimCmd *const gSpriteAnimTable_83D7694[] = const struct SpriteTemplate gBattleAnimSpriteTemplate_83D769C = { - .tileTag = 10138, - .paletteTag = 10138, + .tileTag = ANIM_TAG_CUT, + .paletteTag = ANIM_TAG_CUT, .oam = &gOamData_837E054, .anims = gSpriteAnimTable_83D7694, .images = NULL, diff --git a/src/battle/anim/ground.c b/src/battle/anim/ground.c index 407abeddc..9f72cd73e 100644 --- a/src/battle/anim/ground.c +++ b/src/battle/anim/ground.c @@ -64,8 +64,8 @@ const union AffineAnimCmd *const gBoneHitSpriteAffineAnimTable[] = const struct SpriteTemplate gBonemerangSpriteTemplate = { - .tileTag = 10000, - .paletteTag = 10000, + .tileTag = ANIM_TAG_BONE, + .paletteTag = ANIM_TAG_BONE, .oam = &gOamData_837DF94, .anims = gDummySpriteAnimTable, .images = NULL, @@ -75,8 +75,8 @@ const struct SpriteTemplate gBonemerangSpriteTemplate = const struct SpriteTemplate gBoneHitSpriteTemplate = { - .tileTag = 10000, - .paletteTag = 10000, + .tileTag = ANIM_TAG_BONE, + .paletteTag = ANIM_TAG_BONE, .oam = &gOamData_837DF94, .anims = gDummySpriteAnimTable, .images = NULL, @@ -86,8 +86,8 @@ const struct SpriteTemplate gBoneHitSpriteTemplate = const struct SpriteTemplate gSandAttackDirtSpriteTemplate = { - .tileTag = 10074, - .paletteTag = 10074, + .tileTag = ANIM_TAG_MUD_SAND, + .paletteTag = ANIM_TAG_MUD_SAND, .oam = &gOamData_837DF24, .anims = gDummySpriteAnimTable, .images = NULL, @@ -108,8 +108,8 @@ const union AnimCmd *const gMudSlapDirtSpriteAnimTable[] = const struct SpriteTemplate gMudSlapDirtSpriteTemplate = { - .tileTag = 10074, - .paletteTag = 10074, + .tileTag = ANIM_TAG_MUD_SAND, + .paletteTag = ANIM_TAG_MUD_SAND, .oam = &gOamData_837DF2C, .anims = gMudSlapDirtSpriteAnimTable, .images = NULL, @@ -119,8 +119,8 @@ const struct SpriteTemplate gMudSlapDirtSpriteTemplate = const struct SpriteTemplate gMudSportDirtSpriteTemplate = { - .tileTag = 10074, - .paletteTag = 10074, + .tileTag = ANIM_TAG_MUD_SAND, + .paletteTag = ANIM_TAG_MUD_SAND, .oam = &gOamData_837DF2C, .anims = gDummySpriteAnimTable, .images = NULL, @@ -130,8 +130,8 @@ const struct SpriteTemplate gMudSportDirtSpriteTemplate = const struct SpriteTemplate gDirtPlumeSpriteTemplate = { - .tileTag = 10074, - .paletteTag = 10074, + .tileTag = ANIM_TAG_MUD_SAND, + .paletteTag = ANIM_TAG_MUD_SAND, .oam = &gOamData_837DF24, .anims = gDummySpriteAnimTable, .images = NULL, @@ -141,8 +141,8 @@ const struct SpriteTemplate gDirtPlumeSpriteTemplate = const struct SpriteTemplate gDigDirtMoundSpriteTemplate = { - .tileTag = 10281, - .paletteTag = 10281, + .tileTag = ANIM_TAG_DIRT_MOUND, + .paletteTag = ANIM_TAG_DIRT_MOUND, .oam = &gOamData_837DF54, .anims = gDummySpriteAnimTable, .images = NULL, diff --git a/src/battle/anim/guard.c b/src/battle/anim/guard.c index b1f194ef5..779895831 100644 --- a/src/battle/anim/guard.c +++ b/src/battle/anim/guard.c @@ -33,8 +33,8 @@ const union AffineAnimCmd *const gSpriteAffineAnimTable_83D7D6C[] = const struct SpriteTemplate gBattleAnimSpriteTemplate_83D7D74 = { - .tileTag = 10244, - .paletteTag = 10244, + .tileTag = ANIM_TAG_GUARD_RING, + .paletteTag = ANIM_TAG_GUARD_RING, .oam = &gOamData_837E13C, .anims = gDummySpriteAnimTable, .images = NULL, diff --git a/src/battle/anim/guillotine.c b/src/battle/anim/guillotine.c index bc0fce4dd..cfad4837b 100644 --- a/src/battle/anim/guillotine.c +++ b/src/battle/anim/guillotine.c @@ -40,8 +40,8 @@ const union AnimCmd *const gSpriteAnimTable_83D76D4[] = const struct SpriteTemplate gBattleAnimSpriteTemplate_83D76DC = { - .tileTag = 10138, - .paletteTag = 10138, + .tileTag = ANIM_TAG_CUT, + .paletteTag = ANIM_TAG_CUT, .oam = &gOamData_837E054, .anims = gSpriteAnimTable_83D76D4, .images = NULL, diff --git a/src/battle/anim/heal.c b/src/battle/anim/heal.c index e0b8f9b9e..c44dd4ba4 100644 --- a/src/battle/anim/heal.c +++ b/src/battle/anim/heal.c @@ -28,8 +28,8 @@ const union AnimCmd *const gSpriteAnimTable_83D6760[] = const struct SpriteTemplate gBattleAnimSpriteTemplate_83D6764 = { - .tileTag = 10195, - .paletteTag = 10195, + .tileTag = ANIM_TAG_SPARKLE_5, + .paletteTag = ANIM_TAG_SPARKLE_5, .oam = &gOamData_837DF2C, .anims = gSpriteAnimTable_83D6760, .images = NULL, diff --git a/src/battle/anim/heal_bell.c b/src/battle/anim/heal_bell.c index c9f26b093..25b1ccc51 100644 --- a/src/battle/anim/heal_bell.c +++ b/src/battle/anim/heal_bell.c @@ -42,8 +42,8 @@ const union AnimCmd *const gSpriteAnimTable_83D7A40[] = const struct SpriteTemplate gBattleAnimSpriteTemplate_83D7A44 = { - .tileTag = 10205, - .paletteTag = 10205, + .tileTag = ANIM_TAG_BELL, + .paletteTag = ANIM_TAG_BELL, .oam = &gOamData_837DF34, .anims = gSpriteAnimTable_83D7A40, .images = NULL, @@ -63,8 +63,8 @@ const u16 gUnknown_083D7A5C[] = const struct SpriteTemplate gBattleAnimSpriteTemplate_83D7A68 = { - .tileTag = 10206, - .paletteTag = 10206, + .tileTag = ANIM_TAG_MUSIC_NOTES_2, + .paletteTag = ANIM_TAG_MUSIC_NOTES_2, .oam = &gOamData_837DF2C, .anims = gDummySpriteAnimTable, .images = NULL, diff --git a/src/battle/anim/heart_1.c b/src/battle/anim/heart_1.c index 5522d4551..523e0082d 100644 --- a/src/battle/anim/heart_1.c +++ b/src/battle/anim/heart_1.c @@ -15,8 +15,8 @@ void sub_80D1C80(struct Sprite* sprite); const struct SpriteTemplate gBattleAnimSpriteTemplate_83D7A80 = { - .tileTag = 10210, - .paletteTag = 10210, + .tileTag = ANIM_TAG_MAGENTA_HEART, + .paletteTag = ANIM_TAG_MAGENTA_HEART, .oam = &gOamData_837DF2C, .anims = gDummySpriteAnimTable, .images = NULL, diff --git a/src/battle/anim/hidden_power_orbit.c b/src/battle/anim/hidden_power_orbit.c index ed680b2bd..3d1cd74c0 100644 --- a/src/battle/anim/hidden_power_orbit.c +++ b/src/battle/anim/hidden_power_orbit.c @@ -27,8 +27,8 @@ const union AffineAnimCmd *const gSpriteAffineAnimTable_83D7B10[] = const struct SpriteTemplate gHiddenPowerOrbSpriteTemplate = { - .tileTag = 10217, - .paletteTag = 10217, + .tileTag = ANIM_TAG_RED_ORB, + .paletteTag = ANIM_TAG_RED_ORB, .oam = &gOamData_837DF8C, .anims = gDummySpriteAnimTable, .images = NULL, @@ -38,8 +38,8 @@ const struct SpriteTemplate gHiddenPowerOrbSpriteTemplate = const struct SpriteTemplate gHiddenPowerOrbScatterSpriteTemplate = { - .tileTag = 10217, - .paletteTag = 10217, + .tileTag = ANIM_TAG_RED_ORB, + .paletteTag = ANIM_TAG_RED_ORB, .oam = &gOamData_837DFEC, .anims = gDummySpriteAnimTable, .images = NULL, @@ -58,7 +58,7 @@ void AnimOrbitFast(struct Sprite* sprite) sprite->affineAnimPaused = 1; sprite->data[0] = gBattleAnimArgs[0]; sprite->data[1] = gBattleAnimArgs[1]; - sprite->data[7] = sub_8079E90(gAnimBankAttacker); + sprite->data[7] = GetBattlerSubpriority(gAnimBankAttacker); sprite->callback = AnimOrbitFastStep; sprite->callback(sprite); } diff --git a/src/battle/anim/homing.c b/src/battle/anim/homing.c index 5cd2a3ddb..4b2365542 100644 --- a/src/battle/anim/homing.c +++ b/src/battle/anim/homing.c @@ -16,8 +16,8 @@ static void sub_80CC7D4(struct Sprite* sprite); const struct SpriteTemplate gBattleAnimSpriteTemplate_83D6994 = { - .tileTag = 10266, - .paletteTag = 10266, + .tileTag = ANIM_TAG_GREEN_SPIKE, + .paletteTag = ANIM_TAG_GREEN_SPIKE, .oam = &gOamData_837DF8C, .anims = gDummySpriteAnimTable, .images = NULL, diff --git a/src/battle/anim/hop.c b/src/battle/anim/hop.c index 3aba79511..dcf8ed702 100644 --- a/src/battle/anim/hop.c +++ b/src/battle/anim/hop.c @@ -48,8 +48,8 @@ const union AffineAnimCmd *const gSpriteAffineAnimTable_83D6714[] = { const struct SpriteTemplate gBattleAnimSpriteTemplate_83D671C = { - .tileTag = 10224, - .paletteTag = 10224, + .tileTag = ANIM_TAG_ITEM_BAG, + .paletteTag = ANIM_TAG_ITEM_BAG, .oam = &gOamData_837DF94, .anims = gSpriteAnimTable_83D66B8, .images = NULL, @@ -59,8 +59,8 @@ const struct SpriteTemplate gBattleAnimSpriteTemplate_83D671C = const struct SpriteTemplate gBattleAnimSpriteTemplate_83D6734 = { - .tileTag = 10224, - .paletteTag = 10224, + .tileTag = ANIM_TAG_ITEM_BAG, + .paletteTag = ANIM_TAG_ITEM_BAG, .oam = &gOamData_837DF94, .anims = gSpriteAnimTable_83D66B8, .images = NULL, diff --git a/src/battle/anim/hop_2.c b/src/battle/anim/hop_2.c index 108b06c60..5ebefd626 100644 --- a/src/battle/anim/hop_2.c +++ b/src/battle/anim/hop_2.c @@ -22,8 +22,8 @@ static void sub_80CBB60(struct Sprite* sprite); const struct SpriteTemplate gBattleAnimSpriteTemplate_83D677C = { - .tileTag = 10224, - .paletteTag = 10224, + .tileTag = ANIM_TAG_ITEM_BAG, + .paletteTag = ANIM_TAG_ITEM_BAG, .oam = &gOamData_837DF94, .anims = gSpriteAnimTable_83D66B8, .images = NULL, @@ -71,7 +71,7 @@ static void sub_80CBB60(struct Sprite* sprite) sprite->pos2.y = Sin(sprite->data[0] + 0x80, 30 - sprite->data[1] * 8); if (sprite->pos2.y == 0) { - PlaySE12WithPanning(0x7D, BattleAnimAdjustPanning(0x3F)); + PlaySE12WithPanning(0x7D, BattleAnimAdjustPanning(SOUND_PAN_TARGET)); } if (sub_80CB814(sprite)) @@ -79,6 +79,6 @@ static void sub_80CBB60(struct Sprite* sprite) sprite->pos2.y = 0; sprite->data[0] = 0; sprite->callback = sub_80CB8B8; - PlaySE12WithPanning(0x7D, BattleAnimAdjustPanning(-0x40)); + PlaySE12WithPanning(0x7D, BattleAnimAdjustPanning(SOUND_PAN_ATTACKER_NEG)); } } diff --git a/src/battle/anim/ice.c b/src/battle/anim/ice.c index e2288e704..5ad79051f 100644 --- a/src/battle/anim/ice.c +++ b/src/battle/anim/ice.c @@ -70,8 +70,8 @@ const union AnimCmd *const gSpriteAnimTable_83D9B64[] = // unknown sprite template const struct SpriteTemplate gSpriteTemplate_83D9B68 = { - .tileTag = 10141, - .paletteTag = 10141, + .tileTag = ANIM_TAG_ICE_CRYSTALS, + .paletteTag = ANIM_TAG_ICE_CRYSTALS, .oam = &gOamData_837DF24, .anims = gDummySpriteAnimTable, .images = NULL, @@ -159,8 +159,8 @@ const union AffineAnimCmd *const gSpriteAffineAnimTable_83D9BDC[] = const struct SpriteTemplate gLargeIcePunchCrystalSpriteTemplate = { - .tileTag = 10141, - .paletteTag = 10141, + .tileTag = ANIM_TAG_ICE_CRYSTALS, + .paletteTag = ANIM_TAG_ICE_CRYSTALS, .oam = &gOamData_837E144, .anims = gSpriteAnimTable_83D9BB8, .images = NULL, @@ -170,8 +170,8 @@ const struct SpriteTemplate gLargeIcePunchCrystalSpriteTemplate = const struct SpriteTemplate gSmallIcePunchCrystalSpriteTemplate = { - .tileTag = 10141, - .paletteTag = 10141, + .tileTag = ANIM_TAG_ICE_CRYSTALS, + .paletteTag = ANIM_TAG_ICE_CRYSTALS, .oam = &gOamData_837E044, .anims = gSpriteAnimTable_83D9BBC, .images = NULL, @@ -192,8 +192,8 @@ const union AffineAnimCmd *const gSpriteAffineAnimTable_83D9C20[] = const struct SpriteTemplate IceBeamCenterParticleSpriteTemplate = { - .tileTag = 10141, - .paletteTag = 10141, + .tileTag = ANIM_TAG_ICE_CRYSTALS, + .paletteTag = ANIM_TAG_ICE_CRYSTALS, .oam = &gOamData_837E0E4, .anims = gSpriteAnimTable_83D9BB8, .images = NULL, @@ -203,8 +203,8 @@ const struct SpriteTemplate IceBeamCenterParticleSpriteTemplate = const struct SpriteTemplate gIceBeamOuterParticleSpriteTemplate = { - .tileTag = 10141, - .paletteTag = 10141, + .tileTag = ANIM_TAG_ICE_CRYSTALS, + .paletteTag = ANIM_TAG_ICE_CRYSTALS, .oam = &gOamData_837E044, .anims = gSpriteAnimTable_83D9BBC, .images = NULL, @@ -227,8 +227,8 @@ const union AffineAnimCmd *const gSpriteAffineAnimTable_83D9C74[] = const struct SpriteTemplate gLargeIceEffectParticleSpriteTemplate = { - .tileTag = 10141, - .paletteTag = 10141, + .tileTag = ANIM_TAG_ICE_CRYSTALS, + .paletteTag = ANIM_TAG_ICE_CRYSTALS, .oam = &gOamData_837E0E4, .anims = gSpriteAnimTable_83D9BB8, .images = NULL, @@ -238,8 +238,8 @@ const struct SpriteTemplate gLargeIceEffectParticleSpriteTemplate = const struct SpriteTemplate gSmallIceEffectParticleSpriteTemplate = { - .tileTag = 10141, - .paletteTag = 10141, + .tileTag = ANIM_TAG_ICE_CRYSTALS, + .paletteTag = ANIM_TAG_ICE_CRYSTALS, .oam = &gOamData_837E0A4, .anims = gSpriteAnimTable_83D9BBC, .images = NULL, @@ -249,8 +249,8 @@ const struct SpriteTemplate gSmallIceEffectParticleSpriteTemplate = const struct SpriteTemplate gSmallSnowballSpriteTemplate1 = { - .tileTag = 10141, - .paletteTag = 10141, + .tileTag = ANIM_TAG_ICE_CRYSTALS, + .paletteTag = ANIM_TAG_ICE_CRYSTALS, .oam = &gOamData_837DF24, .anims = gSpriteAnimTable_83D9BC0, .images = NULL, @@ -260,8 +260,8 @@ const struct SpriteTemplate gSmallSnowballSpriteTemplate1 = const struct SpriteTemplate gLargeSnowballSpriteTemplate = { - .tileTag = 10141, - .paletteTag = 10141, + .tileTag = ANIM_TAG_ICE_CRYSTALS, + .paletteTag = ANIM_TAG_ICE_CRYSTALS, .oam = &gOamData_837DF2C, .anims = gSpriteAnimTable_83D9BC4, .images = NULL, @@ -271,8 +271,8 @@ const struct SpriteTemplate gLargeSnowballSpriteTemplate = const struct SpriteTemplate gSmallSnowballSpriteTemplate2 = { - .tileTag = 10141, - .paletteTag = 10141, + .tileTag = ANIM_TAG_ICE_CRYSTALS, + .paletteTag = ANIM_TAG_ICE_CRYSTALS, .oam = &gOamData_837DF24, .anims = gSpriteAnimTable_83D9BC0, .images = NULL, @@ -299,8 +299,8 @@ const union AnimCmd *const gSpriteAnimTable_83D9D10[] = const struct SpriteTemplate gIceSpikeSpriteTemplate = { - .tileTag = 10142, - .paletteTag = 10142, + .tileTag = ANIM_TAG_ICE_SPIKES, + .paletteTag = ANIM_TAG_ICE_SPIKES, .oam = &gOamData_837E084, .anims = gSpriteAnimTable_83D9D10, .images = NULL, @@ -322,8 +322,8 @@ const union AnimCmd *const gSpriteAnimTable_83D9D38[] = const struct SpriteTemplate gMistCloudSpriteTemplate = { - .tileTag = 10144, - .paletteTag = 10144, + .tileTag = ANIM_TAG_MIST_CLOUD, + .paletteTag = ANIM_TAG_MIST_CLOUD, .oam = &gOamData_837E074, .anims = gSpriteAnimTable_83D9D38, .images = NULL, @@ -333,8 +333,8 @@ const struct SpriteTemplate gMistCloudSpriteTemplate = const struct SpriteTemplate gSmogCloudSpriteTemplate = { - .tileTag = 10172, - .paletteTag = 10172, + .tileTag = ANIM_TAG_PURPLE_GAS_CLOUD, + .paletteTag = ANIM_TAG_PURPLE_GAS_CLOUD, .oam = &gOamData_837E074, .anims = gSpriteAnimTable_83D9D38, .images = NULL, @@ -349,8 +349,8 @@ const u8 gUnknown_083D9D6C[] = const struct SpriteTemplate gMistBallSpriteTemplate = { - .tileTag = 10155, - .paletteTag = 10155, + .tileTag = ANIM_TAG_SMALL_BUBBLES, + .paletteTag = ANIM_TAG_SMALL_BUBBLES, .oam = &gOamData_837DF2C, .anims = gDummySpriteAnimTable, .images = NULL, @@ -365,8 +365,8 @@ const u8 gUnknown_083D9D98[] = const struct SpriteTemplate gPoisonGasCloudSpriteTemplate = { - .tileTag = 10172, - .paletteTag = 10172, + .tileTag = ANIM_TAG_PURPLE_GAS_CLOUD, + .paletteTag = ANIM_TAG_PURPLE_GAS_CLOUD, .oam = &gOamData_837E074, .anims = gSpriteAnimTable_83D9D38, .images = NULL, @@ -426,8 +426,8 @@ const union AffineAnimCmd *const gSpriteAffineAnimTable_83D9E38[] = const struct SpriteTemplate gHailSpriteTemplate = { - .tileTag = 10263, - .paletteTag = 10263, + .tileTag = ANIM_TAG_HAIL, + .paletteTag = ANIM_TAG_HAIL, .oam = &gOamData_837DF8C, .anims = gDummySpriteAnimTable, .images = NULL, @@ -437,8 +437,8 @@ const struct SpriteTemplate gHailSpriteTemplate = const struct SpriteTemplate gWeatherBallHailSpriteTemplate = { - .tileTag = 10263, - .paletteTag = 10263, + .tileTag = ANIM_TAG_HAIL, + .paletteTag = ANIM_TAG_HAIL, .oam = &gOamData_837DF8C, .anims = gDummySpriteAnimTable, .images = NULL, @@ -508,8 +508,8 @@ const union AffineAnimCmd *const gSpriteAffineAnimTable_83D9EE0[] = const struct SpriteTemplate gIceBallSpriteTemplate = { - .tileTag = 10043, - .paletteTag = 10043, + .tileTag = ANIM_TAG_ICE_CHUNK, + .paletteTag = ANIM_TAG_ICE_CHUNK, .oam = &gOamData_837DFF4, .anims = gSpriteAnimTable_83D9E88, .images = NULL, @@ -519,8 +519,8 @@ const struct SpriteTemplate gIceBallSpriteTemplate = const struct SpriteTemplate gIceBallParticleSpriteTemplate = { - .tileTag = 10141, - .paletteTag = 10141, + .tileTag = ANIM_TAG_ICE_CRYSTALS, + .paletteTag = ANIM_TAG_ICE_CRYSTALS, .oam = &gOamData_837DF24, .anims = gSpriteAnimTable_83D9BBC, .images = NULL, diff --git a/src/battle/anim/kiss_fountain.c b/src/battle/anim/kiss_fountain.c index 8ab3fcded..4fc340e63 100644 --- a/src/battle/anim/kiss_fountain.c +++ b/src/battle/anim/kiss_fountain.c @@ -15,8 +15,8 @@ void sub_80D1FDC(struct Sprite* sprite); const struct SpriteTemplate gBattleAnimSpriteTemplate_83D7AC8 = { - .tileTag = 10216, - .paletteTag = 10216, + .tileTag = ANIM_TAG_RED_HEART, + .paletteTag = ANIM_TAG_RED_HEART, .oam = &gOamData_837DF2C, .anims = gDummySpriteAnimTable, .images = NULL, diff --git a/src/battle/anim/leaf.c b/src/battle/anim/leaf.c index 2d36d7360..a60390dc5 100644 --- a/src/battle/anim/leaf.c +++ b/src/battle/anim/leaf.c @@ -50,8 +50,8 @@ const union AnimCmd *const gSpriteAnimTable_83D6494[] = const struct SpriteTemplate gBattleAnimSpriteTemplate_83D649C = { - .tileTag = 10063, - .paletteTag = 10063, + .tileTag = ANIM_TAG_LEAF, + .paletteTag = ANIM_TAG_LEAF, .oam = &gOamData_837DF2C, .anims = gSpriteAnimTable_83D6494, .images = NULL, @@ -61,8 +61,8 @@ const struct SpriteTemplate gBattleAnimSpriteTemplate_83D649C = const struct SpriteTemplate gBattleAnimSpriteTemplate_83D64B4 = { - .tileTag = 10063, - .paletteTag = 10063, + .tileTag = ANIM_TAG_LEAF, + .paletteTag = ANIM_TAG_LEAF, .oam = &gOamData_837DF2C, .anims = gSpriteAnimTable_83D6494, .images = NULL, @@ -86,8 +86,8 @@ const union AnimCmd *const gSpriteAnimTable_83D64E0[] = const struct SpriteTemplate gBattleAnimSpriteTemplate_83D64E4 = { - .tileTag = 10160, - .paletteTag = 10160, + .tileTag = ANIM_TAG_RAZOR_LEAF, + .paletteTag = ANIM_TAG_RAZOR_LEAF, .oam = &gOamData_837DF54, .anims = gSpriteAnimTable_83D64E0, .images = NULL, @@ -106,8 +106,8 @@ const union AffineAnimCmd *const gSpriteAffineAnimTable_83D650C[] = { const struct SpriteTemplate gSwiftStarSpriteTemplate = { - .tileTag = 10174, - .paletteTag = 10174, + .tileTag = ANIM_TAG_YELLOW_STAR, + .paletteTag = ANIM_TAG_YELLOW_STAR, .oam = &gOamData_837DF94, .anims = gDummySpriteAnimTable, .images = NULL, diff --git a/src/battle/anim/money.c b/src/battle/anim/money.c index 3960b5e1a..e23b38012 100644 --- a/src/battle/anim/money.c +++ b/src/battle/anim/money.c @@ -39,8 +39,8 @@ const union AffineAnimCmd *const gSpriteAffineAnimTable_83D75E0[] = const struct SpriteTemplate gBattleAnimSpriteTemplate_83D75E4 = { - .tileTag = 10100, - .paletteTag = 10100, + .tileTag = ANIM_TAG_COIN, + .paletteTag = ANIM_TAG_COIN, .oam = &gOamData_837DF8C, .anims = gSpriteAnimTable_83D75CC, .images = NULL, @@ -50,8 +50,8 @@ const struct SpriteTemplate gBattleAnimSpriteTemplate_83D75E4 = const struct SpriteTemplate gBattleAnimSpriteTemplate_83D75FC = { - .tileTag = 10100, - .paletteTag = 10100, + .tileTag = ANIM_TAG_COIN, + .paletteTag = ANIM_TAG_COIN, .oam = &gOamData_837DF8C, .anims = gSpriteAnimTable_83D75CC, .images = NULL, diff --git a/src/battle/anim/moon.c b/src/battle/anim/moon.c index 6e889008e..fe2e7a849 100644 --- a/src/battle/anim/moon.c +++ b/src/battle/anim/moon.c @@ -16,8 +16,8 @@ static void sub_80CE354(struct Sprite* sprite); const struct SpriteTemplate gBattleAnimSpriteTemplate_83D6FC8 = { - .tileTag = 10194, - .paletteTag = 10194, + .tileTag = ANIM_TAG_MOON, + .paletteTag = ANIM_TAG_MOON, .oam = &gOamData_837E05C, .anims = gDummySpriteAnimTable, .images = NULL, diff --git a/src/battle/anim/musical.c b/src/battle/anim/musical.c index b67cd17b8..c0269a379 100644 --- a/src/battle/anim/musical.c +++ b/src/battle/anim/musical.c @@ -92,8 +92,8 @@ const union AffineAnimCmd *const gSpriteAffineAnimTable_83D7110[] = const struct SpriteTemplate gBattleAnimSpriteTemplate_83D7114 = { - .tileTag = 10072, - .paletteTag = 10072, + .tileTag = ANIM_TAG_MUSIC_NOTES, + .paletteTag = ANIM_TAG_MUSIC_NOTES, .oam = &gOamData_837DFEC, .anims = gSpriteAnimTable_83D70D8, .images = NULL, @@ -111,8 +111,8 @@ const u16 gUnknown_083D712C[][6] = const struct SpriteTemplate gBattleAnimSpriteTemplate_83D715C = { - .tileTag = 10072, - .paletteTag = 10072, + .tileTag = ANIM_TAG_MUSIC_NOTES, + .paletteTag = ANIM_TAG_MUSIC_NOTES, .oam = &gOamData_837DFEC, .anims = gSpriteAnimTable_83D70D8, .images = NULL, @@ -122,8 +122,8 @@ const struct SpriteTemplate gBattleAnimSpriteTemplate_83D715C = const struct SpriteTemplate gBattleAnimSpriteTemplate_83D7174 = { - .tileTag = 10193, - .paletteTag = 10193, + .tileTag = ANIM_TAG_PURPLE_HAND_OUTLINE, + .paletteTag = ANIM_TAG_PURPLE_HAND_OUTLINE, .oam = &gOamData_837DF34, .anims = gDummySpriteAnimTable, .images = NULL, @@ -145,8 +145,8 @@ const union AffineAnimCmd *const gSpriteAffineAnimTable_83D71A4[] = const struct SpriteTemplate gBattleAnimSpriteTemplate_83D71A8 = { - .tileTag = 10072, - .paletteTag = 10072, + .tileTag = ANIM_TAG_MUSIC_NOTES, + .paletteTag = ANIM_TAG_MUSIC_NOTES, .oam = &gOamData_837DFEC, .anims = gSpriteAnimTable_83D70D8, .images = NULL, diff --git a/src/battle/anim/noise.c b/src/battle/anim/noise.c index 6a6f6c10a..f4ea10bf9 100644 --- a/src/battle/anim/noise.c +++ b/src/battle/anim/noise.c @@ -14,8 +14,8 @@ static void sub_80D2E30(struct Sprite *); const struct SpriteTemplate gBattleAnimSpriteTemplate_83D7CC8 = { - .tileTag = 10225, - .paletteTag = 10225, + .tileTag = ANIM_TAG_JAGGED_MUSIC_NOTE, + .paletteTag = ANIM_TAG_JAGGED_MUSIC_NOTE, .oam = &gOamData_837DF34, .anims = gDummySpriteAnimTable, .images = NULL, diff --git a/src/battle/anim/normal.c b/src/battle/anim/normal.c index 54524f2ef..9f0007e97 100644 --- a/src/battle/anim/normal.c +++ b/src/battle/anim/normal.c @@ -109,8 +109,8 @@ const union AnimCmd *const gConfusionDuckSpriteAnimTable[] = const struct SpriteTemplate gConfusionDuckSpriteTemplate = { - .tileTag = 10073, - .paletteTag = 10073, + .tileTag = ANIM_TAG_DUCK, + .paletteTag = ANIM_TAG_DUCK, .oam = &gOamData_837DF2C, .anims = gConfusionDuckSpriteAnimTable, .images = NULL, @@ -157,8 +157,8 @@ const union AnimCmd *const gSpriteAnimTable_83DB40C[] = const struct SpriteTemplate gSpriteTemplate_83DB410 = { - .tileTag = 10071, - .paletteTag = 10071, + .tileTag = ANIM_TAG_SPARKLE_4, + .paletteTag = ANIM_TAG_SPARKLE_4, .oam = &gOamData_837DF34, .anims = gSpriteAnimTable_83DB40C, .images = NULL, @@ -214,8 +214,8 @@ const union AffineAnimCmd *const gSpriteAffineAnimTable_83DB498[] = const struct SpriteTemplate gBasicHitSplatSpriteTemplate = { - .tileTag = 10135, - .paletteTag = 10135, + .tileTag = ANIM_TAG_IMPACT, + .paletteTag = ANIM_TAG_IMPACT, .oam = &gOamData_837E0B4, .anims = gDummySpriteAnimTable, .images = NULL, @@ -225,8 +225,8 @@ const struct SpriteTemplate gBasicHitSplatSpriteTemplate = const struct SpriteTemplate gBattleAnimSpriteTemplate_83DB4C0 = { - .tileTag = 10135, - .paletteTag = 10135, + .tileTag = ANIM_TAG_IMPACT, + .paletteTag = ANIM_TAG_IMPACT, .oam = &gOamData_837E0B4, .anims = gDummySpriteAnimTable, .images = NULL, @@ -236,8 +236,8 @@ const struct SpriteTemplate gBattleAnimSpriteTemplate_83DB4C0 = const struct SpriteTemplate gBattleAnimSpriteTemplate_83DB4D8 = { - .tileTag = 10148, - .paletteTag = 10148, + .tileTag = ANIM_TAG_WATER_IMPACT, + .paletteTag = ANIM_TAG_WATER_IMPACT, .oam = &gOamData_837E0B4, .anims = gDummySpriteAnimTable, .images = NULL, @@ -247,8 +247,8 @@ const struct SpriteTemplate gBattleAnimSpriteTemplate_83DB4D8 = const struct SpriteTemplate gBattleAnimSpriteTemplate_83DB4F0 = { - .tileTag = 10135, - .paletteTag = 10135, + .tileTag = ANIM_TAG_IMPACT, + .paletteTag = ANIM_TAG_IMPACT, .oam = &gOamData_837E0B4, .anims = gDummySpriteAnimTable, .images = NULL, @@ -258,8 +258,8 @@ const struct SpriteTemplate gBattleAnimSpriteTemplate_83DB4F0 = const struct SpriteTemplate gBattleAnimSpriteTemplate_83DB508 = { - .tileTag = 10135, - .paletteTag = 10135, + .tileTag = ANIM_TAG_IMPACT, + .paletteTag = ANIM_TAG_IMPACT, .oam = &gOamData_837E0B4, .anims = gDummySpriteAnimTable, .images = NULL, @@ -269,8 +269,8 @@ const struct SpriteTemplate gBattleAnimSpriteTemplate_83DB508 = const struct SpriteTemplate gBattleAnimSpriteTemplate_83DB520 = { - .tileTag = 10285, - .paletteTag = 10285, + .tileTag = ANIM_TAG_CROSS_IMPACT, + .paletteTag = ANIM_TAG_CROSS_IMPACT, .oam = &gOamData_837E054, .anims = gDummySpriteAnimTable, .images = NULL, @@ -280,8 +280,8 @@ const struct SpriteTemplate gBattleAnimSpriteTemplate_83DB520 = const struct SpriteTemplate gBattleAnimSpriteTemplate_83DB538 = { - .tileTag = 10135, - .paletteTag = 10135, + .tileTag = ANIM_TAG_IMPACT, + .paletteTag = ANIM_TAG_IMPACT, .oam = &gOamData_837DF94, .anims = gDummySpriteAnimTable, .images = NULL, @@ -291,8 +291,8 @@ const struct SpriteTemplate gBattleAnimSpriteTemplate_83DB538 = const struct SpriteTemplate gBattleAnimSpriteTemplate_83DB550 = { - .tileTag = 10135, - .paletteTag = 10135, + .tileTag = ANIM_TAG_IMPACT, + .paletteTag = ANIM_TAG_IMPACT, .oam = &gOamData_837E0B4, .anims = gDummySpriteAnimTable, .images = NULL, @@ -1426,9 +1426,9 @@ static void sub_80E3338(u8 taskId) gTasks[taskId].func = sub_80E3704; if (taskData[0] == 0) - PlaySE12WithPanning(SE_W287, BattleAnimAdjustPanning2(-64)); + PlaySE12WithPanning(SE_W287, BattleAnimAdjustPanning2(SOUND_PAN_ATTACKER_NEG)); else - PlaySE12WithPanning(SE_W287B, BattleAnimAdjustPanning2(-64)); + PlaySE12WithPanning(SE_W287B, BattleAnimAdjustPanning2(SOUND_PAN_ATTACKER_NEG)); } static void sub_80E3704(u8 taskId) diff --git a/src/battle/anim/note_spin.c b/src/battle/anim/note_spin.c index c3d6bdf52..899357310 100644 --- a/src/battle/anim/note_spin.c +++ b/src/battle/anim/note_spin.c @@ -44,8 +44,8 @@ const union AffineAnimCmd *const gSpriteAffineAnimTable_83D7D10[] = const struct SpriteTemplate gBattleAnimSpriteTemplate_83D7D1C = { - .tileTag = 10206, - .paletteTag = 10206, + .tileTag = ANIM_TAG_MUSIC_NOTES_2, + .paletteTag = ANIM_TAG_MUSIC_NOTES_2, .oam = &gOamData_837DF8C, .anims = gSpriteAnimTable_83D70D8, .images = NULL, @@ -55,8 +55,8 @@ const struct SpriteTemplate gBattleAnimSpriteTemplate_83D7D1C = const struct SpriteTemplate gBattleAnimSpriteTemplate_83D7D34 = { - .tileTag = 10206, - .paletteTag = 10206, + .tileTag = ANIM_TAG_MUSIC_NOTES_2, + .paletteTag = ANIM_TAG_MUSIC_NOTES_2, .oam = &gOamData_837DF8C, .anims = gSpriteAnimTable_83D70D8, .images = NULL, diff --git a/src/battle/anim/orbit.c b/src/battle/anim/orbit.c index 5d82b2842..d59adde08 100644 --- a/src/battle/anim/orbit.c +++ b/src/battle/anim/orbit.c @@ -67,8 +67,8 @@ const union AnimCmd *const gSpriteAnimTable_83D6424[] = const struct SpriteTemplate gBattleAnimSpriteTemplate_83D6428 = { - .tileTag = 10159, - .paletteTag = 10159, + .tileTag = ANIM_TAG_FLOWER, + .paletteTag = ANIM_TAG_FLOWER, .oam = &gOamData_837DF2C, .anims = gSpriteAnimTable_83D6420, .images = NULL, @@ -78,8 +78,8 @@ const struct SpriteTemplate gBattleAnimSpriteTemplate_83D6428 = const struct SpriteTemplate gBattleAnimSpriteTemplate_83D6440 = { - .tileTag = 10159, - .paletteTag = 10159, + .tileTag = ANIM_TAG_FLOWER, + .paletteTag = ANIM_TAG_FLOWER, .oam = &gOamData_837DF24, .anims = gSpriteAnimTable_83D6424, .images = NULL, @@ -172,11 +172,11 @@ static void sub_80CADA8(struct Sprite* sprite) sprite->pos2.y += Cos(sprite->data[5], -5); if ((u16)(sprite->data[5] - 0x40) < 0x80) { - sprite->subpriority = sub_8079E90(gAnimBankAttacker) - 1; + sprite->subpriority = GetBattlerSubpriority(gAnimBankAttacker) - 1; } else { - sprite->subpriority = sub_8079E90(gAnimBankAttacker) + 1; + sprite->subpriority = GetBattlerSubpriority(gAnimBankAttacker) + 1; } sprite->data[5] = (sprite->data[5] + 5) & 0xFF; diff --git a/src/battle/anim/orbs.c b/src/battle/anim/orbs.c index d4886d1f8..3301990ec 100644 --- a/src/battle/anim/orbs.c +++ b/src/battle/anim/orbs.c @@ -103,8 +103,8 @@ const union AffineAnimCmd *const gSpriteAffineAnimTable_83D62E8[] = { const struct SpriteTemplate gBattleAnimSpriteTemplate_83D62EC = { - .tileTag = 10147, - .paletteTag = 10147, + .tileTag = ANIM_TAG_ORBS, + .paletteTag = ANIM_TAG_ORBS, .oam = &gOamData_837E0AC, .anims = gSpriteAnimTable_83D62D4, .images = NULL, @@ -114,8 +114,8 @@ const struct SpriteTemplate gBattleAnimSpriteTemplate_83D62EC = const struct SpriteTemplate gBattleAnimSpriteTemplate_83D6304 = { - .tileTag = 10147, - .paletteTag = 10147, + .tileTag = ANIM_TAG_ORBS, + .paletteTag = ANIM_TAG_ORBS, .oam = &gOamData_837DF24, .anims = gSpriteAnimTable_83D62B4, .images = NULL, @@ -125,8 +125,8 @@ const struct SpriteTemplate gBattleAnimSpriteTemplate_83D6304 = const struct SpriteTemplate gSpriteTemplate_83D631C = { - .tileTag = 10147, - .paletteTag = 10147, + .tileTag = ANIM_TAG_ORBS, + .paletteTag = ANIM_TAG_ORBS, .oam = &gOamData_837DF24, .anims = gSpriteAnimTable_83D62D0, .images = NULL, @@ -146,8 +146,8 @@ const union AffineAnimCmd *const gSpriteAffineAnimTable_83D634C[] = { const struct SpriteTemplate gBattleAnimSpriteTemplate_83D6350 = { - .tileTag = 10235, - .paletteTag = 10235, + .tileTag = ANIM_TAG_GRAY_ORB, + .paletteTag = ANIM_TAG_GRAY_ORB, .oam = &gOamData_837DFE4, .anims = gDummySpriteAnimTable, .images = NULL, @@ -166,8 +166,8 @@ const union AffineAnimCmd *const gSpriteAffineAnimTable_83D6378[] = { const struct SpriteTemplate gBattleAnimSpriteTemplate_83D637C = { - .tileTag = 10147, - .paletteTag = 10147, + .tileTag = ANIM_TAG_ORBS, + .paletteTag = ANIM_TAG_ORBS, .oam = &gOamData_837E0AC, .anims = gSpriteAnimTable_83D62D4, .images = NULL, @@ -177,8 +177,8 @@ const struct SpriteTemplate gBattleAnimSpriteTemplate_83D637C = const struct SpriteTemplate gBattleAnimSpriteTemplate_83D6394 = { - .tileTag = 10147, - .paletteTag = 10147, + .tileTag = ANIM_TAG_ORBS, + .paletteTag = ANIM_TAG_ORBS, .oam = &gOamData_837DF24, .anims = gSpriteAnimTable_83D62B4, .images = NULL, @@ -235,11 +235,11 @@ static void sub_80CA8B4(struct Sprite* sprite) { if (sprite->data[5] > 0x7F) { - sprite->subpriority = sub_8079E90(gAnimBankTarget) + 1; + sprite->subpriority = GetBattlerSubpriority(gAnimBankTarget) + 1; } else { - sprite->subpriority = sub_8079E90(gAnimBankTarget) + 6; + sprite->subpriority = GetBattlerSubpriority(gAnimBankTarget) + 6; } sprite->pos2.x += Sin(sprite->data[5], 5); sprite->pos2.y += Cos(sprite->data[5], 14); @@ -258,7 +258,7 @@ void sub_80CA928(u8 taskId) gBattleAnimArgs[1] = 0; gBattleAnimArgs[2] = 80; gBattleAnimArgs[3] = 0; - CreateSpriteAndAnimate(&gSpriteTemplate_83D631C, 0, 0, sub_8079E90(gAnimBankTarget) + 1); + CreateSpriteAndAnimate(&gSpriteTemplate_83D631C, 0, 0, GetBattlerSubpriority(gAnimBankTarget) + 1); } if (gTasks[taskId].data[1] == 15) diff --git a/src/battle/anim/osmose.c b/src/battle/anim/osmose.c index dad5605f7..36949b3c5 100644 --- a/src/battle/anim/osmose.c +++ b/src/battle/anim/osmose.c @@ -26,8 +26,8 @@ const union AnimCmd *const gSpriteAnimTable_83D6694[] = const struct SpriteTemplate gBattleAnimSpriteTemplate_83D6698 = { - .tileTag = 10147, - .paletteTag = 10147, + .tileTag = ANIM_TAG_ORBS, + .paletteTag = ANIM_TAG_ORBS, .oam = &gOamData_837DF24, .anims = gSpriteAnimTable_83D6694, .images = NULL, diff --git a/src/battle/anim/perceive.c b/src/battle/anim/perceive.c index ceca55141..0679dc617 100644 --- a/src/battle/anim/perceive.c +++ b/src/battle/anim/perceive.c @@ -30,8 +30,8 @@ const union AnimCmd *const gSpriteAnimTable_83D7B90[] = const struct SpriteTemplate gBattleAnimSpriteTemplate_83D7B94 = { - .tileTag = 10218, - .paletteTag = 10218, + .tileTag = ANIM_TAG_EYE_SPARKLE, + .paletteTag = ANIM_TAG_EYE_SPARKLE, .oam = &gOamData_837DF2C, .anims = gSpriteAnimTable_83D7B90, .images = NULL, diff --git a/src/battle/anim/poison.c b/src/battle/anim/poison.c index 99f534e1c..6559e1b2e 100644 --- a/src/battle/anim/poison.c +++ b/src/battle/anim/poison.c @@ -36,8 +36,8 @@ const union AnimCmd *const gSpriteAnimTable_83DA240[] = const struct SpriteTemplate gBattleAnimSpriteTemplate_83DA244 = { - .tileTag = 10151, - .paletteTag = 10151, + .tileTag = ANIM_TAG_TOXIC_BUBBLE, + .paletteTag = ANIM_TAG_TOXIC_BUBBLE, .oam = &gOamData_837DF74, .anims = gSpriteAnimTable_83DA240, .images = NULL, @@ -104,8 +104,8 @@ const union AffineAnimCmd *const gSpriteAffineAnimTable_83DA2B4[] = const struct SpriteTemplate gBattleAnimSpriteTemplate_83DA2B8 = { - .tileTag = 10150, - .paletteTag = 10150, + .tileTag = ANIM_TAG_POISON_BUBBLE, + .paletteTag = ANIM_TAG_POISON_BUBBLE, .oam = &gOamData_837DFEC, .anims = gSpriteAnimTable_83DA274, .images = NULL, @@ -115,8 +115,8 @@ const struct SpriteTemplate gBattleAnimSpriteTemplate_83DA2B8 = const struct SpriteTemplate gBattleAnimSpriteTemplate_83DA2D0 = { - .tileTag = 10150, - .paletteTag = 10150, + .tileTag = ANIM_TAG_POISON_BUBBLE, + .paletteTag = ANIM_TAG_POISON_BUBBLE, .oam = &gOamData_837DFEC, .anims = gSpriteAnimTable_83DA274, .images = NULL, @@ -126,8 +126,8 @@ const struct SpriteTemplate gBattleAnimSpriteTemplate_83DA2D0 = const struct SpriteTemplate gBattleAnimSpriteTemplate_83DA2E8 = { - .tileTag = 10150, - .paletteTag = 10150, + .tileTag = ANIM_TAG_POISON_BUBBLE, + .paletteTag = ANIM_TAG_POISON_BUBBLE, .oam = &gOamData_837DF8C, .anims = gSpriteAnimTable_83DA27C, .images = NULL, @@ -149,8 +149,8 @@ const union AffineAnimCmd *const gSpriteAffineAnimTable_83DA318[] = const struct SpriteTemplate gBattleAnimSpriteTemplate_83DA31C = { - .tileTag = 10150, - .paletteTag = 10150, + .tileTag = ANIM_TAG_POISON_BUBBLE, + .paletteTag = ANIM_TAG_POISON_BUBBLE, .oam = &gOamData_837DFEC, .anims = gSpriteAnimTable_83DA278, .images = NULL, @@ -172,8 +172,8 @@ const union AffineAnimCmd *const gSpriteAffineAnimTable_83DA34C[] = const struct SpriteTemplate gPoisonBubbleSpriteTemplate = { - .tileTag = 10150, - .paletteTag = 10150, + .tileTag = ANIM_TAG_POISON_BUBBLE, + .paletteTag = ANIM_TAG_POISON_BUBBLE, .oam = &gOamData_837DF8C, .anims = gSpriteAnimTable_83DA274, .images = NULL, @@ -183,8 +183,8 @@ const struct SpriteTemplate gPoisonBubbleSpriteTemplate = const struct SpriteTemplate gWaterBubbleSpriteTemplate = { - .tileTag = 10155, - .paletteTag = 10155, + .tileTag = ANIM_TAG_SMALL_BUBBLES, + .paletteTag = ANIM_TAG_SMALL_BUBBLES, .oam = &gOamData_837E0AC, .anims = gSpriteAnimTable_83D9310, .images = NULL, diff --git a/src/battle/anim/powder.c b/src/battle/anim/powder.c index 046d3c20c..447f31866 100644 --- a/src/battle/anim/powder.c +++ b/src/battle/anim/powder.c @@ -29,8 +29,8 @@ const union AnimCmd *const gSpriteAnimTable_83D6220[] = const struct SpriteTemplate gSleepPowderParticleSpriteTemplate = { - .tileTag = 10067, - .paletteTag = 10067, + .tileTag = ANIM_TAG_SLEEP_POWDER, + .paletteTag = ANIM_TAG_SLEEP_POWDER, .oam = &gOamData_837DF64, .anims = gSpriteAnimTable_83D6220, .images = NULL, @@ -40,8 +40,8 @@ const struct SpriteTemplate gSleepPowderParticleSpriteTemplate = const struct SpriteTemplate gStunSporeParticleSpriteTemplate = { - .tileTag = 10068, - .paletteTag = 10068, + .tileTag = ANIM_TAG_STUN_SPORE, + .paletteTag = ANIM_TAG_STUN_SPORE, .oam = &gOamData_837DF64, .anims = gSpriteAnimTable_83D6220, .images = NULL, @@ -51,8 +51,8 @@ const struct SpriteTemplate gStunSporeParticleSpriteTemplate = const struct SpriteTemplate gPoisonPowderParticleSpriteTemplate = { - .tileTag = 10065, - .paletteTag = 10065, + .tileTag = ANIM_TAG_POISON_POWDER, + .paletteTag = ANIM_TAG_POISON_POWDER, .oam = &gOamData_837DF64, .anims = gSpriteAnimTable_83D6220, .images = NULL, diff --git a/src/battle/anim/psychic.c b/src/battle/anim/psychic.c index ef263b971..140eadde1 100644 --- a/src/battle/anim/psychic.c +++ b/src/battle/anim/psychic.c @@ -50,8 +50,8 @@ const union AffineAnimCmd *const gSpriteAffineAnimTable_83DA68C[] = const struct SpriteTemplate gBattleAnimSpriteTemplate_83DA690 = { - .tileTag = 10196, - .paletteTag = 10196, + .tileTag = ANIM_TAG_SPIRAL, + .paletteTag = ANIM_TAG_SPIRAL, .oam = &gOamData_837E0BC, .anims = gDummySpriteAnimTable, .images = NULL, @@ -61,8 +61,8 @@ const struct SpriteTemplate gBattleAnimSpriteTemplate_83DA690 = const struct SpriteTemplate gBattleAnimSpriteTemplate_83DA6A8 = { - .tileTag = 10166, - .paletteTag = 10166, + .tileTag = ANIM_TAG_GREEN_LIGHT_WALL, + .paletteTag = ANIM_TAG_GREEN_LIGHT_WALL, .oam = &gOamData_837E05C, .anims = gDummySpriteAnimTable, .images = NULL, @@ -72,8 +72,8 @@ const struct SpriteTemplate gBattleAnimSpriteTemplate_83DA6A8 = const struct SpriteTemplate gBattleAnimSpriteTemplate_83DA6C0 = { - .tileTag = 10167, - .paletteTag = 10167, + .tileTag = ANIM_TAG_BLUE_LIGHT_WALL, + .paletteTag = ANIM_TAG_BLUE_LIGHT_WALL, .oam = &gOamData_837E05C, .anims = gDummySpriteAnimTable, .images = NULL, @@ -83,8 +83,8 @@ const struct SpriteTemplate gBattleAnimSpriteTemplate_83DA6C0 = const struct SpriteTemplate gBattleAnimSpriteTemplate_83DA6D8 = { - .tileTag = 10168, - .paletteTag = 10168, + .tileTag = ANIM_TAG_RED_LIGHT_WALL, + .paletteTag = ANIM_TAG_RED_LIGHT_WALL, .oam = &gOamData_837E05C, .anims = gDummySpriteAnimTable, .images = NULL, @@ -94,8 +94,8 @@ const struct SpriteTemplate gBattleAnimSpriteTemplate_83DA6D8 = const struct SpriteTemplate gBattleAnimSpriteTemplate_83DA6F0 = { - .tileTag = 10169, - .paletteTag = 10169, + .tileTag = ANIM_TAG_GRAY_LIGHT_WALL, + .paletteTag = ANIM_TAG_GRAY_LIGHT_WALL, .oam = &gOamData_837E05C, .anims = gDummySpriteAnimTable, .images = NULL, @@ -105,8 +105,8 @@ const struct SpriteTemplate gBattleAnimSpriteTemplate_83DA6F0 = const struct SpriteTemplate gBattleAnimSpriteTemplate_83DA708 = { - .tileTag = 10170, - .paletteTag = 10170, + .tileTag = ANIM_TAG_ORANGE_LIGHT_WALL, + .paletteTag = ANIM_TAG_ORANGE_LIGHT_WALL, .oam = &gOamData_837E05C, .anims = gDummySpriteAnimTable, .images = NULL, @@ -131,8 +131,8 @@ const union AnimCmd *const gSpriteAnimTable_83DA738[] = const struct SpriteTemplate gBattleAnimSpriteTemplate_83DA73C = { - .tileTag = 10071, - .paletteTag = 10071, + .tileTag = ANIM_TAG_SPARKLE_4, + .paletteTag = ANIM_TAG_SPARKLE_4, .oam = &gOamData_837DF34, .anims = gSpriteAnimTable_83DA738, .images = NULL, @@ -156,8 +156,8 @@ const union AnimCmd *const gSpriteAnimTable_83DA768[] = const struct SpriteTemplate gBattleAnimSpriteTemplate_83DA76C = { - .tileTag = 10070, - .paletteTag = 10070, + .tileTag = ANIM_TAG_SPARKLE_3, + .paletteTag = ANIM_TAG_SPARKLE_3, .oam = &gOamData_837DF2C, .anims = gSpriteAnimTable_83DA768, .images = NULL, @@ -167,8 +167,8 @@ const struct SpriteTemplate gBattleAnimSpriteTemplate_83DA76C = const struct SpriteTemplate gBattleAnimSpriteTemplate_83DA784 = { - .tileTag = 10163, - .paletteTag = 10163, + .tileTag = ANIM_TAG_GOLD_RING, + .paletteTag = ANIM_TAG_GOLD_RING, .oam = &gOamData_837DF74, .anims = gDummySpriteAnimTable, .images = NULL, @@ -224,8 +224,8 @@ const union AnimCmd *const gSpriteAnimTable_83DA81C[] = const struct SpriteTemplate gBattleAnimSpriteTemplate_83DA824 = { - .tileTag = 10097, - .paletteTag = 10097, + .tileTag = ANIM_TAG_BENT_SPOON, + .paletteTag = ANIM_TAG_BENT_SPOON, .oam = &gOamData_837DF74, .anims = gSpriteAnimTable_83DA81C, .images = NULL, @@ -266,8 +266,8 @@ const union AffineAnimCmd *const gSpriteAffineAnimTable_083DA888[] = const struct SpriteTemplate gBattleAnimSpriteTemplate_83DA88C = { - .tileTag = 10093, - .paletteTag = 10093, + .tileTag = ANIM_TAG_AMNESIA, + .paletteTag = ANIM_TAG_AMNESIA, .oam = &gOamData_837DF34, .anims = gSpriteAnimTable_83DA85C, .images = NULL, @@ -292,8 +292,8 @@ const union AffineAnimCmd gSpriteAffineAnim_083DA8C4[] = const struct SpriteTemplate gSpriteTemplate_83DA8DC = { - .tileTag = 10249, - .paletteTag = 10249, + .tileTag = ANIM_TAG_HOLLOW_ORB, + .paletteTag = ANIM_TAG_HOLLOW_ORB, .oam = &gOamData_837E04C, .anims = gDummySpriteAnimTable, .images = NULL, @@ -356,8 +356,8 @@ const union AffineAnimCmd *const gSpriteAffineAnimTable_83DA99C[] = const struct SpriteTemplate gSpriteTemplate_83DA9AC = { - .tileTag = 10251, - .paletteTag = 10251, + .tileTag = ANIM_TAG_BLUEGREEN_ORB, + .paletteTag = ANIM_TAG_BLUEGREEN_ORB, .oam = &gOamData_837DF8C, .anims = gDummySpriteAnimTable, .images = NULL, @@ -379,8 +379,8 @@ const union AffineAnimCmd *const gSpriteAffineAnimTable_83DA9DC[] = const struct SpriteTemplate gBattleAnimSpriteTemplate_83DA9E0 = { - .tileTag = 10267, - .paletteTag = 10267, + .tileTag = ANIM_TAG_WHITE_CIRCLE_OF_LIGHT, + .paletteTag = ANIM_TAG_WHITE_CIRCLE_OF_LIGHT, .oam = &gOamData_837E11C, .anims = gDummySpriteAnimTable, .images = NULL, @@ -417,8 +417,8 @@ const union AffineAnimCmd *const gSpriteAffineAnimTable_83DAA60[] = const struct SpriteTemplate gBattleAnimSpriteTemplate_83DAA68 = { - .tileTag = 10212, - .paletteTag = 10212, + .tileTag = ANIM_TAG_CIRCLE_OF_LIGHT, + .paletteTag = ANIM_TAG_CIRCLE_OF_LIGHT, .oam = &gOamData_837E11C, .anims = gDummySpriteAnimTable, .images = NULL, @@ -1258,7 +1258,7 @@ void sub_80DC700(struct Sprite *sprite) case 1: if (sprite->affineAnimEnded) { - PlaySE12WithPanning(SE_W100, BattleAnimAdjustPanning(-64)); + PlaySE12WithPanning(SE_W100, BattleAnimAdjustPanning(SOUND_PAN_ATTACKER_NEG)); ChangeSpriteAffineAnim(sprite, 1); sprite->data[0]++; } diff --git a/src/battle/anim/ring.c b/src/battle/anim/ring.c index a2cf618a6..f3d18c89a 100644 --- a/src/battle/anim/ring.c +++ b/src/battle/anim/ring.c @@ -30,8 +30,8 @@ static void sub_80D158C(struct Sprite* sprite); const struct SpriteTemplate gBattleAnimSpriteTemplate_83D77F8 = { - .tileTag = 10197, - .paletteTag = 10197, + .tileTag = ANIM_TAG_SNORE_Z, + .paletteTag = ANIM_TAG_SNORE_Z, .oam = &gOamData_837DF34, .anims = gDummySpriteAnimTable, .images = NULL, @@ -55,8 +55,8 @@ const union AnimCmd *const gSpriteAnimTable_83D7824[] = const struct SpriteTemplate gBattleAnimSpriteTemplate_83D7828 = { - .tileTag = 10198, - .paletteTag = 10198, + .tileTag = ANIM_TAG_EXPLOSION, + .paletteTag = ANIM_TAG_EXPLOSION, .oam = &gOamData_837DF34, .anims = gSpriteAnimTable_83D7824, .images = NULL, @@ -99,8 +99,8 @@ const union AffineAnimCmd *const gSpriteAffineAnimTable_83D78B0[] = const struct SpriteTemplate gBattleAnimSpriteTemplate_83D78BC = { - .tileTag = 10202, - .paletteTag = 10202, + .tileTag = ANIM_TAG_BREAKING_EGG, + .paletteTag = ANIM_TAG_BREAKING_EGG, .oam = &gOamData_837E114, .anims = gDummySpriteAnimTable, .images = NULL, @@ -142,8 +142,8 @@ const union AffineAnimCmd *const gSpriteAffineAnimTable_83D7924[] = const struct SpriteTemplate gBattleAnimSpriteTemplate_83D7928 = { - .tileTag = 10203, - .paletteTag = 10203, + .tileTag = ANIM_TAG_THIN_RING, + .paletteTag = ANIM_TAG_THIN_RING, .oam = &gOamData_837DFFC, .anims = gDummySpriteAnimTable, .images = NULL, @@ -165,8 +165,8 @@ const union AffineAnimCmd *const gSpriteAffineAnimTable_83D7958[] = const struct SpriteTemplate gBattleAnimSpriteTemplate_83D795C = { - .tileTag = 10203, - .paletteTag = 10203, + .tileTag = ANIM_TAG_THIN_RING, + .paletteTag = ANIM_TAG_THIN_RING, .oam = &gOamData_837E11C, .anims = gDummySpriteAnimTable, .images = NULL, @@ -176,8 +176,8 @@ const struct SpriteTemplate gBattleAnimSpriteTemplate_83D795C = const struct SpriteTemplate gBattleAnimSpriteTemplate_83D7974 = { - .tileTag = 10203, - .paletteTag = 10203, + .tileTag = ANIM_TAG_THIN_RING, + .paletteTag = ANIM_TAG_THIN_RING, .oam = &gOamData_837E11C, .anims = gDummySpriteAnimTable, .images = NULL, @@ -187,8 +187,8 @@ const struct SpriteTemplate gBattleAnimSpriteTemplate_83D7974 = const struct SpriteTemplate gBattleAnimSpriteTemplate_83D798C = { - .tileTag = 10203, - .paletteTag = 10203, + .tileTag = ANIM_TAG_THIN_RING, + .paletteTag = ANIM_TAG_THIN_RING, .oam = &gOamData_837E11C, .anims = gDummySpriteAnimTable, .images = NULL, @@ -198,8 +198,8 @@ const struct SpriteTemplate gBattleAnimSpriteTemplate_83D798C = const struct SpriteTemplate gBattleAnimSpriteTemplate_83D79A4 = { - .tileTag = 10203, - .paletteTag = 10203, + .tileTag = ANIM_TAG_THIN_RING, + .paletteTag = ANIM_TAG_THIN_RING, .oam = &gOamData_837E11C, .anims = gDummySpriteAnimTable, .images = NULL, diff --git a/src/battle/anim/rock.c b/src/battle/anim/rock.c index fa53df5b8..4a6fcd89e 100644 --- a/src/battle/anim/rock.c +++ b/src/battle/anim/rock.c @@ -70,8 +70,8 @@ const union AnimCmd *const gSpriteAnimTable_83DAC40[] = const struct SpriteTemplate gBattleAnimSpriteTemplate_83DAC4C = { - .tileTag = 10058, - .paletteTag = 10058, + .tileTag = ANIM_TAG_ROCKS, + .paletteTag = ANIM_TAG_ROCKS, .oam = &gOamData_837DF34, .anims = gSpriteAnimTable_83DAC40, .images = NULL, @@ -81,8 +81,8 @@ const struct SpriteTemplate gBattleAnimSpriteTemplate_83DAC4C = const struct SpriteTemplate gBattleAnimSpriteTemplate_83DAC64 = { - .tileTag = 10058, - .paletteTag = 10058, + .tileTag = ANIM_TAG_ROCKS, + .paletteTag = ANIM_TAG_ROCKS, .oam = &gOamData_837DF34, .anims = gSpriteAnimTable_83DAC40, .images = NULL, @@ -92,8 +92,8 @@ const struct SpriteTemplate gBattleAnimSpriteTemplate_83DAC64 = const struct SpriteTemplate gBattleAnimSpriteTemplate_83DAC7C = { - .tileTag = 10074, - .paletteTag = 10074, + .tileTag = ANIM_TAG_MUD_SAND, + .paletteTag = ANIM_TAG_MUD_SAND, .oam = &gOamData_837DF24, .anims = gDummySpriteAnimTable, .images = NULL, @@ -116,8 +116,8 @@ const union AffineAnimCmd *const gSpriteAffineAnimTable_83DACB4[] = const struct SpriteTemplate gBattleAnimSpriteTemplate_83DACB8 = { - .tileTag = 10149, - .paletteTag = 10149, + .tileTag = ANIM_TAG_WATER_ORB, + .paletteTag = ANIM_TAG_WATER_ORB, .oam = &gOamData_837E0AC, .anims = gSpriteAnimTable_83D91F0, .images = NULL, @@ -127,8 +127,8 @@ const struct SpriteTemplate gBattleAnimSpriteTemplate_83DACB8 = const struct SpriteTemplate gBattleAnimSpriteTemplate_83DACD0 = { - .tileTag = 10029, - .paletteTag = 10029, + .tileTag = ANIM_TAG_SMALL_EMBER, + .paletteTag = ANIM_TAG_SMALL_EMBER, .oam = &gOamData_837DF34, .anims = gSpriteAnimTable_83D95E0, .images = NULL, @@ -138,8 +138,8 @@ const struct SpriteTemplate gBattleAnimSpriteTemplate_83DACD0 = const struct SpriteTemplate gFlyingDirtSpriteTemplate = { - .tileTag = 10261, - .paletteTag = 10261, + .tileTag = ANIM_TAG_FLYING_DIRT, + .paletteTag = ANIM_TAG_FLYING_DIRT, .oam = &gOamData_837DF54, .anims = gDummySpriteAnimTable, .images = NULL, @@ -214,8 +214,8 @@ const union AnimCmd *const gSpriteAnimTable_83DAD58[] = const struct SpriteTemplate gAncientPowerRockSpriteTemplate = { - .tileTag = 10058, - .paletteTag = 10058, + .tileTag = ANIM_TAG_ROCKS, + .paletteTag = ANIM_TAG_ROCKS, .oam = &gOamData_837DF34, .anims = gSpriteAnimTable_83DAD48, .images = NULL, @@ -225,8 +225,8 @@ const struct SpriteTemplate gAncientPowerRockSpriteTemplate = const struct SpriteTemplate gSpriteTemplate_83DAD78 = { - .tileTag = 10074, - .paletteTag = 10074, + .tileTag = ANIM_TAG_MUD_SAND, + .paletteTag = ANIM_TAG_MUD_SAND, .oam = &gOamData_837DF24, .anims = gDummySpriteAnimTable, .images = NULL, @@ -236,8 +236,8 @@ const struct SpriteTemplate gSpriteTemplate_83DAD78 = const struct SpriteTemplate gSpriteTemplate_83DAD90 = { - .tileTag = 10058, - .paletteTag = 10058, + .tileTag = ANIM_TAG_ROCKS, + .paletteTag = ANIM_TAG_ROCKS, .oam = &gOamData_837DF34, .anims = gDummySpriteAnimTable, .images = NULL, @@ -247,8 +247,8 @@ const struct SpriteTemplate gSpriteTemplate_83DAD90 = const struct SpriteTemplate gBattleAnimSpriteTemplate_83DADA8 = { - .tileTag = 10058, - .paletteTag = 10058, + .tileTag = ANIM_TAG_ROCKS, + .paletteTag = ANIM_TAG_ROCKS, .oam = &gOamData_837DF34, .anims = gSpriteAnimTable_83DAD48, .images = NULL, @@ -276,8 +276,8 @@ const union AffineAnimCmd *const gSpriteAffineAnimTable_83DADE0[] = const struct SpriteTemplate gBattleAnimSpriteTemplate_83DADE8 = { - .tileTag = 10058, - .paletteTag = 10058, + .tileTag = ANIM_TAG_ROCKS, + .paletteTag = ANIM_TAG_ROCKS, .oam = &gOamData_837DF94, .anims = gSpriteAnimTable_83DAD48, .images = NULL, @@ -287,8 +287,8 @@ const struct SpriteTemplate gBattleAnimSpriteTemplate_83DADE8 = const struct SpriteTemplate gBattleAnimSpriteTemplate_83DAE00 = { - .tileTag = 10058, - .paletteTag = 10058, + .tileTag = ANIM_TAG_ROCKS, + .paletteTag = ANIM_TAG_ROCKS, .oam = &gOamData_837DF94, .anims = gSpriteAnimTable_83DAD48, .images = NULL, @@ -298,8 +298,8 @@ const struct SpriteTemplate gBattleAnimSpriteTemplate_83DAE00 = const struct SpriteTemplate gBattleAnimSpriteTemplate_83DAE18 = { - .tileTag = 10058, - .paletteTag = 10058, + .tileTag = ANIM_TAG_ROCKS, + .paletteTag = ANIM_TAG_ROCKS, .oam = &gOamData_837DF34, .anims = gSpriteAnimTable_83DAD58, .images = NULL, @@ -309,8 +309,8 @@ const struct SpriteTemplate gBattleAnimSpriteTemplate_83DAE18 = const struct SpriteTemplate gBattleAnimSpriteTemplate_83DAE30 = { - .tileTag = 10058, - .paletteTag = 10058, + .tileTag = ANIM_TAG_ROCKS, + .paletteTag = ANIM_TAG_ROCKS, .oam = &gOamData_837DF94, .anims = gSpriteAnimTable_83DAD50, .images = NULL, @@ -622,8 +622,8 @@ void sub_80DD4D4(u8 taskId) task->data[6] = 0; task->data[7] = 0; - pan1 = BattleAnimAdjustPanning(-64); - pan2 = BattleAnimAdjustPanning(63); + pan1 = BattleAnimAdjustPanning(SOUND_PAN_ATTACKER_NEG); + pan2 = BattleAnimAdjustPanning(SOUND_PAN_TARGET); task->data[13] = pan1; task->data[14] = (pan2 - pan1) / task->data[8]; diff --git a/src/battle/anim/roots.c b/src/battle/anim/roots.c index b9b76c584..085d678d6 100644 --- a/src/battle/anim/roots.c +++ b/src/battle/anim/roots.c @@ -59,8 +59,8 @@ const union AnimCmd *const gSpriteAnimTable_83D6648[] = const struct SpriteTemplate gBattleAnimSpriteTemplate_83D6658 = { - .tileTag = 10223, - .paletteTag = 10223, + .tileTag = ANIM_TAG_ROOTS, + .paletteTag = ANIM_TAG_ROOTS, .oam = &gOamData_837DF34, .anims = gSpriteAnimTable_83D6648, .images = NULL, @@ -70,8 +70,8 @@ const struct SpriteTemplate gBattleAnimSpriteTemplate_83D6658 = const struct SpriteTemplate gBattleAnimSpriteTemplate_83D6670 = { - .tileTag = 10223, - .paletteTag = 10223, + .tileTag = ANIM_TAG_ROOTS, + .paletteTag = ANIM_TAG_ROOTS, .oam = &gOamData_837DF34, .anims = gSpriteAnimTable_83D6648, .images = NULL, diff --git a/src/battle/anim/scan.c b/src/battle/anim/scan.c index 409acf549..792e832cb 100644 --- a/src/battle/anim/scan.c +++ b/src/battle/anim/scan.c @@ -23,8 +23,8 @@ static void sub_80CD67C(struct Sprite* sprite); const struct SpriteTemplate gBattleAnimSpriteTemplate_83D6DAC = { - .tileTag = 10014, - .paletteTag = 10014, + .tileTag = ANIM_TAG_LOCK_ON, + .paletteTag = ANIM_TAG_LOCK_ON, .oam = &gOamData_837DF34, .anims = gDummySpriteAnimTable, .images = NULL, @@ -34,8 +34,8 @@ const struct SpriteTemplate gBattleAnimSpriteTemplate_83D6DAC = const struct SpriteTemplate gBattleAnimSpriteTemplate_83D6DC4 = { - .tileTag = 10014, - .paletteTag = 10014, + .tileTag = ANIM_TAG_LOCK_ON, + .paletteTag = ANIM_TAG_LOCK_ON, .oam = &gOamData_837DF2C, .anims = gDummySpriteAnimTable, .images = NULL, @@ -80,7 +80,7 @@ static void sub_80CD408(struct Sprite* sprite) sprite->callback = StartAnimLinearTranslation; StoreSpriteCallbackInData(sprite, sub_80CD4B8); sprite->data[5] += 0x100; - PlaySE12WithPanning(0xD2, BattleAnimAdjustPanning(0x3F)); + PlaySE12WithPanning(0xD2, BattleAnimAdjustPanning(SOUND_PAN_TARGET)); break; } @@ -166,7 +166,7 @@ static void sub_80CD5A8(struct Sprite* sprite) sprite->data[2]++; pal = sprite->oam.paletteNum; LoadPalette(&gPlttBufferUnfaded[0x108 + pal * 16], pal * 16 | 0x101, 4); - PlaySE12WithPanning(0xC0, BattleAnimAdjustPanning(0x3F)); + PlaySE12WithPanning(0xC0, BattleAnimAdjustPanning(SOUND_PAN_TARGET)); } else if (sprite->data[1] == 0) { diff --git a/src/battle/anim/seed.c b/src/battle/anim/seed.c index bf8142a49..8065c9a38 100644 --- a/src/battle/anim/seed.c +++ b/src/battle/anim/seed.c @@ -32,8 +32,8 @@ const union AnimCmd *const gSpriteAnimTable_83D63C0[] = const struct SpriteTemplate gLeechSeedSpriteTemplate = { - .tileTag = 10006, - .paletteTag = 10006, + .tileTag = ANIM_TAG_SEED, + .paletteTag = ANIM_TAG_SEED, .oam = &gOamData_837DF2C, .anims = gSpriteAnimTable_83D63C0, .images = NULL, diff --git a/src/battle/anim/sfx.c b/src/battle/anim/sfx.c index 6d47f0b46..e41251964 100644 --- a/src/battle/anim/sfx.c +++ b/src/battle/anim/sfx.c @@ -27,8 +27,8 @@ void sub_812AF30(u8 taskId) TASK.data[0] = gBattleAnimArgs[0]; TASK.data[1] = gBattleAnimArgs[1]; - sourcePan = BattleAnimAdjustPanning(-64); - targetPan = BattleAnimAdjustPanning(63); + sourcePan = BattleAnimAdjustPanning(SOUND_PAN_ATTACKER_NEG); + targetPan = BattleAnimAdjustPanning(SOUND_PAN_TARGET); panIncrement = CalculatePanIncrement(sourcePan, targetPan, 2); TASK.data[2] = sourcePan; @@ -70,7 +70,7 @@ static void sub_812B004(u8 taskId) { TASK.data[10] = 0; - pan = BattleAnimAdjustPanning(63); + pan = BattleAnimAdjustPanning(SOUND_PAN_TARGET); PlaySE12WithPanning(TASK.data[1], pan); if (++TASK.data[11] == 2) @@ -145,7 +145,7 @@ static void sub_812B108(u8 taskId) void sub_812B18C(u8 taskId) { u16 species = 0; - s8 pan = BattleAnimAdjustPanning(-64); + s8 pan = BattleAnimAdjustPanning(SOUND_PAN_ATTACKER_NEG); if (IsContest()) { @@ -197,7 +197,7 @@ void sub_812B18C(u8 taskId) void sub_812B2B8(u8 taskId) { u16 species; - s8 pan = BattleAnimAdjustPanning(-64); + s8 pan = BattleAnimAdjustPanning(SOUND_PAN_ATTACKER_NEG); if (IsContest()) species = shared19348.unk0; diff --git a/src/battle/anim/shadow_minimize.c b/src/battle/anim/shadow_minimize.c index 1a04fd58a..224896d86 100644 --- a/src/battle/anim/shadow_minimize.c +++ b/src/battle/anim/shadow_minimize.c @@ -27,7 +27,7 @@ void sub_80D0488(u8 taskId) task->data[4] = 0x100; task->data[5] = 0; task->data[6] = 0; - task->data[7] = sub_8079E90(gAnimBankAttacker); + task->data[7] = GetBattlerSubpriority(gAnimBankAttacker); task->func = sub_80D04E0; } diff --git a/src/battle/anim/shield.c b/src/battle/anim/shield.c index d858f5100..d71baacc9 100644 --- a/src/battle/anim/shield.c +++ b/src/battle/anim/shield.c @@ -17,8 +17,8 @@ static void sub_80CCE0C(struct Sprite* sprite); const struct SpriteTemplate gBattleAnimSpriteTemplate_83D6BE8 = { - .tileTag = 10280, - .paletteTag = 10280, + .tileTag = ANIM_TAG_PROTECT, + .paletteTag = ANIM_TAG_PROTECT, .oam = &gOamData_837E05C, .anims = gDummySpriteAnimTable, .images = NULL, diff --git a/src/battle/anim/shock.c b/src/battle/anim/shock.c index 5b82d9319..fac415ade 100644 --- a/src/battle/anim/shock.c +++ b/src/battle/anim/shock.c @@ -33,8 +33,8 @@ const union AnimCmd *const gSpriteAnimTable_83D9840[] = const struct SpriteTemplate gSpriteTemplate_83D9844 = { - .tileTag = 10079, - .paletteTag = 10079, + .tileTag = ANIM_TAG_SHOCK, + .paletteTag = ANIM_TAG_SHOCK, .oam = &gOamData_837DF34, .anims = gSpriteAnimTable_83D9840, .images = NULL, @@ -44,8 +44,8 @@ const struct SpriteTemplate gSpriteTemplate_83D9844 = const struct SpriteTemplate gBattleAnimSpriteTemplate_83D985C = { - .tileTag = 10011, - .paletteTag = 10011, + .tileTag = ANIM_TAG_SPARK_2, + .paletteTag = ANIM_TAG_SPARK_2, .oam = &gOamData_837DF8C, .anims = gDummySpriteAnimTable, .images = NULL, @@ -55,8 +55,8 @@ const struct SpriteTemplate gBattleAnimSpriteTemplate_83D985C = const struct SpriteTemplate gBattleAnimSpriteTemplate_83D9874 = { - .tileTag = 10171, - .paletteTag = 10171, + .tileTag = ANIM_TAG_BLACK_BALL_2, + .paletteTag = ANIM_TAG_BLACK_BALL_2, .oam = &gOamData_837DF2C, .anims = gDummySpriteAnimTable, .images = NULL, diff --git a/src/battle/anim/slash.c b/src/battle/anim/slash.c index f71bc6eaa..c2c1fcb16 100644 --- a/src/battle/anim/slash.c +++ b/src/battle/anim/slash.c @@ -41,8 +41,8 @@ const union AnimCmd *const gSpriteAnimTable_83D6E30[] = const struct SpriteTemplate gBattleAnimSpriteTemplate_83D6E38 = { - .tileTag = 10183, - .paletteTag = 10183, + .tileTag = ANIM_TAG_SLASH, + .paletteTag = ANIM_TAG_SLASH, .oam = &gOamData_837DF34, .anims = gSpriteAnimTable_83D6E30, .images = NULL, @@ -52,8 +52,8 @@ const struct SpriteTemplate gBattleAnimSpriteTemplate_83D6E38 = const struct SpriteTemplate gBattleAnimSpriteTemplate_83D6E50 = { - .tileTag = 10286, - .paletteTag = 10286, + .tileTag = ANIM_TAG_SLASH_2, + .paletteTag = ANIM_TAG_SLASH_2, .oam = &gOamData_837DF34, .anims = gSpriteAnimTable_83D6E30, .images = NULL, @@ -63,8 +63,8 @@ const struct SpriteTemplate gBattleAnimSpriteTemplate_83D6E50 = const struct SpriteTemplate gBattleAnimSpriteTemplate_83D6E68 = { - .tileTag = 10286, - .paletteTag = 10286, + .tileTag = ANIM_TAG_SLASH_2, + .paletteTag = ANIM_TAG_SLASH_2, .oam = &gOamData_837DF34, .anims = gSpriteAnimTable_83D6E30, .images = NULL, diff --git a/src/battle/anim/sleep.c b/src/battle/anim/sleep.c index 40b984be7..6963624ee 100644 --- a/src/battle/anim/sleep.c +++ b/src/battle/anim/sleep.c @@ -61,8 +61,8 @@ const union AffineAnimCmd *const gSpriteAffineAnimTable_83D6D8C[] = const struct SpriteTemplate gBattleAnimSpriteTemplate_83D6D94 = { - .tileTag = 10228, - .paletteTag = 10228, + .tileTag = ANIM_TAG_LETTER_Z, + .paletteTag = ANIM_TAG_LETTER_Z, .oam = &gOamData_837DF94, .anims = gSpriteAnimTable_83D6D28, .images = NULL, diff --git a/src/battle/anim/slice.c b/src/battle/anim/slice.c index 4da414cbf..329f267d6 100644 --- a/src/battle/anim/slice.c +++ b/src/battle/anim/slice.c @@ -28,8 +28,8 @@ const union AnimCmd *const gSpriteAnimTable_83D6B24[] = const struct SpriteTemplate gCuttingSliceSpriteTemplate = { - .tileTag = 10138, - .paletteTag = 10138, + .tileTag = ANIM_TAG_CUT, + .paletteTag = ANIM_TAG_CUT, .oam = &gOamData_837E054, .anims = gSpriteAnimTable_83D6B24, .images = NULL, @@ -39,8 +39,8 @@ const struct SpriteTemplate gCuttingSliceSpriteTemplate = const struct SpriteTemplate gBattleAnimSpriteTemplate_83D6B40 = { - .tileTag = 10138, - .paletteTag = 10138, + .tileTag = ANIM_TAG_CUT, + .paletteTag = ANIM_TAG_CUT, .oam = &gOamData_837E054, .anims = gSpriteAnimTable_83D6B24, .images = NULL, diff --git a/src/battle/anim/sonic.c b/src/battle/anim/sonic.c index 4a9ade286..1de546780 100644 --- a/src/battle/anim/sonic.c +++ b/src/battle/anim/sonic.c @@ -19,8 +19,8 @@ void sub_80CF8B8(struct Sprite* sprite); const struct SpriteTemplate gSonicBoomSpriteTemplate = { - .tileTag = 10003, - .paletteTag = 10003, + .tileTag = ANIM_TAG_AIR_WAVE, + .paletteTag = ANIM_TAG_AIR_WAVE, .oam = &gOamData_837E134, .anims = gDummySpriteAnimTable, .images = NULL, @@ -30,8 +30,8 @@ const struct SpriteTemplate gSonicBoomSpriteTemplate = const struct SpriteTemplate gSpriteTemplate_83D74BC = { - .tileTag = 10003, - .paletteTag = 10003, + .tileTag = ANIM_TAG_AIR_WAVE, + .paletteTag = ANIM_TAG_AIR_WAVE, .oam = &gOamData_837E074, .anims = gDummySpriteAnimTable, .images = NULL, @@ -70,8 +70,8 @@ const union AffineAnimCmd *const gSpriteAffineAnimTable_83D7530[] = const struct SpriteTemplate gSupersonicWaveSpriteTemplate = { - .tileTag = 10163, - .paletteTag = 10163, + .tileTag = ANIM_TAG_GOLD_RING, + .paletteTag = ANIM_TAG_GOLD_RING, .oam = &gOamData_837E034, .anims = gDummySpriteAnimTable, .images = NULL, @@ -81,8 +81,8 @@ const struct SpriteTemplate gSupersonicWaveSpriteTemplate = const struct SpriteTemplate gScreechWaveSpriteTemplate = { - .tileTag = 10164, - .paletteTag = 10164, + .tileTag = ANIM_TAG_PURPLE_RING, + .paletteTag = ANIM_TAG_PURPLE_RING, .oam = &gOamData_837E034, .anims = gDummySpriteAnimTable, .images = NULL, @@ -92,8 +92,8 @@ const struct SpriteTemplate gScreechWaveSpriteTemplate = const struct SpriteTemplate gBattleAnimSpriteTemplate_83D7564 = { - .tileTag = 10260, - .paletteTag = 10260, + .tileTag = ANIM_TAG_METAL_SOUND_WAVES, + .paletteTag = ANIM_TAG_METAL_SOUND_WAVES, .oam = &gOamData_837E03C, .anims = gDummySpriteAnimTable, .images = NULL, @@ -103,8 +103,8 @@ const struct SpriteTemplate gBattleAnimSpriteTemplate_83D7564 = const struct SpriteTemplate gBattleAnimSpriteTemplate_83D757C = { - .tileTag = 10288, - .paletteTag = 10288, + .tileTag = ANIM_TAG_BLUE_RING_2, + .paletteTag = ANIM_TAG_BLUE_RING_2, .oam = &gOamData_837E034, .anims = gDummySpriteAnimTable, .images = NULL, @@ -347,12 +347,12 @@ void sub_80CFB04(u8 taskId) gBattleAnimArgs[4] ^= 0x80; if (gBattleAnimArgs[4] >= 64) { - u16 var = sub_8079E90(gAnimBankTarget) + (gBattleAnimArgs[4] - 64); + u16 var = GetBattlerSubpriority(gAnimBankTarget) + (gBattleAnimArgs[4] - 64); gTasks[taskId].data[2] = var; } else { - u16 var = sub_8079E90(gAnimBankTarget) - gBattleAnimArgs[4]; + u16 var = GetBattlerSubpriority(gAnimBankTarget) - gBattleAnimArgs[4]; gTasks[taskId].data[2] = var; } } @@ -360,12 +360,12 @@ void sub_80CFB04(u8 taskId) { if (gBattleAnimArgs[4] >= 64) { - u16 var = sub_8079E90(gAnimBankTarget) + (gBattleAnimArgs[4] - 64); + u16 var = GetBattlerSubpriority(gAnimBankTarget) + (gBattleAnimArgs[4] - 64); gTasks[taskId].data[2] = var; } else { - u16 var = sub_8079E90(gAnimBankTarget) - gBattleAnimArgs[4]; + u16 var = GetBattlerSubpriority(gAnimBankTarget) - gBattleAnimArgs[4]; gTasks[taskId].data[2] = var; } } diff --git a/src/battle/anim/spit.c b/src/battle/anim/spit.c index 792d7e0eb..ee21135ac 100644 --- a/src/battle/anim/spit.c +++ b/src/battle/anim/spit.c @@ -27,8 +27,8 @@ const union AffineAnimCmd *const gSpriteAffineAnimTable_83D7B5C[] = const struct SpriteTemplate gBattleAnimSpriteTemplate_83D7B60 = { - .tileTag = 10237, - .paletteTag = 10237, + .tileTag = ANIM_TAG_RED_ORB_2, + .paletteTag = ANIM_TAG_RED_ORB_2, .oam = &gOamData_837DFE4, .anims = gDummySpriteAnimTable, .images = NULL, diff --git a/src/battle/anim/strike.c b/src/battle/anim/strike.c index 79dd833a9..0eba290a9 100644 --- a/src/battle/anim/strike.c +++ b/src/battle/anim/strike.c @@ -34,8 +34,8 @@ const union AnimCmd *const gSpriteAnimTable_83D7034[] = const struct SpriteTemplate gBattleAnimSpriteTemplate_83D7038 = { - .tileTag = 10031, - .paletteTag = 10031, + .tileTag = ANIM_TAG_BLUE_STAR, + .paletteTag = ANIM_TAG_BLUE_STAR, .oam = &gOamData_837DF34, .anims = gSpriteAnimTable_83D7034, .images = NULL, @@ -45,8 +45,8 @@ const struct SpriteTemplate gBattleAnimSpriteTemplate_83D7038 = const struct SpriteTemplate gBattleAnimSpriteTemplate_83D7050 = { - .tileTag = 10020, - .paletteTag = 10020, + .tileTag = ANIM_TAG_HORN_HIT, + .paletteTag = ANIM_TAG_HORN_HIT, .oam = &gOamData_837DF34, .anims = gDummySpriteAnimTable, .images = NULL, diff --git a/src/battle/anim/struggle.c b/src/battle/anim/struggle.c index 2bcf3727e..609673fa0 100644 --- a/src/battle/anim/struggle.c +++ b/src/battle/anim/struggle.c @@ -36,8 +36,8 @@ const union AnimCmd *const gSpriteAnimTable_83D7C88[] = const struct SpriteTemplate gBattleAnimSpriteTemplate_83D7C90 = { - .tileTag = 10215, - .paletteTag = 10215, + .tileTag = ANIM_TAG_MOVEMENT_WAVES, + .paletteTag = ANIM_TAG_MOVEMENT_WAVES, .oam = &gOamData_837DF34, .anims = gSpriteAnimTable_83D7C88, .images = NULL, diff --git a/src/battle/anim/sunlight.c b/src/battle/anim/sunlight.c index 5edb9afea..c10f561ae 100644 --- a/src/battle/anim/sunlight.c +++ b/src/battle/anim/sunlight.c @@ -21,8 +21,8 @@ const union AffineAnimCmd *const gSpriteAffineAnimTable_83D95AC[] = const struct SpriteTemplate gBattleAnimSpriteTemplate_83D95B0 = { - .tileTag = 10157, - .paletteTag = 10157, + .tileTag = ANIM_TAG_SUNLIGHT, + .paletteTag = ANIM_TAG_SUNLIGHT, .oam = &gOamData_837E0B4, .anims = gDummySpriteAnimTable, .images = NULL, diff --git a/src/battle/anim/swipe.c b/src/battle/anim/swipe.c index df7a0e91f..09f9adbd6 100644 --- a/src/battle/anim/swipe.c +++ b/src/battle/anim/swipe.c @@ -32,8 +32,8 @@ const union AnimCmd *const gSpriteAnimTable_83D7C40[] = const struct SpriteTemplate gBattleAnimSpriteTemplate_83D7C48 = { - .tileTag = 10222, - .paletteTag = 10222, + .tileTag = ANIM_TAG_SWIPE, + .paletteTag = ANIM_TAG_SWIPE, .oam = &gOamData_837DF34, .anims = gSpriteAnimTable_83D7C40, .images = NULL, diff --git a/src/battle/anim/switch.c b/src/battle/anim/switch.c index fcb1d9fc3..2b8a87d3d 100644 --- a/src/battle/anim/switch.c +++ b/src/battle/anim/switch.c @@ -45,8 +45,8 @@ const union AffineAnimCmd *const gSpriteAffineAnimTable_83D67E4[] = { const struct SpriteTemplate gBattleAnimSpriteTemplate_83D67F4 = { - .tileTag = 10224, - .paletteTag = 10224, + .tileTag = ANIM_TAG_ITEM_BAG, + .paletteTag = ANIM_TAG_ITEM_BAG, .oam = &gOamData_837DF94, .anims = gSpriteAnimTable_83D66B8, .images = NULL, diff --git a/src/battle/anim/sword.c b/src/battle/anim/sword.c index fcb85a794..8b15288b9 100644 --- a/src/battle/anim/sword.c +++ b/src/battle/anim/sword.c @@ -29,8 +29,8 @@ const union AffineAnimCmd *const gSpriteAffineAnimTable_83D7488[] = const struct SpriteTemplate gBattleAnimSpriteTemplate_83D748C = { - .tileTag = 10005, - .paletteTag = 10005, + .tileTag = ANIM_TAG_SWORD, + .paletteTag = ANIM_TAG_SWORD, .oam = &gOamData_837E0FC, .anims = gDummySpriteAnimTable, .images = NULL, diff --git a/src/battle/anim/tendrils.c b/src/battle/anim/tendrils.c index cee45b648..de50fc419 100644 --- a/src/battle/anim/tendrils.c +++ b/src/battle/anim/tendrils.c @@ -59,8 +59,8 @@ const union AffineAnimCmd *const gSpriteAffineAnimTable_83D6598[] = { const struct SpriteTemplate gBattleAnimSpriteTemplate_83D65A0 = { - .tileTag = 10186, - .paletteTag = 10186, + .tileTag = ANIM_TAG_TENDRILS, + .paletteTag = ANIM_TAG_TENDRILS, .oam = &gOamData_837DFBC, .anims = gSpriteAnimTable_83D6550, .images = NULL, diff --git a/src/battle/anim/thought.c b/src/battle/anim/thought.c index d39520dac..fcaf6a9a8 100644 --- a/src/battle/anim/thought.c +++ b/src/battle/anim/thought.c @@ -60,8 +60,8 @@ const union AnimCmd *const gSpriteAnimTable_83D7210[] = const struct SpriteTemplate gBattleAnimSpriteTemplate_83D7220 = { - .tileTag = 10209, - .paletteTag = 10209, + .tileTag = ANIM_TAG_THOUGHT_BUBBLE, + .paletteTag = ANIM_TAG_THOUGHT_BUBBLE, .oam = &gOamData_837DF34, .anims = gSpriteAnimTable_83D7210, .images = NULL, diff --git a/src/battle/anim/thunder.c b/src/battle/anim/thunder.c index 9cd04e61f..862f0f7a8 100644 --- a/src/battle/anim/thunder.c +++ b/src/battle/anim/thunder.c @@ -30,8 +30,8 @@ const union AnimCmd *const gSpriteAnimTable_83D97CC[] = const struct SpriteTemplate gBattleAnimSpriteTemplate_83D97D0 = { - .tileTag = 10037, - .paletteTag = 10037, + .tileTag = ANIM_TAG_LIGHTNING, + .paletteTag = ANIM_TAG_LIGHTNING, .oam = &gOamData_837DF34, .anims = gSpriteAnimTable_83D97CC, .images = NULL, diff --git a/src/battle/anim/tile.c b/src/battle/anim/tile.c index 0442321d6..de89b80a7 100644 --- a/src/battle/anim/tile.c +++ b/src/battle/anim/tile.c @@ -20,8 +20,8 @@ static void sub_80CE1AC(struct Sprite* sprite); const struct SpriteTemplate gBattleAnimSpriteTemplate_83D6F08 = { - .tileTag = 10017, - .paletteTag = 10017, + .tileTag = ANIM_TAG_BLACK_BALL, + .paletteTag = ANIM_TAG_BLACK_BALL, .oam = &gOamData_837DF24, .anims = gDummySpriteAnimTable, .images = NULL, @@ -46,8 +46,8 @@ const union AnimCmd *const gSpriteAnimTable_83D6F38[] = const struct SpriteTemplate gBattleAnimSpriteTemplate_83D6F3C = { - .tileTag = 10030, - .paletteTag = 10030, + .tileTag = ANIM_TAG_GRAY_SMOKE, + .paletteTag = ANIM_TAG_GRAY_SMOKE, .oam = &gOamData_837DF34, .anims = gSpriteAnimTable_83D6F38, .images = NULL, @@ -82,8 +82,8 @@ const union AffineAnimCmd *const gSpriteAffineAnimTable_83D6F7C[] = const struct SpriteTemplate gBattleAnimSpriteTemplate_83D6F80 = { - .tileTag = 10018, - .paletteTag = 10018, + .tileTag = ANIM_TAG_CONVERSION, + .paletteTag = ANIM_TAG_CONVERSION, .oam = &gOamData_837E104, .anims = gSpriteAnimTable_83D6F68, .images = NULL, @@ -107,8 +107,8 @@ const union AnimCmd *const gSpriteAnimTable_83D6FAC[] = const struct SpriteTemplate gBattleAnimSpriteTemplate_83D6FB0 = { - .tileTag = 10018, - .paletteTag = 10018, + .tileTag = ANIM_TAG_CONVERSION, + .paletteTag = ANIM_TAG_CONVERSION, .oam = &gOamData_837E104, .anims = gSpriteAnimTable_83D6FAC, .images = NULL, diff --git a/src/battle/anim/twinkle.c b/src/battle/anim/twinkle.c index bfe0c8da2..0180d5be1 100644 --- a/src/battle/anim/twinkle.c +++ b/src/battle/anim/twinkle.c @@ -30,8 +30,8 @@ const union AnimCmd *const gSpriteAnimTable_83D6FF4[] = const struct SpriteTemplate gBattleAnimSpriteTemplate_83D6FF8 = { - .tileTag = 10195, - .paletteTag = 10195, + .tileTag = ANIM_TAG_SPARKLE_5, + .paletteTag = ANIM_TAG_SPARKLE_5, .oam = &gOamData_837DF2C, .anims = gSpriteAnimTable_83D6FF4, .images = NULL, diff --git a/src/battle/anim/unused_1.c b/src/battle/anim/unused_1.c index 15050b54c..ee775a0ed 100644 --- a/src/battle/anim/unused_1.c +++ b/src/battle/anim/unused_1.c @@ -66,8 +66,8 @@ const union AffineAnimCmd *const gSpriteAffineAnimTable_83D6AD8[] = { const struct SpriteTemplate gSpriteTemplate_83D6AF8 = { - .tileTag = 10143, - .paletteTag = 10143, + .tileTag = ANIM_TAG_HANDS_AND_FEET, + .paletteTag = ANIM_TAG_HANDS_AND_FEET, .oam = &gOamData_837DF94, .anims = gDummySpriteAnimTable, .images = NULL, diff --git a/src/battle/anim/unused_2.c b/src/battle/anim/unused_2.c index f4ebe0e74..4c12f609d 100644 --- a/src/battle/anim/unused_2.c +++ b/src/battle/anim/unused_2.c @@ -90,8 +90,8 @@ const union AnimCmd *const gSpriteAnimTable_83D6BA8[] = const struct SpriteTemplate gSpriteTemplate_83D6BD0 = { - .tileTag = 10072, - .paletteTag = 10072, + .tileTag = ANIM_TAG_MUSIC_NOTES, + .paletteTag = ANIM_TAG_MUSIC_NOTES, .oam = &gOamData_837DF2C, .anims = gSpriteAnimTable_83D6BA8, .images = NULL, diff --git a/src/battle/anim/unused_3.c b/src/battle/anim/unused_3.c index 1c3ab978e..e222cd512 100644 --- a/src/battle/anim/unused_3.c +++ b/src/battle/anim/unused_3.c @@ -47,8 +47,8 @@ const union AnimCmd *const gSpriteAnimTable_83D6D00[] = const struct SpriteTemplate gSpriteTemplate_83D6D08 = { - .tileTag = 10032, - .paletteTag = 10032, + .tileTag = ANIM_TAG_UNUSED_BUBBLE_BURST, + .paletteTag = ANIM_TAG_UNUSED_BUBBLE_BURST, .oam = &gOamData_837DF2C, .anims = gSpriteAnimTable_83D6D00, .images = NULL, diff --git a/src/battle/anim/unused_5.c b/src/battle/anim/unused_5.c index af9a8a037..e6b2f47f4 100644 --- a/src/battle/anim/unused_5.c +++ b/src/battle/anim/unused_5.c @@ -14,8 +14,8 @@ void sub_80CF280(struct Sprite* sprite); const struct SpriteTemplate gSpriteTemplate_83D7370 = { - .tileTag = 10064, - .paletteTag = 10064, + .tileTag = ANIM_TAG_FINGER, + .paletteTag = ANIM_TAG_FINGER, .oam = &gOamData_837DF34, .anims = gDummySpriteAnimTable, .images = NULL, diff --git a/src/battle/anim/unused_6.c b/src/battle/anim/unused_6.c index 5b37d32c9..ab5678641 100644 --- a/src/battle/anim/unused_6.c +++ b/src/battle/anim/unused_6.c @@ -28,8 +28,8 @@ const union AnimCmd *const gSpriteAnimTable_83D7390[] = const struct SpriteTemplate gSpriteTemplate_83D7394 = { - .tileTag = 10072, - .paletteTag = 10072, + .tileTag = ANIM_TAG_MUSIC_NOTES, + .paletteTag = ANIM_TAG_MUSIC_NOTES, .oam = &gOamData_837DF2C, .anims = gDummySpriteAnimTable, .images = NULL, diff --git a/src/battle/anim/unused_8.c b/src/battle/anim/unused_8.c index 92f5973db..586725f33 100644 --- a/src/battle/anim/unused_8.c +++ b/src/battle/anim/unused_8.c @@ -17,8 +17,8 @@ static void sub_80CF4B8(struct Sprite* sprite); const struct SpriteTemplate gSpriteTemplate_83D73C4 = { - .tileTag = 10145, - .paletteTag = 10145, + .tileTag = ANIM_TAG_CLAMP, + .paletteTag = ANIM_TAG_CLAMP, .oam = &gOamData_837E0BC, .anims = gDummySpriteAnimTable, .images = NULL, diff --git a/src/battle/anim/unused_9.c b/src/battle/anim/unused_9.c index d8dda35b3..75d236714 100644 --- a/src/battle/anim/unused_9.c +++ b/src/battle/anim/unused_9.c @@ -17,8 +17,8 @@ static void sub_80CFE2C(struct Sprite* sprite); const struct SpriteTemplate gSpriteTemplate_83D75AC = { - .tileTag = 10178, - .paletteTag = 10178, + .tileTag = ANIM_TAG_UNUSED_VOID_LINES, + .paletteTag = ANIM_TAG_UNUSED_VOID_LINES, .oam = &gOamData_837E05C, .anims = gDummySpriteAnimTable, .images = NULL, diff --git a/src/battle/anim/water.c b/src/battle/anim/water.c index 487624224..af38ecd7a 100644 --- a/src/battle/anim/water.c +++ b/src/battle/anim/water.c @@ -43,8 +43,8 @@ const union AnimCmd *const gSpriteAnimTable_83D9314[] = const struct SpriteTemplate gBattleAnimSpriteTemplate_83D9318 = { - .tileTag = 10155, - .paletteTag = 10155, + .tileTag = ANIM_TAG_SMALL_BUBBLES, + .paletteTag = ANIM_TAG_SMALL_BUBBLES, .oam = &gOamData_837E04C, .anims = gSpriteAnimTable_83D9310, .images = NULL, @@ -54,8 +54,8 @@ const struct SpriteTemplate gBattleAnimSpriteTemplate_83D9318 = const struct SpriteTemplate gBattleAnimSpriteTemplate_83D9330 = { - .tileTag = 10155, - .paletteTag = 10155, + .tileTag = ANIM_TAG_SMALL_BUBBLES, + .paletteTag = ANIM_TAG_SMALL_BUBBLES, .oam = &gOamData_837E10C, .anims = gSpriteAnimTable_83D9314, .images = NULL, @@ -65,8 +65,8 @@ const struct SpriteTemplate gBattleAnimSpriteTemplate_83D9330 = const struct SpriteTemplate gBattleAnimSpriteTemplate_83D9348 = { - .tileTag = 10141, - .paletteTag = 10141, + .tileTag = ANIM_TAG_ICE_CRYSTALS, + .paletteTag = ANIM_TAG_ICE_CRYSTALS, .oam = &gOamData_837DF24, .anims = gSpriteAnimTable_83D9BC8, .images = NULL, @@ -76,8 +76,8 @@ const struct SpriteTemplate gBattleAnimSpriteTemplate_83D9348 = const struct SpriteTemplate gBattleAnimSpriteTemplate_83D9360 = { - .tileTag = 10155, - .paletteTag = 10155, + .tileTag = ANIM_TAG_SMALL_BUBBLES, + .paletteTag = ANIM_TAG_SMALL_BUBBLES, .oam = &gOamData_837DF24, .anims = gDummySpriteAnimTable, .images = NULL, @@ -87,8 +87,8 @@ const struct SpriteTemplate gBattleAnimSpriteTemplate_83D9360 = const struct SpriteTemplate gSpriteTemplate_83D9378 = { - .tileTag = 10268, - .paletteTag = 10268, + .tileTag = ANIM_TAG_GLOWY_BLUE_ORB, + .paletteTag = ANIM_TAG_GLOWY_BLUE_ORB, .oam = &gOamData_837DF24, .anims = gDummySpriteAnimTable, .images = NULL, @@ -159,8 +159,8 @@ const union AffineAnimCmd *const gSpriteAffineAnimTable_83D9404[] = const struct SpriteTemplate gBattleAnimSpriteTemplate_83D9408 = { - .tileTag = 10155, - .paletteTag = 10155, + .tileTag = ANIM_TAG_SMALL_BUBBLES, + .paletteTag = ANIM_TAG_SMALL_BUBBLES, .oam = &gOamData_837DF24, .anims = gSpriteAnimTable_83D93A8, .images = NULL, @@ -170,8 +170,8 @@ const struct SpriteTemplate gBattleAnimSpriteTemplate_83D9408 = const struct SpriteTemplate gSpriteTemplate_83D9420 = { - .tileTag = 10155, - .paletteTag = 10155, + .tileTag = ANIM_TAG_SMALL_BUBBLES, + .paletteTag = ANIM_TAG_SMALL_BUBBLES, .oam = &gOamData_837DF84, .anims = gSpriteAnimTable_83D93A8, .images = NULL, @@ -181,8 +181,8 @@ const struct SpriteTemplate gSpriteTemplate_83D9420 = const struct SpriteTemplate gBattleAnimSpriteTemplate_83D9438 = { - .tileTag = 10155, - .paletteTag = 10155, + .tileTag = ANIM_TAG_SMALL_BUBBLES, + .paletteTag = ANIM_TAG_SMALL_BUBBLES, .oam = &gOamData_837DF8C, .anims = gSpriteAnimTable_83D93B0, .images = NULL, diff --git a/src/battle/anim/whip.c b/src/battle/anim/whip.c index e6e004932..91a937d41 100644 --- a/src/battle/anim/whip.c +++ b/src/battle/anim/whip.c @@ -51,8 +51,8 @@ const struct SpriteTemplate gBattleAnimSpriteTemplate_83D69DC = const struct SpriteTemplate gBattleAnimSpriteTemplate_83D69F4 = { - .tileTag = 10287, - .paletteTag = 10287, + .tileTag = ANIM_TAG_WHIP_HIT, + .paletteTag = ANIM_TAG_WHIP_HIT, .oam = &gOamData_837DF34, .anims = gSpriteAnimTable_83D69D4, .images = NULL, @@ -77,8 +77,8 @@ const union AnimCmd *const gSpriteAnimTable_83D6A24[] = const struct SpriteTemplate gSpriteTemplate_83D6A28 = { - .tileTag = 10021, - .paletteTag = 10021, + .tileTag = ANIM_TAG_UNUSED_HIT, + .paletteTag = ANIM_TAG_UNUSED_HIT, .oam = &gOamData_837DF34, .anims = gSpriteAnimTable_83D6A24, .images = NULL, @@ -88,8 +88,8 @@ const struct SpriteTemplate gSpriteTemplate_83D6A28 = const struct SpriteTemplate gSpriteTemplate_83D6A40 = { - .tileTag = 10022, - .paletteTag = 10022, + .tileTag = ANIM_TAG_UNUSED_HIT_2, + .paletteTag = ANIM_TAG_UNUSED_HIT_2, .oam = &gOamData_837DF34, .anims = gSpriteAnimTable_83D6A24, .images = NULL, diff --git a/src/battle/anim/wisp_fire.c b/src/battle/anim/wisp_fire.c index a8ced992a..afcfaa832 100644 --- a/src/battle/anim/wisp_fire.c +++ b/src/battle/anim/wisp_fire.c @@ -30,8 +30,8 @@ const union AnimCmd *const gSpriteAnimTable_83D9778[] = const struct SpriteTemplate gBattleAnimSpriteTemplate_83D977C = { - .tileTag = 10232, - .paletteTag = 10232, + .tileTag = ANIM_TAG_WISP_FIRE, + .paletteTag = ANIM_TAG_WISP_FIRE, .oam = &gOamData_837DF34, .anims = gSpriteAnimTable_83D9778, .images = NULL, diff --git a/src/battle/anim/wisp_orb.c b/src/battle/anim/wisp_orb.c index f9e21d704..891d86ee1 100644 --- a/src/battle/anim/wisp_orb.c +++ b/src/battle/anim/wisp_orb.c @@ -54,8 +54,8 @@ const union AnimCmd *const gSpriteAnimTable_83D973C[] = const struct SpriteTemplate gBattleAnimSpriteTemplate_83D974C = { - .tileTag = 10231, - .paletteTag = 10231, + .tileTag = ANIM_TAG_WISP_ORB, + .paletteTag = ANIM_TAG_WISP_ORB, .oam = &gOamData_837DF2C, .anims = gSpriteAnimTable_83D973C, .images = NULL, diff --git a/src/battle/battle_anim.c b/src/battle/battle_anim.c index 7420e3e2e..376de416a 100644 --- a/src/battle/battle_anim.c +++ b/src/battle/battle_anim.c @@ -15,12 +15,7 @@ #include "ewram.h" #include "graphics.h" #include "constants/battle_anim.h" - -// sprites start at 10000 and thus must be subtracted of 10000 to account for the true index. -#define GET_TRUE_SPRITE_INDEX(i) (i - 10000) - -#define ANIM_SPRITE_INDEX_COUNT 8 -#define ANIM_ARGS_COUNT 8 +#include "constants/songs.h" const struct OamData gOamData_837DF24 = { @@ -672,588 +667,588 @@ const struct OamData gOamData_837E15C = const struct CompressedSpriteSheet gBattleAnimPicTable[] = { - { gBattleAnimSpriteSheet_000, 0x200, 10000 }, - { gBattleAnimSpriteSheet_001, 0x300, 10001 }, - { gBattleAnimSpriteSheet_002, 0x200, 10002 }, - { gBattleAnimSpriteSheet_003, 0x100, 10003 }, - { gBattleAnimSpriteSheet_004, 0x200, 10004 }, - { gBattleAnimSpriteSheet_005, 0x400, 10005 }, - { gBattleAnimSpriteSheet_006, 0x180, 10006 }, - { gBattleAnimSpriteSheet_007, 0x800, 10007 }, - { gBattleAnimSpriteSheet_008, 0x20, 10008 }, - { gBattleAnimSpriteSheet_009, 0x400, 10009 }, - { gBattleAnimSpriteSheet_010, 0x1200, 10010 }, - { gBattleAnimSpriteSheet_011, 0x180, 10011 }, - { gBattleAnimSpriteSheet_012, 0x80, 10012 }, - { gBattleAnimSpriteSheet_013, 0x80, 10013 }, - { gBattleAnimSpriteSheet_014, 0x280, 10014 }, - { gBattleAnimSpriteSheet_015, 0x80, 10015 }, - { gBattleAnimSpriteSheet_016, 0x100, 10016 }, - { gBattleAnimSpriteSheet_017, 0x20, 10017 }, - { gBattleAnimSpriteSheet_018, 0x80, 10018 }, - { gBattleAnimSpriteSheet_019, 0x400, 10019 }, - { gBattleAnimSpriteSheet_020, 0x200, 10020 }, - { gBattleAnimSpriteSheet_021, 0xA00, 10021 }, - { gBattleAnimSpriteSheet_021, 0xA00, 10022 }, - { gBattleAnimSpriteSheet_023, 0x380, 10023 }, - { gBattleAnimSpriteSheet_024, 0x300, 10024 }, - { gBattleAnimSpriteSheet_025, 0xA00, 10025 }, - { gBattleAnimSpriteSheet_026, 0xA00, 10026 }, - { gBattleAnimSpriteSheet_027, 0xA00, 10027 }, - { gBattleAnimSpriteSheet_028, 0xA00, 10028 }, - { gBattleAnimSpriteSheet_029, 0xA00, 10029 }, - { gBattleAnimSpriteSheet_030, 0xA00, 10030 }, - { gBattleAnimSpriteSheet_031, 0xE00, 10031 }, - { gBattleAnimSpriteSheet_032, 0x380, 10032 }, - { gBattleAnimSpriteSheet_033, 0x1000, 10033 }, - { gBattleAnimSpriteSheet_034, 0x800, 10034 }, - { gBattleAnimSpriteSheet_035, 0xA00, 10035 }, - { gBattleAnimSpriteSheet_036, 0x800, 10036 }, - { gBattleAnimSpriteSheet_037, 0xA00, 10037 }, - { gBattleAnimSpriteSheet_038, 0xA00, 10038 }, - { gBattleAnimSpriteSheet_039, 0xA00, 10039 }, - { gBattleAnimSpriteSheet_040, 0xA00, 10040 }, - { gBattleAnimSpriteSheet_041, 0xA00, 10041 }, - { gBattleAnimSpriteSheet_042, 0xA00, 10042 }, - { gBattleAnimSpriteSheet_043, 0xA00, 10043 }, - { gBattleAnimSpriteSheet_044, 0xA00, 10044 }, - { gBattleAnimSpriteSheet_045, 0xA00, 10045 }, - { gBattleAnimSpriteSheet_046, 0x1000, 10046 }, - { gBattleAnimSpriteSheet_046, 0x1000, 10047 }, - { gBattleAnimSpriteSheet_048, 0x1000, 10048 }, - { gBattleAnimSpriteSheet_048, 0x1000, 10049 }, - { gBattleAnimSpriteSheet_050, 0x200, 10050 }, - { gBattleAnimSpriteSheet_051, 0x200, 10051 }, - { gBattleAnimSpriteSheet_052, 0x200, 10052 }, - { gBattleAnimSpriteSheet_053, 0x800, 10053 }, - { gBattleAnimSpriteSheet_054, 0x80, 10054 }, - { gBattleAnimSpriteSheet_055, 0x200, 10055 }, - { gBattleAnimSpriteSheet_056, 0x1000, 10056 }, - { gBattleAnimSpriteSheet_057, 0x180, 10057 }, - { gBattleAnimSpriteSheet_058, 0xC00, 10058 }, - { gBattleAnimSpriteSheet_059, 0x100, 10059 }, - { gBattleAnimSpriteSheet_060, 0x40, 10060 }, - { gBattleAnimSpriteSheet_061, 0x180, 10061 }, - { gBattleAnimSpriteSheet_062, 0x800, 10062 }, - { gBattleAnimSpriteSheet_063, 0x480, 10063 }, - { gBattleAnimSpriteSheet_064, 0x200, 10064 }, - { gBattleAnimSpriteSheet_065, 0x200, 10065 }, - { gBattleAnimSpriteSheet_066, 0x100, 10066 }, - { gBattleAnimSpriteSheet_065, 0x200, 10067 }, - { gBattleAnimSpriteSheet_065, 0x200, 10068 }, - { gBattleAnimSpriteSheet_065, 0x200, 10069 }, - { gBattleAnimSpriteSheet_070, 0x200, 10070 }, - { gBattleAnimSpriteSheet_071, 0xA00, 10071 }, - { gBattleAnimSpriteSheet_072, 0x300, 10072 }, - { gBattleAnimSpriteSheet_073, 0x180, 10073 }, - { gBattleAnimSpriteSheet_074, 0xA0, 10074 }, - { gBattleAnimSpriteSheet_075, 0x700, 10075 }, - { gBattleAnimSpriteSheet_076, 0x400, 10076 }, - { gBattleAnimSpriteSheet_077, 0x200, 10077 }, - { gBattleAnimSpriteSheet_078, 0x300, 10078 }, - { gBattleAnimSpriteSheet_079, 0xC00, 10079 }, - { gBattleAnimSpriteSheet_080, 0xA00, 10080 }, - { gBattleAnimSpriteSheet_081, 0x80, 10081 }, - { gBattleAnimSpriteSheet_082, 0x40, 10082 }, - { gBattleAnimSpriteSheet_083, 0xE00, 10083 }, - { gBattleAnimSpriteSheet_084, 0xE00, 10084 }, - { gBattleAnimSpriteSheet_085, 0x280, 10085 }, - { gBattleAnimSpriteSheet_086, 0x200, 10086 }, - { gBattleAnimSpriteSheet_087, 0x80, 10087 }, - { gBattleAnimSpriteSheet_088, 0xC0, 10088 }, - { gBattleAnimSpriteSheet_089, 0xA00, 10089 }, - { gBattleAnimSpriteSheet_090, 0x200, 10090 }, - { gBattleAnimSpriteSheet_091, 0x180, 10091 }, - { gBattleAnimSpriteSheet_092, 0x80, 10092 }, - { gBattleAnimSpriteSheet_093, 0x1000, 10093 }, - { gBattleAnimSpriteSheet_094, 0xA00, 10094 }, - { gBattleAnimSpriteSheet_095, 0x180, 10095 }, - { gBattleAnimSpriteSheet_096, 0x380, 10096 }, - { gBattleAnimSpriteSheet_097, 0xC00, 10097 }, - { gBattleAnimSpriteSheet_098, 0x200, 10098 }, - { gBattleAnimSpriteSheet_099, 0x200, 10099 }, - { gBattleAnimSpriteSheet_100, 0x200, 10100 }, - { gBattleAnimSpriteSheet_101, 0x200, 10101 }, - { gBattleAnimSpriteSheet_102, 0x400, 10102 }, - { gBattleAnimSpriteSheet_103, 0x80, 10103 }, - { gBattleAnimSpriteSheet_104, 0x400, 10104 }, - { gBattleAnimSpriteSheet_105, 0xC00, 10105 }, - { gBattleAnimSpriteSheet_106, 0x200, 10106 }, - { gBattleAnimSpriteSheet_107, 0x1000, 10107 }, - { gBattleAnimSpriteSheet_108, 0xA00, 10108 }, - { gBattleAnimSpriteSheet_109, 0x20, 10109 }, - { gBattleAnimSpriteSheet_110, 0xE00, 10110 }, - { gBattleAnimSpriteSheet_111, 0x80, 10111 }, - { gBattleAnimSpriteSheet_112, 0xA00, 10112 }, - { gBattleAnimSpriteSheet_113, 0x400, 10113 }, - { gBattleAnimSpriteSheet_114, 0x200, 10114 }, - { gBattleAnimSpriteSheet_115, 0x700, 10115 }, - { gBattleAnimSpriteSheet_116, 0x800, 10116 }, - { gBattleAnimSpriteSheet_117, 0xA00, 10117 }, - { gBattleAnimSpriteSheet_118, 0x600, 10118 }, - { gBattleAnimSpriteSheet_119, 0x800, 10119 }, - { gBattleAnimSpriteSheet_120, 0x200, 10120 }, - { gBattleAnimSpriteSheet_121, 0x40, 10121 }, - { gBattleAnimSpriteSheet_122, 0x180, 10122 }, - { gBattleAnimSpriteSheet_123, 0x600, 10123 }, - { gBattleAnimSpriteSheet_124, 0x600, 10124 }, - { gBattleAnimSpriteSheet_125, 0x200, 10125 }, - { gBattleAnimSpriteSheet_126, 0x80, 10126 }, - { gBattleAnimSpriteSheet_127, 0x200, 10127 }, - { gBattleAnimSpriteSheet_128, 0x800, 10128 }, - { gBattleAnimSpriteSheet_129, 0x80, 10129 }, - { gBattleAnimSpriteSheet_130, 0xA00, 10130 }, - { gBattleAnimSpriteSheet_131, 0x280, 10131 }, - { gBattleAnimSpriteSheet_132, 0x280, 10132 }, - { gBattleAnimSpriteSheet_133, 0x100, 10133 }, - { gBattleAnimSpriteSheet_134, 0x200, 10134 }, - { gBattleAnimSpriteSheet_135, 0x200, 10135 }, - { gBattleAnimSpriteSheet_136, 0x20, 10136 }, - { gBattleAnimSpriteSheet_137, 0xA00, 10137 }, - { gBattleAnimSpriteSheet_138, 0x800, 10138 }, - { gBattleAnimSpriteSheet_139, 0x800, 10139 }, - { gBattleAnimSpriteSheet_140, 0xC0, 10140 }, - { gBattleAnimSpriteSheet_141, 0x1C0, 10141 }, - { gBattleAnimSpriteSheet_142, 0x100, 10142 }, - { gBattleAnimSpriteSheet_143, 0x800, 10143 }, - { gBattleAnimSpriteSheet_144, 0x200, 10144 }, - { gBattleAnimSpriteSheet_145, 0x800, 10145 }, - { gBattleAnimSpriteSheet_146, 0x180, 10146 }, - { gBattleAnimSpriteSheet_147, 0x180, 10147 }, - { gBattleAnimSpriteSheet_148, 0x200, 10148 }, - { gBattleAnimSpriteSheet_149, 0x200, 10149 }, - { gBattleAnimSpriteSheet_150, 0x180, 10150 }, - { gBattleAnimSpriteSheet_151, 0x400, 10151 }, - { gBattleAnimSpriteSheet_152, 0x80, 10152 }, - { gBattleAnimSpriteSheet_153, 0x100, 10153 }, - { gBattleAnimSpriteSheet_154, 0x100, 10154 }, - { gBattleAnimSpriteSheet_155, 0x140, 10155 }, - { gBattleAnimSpriteSheet_156, 0x800, 10156 }, - { gBattleAnimSpriteSheet_157, 0x200, 10157 }, - { gBattleAnimSpriteSheet_158, 0x100, 10158 }, - { gBattleAnimSpriteSheet_159, 0xA0, 10159 }, - { gBattleAnimSpriteSheet_160, 0x100, 10160 }, - { gBattleAnimSpriteSheet_161, 0x80, 10161 }, - { gBattleAnimSpriteSheet_162, 0x300, 10162 }, - { gBattleAnimSpriteSheet_163, 0x100, 10163 }, - { gBattleAnimSpriteSheet_163, 0x100, 10164 }, - { gBattleAnimSpriteSheet_163, 0x100, 10165 }, - { gBattleAnimSpriteSheet_166, 0x800, 10166 }, - { gBattleAnimSpriteSheet_166, 0x800, 10167 }, - { gBattleAnimSpriteSheet_166, 0x800, 10168 }, - { gBattleAnimSpriteSheet_166, 0x800, 10169 }, - { gBattleAnimSpriteSheet_166, 0x800, 10170 }, - { gBattleAnimSpriteSheet_171, 0x80, 10171 }, - { gBattleAnimSpriteSheet_144, 0x200, 10172 }, - { gBattleAnimSpriteSheet_173, 0x200, 10173 }, - { gBattleAnimSpriteSheet_174, 0x200, 10174 }, - { gBattleAnimSpriteSheet_175, 0x80, 10175 }, - { gBattleAnimSpriteSheet_176, 0x200, 10176 }, - { gBattleAnimSpriteSheet_177, 0x500, 10177 }, - { gBattleAnimSpriteSheet_178, 0x800, 10178 }, - { gBattleAnimSpriteSheet_179, 0x400, 10179 }, - { gBattleAnimSpriteSheet_180, 0x20, 10180 }, - { gBattleAnimSpriteSheet_181, 0x800, 10181 }, - { gBattleAnimSpriteSheet_182, 0x100, 10182 }, - { gBattleAnimSpriteSheet_183, 0x800, 10183 }, - { gBattleAnimSpriteSheet_184, 0x400, 10184 }, - { gBattleAnimSpriteSheet_185, 0xA00, 10185 }, - { gBattleAnimSpriteSheet_186, 0x1000, 10186 }, - { gBattleAnimSpriteSheet_187, 0x800, 10187 }, - { gBattleAnimSpriteSheet_188, 0x400, 10188 }, - { gBattleAnimSpriteSheet_189, 0x200, 10189 }, - { gBattleAnimSpriteSheet_190, 0x800, 10190 }, - { gBattleAnimSpriteSheet_191, 0x800, 10191 }, - { gBattleAnimSpriteSheet_192, 0x800, 10192 }, - { gBattleAnimSpriteSheet_193, 0x200, 10193 }, - { gBattleAnimSpriteSheet_194, 0x800, 10194 }, - { gBattleAnimSpriteSheet_195, 0x200, 10195 }, - { gBattleAnimSpriteSheet_196, 0x800, 10196 }, - { gBattleAnimSpriteSheet_197, 0x200, 10197 }, - { gBattleAnimSpriteSheet_198, 0x800, 10198 }, - { gBattleAnimSpriteSheet_199, 0x400, 10199 }, - { gBattleAnimSpriteSheet_200, 0x200, 10200 }, - { gBattleAnimSpriteSheet_201, 0xA80, 10201 }, - { gBattleAnimSpriteSheet_202, 0x600, 10202 }, - { gBattleAnimSpriteSheet_203, 0x800, 10203 }, - { gBattleAnimSpriteSheet_204, 0x200, 10204 }, - { gBattleAnimSpriteSheet_205, 0x600, 10205 }, - { gBattleAnimSpriteSheet_206, 0x800, 10206 }, - { gBattleAnimSpriteSheet_207, 0x180, 10207 }, - { gBattleAnimSpriteSheet_208, 0x800, 10208 }, - { gBattleAnimSpriteSheet_209, 0x800, 10209 }, - { gBattleAnimSpriteSheet_210, 0x80, 10210 }, - { gBattleAnimSpriteSheet_211, 0x80, 10211 }, - { gBattleAnimSpriteSheet_212, 0x800, 10212 }, - { gBattleAnimSpriteSheet_213, 0x800, 10213 }, - { gBattleAnimSpriteSheet_214, 0x600, 10214 }, - { gBattleAnimSpriteSheet_215, 0x600, 10215 }, - { gBattleAnimSpriteSheet_210, 0x80, 10216 }, - { gBattleAnimSpriteSheet_217, 0x80, 10217 }, - { gBattleAnimSpriteSheet_218, 0x180, 10218 }, - { gBattleAnimSpriteSheet_210, 0x80, 10219 }, - { gBattleAnimSpriteSheet_220, 0x200, 10220 }, - { gBattleAnimSpriteSheet_221, 0x400, 10221 }, - { gBattleAnimSpriteSheet_222, 0xA00, 10222 }, - { gBattleAnimSpriteSheet_223, 0x800, 10223 }, - { gBattleAnimSpriteSheet_224, 0x200, 10224 }, - { gBattleAnimSpriteSheet_225, 0x400, 10225 }, - { gBattleAnimSpriteSheet_226, 0x80, 10226 }, - { gBattleAnimSpriteSheet_227, 0x800, 10227 }, - { gBattleAnimSpriteSheet_228, 0x200, 10228 }, - { gBattleAnimSpriteSheet_229, 0x300, 10229 }, - { gBattleAnimSpriteSheet_230, 0x800, 10230 }, - { gBattleAnimSpriteSheet_231, 0x380, 10231 }, - { gBattleAnimSpriteSheet_232, 0x800, 10232 }, - { gBattleAnimSpriteSheet_233, 0xC0, 10233 }, - { gBattleAnimSpriteSheet_234, 0x800, 10234 }, - { gBattleAnimSpriteSheet_235, 0x60, 10235 }, - { gBattleAnimSpriteSheet_235, 0x60, 10236 }, - { gBattleAnimSpriteSheet_235, 0x60, 10237 }, - { gBattleAnimSpriteSheet_238, 0x80, 10238 }, - { gBattleAnimSpriteSheet_239, 0x180, 10239 }, - { gBattleAnimSpriteSheet_240, 0x180, 10240 }, - { gBattleAnimSpriteSheet_241, 0x200, 10241 }, - { gBattleAnimSpriteSheet_242, 0x200, 10242 }, - { gBattleAnimSpriteSheet_243, 0x20, 10243 }, - { gBattleAnimSpriteSheet_244, 0x400, 10244 }, - { gBattleAnimSpriteSheet_245, 0x600, 10245 }, - { gBattleAnimSpriteSheet_246, 0x1000, 10246 }, - { gBattleAnimSpriteSheet_247, 0x400, 10247 }, - { gBattleAnimSpriteSheet_248, 0x20, 10248 }, - { gBattleAnimSpriteSheet_249, 0x80, 10249 }, - { gBattleAnimSpriteSheet_250, 0x800, 10250 }, - { gBattleAnimSpriteSheet_251, 0x80, 10251 }, - { gBattleAnimSpriteSheet_252, 0x200, 10252 }, - { gBattleAnimSpriteSheet_253, 0x400, 10253 }, - { gBattleAnimSpriteSheet_254, 0x200, 10254 }, - { gBattleAnimSpriteSheet_255, 0x200, 10255 }, - { gBattleAnimSpriteSheet_256, 0x800, 10256 }, - { gBattleAnimSpriteSheet_257, 0x280, 10257 }, - { gBattleAnimSpriteSheet_258, 0x200, 10258 }, - { gBattleAnimSpriteSheet_149, 0x200, 10259 }, - { gBattleAnimSpriteSheet_260, 0x400, 10260 }, - { gBattleAnimSpriteSheet_261, 0x200, 10261 }, - { gBattleAnimSpriteSheet_262, 0x200, 10262 }, - { gBattleAnimSpriteSheet_263, 0x80, 10263 }, - { gBattleAnimSpriteSheet_264, 0x20, 10264 }, - { gBattleAnimSpriteSheet_264, 0x20, 10265 }, - { gBattleAnimSpriteSheet_266, 0x80, 10266 }, - { gBattleAnimSpriteSheet_212, 0x800, 10267 }, - { gBattleAnimSpriteSheet_264, 0x20, 10268 }, - { gBattleAnimSpriteSheet_269, 0x80, 10269 }, - { gBattleAnimSpriteSheet_270, 0x400, 10270 }, - { gBattleAnimSpriteSheet_271, 0x80, 10271 }, - { gBattleAnimSpriteSheet_272, 0x800, 10272 }, - { gBattleAnimSpriteSheet_273, 0x20, 10273 }, - { gBattleAnimSpriteSheet_274, 0x800, 10274 }, - { gBattleAnimSpriteSheet_275, 0x800, 10275 }, - { gBattleAnimSpriteSheet_276, 0x800, 10276 }, - { gBattleAnimSpriteSheet_277, 0x1000, 10277 }, - { gBattleAnimSpriteSheet_278, 0x800, 10278 }, - { gBattleAnimSpriteSheet_279, 0xA0, 10279 }, - { gBattleAnimSpriteSheet_280, 0x800, 10280 }, - { gBattleAnimSpriteSheet_281, 0x200, 10281 }, - { gBattleAnimSpriteSheet_282, 0x600, 10282 }, - { gBattleAnimSpriteSheet_283, 0x200, 10283 }, - { gBattleAnimSpriteSheet_284, 0x800, 10284 }, - { gBattleAnimSpriteSheet_285, 0x200, 10285 }, - { gBattleAnimSpriteSheet_183, 0x800, 10286 }, - { gBattleAnimSpriteSheet_056, 0x1000, 10287 }, - { gBattleAnimSpriteSheet_163, 0x100, 10288 }, + { gBattleAnimSpriteSheet_000, 0x200, ANIM_TAG_BONE }, + { gBattleAnimSpriteSheet_001, 0x300, ANIM_TAG_SPARK }, + { gBattleAnimSpriteSheet_002, 0x200, ANIM_TAG_PENCIL }, + { gBattleAnimSpriteSheet_003, 0x100, ANIM_TAG_AIR_WAVE }, + { gBattleAnimSpriteSheet_004, 0x200, ANIM_TAG_UNUSED_ORB }, + { gBattleAnimSpriteSheet_005, 0x400, ANIM_TAG_SWORD }, + { gBattleAnimSpriteSheet_006, 0x180, ANIM_TAG_SEED }, + { gBattleAnimSpriteSheet_007, 0x800, ANIM_TAG_UNUSED_EXPLOSION }, + { gBattleAnimSpriteSheet_008, 0x20, ANIM_TAG_UNUSED_PINK_ORB }, + { gBattleAnimSpriteSheet_009, 0x400, ANIM_TAG_GUST }, + { gBattleAnimSpriteSheet_010, 0x1200, ANIM_TAG_ICE_CUBE }, + { gBattleAnimSpriteSheet_011, 0x180, ANIM_TAG_SPARK_2 }, + { gBattleAnimSpriteSheet_012, 0x80, ANIM_TAG_UNUSED_ORANGE }, + { gBattleAnimSpriteSheet_013, 0x80, ANIM_TAG_YELLOW_BALL }, + { gBattleAnimSpriteSheet_014, 0x280, ANIM_TAG_LOCK_ON }, + { gBattleAnimSpriteSheet_015, 0x80, ANIM_TAG_TIED_BAG }, + { gBattleAnimSpriteSheet_016, 0x100, ANIM_TAG_BLACK_SMOKE }, + { gBattleAnimSpriteSheet_017, 0x20, ANIM_TAG_BLACK_BALL }, + { gBattleAnimSpriteSheet_018, 0x80, ANIM_TAG_CONVERSION }, + { gBattleAnimSpriteSheet_019, 0x400, ANIM_TAG_UNUSED_GLASS }, + { gBattleAnimSpriteSheet_020, 0x200, ANIM_TAG_HORN_HIT }, + { gBattleAnimSpriteSheet_021, 0xA00, ANIM_TAG_UNUSED_HIT }, + { gBattleAnimSpriteSheet_021, 0xA00, ANIM_TAG_UNUSED_HIT_2 }, + { gBattleAnimSpriteSheet_023, 0x380, ANIM_TAG_UNUSED_BLUE_SHARDS }, + { gBattleAnimSpriteSheet_024, 0x300, ANIM_TAG_UNUSED_CLOSING_EYE }, + { gBattleAnimSpriteSheet_025, 0xA00, ANIM_TAG_UNUSED_WAVING_HAND }, + { gBattleAnimSpriteSheet_026, 0xA00, ANIM_TAG_UNUSED_HIT_DUPLICATE }, + { gBattleAnimSpriteSheet_027, 0xA00, ANIM_TAG_LEER }, + { gBattleAnimSpriteSheet_028, 0xA00, ANIM_TAG_UNUSED_BLUE_BURST }, + { gBattleAnimSpriteSheet_029, 0xA00, ANIM_TAG_SMALL_EMBER }, + { gBattleAnimSpriteSheet_030, 0xA00, ANIM_TAG_GRAY_SMOKE }, + { gBattleAnimSpriteSheet_031, 0xE00, ANIM_TAG_BLUE_STAR }, + { gBattleAnimSpriteSheet_032, 0x380, ANIM_TAG_UNUSED_BUBBLE_BURST }, + { gBattleAnimSpriteSheet_033, 0x1000, ANIM_TAG_FIRE }, + { gBattleAnimSpriteSheet_034, 0x800, ANIM_TAG_UNUSED_SPINNING_FIRE }, + { gBattleAnimSpriteSheet_035, 0xA00, ANIM_TAG_FIRE_PLUME }, + { gBattleAnimSpriteSheet_036, 0x800, ANIM_TAG_UNUSED_LIGHTNING }, + { gBattleAnimSpriteSheet_037, 0xA00, ANIM_TAG_LIGHTNING }, + { gBattleAnimSpriteSheet_038, 0xA00, ANIM_TAG_UNUSED_CLAW_SLASH }, + { gBattleAnimSpriteSheet_039, 0xA00, ANIM_TAG_CLAW_SLASH }, + { gBattleAnimSpriteSheet_040, 0xA00, ANIM_TAG_UNUSED_SCRATCH }, + { gBattleAnimSpriteSheet_041, 0xA00, ANIM_TAG_UNUSED_SCRATCH_2 }, + { gBattleAnimSpriteSheet_042, 0xA00, ANIM_TAG_UNUSED_BUBBLE_BURST_2 }, + { gBattleAnimSpriteSheet_043, 0xA00, ANIM_TAG_ICE_CHUNK }, + { gBattleAnimSpriteSheet_044, 0xA00, ANIM_TAG_UNUSED_GLASS_2 }, + { gBattleAnimSpriteSheet_045, 0xA00, ANIM_TAG_UNUSED_PINK_HEART }, + { gBattleAnimSpriteSheet_046, 0x1000, ANIM_TAG_UNUSED_SAP_DRIP }, + { gBattleAnimSpriteSheet_046, 0x1000, ANIM_TAG_UNUSED_SAP_DRIP_2 }, + { gBattleAnimSpriteSheet_048, 0x1000, ANIM_TAG_SPARKLE_1 }, + { gBattleAnimSpriteSheet_048, 0x1000, ANIM_TAG_SPARKLE_2 }, + { gBattleAnimSpriteSheet_050, 0x200, ANIM_TAG_HUMANOID_FOOT }, + { gBattleAnimSpriteSheet_051, 0x200, ANIM_TAG_UNUSED_MONSTER_FOOT }, + { gBattleAnimSpriteSheet_052, 0x200, ANIM_TAG_UNUSED_HUMANOID_HAND }, + { gBattleAnimSpriteSheet_053, 0x800, ANIM_TAG_NOISE_LINE }, + { gBattleAnimSpriteSheet_054, 0x80, ANIM_TAG_UNUSED_YELLOW_UNK }, + { gBattleAnimSpriteSheet_055, 0x200, ANIM_TAG_UNUSED_RED_FIST }, + { gBattleAnimSpriteSheet_056, 0x1000, ANIM_TAG_SLAM_HIT }, + { gBattleAnimSpriteSheet_057, 0x180, ANIM_TAG_UNUSED_RING }, + { gBattleAnimSpriteSheet_058, 0xC00, ANIM_TAG_ROCKS }, + { gBattleAnimSpriteSheet_059, 0x100, ANIM_TAG_UNUSED_Z }, + { gBattleAnimSpriteSheet_060, 0x40, ANIM_TAG_UNUSED_YELLOW_UNK_2 }, + { gBattleAnimSpriteSheet_061, 0x180, ANIM_TAG_UNUSED_AIR_SLASH }, + { gBattleAnimSpriteSheet_062, 0x800, ANIM_TAG_UNUSED_SPINNING_GREEN_ORBS }, + { gBattleAnimSpriteSheet_063, 0x480, ANIM_TAG_LEAF }, + { gBattleAnimSpriteSheet_064, 0x200, ANIM_TAG_FINGER }, + { gBattleAnimSpriteSheet_065, 0x200, ANIM_TAG_POISON_POWDER }, + { gBattleAnimSpriteSheet_066, 0x100, ANIM_TAG_UNUSED_BROWN_TRIANGLE }, + { gBattleAnimSpriteSheet_065, 0x200, ANIM_TAG_SLEEP_POWDER }, + { gBattleAnimSpriteSheet_065, 0x200, ANIM_TAG_STUN_SPORE }, + { gBattleAnimSpriteSheet_065, 0x200, ANIM_TAG_UNUSED_POWDER }, + { gBattleAnimSpriteSheet_070, 0x200, ANIM_TAG_SPARKLE_3 }, + { gBattleAnimSpriteSheet_071, 0xA00, ANIM_TAG_SPARKLE_4 }, + { gBattleAnimSpriteSheet_072, 0x300, ANIM_TAG_MUSIC_NOTES }, + { gBattleAnimSpriteSheet_073, 0x180, ANIM_TAG_DUCK }, + { gBattleAnimSpriteSheet_074, 0xA0, ANIM_TAG_MUD_SAND }, + { gBattleAnimSpriteSheet_075, 0x700, ANIM_TAG_ALERT }, + { gBattleAnimSpriteSheet_076, 0x400, ANIM_TAG_UNUSED_BLUE_FLAMES }, + { gBattleAnimSpriteSheet_077, 0x200, ANIM_TAG_UNUSED_BLUE_FLAMES_2 }, + { gBattleAnimSpriteSheet_078, 0x300, ANIM_TAG_UNUSED_SHOCK }, + { gBattleAnimSpriteSheet_079, 0xC00, ANIM_TAG_SHOCK }, + { gBattleAnimSpriteSheet_080, 0xA00, ANIM_TAG_UNUSED_BELL }, + { gBattleAnimSpriteSheet_081, 0x80, ANIM_TAG_UNUSED_PINK_GLOVE }, + { gBattleAnimSpriteSheet_082, 0x40, ANIM_TAG_UNUSED_BLUE_LINES }, + { gBattleAnimSpriteSheet_083, 0xE00, ANIM_TAG_UNUSED_IMPACT }, + { gBattleAnimSpriteSheet_084, 0xE00, ANIM_TAG_UNUSED_IMPACT_2 }, + { gBattleAnimSpriteSheet_085, 0x280, ANIM_TAG_UNUSED_RETICLE }, + { gBattleAnimSpriteSheet_086, 0x200, ANIM_TAG_BREATH }, + { gBattleAnimSpriteSheet_087, 0x80, ANIM_TAG_ANGER }, + { gBattleAnimSpriteSheet_088, 0xC0, ANIM_TAG_UNUSED_SNOWBALL }, + { gBattleAnimSpriteSheet_089, 0xA00, ANIM_TAG_UNUSED_VINE }, + { gBattleAnimSpriteSheet_090, 0x200, ANIM_TAG_UNUSED_SWORD }, + { gBattleAnimSpriteSheet_091, 0x180, ANIM_TAG_UNUSED_CLAPPING }, + { gBattleAnimSpriteSheet_092, 0x80, ANIM_TAG_UNUSED_RED_TUBE }, + { gBattleAnimSpriteSheet_093, 0x1000, ANIM_TAG_AMNESIA }, + { gBattleAnimSpriteSheet_094, 0xA00, ANIM_TAG_UNUSED_STRING }, + { gBattleAnimSpriteSheet_095, 0x180, ANIM_TAG_UNUSED_PENCIL }, + { gBattleAnimSpriteSheet_096, 0x380, ANIM_TAG_UNUSED_PETAL }, + { gBattleAnimSpriteSheet_097, 0xC00, ANIM_TAG_BENT_SPOON }, + { gBattleAnimSpriteSheet_098, 0x200, ANIM_TAG_UNUSED_WEB }, + { gBattleAnimSpriteSheet_099, 0x200, ANIM_TAG_MILK_BOTTLE }, + { gBattleAnimSpriteSheet_100, 0x200, ANIM_TAG_COIN }, + { gBattleAnimSpriteSheet_101, 0x200, ANIM_TAG_UNUSED_CRACKED_EGG }, + { gBattleAnimSpriteSheet_102, 0x400, ANIM_TAG_UNUSED_HATCHED_EGG }, + { gBattleAnimSpriteSheet_103, 0x80, ANIM_TAG_UNUSED_FRESH_EGG }, + { gBattleAnimSpriteSheet_104, 0x400, ANIM_TAG_UNUSED_FANGS }, + { gBattleAnimSpriteSheet_105, 0xC00, ANIM_TAG_UNUSED_EXPLOSION_2 }, + { gBattleAnimSpriteSheet_106, 0x200, ANIM_TAG_UNUSED_EXPLOSION_3 }, + { gBattleAnimSpriteSheet_107, 0x1000, ANIM_TAG_UNUSED_WATER_DROPLET }, + { gBattleAnimSpriteSheet_108, 0xA00, ANIM_TAG_UNUSED_WATER_DROPLET_2 }, + { gBattleAnimSpriteSheet_109, 0x20, ANIM_TAG_UNUSED_SEED }, + { gBattleAnimSpriteSheet_110, 0xE00, ANIM_TAG_UNUSED_SPROUT }, + { gBattleAnimSpriteSheet_111, 0x80, ANIM_TAG_UNUSED_RED_WAND }, + { gBattleAnimSpriteSheet_112, 0xA00, ANIM_TAG_UNUSED_PURPLE_GREEN_UNK }, + { gBattleAnimSpriteSheet_113, 0x400, ANIM_TAG_UNUSED_WATER_COLUMN }, + { gBattleAnimSpriteSheet_114, 0x200, ANIM_TAG_UNUSED_MUD_UNK }, + { gBattleAnimSpriteSheet_115, 0x700, ANIM_TAG_RAIN_DROPS }, + { gBattleAnimSpriteSheet_116, 0x800, ANIM_TAG_UNUSED_FURY_SWIPES }, + { gBattleAnimSpriteSheet_117, 0xA00, ANIM_TAG_UNUSED_VINE_2 }, + { gBattleAnimSpriteSheet_118, 0x600, ANIM_TAG_UNUSED_TEETH }, + { gBattleAnimSpriteSheet_119, 0x800, ANIM_TAG_UNUSED_BONE }, + { gBattleAnimSpriteSheet_120, 0x200, ANIM_TAG_UNUSED_WHITE_BAG }, + { gBattleAnimSpriteSheet_121, 0x40, ANIM_TAG_UNUSED_UNKNOWN }, + { gBattleAnimSpriteSheet_122, 0x180, ANIM_TAG_UNUSED_PURPLE_CORAL }, + { gBattleAnimSpriteSheet_123, 0x600, ANIM_TAG_UNUSED_PURPLE_DROPLET }, + { gBattleAnimSpriteSheet_124, 0x600, ANIM_TAG_UNUSED_SHOCK_2 }, + { gBattleAnimSpriteSheet_125, 0x200, ANIM_TAG_UNUSED_CLOSING_EYE_2 }, + { gBattleAnimSpriteSheet_126, 0x80, ANIM_TAG_UNUSED_METAL_BALL }, + { gBattleAnimSpriteSheet_127, 0x200, ANIM_TAG_UNUSED_MONSTER_DOLL }, + { gBattleAnimSpriteSheet_128, 0x800, ANIM_TAG_UNUSED_WHIRLWIND }, + { gBattleAnimSpriteSheet_129, 0x80, ANIM_TAG_UNUSED_WHIRLWIND_2 }, + { gBattleAnimSpriteSheet_130, 0xA00, ANIM_TAG_UNUSED_EXPLOSION_4 }, + { gBattleAnimSpriteSheet_131, 0x280, ANIM_TAG_UNUSED_EXPLOSION_5 }, + { gBattleAnimSpriteSheet_132, 0x280, ANIM_TAG_UNUSED_TONGUE }, + { gBattleAnimSpriteSheet_133, 0x100, ANIM_TAG_UNUSED_SMOKE }, + { gBattleAnimSpriteSheet_134, 0x200, ANIM_TAG_UNUSED_SMOKE_2 }, + { gBattleAnimSpriteSheet_135, 0x200, ANIM_TAG_IMPACT }, + { gBattleAnimSpriteSheet_136, 0x20, ANIM_TAG_CIRCLE_IMPACT }, + { gBattleAnimSpriteSheet_137, 0xA00, ANIM_TAG_SCRATCH }, + { gBattleAnimSpriteSheet_138, 0x800, ANIM_TAG_CUT }, + { gBattleAnimSpriteSheet_139, 0x800, ANIM_TAG_SHARP_TEETH }, + { gBattleAnimSpriteSheet_140, 0xC0, ANIM_TAG_RAINBOW_RINGS }, + { gBattleAnimSpriteSheet_141, 0x1C0, ANIM_TAG_ICE_CRYSTALS }, + { gBattleAnimSpriteSheet_142, 0x100, ANIM_TAG_ICE_SPIKES }, + { gBattleAnimSpriteSheet_143, 0x800, ANIM_TAG_HANDS_AND_FEET }, + { gBattleAnimSpriteSheet_144, 0x200, ANIM_TAG_MIST_CLOUD }, + { gBattleAnimSpriteSheet_145, 0x800, ANIM_TAG_CLAMP }, + { gBattleAnimSpriteSheet_146, 0x180, ANIM_TAG_BUBBLE }, + { gBattleAnimSpriteSheet_147, 0x180, ANIM_TAG_ORBS }, + { gBattleAnimSpriteSheet_148, 0x200, ANIM_TAG_WATER_IMPACT }, + { gBattleAnimSpriteSheet_149, 0x200, ANIM_TAG_WATER_ORB }, + { gBattleAnimSpriteSheet_150, 0x180, ANIM_TAG_POISON_BUBBLE }, + { gBattleAnimSpriteSheet_151, 0x400, ANIM_TAG_TOXIC_BUBBLE }, + { gBattleAnimSpriteSheet_152, 0x80, ANIM_TAG_SPIKES }, + { gBattleAnimSpriteSheet_153, 0x100, ANIM_TAG_HORN_HIT_2 }, + { gBattleAnimSpriteSheet_154, 0x100, ANIM_TAG_AIR_WAVE_2 }, + { gBattleAnimSpriteSheet_155, 0x140, ANIM_TAG_SMALL_BUBBLES }, + { gBattleAnimSpriteSheet_156, 0x800, ANIM_TAG_ROUND_SHADOW }, + { gBattleAnimSpriteSheet_157, 0x200, ANIM_TAG_SUNLIGHT }, + { gBattleAnimSpriteSheet_158, 0x100, ANIM_TAG_SPORE }, + { gBattleAnimSpriteSheet_159, 0xA0, ANIM_TAG_FLOWER }, + { gBattleAnimSpriteSheet_160, 0x100, ANIM_TAG_RAZOR_LEAF }, + { gBattleAnimSpriteSheet_161, 0x80, ANIM_TAG_NEEDLE }, + { gBattleAnimSpriteSheet_162, 0x300, ANIM_TAG_WHIRLWIND_LINES }, + { gBattleAnimSpriteSheet_163, 0x100, ANIM_TAG_GOLD_RING }, + { gBattleAnimSpriteSheet_163, 0x100, ANIM_TAG_PURPLE_RING }, + { gBattleAnimSpriteSheet_163, 0x100, ANIM_TAG_BLUE_RING }, + { gBattleAnimSpriteSheet_166, 0x800, ANIM_TAG_GREEN_LIGHT_WALL }, + { gBattleAnimSpriteSheet_166, 0x800, ANIM_TAG_BLUE_LIGHT_WALL }, + { gBattleAnimSpriteSheet_166, 0x800, ANIM_TAG_RED_LIGHT_WALL }, + { gBattleAnimSpriteSheet_166, 0x800, ANIM_TAG_GRAY_LIGHT_WALL }, + { gBattleAnimSpriteSheet_166, 0x800, ANIM_TAG_ORANGE_LIGHT_WALL }, + { gBattleAnimSpriteSheet_171, 0x80, ANIM_TAG_BLACK_BALL_2 }, + { gBattleAnimSpriteSheet_144, 0x200, ANIM_TAG_PURPLE_GAS_CLOUD }, + { gBattleAnimSpriteSheet_173, 0x200, ANIM_TAG_SPARK_H }, + { gBattleAnimSpriteSheet_174, 0x200, ANIM_TAG_YELLOW_STAR }, + { gBattleAnimSpriteSheet_175, 0x80, ANIM_TAG_LARGE_FRESH_EGG }, + { gBattleAnimSpriteSheet_176, 0x200, ANIM_TAG_SHADOW_BALL }, + { gBattleAnimSpriteSheet_177, 0x500, ANIM_TAG_LICK }, + { gBattleAnimSpriteSheet_178, 0x800, ANIM_TAG_UNUSED_VOID_LINES }, + { gBattleAnimSpriteSheet_179, 0x400, ANIM_TAG_STRING }, + { gBattleAnimSpriteSheet_180, 0x20, ANIM_TAG_STRING_DOT }, + { gBattleAnimSpriteSheet_181, 0x800, ANIM_TAG_WEB }, + { gBattleAnimSpriteSheet_182, 0x100, ANIM_TAG_UNUSED_LIGHTBULB }, + { gBattleAnimSpriteSheet_183, 0x800, ANIM_TAG_SLASH }, + { gBattleAnimSpriteSheet_184, 0x400, ANIM_TAG_FOCUS_ENERGY }, + { gBattleAnimSpriteSheet_185, 0xA00, ANIM_TAG_SPHERE_TO_CUBE }, + { gBattleAnimSpriteSheet_186, 0x1000, ANIM_TAG_TENDRILS }, + { gBattleAnimSpriteSheet_187, 0x800, ANIM_TAG_EYE }, + { gBattleAnimSpriteSheet_188, 0x400, ANIM_TAG_WHITE_SHADOW }, + { gBattleAnimSpriteSheet_189, 0x200, ANIM_TAG_TEAL_ALERT }, + { gBattleAnimSpriteSheet_190, 0x800, ANIM_TAG_OPENING_EYE }, + { gBattleAnimSpriteSheet_191, 0x800, ANIM_TAG_ROUND_WHITE_HALO }, + { gBattleAnimSpriteSheet_192, 0x800, ANIM_TAG_FANG_ATTACK }, + { gBattleAnimSpriteSheet_193, 0x200, ANIM_TAG_PURPLE_HAND_OUTLINE }, + { gBattleAnimSpriteSheet_194, 0x800, ANIM_TAG_MOON }, + { gBattleAnimSpriteSheet_195, 0x200, ANIM_TAG_SPARKLE_5 }, + { gBattleAnimSpriteSheet_196, 0x800, ANIM_TAG_SPIRAL }, + { gBattleAnimSpriteSheet_197, 0x200, ANIM_TAG_SNORE_Z }, + { gBattleAnimSpriteSheet_198, 0x800, ANIM_TAG_EXPLOSION }, + { gBattleAnimSpriteSheet_199, 0x400, ANIM_TAG_NAIL }, + { gBattleAnimSpriteSheet_200, 0x200, ANIM_TAG_GHOSTLY_SPIRIT }, + { gBattleAnimSpriteSheet_201, 0xA80, ANIM_TAG_WARM_ROCK }, + { gBattleAnimSpriteSheet_202, 0x600, ANIM_TAG_BREAKING_EGG }, + { gBattleAnimSpriteSheet_203, 0x800, ANIM_TAG_THIN_RING }, + { gBattleAnimSpriteSheet_204, 0x200, ANIM_TAG_UNUSED_PUNCH_IMPACT }, + { gBattleAnimSpriteSheet_205, 0x600, ANIM_TAG_BELL }, + { gBattleAnimSpriteSheet_206, 0x800, ANIM_TAG_MUSIC_NOTES_2 }, + { gBattleAnimSpriteSheet_207, 0x180, ANIM_TAG_SPEED_DUST }, + { gBattleAnimSpriteSheet_208, 0x800, ANIM_TAG_TORN_METAL }, + { gBattleAnimSpriteSheet_209, 0x800, ANIM_TAG_THOUGHT_BUBBLE }, + { gBattleAnimSpriteSheet_210, 0x80, ANIM_TAG_MAGENTA_HEART }, + { gBattleAnimSpriteSheet_211, 0x80, ANIM_TAG_ELECTRIC_ORBS }, + { gBattleAnimSpriteSheet_212, 0x800, ANIM_TAG_CIRCLE_OF_LIGHT }, + { gBattleAnimSpriteSheet_213, 0x800, ANIM_TAG_ELECTRICITY }, + { gBattleAnimSpriteSheet_214, 0x600, ANIM_TAG_FINGER_2 }, + { gBattleAnimSpriteSheet_215, 0x600, ANIM_TAG_MOVEMENT_WAVES }, + { gBattleAnimSpriteSheet_210, 0x80, ANIM_TAG_RED_HEART }, + { gBattleAnimSpriteSheet_217, 0x80, ANIM_TAG_RED_ORB }, + { gBattleAnimSpriteSheet_218, 0x180, ANIM_TAG_EYE_SPARKLE }, + { gBattleAnimSpriteSheet_210, 0x80, ANIM_TAG_PINK_HEART }, + { gBattleAnimSpriteSheet_220, 0x200, ANIM_TAG_ANGEL }, + { gBattleAnimSpriteSheet_221, 0x400, ANIM_TAG_DEVIL }, + { gBattleAnimSpriteSheet_222, 0xA00, ANIM_TAG_SWIPE }, + { gBattleAnimSpriteSheet_223, 0x800, ANIM_TAG_ROOTS }, + { gBattleAnimSpriteSheet_224, 0x200, ANIM_TAG_ITEM_BAG }, + { gBattleAnimSpriteSheet_225, 0x400, ANIM_TAG_JAGGED_MUSIC_NOTE }, + { gBattleAnimSpriteSheet_226, 0x80, ANIM_TAG_POKEBALL }, + { gBattleAnimSpriteSheet_227, 0x800, ANIM_TAG_SPOTLIGHT }, + { gBattleAnimSpriteSheet_228, 0x200, ANIM_TAG_LETTER_Z }, + { gBattleAnimSpriteSheet_229, 0x300, ANIM_TAG_RAPID_SPIN }, + { gBattleAnimSpriteSheet_230, 0x800, ANIM_TAG_TRI_FORCE_TRIANGLE }, + { gBattleAnimSpriteSheet_231, 0x380, ANIM_TAG_WISP_ORB }, + { gBattleAnimSpriteSheet_232, 0x800, ANIM_TAG_WISP_FIRE }, + { gBattleAnimSpriteSheet_233, 0xC0, ANIM_TAG_GOLD_STARS }, + { gBattleAnimSpriteSheet_234, 0x800, ANIM_TAG_ECLIPSING_ORB }, + { gBattleAnimSpriteSheet_235, 0x60, ANIM_TAG_GRAY_ORB }, + { gBattleAnimSpriteSheet_235, 0x60, ANIM_TAG_BLUE_ORB }, + { gBattleAnimSpriteSheet_235, 0x60, ANIM_TAG_RED_ORB_2 }, + { gBattleAnimSpriteSheet_238, 0x80, ANIM_TAG_PINK_PETAL }, + { gBattleAnimSpriteSheet_239, 0x180, ANIM_TAG_PAIN_SPLIT }, + { gBattleAnimSpriteSheet_240, 0x180, ANIM_TAG_CONFETTI }, + { gBattleAnimSpriteSheet_241, 0x200, ANIM_TAG_GREEN_STAR }, + { gBattleAnimSpriteSheet_242, 0x200, ANIM_TAG_PINK_CLOUD }, + { gBattleAnimSpriteSheet_243, 0x20, ANIM_TAG_SWEAT_DROP }, + { gBattleAnimSpriteSheet_244, 0x400, ANIM_TAG_GUARD_RING }, + { gBattleAnimSpriteSheet_245, 0x600, ANIM_TAG_PURPLE_SCRATCH }, + { gBattleAnimSpriteSheet_246, 0x1000, ANIM_TAG_PURPLE_SWIPE }, + { gBattleAnimSpriteSheet_247, 0x400, ANIM_TAG_TAG_HAND }, + { gBattleAnimSpriteSheet_248, 0x20, ANIM_TAG_SMALL_RED_EYE }, + { gBattleAnimSpriteSheet_249, 0x80, ANIM_TAG_HOLLOW_ORB }, + { gBattleAnimSpriteSheet_250, 0x800, ANIM_TAG_X_SIGN }, + { gBattleAnimSpriteSheet_251, 0x80, ANIM_TAG_BLUEGREEN_ORB }, + { gBattleAnimSpriteSheet_252, 0x200, ANIM_TAG_PAW_PRINT }, + { gBattleAnimSpriteSheet_253, 0x400, ANIM_TAG_PURPLE_FLAME }, + { gBattleAnimSpriteSheet_254, 0x200, ANIM_TAG_RED_BALL }, + { gBattleAnimSpriteSheet_255, 0x200, ANIM_TAG_SMELLINGSALT_EFFECT }, + { gBattleAnimSpriteSheet_256, 0x800, ANIM_TAG_METEOR }, + { gBattleAnimSpriteSheet_257, 0x280, ANIM_TAG_FLAT_ROCK }, + { gBattleAnimSpriteSheet_258, 0x200, ANIM_TAG_MAGNIFYING_GLASS }, + { gBattleAnimSpriteSheet_149, 0x200, ANIM_TAG_BROWN_ORB }, + { gBattleAnimSpriteSheet_260, 0x400, ANIM_TAG_METAL_SOUND_WAVES }, + { gBattleAnimSpriteSheet_261, 0x200, ANIM_TAG_FLYING_DIRT }, + { gBattleAnimSpriteSheet_262, 0x200, ANIM_TAG_ICICLE_SPEAR }, + { gBattleAnimSpriteSheet_263, 0x80, ANIM_TAG_HAIL }, + { gBattleAnimSpriteSheet_264, 0x20, ANIM_TAG_GLOWY_RED_ORB }, + { gBattleAnimSpriteSheet_264, 0x20, ANIM_TAG_GLOWY_GREEN_ORB }, + { gBattleAnimSpriteSheet_266, 0x80, ANIM_TAG_GREEN_SPIKE }, + { gBattleAnimSpriteSheet_212, 0x800, ANIM_TAG_WHITE_CIRCLE_OF_LIGHT }, + { gBattleAnimSpriteSheet_264, 0x20, ANIM_TAG_GLOWY_BLUE_ORB }, + { gBattleAnimSpriteSheet_269, 0x80, ANIM_TAG_UNUSED_RED_BRICK }, + { gBattleAnimSpriteSheet_270, 0x400, ANIM_TAG_WHITE_FEATHER }, + { gBattleAnimSpriteSheet_271, 0x80, ANIM_TAG_SPARKLE_6 }, + { gBattleAnimSpriteSheet_272, 0x800, ANIM_TAG_SPLASH }, + { gBattleAnimSpriteSheet_273, 0x20, ANIM_TAG_SWEAT_BEAD }, + { gBattleAnimSpriteSheet_274, 0x800, ANIM_TAG_UNUSED_GEM_1 }, + { gBattleAnimSpriteSheet_275, 0x800, ANIM_TAG_UNUSED_GEM_2 }, + { gBattleAnimSpriteSheet_276, 0x800, ANIM_TAG_UNUSED_GEM_3 }, + { gBattleAnimSpriteSheet_277, 0x1000, ANIM_TAG_SLAM_HIT_2 }, + { gBattleAnimSpriteSheet_278, 0x800, ANIM_TAG_RECYCLE }, + { gBattleAnimSpriteSheet_279, 0xA0, ANIM_TAG_UNUSED_RED_PARTICLES }, + { gBattleAnimSpriteSheet_280, 0x800, ANIM_TAG_PROTECT }, + { gBattleAnimSpriteSheet_281, 0x200, ANIM_TAG_DIRT_MOUND }, + { gBattleAnimSpriteSheet_282, 0x600, ANIM_TAG_SHOCK_3 }, + { gBattleAnimSpriteSheet_283, 0x200, ANIM_TAG_WEATHER_BALL }, + { gBattleAnimSpriteSheet_284, 0x800, ANIM_TAG_BIRD }, + { gBattleAnimSpriteSheet_285, 0x200, ANIM_TAG_CROSS_IMPACT }, + { gBattleAnimSpriteSheet_183, 0x800, ANIM_TAG_SLASH_2 }, + { gBattleAnimSpriteSheet_056, 0x1000, ANIM_TAG_WHIP_HIT }, + { gBattleAnimSpriteSheet_163, 0x100, ANIM_TAG_BLUE_RING_2 }, }; const struct CompressedSpritePalette gBattleAnimPaletteTable[] = { - { gBattleAnimSpritePalette_000, 10000 }, - { gBattleAnimSpritePalette_001, 10001 }, - { gBattleAnimSpritePalette_002, 10002 }, - { gBattleAnimSpritePalette_003, 10003 }, - { gBattleAnimSpritePalette_004, 10004 }, - { gBattleAnimSpritePalette_005, 10005 }, - { gBattleAnimSpritePalette_006, 10006 }, - { gBattleAnimSpritePalette_007, 10007 }, - { gBattleAnimSpritePalette_008, 10008 }, - { gBattleAnimSpritePalette_009, 10009 }, - { gBattleAnimSpritePalette_010, 10010 }, - { gBattleAnimSpritePalette_011, 10011 }, - { gBattleAnimSpritePalette_012, 10012 }, - { gBattleAnimSpritePalette_013, 10013 }, - { gBattleAnimSpritePalette_014, 10014 }, - { gBattleAnimSpritePalette_015, 10015 }, - { gBattleAnimSpritePalette_016, 10016 }, - { gBattleAnimSpritePalette_016, 10017 }, - { gBattleAnimSpritePalette_018, 10018 }, - { gBattleAnimSpritePalette_019, 10019 }, - { gBattleAnimSpritePalette_020, 10020 }, - { gBattleAnimSpritePalette_021, 10021 }, - { gBattleAnimSpritePalette_022, 10022 }, - { gBattleAnimSpritePalette_023, 10023 }, - { gBattleAnimSpritePalette_024, 10024 }, - { gBattleAnimSpritePalette_025, 10025 }, - { gBattleAnimSpritePalette_026, 10026 }, - { gBattleAnimSpritePalette_027, 10027 }, - { gBattleAnimSpritePalette_028, 10028 }, - { gBattleAnimSpritePalette_029, 10029 }, - { gBattleAnimSpritePalette_030, 10030 }, - { gBattleAnimSpritePalette_031, 10031 }, - { gBattleAnimSpritePalette_032, 10032 }, - { gBattleAnimSpritePalette_033, 10033 }, - { gBattleAnimSpritePalette_033, 10034 }, - { gBattleAnimSpritePalette_033, 10035 }, - { gBattleAnimSpritePalette_036, 10036 }, - { gBattleAnimSpritePalette_036, 10037 }, - { gBattleAnimSpritePalette_038, 10038 }, - { gBattleAnimSpritePalette_039, 10039 }, - { gBattleAnimSpritePalette_038, 10040 }, - { gBattleAnimSpritePalette_038, 10041 }, - { gBattleAnimSpritePalette_042, 10042 }, - { gBattleAnimSpritePalette_043, 10043 }, - { gBattleAnimSpritePalette_044, 10044 }, - { gBattleAnimSpritePalette_045, 10045 }, - { gBattleAnimSpritePalette_046, 10046 }, - { gBattleAnimSpritePalette_047, 10046 }, - { gBattleAnimSpritePalette_048, 10048 }, - { gBattleAnimSpritePalette_049, 10049 }, - { gBattleAnimSpritePalette_050, 10050 }, - { gBattleAnimSpritePalette_050, 10051 }, - { gBattleAnimSpritePalette_050, 10052 }, - { gBattleAnimSpritePalette_026, 10053 }, - { gBattleAnimSpritePalette_054, 10054 }, - { gBattleAnimSpritePalette_050, 10055 }, - { gBattleAnimSpritePalette_056, 10056 }, - { gBattleAnimSpritePalette_057, 10057 }, - { gBattleAnimSpritePalette_058, 10058 }, - { gBattleAnimSpritePalette_059, 10059 }, - { gBattleAnimSpritePalette_060, 10060 }, - { gBattleAnimSpritePalette_061, 10061 }, - { gBattleAnimSpritePalette_062, 10062 }, - { gBattleAnimSpritePalette_063, 10063 }, - { gBattleAnimSpritePalette_064, 10064 }, - { gBattleAnimSpritePalette_065, 10065 }, - { gBattleAnimSpritePalette_066, 10066 }, - { gBattleAnimSpritePalette_067, 10067 }, - { gBattleAnimSpritePalette_068, 10068 }, - { gBattleAnimSpritePalette_065, 10069 }, - { gBattleAnimSpritePalette_070, 10070 }, - { gBattleAnimSpritePalette_070, 10071 }, - { gBattleAnimSpritePalette_072, 10072 }, - { gBattleAnimSpritePalette_073, 10073 }, - { gBattleAnimSpritePalette_074, 10074 }, - { gBattleAnimSpritePalette_075, 10075 }, - { gBattleAnimSpritePalette_076, 10076 }, - { gBattleAnimSpritePalette_076, 10077 }, - { gBattleAnimSpritePalette_078, 10078 }, - { gBattleAnimSpritePalette_078, 10079 }, - { gBattleAnimSpritePalette_080, 10080 }, - { gBattleAnimSpritePalette_081, 10081 }, - { gBattleAnimSpritePalette_082, 10082 }, - { gBattleAnimSpritePalette_083, 10083 }, - { gBattleAnimSpritePalette_084, 10084 }, - { gBattleAnimSpritePalette_085, 10085 }, - { gBattleAnimSpritePalette_086, 10086 }, - { gBattleAnimSpritePalette_087, 10087 }, - { gBattleAnimSpritePalette_088, 10088 }, - { gBattleAnimSpritePalette_089, 10089 }, - { gBattleAnimSpritePalette_090, 10090 }, - { gBattleAnimSpritePalette_091, 10091 }, - { gBattleAnimSpritePalette_092, 10092 }, - { gBattleAnimSpritePalette_093, 10093 }, - { gBattleAnimSpritePalette_094, 10094 }, - { gBattleAnimSpritePalette_095, 10095 }, - { gBattleAnimSpritePalette_096, 10096 }, - { gBattleAnimSpritePalette_097, 10097 }, - { gBattleAnimSpritePalette_094, 10098 }, - { gBattleAnimSpritePalette_099, 10099 }, - { gBattleAnimSpritePalette_100, 10100 }, - { gBattleAnimSpritePalette_101, 10101 }, - { gBattleAnimSpritePalette_101, 10102 }, - { gBattleAnimSpritePalette_103, 10103 }, - { gBattleAnimSpritePalette_104, 10104 }, - { gBattleAnimSpritePalette_105, 10105 }, - { gBattleAnimSpritePalette_105, 10106 }, - { gBattleAnimSpritePalette_107, 10107 }, - { gBattleAnimSpritePalette_107, 10108 }, - { gBattleAnimSpritePalette_109, 10109 }, - { gBattleAnimSpritePalette_109, 10110 }, - { gBattleAnimSpritePalette_111, 10111 }, - { gBattleAnimSpritePalette_112, 10112 }, - { gBattleAnimSpritePalette_113, 10113 }, - { gBattleAnimSpritePalette_114, 10114 }, - { gBattleAnimSpritePalette_115, 10115 }, - { gBattleAnimSpritePalette_116, 10116 }, - { gBattleAnimSpritePalette_117, 10117 }, - { gBattleAnimSpritePalette_118, 10118 }, - { gBattleAnimSpritePalette_119, 10119 }, - { gBattleAnimSpritePalette_120, 10120 }, - { gBattleAnimSpritePalette_121, 10121 }, - { gBattleAnimSpritePalette_122, 10122 }, - { gBattleAnimSpritePalette_122, 10123 }, - { gBattleAnimSpritePalette_124, 10124 }, - { gBattleAnimSpritePalette_125, 10125 }, - { gBattleAnimSpritePalette_126, 10126 }, - { gBattleAnimSpritePalette_127, 10127 }, - { gBattleAnimSpritePalette_128, 10128 }, - { gBattleAnimSpritePalette_128, 10129 }, - { gBattleAnimSpritePalette_130, 10130 }, - { gBattleAnimSpritePalette_130, 10131 }, - { gBattleAnimSpritePalette_132, 10132 }, - { gBattleAnimSpritePalette_133, 10133 }, - { gBattleAnimSpritePalette_133, 10134 }, - { gBattleAnimSpritePalette_135, 10135 }, - { gBattleAnimSpritePalette_136, 10136 }, - { gBattleAnimSpritePalette_135, 10137 }, - { gBattleAnimSpritePalette_135, 10138 }, - { gBattleAnimSpritePalette_139, 10139 }, - { gBattleAnimSpritePalette_140, 10140 }, - { gBattleAnimSpritePalette_141, 10141 }, - { gBattleAnimSpritePalette_141, 10142 }, - { gBattleAnimSpritePalette_143, 10143 }, - { gBattleAnimSpritePalette_144, 10144 }, - { gBattleAnimSpritePalette_139, 10145 }, - { gBattleAnimSpritePalette_115, 10146 }, - { gBattleAnimSpritePalette_147, 10147 }, - { gBattleAnimSpritePalette_148, 10148 }, - { gBattleAnimSpritePalette_148, 10149 }, - { gBattleAnimSpritePalette_150, 10150 }, - { gBattleAnimSpritePalette_150, 10151 }, - { gBattleAnimSpritePalette_152, 10152 }, - { gBattleAnimSpritePalette_153, 10153 }, - { gBattleAnimSpritePalette_154, 10154 }, - { gBattleAnimSpritePalette_155, 10155 }, - { gBattleAnimSpritePalette_156, 10156 }, - { gBattleAnimSpritePalette_157, 10157 }, - { gBattleAnimSpritePalette_158, 10158 }, - { gBattleAnimSpritePalette_159, 10159 }, - { gBattleAnimSpritePalette_160, 10160 }, - { gBattleAnimSpritePalette_161, 10161 }, - { gBattleAnimSpritePalette_162, 10162 }, - { gBattleAnimSpritePalette_163, 10163 }, - { gBattleAnimSpritePalette_164, 10164 }, - { gBattleAnimSpritePalette_165, 10165 }, - { gBattleAnimSpritePalette_166, 10166 }, - { gBattleAnimSpritePalette_167, 10167 }, - { gBattleAnimSpritePalette_168, 10168 }, - { gBattleAnimSpritePalette_169, 10169 }, - { gBattleAnimSpritePalette_170, 10170 }, - { gBattleAnimSpritePalette_171, 10171 }, - { gBattleAnimSpritePalette_172, 10172 }, - { gBattleAnimSpritePalette_001, 10173 }, - { gBattleAnimSpritePalette_174, 10174 }, - { gBattleAnimSpritePalette_175, 10175 }, - { gBattleAnimSpritePalette_176, 10176 }, - { gBattleAnimSpritePalette_177, 10177 }, - { gBattleAnimSpritePalette_178, 10178 }, - { gBattleAnimSpritePalette_179, 10179 }, - { gBattleAnimSpritePalette_179, 10180 }, - { gBattleAnimSpritePalette_179, 10181 }, - { gBattleAnimSpritePalette_182, 10182 }, - { gBattleAnimSpritePalette_183, 10183 }, - { gBattleAnimSpritePalette_184, 10184 }, - { gBattleAnimSpritePalette_185, 10185 }, - { gBattleAnimSpritePalette_186, 10186 }, - { gBattleAnimSpritePalette_187, 10187 }, - { gBattleAnimSpritePalette_188, 10188 }, - { gBattleAnimSpritePalette_189, 10189 }, - { gBattleAnimSpritePalette_190, 10190 }, - { gBattleAnimSpritePalette_191, 10191 }, - { gBattleAnimSpritePalette_192, 10192 }, - { gBattleAnimSpritePalette_193, 10193 }, - { gBattleAnimSpritePalette_194, 10194 }, - { gBattleAnimSpritePalette_195, 10195 }, - { gBattleAnimSpritePalette_196, 10196 }, - { gBattleAnimSpritePalette_197, 10197 }, - { gBattleAnimSpritePalette_198, 10198 }, - { gBattleAnimSpritePalette_199, 10199 }, - { gBattleAnimSpritePalette_200, 10200 }, - { gBattleAnimSpritePalette_201, 10201 }, - { gBattleAnimSpritePalette_202, 10202 }, - { gBattleAnimSpritePalette_203, 10203 }, - { gBattleAnimSpritePalette_204, 10204 }, - { gBattleAnimSpritePalette_205, 10205 }, - { gBattleAnimSpritePalette_206, 10206 }, - { gBattleAnimSpritePalette_207, 10207 }, - { gBattleAnimSpritePalette_167, 10208 }, - { gBattleAnimSpritePalette_209, 10209 }, - { gBattleAnimSpritePalette_210, 10210 }, - { gBattleAnimSpritePalette_211, 10211 }, - { gBattleAnimSpritePalette_211, 10212 }, - { gBattleAnimSpritePalette_211, 10213 }, - { gBattleAnimSpritePalette_064, 10214 }, - { gBattleAnimSpritePalette_215, 10215 }, - { gBattleAnimSpritePalette_216, 10216 }, - { gBattleAnimSpritePalette_217, 10217 }, - { gBattleAnimSpritePalette_218, 10218 }, - { gBattleAnimSpritePalette_219, 10219 }, - { gBattleAnimSpritePalette_220, 10220 }, - { gBattleAnimSpritePalette_221, 10221 }, - { gBattleAnimSpritePalette_222, 10222 }, - { gBattleAnimSpritePalette_223, 10223 }, - { gBattleAnimSpritePalette_224, 10224 }, - { gBattleAnimSpritePalette_225, 10225 }, - { gBattleAnimSpritePalette_226, 10226 }, - { gBattleAnimSpritePalette_226, 10227 }, - { gBattleAnimSpritePalette_228, 10228 }, - { gBattleAnimSpritePalette_229, 10229 }, - { gBattleAnimSpritePalette_230, 10230 }, - { gBattleAnimSpritePalette_231, 10231 }, - { gBattleAnimSpritePalette_231, 10232 }, - { gBattleAnimSpritePalette_233, 10233 }, - { gBattleAnimSpritePalette_234, 10234 }, - { gBattleAnimSpritePalette_235, 10235 }, - { gBattleAnimSpritePalette_236, 10236 }, - { gBattleAnimSpritePalette_237, 10237 }, - { gBattleAnimSpritePalette_238, 10238 }, - { gBattleAnimSpritePalette_239, 10239 }, - { gBattleAnimSpritePalette_240, 10240 }, - { gBattleAnimSpritePalette_241, 10241 }, - { gBattleAnimSpritePalette_242, 10242 }, - { gBattleAnimSpritePalette_243, 10243 }, - { gBattleAnimSpritePalette_244, 10244 }, - { gBattleAnimSpritePalette_245, 10245 }, - { gBattleAnimSpritePalette_245, 10246 }, - { gBattleAnimSpritePalette_064, 10247 }, - { gBattleAnimSpritePalette_248, 10248 }, - { gBattleAnimSpritePalette_249, 10249 }, - { gBattleAnimSpritePalette_249, 10250 }, - { gBattleAnimSpritePalette_251, 10251 }, - { gBattleAnimSpritePalette_252, 10252 }, - { gBattleAnimSpritePalette_253, 10253 }, - { gBattleAnimSpritePalette_254, 10254 }, - { gBattleAnimSpritePalette_255, 10255 }, - { gBattleAnimSpritePalette_256, 10256 }, - { gBattleAnimSpritePalette_257, 10257 }, - { gBattleAnimSpritePalette_258, 10258 }, - { gBattleAnimSpritePalette_259, 10259 }, - { gBattleAnimSpritePalette_260, 10260 }, - { gBattleAnimSpritePalette_261, 10261 }, - { gBattleAnimSpritePalette_262, 10262 }, - { gBattleAnimSpritePalette_263, 10263 }, - { gBattleAnimSpritePalette_264, 10264 }, - { gBattleAnimSpritePalette_265, 10265 }, - { gBattleAnimSpritePalette_266, 10266 }, - { gBattleAnimSpritePalette_267, 10267 }, - { gBattleAnimSpritePalette_268, 10268 }, - { gBattleAnimSpritePalette_269, 10269 }, - { gBattleAnimSpritePalette_270, 10270 }, - { gBattleAnimSpritePalette_271, 10271 }, - { gBattleAnimSpritePalette_272, 10272 }, - { gBattleAnimSpritePalette_272, 10273 }, - { gBattleAnimSpritePalette_274, 10274 }, - { gBattleAnimSpritePalette_274, 10275 }, - { gBattleAnimSpritePalette_274, 10276 }, - { gBattleAnimSpritePalette_277, 10277 }, - { gBattleAnimSpritePalette_278, 10278 }, - { gBattleAnimSpritePalette_279, 10279 }, - { gBattleAnimSpritePalette_280, 10280 }, - { gBattleAnimSpritePalette_281, 10281 }, - { gBattleAnimSpritePalette_282, 10282 }, - { gBattleAnimSpritePalette_283, 10283 }, - { gBattleAnimSpritePalette_284, 10284 }, - { gBattleAnimSpritePalette_285, 10285 }, - { gBattleAnimSpritePalette_286, 10286 }, - { gBattleAnimSpritePalette_287, 10287 }, - { gBattleAnimSpritePalette_288, 10288 }, + { gBattleAnimSpritePalette_000, ANIM_TAG_BONE }, + { gBattleAnimSpritePalette_001, ANIM_TAG_SPARK }, + { gBattleAnimSpritePalette_002, ANIM_TAG_PENCIL }, + { gBattleAnimSpritePalette_003, ANIM_TAG_AIR_WAVE }, + { gBattleAnimSpritePalette_004, ANIM_TAG_UNUSED_ORB }, + { gBattleAnimSpritePalette_005, ANIM_TAG_SWORD }, + { gBattleAnimSpritePalette_006, ANIM_TAG_SEED }, + { gBattleAnimSpritePalette_007, ANIM_TAG_UNUSED_EXPLOSION }, + { gBattleAnimSpritePalette_008, ANIM_TAG_UNUSED_PINK_ORB }, + { gBattleAnimSpritePalette_009, ANIM_TAG_GUST }, + { gBattleAnimSpritePalette_010, ANIM_TAG_ICE_CUBE }, + { gBattleAnimSpritePalette_011, ANIM_TAG_SPARK_2 }, + { gBattleAnimSpritePalette_012, ANIM_TAG_UNUSED_ORANGE }, + { gBattleAnimSpritePalette_013, ANIM_TAG_YELLOW_BALL }, + { gBattleAnimSpritePalette_014, ANIM_TAG_LOCK_ON }, + { gBattleAnimSpritePalette_015, ANIM_TAG_TIED_BAG }, + { gBattleAnimSpritePalette_016, ANIM_TAG_BLACK_SMOKE }, + { gBattleAnimSpritePalette_016, ANIM_TAG_BLACK_BALL }, + { gBattleAnimSpritePalette_018, ANIM_TAG_CONVERSION }, + { gBattleAnimSpritePalette_019, ANIM_TAG_UNUSED_GLASS }, + { gBattleAnimSpritePalette_020, ANIM_TAG_HORN_HIT }, + { gBattleAnimSpritePalette_021, ANIM_TAG_UNUSED_HIT }, + { gBattleAnimSpritePalette_022, ANIM_TAG_UNUSED_HIT_2 }, + { gBattleAnimSpritePalette_023, ANIM_TAG_UNUSED_BLUE_SHARDS }, + { gBattleAnimSpritePalette_024, ANIM_TAG_UNUSED_CLOSING_EYE }, + { gBattleAnimSpritePalette_025, ANIM_TAG_UNUSED_WAVING_HAND }, + { gBattleAnimSpritePalette_026, ANIM_TAG_UNUSED_HIT_DUPLICATE }, + { gBattleAnimSpritePalette_027, ANIM_TAG_LEER }, + { gBattleAnimSpritePalette_028, ANIM_TAG_UNUSED_BLUE_BURST }, + { gBattleAnimSpritePalette_029, ANIM_TAG_SMALL_EMBER }, + { gBattleAnimSpritePalette_030, ANIM_TAG_GRAY_SMOKE }, + { gBattleAnimSpritePalette_031, ANIM_TAG_BLUE_STAR }, + { gBattleAnimSpritePalette_032, ANIM_TAG_UNUSED_BUBBLE_BURST }, + { gBattleAnimSpritePalette_033, ANIM_TAG_FIRE }, + { gBattleAnimSpritePalette_033, ANIM_TAG_UNUSED_SPINNING_FIRE }, + { gBattleAnimSpritePalette_033, ANIM_TAG_FIRE_PLUME }, + { gBattleAnimSpritePalette_036, ANIM_TAG_UNUSED_LIGHTNING }, + { gBattleAnimSpritePalette_036, ANIM_TAG_LIGHTNING }, + { gBattleAnimSpritePalette_038, ANIM_TAG_UNUSED_CLAW_SLASH }, + { gBattleAnimSpritePalette_039, ANIM_TAG_CLAW_SLASH }, + { gBattleAnimSpritePalette_038, ANIM_TAG_UNUSED_SCRATCH }, + { gBattleAnimSpritePalette_038, ANIM_TAG_UNUSED_SCRATCH_2 }, + { gBattleAnimSpritePalette_042, ANIM_TAG_UNUSED_BUBBLE_BURST_2 }, + { gBattleAnimSpritePalette_043, ANIM_TAG_ICE_CHUNK }, + { gBattleAnimSpritePalette_044, ANIM_TAG_UNUSED_GLASS_2 }, + { gBattleAnimSpritePalette_045, ANIM_TAG_UNUSED_PINK_HEART }, + { gBattleAnimSpritePalette_046, ANIM_TAG_UNUSED_SAP_DRIP }, + { gBattleAnimSpritePalette_047, ANIM_TAG_UNUSED_SAP_DRIP }, + { gBattleAnimSpritePalette_048, ANIM_TAG_SPARKLE_1 }, + { gBattleAnimSpritePalette_049, ANIM_TAG_SPARKLE_2 }, + { gBattleAnimSpritePalette_050, ANIM_TAG_HUMANOID_FOOT }, + { gBattleAnimSpritePalette_050, ANIM_TAG_UNUSED_MONSTER_FOOT }, + { gBattleAnimSpritePalette_050, ANIM_TAG_UNUSED_HUMANOID_HAND }, + { gBattleAnimSpritePalette_026, ANIM_TAG_NOISE_LINE }, + { gBattleAnimSpritePalette_054, ANIM_TAG_UNUSED_YELLOW_UNK }, + { gBattleAnimSpritePalette_050, ANIM_TAG_UNUSED_RED_FIST }, + { gBattleAnimSpritePalette_056, ANIM_TAG_SLAM_HIT }, + { gBattleAnimSpritePalette_057, ANIM_TAG_UNUSED_RING }, + { gBattleAnimSpritePalette_058, ANIM_TAG_ROCKS }, + { gBattleAnimSpritePalette_059, ANIM_TAG_UNUSED_Z }, + { gBattleAnimSpritePalette_060, ANIM_TAG_UNUSED_YELLOW_UNK_2 }, + { gBattleAnimSpritePalette_061, ANIM_TAG_UNUSED_AIR_SLASH }, + { gBattleAnimSpritePalette_062, ANIM_TAG_UNUSED_SPINNING_GREEN_ORBS }, + { gBattleAnimSpritePalette_063, ANIM_TAG_LEAF }, + { gBattleAnimSpritePalette_064, ANIM_TAG_FINGER }, + { gBattleAnimSpritePalette_065, ANIM_TAG_POISON_POWDER }, + { gBattleAnimSpritePalette_066, ANIM_TAG_UNUSED_BROWN_TRIANGLE }, + { gBattleAnimSpritePalette_067, ANIM_TAG_SLEEP_POWDER }, + { gBattleAnimSpritePalette_068, ANIM_TAG_STUN_SPORE }, + { gBattleAnimSpritePalette_065, ANIM_TAG_UNUSED_POWDER }, + { gBattleAnimSpritePalette_070, ANIM_TAG_SPARKLE_3 }, + { gBattleAnimSpritePalette_070, ANIM_TAG_SPARKLE_4 }, + { gBattleAnimSpritePalette_072, ANIM_TAG_MUSIC_NOTES }, + { gBattleAnimSpritePalette_073, ANIM_TAG_DUCK }, + { gBattleAnimSpritePalette_074, ANIM_TAG_MUD_SAND }, + { gBattleAnimSpritePalette_075, ANIM_TAG_ALERT }, + { gBattleAnimSpritePalette_076, ANIM_TAG_UNUSED_BLUE_FLAMES }, + { gBattleAnimSpritePalette_076, ANIM_TAG_UNUSED_BLUE_FLAMES_2 }, + { gBattleAnimSpritePalette_078, ANIM_TAG_UNUSED_SHOCK }, + { gBattleAnimSpritePalette_078, ANIM_TAG_SHOCK }, + { gBattleAnimSpritePalette_080, ANIM_TAG_UNUSED_BELL }, + { gBattleAnimSpritePalette_081, ANIM_TAG_UNUSED_PINK_GLOVE }, + { gBattleAnimSpritePalette_082, ANIM_TAG_UNUSED_BLUE_LINES }, + { gBattleAnimSpritePalette_083, ANIM_TAG_UNUSED_IMPACT }, + { gBattleAnimSpritePalette_084, ANIM_TAG_UNUSED_IMPACT_2 }, + { gBattleAnimSpritePalette_085, ANIM_TAG_UNUSED_RETICLE }, + { gBattleAnimSpritePalette_086, ANIM_TAG_BREATH }, + { gBattleAnimSpritePalette_087, ANIM_TAG_ANGER }, + { gBattleAnimSpritePalette_088, ANIM_TAG_UNUSED_SNOWBALL }, + { gBattleAnimSpritePalette_089, ANIM_TAG_UNUSED_VINE }, + { gBattleAnimSpritePalette_090, ANIM_TAG_UNUSED_SWORD }, + { gBattleAnimSpritePalette_091, ANIM_TAG_UNUSED_CLAPPING }, + { gBattleAnimSpritePalette_092, ANIM_TAG_UNUSED_RED_TUBE }, + { gBattleAnimSpritePalette_093, ANIM_TAG_AMNESIA }, + { gBattleAnimSpritePalette_094, ANIM_TAG_UNUSED_STRING }, + { gBattleAnimSpritePalette_095, ANIM_TAG_UNUSED_PENCIL }, + { gBattleAnimSpritePalette_096, ANIM_TAG_UNUSED_PETAL }, + { gBattleAnimSpritePalette_097, ANIM_TAG_BENT_SPOON }, + { gBattleAnimSpritePalette_094, ANIM_TAG_UNUSED_WEB }, + { gBattleAnimSpritePalette_099, ANIM_TAG_MILK_BOTTLE }, + { gBattleAnimSpritePalette_100, ANIM_TAG_COIN }, + { gBattleAnimSpritePalette_101, ANIM_TAG_UNUSED_CRACKED_EGG }, + { gBattleAnimSpritePalette_101, ANIM_TAG_UNUSED_HATCHED_EGG }, + { gBattleAnimSpritePalette_103, ANIM_TAG_UNUSED_FRESH_EGG }, + { gBattleAnimSpritePalette_104, ANIM_TAG_UNUSED_FANGS }, + { gBattleAnimSpritePalette_105, ANIM_TAG_UNUSED_EXPLOSION_2 }, + { gBattleAnimSpritePalette_105, ANIM_TAG_UNUSED_EXPLOSION_3 }, + { gBattleAnimSpritePalette_107, ANIM_TAG_UNUSED_WATER_DROPLET }, + { gBattleAnimSpritePalette_107, ANIM_TAG_UNUSED_WATER_DROPLET_2 }, + { gBattleAnimSpritePalette_109, ANIM_TAG_UNUSED_SEED }, + { gBattleAnimSpritePalette_109, ANIM_TAG_UNUSED_SPROUT }, + { gBattleAnimSpritePalette_111, ANIM_TAG_UNUSED_RED_WAND }, + { gBattleAnimSpritePalette_112, ANIM_TAG_UNUSED_PURPLE_GREEN_UNK }, + { gBattleAnimSpritePalette_113, ANIM_TAG_UNUSED_WATER_COLUMN }, + { gBattleAnimSpritePalette_114, ANIM_TAG_UNUSED_MUD_UNK }, + { gBattleAnimSpritePalette_115, ANIM_TAG_RAIN_DROPS }, + { gBattleAnimSpritePalette_116, ANIM_TAG_UNUSED_FURY_SWIPES }, + { gBattleAnimSpritePalette_117, ANIM_TAG_UNUSED_VINE_2 }, + { gBattleAnimSpritePalette_118, ANIM_TAG_UNUSED_TEETH }, + { gBattleAnimSpritePalette_119, ANIM_TAG_UNUSED_BONE }, + { gBattleAnimSpritePalette_120, ANIM_TAG_UNUSED_WHITE_BAG }, + { gBattleAnimSpritePalette_121, ANIM_TAG_UNUSED_UNKNOWN }, + { gBattleAnimSpritePalette_122, ANIM_TAG_UNUSED_PURPLE_CORAL }, + { gBattleAnimSpritePalette_122, ANIM_TAG_UNUSED_PURPLE_DROPLET }, + { gBattleAnimSpritePalette_124, ANIM_TAG_UNUSED_SHOCK_2 }, + { gBattleAnimSpritePalette_125, ANIM_TAG_UNUSED_CLOSING_EYE_2 }, + { gBattleAnimSpritePalette_126, ANIM_TAG_UNUSED_METAL_BALL }, + { gBattleAnimSpritePalette_127, ANIM_TAG_UNUSED_MONSTER_DOLL }, + { gBattleAnimSpritePalette_128, ANIM_TAG_UNUSED_WHIRLWIND }, + { gBattleAnimSpritePalette_128, ANIM_TAG_UNUSED_WHIRLWIND_2 }, + { gBattleAnimSpritePalette_130, ANIM_TAG_UNUSED_EXPLOSION_4 }, + { gBattleAnimSpritePalette_130, ANIM_TAG_UNUSED_EXPLOSION_5 }, + { gBattleAnimSpritePalette_132, ANIM_TAG_UNUSED_TONGUE }, + { gBattleAnimSpritePalette_133, ANIM_TAG_UNUSED_SMOKE }, + { gBattleAnimSpritePalette_133, ANIM_TAG_UNUSED_SMOKE_2 }, + { gBattleAnimSpritePalette_135, ANIM_TAG_IMPACT }, + { gBattleAnimSpritePalette_136, ANIM_TAG_CIRCLE_IMPACT }, + { gBattleAnimSpritePalette_135, ANIM_TAG_SCRATCH }, + { gBattleAnimSpritePalette_135, ANIM_TAG_CUT }, + { gBattleAnimSpritePalette_139, ANIM_TAG_SHARP_TEETH }, + { gBattleAnimSpritePalette_140, ANIM_TAG_RAINBOW_RINGS }, + { gBattleAnimSpritePalette_141, ANIM_TAG_ICE_CRYSTALS }, + { gBattleAnimSpritePalette_141, ANIM_TAG_ICE_SPIKES }, + { gBattleAnimSpritePalette_143, ANIM_TAG_HANDS_AND_FEET }, + { gBattleAnimSpritePalette_144, ANIM_TAG_MIST_CLOUD }, + { gBattleAnimSpritePalette_139, ANIM_TAG_CLAMP }, + { gBattleAnimSpritePalette_115, ANIM_TAG_BUBBLE }, + { gBattleAnimSpritePalette_147, ANIM_TAG_ORBS }, + { gBattleAnimSpritePalette_148, ANIM_TAG_WATER_IMPACT }, + { gBattleAnimSpritePalette_148, ANIM_TAG_WATER_ORB }, + { gBattleAnimSpritePalette_150, ANIM_TAG_POISON_BUBBLE }, + { gBattleAnimSpritePalette_150, ANIM_TAG_TOXIC_BUBBLE }, + { gBattleAnimSpritePalette_152, ANIM_TAG_SPIKES }, + { gBattleAnimSpritePalette_153, ANIM_TAG_HORN_HIT_2 }, + { gBattleAnimSpritePalette_154, ANIM_TAG_AIR_WAVE_2 }, + { gBattleAnimSpritePalette_155, ANIM_TAG_SMALL_BUBBLES }, + { gBattleAnimSpritePalette_156, ANIM_TAG_ROUND_SHADOW }, + { gBattleAnimSpritePalette_157, ANIM_TAG_SUNLIGHT }, + { gBattleAnimSpritePalette_158, ANIM_TAG_SPORE }, + { gBattleAnimSpritePalette_159, ANIM_TAG_FLOWER }, + { gBattleAnimSpritePalette_160, ANIM_TAG_RAZOR_LEAF }, + { gBattleAnimSpritePalette_161, ANIM_TAG_NEEDLE }, + { gBattleAnimSpritePalette_162, ANIM_TAG_WHIRLWIND_LINES }, + { gBattleAnimSpritePalette_163, ANIM_TAG_GOLD_RING }, + { gBattleAnimSpritePalette_164, ANIM_TAG_PURPLE_RING }, + { gBattleAnimSpritePalette_165, ANIM_TAG_BLUE_RING }, + { gBattleAnimSpritePalette_166, ANIM_TAG_GREEN_LIGHT_WALL }, + { gBattleAnimSpritePalette_167, ANIM_TAG_BLUE_LIGHT_WALL }, + { gBattleAnimSpritePalette_168, ANIM_TAG_RED_LIGHT_WALL }, + { gBattleAnimSpritePalette_169, ANIM_TAG_GRAY_LIGHT_WALL }, + { gBattleAnimSpritePalette_170, ANIM_TAG_ORANGE_LIGHT_WALL }, + { gBattleAnimSpritePalette_171, ANIM_TAG_BLACK_BALL_2 }, + { gBattleAnimSpritePalette_172, ANIM_TAG_PURPLE_GAS_CLOUD }, + { gBattleAnimSpritePalette_001, ANIM_TAG_SPARK_H }, + { gBattleAnimSpritePalette_174, ANIM_TAG_YELLOW_STAR }, + { gBattleAnimSpritePalette_175, ANIM_TAG_LARGE_FRESH_EGG }, + { gBattleAnimSpritePalette_176, ANIM_TAG_SHADOW_BALL }, + { gBattleAnimSpritePalette_177, ANIM_TAG_LICK }, + { gBattleAnimSpritePalette_178, ANIM_TAG_UNUSED_VOID_LINES }, + { gBattleAnimSpritePalette_179, ANIM_TAG_STRING }, + { gBattleAnimSpritePalette_179, ANIM_TAG_STRING_DOT }, + { gBattleAnimSpritePalette_179, ANIM_TAG_WEB }, + { gBattleAnimSpritePalette_182, ANIM_TAG_UNUSED_LIGHTBULB }, + { gBattleAnimSpritePalette_183, ANIM_TAG_SLASH }, + { gBattleAnimSpritePalette_184, ANIM_TAG_FOCUS_ENERGY }, + { gBattleAnimSpritePalette_185, ANIM_TAG_SPHERE_TO_CUBE }, + { gBattleAnimSpritePalette_186, ANIM_TAG_TENDRILS }, + { gBattleAnimSpritePalette_187, ANIM_TAG_EYE }, + { gBattleAnimSpritePalette_188, ANIM_TAG_WHITE_SHADOW }, + { gBattleAnimSpritePalette_189, ANIM_TAG_TEAL_ALERT }, + { gBattleAnimSpritePalette_190, ANIM_TAG_OPENING_EYE }, + { gBattleAnimSpritePalette_191, ANIM_TAG_ROUND_WHITE_HALO }, + { gBattleAnimSpritePalette_192, ANIM_TAG_FANG_ATTACK }, + { gBattleAnimSpritePalette_193, ANIM_TAG_PURPLE_HAND_OUTLINE }, + { gBattleAnimSpritePalette_194, ANIM_TAG_MOON }, + { gBattleAnimSpritePalette_195, ANIM_TAG_SPARKLE_5 }, + { gBattleAnimSpritePalette_196, ANIM_TAG_SPIRAL }, + { gBattleAnimSpritePalette_197, ANIM_TAG_SNORE_Z }, + { gBattleAnimSpritePalette_198, ANIM_TAG_EXPLOSION }, + { gBattleAnimSpritePalette_199, ANIM_TAG_NAIL }, + { gBattleAnimSpritePalette_200, ANIM_TAG_GHOSTLY_SPIRIT }, + { gBattleAnimSpritePalette_201, ANIM_TAG_WARM_ROCK }, + { gBattleAnimSpritePalette_202, ANIM_TAG_BREAKING_EGG }, + { gBattleAnimSpritePalette_203, ANIM_TAG_THIN_RING }, + { gBattleAnimSpritePalette_204, ANIM_TAG_UNUSED_PUNCH_IMPACT }, + { gBattleAnimSpritePalette_205, ANIM_TAG_BELL }, + { gBattleAnimSpritePalette_206, ANIM_TAG_MUSIC_NOTES_2 }, + { gBattleAnimSpritePalette_207, ANIM_TAG_SPEED_DUST }, + { gBattleAnimSpritePalette_167, ANIM_TAG_TORN_METAL }, + { gBattleAnimSpritePalette_209, ANIM_TAG_THOUGHT_BUBBLE }, + { gBattleAnimSpritePalette_210, ANIM_TAG_MAGENTA_HEART }, + { gBattleAnimSpritePalette_211, ANIM_TAG_ELECTRIC_ORBS }, + { gBattleAnimSpritePalette_211, ANIM_TAG_CIRCLE_OF_LIGHT }, + { gBattleAnimSpritePalette_211, ANIM_TAG_ELECTRICITY }, + { gBattleAnimSpritePalette_064, ANIM_TAG_FINGER_2 }, + { gBattleAnimSpritePalette_215, ANIM_TAG_MOVEMENT_WAVES }, + { gBattleAnimSpritePalette_216, ANIM_TAG_RED_HEART }, + { gBattleAnimSpritePalette_217, ANIM_TAG_RED_ORB }, + { gBattleAnimSpritePalette_218, ANIM_TAG_EYE_SPARKLE }, + { gBattleAnimSpritePalette_219, ANIM_TAG_PINK_HEART }, + { gBattleAnimSpritePalette_220, ANIM_TAG_ANGEL }, + { gBattleAnimSpritePalette_221, ANIM_TAG_DEVIL }, + { gBattleAnimSpritePalette_222, ANIM_TAG_SWIPE }, + { gBattleAnimSpritePalette_223, ANIM_TAG_ROOTS }, + { gBattleAnimSpritePalette_224, ANIM_TAG_ITEM_BAG }, + { gBattleAnimSpritePalette_225, ANIM_TAG_JAGGED_MUSIC_NOTE }, + { gBattleAnimSpritePalette_226, ANIM_TAG_POKEBALL }, + { gBattleAnimSpritePalette_226, ANIM_TAG_SPOTLIGHT }, + { gBattleAnimSpritePalette_228, ANIM_TAG_LETTER_Z }, + { gBattleAnimSpritePalette_229, ANIM_TAG_RAPID_SPIN }, + { gBattleAnimSpritePalette_230, ANIM_TAG_TRI_FORCE_TRIANGLE }, + { gBattleAnimSpritePalette_231, ANIM_TAG_WISP_ORB }, + { gBattleAnimSpritePalette_231, ANIM_TAG_WISP_FIRE }, + { gBattleAnimSpritePalette_233, ANIM_TAG_GOLD_STARS }, + { gBattleAnimSpritePalette_234, ANIM_TAG_ECLIPSING_ORB }, + { gBattleAnimSpritePalette_235, ANIM_TAG_GRAY_ORB }, + { gBattleAnimSpritePalette_236, ANIM_TAG_BLUE_ORB }, + { gBattleAnimSpritePalette_237, ANIM_TAG_RED_ORB_2 }, + { gBattleAnimSpritePalette_238, ANIM_TAG_PINK_PETAL }, + { gBattleAnimSpritePalette_239, ANIM_TAG_PAIN_SPLIT }, + { gBattleAnimSpritePalette_240, ANIM_TAG_CONFETTI }, + { gBattleAnimSpritePalette_241, ANIM_TAG_GREEN_STAR }, + { gBattleAnimSpritePalette_242, ANIM_TAG_PINK_CLOUD }, + { gBattleAnimSpritePalette_243, ANIM_TAG_SWEAT_DROP }, + { gBattleAnimSpritePalette_244, ANIM_TAG_GUARD_RING }, + { gBattleAnimSpritePalette_245, ANIM_TAG_PURPLE_SCRATCH }, + { gBattleAnimSpritePalette_245, ANIM_TAG_PURPLE_SWIPE }, + { gBattleAnimSpritePalette_064, ANIM_TAG_TAG_HAND }, + { gBattleAnimSpritePalette_248, ANIM_TAG_SMALL_RED_EYE }, + { gBattleAnimSpritePalette_249, ANIM_TAG_HOLLOW_ORB }, + { gBattleAnimSpritePalette_249, ANIM_TAG_X_SIGN }, + { gBattleAnimSpritePalette_251, ANIM_TAG_BLUEGREEN_ORB }, + { gBattleAnimSpritePalette_252, ANIM_TAG_PAW_PRINT }, + { gBattleAnimSpritePalette_253, ANIM_TAG_PURPLE_FLAME }, + { gBattleAnimSpritePalette_254, ANIM_TAG_RED_BALL }, + { gBattleAnimSpritePalette_255, ANIM_TAG_SMELLINGSALT_EFFECT }, + { gBattleAnimSpritePalette_256, ANIM_TAG_METEOR }, + { gBattleAnimSpritePalette_257, ANIM_TAG_FLAT_ROCK }, + { gBattleAnimSpritePalette_258, ANIM_TAG_MAGNIFYING_GLASS }, + { gBattleAnimSpritePalette_259, ANIM_TAG_BROWN_ORB }, + { gBattleAnimSpritePalette_260, ANIM_TAG_METAL_SOUND_WAVES }, + { gBattleAnimSpritePalette_261, ANIM_TAG_FLYING_DIRT }, + { gBattleAnimSpritePalette_262, ANIM_TAG_ICICLE_SPEAR }, + { gBattleAnimSpritePalette_263, ANIM_TAG_HAIL }, + { gBattleAnimSpritePalette_264, ANIM_TAG_GLOWY_RED_ORB }, + { gBattleAnimSpritePalette_265, ANIM_TAG_GLOWY_GREEN_ORB }, + { gBattleAnimSpritePalette_266, ANIM_TAG_GREEN_SPIKE }, + { gBattleAnimSpritePalette_267, ANIM_TAG_WHITE_CIRCLE_OF_LIGHT }, + { gBattleAnimSpritePalette_268, ANIM_TAG_GLOWY_BLUE_ORB }, + { gBattleAnimSpritePalette_269, ANIM_TAG_UNUSED_RED_BRICK }, + { gBattleAnimSpritePalette_270, ANIM_TAG_WHITE_FEATHER }, + { gBattleAnimSpritePalette_271, ANIM_TAG_SPARKLE_6 }, + { gBattleAnimSpritePalette_272, ANIM_TAG_SPLASH }, + { gBattleAnimSpritePalette_272, ANIM_TAG_SWEAT_BEAD }, + { gBattleAnimSpritePalette_274, ANIM_TAG_UNUSED_GEM_1 }, + { gBattleAnimSpritePalette_274, ANIM_TAG_UNUSED_GEM_2 }, + { gBattleAnimSpritePalette_274, ANIM_TAG_UNUSED_GEM_3 }, + { gBattleAnimSpritePalette_277, ANIM_TAG_SLAM_HIT_2 }, + { gBattleAnimSpritePalette_278, ANIM_TAG_RECYCLE }, + { gBattleAnimSpritePalette_279, ANIM_TAG_UNUSED_RED_PARTICLES }, + { gBattleAnimSpritePalette_280, ANIM_TAG_PROTECT }, + { gBattleAnimSpritePalette_281, ANIM_TAG_DIRT_MOUND }, + { gBattleAnimSpritePalette_282, ANIM_TAG_SHOCK_3 }, + { gBattleAnimSpritePalette_283, ANIM_TAG_WEATHER_BALL }, + { gBattleAnimSpritePalette_284, ANIM_TAG_BIRD }, + { gBattleAnimSpritePalette_285, ANIM_TAG_CROSS_IMPACT }, + { gBattleAnimSpritePalette_286, ANIM_TAG_SLASH_2 }, + { gBattleAnimSpritePalette_287, ANIM_TAG_WHIP_HIT }, + { gBattleAnimSpritePalette_288, ANIM_TAG_BLUE_RING_2 }, }; const struct BattleAnimBackground gBattleAnimBackgroundTable[] = @@ -1291,6 +1286,8 @@ extern u16 gBattlerPartyIndexes[4]; extern u8 gBankSpriteIds[]; extern u8 gBankAttacker; extern u8 gBankTarget; + +// sBattleAnimScriptPtr is a pointer to the next set of battle script commands. EWRAM_DATA const u8 *sBattleAnimScriptPtr = NULL; EWRAM_DATA const u8 *gBattleAnimScriptRetAddr = NULL; EWRAM_DATA void (*gAnimScriptCallback)(void) = NULL; @@ -1478,7 +1475,7 @@ void LaunchBattleAnimation(const u8 *const moveAnims[], u16 move, u8 isMoveAnim) if (!IsContest()) { - sub_8079E24(); + UpdateBattlerSpritePriorities(); UpdateOamPriorityInAllHealthboxes(0); for (i = 0; i < 4; i++) { @@ -1599,6 +1596,8 @@ static void RunAnimScriptCommand(void) } while (gAnimFramesToWait == 0 && gAnimScriptActive); } +// Loads sprite graphics used in a move into memory. +// arg 0: gfx ANIM_TAG static void ScriptCmd_loadspritegfx(void) { u16 tag; @@ -1613,6 +1612,8 @@ static void ScriptCmd_loadspritegfx(void) gAnimScriptCallback = WaitAnimFrameCount; } +// Frees sprite graphics from memory when move animation no longer needs them. +// arg0: gfx ANIM_TAG static void ScriptCmd_unloadspritegfx(void) { u16 tag; @@ -1625,6 +1626,9 @@ static void ScriptCmd_unloadspritegfx(void) ClearSpriteIndex(GET_TRUE_SPRITE_INDEX(tag)); } +// Creates a sprite from the given sprite template. +// arg0: SpriteTemplate +// arg1: s16[] gBattleAnimArgs static void ScriptCmd_createsprite(void) { s32 i; @@ -1656,7 +1660,7 @@ static void ScriptCmd_createsprite(void) else argVar *= -1; - subpriority = sub_8079E90(gAnimBankTarget) + (s8)(argVar); + subpriority = GetBattlerSubpriority(gAnimBankTarget) + (s8)(argVar); } else { @@ -1665,7 +1669,7 @@ static void ScriptCmd_createsprite(void) else argVar *= -1; - subpriority = sub_8079E90(gAnimBankAttacker) + (s8)(argVar); + subpriority = GetBattlerSubpriority(gAnimBankAttacker) + (s8)(argVar); } if (subpriority < 3) @@ -1675,6 +1679,9 @@ static void ScriptCmd_createsprite(void) gAnimVisualTaskCount++; } +// Initializes an animation task. +// arg0: AnimTask function +// arg1: s16[] arguments static void ScriptCmd_createvisualtask(void) { TaskFunc taskFunc; @@ -1705,6 +1712,8 @@ static void ScriptCmd_createvisualtask(void) gAnimVisualTaskCount++; } +// Creates a visual delay. +// arg0: number of frames to wait. static void ScriptCmd_delay(void) { sBattleAnimScriptPtr++; @@ -1715,7 +1724,7 @@ static void ScriptCmd_delay(void) gAnimScriptCallback = WaitAnimFrameCount; } -// wait for visual tasks to finish. +// Wait for visual tasks to finish. static void ScriptCmd_waitforvisualfinish(void) { if (gAnimVisualTaskCount == 0) @@ -1737,6 +1746,8 @@ static void ScriptCmd_hang2(void) { } +// Marks the end of an animation. Finishes the anims, tasks, and sound effects. +// started during an animaiton. static void ScriptCmd_end(void) { s32 i; @@ -1784,13 +1795,15 @@ static void ScriptCmd_end(void) m4aMPlayVolumeControl(&gMPlay_BGM, 0xFFFF, 256); if (IsContest() == 0) { - sub_8079E24(); + UpdateBattlerSpritePriorities(); UpdateOamPriorityInAllHealthboxes(1); } gAnimScriptActive = FALSE; } } +// Plays a sound effect. +// arg0: sound effect ID static void ScriptCmd_playse(void) { sBattleAnimScriptPtr++; @@ -1798,6 +1811,8 @@ static void ScriptCmd_playse(void) sBattleAnimScriptPtr += 2; } +// +// arg0: battler static void ScriptCmd_monbg(void) { u8 animBank; @@ -2237,6 +2252,9 @@ static void sub_80769A4(u8 taskId) } } +// Sets transparency of sprite. +// arg0: sprite alpha value +// arg1: background alpha value static void ScriptCmd_setalpha(void) { u16 spriteAlpha, bgAlpha; @@ -2258,6 +2276,7 @@ static void ScriptCmd_setbldcnt(void) REG_BLDCNT = half1 | half2; } +// Turns off alpha blending / semi transparency. static void ScriptCmd_blendoff(void) { sBattleAnimScriptPtr++; @@ -2265,6 +2284,8 @@ static void ScriptCmd_blendoff(void) REG_BLDALPHA = 0; } +// Calls another animation by resetting sBattleAnimScriptPtr. +// arg0: Function static void ScriptCmd_call(void) { sBattleAnimScriptPtr++; @@ -2272,11 +2293,15 @@ static void ScriptCmd_call(void) sBattleAnimScriptPtr = T2_READ_PTR(sBattleAnimScriptPtr); } +// Returns to the function that called this. static void ScriptCmd_return(void) { sBattleAnimScriptPtr = gBattleAnimScriptRetAddr; } +// Sets a value into gBattleAnimArgs[8] +// arg0: index / arg number +// arg1: value to set static void ScriptCmd_setarg(void) { const u8 *addr = sBattleAnimScriptPtr; @@ -2291,6 +2316,9 @@ static void ScriptCmd_setarg(void) gBattleAnimArgs[argId] = value; } +// Flips between the first and second step of a move with two turns. +// arg0: first turn animation +// arg1: second turn animation static void ScriptCmd_choosetwoturnanim(void) { sBattleAnimScriptPtr++; @@ -2299,6 +2327,9 @@ static void ScriptCmd_choosetwoturnanim(void) sBattleAnimScriptPtr = T2_READ_PTR(sBattleAnimScriptPtr); } +// Jump to specified step of multi turn moves. +// arg0: move turn +// arg1: turn animation static void ScriptCmd_jumpifmoveturn(void) { u8 toCheck; @@ -2317,6 +2348,8 @@ static void ScriptCmd_jumpifmoveturn(void) } } +// Jump to another animation. +// arg0: new animation static void ScriptCmd_jump(void) { sBattleAnimScriptPtr++; @@ -2334,6 +2367,8 @@ bool8 IsContest(void) #define tBackgroundId data[0] #define tState data[10] +// Fades the screen and sets new background image. +// arg0: background ID static void ScriptCmd_fadetobg(void) { u8 backgroundId; @@ -2347,6 +2382,10 @@ static void ScriptCmd_fadetobg(void) sAnimBackgroundFadeState = 1; } +// Fades to background image based on context of move (contest, battle) +// arg0: opponent background image ID +// arg1: player background image ID +// arg2: contest background image ID static void ScriptCmd_fadetobgfromset(void) { u8 bg1, bg2, bg3; @@ -2434,6 +2473,7 @@ static void LoadDefaultBg(void) DrawMainBattleBackground(); } +// Restores default background image. static void ScriptCmd_restorebg(void) { u8 taskId; @@ -2447,6 +2487,7 @@ static void ScriptCmd_restorebg(void) #undef tBackgroundId #undef tState +// Wait for background image fade out to compete. static void ScriptCmd_waitbgfadeout(void) { if (sAnimBackgroundFadeState == 2) @@ -2460,6 +2501,7 @@ static void ScriptCmd_waitbgfadeout(void) } } +// Wait for background image fade in to compete. static void ScriptCmd_waitbgfadein(void) { if (sAnimBackgroundFadeState == 0) @@ -2473,6 +2515,8 @@ static void ScriptCmd_waitbgfadein(void) } } +// Change background. +// arg0: background image ID static void ScriptCmd_changebg(void) { sBattleAnimScriptPtr++; @@ -2486,7 +2530,7 @@ s8 BattleAnimAdjustPanning(s8 a) { if (!IsContest() && (EWRAM_17810[gAnimBankAttacker].unk0 & 0x10)) { - a = GetBattlerSide(gAnimBankAttacker) ? 0xC0 : 0x3F; + a = GetBattlerSide(gAnimBankAttacker) ? SOUND_PAN_ATTACKER : SOUND_PAN_TARGET; } //_08076FDC else @@ -2494,11 +2538,11 @@ s8 BattleAnimAdjustPanning(s8 a) if (IsContest()) { if (gAnimBankAttacker == gAnimBankTarget && gAnimBankAttacker == 2 - && a == 0x3F) + && a == SOUND_PAN_TARGET) { //jump to _0807707A - if (a < -0x40) - a = 0xC0; + if (a < SOUND_PAN_ATTACKER_NEG) + a = SOUND_PAN_ATTACKER; return a; } } @@ -2655,9 +2699,9 @@ s8 BattleAnimAdjustPanning2(s8 pan) if (!IsContest() && (EWRAM_17810[gAnimBankAttacker].unk0 & 0x10)) { if (GetBattlerSide(gAnimBankAttacker) != 0) - pan = 0x3F; + pan = SOUND_PAN_TARGET; else - pan = 0xC0; + pan = SOUND_PAN_ATTACKER; } else { @@ -2671,10 +2715,10 @@ s16 sub_8077104(s16 newPan, int oldPan) { s16 var = newPan; - if (var > 63) - var = 63; - else if (var < -64) - var = -64; + if (var > SOUND_PAN_TARGET) + var = SOUND_PAN_TARGET; + else if (var < SOUND_PAN_ATTACKER_NEG) + var = SOUND_PAN_ATTACKER_NEG; return var; } @@ -2957,6 +3001,9 @@ static void Task_WaitAndPlaySE(u8 taskId) #undef tPanning #undef tFramesToWait +// Creates a sound task. +// arg0: sound task function +// arg1: s16[] gBattleAnimArgs static void ScriptCmd_createsoundtask(void) { TaskFunc func; @@ -2978,6 +3025,7 @@ static void ScriptCmd_createsoundtask(void) gAnimSoundTaskCount++; } +// Wait for sound effect to end. static void ScriptCmd_waitsound(void) { if (gAnimSoundTaskCount != 0) @@ -3006,6 +3054,10 @@ static void ScriptCmd_waitsound(void) } } +// Jump to animation based on gBattleAnimArgs[index] value. +// arg0: gBattleAnimArgs[] argument index +// arg1: value +// arg2: animation script static void ScriptCmd_jumpargeq(void) { u8 argId; @@ -3021,6 +3073,8 @@ static void ScriptCmd_jumpargeq(void) sBattleAnimScriptPtr += 7; } +// If using move in contest, go to specific animation script. +// arg0: animation script static void ScriptCmd_jumpifcontest(void) { sBattleAnimScriptPtr++; @@ -3085,6 +3139,8 @@ static void ScriptCmd_monbgprio_2A(void) } } +// Sets sprite to be invisible. +// arg0: battler sprite ID static void ScriptCmd_invisible(void) { u8 spriteId; @@ -3096,6 +3152,8 @@ static void ScriptCmd_invisible(void) sBattleAnimScriptPtr += 2; } +// Sets aprite to be visible. +// arg0: battler sprite ID static void ScriptCmd_visible(void) { u8 spriteId; @@ -3169,6 +3227,7 @@ static void ScriptCmd_doublebattle_2E(void) } } +// Cease playing sounds. static void ScriptCmd_stopsound(void) { m4aMPlayStop(&gMPlay_SE1); diff --git a/src/battle/battle_anim_807B69C.c b/src/battle/battle_anim_807B69C.c index 92099c495..5daf7bb50 100644 --- a/src/battle/battle_anim_807B69C.c +++ b/src/battle/battle_anim_807B69C.c @@ -41,8 +41,8 @@ static const struct SubspriteTable gSubspriteTables_83931D8[] = static const struct SpriteTemplate gSpriteTemplate_83931E0 = { - .tileTag = 10010, - .paletteTag = 10010, + .tileTag = ANIM_TAG_ICE_CUBE, + .paletteTag = ANIM_TAG_ICE_CUBE, .oam = &gOamData_837E05C, .anims = gDummySpriteAnimTable, .images = NULL, @@ -53,8 +53,8 @@ static const struct SpriteTemplate gSpriteTemplate_83931E0 = static void sub_807B870(struct Sprite *); static const struct SpriteTemplate gSpriteTemplate_83931F8 = { - .tileTag = 10136, - .paletteTag = 10136, + .tileTag = ANIM_TAG_CIRCLE_IMPACT, + .paletteTag = ANIM_TAG_CIRCLE_IMPACT, .oam = &gOamData_837DF24, .anims = gDummySpriteAnimTable, .images = NULL, diff --git a/src/battle/battle_anim_812C144.c b/src/battle/battle_anim_812C144.c index 4614f9aa9..acf8f7749 100644 --- a/src/battle/battle_anim_812C144.c +++ b/src/battle/battle_anim_812C144.c @@ -157,8 +157,8 @@ const union AnimCmd *const gSpriteAnimTable_840217C[] = const struct SpriteTemplate gBattleAnimSpriteTemplate_8402180 = { - .tileTag = 10137, - .paletteTag = 10137, + .tileTag = ANIM_TAG_SCRATCH, + .paletteTag = ANIM_TAG_SCRATCH, .oam = &gOamData_837E054, .anims = gSpriteAnimTable_840217C, .images = NULL, @@ -168,8 +168,8 @@ const struct SpriteTemplate gBattleAnimSpriteTemplate_8402180 = const struct SpriteTemplate gBattleAnimSpriteTemplate_8402198 = { - .tileTag = 10016, - .paletteTag = 10016, + .tileTag = ANIM_TAG_BLACK_SMOKE, + .paletteTag = ANIM_TAG_BLACK_SMOKE, .oam = &gOamData_837DF54, .anims = gDummySpriteAnimTable, .images = NULL, @@ -179,8 +179,8 @@ const struct SpriteTemplate gBattleAnimSpriteTemplate_8402198 = const struct SpriteTemplate gBattleAnimSpriteTemplate_84021B0 = { - .tileTag = 10017, - .paletteTag = 10017, + .tileTag = ANIM_TAG_BLACK_BALL, + .paletteTag = ANIM_TAG_BLACK_BALL, .oam = &gOamData_837DF24, .anims = gDummySpriteAnimTable, .images = NULL, @@ -203,8 +203,8 @@ const union AnimCmd *const gSpriteAnimTable_84021D8[] = const struct SpriteTemplate gBattleAnimSpriteTemplate_84021DC = { - .tileTag = 10190, - .paletteTag = 10190, + .tileTag = ANIM_TAG_OPENING_EYE, + .paletteTag = ANIM_TAG_OPENING_EYE, .oam = &gOamData_837DF34, .anims = gSpriteAnimTable_84021D8, .images = NULL, @@ -214,8 +214,8 @@ const struct SpriteTemplate gBattleAnimSpriteTemplate_84021DC = const struct SpriteTemplate gBattleAnimSpriteTemplate_84021F4 = { - .tileTag = 10191, - .paletteTag = 10191, + .tileTag = ANIM_TAG_ROUND_WHITE_HALO, + .paletteTag = ANIM_TAG_ROUND_WHITE_HALO, .oam = &gOamData_837E05C, .anims = gDummySpriteAnimTable, .images = NULL, @@ -225,8 +225,8 @@ const struct SpriteTemplate gBattleAnimSpriteTemplate_84021F4 = const struct SpriteTemplate gBattleAnimSpriteTemplate_840220C = { - .tileTag = 10189, - .paletteTag = 10189, + .tileTag = ANIM_TAG_TEAL_ALERT, + .paletteTag = ANIM_TAG_TEAL_ALERT, .oam = &gOamData_837DF94, .anims = gDummySpriteAnimTable, .images = NULL, @@ -257,8 +257,8 @@ const union AffineAnimCmd *const gSpriteAffineAnimTable_840225C[] = const struct SpriteTemplate gBattleAnimSpriteTemplate_8402264 = { - .tileTag = 10187, - .paletteTag = 10187, + .tileTag = ANIM_TAG_EYE, + .paletteTag = ANIM_TAG_EYE, .oam = &gOamData_837E11C, .anims = gDummySpriteAnimTable, .images = NULL, @@ -268,8 +268,8 @@ const struct SpriteTemplate gBattleAnimSpriteTemplate_8402264 = const struct SpriteTemplate gBattleAnimSpriteTemplate_840227C = { - .tileTag = 10152, - .paletteTag = 10152, + .tileTag = ANIM_TAG_SPIKES, + .paletteTag = ANIM_TAG_SPIKES, .oam = &gOamData_837DF2C, .anims = gDummySpriteAnimTable, .images = NULL, @@ -294,8 +294,8 @@ const union AnimCmd *const gSpriteAnimTable_84022AC[] = const struct SpriteTemplate gBattleAnimSpriteTemplate_84022B0 = { - .tileTag = 10027, - .paletteTag = 10027, + .tileTag = ANIM_TAG_LEER, + .paletteTag = ANIM_TAG_LEER, .oam = &gOamData_837DF34, .anims = gSpriteAnimTable_84022AC, .images = NULL, @@ -328,8 +328,8 @@ const union AffineAnimCmd *const gSpriteAffineAnimTable_84022EC[] = const struct SpriteTemplate gBattleAnimSpriteTemplate_84022F0 = { - .tileTag = 10228, - .paletteTag = 10228, + .tileTag = ANIM_TAG_LETTER_Z, + .paletteTag = ANIM_TAG_LETTER_Z, .oam = &gOamData_837DF94, .anims = gSpriteAnimTable_84022D0, .images = NULL, @@ -365,8 +365,8 @@ const union AffineAnimCmd *const gSpriteAffineAnimTable_8402338[] = const struct SpriteTemplate gBattleAnimSpriteTemplate_840233C = { - .tileTag = 10192, - .paletteTag = 10192, + .tileTag = ANIM_TAG_FANG_ATTACK, + .paletteTag = ANIM_TAG_FANG_ATTACK, .oam = &gOamData_837DFF4, .anims = gSpriteAnimTable_840231C, .images = NULL, @@ -396,8 +396,8 @@ const union AffineAnimCmd *const gSpriteAffineAnimTable_8402384[] = const struct SpriteTemplate gBattleAnimSpriteTemplate_840238C = { - .tileTag = 10227, - .paletteTag = 10227, + .tileTag = ANIM_TAG_SPOTLIGHT, + .paletteTag = ANIM_TAG_SPOTLIGHT, .oam = &gOamData_837DFFC, .anims = gDummySpriteAnimTable, .images = NULL, @@ -407,8 +407,8 @@ const struct SpriteTemplate gBattleAnimSpriteTemplate_840238C = const struct SpriteTemplate gBattleAnimSpriteTemplate_84023A4 = { - .tileTag = 10247, - .paletteTag = 10247, + .tileTag = ANIM_TAG_TAG_HAND, + .paletteTag = ANIM_TAG_TAG_HAND, .oam = &gOamData_837DF34, .anims = gDummySpriteAnimTable, .images = NULL, @@ -418,8 +418,8 @@ const struct SpriteTemplate gBattleAnimSpriteTemplate_84023A4 = const struct SpriteTemplate gBattleAnimSpriteTemplate_84023BC = { - .tileTag = 10247, - .paletteTag = 10247, + .tileTag = ANIM_TAG_TAG_HAND, + .paletteTag = ANIM_TAG_TAG_HAND, .oam = &gOamData_837DF34, .anims = gDummySpriteAnimTable, .images = NULL, @@ -442,8 +442,8 @@ const union AnimCmd *const gSpriteAnimTable_84023E4[] = const struct SpriteTemplate gBattleAnimSpriteTemplate_84023E8 = { - .tileTag = 10229, - .paletteTag = 10229, + .tileTag = ANIM_TAG_RAPID_SPIN, + .paletteTag = ANIM_TAG_RAPID_SPIN, .oam = &gOamData_837DF54, .anims = gSpriteAnimTable_84023E4, .images = NULL, @@ -486,8 +486,8 @@ const union AffineAnimCmd *const gSpriteAffineAnimTable_8402454[] = const struct SpriteTemplate gBattleAnimSpriteTemplate_8402458 = { - .tileTag = 10230, - .paletteTag = 10230, + .tileTag = ANIM_TAG_TRI_FORCE_TRIANGLE, + .paletteTag = ANIM_TAG_TRI_FORCE_TRIANGLE, .oam = &gOamData_837DFFC, .anims = gSpriteAnimTable_8402428, .images = NULL, @@ -515,8 +515,8 @@ const union AnimCmd *const gSpriteAnimTable_8402494[] = const struct SpriteTemplate gBattleAnimSpriteTemplate_8402498 = { - .tileTag = 10234, - .paletteTag = 10234, + .tileTag = ANIM_TAG_ECLIPSING_ORB, + .paletteTag = ANIM_TAG_ECLIPSING_ORB, .oam = &gOamData_837DF34, .anims = gSpriteAnimTable_8402494, .images = NULL, @@ -534,8 +534,8 @@ const union AffineAnimCmd gUnknown_084024B0[] = const struct SpriteTemplate gBattleAnimSpriteTemplate_84024D0 = { - .tileTag = 10226, - .paletteTag = 10226, + .tileTag = ANIM_TAG_POKEBALL, + .paletteTag = ANIM_TAG_POKEBALL, .oam = &gOamData_837DF2C, .anims = gDummySpriteAnimTable, .images = NULL, @@ -545,8 +545,8 @@ const struct SpriteTemplate gBattleAnimSpriteTemplate_84024D0 = const struct SpriteTemplate gBattleAnimSpriteTemplate_84024E8 = { - .tileTag = 10233, - .paletteTag = 10233, + .tileTag = ANIM_TAG_GOLD_STARS, + .paletteTag = ANIM_TAG_GOLD_STARS, .oam = &gOamData_837DF2C, .anims = gDummySpriteAnimTable, .images = NULL, @@ -556,8 +556,8 @@ const struct SpriteTemplate gBattleAnimSpriteTemplate_84024E8 = const struct SpriteTemplate gSpriteTemplate_8402500 = { - .tileTag = 10233, - .paletteTag = 10233, + .tileTag = ANIM_TAG_GOLD_STARS, + .paletteTag = ANIM_TAG_GOLD_STARS, .oam = &gOamData_837DF24, .anims = gDummySpriteAnimTable, .images = NULL, @@ -587,8 +587,8 @@ const union AffineAnimCmd gUnknown_08402540[] = const struct SpriteTemplate gBattleAnimSpriteTemplate_8402578 = { - .tileTag = 10236, - .paletteTag = 10236, + .tileTag = ANIM_TAG_BLUE_ORB, + .paletteTag = ANIM_TAG_BLUE_ORB, .oam = &gOamData_837DF24, .anims = gDummySpriteAnimTable, .images = NULL, @@ -642,8 +642,8 @@ const union AnimCmd *const gSpriteAnimTable_84025E0[] = const struct SpriteTemplate gBattleAnimSpriteTemplate_84025EC = { - .tileTag = 10241, - .paletteTag = 10241, + .tileTag = ANIM_TAG_GREEN_STAR, + .paletteTag = ANIM_TAG_GREEN_STAR, .oam = &gOamData_837DF2C, .anims = gSpriteAnimTable_84025E0, .images = NULL, @@ -678,8 +678,8 @@ const union AffineAnimCmd gUnknown_08402610[] = const struct SpriteTemplate gBattleAnimSpriteTemplate_8402630 = { - .tileTag = 10087, - .paletteTag = 10087, + .tileTag = ANIM_TAG_ANGER, + .paletteTag = ANIM_TAG_ANGER, .oam = &gOamData_837DF2C, .anims = gDummySpriteAnimTable, .images = NULL, @@ -728,8 +728,8 @@ const union AnimCmd *const gSpriteAnimTable_8402698[] = const struct SpriteTemplate gBattleAnimSpriteTemplate_84026A4 = { - .tileTag = 10238, - .paletteTag = 10238, + .tileTag = ANIM_TAG_PINK_PETAL, + .paletteTag = ANIM_TAG_PINK_PETAL, .oam = &gOamData_837DF24, .anims = gSpriteAnimTable_8402698, .images = NULL, @@ -754,8 +754,8 @@ const union AnimCmd *const gSpriteAnimTable_84026EC[] = const struct SpriteTemplate gBattleAnimSpriteTemplate_84026F0 = { - .tileTag = 10239, - .paletteTag = 10239, + .tileTag = ANIM_TAG_PAIN_SPLIT, + .paletteTag = ANIM_TAG_PAIN_SPLIT, .oam = &gOamData_837DF2C, .anims = gSpriteAnimTable_84026EC, .images = NULL, @@ -765,8 +765,8 @@ const struct SpriteTemplate gBattleAnimSpriteTemplate_84026F0 = const struct SpriteTemplate gBattleAnimSpriteTemplate_8402708 = { - .tileTag = 10240, - .paletteTag = 10240, + .tileTag = ANIM_TAG_CONFETTI, + .paletteTag = ANIM_TAG_CONFETTI, .oam = &gOamData_837DF24, .anims = gDummySpriteAnimTable, .images = NULL, @@ -776,8 +776,8 @@ const struct SpriteTemplate gBattleAnimSpriteTemplate_8402708 = const struct SpriteTemplate gBattleAnimSpriteTemplate_8402720 = { - .tileTag = 10227, - .paletteTag = 10227, + .tileTag = ANIM_TAG_SPOTLIGHT, + .paletteTag = ANIM_TAG_SPOTLIGHT, .oam = &gOamData_837DFFC, .anims = gDummySpriteAnimTable, .images = NULL, @@ -787,8 +787,8 @@ const struct SpriteTemplate gBattleAnimSpriteTemplate_8402720 = const struct SpriteTemplate gBattleAnimSpriteTemplate_8402738 = { - .tileTag = 10236, - .paletteTag = 10236, + .tileTag = ANIM_TAG_BLUE_ORB, + .paletteTag = ANIM_TAG_BLUE_ORB, .oam = &gOamData_837DF24, .anims = gDummySpriteAnimTable, .images = NULL, @@ -839,8 +839,8 @@ const union AffineAnimCmd *const gSpriteAffineAnimTable_84027E0[] = const struct SpriteTemplate gBattleAnimSpriteTemplate_84027EC = { - .tileTag = 10242, - .paletteTag = 10242, + .tileTag = ANIM_TAG_PINK_CLOUD, + .paletteTag = ANIM_TAG_PINK_CLOUD, .oam = &gOamData_837DF94, .anims = gDummySpriteAnimTable, .images = NULL, @@ -890,8 +890,8 @@ const union AffineAnimCmd *const gSpriteAffineAnimTable_8402884[] = const struct SpriteTemplate gBattleAnimSpriteTemplate_8402894 = { - .tileTag = 10242, - .paletteTag = 10242, + .tileTag = ANIM_TAG_PINK_CLOUD, + .paletteTag = ANIM_TAG_PINK_CLOUD, .oam = &gOamData_837DFF4, .anims = gDummySpriteAnimTable, .images = NULL, @@ -909,8 +909,8 @@ const union AffineAnimCmd gUnknown_084028AC[] = const struct SpriteTemplate gSpriteTemplate_84028CC = { - .tileTag = 10243, - .paletteTag = 10243, + .tileTag = ANIM_TAG_SWEAT_DROP, + .paletteTag = ANIM_TAG_SWEAT_DROP, .oam = &gOamData_837DF24, .anims = gDummySpriteAnimTable, .images = NULL, @@ -942,8 +942,8 @@ const union AnimCmd *const gSpriteAnimTable_840292C[] = const struct SpriteTemplate gBattleAnimSpriteTemplate_8402934 = { - .tileTag = 10053, - .paletteTag = 10053, + .tileTag = ANIM_TAG_NOISE_LINE, + .paletteTag = ANIM_TAG_NOISE_LINE, .oam = &gOamData_837DF34, .anims = gSpriteAnimTable_840292C, .images = NULL, @@ -953,8 +953,8 @@ const struct SpriteTemplate gBattleAnimSpriteTemplate_8402934 = const struct SpriteTemplate gSpriteTemplate_840294C = { - .tileTag = 10248, - .paletteTag = 10248, + .tileTag = ANIM_TAG_SMALL_RED_EYE, + .paletteTag = ANIM_TAG_SMALL_RED_EYE, .oam = &gOamData_837DF24, .anims = gDummySpriteAnimTable, .images = NULL, @@ -964,8 +964,8 @@ const struct SpriteTemplate gSpriteTemplate_840294C = const struct SpriteTemplate gBattleAnimSpriteTemplate_8402964 = { - .tileTag = 10252, - .paletteTag = 10252, + .tileTag = ANIM_TAG_PAW_PRINT, + .paletteTag = ANIM_TAG_PAW_PRINT, .oam = &gOamData_837DF34, .anims = gDummySpriteAnimTable, .images = NULL, @@ -994,8 +994,8 @@ const union AffineAnimCmd *const gSpriteAffineAnimTable_84029A4[] = const struct SpriteTemplate gSpriteTemplate_84029AC = { - .tileTag = 10254, - .paletteTag = 10254, + .tileTag = ANIM_TAG_RED_BALL, + .paletteTag = ANIM_TAG_RED_BALL, .oam = &gOamData_837DF94, .anims = gDummySpriteAnimTable, .images = NULL, @@ -1005,8 +1005,8 @@ const struct SpriteTemplate gSpriteTemplate_84029AC = const struct SpriteTemplate gBattleAnimSpriteTemplate_84029C4 = { - .tileTag = 10247, - .paletteTag = 10247, + .tileTag = ANIM_TAG_TAG_HAND, + .paletteTag = ANIM_TAG_TAG_HAND, .oam = &gOamData_837DF34, .anims = gDummySpriteAnimTable, .images = NULL, @@ -1023,8 +1023,8 @@ const union AffineAnimCmd gUnknown_084029DC[] = const struct SpriteTemplate gBattleAnimSpriteTemplate_84029F4 = { - .tileTag = 10255, - .paletteTag = 10255, + .tileTag = ANIM_TAG_SMELLINGSALT_EFFECT, + .paletteTag = ANIM_TAG_SMELLINGSALT_EFFECT, .oam = &gOamData_837DF34, .anims = gDummySpriteAnimTable, .images = NULL, @@ -1034,8 +1034,8 @@ const struct SpriteTemplate gBattleAnimSpriteTemplate_84029F4 = const struct SpriteTemplate gBattleAnimSpriteTemplate_8402A0C = { - .tileTag = 10247, - .paletteTag = 10247, + .tileTag = ANIM_TAG_TAG_HAND, + .paletteTag = ANIM_TAG_TAG_HAND, .oam = &gOamData_837DF34, .anims = gDummySpriteAnimTable, .images = NULL, @@ -1045,8 +1045,8 @@ const struct SpriteTemplate gBattleAnimSpriteTemplate_8402A0C = const struct SpriteTemplate gBattleAnimSpriteTemplate_8402A24 = { - .tileTag = 10258, - .paletteTag = 10258, + .tileTag = ANIM_TAG_MAGNIFYING_GLASS, + .paletteTag = ANIM_TAG_MAGNIFYING_GLASS, .oam = &gOamData_837E054, .anims = gDummySpriteAnimTable, .images = NULL, @@ -1056,8 +1056,8 @@ const struct SpriteTemplate gBattleAnimSpriteTemplate_8402A24 = const struct SpriteTemplate gBattleAnimSpriteTemplate_8402A3C = { - .tileTag = 10233, - .paletteTag = 10233, + .tileTag = ANIM_TAG_GOLD_STARS, + .paletteTag = ANIM_TAG_GOLD_STARS, .oam = &gOamData_837DF2C, .anims = gDummySpriteAnimTable, .images = NULL, @@ -1067,8 +1067,8 @@ const struct SpriteTemplate gBattleAnimSpriteTemplate_8402A3C = const struct SpriteTemplate gSpriteTemplate_8402A54 = { - .tileTag = 10233, - .paletteTag = 10233, + .tileTag = ANIM_TAG_GOLD_STARS, + .paletteTag = ANIM_TAG_GOLD_STARS, .oam = &gOamData_837DF2C, .anims = gDummySpriteAnimTable, .images = NULL, @@ -1078,8 +1078,8 @@ const struct SpriteTemplate gSpriteTemplate_8402A54 = const struct SpriteTemplate gBattleAnimSpriteTemplate_8402A6C = { - .tileTag = 10250, - .paletteTag = 10250, + .tileTag = ANIM_TAG_X_SIGN, + .paletteTag = ANIM_TAG_X_SIGN, .oam = &gOamData_837DF3C, .anims = gDummySpriteAnimTable, .images = NULL, @@ -1089,8 +1089,8 @@ const struct SpriteTemplate gBattleAnimSpriteTemplate_8402A6C = const struct SpriteTemplate gSpriteTemplate_8402A84 = { - .tileTag = 10224, - .paletteTag = 10224, + .tileTag = ANIM_TAG_ITEM_BAG, + .paletteTag = ANIM_TAG_ITEM_BAG, .oam = &gOamData_837DF34, .anims = gDummySpriteAnimTable, .images = NULL, @@ -1132,8 +1132,8 @@ const union AffineAnimCmd *const gSpriteAffineAnimTable_8402ADC[] = const struct SpriteTemplate gBattleAnimSpriteTemplate_8402AE4 = { - .tileTag = 10277, - .paletteTag = 10277, + .tileTag = ANIM_TAG_SLAM_HIT_2, + .paletteTag = ANIM_TAG_SLAM_HIT_2, .oam = &gOamData_837DF9C, .anims = gSpriteAnimTable_8402AA8, .images = NULL, @@ -1154,8 +1154,8 @@ const union AffineAnimCmd *const gSpriteAffineAnimTable_8402B0C[] = const struct SpriteTemplate gBattleAnimSpriteTemplate_8402B10 = { - .tileTag = 10278, - .paletteTag = 10278, + .tileTag = ANIM_TAG_RECYCLE, + .paletteTag = ANIM_TAG_RECYCLE, .oam = &gOamData_837E0BC, .anims = gDummySpriteAnimTable, .images = NULL, @@ -1647,7 +1647,7 @@ static void sub_812CBB4(struct Sprite *sprite) sprite->data[2]++; if (sprite->data[3] == 0) { - PlaySE1WithPanning(222, BattleAnimAdjustPanning(-64)); + PlaySE1WithPanning(222, BattleAnimAdjustPanning(SOUND_PAN_ATTACKER_NEG)); } } } @@ -1927,7 +1927,7 @@ static void sub_812D06C(u8 taskId) y = task->data[3] + task->data[5]; spriteId = CreateSprite(&gBattleAnimSpriteTemplate_83D7220, x, y, 6 - task->data[1]); - PlaySE12WithPanning(186, BattleAnimAdjustPanning(-64)); + PlaySE12WithPanning(186, BattleAnimAdjustPanning(SOUND_PAN_ATTACKER_NEG)); if (spriteId != MAX_SPRITES) { @@ -2413,7 +2413,7 @@ void sub_812DB84(u8 taskId) gTasks[taskId].data[11] = gBattle_BG1_Y; gTasks[taskId].data[0]++; - PlaySE12WithPanning(SE_W234, BattleAnimAdjustPanning(-64)); + PlaySE12WithPanning(SE_W234, BattleAnimAdjustPanning(SOUND_PAN_ATTACKER_NEG)); break; case 1: if (gTasks[taskId].data[4]++ > 0) @@ -2448,7 +2448,7 @@ void sub_812DB84(u8 taskId) { gTasks[taskId].data[3] = 0; gTasks[taskId].data[0] = 1; - PlaySE12WithPanning(SE_W234, BattleAnimAdjustPanning(-64)); + PlaySE12WithPanning(SE_W234, BattleAnimAdjustPanning(SOUND_PAN_ATTACKER_NEG)); } break; case 4: @@ -3146,9 +3146,9 @@ static void sub_812EEEC(struct Sprite *sprite) sprite->data[1] = (sprite->data[1] + 9) & 0xFF; if ((u16)sprite->data[1] < 64 || sprite->data[1] > 195) - sprite->subpriority = sub_8079E90(gAnimBankAttacker) - 1; + sprite->subpriority = GetBattlerSubpriority(gAnimBankAttacker) - 1; else - sprite->subpriority = sub_8079E90(gAnimBankAttacker) + 1; + sprite->subpriority = GetBattlerSubpriority(gAnimBankAttacker) + 1; if (sprite->data[5] == 0) { @@ -4013,7 +4013,7 @@ void sub_812FD7C(u8 taskId) task->data[4] = GetBattlerSpriteCoord(battler, 0); task->data[5] = GetBattlerSpriteCoord(battler, 1); - task->data[6] = sub_8079E90(battler); + task->data[6] = GetBattlerSubpriority(battler); task->data[15] = GetAnimBattlerSpriteId(gBattleAnimArgs[0]); sub_80798F4(task, task->data[15], &gUnknown_084028AC); task->func = sub_812FE20; @@ -4342,7 +4342,7 @@ void sub_8130554(u8 taskId) task->data[12] = GetBattlerSpriteCoord(gAnimBankAttacker, 3); task->data[13] = GetBattlerSpriteCoord(gAnimBankTarget, 2); task->data[14] = GetBattlerSpriteCoord(gAnimBankTarget, 3) + sub_807A100(gAnimBankTarget, 0) / 4; - task->data[15] = CreateSprite(&gSpriteTemplate_84029AC, task->data[11], task->data[12], sub_8079E90(gAnimBankTarget) - 5); + task->data[15] = CreateSprite(&gSpriteTemplate_84029AC, task->data[11], task->data[12], GetBattlerSubpriority(gAnimBankTarget) - 5); if (task->data[15] != MAX_SPRITES) { gSprites[task->data[15]].data[0] = 16; @@ -4999,7 +4999,7 @@ static void sub_8131408(u8 taskId) if (gSprites[spriteId].pos2.y == 0) { - PlaySE12WithPanning(SE_W145B, BattleAnimAdjustPanning(-64)); + PlaySE12WithPanning(SE_W145B, BattleAnimAdjustPanning(SOUND_PAN_ATTACKER_NEG)); gTasks[taskId].data[10] -= 0x800; gTasks[taskId].data[0]++; } @@ -5021,7 +5021,7 @@ static void sub_8131408(u8 taskId) if (gSprites[spriteId].pos2.y == 0) { - PlaySE12WithPanning(SE_W145B, BattleAnimAdjustPanning(-64)); + PlaySE12WithPanning(SE_W145B, BattleAnimAdjustPanning(SOUND_PAN_ATTACKER_NEG)); DestroyAnimVisualTask(taskId); } break; @@ -5034,12 +5034,12 @@ static void sub_8131564(struct Sprite *sprite) if (GetBattlerSide(gAnimBankTarget) == B_SIDE_PLAYER) { - sprite->subpriority = sub_8079E90(gAnimBankTarget) - 2; + sprite->subpriority = GetBattlerSubpriority(gAnimBankTarget) - 2; y2 = -144; } else { - sprite->subpriority = sub_8079E90(gAnimBankTarget) + 2; + sprite->subpriority = GetBattlerSubpriority(gAnimBankTarget) + 2; y2 = -96; } @@ -5056,7 +5056,7 @@ static void sub_81315C8(struct Sprite *sprite) sprite->pos2.y += 10; if (sprite->pos2.y >= 0) { - PlaySE12WithPanning(SE_W166, BattleAnimAdjustPanning(63)); + PlaySE12WithPanning(SE_W166, BattleAnimAdjustPanning(SOUND_PAN_TARGET)); sprite->pos2.y = 0; sprite->data[0]++; } @@ -5066,7 +5066,7 @@ static void sub_81315C8(struct Sprite *sprite) sprite->pos2.y = -(gSineTable[sprite->data[1]] >> 3); if (sprite->data[1] > 127) { - PlaySE12WithPanning(SE_W166, BattleAnimAdjustPanning(63)); + PlaySE12WithPanning(SE_W166, BattleAnimAdjustPanning(SOUND_PAN_TARGET)); sprite->data[1] = 0; sprite->pos2.y = 0; sprite->data[0]++; @@ -5085,7 +5085,7 @@ static void sub_81315C8(struct Sprite *sprite) case 3: if (++sprite->data[1] > 8) { - PlaySE12WithPanning(SE_W043, BattleAnimAdjustPanning(63)); + PlaySE12WithPanning(SE_W043, BattleAnimAdjustPanning(SOUND_PAN_TARGET)); sprite->data[1] = 0; sprite->data[0]++; } diff --git a/src/battle/battle_anim_813F0F4.c b/src/battle/battle_anim_813F0F4.c index 312cdf8c9..7bcae382f 100755 --- a/src/battle/battle_anim_813F0F4.c +++ b/src/battle/battle_anim_813F0F4.c @@ -351,8 +351,8 @@ const u16 gUnknown_0840B4D4[] = static void sub_8141C30(struct Sprite *sprite); const struct SpriteTemplate gBattleAnimSpriteTemplate_840B4FC = { - .tileTag = 10269, - .paletteTag = 10269, + .tileTag = ANIM_TAG_UNUSED_RED_BRICK, + .paletteTag = ANIM_TAG_UNUSED_RED_BRICK, .oam = &gOamData_837DF2C, .anims = gDummySpriteAnimTable, .images = NULL, @@ -721,7 +721,7 @@ void sub_813FBB8(u8 taskId) } ballIndex = ball_number_to_ball_processing_index(gLastUsedItem); - subpriority = sub_8079E90(GetBattlerAtPosition(B_POSITION_OPPONENT_LEFT)) + 1; + subpriority = GetBattlerSubpriority(GetBattlerAtPosition(B_POSITION_OPPONENT_LEFT)) + 1; spriteId = CreateSprite(&gBallSpriteTemplates[ballIndex], x + 32, y | 80, subpriority); gSprites[spriteId].data[0] = 34; gSprites[spriteId].data[1] = GetBattlerSpriteCoord(gAnimBankTarget, 0); diff --git a/src/battle/battle_controller_linkopponent.c b/src/battle/battle_controller_linkopponent.c index f9c8fe7d1..117aeb932 100644 --- a/src/battle/battle_controller_linkopponent.c +++ b/src/battle/battle_controller_linkopponent.c @@ -55,7 +55,7 @@ extern MainCallback gPreBattleCallback1; extern struct MusicPlayerInfo gMPlay_BGM; extern u8 sub_8077F68(); -extern u8 sub_8079E90(); +extern u8 GetBattlerSubpriority(); extern u8 GetBattlerPosition(u8); extern void BattleLoadOpponentMonSprite(struct Pokemon *, u8); extern void sub_8037A74(void); @@ -1157,7 +1157,7 @@ void LinkOpponentHandleLoadPokeSprite(void) &gUnknown_02024E8C, GetBattlerSpriteCoord(gActiveBattler, 2), sub_8077F68(gActiveBattler), - sub_8079E90(gActiveBattler)); + GetBattlerSubpriority(gActiveBattler)); gSprites[gBankSpriteIds[gActiveBattler]].pos2.x = -240; gSprites[gBankSpriteIds[gActiveBattler]].data[0] = gActiveBattler; gSprites[gBankSpriteIds[gActiveBattler]].oam.paletteNum = gActiveBattler; @@ -1187,7 +1187,7 @@ void sub_8039430(u8 a, u8 b) &gUnknown_02024E8C, GetBattlerSpriteCoord(a, 2), sub_8077F68(a), - sub_8079E90(a)); + GetBattlerSubpriority(a)); gSprites[gUnknown_0300434C[a]].data[1] = gBankSpriteIds[a]; gSprites[gBankSpriteIds[a]].data[0] = a; gSprites[gBankSpriteIds[a]].data[2] = species; @@ -1258,7 +1258,7 @@ void LinkOpponentHandleTrainerThrow(void) gBankSpriteIds[gActiveBattler] = CreateSprite( &gUnknown_02024E8C, 176 + xOffset, 40 + 4 * (8 - gTrainerFrontPicCoords[gender].coords), - sub_8079E90(gActiveBattler)); + GetBattlerSubpriority(gActiveBattler)); gSprites[gBankSpriteIds[gActiveBattler]].pos2.x = -240; gSprites[gBankSpriteIds[gActiveBattler]].data[0] = 2; gSprites[gBankSpriteIds[gActiveBattler]].oam.paletteNum = IndexOfSpritePaletteTag(gTrainerFrontPicPaletteTable[gender].tag); diff --git a/src/battle/battle_controller_linkpartner.c b/src/battle/battle_controller_linkpartner.c index 38514bfb5..0db2f54b4 100644 --- a/src/battle/battle_controller_linkpartner.c +++ b/src/battle/battle_controller_linkpartner.c @@ -85,7 +85,7 @@ extern u8 CreateInvisibleSpriteWithCallback(); extern void BattleLoadPlayerMonSprite(); extern u8 GetBattlerSpriteCoord(); extern u8 sub_8077F68(); -extern u8 sub_8079E90(); +extern u8 GetBattlerSubpriority(); extern void nullsub_10(); extern void sub_8045A5C(); extern void sub_804777C(); @@ -1105,7 +1105,7 @@ void LinkPartnerHandleLoadPokeSprite(void) &gUnknown_02024E8C, GetBattlerSpriteCoord(gActiveBattler, 2), sub_8077F68(gActiveBattler), - sub_8079E90(gActiveBattler)); + GetBattlerSubpriority(gActiveBattler)); gSprites[gBankSpriteIds[gActiveBattler]].pos2.x = -240; gSprites[gBankSpriteIds[gActiveBattler]].data[0] = gActiveBattler; gSprites[gBankSpriteIds[gActiveBattler]].oam.paletteNum = gActiveBattler; @@ -1135,7 +1135,7 @@ void sub_811F864(u8 a, u8 b) &gUnknown_02024E8C, GetBattlerSpriteCoord(a, 2), sub_8077F68(a), - sub_8079E90(a)); + GetBattlerSubpriority(a)); gSprites[gUnknown_0300434C[a]].data[1] = gBankSpriteIds[a]; gSprites[gBankSpriteIds[a]].data[0] = a; gSprites[gBankSpriteIds[a]].data[2] = species; @@ -1205,7 +1205,7 @@ void LinkPartnerHandleTrainerThrow(void) gBankSpriteIds[gActiveBattler] = CreateSprite( &gUnknown_02024E8C, 80 + xOffset, 80 + 4 * (8 - gTrainerBackPicCoords[gender].coords), - sub_8079E90(gActiveBattler)); + GetBattlerSubpriority(gActiveBattler)); gSprites[gBankSpriteIds[gActiveBattler]].oam.paletteNum = gActiveBattler; gSprites[gBankSpriteIds[gActiveBattler]].pos2.x = 240; gSprites[gBankSpriteIds[gActiveBattler]].data[0] = -2; diff --git a/src/battle/battle_controller_opponent.c b/src/battle/battle_controller_opponent.c index a7e99900b..cf1fd6274 100644 --- a/src/battle/battle_controller_opponent.c +++ b/src/battle/battle_controller_opponent.c @@ -67,7 +67,7 @@ extern u32 gBattleExecBuffer; extern u8 GetBattlerSpriteCoord(); extern u8 sub_8077F68(); -extern u8 sub_8079E90(); +extern u8 GetBattlerSubpriority(); extern void sub_8033018(void); extern void BattleLoadOpponentMonSprite(); extern u8 GetBattlerPosition(u8); @@ -1128,7 +1128,7 @@ void OpponentHandleLoadPokeSprite(void) &gUnknown_02024E8C, GetBattlerSpriteCoord(gActiveBattler, 2), sub_8077F68(gActiveBattler), - sub_8079E90(gActiveBattler)); + GetBattlerSubpriority(gActiveBattler)); gSprites[gBankSpriteIds[gActiveBattler]].pos2.x = -240; gSprites[gBankSpriteIds[gActiveBattler]].data[0] = gActiveBattler; gSprites[gBankSpriteIds[gActiveBattler]].data[2] = species; @@ -1160,7 +1160,7 @@ void sub_803495C(u8 a, u8 b) &gUnknown_02024E8C, GetBattlerSpriteCoord(a, 2), sub_8077F68(a), - sub_8079E90(a)); + GetBattlerSubpriority(a)); gSprites[gBankSpriteIds[a]].data[0] = a; gSprites[gBankSpriteIds[a]].data[2] = species; gSprites[gUnknown_0300434C[a]].data[1] = gBankSpriteIds[a]; @@ -1236,7 +1236,7 @@ void OpponentHandleTrainerThrow(void) &gUnknown_02024E8C, 0xB0, 40 + 4 * (8 - gTrainerFrontPicCoords[trainerPicIndex].coords), - sub_8079E90(gActiveBattler)); + GetBattlerSubpriority(gActiveBattler)); gSprites[gBankSpriteIds[gActiveBattler]].pos2.x = -240; gSprites[gBankSpriteIds[gActiveBattler]].data[0] = 2; gSprites[gBankSpriteIds[gActiveBattler]].oam.paletteNum = IndexOfSpritePaletteTag(gTrainerFrontPicPaletteTable[trainerPicIndex].tag); diff --git a/src/battle/battle_controller_player.c b/src/battle/battle_controller_player.c index de8b1579b..5d7a8955c 100644 --- a/src/battle/battle_controller_player.c +++ b/src/battle/battle_controller_player.c @@ -121,7 +121,7 @@ extern u8 GetBattlerPosition(u8); extern void LoadPlayerTrainerBankSprite(); extern void sub_80313A0(struct Sprite *); extern void sub_802D204(void); -extern u8 sub_8079E90(); +extern u8 GetBattlerSubpriority(); extern void sub_802DEAC(void); extern void sub_80312F0(struct Sprite *); extern u8 GetBattlerSpriteCoord(); @@ -2515,7 +2515,7 @@ void sub_802F934(u8 bank, u8 b) &gUnknown_02024E8C, GetBattlerSpriteCoord(bank, 2), sub_8077F68(bank), - sub_8079E90(bank)); + GetBattlerSubpriority(bank)); gSprites[gUnknown_0300434C[bank]].data[1] = gBankSpriteIds[bank]; gSprites[gBankSpriteIds[bank]].data[0] = bank; gSprites[gBankSpriteIds[bank]].data[2] = species; @@ -2582,7 +2582,7 @@ void PlayerHandleTrainerThrow(void) &gUnknown_02024E8C, r7 + 80, (8 - gTrainerBackPicCoords[gSaveBlock2.playerGender].coords) * 4 + 80, - sub_8079E90(gActiveBattler)); + GetBattlerSubpriority(gActiveBattler)); gSprites[gBankSpriteIds[gActiveBattler]].oam.paletteNum = gActiveBattler; gSprites[gBankSpriteIds[gActiveBattler]].pos2.x = 240; gSprites[gBankSpriteIds[gActiveBattler]].data[0] = -2; diff --git a/src/battle/battle_controller_safari.c b/src/battle/battle_controller_safari.c index 72054ee6b..e547c4a3c 100644 --- a/src/battle/battle_controller_safari.c +++ b/src/battle/battle_controller_safari.c @@ -42,7 +42,7 @@ extern u8 GetBattlerSide(u8); extern u8 GetBattlerAtPosition(u8); extern u8 GetBattlerPosition(u8); extern void LoadPlayerTrainerBankSprite(); -extern u8 sub_8079E90(); +extern u8 GetBattlerSubpriority(); extern void sub_80313A0(struct Sprite *); extern void sub_810BADC(void); extern void sub_8045A5C(); diff --git a/src/battle/battle_controller_wally.c b/src/battle/battle_controller_wally.c index a7ce7d27d..fa8b2a63b 100644 --- a/src/battle/battle_controller_wally.c +++ b/src/battle/battle_controller_wally.c @@ -91,7 +91,7 @@ extern void StoreSpriteCallbackInData(); extern u8 StartSendOutMonAnimation(); extern u8 GetBattlerSpriteCoord(); extern u8 sub_8077F68(); -extern u8 sub_8079E90(); +extern u8 GetBattlerSubpriority(); extern void sub_80312F0(struct Sprite *); extern bool8 move_anim_start_t3(); @@ -1510,7 +1510,7 @@ void sub_81398BC(u8 bank) &gUnknown_02024E8C, GetBattlerSpriteCoord(bank, 2), sub_8077F68(bank), - sub_8079E90(bank)); + GetBattlerSubpriority(bank)); gSprites[gUnknown_0300434C[bank]].data[1] = gBankSpriteIds[bank]; gSprites[gBankSpriteIds[bank]].data[0] = bank; gSprites[gBankSpriteIds[bank]].data[2] = species; diff --git a/src/battle/reshow_battle_screen.c b/src/battle/reshow_battle_screen.c index bc4d394f0..712ec3ea8 100644 --- a/src/battle/reshow_battle_screen.c +++ b/src/battle/reshow_battle_screen.c @@ -235,7 +235,7 @@ static void sub_807B184(u8 bank) if (GetMonData(&gEnemyParty[gBattlerPartyIndexes[bank]], MON_DATA_HP) == 0) return; GetMonSpriteTemplate_803C56C(GetMonData(&gEnemyParty[gBattlerPartyIndexes[bank]], MON_DATA_SPECIES), GetBattlerPosition(bank)); - gBankSpriteIds[bank] = CreateSprite(&gUnknown_02024E8C, GetBattlerSpriteCoord(bank, 2), posY, sub_8079E90(bank)); + gBankSpriteIds[bank] = CreateSprite(&gUnknown_02024E8C, GetBattlerSpriteCoord(bank, 2), posY, GetBattlerSubpriority(bank)); gSprites[gBankSpriteIds[bank]].oam.paletteNum = bank; gSprites[gBankSpriteIds[bank]].callback = SpriteCallbackDummy; gSprites[gBankSpriteIds[bank]].data[0] = bank; @@ -247,7 +247,7 @@ static void sub_807B184(u8 bank) GetMonSpriteTemplate_803C5A0(gSaveBlock2.playerGender, GetBattlerPosition(0)); gBankSpriteIds[bank] = CreateSprite(&gUnknown_02024E8C, 0x50, (8 - gTrainerBackPicCoords[gSaveBlock2.playerGender].coords) * 4 + 80, - sub_8079E90(0)); + GetBattlerSubpriority(0)); gSprites[gBankSpriteIds[bank]].oam.paletteNum = bank; gSprites[gBankSpriteIds[bank]].callback = SpriteCallbackDummy; gSprites[gBankSpriteIds[bank]].data[0] = bank; @@ -257,7 +257,7 @@ static void sub_807B184(u8 bank) GetMonSpriteTemplate_803C5A0(2, GetBattlerPosition(0)); gBankSpriteIds[bank] = CreateSprite(&gUnknown_02024E8C, 0x50, (8 - gTrainerBackPicCoords[2].coords) * 4 + 80, - sub_8079E90(0)); + GetBattlerSubpriority(0)); gSprites[gBankSpriteIds[bank]].oam.paletteNum = bank; gSprites[gBankSpriteIds[bank]].callback = SpriteCallbackDummy; gSprites[gBankSpriteIds[bank]].data[0] = bank; @@ -267,7 +267,7 @@ static void sub_807B184(u8 bank) if (GetMonData(&gPlayerParty[gBattlerPartyIndexes[bank]], MON_DATA_HP) == 0) return; GetMonSpriteTemplate_803C56C(GetMonData(&gPlayerParty[gBattlerPartyIndexes[bank]], MON_DATA_SPECIES), GetBattlerPosition(bank)); - gBankSpriteIds[bank] = CreateSprite(&gUnknown_02024E8C, GetBattlerSpriteCoord(bank, 2), posY, sub_8079E90(bank)); + gBankSpriteIds[bank] = CreateSprite(&gUnknown_02024E8C, GetBattlerSpriteCoord(bank, 2), posY, GetBattlerSubpriority(bank)); gSprites[gBankSpriteIds[bank]].oam.paletteNum = bank; gSprites[gBankSpriteIds[bank]].callback = SpriteCallbackDummy; gSprites[gBankSpriteIds[bank]].data[0] = bank; diff --git a/src/contest.c b/src/contest.c index 78e2da3c0..076d08759 100644 --- a/src/contest.c +++ b/src/contest.c @@ -2495,7 +2495,7 @@ u8 sub_80AE9FC(u16 species, u32 otId, u32 personality) spriteId = CreateSprite(&gUnknown_02024E8C, 112, sub_8077E44(2, species, 0), 30); gSprites[spriteId].oam.paletteNum = 2; gSprites[spriteId].oam.priority = 2; - gSprites[spriteId].subpriority = sub_8079E90(2); + gSprites[spriteId].subpriority = GetBattlerSubpriority(2); gSprites[spriteId].callback = SpriteCallbackDummy; gSprites[spriteId].data[0] = gSprites[spriteId].oam.paletteNum; gSprites[spriteId].data[2] = species; diff --git a/src/rom_8077ABC.c b/src/rom_8077ABC.c index 8e8e6ef8a..20ca6c592 100644 --- a/src/rom_8077ABC.c +++ b/src/rom_8077ABC.c @@ -1862,7 +1862,7 @@ void unref_sub_8079D20(u8 priority) gSprites[gBattleMonSprites[gAnimBankAttacker ^ 2]].oam.priority = priority; } -void sub_8079E24() +void UpdateBattlerSpritePriorities() { int i; @@ -1870,13 +1870,13 @@ void sub_8079E24() { if (IsAnimBankSpriteVisible(i)) { - gSprites[gBattleMonSprites[i]].subpriority = sub_8079E90(i); + gSprites[gBattleMonSprites[i]].subpriority = GetBattlerSubpriority(i); gSprites[gBattleMonSprites[i]].oam.priority = 2; } } } -u8 sub_8079E90(u8 bank) +u8 GetBattlerSubpriority(u8 bank) { u8 identity; u8 ret; @@ -2241,7 +2241,7 @@ void sub_807A69C(u8 taskId) dest = (task->data[4] + 0x10) * 0x10; src = (gSprites[task->data[0]].oam.paletteNum + 0x10) * 0x10; - task->data[6] = sub_8079E90(gAnimBankAttacker); + task->data[6] = GetBattlerSubpriority(gAnimBankAttacker); if (task->data[6] == 20 || task->data[6] == 40) task->data[6] = 2; else |